Report 1904.1: Configuration 70/20070/4
authorTibor Frank <tifrank@cisco.com>
Tue, 11 Jun 2019 10:16:30 +0000 (12:16 +0200)
committerJan Gelety <jgelety@cisco.com>
Mon, 3 Jun 2019 16:43:11 +0000 (18:43 +0200)
Change-Id: Ie378515c775854e38cc4db090153834490521aa1
Signed-off-by: Tibor Frank <tifrank@cisco.com>
37 files changed:
docs/report/detailed_test_results/vpp_performance_results/index.rst
docs/report/index.html.template
docs/report/index.pdf.template
docs/report/introduction/report_history.rst
docs/report/test_configuration/vpp_performance_configuration/index.rst
docs/report/test_operational_data/vpp_performance_operational_data/index.rst
docs/report/vpp_functional_tests/csit_release_notes.rst
docs/report/vpp_functional_tests/test_environment.rst
docs/report/vpp_performance_tests/comparisons/current_vs_previous_release.rst
docs/report/vpp_performance_tests/comparisons/index.rst
docs/report/vpp_performance_tests/comparisons/nic_comparison.rst
docs/report/vpp_performance_tests/csit_release_notes.rst
docs/report/vpp_performance_tests/index.rst
docs/report/vpp_performance_tests/packet_latency_graphs/container_memif.rst
docs/report/vpp_performance_tests/packet_latency_graphs/index.rst
docs/report/vpp_performance_tests/packet_latency_graphs/ip4.rst
docs/report/vpp_performance_tests/packet_latency_graphs/ip4_tunnels.rst
docs/report/vpp_performance_tests/packet_latency_graphs/ip6.rst
docs/report/vpp_performance_tests/packet_latency_graphs/l2.rst
docs/report/vpp_performance_tests/packet_latency_graphs/vm_vhost.rst
docs/report/vpp_performance_tests/packet_throughput_graphs/container_memif.rst
docs/report/vpp_performance_tests/packet_throughput_graphs/index.rst
docs/report/vpp_performance_tests/packet_throughput_graphs/ip4.rst
docs/report/vpp_performance_tests/packet_throughput_graphs/ip4_tunnels.rst
docs/report/vpp_performance_tests/packet_throughput_graphs/ip6.rst
docs/report/vpp_performance_tests/packet_throughput_graphs/l2.rst
docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost.rst
docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif.rst
docs/report/vpp_performance_tests/throughput_speedup_multi_core/index.rst
docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4.rst
docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4_tunnels.rst
docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6.rst
docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2.rst
docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost.rst
resources/tools/presentation/conf.py
resources/tools/presentation/run_report.sh
resources/tools/presentation/specification.yaml

index 0765024..bf89346 100644 (file)
@@ -5,7 +5,7 @@ VPP Throughput
 
     ../vpp_performance_results_3n_hsw/index
     ../vpp_performance_results_3n_skx/index
-    ../vpp_performance_results_2n_skx/index
 
 ..
+    ../vpp_performance_results_2n_skx/index
     ../vpp_performance_results_2n_dnv/index
index 2663b49..cc757c6 100644 (file)
@@ -1,5 +1,5 @@
-CSIT-1904
-=========
+CSIT-1901.2
+===========
 
 .. toctree::
     :maxdepth: 2
@@ -20,13 +20,13 @@ CSIT-1904
     vpp_performance_tests/packet_throughput_graphs/index
     vpp_performance_tests/throughput_speedup_multi_core/index
     vpp_performance_tests/packet_latency_graphs/index
-    vpp_performance_tests/soak_tests/index
-    vpp_performance_tests/nf_service_density/index
     vpp_performance_tests/comparisons/index
     vpp_performance_tests/throughput_trending
     vpp_performance_tests/test_environment
     vpp_performance_tests/documentation/index
 ..
+    vpp_performance_tests/soak_tests/index
+    vpp_performance_tests/nf_service_density/index
     vpp_performance_tests/http_server_performance/index
 
 .. toctree::
@@ -60,16 +60,16 @@ CSIT-1904
     vpp_functional_tests/test_environment
     vpp_functional_tests/documentation
 
-.. toctree::
-    :maxdepth: 2
-    :caption: HoneyComb Functional
+..
+    .. toctree::
+        :maxdepth: 2
+        :caption: HoneyComb Functional
 
-    honeycomb_functional_tests/overview
-    honeycomb_functional_tests/csit_release_notes
-    honeycomb_functional_tests/test_environment
-    honeycomb_functional_tests/documentation
+        honeycomb_functional_tests/overview
+        honeycomb_functional_tests/csit_release_notes
+        honeycomb_functional_tests/test_environment
+        honeycomb_functional_tests/documentation
 
-..
     .. toctree::
         :maxdepth: 2
         :caption: NSH_SFC Functional
@@ -79,7 +79,6 @@ CSIT-1904
         nsh_sfc_functional_tests/test_environment
         nsh_sfc_functional_tests/documentation
 
-..
     .. toctree::
         :maxdepth: 2
         :caption: DMM Functional
@@ -94,14 +93,14 @@ CSIT-1904
     :caption: Detailed Results
 
     detailed_test_results/vpp_performance_results/index
-    detailed_test_results/vpp_mrr_results/index
     detailed_test_results/dpdk_performance_results/index
     detailed_test_results/vpp_functional_results/index
     detailed_test_results/vpp_device_results_ubuntu/index
-    detailed_test_results/honeycomb_functional_results/index
 
 ..
+    detailed_test_results/honeycomb_functional_results/index
     detailed_test_results/dmm_functional_results/index
+    detailed_test_results/vpp_mrr_results/index
     detailed_test_results/cot_performance_results/index
     detailed_test_results/nshsfc_functional_results/index
 
@@ -110,10 +109,11 @@ CSIT-1904
     :caption: Test Configuration
 
     test_configuration/vpp_performance_configuration/index
-    test_configuration/vpp_mrr_configuration/index
     test_configuration/vpp_functional_configuration/index
     test_configuration/vpp_device_configuration_ubuntu/index
+
 ..
+    test_configuration/vpp_mrr_configuration/index
     test_configuration/cot_performance_configuration/index
 
 .. toctree::
index 29faad5..9302af8 100644 (file)
@@ -1,5 +1,5 @@
-CSIT-1904
-=========
+CSIT-1901.2
+===========
 
 .. toctree::
     :numbered:
@@ -9,9 +9,9 @@ CSIT-1904
     dpdk_performance_tests/index
     vpp_device_tests/index
     vpp_functional_tests/index
-    honeycomb_functional_tests/index
     csit_framework_documentation/index
 
 ..
+    honeycomb_functional_tests/index
     dmm_functional_tests/index
     nsh_sfc_functional_tests/index
index ba7cc25..65c5435 100644 (file)
@@ -1,42 +1,12 @@
 Report History
 ==============
 
-FD.io CSIT-1904 Report history and per .[ww] revision changes are listed below.
+FD.io CSIT-1904.1 Report history and per .[ww] revision changes are listed below.
 
 +----------------+------------------------------------------------------------+
 | .[ww] Revision | Changes                                                    |
 +================+============================================================+
-| .23            | 1. Added new data                                          |
-|                |                                                            |
-|                |    - VPP 3n-hsw NDRPDR full                                |
-|                |                                                            |
-+----------------+------------------------------------------------------------+
-| .22            | 1. Added new data                                          |
-|                |                                                            |
-|                |    - VPP 3n-hsw NDRPDR full                                |
-|                |                                                            |
-+----------------+------------------------------------------------------------+
-| .21            | 1. Added new data                                          |
-|                |                                                            |
-|                |    - VPP 3n-hsw NDRPDR full                                |
-|                |    - VPP 2n-skx NFV NDRPDR 64b and IMIX                    |
-|                |                                                            |
-|                | 2. Added missing results                                   |
-|                |                                                            |
-|                |    - VPP functional tests Ubuntu                           |
-|                |    - VPP device tests                                      |
-|                |                                                            |
-+----------------+------------------------------------------------------------+
-| .20            | 1. Added new data                                          |
-|                |                                                            |
-|                |    - VPP 3n-hsw NDRPDR selected                            |
-|                |    - VPP 3n-skx NDRPDR full                                |
-|                |    - VPP 2n-skx NFV NDRPDR 64b and IMIX                    |
-|                |                                                            |
-|                | 2. Added Soak tests                                        |
-|                |                                                            |
-+----------------+------------------------------------------------------------+
-| .19            | Initial version                                            |
+| .24            | Initial version                                            |
 |                |                                                            |
 +----------------+------------------------------------------------------------+
 
index 8039fb4..4584a15 100644 (file)
@@ -5,7 +5,7 @@ VPP Throughput
 
     ../vpp_performance_configuration_3n_hsw/index
     ../vpp_performance_configuration_3n_skx/index
-    ../vpp_performance_configuration_2n_skx/index
 
 ..
     ../vpp_performance_configuration_2n_dnv/index
+    ../vpp_performance_configuration_2n_skx/index
index e34d08f..ff8009d 100644 (file)
@@ -5,7 +5,7 @@ VPP Throughput
 
     ../vpp_performance_operational_data_3n_hsw/index
     ../vpp_performance_operational_data_3n_skx/index
-    ../vpp_performance_operational_data_2n_skx/index
 
 ..
     ../vpp_performance_operational_data_2n_dnv/index
+    ../vpp_performance_operational_data_2n_skx/index
index 57114cc..c861a9a 100644 (file)
@@ -8,14 +8,6 @@ Changes in |csit-release|
 
    - **Bug fixes**.
 
-#. CSIT TEST MIMGRATION
-
-   - **VPP_Path**: Continuing migration of the original FD.io CSIT VIRL
-     tests to VPP-make_test VPP integration tests for functional
-     acceptance of VPP feature path(s) driven by use case(s). See P1
-     and P2 markup in `CSIT_VIRL migration progress
-     <https://docs.google.com/spreadsheets/d/1PciV8XN9v1qHbIRUpFJoqyES29_vik7lcFDl73G1usc/edit?usp=sharing>`_
-
 Known Issues
 ------------
 
index d8f2abf..b3b857a 100644 (file)
@@ -247,15 +247,15 @@ VPP Installed Packages - Ubuntu
 ::
 
     $ dpkg -l | grep vpp
-    ii  libvppinfra        19.04-release    amd64        Vector Packet Processing--runtime libraries
-    ii  libvppinfra-dev    19.04-release    amd64        Vector Packet Processing--runtime libraries
-    ii  python3-vpp-api    19.04-release    amd64        VPP Python3 API bindings
-    ii  vpp                19.04-release    amd64        Vector Packet Processing--executables
-    ii  vpp-api-python     19.04-release    amd64        VPP Python API bindings
-    ii  vpp-dbg            19.04-release    amd64        Vector Packet Processing--debug symbols
-    ii  vpp-dev            19.04-release    amd64        Vector Packet Processing--development support
-    ii  vpp-plugin-core    19.04-release    amd64        Vector Packet Processing--runtime core plugins
-    ii  vpp-plugin-dpdk    19.04-release    amd64        Vector Packet Processing--runtime dpdk plugin
+    ii  libvppinfra        19.04.1-release    amd64        Vector Packet Processing--runtime libraries
+    ii  libvppinfra-dev    19.04.1-release    amd64        Vector Packet Processing--runtime libraries
+    ii  python3-vpp-api    19.04.1-release    amd64        VPP Python3 API bindings
+    ii  vpp                19.04.1-release    amd64        Vector Packet Processing--executables
+    ii  vpp-api-python     19.04.1-release    amd64        VPP Python API bindings
+    ii  vpp-dbg            19.04.1-release    amd64        Vector Packet Processing--debug symbols
+    ii  vpp-dev            19.04.1-release    amd64        Vector Packet Processing--development support
+    ii  vpp-plugin-core    19.04.1-release    amd64        Vector Packet Processing--runtime core plugins
+    ii  vpp-plugin-dpdk    19.04.1-release    amd64        Vector Packet Processing--runtime dpdk plugin
 
 VPP Installed Packages - Centos
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -264,17 +264,17 @@ VPP Installed Packages - Centos
 
     $ rpm -qai *vpp*
     Name        : vpp-lib
-    Version     : 19.04
+    Version     : 19.04.1
     Release     : release
     Architecture: x86_64
-    Install Date: Thu 25 Apr 2019 04:14:51 AM EDT
+    Install Date: Fri 07 Jun 2019 04:19:08 AM EDT
     Group       : System Environment/Libraries
-    Size        : 39543181
+    Size        : 39668077
     License     : ASL 2.0
     Signature   : (none)
-    Source RPM  : vpp-19.04-release.src.rpm
-    Build Date  : Tue 23 Apr 2019 08:46:26 PM EDT
-    Build Host  : 940fc1a9327e
+    Source RPM  : vpp-19.04.1-release.src.rpm
+    Build Date  : Fri 31 May 2019 12:46:18 PM EDT
+    Build Host  : 8e0d50f37e2b
     Relocations : (not relocatable)
     Summary     : VPP libraries
     Description :
@@ -285,17 +285,17 @@ VPP Installed Packages - Centos
     vlib-api - binary API library
     vnet -  network stack library
     Name        : vpp-devel
-    Version     : 19.04
+    Version     : 19.04.1
     Release     : release
     Architecture: x86_64
-    Install Date: Thu 25 Apr 2019 04:14:52 AM EDT
+    Install Date: Fri 07 Jun 2019 04:19:10 AM EDT
     Group       : Development/Libraries
-    Size        : 12701413
+    Size        : 12702385
     License     : ASL 2.0
     Signature   : (none)
-    Source RPM  : vpp-19.04-release.src.rpm
-    Build Date  : Tue 23 Apr 2019 08:46:26 PM EDT
-    Build Host  : 940fc1a9327e
+    Source RPM  : vpp-19.04.1-release.src.rpm
+    Build Date  : Fri 31 May 2019 12:46:18 PM EDT
+    Build Host  : 8e0d50f37e2b
     Relocations : (not relocatable)
     Summary     : VPP header files, static libraries
     Description :
@@ -308,65 +308,65 @@ VPP Installed Packages - Centos
     vpp-api
     vppinfra
     Name        : vpp-selinux-policy
-    Version     : 19.04
+    Version     : 19.04.1
     Release     : release
     Architecture: x86_64
-    Install Date: Thu 25 Apr 2019 04:14:49 AM EDT
+    Install Date: Fri 07 Jun 2019 04:19:07 AM EDT
     Group       : System Environment/Base
     Size        : 102155
     License     : ASL 2.0
     Signature   : (none)
-    Source RPM  : vpp-19.04-release.src.rpm
-    Build Date  : Tue 23 Apr 2019 08:46:26 PM EDT
-    Build Host  : 940fc1a9327e
+    Source RPM  : vpp-19.04.1-release.src.rpm
+    Build Date  : Fri 31 May 2019 12:46:18 PM EDT
+    Build Host  : 8e0d50f37e2b
     Relocations : (not relocatable)
     Summary     : VPP Security-Enhanced Linux (SELinux) policy
     Description :
     This package contains a tailored VPP SELinux policy
     Name        : vpp-plugins
-    Version     : 19.04
+    Version     : 19.04.1
     Release     : release
     Architecture: x86_64
-    Install Date: Thu 25 Apr 2019 04:14:51 AM EDT
+    Install Date: Fri 07 Jun 2019 04:19:10 AM EDT
     Group       : System Environment/Libraries
-    Size        : 22696981
+    Size        : 22767029
     License     : ASL 2.0
     Signature   : (none)
-    Source RPM  : vpp-19.04-release.src.rpm
-    Build Date  : Tue 23 Apr 2019 08:46:26 PM EDT
-    Build Host  : 940fc1a9327e
+    Source RPM  : vpp-19.04.1-release.src.rpm
+    Build Date  : Fri 31 May 2019 12:46:18 PM EDT
+    Build Host  : 8e0d50f37e2b
     Relocations : (not relocatable)
     Summary     : Vector Packet Processing--runtime plugins
     Description :
     This package contains VPP plugins
     Name        : vpp-api-python
-    Version     : 19.04
+    Version     : 19.04.1
     Release     : release
     Architecture: x86_64
-    Install Date: Thu 25 Apr 2019 04:14:51 AM EDT
+    Install Date: Fri 07 Jun 2019 04:19:09 AM EDT
     Group       : Development/Libraries
     Size        : 164979
     License     : ASL 2.0
     Signature   : (none)
-    Source RPM  : vpp-19.04-release.src.rpm
-    Build Date  : Tue 23 Apr 2019 08:46:26 PM EDT
-    Build Host  : 940fc1a9327e
+    Source RPM  : vpp-19.04.1-release.src.rpm
+    Build Date  : Fri 31 May 2019 12:46:18 PM EDT
+    Build Host  : 8e0d50f37e2b
     Relocations : (not relocatable)
     Summary     : VPP api python bindings
     Description :
     This package contains the python bindings for the vpp api
     Name        : vpp
-    Version     : 19.04
+    Version     : 19.04.1
     Release     : release
     Architecture: x86_64
-    Install Date: Thu 25 Apr 2019 04:14:51 AM EDT
+    Install Date: Fri 07 Jun 2019 04:19:08 AM EDT
     Group       : Unspecified
-    Size        : 2496078
+    Size        : 2496102
     License     : ASL 2.0
     Signature   : (none)
-    Source RPM  : vpp-19.04-release.src.rpm
-    Build Date  : Tue 23 Apr 2019 08:46:26 PM EDT
-    Build Host  : 940fc1a9327e
+    Source RPM  : vpp-19.04.1-release.src.rpm
+    Build Date  : Fri 31 May 2019 12:46:18 PM EDT
+    Build Host  : 8e0d50f37e2b
     Relocations : (not relocatable)
     Summary     : Vector Packet Processing
     Description :
index ecc2c98..e13cac3 100644 (file)
@@ -53,17 +53,18 @@ Comparison tables in ASCII and CSV formats:
   - `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
-``````````````
+..
+    MRR Comparison
+    ``````````````
 
-Comparison tables in ASCII and CSV formats:
+    Comparison tables in ASCII and CSV formats:
 
-  - `ASCII 1t1c MRR comparison <../../_static/vpp/performance-changes-3n-hsw-1t1c-mrr.txt>`_
-  - `ASCII 2t2c MRR comparison <../../_static/vpp/performance-changes-3n-hsw-2t2c-mrr.txt>`_
-  - `ASCII 4t4c MRR comparison <../../_static/vpp/performance-changes-3n-hsw-4t4c-mrr.txt>`_
-  - `CSV 1t1c MRR comparison <../../_static/vpp/performance-changes-3n-hsw-1t1c-mrr.csv>`_
-  - `CSV 2t2c MRR comparison <../../_static/vpp/performance-changes-3n-hsw-2t2c-mrr.csv>`_
-  - `CSV 4t4c MRR comparison <../../_static/vpp/performance-changes-3n-hsw-4t4c-mrr.csv>`_
+      - `ASCII 1t1c MRR comparison <../../_static/vpp/performance-changes-3n-hsw-1t1c-mrr.txt>`_
+      - `ASCII 2t2c MRR comparison <../../_static/vpp/performance-changes-3n-hsw-2t2c-mrr.txt>`_
+      - `ASCII 4t4c MRR comparison <../../_static/vpp/performance-changes-3n-hsw-4t4c-mrr.txt>`_
+      - `CSV 1t1c MRR comparison <../../_static/vpp/performance-changes-3n-hsw-1t1c-mrr.csv>`_
+      - `CSV 2t2c MRR comparison <../../_static/vpp/performance-changes-3n-hsw-2t2c-mrr.csv>`_
+      - `CSV 4t4c MRR comparison <../../_static/vpp/performance-changes-3n-hsw-4t4c-mrr.csv>`_
 
 3n-skx
 ~~~~~~
@@ -88,55 +89,21 @@ Comparison tables in ASCII and CSV formats:
   - `CSV 2t1c PDR comparison <../../_static/vpp/performance-changes-3n-skx-2t1c-pdr.csv>`_
   - `CSV 4t2c PDR comparison <../../_static/vpp/performance-changes-3n-skx-4t2c-pdr.csv>`_
 
-MRR Comparison
-``````````````
-
-Comparison tables in ASCII and CSV formats:
-
-  - `ASCII 2t1c MRR comparison <../../_static/vpp/performance-changes-3n-skx-2t1c-mrr.txt>`_
-  - `ASCII 4t2c MRR comparison <../../_static/vpp/performance-changes-3n-skx-4t2c-mrr.txt>`_
-  - `ASCII 8t4c MRR comparison <../../_static/vpp/performance-changes-3n-skx-8t4c-mrr.txt>`_
-  - `CSV 2t1c MRR comparison <../../_static/vpp/performance-changes-3n-skx-2t1c-mrr.csv>`_
-  - `CSV 4t2c MRR comparison <../../_static/vpp/performance-changes-3n-skx-4t2c-mrr.csv>`_
-  - `CSV 8t4c MRR comparison <../../_static/vpp/performance-changes-3n-skx-8t4c-mrr.csv>`_
-
-2n-skx
-~~~~~~
-
-NDR Comparison
-``````````````
-
-Comparison tables in ASCII and CSV formats:
-
-  - `ASCII 2t1c NDR comparison <../../_static/vpp/performance-changes-2n-skx-2t1c-ndr.txt>`_
-  - `ASCII 4t2c NDR comparison <../../_static/vpp/performance-changes-2n-skx-4t2c-ndr.txt>`_
-  - `CSV 2t1c NDR comparison <../../_static/vpp/performance-changes-2n-skx-2t1c-ndr.csv>`_
-  - `CSV 4t2c NDR comparison <../../_static/vpp/performance-changes-2n-skx-4t2c-ndr.csv>`_
-
-PDR Comparison
-``````````````
-
-Comparison tables in ASCII and CSV formats:
-
-  - `ASCII 2t1c PDR comparison <../../_static/vpp/performance-changes-2n-skx-2t1c-pdr.txt>`_
-  - `ASCII 4t2c PDR comparison <../../_static/vpp/performance-changes-2n-skx-4t2c-pdr.txt>`_
-  - `CSV 2t1c PDR comparison <../../_static/vpp/performance-changes-2n-skx-2t1c-pdr.csv>`_
-  - `CSV 4t2c PDR comparison <../../_static/vpp/performance-changes-2n-skx-4t2c-pdr.csv>`_
-
-MRR Comparison
-``````````````
+..
+    MRR Comparison
+    ``````````````
 
-Comparison tables in ASCII and CSV formats:
+    Comparison tables in ASCII and CSV formats:
 
-  - `ASCII 2t1c MRR comparison <../../_static/vpp/performance-changes-2n-skx-2t1c-mrr.txt>`_
-  - `ASCII 4t2c MRR comparison <../../_static/vpp/performance-changes-2n-skx-4t2c-mrr.txt>`_
-  - `ASCII 8t4c MRR comparison <../../_static/vpp/performance-changes-2n-skx-8t4c-mrr.txt>`_
-  - `CSV 2t1c MRR comparison <../../_static/vpp/performance-changes-2n-skx-2t1c-mrr.csv>`_
-  - `CSV 4t2c MRR comparison <../../_static/vpp/performance-changes-2n-skx-4t2c-mrr.csv>`_
-  - `CSV 8t4c MRR comparison <../../_static/vpp/performance-changes-2n-skx-8t4c-mrr.csv>`_
+      - `ASCII 2t1c MRR comparison <../../_static/vpp/performance-changes-3n-skx-2t1c-mrr.txt>`_
+      - `ASCII 4t2c MRR comparison <../../_static/vpp/performance-changes-3n-skx-4t2c-mrr.txt>`_
+      - `ASCII 8t4c MRR comparison <../../_static/vpp/performance-changes-3n-skx-8t4c-mrr.txt>`_
+      - `CSV 2t1c MRR comparison <../../_static/vpp/performance-changes-3n-skx-2t1c-mrr.csv>`_
+      - `CSV 4t2c MRR comparison <../../_static/vpp/performance-changes-3n-skx-4t2c-mrr.csv>`_
+      - `CSV 8t4c MRR comparison <../../_static/vpp/performance-changes-3n-skx-8t4c-mrr.csv>`_
 
 ..
-    2n-dnv
+    2n-skx
     ~~~~~~
 
     NDR Comparison
@@ -144,29 +111,29 @@ Comparison tables in ASCII and CSV formats:
 
     Comparison tables in ASCII and CSV formats:
 
-      - `ASCII 1t1c NDR comparison <../../_static/vpp/performance-changes-2n-dnv-1t1c-ndr.txt>`_
-      - `ASCII 2t2c NDR comparison <../../_static/vpp/performance-changes-2n-dnv-2t2c-ndr.txt>`_
-      - `CSV 1t1c NDR comparison <../../_static/vpp/performance-changes-2n-dnv-1t1c-ndr.csv>`_
-      - `CSV 2t2c NDR comparison <../../_static/vpp/performance-changes-2n-dnv-2t2c-ndr.csv>`_
+      - `ASCII 2t1c NDR comparison <../../_static/vpp/performance-changes-2n-skx-2t1c-ndr.txt>`_
+      - `ASCII 4t2c NDR comparison <../../_static/vpp/performance-changes-2n-skx-4t2c-ndr.txt>`_
+      - `CSV 2t1c NDR comparison <../../_static/vpp/performance-changes-2n-skx-2t1c-ndr.csv>`_
+      - `CSV 4t2c NDR comparison <../../_static/vpp/performance-changes-2n-skx-4t2c-ndr.csv>`_
 
     PDR Comparison
     ``````````````
 
     Comparison tables in ASCII and CSV formats:
 
-      - `ASCII 1t1c PDR comparison <../../_static/vpp/performance-changes-2n-dnv-1t1c-pdr.txt>`_
-      - `ASCII 2t2c PDR comparison <../../_static/vpp/performance-changes-2n-dnv-2t2c-pdr.txt>`_
-      - `CSV 1t1c PDR comparison <../../_static/vpp/performance-changes-2n-dnv-1t1c-pdr.csv>`_
-      - `CSV 2t2c PDR comparison <../../_static/vpp/performance-changes-2n-dnv-2t2c-pdr.csv>`_
+      - `ASCII 2t1c PDR comparison <../../_static/vpp/performance-changes-2n-skx-2t1c-pdr.txt>`_
+      - `ASCII 4t2c PDR comparison <../../_static/vpp/performance-changes-2n-skx-4t2c-pdr.txt>`_
+      - `CSV 2t1c PDR comparison <../../_static/vpp/performance-changes-2n-skx-2t1c-pdr.csv>`_
+      - `CSV 4t2c PDR comparison <../../_static/vpp/performance-changes-2n-skx-4t2c-pdr.csv>`_
 
     MRR Comparison
     ``````````````
 
     Comparison tables in ASCII and CSV formats:
 
-      - `ASCII 1t1c MRR comparison <../../_static/vpp/performance-changes-2n-dnv-1t1c-mrr.txt>`_
-      - `ASCII 2t2c MRR comparison <../../_static/vpp/performance-changes-2n-dnv-2t2c-mrr.txt>`_
-      - `ASCII 4t4c MRR comparison <../../_static/vpp/performance-changes-2n-dnv-4t4c-mrr.txt>`_
-      - `CSV 1t1c MRR comparison <../../_static/vpp/performance-changes-2n-dnv-1t1c-mrr.csv>`_
-      - `CSV 2t2c MRR comparison <../../_static/vpp/performance-changes-2n-dnv-2t2c-mrr.csv>`_
-      - `CSV 4t4c MRR comparison <../../_static/vpp/performance-changes-2n-dnv-4t4c-mrr.csv>`_
+      - `ASCII 2t1c MRR comparison <../../_static/vpp/performance-changes-2n-skx-2t1c-mrr.txt>`_
+      - `ASCII 4t2c MRR comparison <../../_static/vpp/performance-changes-2n-skx-4t2c-mrr.txt>`_
+      - `ASCII 8t4c MRR comparison <../../_static/vpp/performance-changes-2n-skx-8t4c-mrr.txt>`_
+      - `CSV 2t1c MRR comparison <../../_static/vpp/performance-changes-2n-skx-2t1c-mrr.csv>`_
+      - `CSV 4t2c MRR comparison <../../_static/vpp/performance-changes-2n-skx-4t2c-mrr.csv>`_
+      - `CSV 8t4c MRR comparison <../../_static/vpp/performance-changes-2n-skx-8t4c-mrr.csv>`_
index 1ce9427..2664bb9 100644 (file)
@@ -11,7 +11,9 @@ Comparisons
 .. toctree::
 
     current_vs_previous_release
+
+..
     3n-skx_vs_3n-hsw_testbeds
     3n-skx_vs_2n-skx_testbeds
     nic_comparison
-    soak_vs_ndr
+
index 6db2756..4b288da 100644 (file)
@@ -29,40 +29,41 @@ 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 Intel-x520 and Intel-x710 comparison <../../_static/vpp/performance-changes-3n-hsw-1t1c-nics-ndr.txt>`_
-  - `ASCII 2t2c NDR Intel-x520 and Intel-x710 comparison <../../_static/vpp/performance-changes-3n-hsw-2t2c-nics-ndr.txt>`_
-  - `CSV 1t1c NDR Intel-x520 and Intel-x710 comparison <../../_static/vpp/performance-changes-3n-hsw-1t1c-nics-ndr.csv>`_
-  - `CSV 2t2c NDR Intel-x520 and Intel-x710 comparison <../../_static/vpp/performance-changes-3n-hsw-2t2c-nics-ndr.csv>`_
+      - `ASCII 1t1c NDR Intel-x520 and Intel-x710 comparison <../../_static/vpp/performance-changes-3n-hsw-1t1c-nics-ndr.txt>`_
+      - `ASCII 2t2c NDR Intel-x520 and Intel-x710 comparison <../../_static/vpp/performance-changes-3n-hsw-2t2c-nics-ndr.txt>`_
+      - `CSV 1t1c NDR Intel-x520 and Intel-x710 comparison <../../_static/vpp/performance-changes-3n-hsw-1t1c-nics-ndr.csv>`_
+      - `CSV 2t2c NDR Intel-x520 and Intel-x710 comparison <../../_static/vpp/performance-changes-3n-hsw-2t2c-nics-ndr.csv>`_
 
-PDR Comparison
-``````````````
+    PDR Comparison
+    ``````````````
 
-Comparison tables in ASCII and CSV formats:
+    Comparison tables in ASCII and CSV formats:
 
-  - `ASCII 1t1c PDR Intel-x520 and Intel-x710 comparison <../../_static/vpp/performance-changes-3n-hsw-1t1c-nics-pdr.txt>`_
-  - `ASCII 2t2c PDR Intel-x520 and Intel-x710 comparison <../../_static/vpp/performance-changes-3n-hsw-2t2c-nics-pdr.txt>`_
-  - `CSV 1t1c PDR Intel-x520 and Intel-x710 comparison <../../_static/vpp/performance-changes-3n-hsw-1t1c-nics-pdr.csv>`_
-  - `CSV 2t2c PDR Intel-x520 and Intel-x710 comparison <../../_static/vpp/performance-changes-3n-hsw-2t2c-nics-pdr.csv>`_
+      - `ASCII 1t1c PDR Intel-x520 and Intel-x710 comparison <../../_static/vpp/performance-changes-3n-hsw-1t1c-nics-pdr.txt>`_
+      - `ASCII 2t2c PDR Intel-x520 and Intel-x710 comparison <../../_static/vpp/performance-changes-3n-hsw-2t2c-nics-pdr.txt>`_
+      - `CSV 1t1c PDR Intel-x520 and Intel-x710 comparison <../../_static/vpp/performance-changes-3n-hsw-1t1c-nics-pdr.csv>`_
+      - `CSV 2t2c PDR Intel-x520 and Intel-x710 comparison <../../_static/vpp/performance-changes-3n-hsw-2t2c-nics-pdr.csv>`_
 
-MRR Comparison
-``````````````
+    MRR Comparison
+    ``````````````
 
-Comparison tables in ASCII and CSV formats:
+    Comparison tables in ASCII and CSV formats:
 
-  - `ASCII 1t1c MRR Intel-x520 and Intel-x710 comparison <../../_static/vpp/performance-changes-3n-hsw-1t1c-nics-mrr.txt>`_
-  - `ASCII 2t2c MRR Intel-x520 and Intel-x710 comparison <../../_static/vpp/performance-changes-3n-hsw-2t2c-nics-mrr.txt>`_
-  - `ASCII 4t4c MRR Intel-x520 and Intel-x710 comparison <../../_static/vpp/performance-changes-3n-hsw-4t4c-nics-mrr.txt>`_
-  - `CSV 1t1c MRR Intel-x520 and Intel-x710 comparison <../../_static/vpp/performance-changes-3n-hsw-1t1c-nics-mrr.csv>`_
-  - `CSV 2t2c MRR Intel-x520 and Intel-x710 comparison <../../_static/vpp/performance-changes-3n-hsw-2t2c-nics-mrr.csv>`_
-  - `CSV 4t4c MRR Intel-x520 and Intel-x710 comparison <../../_static/vpp/performance-changes-3n-hsw-4t4c-nics-mrr.csv>`_
+      - `ASCII 1t1c MRR Intel-x520 and Intel-x710 comparison <../../_static/vpp/performance-changes-3n-hsw-1t1c-nics-mrr.txt>`_
+      - `ASCII 2t2c MRR Intel-x520 and Intel-x710 comparison <../../_static/vpp/performance-changes-3n-hsw-2t2c-nics-mrr.txt>`_
+      - `ASCII 4t4c MRR Intel-x520 and Intel-x710 comparison <../../_static/vpp/performance-changes-3n-hsw-4t4c-nics-mrr.txt>`_
+      - `CSV 1t1c MRR Intel-x520 and Intel-x710 comparison <../../_static/vpp/performance-changes-3n-hsw-1t1c-nics-mrr.csv>`_
+      - `CSV 2t2c MRR Intel-x520 and Intel-x710 comparison <../../_static/vpp/performance-changes-3n-hsw-2t2c-nics-mrr.csv>`_
+      - `CSV 4t4c MRR Intel-x520 and Intel-x710 comparison <../../_static/vpp/performance-changes-3n-hsw-4t4c-nics-mrr.csv>`_
 
 3n-skx
 ~~~~~~
@@ -87,49 +88,51 @@ Comparison tables in ASCII and CSV formats:
   - `CSV 2t1c PDR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-3n-skx-2t1c-nics-pdr.csv>`_
   - `CSV 4t2c PDR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-3n-skx-4t2c-nics-pdr.csv>`_
 
-MRR Comparison
-``````````````
+..
+    MRR Comparison
+    ``````````````
 
-Comparison tables in ASCII and CSV formats:
+    Comparison tables in ASCII and CSV formats:
 
-  - `ASCII 2t1c MRR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-3n-skx-2t1c-nics-mrr.txt>`_
-  - `ASCII 4t2c MRR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-3n-skx-4t2c-nics-mrr.txt>`_
-  - `ASCII 8t4c MRR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-3n-skx-8t4c-nics-mrr.txt>`_
-  - `CSV 2t1c MRR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-3n-skx-2t1c-nics-mrr.csv>`_
-  - `CSV 4t2c MRR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-3n-skx-4t2c-nics-mrr.csv>`_
-  - `CSV 8t4c MRR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-3n-skx-8t4c-nics-mrr.csv>`_
+      - `ASCII 2t1c MRR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-3n-skx-2t1c-nics-mrr.txt>`_
+      - `ASCII 4t2c MRR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-3n-skx-4t2c-nics-mrr.txt>`_
+      - `ASCII 8t4c MRR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-3n-skx-8t4c-nics-mrr.txt>`_
+      - `CSV 2t1c MRR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-3n-skx-2t1c-nics-mrr.csv>`_
+      - `CSV 4t2c MRR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-3n-skx-4t2c-nics-mrr.csv>`_
+      - `CSV 8t4c MRR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-3n-skx-8t4c-nics-mrr.csv>`_
 
-2n-skx
-~~~~~~
+..
+    2n-skx
+    ~~~~~~
 
-NDR Comparison
-``````````````
+    NDR Comparison
+    ``````````````
 
-Comparison tables in ASCII and CSV formats:
+    Comparison tables in ASCII and CSV formats:
 
-  - `ASCII 2t1c NDR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-2n-skx-2t1c-nics-ndr.txt>`_
-  - `ASCII 4t2c NDR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-2n-skx-4t2c-nics-ndr.txt>`_
-  - `CSV 2t1c NDR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-2n-skx-2t1c-nics-ndr.csv>`_
-  - `CSV 4t2c NDR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-2n-skx-4t2c-nics-ndr.csv>`_
+      - `ASCII 2t1c NDR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-2n-skx-2t1c-nics-ndr.txt>`_
+      - `ASCII 4t2c NDR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-2n-skx-4t2c-nics-ndr.txt>`_
+      - `CSV 2t1c NDR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-2n-skx-2t1c-nics-ndr.csv>`_
+      - `CSV 4t2c NDR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-2n-skx-4t2c-nics-ndr.csv>`_
 
-PDR Comparison
-``````````````
+    PDR Comparison
+    ``````````````
 
-Comparison tables in ASCII and CSV formats:
+    Comparison tables in ASCII and CSV formats:
 
-  - `ASCII 2t1c PDR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-2n-skx-2t1c-nics-pdr.txt>`_
-  - `ASCII 4t2c PDR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-2n-skx-4t2c-nics-pdr.txt>`_
-  - `CSV 2t1c PDR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-2n-skx-2t1c-nics-pdr.csv>`_
-  - `CSV 4t2c PDR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-2n-skx-4t2c-nics-pdr.csv>`_
+      - `ASCII 2t1c PDR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-2n-skx-2t1c-nics-pdr.txt>`_
+      - `ASCII 4t2c PDR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-2n-skx-4t2c-nics-pdr.txt>`_
+      - `CSV 2t1c PDR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-2n-skx-2t1c-nics-pdr.csv>`_
+      - `CSV 4t2c PDR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-2n-skx-4t2c-nics-pdr.csv>`_
 
-MRR Comparison
-``````````````
+    MRR Comparison
+    ``````````````
 
-Comparison tables in ASCII and CSV formats:
+    Comparison tables in ASCII and CSV formats:
 
-  - `ASCII 2t1c MRR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-2n-skx-2t1c-nics-mrr.txt>`_
-  - `ASCII 4t2c MRR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-2n-skx-4t2c-nics-mrr.txt>`_
-  - `ASCII 8t4c MRR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-2n-skx-8t4c-nics-mrr.txt>`_
-  - `CSV 2t1c MRR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-2n-skx-2t1c-nics-mrr.csv>`_
-  - `CSV 4t2c MRR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-2n-skx-4t2c-nics-mrr.csv>`_
-  - `CSV 8t4c MRR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-2n-skx-8t4c-nics-mrr.csv>`_
+      - `ASCII 2t1c MRR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-2n-skx-2t1c-nics-mrr.txt>`_
+      - `ASCII 4t2c MRR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-2n-skx-4t2c-nics-mrr.txt>`_
+      - `ASCII 8t4c MRR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-2n-skx-8t4c-nics-mrr.txt>`_
+      - `CSV 2t1c MRR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-2n-skx-2t1c-nics-mrr.csv>`_
+      - `CSV 4t2c MRR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-2n-skx-4t2c-nics-mrr.csv>`_
+      - `CSV 8t4c MRR Intel-x710 and Intel-xxv710 comparison <../../_static/vpp/performance-changes-2n-skx-8t4c-nics-mrr.csv>`_
index 74ab680..6cf529e 100644 (file)
@@ -1,60 +1,60 @@
 Release Notes
 =============
 
-Changes in |csit-release|
--------------------------
-
-#. VPP PERFORMANCE TESTS
-
-   - **Service density 2n-skx tests**: Added higher NF density tests with two
-     NFs' data-plane threads sharing a physical core. VPP IPv4 routing is now
-     used as a VNF payload similar to CNF tests.
+..
+    Changes in |csit-release|
+    -------------------------
 
-   - **Soak Tests**: Optimized performamce soak tests framework
-     code for extended time duration tests and throughput discovery
-     at given PLR and at give total test time e.g. minutes, hours,
-     days, weeks. See updated
-     :ref:`test_methodology` section for more details.
+    #. VPP PERFORMANCE TESTS
 
-#. TEST FRAMEWORK
+       - **Service density 2n-skx tests**: Network Function Virtualization (NFV)
+         service density tests focus on measuring total per server throughput at
+         varied NFV service *packing* densities with vswitch providing host
+         dataplane. The goal is to compare and contrast performance of a shared
+         vswitch for different network topologies and virtualization technologies,
+         and their impact on vswitch performance and efficiency in a range of NFV
+         service configurations.
 
-   - **Qemu code refactor**: Complete code refactor of the key components of
-     QemuUtil.py and QemuManager.py (L1 and L2 KW counterparts). Added
-     implementation of kernel-image-kvm based VM replacing the previously used
-     NestedVM images. Added ability to run VPP as a payload in VNF.
+       - **Experimental Soak Tests**: Added performamce soak tests framework
+         code for extended time duration tests and throughput discovery
+         at given PLR and at give total test time e.g. minutes, hours,
+         days, weeks, months, years. See updated
+         :ref:`test_methodology` section for more details.
 
-   - **CSIT PAPI Support**: Continued conversion of CSIT VAT L1 keywords to
-     PAPI L1 KWs in CSIT using VPP Python bindings. Redesign of key components
-     of PAPI Executor and PAPI history.
+    #. TEST FRAMEWORK
 
-   - **General Code Housekeeping**: Ongoing RF keywords optimizations,
-     removal of redundant RF keywords.
+       - **Container code optimizations**: Optimized container library allows to
+         run containre_memif tests faster.
 
-   - **Test suite generator**: Added capability to generate suites for
-     different NIC models as well as throughput search algorithm types. Uses
-     base tests suites as source.
+       - **CSIT PAPI Support**: Continue converting existing VAT L1 keywords to
+         PAPI L1 KWs in CSIT using VPP Python bindings. Required for migrating away
+         from VAT.
 
-   - **TOX verification**: Added verifications for test suite generator.
+       - **General Code Housekeeping**: Ongoing RF keywords optimizations,
+         removal of redundant RF keywords.
 
-#. PRESENTATION AND ANALYTICS LAYER
+    #. PRESENTATION AND ANALYTICS LAYER
 
-   - **Graphs Layout Improvements**: Improved performance graphs layout
-     for better readibility and maintenance: test grouping, axis
-     labels, descriptions, other informative decoration.
+       - **Graphs Layout Improvements**: Improved performance graphs layout
+         for better readibility and maintenance: test grouping, axis
+         labels, descriptions, other informative decoration.
 
-..
     #. MISCELLANEOUS
 
-       - **2n-dnv Tests (3rd Party)**: Published performance tests for 2n-
-         dnv (2-Node Atom Denverton) from 3rd party testbeds running FD.io
+       - **3n-dnv Tests (3rd Party)**: Published performance tests for 3n-
+         dnv (3-Node Atom Denverton) from 3rd party testbeds running FD.io
          |csit-release| automated testing code.
          Only graphs for Packet Throughput and Speedup Multi-core and not
          for Packet Latency were published as there are no results for Packet
          Latency available.
 
-.. raw:: latex
+.. note::
 
-    \clearpage
+    |csit-release| report was generated with a single run of selected
+    64B frame performance tests on 3n-hsw and 3n-skx test beds
+    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.
 
 .. _vpp_known_issues:
 
@@ -63,30 +63,15 @@ Known Issues
 
 List of known issues in |csit-release| for VPP performance tests:
 
-+----+-----------------------------------------+----------------------------------------------------------------------------------------------------------+
-| #  | JiraID                                  | Issue Description                                                                                        |
-+====+=========================================+==========================================================================================================+
-| 1  | `CSIT-570                               | Sporadic (1 in 200) NDR discovery test failures on x520. DPDK reporting rx-errors, indicating L1 issue.  |
-|    | <https://jira.fd.io/browse/CSIT-570>`_  | Suspected issue with HW combination of X710-X520 in LF testbeds. Not observed outside of LF testbeds.    |
-+----+-----------------------------------------+----------------------------------------------------------------------------------------------------------+
-| 2  | `CSIT-1503                              | [`TRex-519 <https://trex-tgn.cisco.com/youtrack/issue/trex-519>`_] XL710/XXV710 with FW 6.0.1 will have  |
-|    | <https://jira.fd.io/browse/CSIT-1503>`_ | Rx drop rate of 27MPPS.                                                                                  |
-+----+-----------------------------------------+----------------------------------------------------------------------------------------------------------+
-| 3  | `CSIT-1501                              | Sporadic crypto backend fails loading `VPP-1670 <https://jira.fd.io/browse/VPP-1670>`_                   |
-|    | <https://jira.fd.io/browse/CSIT-1501>`_ |                                                                                                          |
-+----+-----------------------------------------+----------------------------------------------------------------------------------------------------------+
-| 4  | `CSIT-1427                              | Sporadic HW aes-128-cbc-sha1 tunnel-interface tests are failing.                                         |
-|    | <https://jira.fd.io/browse/CSIT-1427>`_ | `VPP-1671 <https://jira.fd.io/browse/VPP-1671>`_                                                         |
-+----+-----------------------------------------+----------------------------------------------------------------------------------------------------------+
-| 5  | `CSIT-1498                              | Memif tests are sporadically failing on initialization of memif connection.                              |
-|    | <https://jira.fd.io/browse/CSIT-1498>`_ |                                                                                                          |
-+----+-----------------------------------------+----------------------------------------------------------------------------------------------------------+
-| 6  | `CSIT-1499                              | AVF tests are sporadically failing on initialization of AVF interface.                                   |
-|    | <https://jira.fd.io/browse/CSIT-1499>`_ |                                                                                                          |
-+----+-----------------------------------------+----------------------------------------------------------------------------------------------------------+
-| 7  | `VPP-1676                               | 9000B ip4 memif errors - ip4-input: ip4 length > l2 length.                                              |
-|    | <https://jira.fd.io/browse/VPP-1676>`_  | IP4 jumbo frames (9000B) are dropped in case of tests with memif.                                        |
-+----+-----------------------------------------+----------------------------------------------------------------------------------------------------------+
-| 8  | `VPP-1677                               | 9000B ip4 nat44: VPP crash + coredump.                                                                   |
-|    | <https://jira.fd.io/browse/VPP-1677>`_  | VPP crashes very often in case that NAT44 is configured and it has to process IP4 jumbo frames (9000B).  |
-+----+-----------------------------------------+----------------------------------------------------------------------------------------------------------+
++----+-----------------------------------------+---------------------------------------------------------------------------------------------------------------------------------+
+| #  | JiraID                                  | Issue Description                                                                                                               |
++====+=========================================+=================================================================================================================================+
+| 1  | `CSIT-570                               | Sporadic (1 in 200) NDR discovery test failures on x520. DPDK reporting rx-errors, indicating L1 issue.                         |
+|    | <https://jira.fd.io/browse/CSIT-570>`_  | Suspected issue with HW combination of X710-X520 in LF testbeds. Not observed outside of LF testbeds.                           |
++----+-----------------------------------------+---------------------------------------------------------------------------------------------------------------------------------+
+| 2  | `VPP-1563                               | AVF L2patch tests are failing for all packet size and core combination. Reason: null-node blackholed packets in show error.     |
+|    | <https://jira.fd.io/browse/VPP-1563>`_  |                                                                                                                                 |
++----+-----------------------------------------+---------------------------------------------------------------------------------------------------------------------------------+
+| 3  | `CSIT-1465                              | 4c VPP VM vhost tests failiing on 3n-skx                                                                                        |
+|    | <https://jira.fd.io/browse/CSIT-1465>`_ |                                                                                                                                 |
++----+-----------------------------------------+---------------------------------------------------------------------------------------------------------------------------------+
index e33c37d..c681364 100644 (file)
@@ -8,8 +8,6 @@ VPP Performance
     packet_throughput_graphs/index
     throughput_speedup_multi_core/index
     packet_latency_graphs/index
-    soak_tests/index
-    nf_service_density/index
     comparisons/index
     throughput_trending
     test_environment
@@ -17,3 +15,5 @@ VPP Performance
 
 ..
     http_server_performance/index
+    soak_tests/index
+    nf_service_density/index
index 0ffeef5..98872f3 100644 (file)
@@ -17,11 +17,10 @@ CSIT source code for the test cases used for plots can be found in
 
 .. toctree::
 
+    container_memif-3n-skx-x710
+..
     container_memif-3n-hsw-x520
     container_memif-3n-hsw-x710
     container_memif-3n-hsw-xl710
-    container_memif-3n-skx-x710
     container_memif-2n-skx-x710
-
-..
     container_memif-2n-skx-xxv710
index 73798a5..46cac66 100644 (file)
@@ -50,13 +50,13 @@ Additional information about graph data:
     l2
     ip4
     ip6
-    srv6
     ip4_tunnels
-    ip6_tunnels
     vm_vhost
     container_memif
     ipsec
+    srv6
 
 ..
+    ip6_tunnels
     container_orchestrated
     vts
index b523cfd..1c71d99 100644 (file)
@@ -18,8 +18,9 @@ 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-x710
     ip4-3n-hsw-xl710
-    ip4-3n-skx-x710
     ip4-2n-skx-x710
     ip4-2n-skx-xxv710
index 924bf3e..fffea0f 100644 (file)
@@ -17,6 +17,8 @@ CSIT source code for the test cases used for plots can be found in
 
 .. toctree::
 
+    ip4_tunnels-3n-skx-x710
+
+..
     ip4_tunnels-3n-hsw-x520
     ip4_tunnels-3n-hsw-x710
-    ip4_tunnels-3n-skx-x710
index c0de92f..f08bf9e 100644 (file)
@@ -17,10 +17,11 @@ CSIT source code for the test cases used for plots can be found in
 
 .. toctree::
 
+    ip6-3n-skx-x710
+
+..
     ip6-3n-hsw-x520
     ip6-3n-hsw-x710
     ip6-3n-hsw-xl710
-    ip6-3n-skx-x710
-    ip6-3n-skx-xxv710
     ip6-2n-skx-x710
     ip6-2n-skx-xxv710
index 642f995..ac90740 100644 (file)
@@ -44,9 +44,11 @@ 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-x710
     l2-3n-hsw-xl710
-    l2-3n-skx-x710
     l2-3n-skx-xxv710
     l2-2n-skx-x710
     l2-2n-skx-xxv710
index eff6469..36c46b8 100644 (file)
@@ -18,10 +18,10 @@ CSIT source code for the test cases used for plots can be found in
 
 .. toctree::
 
-    vm_vhost-3n-hsw-x520
-    vm_vhost-3n-hsw-x710
     vm_vhost-3n-skx-x710
-    vm_vhost-2n-skx-x710
 
 ..
+    vm_vhost-3n-hsw-x520
+    vm_vhost-3n-hsw-x710
+    vm_vhost-2n-skx-x710
     vm_vhost-2n-skx-xxv710
index a7acf3f..b8b4ea5 100644 (file)
@@ -17,11 +17,11 @@ CSIT source code for the test cases used for plots can be found in
 
 .. toctree::
 
+    container_memif-3n-skx-x710
+
+..
     container_memif-3n-hsw-x520
     container_memif-3n-hsw-x710
     container_memif-3n-hsw-xl710
-    container_memif-3n-skx-x710
     container_memif-2n-skx-x710
-
-..
     container_memif-2n-skx-xxv710
index 48f66d1..252f670 100644 (file)
@@ -60,13 +60,13 @@ Additional information about graph data:
     l2
     ip4
     ip6
-    srv6
     ip4_tunnels
-    ip6_tunnels
     vm_vhost
     container_memif
     ipsec
+    srv6
     vts
 
 ..
+    ip6_tunnels
     container_orchestrated
index 205d2a6..32592d4 100644 (file)
@@ -18,11 +18,11 @@ 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-x710
     ip4-3n-hsw-xl710
-    ip4-3n-skx-x710
     ip4-2n-skx-x710
     ip4-2n-skx-xxv710
-
-..
     ip4-2n-dnv-x553
index 670d580..e441484 100644 (file)
@@ -17,6 +17,8 @@ CSIT source code for the test cases used for plots can be found in
 
 .. toctree::
 
+    ip4_tunnels-3n-skx-x710
+
+..
     ip4_tunnels-3n-hsw-x520
     ip4_tunnels-3n-hsw-x710
-    ip4_tunnels-3n-skx-x710
index 50e9cdc..86320a8 100644 (file)
@@ -17,13 +17,12 @@ CSIT source code for the test cases used for plots can be found in
 
 .. toctree::
 
+    ip6-3n-skx-x710
+
+..
     ip6-3n-hsw-x520
     ip6-3n-hsw-x710
     ip6-3n-hsw-xl710
-    ip6-3n-skx-x710
-    ip6-3n-skx-xxv710
     ip6-2n-skx-x710
     ip6-2n-skx-xxv710
-
-..
     ip6-2n-dnv-x553
index fe09661..2695ffe 100644 (file)
@@ -43,12 +43,12 @@ 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-x710
     l2-3n-hsw-xl710
-    l2-3n-skx-x710
     l2-3n-skx-xxv710
     l2-2n-skx-x710
     l2-2n-skx-xxv710
-
-..
     l2-2n-dnv-x553
index 6cae714..ec356fc 100644 (file)
@@ -20,10 +20,10 @@ CSIT source code for the test cases used for plots can be found in
 
 .. toctree::
 
-    vm_vhost-3n-hsw-x520
-    vm_vhost-3n-hsw-x710
     vm_vhost-3n-skx-x710
-    vm_vhost-2n-skx-x710
 
 ..
+    vm_vhost-3n-hsw-x520
+    vm_vhost-3n-hsw-x710
+    vm_vhost-2n-skx-x710
     vm_vhost-2n-skx-xxv710
index 2713cc6..c9d3eb5 100644 (file)
@@ -19,11 +19,11 @@ CSIT source code for the test cases used for plots can be found in
 
 .. toctree::
 
+    container_memif-3n-skx-x710
+
+..
     container_memif-3n-hsw-x520
     container_memif-3n-hsw-x710
     container_memif-3n-hsw-xl710
-    container_memif-3n-skx-x710
     container_memif-2n-skx-x710
-
-..
     container_memif-2n-skx-xxv710
index f31bfe6..b1b1ebc 100644 (file)
@@ -50,13 +50,13 @@ Additional information about graph data:
     l2
     ip4
     ip6
-    srv6
     ip4_tunnels
-    ip6_tunnels
-    vm_vhost
     container_memif
     ipsec
+    srv6
     vts
 
 ..
+    vm_vhost
+    ip6_tunnels
     container_orchestrated
index 439ed71..1a5d328 100644 (file)
@@ -20,11 +20,12 @@ 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-x710
     ip4-3n-hsw-xl710
     ip4-3n-skx-x710
     ip4-2n-skx-x710
     ip4-2n-skx-xxv710
-
-..
     ip4-2n-dnv-x553
index 574112c..0957953 100644 (file)
@@ -19,6 +19,8 @@ CSIT source code for the test cases used for plots can be found in
 
 .. toctree::
 
+    ip4_tunnels-3n-skx-x710
+
+..
     ip4_tunnels-3n-hsw-x520
     ip4_tunnels-3n-hsw-x710
-    ip4_tunnels-3n-skx-x710
index 23889ed..f5c1efd 100644 (file)
@@ -19,13 +19,12 @@ CSIT source code for the test cases used for plots can be found in
 
 .. toctree::
 
+    ip6-3n-skx-x710
+
+..
     ip6-3n-hsw-x520
     ip6-3n-hsw-x710
     ip6-3n-hsw-xl710
-    ip6-3n-skx-x710
-    ip6-3n-skx-xxv710
     ip6-2n-skx-x710
     ip6-2n-skx-xxv710
-
-..
     ip6-2n-dnv-x553
index da7cbc2..cd78d5a 100644 (file)
@@ -20,12 +20,12 @@ 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-x710
     l2-3n-hsw-xl710
-    l2-3n-skx-x710
     l2-3n-skx-xxv710
     l2-2n-skx-x710
     l2-2n-skx-xxv710
-
-..
     l2-2n-dnv-x553
index ad4e810..2e9b208 100644 (file)
@@ -19,10 +19,10 @@ CSIT source code for the test cases used for plots can be found in
 
 .. toctree::
 
+    vm_vhost-3n-skx-x710
+
+..
     vm_vhost-3n-hsw-x520
     vm_vhost-3n-hsw-x710
     vm_vhost-2n-skx-x710
-
-..
     vm_vhost-2n-skx-xxv710
-    vm_vhost-3n-skx-x710
index ee69545..dc9e6d7 100644 (file)
@@ -45,8 +45,8 @@ source_suffix = ['.rst', '.md']
 master_doc = 'index'
 
 # General information about the project.
-report_week = '23'
-project = u'FD.io CSIT-1904.{week}'.format(week=report_week)
+report_week = '24'
+project = u'FD.io CSIT-1904.1.{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',
+""".format(release='rls1904_1',
            report_week=report_week,
            prev_release='rls1901',
-           srelease='1904',
-           csitrelease='1904',
+           srelease='1904_1',
+           csitrelease='1904.1',
            csit_prev_release='1901',
-           vpprelease='19.04',
+           vpprelease='19.04.1',
            vpp_prev_release='19.01',
            dpdkrelease='19.02',
            sdpdkrelease='1902',
index 795adae..23ffad7 100755 (executable)
@@ -38,7 +38,7 @@ export PYTHONPATH=`pwd`
 python pal.py \
     --specification specification.yaml \
     --release ${RELEASE} \
-    --week "23" \
+    --week "24" \
     --logging INFO \
     --force
 
index 12dda52..9e2edcd 100644 (file)
 
     plot-vpp-throughput-lat-tsa-3n-hsw:
       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
+#        - 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
 
 #    plot-vpp-http-server-performance:
 #      # csit-vpp-perf-verify-1904-3n-hsw:
 
     plot-vpp-throughput-lat-tsa-3n-skx:
       csit-vpp-perf-verify-1904-3n-skx:
-        - 8   # NDRPDR sel
-        - 9   # NDRPDR sel
-        - 10  # NDRPDR sel
-        - 11  # NDRPDR sel
-        - 12  # NDRPDR sel
-        - 14  # NDRPDR sel
-        - 16  # NDRPDR sel
-        - 21  # NDRPDR sel
-        - 23  # NDRPDR sel
-        - 25  # NDRPDR sel
+#        - 8   # NDRPDR sel
+#        - 9   # NDRPDR sel
+#        - 10  # NDRPDR sel
+#        - 11  # NDRPDR sel
+#        - 12  # NDRPDR sel
+#        - 14  # NDRPDR sel
+#        - 16  # NDRPDR sel
+#        - 21  # NDRPDR sel
+#        - 23  # NDRPDR sel
+#        - 25  # NDRPDR sel
+        - 37  # 1904.1 NDRPDR sel
 
     plot-dpdk-throughput-latency-3n-skx:
       csit-dpdk-perf-verify-1904-3n-skx:
 
     # 2n-skx
 
-    plot-vpp-throughput-lat-tsa-2n-skx:
-      csit-vpp-perf-verify-1904-2n-skx:
-        - 12  # NDRPDR sel
-        - 14  # NDRPDR sel
-        - 16  # NDRPDR sel
-        - 17  # NDRPDR sel
-        - 18  # NDRPDR sel
-        - 21  # NDRPDR sel
-        - 27  # NDRPDR sel
-        - 30  # NDRPDR sel
-        - 31  # NDRPDR sel
-        - 32  # NDRPDR sel
-
-    plot-vpp-soak-2n-skx:
-      csit-vpp-perf-verify-1904-2n-skx:
-        - 70  # soak
-        - 71  # soak
-
-    plot-vpp-nfv-2n-skx-ndrpdr-64b:
-      csit-vpp-perf-verify-1904-2n-skx:
-        - 56  # NFV NDRPDR 64b
-        - 59  # NFV NDRPDR 64b
-        - 60  # NFV NDRPDR 64b
-        - 65  # NFV NDRPDR 64b
-        - 68  # NFV NDRPDR 64b
-        - 80  # NFV MRR NDRPDR 64b IMIX
-        - 81  # NFV MRR NDRPDR 64b IMIX
-        - 84  # NFV MRR NDRPDR 64b IMIX
-        - 85  # NFV MRR NDRPDR 64b IMIX
-        - 86  # NFV MRR NDRPDR 64b IMIX
-
-    plot-vpp-nfv-2n-skx-ndrpdr-imix:
-      csit-vpp-perf-verify-1904-2n-skx:
-        - 66  # NFV NDRPDR IMIX
-        - 67  # NFV NDRPDR IMIX
-        - 69  # NFV NDRPDR IMIX
-        - 82  # NFV NDRPDR IMIX
-        - 83  # NFV NDRPDR IMIX
-        - 80  # NFV MRR NDRPDR 64b IMIX
-        - 81  # NFV MRR NDRPDR 64b IMIX
-        - 84  # NFV MRR NDRPDR 64b IMIX
-        - 85  # NFV MRR NDRPDR 64b IMIX
-        - 86  # NFV MRR NDRPDR 64b IMIX
-
-    plot-vpp-nfv-2n-skx-mrr-64b:
-      csit-vpp-perf-verify-1904-2n-skx:
-        - 40  # NFV MRR 64b
-        - 41  # NFV MRR 64b
-        - 42  # NFV MRR 64b
-        - 47  # NFV MRR 64b
-        - 48  # NFV MRR 64b
-        - 80  # NFV MRR NDRPDR 64b IMIX
-        - 81  # NFV MRR NDRPDR 64b IMIX
-        - 84  # NFV MRR NDRPDR 64b IMIX
-        - 85  # NFV MRR NDRPDR 64b IMIX
-        - 86  # NFV MRR NDRPDR 64b IMIX
-
-    plot-vpp-nfv-2n-skx-mrr-imix:
-      csit-vpp-perf-verify-1904-2n-skx:
-        - 49  # NFV MRR IMIX
-        - 50  # NFV MRR IMIX
-        - 51  # NFV MRR IMIX
-        - 54  # NFV MRR IMIX
-        - 55  # NFV MRR IMIX
-        - 80  # NFV MRR NDRPDR 64b IMIX
-        - 81  # NFV MRR NDRPDR 64b IMIX
-        - 84  # NFV MRR NDRPDR 64b IMIX
-        - 85  # NFV MRR NDRPDR 64b IMIX
-        - 86  # NFV MRR NDRPDR 64b IMIX
+#    plot-vpp-throughput-lat-tsa-2n-skx:
+#      csit-vpp-perf-verify-1904-2n-skx:
+#        - 12  # NDRPDR sel
+#        - 14  # NDRPDR sel
+#        - 16  # NDRPDR sel
+#        - 17  # NDRPDR sel
+#        - 18  # NDRPDR sel
+#        - 21  # NDRPDR sel
+#        - 27  # NDRPDR sel
+#        - 30  # NDRPDR sel
+#        - 31  # NDRPDR sel
+#        - 32  # NDRPDR sel
+
+#    plot-vpp-soak-2n-skx:
+#      csit-vpp-perf-verify-1904-2n-skx:
+#        - 70  # soak
+#        - 71  # soak
+
+#    plot-vpp-nfv-2n-skx-ndrpdr-64b:
+#      csit-vpp-perf-verify-1904-2n-skx:
+#        - 56  # NFV NDRPDR 64b
+#        - 59  # NFV NDRPDR 64b
+#        - 60  # NFV NDRPDR 64b
+#        - 65  # NFV NDRPDR 64b
+#        - 68  # NFV NDRPDR 64b
+#        - 80  # NFV MRR NDRPDR 64b IMIX
+#        - 81  # NFV MRR NDRPDR 64b IMIX
+#        - 84  # NFV MRR NDRPDR 64b IMIX
+#        - 85  # NFV MRR NDRPDR 64b IMIX
+#        - 86  # NFV MRR NDRPDR 64b IMIX
+#
+#    plot-vpp-nfv-2n-skx-ndrpdr-imix:
+#      csit-vpp-perf-verify-1904-2n-skx:
+#        - 66  # NFV NDRPDR IMIX
+#        - 67  # NFV NDRPDR IMIX
+#        - 69  # NFV NDRPDR IMIX
+#        - 82  # NFV NDRPDR IMIX
+#        - 83  # NFV NDRPDR IMIX
+#        - 80  # NFV MRR NDRPDR 64b IMIX
+#        - 81  # NFV MRR NDRPDR 64b IMIX
+#        - 84  # NFV MRR NDRPDR 64b IMIX
+#        - 85  # NFV MRR NDRPDR 64b IMIX
+#        - 86  # NFV MRR NDRPDR 64b IMIX
+#
+#    plot-vpp-nfv-2n-skx-mrr-64b:
+#      csit-vpp-perf-verify-1904-2n-skx:
+#        - 40  # NFV MRR 64b
+#        - 41  # NFV MRR 64b
+#        - 42  # NFV MRR 64b
+#        - 47  # NFV MRR 64b
+#        - 48  # NFV MRR 64b
+#        - 80  # NFV MRR NDRPDR 64b IMIX
+#        - 81  # NFV MRR NDRPDR 64b IMIX
+#        - 84  # NFV MRR NDRPDR 64b IMIX
+#        - 85  # NFV MRR NDRPDR 64b IMIX
+#        - 86  # NFV MRR NDRPDR 64b IMIX
+#
+#    plot-vpp-nfv-2n-skx-mrr-imix:
+#      csit-vpp-perf-verify-1904-2n-skx:
+#        - 49  # NFV MRR IMIX
+#        - 50  # NFV MRR IMIX
+#        - 51  # NFV MRR IMIX
+#        - 54  # NFV MRR IMIX
+#        - 55  # NFV MRR IMIX
+#        - 80  # NFV MRR NDRPDR 64b IMIX
+#        - 81  # NFV MRR NDRPDR 64b IMIX
+#        - 84  # NFV MRR NDRPDR 64b IMIX
+#        - 85  # NFV MRR NDRPDR 64b IMIX
+#        - 86  # NFV MRR NDRPDR 64b IMIX
 
     plot-dpdk-throughput-latency-2n-skx:
       csit-dpdk-perf-verify-1904-2n-skx:
 
     # NIC Comparisons
 
-    vpp-nic-comparison-3n-hsw:
-      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
-
-    vpp-nic-comparison-3n-skx:
-      csit-vpp-perf-verify-1904-3n-skx:
-        - 8   # NDRPDR sel
-        - 9   # NDRPDR sel
-        - 10  # NDRPDR sel
-        - 11  # NDRPDR sel
-        - 12  # NDRPDR sel
-        - 14  # NDRPDR sel
-        - 16  # NDRPDR sel
-        - 21  # NDRPDR sel
-        - 23  # NDRPDR sel
-        - 25  # NDRPDR sel
+#    vpp-nic-comparison-3n-hsw:
+#      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
+
+#    vpp-nic-comparison-3n-skx:
+#      csit-vpp-perf-verify-1904-3n-skx:
+#        - 8   # NDRPDR sel
+#        - 9   # NDRPDR sel
+#        - 10  # NDRPDR sel
+#        - 11  # NDRPDR sel
+#        - 12  # NDRPDR sel
+#        - 14  # NDRPDR sel
+#        - 16  # NDRPDR sel
+#        - 21  # NDRPDR sel
+#        - 23  # NDRPDR sel
+#        - 25  # NDRPDR sel
 
-    vpp-nic-comparison-2n-skx:
-      csit-vpp-perf-verify-1904-2n-skx:
-        - 12  # NDRPDR sel
-        - 14  # NDRPDR sel
-        - 16  # NDRPDR sel
-        - 17  # NDRPDR sel
-        - 18  # NDRPDR sel
-        - 21  # NDRPDR sel
-        - 27  # NDRPDR sel
-        - 30  # NDRPDR sel
-        - 31  # NDRPDR sel
-        - 32  # NDRPDR sel
+#    vpp-nic-comparison-2n-skx:
+#      csit-vpp-perf-verify-1904-2n-skx:
+#        - 12  # NDRPDR sel
+#        - 14  # NDRPDR sel
+#        - 16  # NDRPDR sel
+#        - 17  # NDRPDR sel
+#        - 18  # NDRPDR sel
+#        - 21  # NDRPDR sel
+#        - 27  # NDRPDR sel
+#        - 30  # NDRPDR sel
+#        - 31  # NDRPDR sel
+#        - 32  # NDRPDR sel
 
-    vpp-nic-comparison-3n-hsw-mrr:
-      csit-vpp-perf-verify-1904-3n-hsw:
-        - 9   # MRR sel
+#    vpp-nic-comparison-3n-hsw-mrr:
+#      csit-vpp-perf-verify-1904-3n-hsw:
+#        - 9   # MRR sel
 
-    vpp-nic-comparison-3n-skx-mrr:
-      csit-vpp-perf-verify-1904-3n-skx:
-        - 7   # MRR sel
+#    vpp-nic-comparison-3n-skx-mrr:
+#      csit-vpp-perf-verify-1904-3n-skx:
+#        - 7   # MRR sel
 
-    vpp-nic-comparison-2n-skx-mrr:
-      csit-vpp-perf-verify-1904-2n-skx:
-        - 11  # MRR sel
+#    vpp-nic-comparison-2n-skx-mrr:
+#      csit-vpp-perf-verify-1904-2n-skx:
+#        - 11  # MRR sel
 
     # Results
 
     vpp-perf-results-3n-hsw:
-      # TODO: Add FULL 1904 data
       csit-vpp-perf-verify-1904-3n-hsw:
-        - 32  # NDRPDR full
-        - 33  # NDRPDR full
-        - 35  # NDRPDR full
-        - 36  # NDRPDR full
-        - 37  # NDRPDR full
-        - 38  # NDRPDR full
-        - 40  # NDRPDR full
-        - 45  # NDRPDR full
-        - 46  # NDRPDR full
-        - 48  # NDRPDR full
-        - 49  # NDRPDR full
-        - 50  # NDRPDR full
-        - 51  # NDRPDR full
-        - 52  # NDRPDR full
+#        - 32  # NDRPDR full
+#        - 33  # NDRPDR full
+#        - 35  # NDRPDR full
+#        - 36  # NDRPDR full
+#        - 37  # NDRPDR full
+#        - 38  # NDRPDR full
+#        - 40  # NDRPDR full
+#        - 45  # NDRPDR full
+#        - 46  # NDRPDR full
+#        - 48  # NDRPDR full
+#        - 49  # NDRPDR full
+#        - 50  # NDRPDR full
+#        - 51  # NDRPDR full
+#        - 52  # NDRPDR full
+        - 55  # 1904.1 NDRPDR sel
 
     vpp-perf-results-3n-skx:
       csit-vpp-perf-verify-1904-3n-skx:
-        - 26  # NDRPDR full
-        - 27  # NDRPDR full
-        - 30  # NDRPDR full
-        - 31  # NDRPDR full
-
-    vpp-perf-results-2n-skx:
-      csit-vpp-perf-verify-1904-2n-skx:
-        - 33  # NDRPDR full
-        - 39  # NDRPDR full
-        - 58  # NDRPDR full
-        - 62  # NDRPDR full
-
-    vpp-mrr-results-3n-hsw:
-      csit-vpp-perf-verify-1904-3n-hsw:
-        - 9   # MRR sel
-
-    vpp-mrr-results-3n-skx:
-      csit-vpp-perf-verify-1904-3n-skx:
-        - 7   # MRR sel
-
-    vpp-mrr-results-2n-skx:
-      csit-vpp-perf-verify-1904-2n-skx:
-        - 11  # MRR sel
+#        - 26  # NDRPDR full
+#        - 27  # NDRPDR full
+#        - 30  # NDRPDR full
+#        - 31  # NDRPDR full
+        - 37  # 1904.1 NDRPDR sel
+
+#    vpp-perf-results-2n-skx:
+#      csit-vpp-perf-verify-1904-2n-skx:
+#        - 33  # NDRPDR full
+#        - 39  # NDRPDR full
+#        - 58  # NDRPDR full
+#        - 62  # NDRPDR full
+
+#    vpp-mrr-results-3n-hsw:
+#      csit-vpp-perf-verify-1904-3n-hsw:
+#        - 9   # MRR sel
+
+#    vpp-mrr-results-3n-skx:
+#      csit-vpp-perf-verify-1904-3n-skx:
+#        - 7   # MRR sel
+
+#    vpp-mrr-results-2n-skx:
+#      csit-vpp-perf-verify-1904-2n-skx:
+#        - 11  # MRR sel
 
     vpp-func-results-ubuntu:
       csit-vpp-functional-1904-ubuntu1604-virl:
-        - 33
+        - 162
 
     vpp-func-results-centos:
       csit-vpp-functional-1904-centos7-virl:
-        - 32
+        - 160
 
     vpp-device-results-ubuntu:
       csit-vpp-device-1904-ubuntu1804-1n-skx:
-        - 32
+        - 160
 
 #    # VPP Ligato
 #    ligato-perf-results-3n-hsw:
       csit-dpdk-perf-verify-1904-2n-skx:
         - 9   # NDRPDR sel
 
-    # HoneyComb Functional
-    hc-func-results:
-      csit-hc2vpp-verify-func-1904-ubuntu1604:
-        - 4
+#    # HoneyComb Functional
+#    hc-func-results:
+#      csit-hc2vpp-verify-func-1904-ubuntu1604:
+#        - 4
 
 #    # NSH SFC Functional
 #    nsh-func-results:
 #      csit-nsh_sfc-verify-func-1810-ubuntu1604-virl:
 #        - 1
 
-    # DMM Functional
-    dmm-func-results:
-      csit-dmm-functional-1904-ubuntu1604-virl:
-        - 1
+#    # DMM Functional
+#    dmm-func-results:
+#      csit-dmm-functional-1904-ubuntu1604-virl:
+#        - 1
 
     ###########################################################################
     # Tables (more than one data set)
         - 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
+#        - 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"
         - 67  # NDRPDR LB
     vpp-performance-changes-3n-skx-cmp:
       csit-vpp-perf-verify-1904-3n-skx:
-        - 8   # NDRPDR sel
-        - 9   # NDRPDR sel
-        - 10  # NDRPDR sel
-        - 11  # NDRPDR sel
-        - 12  # NDRPDR sel
-        - 14  # NDRPDR sel
-        - 16  # NDRPDR sel
-        - 21  # NDRPDR sel
-        - 23  # NDRPDR sel
-        - 25  # NDRPDR sel
+#        - 8   # NDRPDR sel
+#        - 9   # NDRPDR sel
+#        - 10  # NDRPDR sel
+#        - 11  # NDRPDR sel
+#        - 12  # NDRPDR sel
+#        - 14  # NDRPDR sel
+#        - 16  # NDRPDR sel
+#        - 21  # NDRPDR sel
+#        - 23  # NDRPDR sel
+#        - 25  # NDRPDR sel
+        - 37  # 1904.1 NDRPDR sel
     vpp-performance-changes-3n-skx:
       - "vpp-performance-changes-3n-skx-h1"
       - "vpp-performance-changes-3n-skx-ref"
       - "vpp-performance-changes-3n-skx-cmp"
 
-    vpp-performance-changes-2n-skx-h1:
-      csit-vpp-perf-verify-1810-2n-skx:
-        - 9   # NDRPDR sel
-        - 13  # NDRPDR sel
-        - 14  # NDRPDR sel
-        - 19  # NDRPDR sel
-        - 20  # NDRPDR sel
-        - 21  # NDRPDR sel
-        - 22  # NDRPDR sel
-        - 23  # NDRPDR sel
-        - 24  # NDRPDR sel
-        - 27  # NDRPDR sel
-    vpp-performance-changes-2n-skx-ref:
-      csit-vpp-perf-verify-1901-2n-skx:
-        - 5   # NDRPDR sel
-        - 12  # NDRPDR sel
-        - 13  # NDRPDR sel
-        - 21  # NDRPDR sel
-        - 23  # NDRPDR sel
-        - 31  # NDRPDR sel
-        - 34  # NDRPDR sel
-        - 40  # NDRPDR sel
-        - 42  # NDRPDR sel
-        - 43  # NDRPDR sel
-    vpp-performance-changes-2n-skx-cmp:
-      csit-vpp-perf-verify-1904-2n-skx:
-        - 12  # NDRPDR sel
-        - 14  # NDRPDR sel
-        - 16  # NDRPDR sel
-        - 17  # NDRPDR sel
-        - 18  # NDRPDR sel
-        - 21  # NDRPDR sel
-        - 27  # NDRPDR sel
-        - 30  # NDRPDR sel
-        - 31  # NDRPDR sel
-        - 32  # NDRPDR sel
-    vpp-performance-changes-2n-skx:
-      - "vpp-performance-changes-2n-skx-h1"
-      - "vpp-performance-changes-2n-skx-ref"
-      - "vpp-performance-changes-2n-skx-cmp"
-
-    vpp-soak-vs-ndr-2n-skx-ref:
-      csit-vpp-perf-verify-1904-2n-skx:
-        - 12  # NDRPDR sel
-        - 14  # NDRPDR sel
-        - 16  # NDRPDR sel
-        - 17  # NDRPDR sel
-        - 18  # NDRPDR sel
-        - 21  # NDRPDR sel
-        - 27  # NDRPDR sel
-        - 30  # NDRPDR sel
-        - 31  # NDRPDR sel
-        - 32  # NDRPDR sel
-    vpp-soak-vs-ndr-2n-skx-cmp:
-      csit-vpp-perf-verify-1904-2n-skx:
-        - 70  # soak
-        - 71  # soak
-    vpp-soak-vs-ndr-2n-skx:
-      csit-vpp-perf-verify-1904-2n-skx:
-        - 12  # NDRPDR sel
-        - 14  # NDRPDR sel
-        - 16  # NDRPDR sel
-        - 17  # NDRPDR sel
-        - 18  # NDRPDR sel
-        - 21  # NDRPDR sel
-        - 27  # NDRPDR sel
-        - 30  # NDRPDR sel
-        - 31  # NDRPDR sel
-        - 32  # NDRPDR sel
-        - 70  # soak
-        - 71  # soak
-
-    vpp-performance-changes-3n-hsw-mrr-h1:
-      csit-vpp-perf-verify-1810-3n-hsw:
-        - 9   # MRR sel
-    vpp-performance-changes-3n-hsw-mrr-ref:
-      csit-vpp-perf-verify-1901-3n-hsw:
-        - 35  # MRR sel
-    vpp-performance-changes-3n-hsw-mrr-cmp:
-      csit-vpp-perf-verify-1904-3n-hsw:
-        - 9   # MRR sel
-    vpp-performance-changes-3n-hsw-mrr:
-      - "vpp-performance-changes-3n-hsw-mrr-h1"
-      - "vpp-performance-changes-3n-hsw-mrr-ref"
-      - "vpp-performance-changes-3n-hsw-mrr-cmp"
-
-    vpp-performance-changes-3n-skx-mrr-h1:
-      csit-vpp-perf-verify-1810-3n-skx:
-        - 9   # MRR sel
-        - 11  # MRR sel
-        - 12  # MRR sel
-        - 13  # MRR sel
-    vpp-performance-changes-3n-skx-mrr-ref:
-      csit-vpp-perf-verify-1901-3n-skx:
-        - 32  # MRR sel
-    vpp-performance-changes-3n-skx-mrr-cmp:
-      csit-vpp-perf-verify-1904-3n-skx:
-        - 7   # MRR sel
-    vpp-performance-changes-3n-skx-mrr:
-      - "vpp-performance-changes-3n-skx-mrr-h1"
-      - "vpp-performance-changes-3n-skx-mrr-ref"
-      - "vpp-performance-changes-3n-skx-mrr-cmp"
-
-    vpp-performance-changes-2n-skx-mrr-h1:
-      csit-vpp-perf-verify-1810-2n-skx:
-        - 8   # MRR sel
-        - 10  # MRR sel
-        - 11  # MRR sel
-        - 12  # MRR sel
-    vpp-performance-changes-2n-skx-mrr-ref:
-      csit-vpp-perf-verify-1901-2n-skx:
-        - 22  # MRR sel
-    vpp-performance-changes-2n-skx-mrr-cmp:
-      csit-vpp-perf-verify-1904-2n-skx:
-        - 11  # MRR sel
-    vpp-performance-changes-2n-skx-mrr:
-      - "vpp-performance-changes-2n-skx-mrr-h1"
-      - "vpp-performance-changes-2n-skx-mrr-ref"
-      - "vpp-performance-changes-2n-skx-mrr-cmp"
+#    vpp-performance-changes-2n-skx-h1:
+#      csit-vpp-perf-verify-1810-2n-skx:
+#        - 9   # NDRPDR sel
+#        - 13  # NDRPDR sel
+#        - 14  # NDRPDR sel
+#        - 19  # NDRPDR sel
+#        - 20  # NDRPDR sel
+#        - 21  # NDRPDR sel
+#        - 22  # NDRPDR sel
+#        - 23  # NDRPDR sel
+#        - 24  # NDRPDR sel
+#        - 27  # NDRPDR sel
+#    vpp-performance-changes-2n-skx-ref:
+#      csit-vpp-perf-verify-1901-2n-skx:
+#        - 5   # NDRPDR sel
+#        - 12  # NDRPDR sel
+#        - 13  # NDRPDR sel
+#        - 21  # NDRPDR sel
+#        - 23  # NDRPDR sel
+#        - 31  # NDRPDR sel
+#        - 34  # NDRPDR sel
+#        - 40  # NDRPDR sel
+#        - 42  # NDRPDR sel
+#        - 43  # NDRPDR sel
+#    vpp-performance-changes-2n-skx-cmp:
+#      csit-vpp-perf-verify-1904-2n-skx:
+#        - 12  # NDRPDR sel
+#        - 14  # NDRPDR sel
+#        - 16  # NDRPDR sel
+#        - 17  # NDRPDR sel
+#        - 18  # NDRPDR sel
+#        - 21  # NDRPDR sel
+#        - 27  # NDRPDR sel
+#        - 30  # NDRPDR sel
+#        - 31  # NDRPDR sel
+#        - 32  # NDRPDR sel
+#    vpp-performance-changes-2n-skx:
+#      - "vpp-performance-changes-2n-skx-h1"
+#      - "vpp-performance-changes-2n-skx-ref"
+#      - "vpp-performance-changes-2n-skx-cmp"
+
+#    vpp-soak-vs-ndr-2n-skx-ref:
+#      csit-vpp-perf-verify-1904-2n-skx:
+#        - 12  # NDRPDR sel
+#        - 14  # NDRPDR sel
+#        - 16  # NDRPDR sel
+#        - 17  # NDRPDR sel
+#        - 18  # NDRPDR sel
+#        - 21  # NDRPDR sel
+#        - 27  # NDRPDR sel
+#        - 30  # NDRPDR sel
+#        - 31  # NDRPDR sel
+#        - 32  # NDRPDR sel
+#    vpp-soak-vs-ndr-2n-skx-cmp:
+#      csit-vpp-perf-verify-1904-2n-skx:
+#        - 70  # soak
+#        - 71  # soak
+#    vpp-soak-vs-ndr-2n-skx:
+#      csit-vpp-perf-verify-1904-2n-skx:
+#        - 12  # NDRPDR sel
+#        - 14  # NDRPDR sel
+#        - 16  # NDRPDR sel
+#        - 17  # NDRPDR sel
+#        - 18  # NDRPDR sel
+#        - 21  # NDRPDR sel
+#        - 27  # NDRPDR sel
+#        - 30  # NDRPDR sel
+#        - 31  # NDRPDR sel
+#        - 32  # NDRPDR sel
+#        - 70  # soak
+#        - 71  # soak
+
+#    vpp-performance-changes-3n-hsw-mrr-h1:
+#      csit-vpp-perf-verify-1810-3n-hsw:
+#        - 9   # MRR sel
+#    vpp-performance-changes-3n-hsw-mrr-ref:
+#      csit-vpp-perf-verify-1901-3n-hsw:
+#        - 35  # MRR sel
+#    vpp-performance-changes-3n-hsw-mrr-cmp:
+#      csit-vpp-perf-verify-1904-3n-hsw:
+#        - 9   # MRR sel
+#    vpp-performance-changes-3n-hsw-mrr:
+#      - "vpp-performance-changes-3n-hsw-mrr-h1"
+#      - "vpp-performance-changes-3n-hsw-mrr-ref"
+#      - "vpp-performance-changes-3n-hsw-mrr-cmp"
+
+#    vpp-performance-changes-3n-skx-mrr-h1:
+#      csit-vpp-perf-verify-1810-3n-skx:
+#        - 9   # MRR sel
+#        - 11  # MRR sel
+#        - 12  # MRR sel
+#        - 13  # MRR sel
+#    vpp-performance-changes-3n-skx-mrr-ref:
+#      csit-vpp-perf-verify-1901-3n-skx:
+#        - 32  # MRR sel
+#    vpp-performance-changes-3n-skx-mrr-cmp:
+#      csit-vpp-perf-verify-1904-3n-skx:
+#        - 7   # MRR sel
+#    vpp-performance-changes-3n-skx-mrr:
+#      - "vpp-performance-changes-3n-skx-mrr-h1"
+#      - "vpp-performance-changes-3n-skx-mrr-ref"
+#      - "vpp-performance-changes-3n-skx-mrr-cmp"
+
+#    vpp-performance-changes-2n-skx-mrr-h1:
+#      csit-vpp-perf-verify-1810-2n-skx:
+#        - 8   # MRR sel
+#        - 10  # MRR sel
+#        - 11  # MRR sel
+#        - 12  # MRR sel
+#    vpp-performance-changes-2n-skx-mrr-ref:
+#      csit-vpp-perf-verify-1901-2n-skx:
+#        - 22  # MRR sel
+#    vpp-performance-changes-2n-skx-mrr-cmp:
+#      csit-vpp-perf-verify-1904-2n-skx:
+#        - 11  # MRR sel
+#    vpp-performance-changes-2n-skx-mrr:
+#      - "vpp-performance-changes-2n-skx-mrr-h1"
+#      - "vpp-performance-changes-2n-skx-mrr-ref"
+#      - "vpp-performance-changes-2n-skx-mrr-cmp"
 
     dpdk-performance-changes-3n-hsw-h1:
       csit-dpdk-perf-verify-1810-3n-hsw:
 
     # Compare testbeds
 
-    vpp-compare-testbeds-ref:
-      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
-    vpp-compare-testbeds-cmp:
-      csit-vpp-perf-verify-1904-3n-skx:
-        - 8   # NDRPDR sel
-        - 9   # NDRPDR sel
-        - 10  # NDRPDR sel
-        - 11  # NDRPDR sel
-        - 12  # NDRPDR sel
-        - 14  # NDRPDR sel
-        - 16  # NDRPDR sel
-        - 21  # NDRPDR sel
-        - 23  # NDRPDR sel
-        - 25  # NDRPDR sel
-    vpp-compare-testbeds:
-      - "vpp-compare-testbeds-ref"
-      - "vpp-compare-testbeds-cmp"
-
-    vpp-compare-testbeds-mrr-ref:
-      csit-vpp-perf-verify-1904-3n-hsw:
-        - 9   # MRR sel
-    vpp-compare-testbeds-mrr-cmp:
-      csit-vpp-perf-verify-1904-3n-skx:
-        - 7   # MRR sel
-    vpp-compare-testbeds-mrr:
-      - "vpp-compare-testbeds-mrr-ref"
-      - "vpp-compare-testbeds-mrr-cmp"
+#    vpp-compare-testbeds-ref:
+#      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
+#    vpp-compare-testbeds-cmp:
+#      csit-vpp-perf-verify-1904-3n-skx:
+#        - 8   # NDRPDR sel
+#        - 9   # NDRPDR sel
+#        - 10  # NDRPDR sel
+#        - 11  # NDRPDR sel
+#        - 12  # NDRPDR sel
+#        - 14  # NDRPDR sel
+#        - 16  # NDRPDR sel
+#        - 21  # NDRPDR sel
+#        - 23  # NDRPDR sel
+#        - 25  # NDRPDR sel
+#    vpp-compare-testbeds:
+#      - "vpp-compare-testbeds-ref"
+#      - "vpp-compare-testbeds-cmp"
+
+#    vpp-compare-testbeds-mrr-ref:
+#      csit-vpp-perf-verify-1904-3n-hsw:
+#        - 9   # MRR sel
+#    vpp-compare-testbeds-mrr-cmp:
+#      csit-vpp-perf-verify-1904-3n-skx:
+#        - 7   # MRR sel
+#    vpp-compare-testbeds-mrr:
+#      - "vpp-compare-testbeds-mrr-ref"
+#      - "vpp-compare-testbeds-mrr-cmp"
 
     dpdk-compare-testbeds-ref:
       csit-dpdk-perf-verify-1904-3n-hsw:
 
     # Compare topologies
 
-    vpp-compare-topologies-ref:
-      csit-vpp-perf-verify-1904-3n-skx:
-        - 8   # NDRPDR sel
-        - 9   # NDRPDR sel
-        - 10  # NDRPDR sel
-        - 11  # NDRPDR sel
-        - 12  # NDRPDR sel
-        - 14  # NDRPDR sel
-        - 16  # NDRPDR sel
-        - 21  # NDRPDR sel
-        - 23  # NDRPDR sel
-        - 25  # NDRPDR sel
-    vpp-compare-topologies-cmp:
-      csit-vpp-perf-verify-1904-2n-skx:
-        - 12  # NDRPDR sel
-        - 14  # NDRPDR sel
-        - 16  # NDRPDR sel
-        - 17  # NDRPDR sel
-        - 18  # NDRPDR sel
-        - 21  # NDRPDR sel
-        - 27  # NDRPDR sel
-        - 30  # NDRPDR sel
-        - 31  # NDRPDR sel
-        - 32  # NDRPDR sel
-    vpp-compare-topologies:
-      - "vpp-compare-topologies-ref"
-      - "vpp-compare-topologies-cmp"
-
-    vpp-compare-topologies-mrr-ref:
-      csit-vpp-perf-verify-1904-3n-skx:
-        - 7   # MRR sel
-    vpp-compare-topologies-mrr-cmp:
-      csit-vpp-perf-verify-1904-2n-skx:
-        - 11  # MRR sel
-    vpp-compare-topologies-mrr:
-      - "vpp-compare-topologies-mrr-ref"
-      - "vpp-compare-topologies-mrr-cmp"
+#    vpp-compare-topologies-ref:
+#      csit-vpp-perf-verify-1904-3n-skx:
+#        - 8   # NDRPDR sel
+#        - 9   # NDRPDR sel
+#        - 10  # NDRPDR sel
+#        - 11  # NDRPDR sel
+#        - 12  # NDRPDR sel
+#        - 14  # NDRPDR sel
+#        - 16  # NDRPDR sel
+#        - 21  # NDRPDR sel
+#        - 23  # NDRPDR sel
+#        - 25  # NDRPDR sel
+#    vpp-compare-topologies-cmp:
+#      csit-vpp-perf-verify-1904-2n-skx:
+#        - 12  # NDRPDR sel
+#        - 14  # NDRPDR sel
+#        - 16  # NDRPDR sel
+#        - 17  # NDRPDR sel
+#        - 18  # NDRPDR sel
+#        - 21  # NDRPDR sel
+#        - 27  # NDRPDR sel
+#        - 30  # NDRPDR sel
+#        - 31  # NDRPDR sel
+#        - 32  # NDRPDR sel
+#    vpp-compare-topologies:
+#      - "vpp-compare-topologies-ref"
+#      - "vpp-compare-topologies-cmp"
+
+#    vpp-compare-topologies-mrr-ref:
+#      csit-vpp-perf-verify-1904-3n-skx:
+#        - 7   # MRR sel
+#    vpp-compare-topologies-mrr-cmp:
+#      csit-vpp-perf-verify-1904-2n-skx:
+#        - 11  # MRR sel
+#    vpp-compare-topologies-mrr:
+#      - "vpp-compare-topologies-mrr-ref"
+#      - "vpp-compare-topologies-mrr-cmp"
 
     dpdk-compare-topologies-ref:
       csit-dpdk-perf-verify-1904-3n-skx:
 #      - 1
 
     csit-vpp-perf-verify-1810-3n-hsw:
-      - 9   # MRR sel
+#      - 9   # MRR sel
       - 8   # NDRPDR sel
       - 12  # NDRPDR sel
       - 14  # NDRPDR sel
 #      - 36  # WRK
 #      - 37  # WRK
     csit-vpp-perf-verify-1901-3n-hsw:
-      - 35  # MRR sel
+#      - 35  # MRR sel
       - 10  # NDRPDR sel
       - 19  # NDRPDR sel
       - 31  # 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
+#      - 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
     # TODO: Add 1904 Data
     csit-vpp-perf-verify-1904-3n-hsw:
-      - 9   # MRR sel
-      - 32  # NDRPDR full
-      - 33  # NDRPDR full
-      - 35  # NDRPDR full
-      - 36  # NDRPDR full
-      - 37  # NDRPDR full
-      - 38  # NDRPDR full
-      - 40  # NDRPDR full
-      - 45  # NDRPDR full
-      - 46  # NDRPDR full
-      - 48  # NDRPDR full
-      - 49  # NDRPDR full
-      - 50  # NDRPDR full
-      - 51  # NDRPDR full
-      - 52  # NDRPDR full
-      - 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
+#      - 9   # MRR sel
+#      - 32  # NDRPDR full
+#      - 33  # NDRPDR full
+#      - 35  # NDRPDR full
+#      - 36  # NDRPDR full
+#      - 37  # NDRPDR full
+#      - 38  # NDRPDR full
+#      - 40  # NDRPDR full
+#      - 45  # NDRPDR full
+#      - 46  # NDRPDR full
+#      - 48  # NDRPDR full
+#      - 49  # NDRPDR full
+#      - 50  # NDRPDR full
+#      - 51  # NDRPDR full
+#      - 52  # NDRPDR full
+#      - 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
 
     csit-vpp-perf-verify-1810-3n-skx:
-      - 9   # MRR sel
-      - 11  # MRR sel
-      - 12  # MRR sel
-      - 13  # MRR sel
+#      - 9   # MRR sel
+#      - 11  # MRR sel
+#      - 12  # MRR sel
+#      - 13  # MRR sel
       - 10  # NDRPDR sel
       - 14  # NDRPDR sel
       - 15  # NDRPDR sel
       - 22  # NDRPDR sel
       - 25  # NDRPDR sel
     csit-vpp-perf-verify-1901-3n-skx:
-      - 32  # MRR sel
+#      - 32  # MRR sel
       - 18  # NDRPDR sel
       - 19  # NDRPDR sel
       - 20  # NDRPDR sel
       - 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
     csit-vpp-perf-verify-1904-3n-skx:
-      - 7   # MRR sel
-      - 26  # NDRPDR full
-      - 27  # NDRPDR full
-      - 30  # NDRPDR full
-      - 31  # NDRPDR full
-      - 8   # NDRPDR sel
-      - 9   # NDRPDR sel
-      - 10  # NDRPDR sel
-      - 11  # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 14  # NDRPDR sel
-      - 16  # NDRPDR sel
-      - 21  # NDRPDR sel
-      - 23  # NDRPDR sel
-      - 25  # NDRPDR sel
-
-    csit-vpp-perf-verify-1810-2n-skx:
-      - 8   # MRR sel
-      - 10  # MRR sel
-      - 11  # MRR sel
-      - 12  # MRR sel
-      - 9   # NDRPDR sel
-      - 13  # NDRPDR sel
-      - 14  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 21  # NDRPDR sel
-      - 22  # NDRPDR sel
-      - 23  # NDRPDR sel
-      - 24  # NDRPDR sel
-      - 27  # NDRPDR sel
-    csit-vpp-perf-verify-1901-2n-skx:
-      - 22  # MRR sel
-      - 5   # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
-      - 21  # NDRPDR sel
-      - 23  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 34  # NDRPDR sel
-      - 40  # NDRPDR sel
-      - 42  # NDRPDR sel
-      - 43  # NDRPDR sel
-    csit-vpp-perf-verify-1904-2n-skx:
-      - 11  # MRR sel
-      - 33  # NDRPDR full
-      - 39  # NDRPDR full
-      - 58  # NDRPDR full
-      - 62  # NDRPDR full
-      - 12  # NDRPDR sel
-      - 14  # NDRPDR sel
-      - 16  # NDRPDR sel
-      - 17  # NDRPDR sel
-      - 18  # NDRPDR sel
-      - 21  # NDRPDR sel
-      - 27  # NDRPDR sel
-      - 30  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 32  # NDRPDR sel
-      - 40  # NFV MRR 64b
-      - 41  # NFV MRR 64b
-      - 42  # NFV MRR 64b
-      - 47  # NFV MRR 64b
-      - 48  # NFV MRR 64b
-      - 49  # NFV MRR IMIX
-      - 50  # NFV MRR IMIX
-      - 51  # NFV MRR IMIX
-      - 54  # NFV MRR IMIX
-      - 55  # NFV MRR IMIX
-      - 56  # NFV NDRPDR 64b
-      - 59  # NFV NDRPDR 64b
-      - 60  # NFV NDRPDR 64b
-      - 65  # NFV NDRPDR 64b
-      - 68  # NFV NDRPDR 64b
-      - 66  # NFV NDRPDR IMIX
-      - 67  # NFV NDRPDR IMIX
-      - 69  # NFV NDRPDR IMIX
-      - 82  # NFV NDRPDR IMIX
-      - 83  # NFV NDRPDR IMIX
-      - 80  # NFV MRR NDRPDR 64b IMIX
-      - 81  # NFV MRR NDRPDR 64b IMIX
-      - 84  # NFV MRR NDRPDR 64b IMIX
-      - 85  # NFV MRR NDRPDR 64b IMIX
-      - 86  # NFV MRR NDRPDR 64b IMIX
-      - 70  # soak
-      - 71  # soak
+#      - 7   # MRR sel
+#      - 26  # NDRPDR full
+#      - 27  # NDRPDR full
+#      - 30  # NDRPDR full
+#      - 31  # NDRPDR full
+#      - 8   # NDRPDR sel
+#      - 9   # NDRPDR sel
+#      - 10  # NDRPDR sel
+#      - 11  # NDRPDR sel
+#      - 12  # NDRPDR sel
+#      - 14  # NDRPDR sel
+#      - 16  # NDRPDR sel
+#      - 21  # NDRPDR sel
+#      - 23  # NDRPDR sel
+#      - 25  # NDRPDR sel
+      - 37  # 1904.1 NDRPDR sel
+
+#    csit-vpp-perf-verify-1810-2n-skx:
+#      - 8   # MRR sel
+#      - 10  # MRR sel
+#      - 11  # MRR sel
+#      - 12  # MRR sel
+#      - 9   # NDRPDR sel
+#      - 13  # NDRPDR sel
+#      - 14  # NDRPDR sel
+#      - 19  # NDRPDR sel
+#      - 20  # NDRPDR sel
+#      - 21  # NDRPDR sel
+#      - 22  # NDRPDR sel
+#      - 23  # NDRPDR sel
+#      - 24  # NDRPDR sel
+#      - 27  # NDRPDR sel
+#    csit-vpp-perf-verify-1901-2n-skx:
+#      - 22  # MRR sel
+#      - 5   # NDRPDR sel
+#      - 12  # NDRPDR sel
+#      - 13  # NDRPDR sel
+#      - 21  # NDRPDR sel
+#      - 23  # NDRPDR sel
+#      - 31  # NDRPDR sel
+#      - 34  # NDRPDR sel
+#      - 40  # NDRPDR sel
+#      - 42  # NDRPDR sel
+#      - 43  # NDRPDR sel
+#    csit-vpp-perf-verify-1904-2n-skx:
+#      - 11  # MRR sel
+#      - 33  # NDRPDR full
+#      - 39  # NDRPDR full
+#      - 58  # NDRPDR full
+#      - 62  # NDRPDR full
+#      - 12  # NDRPDR sel
+#      - 14  # NDRPDR sel
+#      - 16  # NDRPDR sel
+#      - 17  # NDRPDR sel
+#      - 18  # NDRPDR sel
+#      - 21  # NDRPDR sel
+#      - 27  # NDRPDR sel
+#      - 30  # NDRPDR sel
+#      - 31  # NDRPDR sel
+#      - 32  # NDRPDR sel
+#      - 40  # NFV MRR 64b
+#      - 41  # NFV MRR 64b
+#      - 42  # NFV MRR 64b
+#      - 47  # NFV MRR 64b
+#      - 48  # NFV MRR 64b
+#      - 49  # NFV MRR IMIX
+#      - 50  # NFV MRR IMIX
+#      - 51  # NFV MRR IMIX
+#      - 54  # NFV MRR IMIX
+#      - 55  # NFV MRR IMIX
+#      - 56  # NFV NDRPDR 64b
+#      - 59  # NFV NDRPDR 64b
+#      - 60  # NFV NDRPDR 64b
+#      - 65  # NFV NDRPDR 64b
+#      - 68  # NFV NDRPDR 64b
+#      - 66  # NFV NDRPDR IMIX
+#      - 67  # NFV NDRPDR IMIX
+#      - 69  # NFV NDRPDR IMIX
+#      - 82  # NFV NDRPDR IMIX
+#      - 83  # NFV NDRPDR IMIX
+#      - 80  # NFV MRR NDRPDR 64b IMIX
+#      - 81  # NFV MRR NDRPDR 64b IMIX
+#      - 84  # NFV MRR NDRPDR 64b IMIX
+#      - 85  # NFV MRR NDRPDR 64b IMIX
+#      - 86  # NFV MRR NDRPDR 64b IMIX
+#      - 70  # soak
+#      - 71  # soak
 
 #    csit-ligato-perf-verify-1901-3n-hsw:
 #      - 10  # NDRPDR full
       - 12  # NDRPDR sel
 
     csit-vpp-functional-1904-ubuntu1604-virl:
-      - 33
+      - 162
     csit-vpp-functional-1904-centos7-virl:
-      - 32
+      - 160
     csit-vpp-device-1904-ubuntu1804-1n-skx:
-      - 32
+      - 160
 #    # Not used
 #    csit-nsh_sfc-verify-func-1810-ubuntu1604-virl:
 #      - 1
-    csit-dmm-functional-1904-ubuntu1604-virl:
-      - 1
-    csit-hc2vpp-verify-func-1904-ubuntu1604:
-      - 4
+#    csit-dmm-functional-1904-ubuntu1604-virl:
+#      - 1
+#    csit-hc2vpp-verify-func-1904-ubuntu1604:
+#      - 4
 
 - type: "output"
   output: "report"
 ###                               T A B L E S                                ###
 ################################################################################
 
-# VPP Soak vs NDR
-- type: "table"
-  title: "VPP Soak vs NDR 2n-skx"
-  algorithm: "table_soak_vs_ndr"
-  output-file: "{DIR[STATIC,VPP]}/soak-vs-ndr-2n-skx"
-  reference:
-    title: "NDR"
-    data: "vpp-soak-vs-ndr-2n-skx-ref"
-  compare:
-    title: "Soak"
-    data: "vpp-soak-vs-ndr-2n-skx-cmp"
-  data: "vpp-soak-vs-ndr-2n-skx"
-  include-tests: "NDR"
-  filter: "('NDRPDR' or 'SOAK')"
-  parameters:
-    - "throughput"
-    - "name"
-    - "parent"
-
-################################################################################
-
-# 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"
-#  history:
-#    - title: "rls1810"
-#      data: "intel-dnv-vpp-changes-2n-dnv-h1"
+## 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: "rls1901"
-#    data: "intel-dnv-vpp-changes-2n-dnv-ref"
+#    title: "Intel-x520"
+#    nic: "NIC_Intel-X520-DA2"
 #  compare:
-#    title: "rls1904"
-#    data: "intel-dnv-vpp-changes-2n-dnv-cmp"
-#  data: "intel-dnv-vpp-changes-2n-dnv"
-#  include-tests: "PDR"
-#  filter: "'1T1C' and ('NDRPDR' or 'NDRPDRDISC')"
+#    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 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"
-#  history:
-#    - title: "rls1810"
-#      data: "intel-dnv-vpp-changes-2n-dnv-h1"
+## 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: "rls1901"
-#    data: "intel-dnv-vpp-changes-2n-dnv-ref"
+#    title: "Intel-x520"
+#    nic: "NIC_Intel-X520-DA2"
 #  compare:
-#    title: "rls1904"
-#    data: "intel-dnv-vpp-changes-2n-dnv-cmp"
-#  data: "intel-dnv-vpp-changes-2n-dnv"
-#  include-tests: "PDR"
-#  filter: "'2T2C' and ('NDRPDR' or 'NDRPDRDISC')"
+#    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 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"
-#  history:
-#    - title: "rls1810"
-#      data: "intel-dnv-vpp-changes-2n-dnv-h1"
+## 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: "rls1901"
-#    data: "intel-dnv-vpp-changes-2n-dnv-ref"
+#    title: "Intel-x520"
+#    nic: "NIC_Intel-X520-DA2"
 #  compare:
-#    title: "rls1904"
-#    data: "intel-dnv-vpp-changes-2n-dnv-cmp"
-#  data: "intel-dnv-vpp-changes-2n-dnv"
-#  include-tests: "NDR"
-#  filter: "'1T1C' and ('NDRPDR' or 'NDRPDRDISC')"
+#    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"
+#-
+#  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"
-#  history:
-#    - title: "rls1810"
-#      data: "intel-dnv-vpp-changes-2n-dnv-h1"
 #  reference:
-#    title: "rls1901"
+#    title: "rls1810"
 #    data: "intel-dnv-vpp-changes-2n-dnv-ref"
 #  compare:
-#    title: "rls1904"
+#    title: "rls1901.1"
 #    data: "intel-dnv-vpp-changes-2n-dnv-cmp"
 #  data: "intel-dnv-vpp-changes-2n-dnv"
 #  include-tests: "NDR"
 #  - "throughput"
 #
 ## VPP Performance Changes 2n-dnv 1t1c MRR
-#- type: "table"
+#-
+#  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"
-#  history:
-#    - title: "rls1810"
-#      data: "intel-dnv-vpp-changes-2n-dnv-h1"
 #  reference:
-#    title: "rls1901"
+#    title: "rls1810"
 #    data: "intel-dnv-vpp-changes-2n-dnv-ref"
 #  compare:
-#    title: "rls1904"
+#    title: "rls1901.1"
 #    data: "intel-dnv-vpp-changes-2n-dnv-cmp"
 #  data: "intel-dnv-vpp-changes-2n-dnv"
 #  include-tests: "MRR"
 #  - "result"
 #
 ## VPP Performance Changes 2n-dnv 2t2c MRR
-#- type: "table"
+#-
+#  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"
-#  history:
-#    - title: "rls1810"
-#      data: "intel-dnv-vpp-changes-2n-dnv-h1"
 #  reference:
-#    title: "rls1901"
+#    title: "rls1810"
 #    data: "intel-dnv-vpp-changes-2n-dnv-ref"
 #  compare:
-#    title: "rls1904"
+#    title: "rls1901.1"
 #    data: "intel-dnv-vpp-changes-2n-dnv-cmp"
 #  data: "intel-dnv-vpp-changes-2n-dnv"
 #  include-tests: "MRR"
 #  - "result"
 #
 ## VPP Performance Changes 2n-dnv 4t4c MRR
-#- type: "table"
+#-
+#  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"
-#  history:
-#    - title: "rls1810"
-#      data: "intel-dnv-vpp-changes-2n-dnv-h1"
 #  reference:
-#    title: "rls1901"
+#    title: "rls1810"
 #    data: "intel-dnv-vpp-changes-2n-dnv-ref"
 #  compare:
-#    title: "rls1904"
+#    title: "rls1901.1"
 #    data: "intel-dnv-vpp-changes-2n-dnv-cmp"
 #  data: "intel-dnv-vpp-changes-2n-dnv"
 #  include-tests: "MRR"
 #  - "result"
 
 # VPP Performance Changes 3n-hsw 1t1c pdr
-- type: "table"
+-
+  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: "rls1810"
+    -
+      title: "rls1807"
       data: "vpp-performance-changes-3n-hsw-h1"
   reference:
-    title: "rls1901"
+    title: "rls1810"
     data: "vpp-performance-changes-3n-hsw-ref"
   compare:
-    title: "rls1904"
+    title: "rls1901.1"
     data: "vpp-performance-changes-3n-hsw-cmp"
   data: "vpp-performance-changes-3n-hsw"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   - "throughput"
 
 # VPP Performance Changes 3n-hsw 2t2c pdr
-- type: "table"
+-
+  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: "rls1810"
+    -
+      title: "rls1807"
       data: "vpp-performance-changes-3n-hsw-h1"
   reference:
-    title: "rls1901"
+    title: "rls1810"
     data: "vpp-performance-changes-3n-hsw-ref"
   compare:
-    title: "rls1904"
+    title: "rls1901.1"
     data: "vpp-performance-changes-3n-hsw-cmp"
   data: "vpp-performance-changes-3n-hsw"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   - "throughput"
 
 # VPP Performance Changes 3n-hsw 1t1c ndr
-- type: "table"
+-
+  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: "rls1810"
+    -
+      title: "rls1807"
       data: "vpp-performance-changes-3n-hsw-h1"
   reference:
-    title: "rls1901"
+    title: "rls1810"
     data: "vpp-performance-changes-3n-hsw-ref"
   compare:
-    title: "rls1904"
+    title: "rls1901.1"
     data: "vpp-performance-changes-3n-hsw-cmp"
   data: "vpp-performance-changes-3n-hsw"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   - "throughput"
 
 # VPP Performance Changes 3n-hsw 2t2c ndr
-- type: "table"
+-
+  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: "rls1810"
+    -
+      title: "rls1807"
       data: "vpp-performance-changes-3n-hsw-h1"
   reference:
-    title: "rls1901"
+    title: "rls1810"
     data: "vpp-performance-changes-3n-hsw-ref"
   compare:
-    title: "rls1904"
+    title: "rls1901.1"
     data: "vpp-performance-changes-3n-hsw-cmp"
   data: "vpp-performance-changes-3n-hsw"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   - "throughput"
 
 # VPP Performance Changes 3n-skx 2t1c pdr
-- type: "table"
+-
+  type: "table"
   title: "VPP Performance Changes 3n-skx 2t1c pdr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-2t1c-pdr"
   history:
-    - title: "rls1810"
+    -
+      title: "rls1807"
       data: "vpp-performance-changes-3n-skx-h1"
   reference:
-    title: "rls1901"
+    title: "rls1810"
     data: "vpp-performance-changes-3n-skx-ref"
   compare:
-    title: "rls1904"
+    title: "rls1901.1"
     data: "vpp-performance-changes-3n-skx-cmp"
   data: "vpp-performance-changes-3n-skx"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   - "throughput"
 
 # VPP Performance Changes 3n-skx 4t2c pdr
-- type: "table"
+-
+  type: "table"
   title: "VPP Performance Changes 3n-skx 4t2c pdr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-4t2c-pdr"
   history:
-    - title: "rls1810"
+    -
+      title: "rls1807"
       data: "vpp-performance-changes-3n-skx-h1"
   reference:
-    title: "rls1901"
+    title: "rls1810"
     data: "vpp-performance-changes-3n-skx-ref"
   compare:
-    title: "rls1904"
+    title: "rls1901.1"
     data: "vpp-performance-changes-3n-skx-cmp"
   data: "vpp-performance-changes-3n-skx"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   - "throughput"
 
 # VPP Performance Changes 3n-skx 2t1c ndr
-- type: "table"
+-
+  type: "table"
   title: "VPP Performance Changes 3n-skx 2t1c ndr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-2t1c-ndr"
   history:
-    - title: "rls1810"
+    -
+      title: "rls1807"
       data: "vpp-performance-changes-3n-skx-h1"
   reference:
-    title: "rls1901"
+    title: "rls1810"
     data: "vpp-performance-changes-3n-skx-ref"
   compare:
-    title: "rls1904"
+    title: "rls1901.1"
     data: "vpp-performance-changes-3n-skx-cmp"
   data: "vpp-performance-changes-3n-skx"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   - "throughput"
 
 # VPP Performance Changes 3n-skx 4t2c ndr
-- type: "table"
+-
+  type: "table"
   title: "VPP Performance Changes 3n-skx 4t2c ndr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-4t2c-ndr"
   history:
-    - title: "rls1810"
+    -
+      title: "rls1807"
       data: "vpp-performance-changes-3n-skx-h1"
   reference:
-    title: "rls1901"
+    title: "rls1810"
     data: "vpp-performance-changes-3n-skx-ref"
   compare:
-    title: "rls1904"
+    title: "rls1901.1"
     data: "vpp-performance-changes-3n-skx-cmp"
   data: "vpp-performance-changes-3n-skx"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   - "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: "rls1810"
-      data: "vpp-performance-changes-2n-skx-h1"
-  reference:
-    title: "rls1901"
-    data: "vpp-performance-changes-2n-skx-ref"
-  compare:
-    title: "rls1904"
-    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: "rls1810"
-      data: "vpp-performance-changes-2n-skx-h1"
-  reference:
-    title: "rls1901"
-    data: "vpp-performance-changes-2n-skx-ref"
-  compare:
-    title: "rls1904"
-    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 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 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: "rls1810"
-      data: "vpp-performance-changes-2n-skx-h1"
-  reference:
-    title: "rls1901"
-    data: "vpp-performance-changes-2n-skx-ref"
-  compare:
-    title: "rls1904"
-    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 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 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: "rls1810"
-      data: "vpp-performance-changes-2n-skx-h1"
-  reference:
-    title: "rls1901"
-    data: "vpp-performance-changes-2n-skx-ref"
-  compare:
-    title: "rls1904"
-    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 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 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 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 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 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 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 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 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 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 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 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"
 
-# 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'"
+# 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"
-  - "throughput"
+  - "msg"
 
-# 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'"
+# Detailed Test Results - VPP Performance Results 3n-skx
+-
+  type: "table"
+  title: "Detailed Test Results - VPP Performance Results 3n-skx"
+  algorithm: "table_merged_details"
+  output-file-ext: ".csv"
+  output-file: "{DIR[DTR,PERF,VPP,3N,SKX]}/vpp_performance_results_3n_skx"
+  columns:
+  -
+    title: "Name"
+    data: "data name"
+  -
+    title: "Status"
+    data: "data msg"
+  rows: "generated"
+  data: "vpp-perf-results-3n-skx"
+  filter: "not 'NDRCHK' and not 'PDRCHK'"
   parameters:
   - "name"
   - "parent"
-  - "throughput"
+  - "msg"
 
-# 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"
+## 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"
 
-# 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: "rls1810"
-      data: "vpp-performance-changes-3n-hsw-mrr-h1"
-  reference:
-    title: "rls1901"
-    data: "vpp-performance-changes-3n-hsw-mrr-ref"
-  compare:
-    title: "rls1904"
-    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"
+## 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"
 
-# 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: "rls1810"
-      data: "vpp-performance-changes-3n-hsw-mrr-h1"
-  reference:
-    title: "rls1901"
-    data: "vpp-performance-changes-3n-hsw-mrr-ref"
-  compare:
-    title: "rls1904"
-    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'"
+# 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:
-  - "name"
   - "parent"
-  - "result"
+  - "name"
+  - "conf-history"
 
-# 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: "rls1810"
-      data: "vpp-performance-changes-3n-hsw-mrr-h1"
-  reference:
-    title: "rls1901"
-    data: "vpp-performance-changes-3n-hsw-mrr-ref"
-  compare:
-    title: "rls1904"
-    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'"
+# Test configuration - VPP Performance Test Configs 3n-skx
+-
+  type: "table"
+  title: "Test configuration - VPP Performance Test Configs 3n-skx"
+  algorithm: "table_merged_details"
+  output-file-ext: ".csv"
+  output-file: "{DIR[DTC,PERF,VPP,3N,SKX]}/vpp_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-perf-results-3n-skx"
+  filter: "not 'NDRCHK' and not 'PDRCHK'"
   parameters:
-  - "name"
   - "parent"
-  - "result"
+  - "name"
+  - "conf-history"
 
-# 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: "rls1810"
-      data: "vpp-performance-changes-3n-skx-mrr-h1"
-  reference:
-    title: "rls1901"
-    data: "vpp-performance-changes-3n-skx-mrr-ref"
-  compare:
-    title: "rls1904"
-    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: "rls1810"
-      data: "vpp-performance-changes-3n-skx-mrr-h1"
-  reference:
-    title: "rls1901"
-    data: "vpp-performance-changes-3n-skx-mrr-ref"
-  compare:
-    title: "rls1904"
-    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: "rls1810"
-      data: "vpp-performance-changes-3n-skx-mrr-h1"
-  reference:
-    title: "rls1901"
-    data: "vpp-performance-changes-3n-skx-mrr-ref"
-  compare:
-    title: "rls1904"
-    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: "rls1810"
-      data: "vpp-performance-changes-2n-skx-mrr-h1"
-  reference:
-    title: "rls1901"
-    data: "vpp-performance-changes-2n-skx-mrr-ref"
-  compare:
-    title: "rls1904"
-    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: "rls1810"
-      data: "vpp-performance-changes-2n-skx-mrr-h1"
-  reference:
-    title: "rls1901"
-    data: "vpp-performance-changes-2n-skx-mrr-ref"
-  compare:
-    title: "rls1904"
-    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: "rls1810"
-      data: "vpp-performance-changes-2n-skx-mrr-h1"
-  reference:
-    title: "rls1901"
-    data: "vpp-performance-changes-2n-skx-mrr-ref"
-  compare:
-    title: "rls1904"
-    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 ('CFS_OPT' or ('NIC_Intel-X520-DA2' and 'IPSECHW') or ('NIC_Cisco-VIC-1385' and '9000B'))"
-  parameters:
-  - "name"
-  - "parent"
-  - "msg"
-
-# Detailed Test Results - VPP Performance Results 3n-skx
-- type: "table"
-  title: "Detailed Test Results - VPP Performance Results 3n-skx"
-  algorithm: "table_merged_details"
-  output-file-ext: ".csv"
-  output-file: "{DIR[DTR,PERF,VPP,3N,SKX]}/vpp_performance_results_3n_skx"
-  columns:
-  - title: "Name"
-    data: "data name"
-  - title: "Status"
-    data: "data msg"
-  rows: "generated"
-  data: "vpp-perf-results-3n-skx"
-  filter: "not 'CFS_OPT'"
-  parameters:
-  - "name"
-  - "parent"
-  - "msg"
-
-# Detailed Test Results - VPP Performance Results 2n-skx
-- type: "table"
-  title: "Detailed Test Results - VPP Performance Results 2n-skx"
-  algorithm: "table_merged_details"
-  output-file-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 'CFS_OPT'"
-  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"
+## 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[DTR,PERF,VPP,2N,DNV]}/vpp_performance_results_2n_dnv"
+#  output-file: "{DIR[DTC,PERF,VPP,2N,SKX]}/vpp_test_configuration_2n_skx"
 #  columns:
-#  - title: "Name"
+#  -
+#    title: "Name"
 #    data: "data name"
-#  - title: "Status"
-#    data: "data msg"
+#  -
+#    title: "VPP API Test Commands History - Commands Used Per Test Case"
+#    data: "data conf-history"
 #  rows: "generated"
-#  data: "intel-dnv-vpp"
-#  filter: "'NDRPDR'"
+#  data: "vpp-perf-results-2n-skx"
+#  filter: "not 'NDRCHK' and not 'PDRCHK'"
 #  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 ('CFS_OPT' or ('NIC_Intel-X520-DA2' and 'IPSECHW') or ('NIC_Cisco-VIC-1385' and '9000B'))"
-  parameters:
-  - "parent"
-  - "name"
-  - "conf-history"
-
-# Test configuration - VPP Performance Test Configs 3n-skx
-- type: "table"
-  title: "Test configuration - VPP Performance Test Configs 3n-skx"
-  algorithm: "table_merged_details"
-  output-file-ext: ".csv"
-  output-file: "{DIR[DTC,PERF,VPP,3N,SKX]}/vpp_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-perf-results-3n-skx"
-  filter: "not 'CFS_OPT'"
-  parameters:
-  - "parent"
-  - "name"
-  - "conf-history"
-
-# Test configuration - VPP Performance Test Configs 2n-skx
-- type: "table"
-  title: "Test configuration - VPP Performance Test Configs 2n-skx"
-  algorithm: "table_merged_details"
-  output-file-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 'CFS_OPT'"
-  parameters:
-  - "parent"
-  - "name"
-  - "conf-history"
+#  - "name"
+#  - "conf-history"
 
 ## Test configuration - VPP Performance Test Configs 2n-dnv
-#- type: "table"
+#-
+#  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"
+#  -
+#    title: "Name"
 #    data: "data name"
-#  - title: "VPP API Test Commands History - Commands Used Per Test Case"
+#  -
+#    title: "VPP API Test Commands History - Commands Used Per Test Case"
 #    data: "data conf-history"
 #  rows: "generated"
 #  data: "intel-dnv-vpp"
 #  - "conf-history"
 
 # Test Operational Data - VPP Performance Operational Data 3n-hsw
-- type: "table"
+-
+  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"
+  -
+    title: "Name"
     data: "data name"
-  - title: "VPP Operational Data - Outputs of 'show runtime' at NDR packet rate"
+  -
+    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 ('CFS_OPT' or ('NIC_Intel-X520-DA2' and 'IPSECHW') or ('NIC_Cisco-VIC-1385' and '9000B'))"
+  filter: "not 'NDRCHK' and not 'PDRCHK'"
   parameters:
   - "parent"
   - "name"
   - "show-run"
 
 # Test Operational Data - VPP Performance Operational Data 3n-skx
-- type: "table"
+-
+  type: "table"
   title: "Test Operational Data - VPP Performance Operational Data 3n-skx"
   algorithm: "table_merged_details"
   output-file-ext: ".csv"
   output-file: "{DIR[DTO,PERF,VPP,3N,SKX]}/vpp_test_operational_3n_skx"
   columns:
-  - title: "Name"
+  -
+    title: "Name"
     data: "data name"
-  - title: "VPP Operational Data - Outputs of 'show runtime' at NDR packet rate"
+  -
+    title: "VPP Operational Data - Outputs of 'show runtime' at NDR packet rate"
     data: "data show-run"
   rows: "generated"
   data: "vpp-perf-results-3n-skx"
-  filter: "not 'CFS_OPT'"
+  filter: "not 'NDRCHK' and not 'PDRCHK'"
   parameters:
   - "parent"
   - "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 'CFS_OPT'"
-  parameters:
-  - "parent"
-  - "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"
+#-
+#  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"
+#  -
+#    title: "Name"
 #    data: "data name"
-#  - title: "VPP Operational Data - Outputs of 'show runtime' at NDR packet rate"
+#  -
+#    title: "VPP Operational Data - Outputs of 'show runtime' at NDR packet rate"
 #    data: "data show-run"
 #  rows: "generated"
 #  data: "intel-dnv-vpp"
 #  - "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 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 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 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"
+#-
+#  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"
+#  -
+#    title: "Name"
 #    data: "data name"
-#  - title: "Status"
+#  -
+#    title: "Status"
 #    data: "data msg"
 #  rows: "generated"
 #  data: "intel-dnv-vpp"
 #  - "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-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 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-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"
+#-
+#  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"
+#  -
+#    title: "Name"
 #    data: "data name"
-#  - title: "VPP API Test Commands History - Commands Used Per Test Case"
+#  -
+#    title: "VPP API Test Commands History - Commands Used Per Test Case"
 #    data: "data conf-history"
 #  rows: "generated"
 #  data: "intel-dnv-vpp"
 #  - "conf-history"
 
 # Detailed Test Results - VPP Functional Results - Ubuntu
-- type: "table"
+-
+  type: "table"
   title: "Detailed Test Results - VPP Functional Results - Ubuntu"
   algorithm: "table_details"
   output-file-ext: ".csv"
   output-file: "{DIR[DTR,FUNC,VPP,UBUNTU]}/vpp_functional_results_ubuntu"
   columns:
-  - title: "Name"
+  -
+    title: "Name"
     data: "data name"
-  - title: "Documentation"
+  -
+    title: "Documentation"
     data: "data doc"
-  - title: "Status"
+  -
+    title: "Status"
     data: "data status"
   rows: "generated"
   data: "vpp-func-results-ubuntu"
   - "status"
 
 # Detailed Test Results - VPP Functional Results - CentOS
-- type: "table"
+-
+  type: "table"
   title: "Detailed Test Results - VPP Functional Results - CentOS"
   algorithm: "table_details"
   output-file-ext: ".csv"
   output-file: "{DIR[DTR,FUNC,VPP,CENTOS]}/vpp_functional_results_centos"
   columns:
-  - title: "Name"
+  -
+    title: "Name"
     data: "data name"
-  - title: "Documentation"
+  -
+    title: "Documentation"
     data: "data doc"
   -
     title: "Status"
   - "status"
 
 # Test configuration - VPP Functional Test Configs - Ubuntu
-- type: "table"
+-
+  type: "table"
   title: "Test configuration - VPP Functional Test Configs - Ubuntu"
   algorithm: "table_details"
   output-file-ext: ".csv"
   output-file: "{DIR[DTC,FUNC,VPP,UBUNTU]}/vpp_functional_configuration_ubuntu"
   columns:
-  - title: "Name"
+  -
+    title: "Name"
     data: "data name"
-  - title: "VPP API Test Commands History - Commands Used Per Test Case"
+  -
+    title: "VPP API Test Commands History - Commands Used Per Test Case"
     data: "data conf-history"
   rows: "generated"
   data: "vpp-func-results-ubuntu"
   - "conf-history"
 
 # Test configuration - VPP Functional Test Configs - CentOS
-- type: "table"
+-
+  type: "table"
   title: "Test configuration - VPP Functional Test Configs - CentOS"
   algorithm: "table_details"
   output-file-ext: ".csv"
   output-file: "{DIR[DTC,FUNC,VPP,CENTOS]}/vpp_functional_configuration_centos"
   columns:
-  - title: "Name"
+  -
+    title: "Name"
     data: "data name"
-  - title: "VPP API Test Commands History - Commands Used Per Test Case"
+  -
+    title: "VPP API Test Commands History - Commands Used Per Test Case"
     data: "data conf-history"
   rows: "generated"
   data: "vpp-func-results-centos"
   - "conf-history"
 
 ## Detailed Test Results - Container Orchestrated Topologies Performance Results 3n-hsw
-#- type: "table"
+#-
+#  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"
+#  -
+#    title: "Name"
 #    data: "data name"
-#  - title: "Status"
+#  -
+#    title: "Status"
 #    data: "data msg"
 #  rows: "generated"
 #  data: "ligato-perf-results-3n-hsw"
 #  - "msg"
 
 # Detailed Test Results - VPP Device Results - Ubuntu
-- type: "table"
+-
+  type: "table"
   title: "Detailed Test Results - VPP Device Results - Ubuntu"
   algorithm: "table_details"
   output-file-ext: ".csv"
   output-file: "{DIR[DTR,FUNC,VPP,DEVICE,UBUNTU]}/vpp_device_results_ubuntu"
   columns:
-  - title: "Name"
+  -
+    title: "Name"
     data: "data name"
-  - title: "Documentation"
+  -
+    title: "Documentation"
     data: "data doc"
-  - title: "Status"
+  -
+    title: "Status"
     data: "data status"
   rows: "generated"
   data: "vpp-device-results-ubuntu"
   - "status"
 
 # Test configuration - VPP Device Test Configs - Ubuntu
-- type: "table"
+-
+  type: "table"
   title: "Test configuration - VPP Device Test Configs - Ubuntu"
   algorithm: "table_details"
   output-file-ext: ".csv"
   output-file: "{DIR[DTC,FUNC,VPP,DEVICE,UBUNTU]}/vpp_device_configuration_ubuntu"
   columns:
-  - title: "Name"
+  -
+    title: "Name"
     data: "data name"
-  - title: "VPP API Test Commands History - Commands Used Per Test Case"
+  -
+    title: "VPP API Test Commands History - Commands Used Per Test Case"
     data: "data conf-history"
   rows: "generated"
   data: "vpp-device-results-ubuntu"
 ################################################################################
 
 # DPDK Performance Changes 3n-hsw 1t1c pdr
-- type: "table"
+-
+  type: "table"
   title: "DPDK Performance Changes 3n-hsw 1t1c pdr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-hsw-1t1c-pdr"
   history:
-    - title: "rls1810"
+    -
+      title: "rls1807"
       data: "dpdk-performance-changes-3n-hsw-h1"
   reference:
-    title: "rls1901"
+    title: "rls1810"
     data: "dpdk-performance-changes-3n-hsw-ref"
   compare:
-    title: "rls1904"
+    title: "rls1901"
     data: "dpdk-performance-changes-3n-hsw-cmp"
   data: "dpdk-performance-changes-3n-hsw"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   - "throughput"
 
 # DPDK Performance Changes 3n-hsw 2t2c pdr
-- type: "table"
+-
+  type: "table"
   title: "DPDK Performance Changes 3n-hsw 2t2c pdr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-hsw-2t2c-pdr"
   history:
-    - title: "rls1810"
+    -
+      title: "rls1807"
       data: "dpdk-performance-changes-3n-hsw-h1"
   reference:
-    title: "rls1901"
+    title: "rls1810"
     data: "dpdk-performance-changes-3n-hsw-ref"
   compare:
-    title: "rls1904"
+    title: "rls1901"
     data: "dpdk-performance-changes-3n-hsw-cmp"
   data: "dpdk-performance-changes-3n-hsw"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   - "throughput"
 
 # DPDK Performance Changes 3n-hsw 1t1c ndr
-- type: "table"
+-
+  type: "table"
   title: "DPDK Performance Changes 3n-hsw 1t1c ndr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-hsw-1t1c-ndr"
   history:
-    - title: "rls1810"
+    -
+      title: "rls1807"
       data: "dpdk-performance-changes-3n-hsw-h1"
   reference:
-    title: "rls1901"
+    title: "rls1810"
     data: "dpdk-performance-changes-3n-hsw-ref"
   compare:
-    title: "rls1904"
+    title: "rls1901"
     data: "dpdk-performance-changes-3n-hsw-cmp"
   data: "dpdk-performance-changes-3n-hsw"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   - "throughput"
 
 # DPDK Performance Changes 3n-hsw 2t2c ndr
-- type: "table"
+-
+  type: "table"
   title: "DPDK Performance Changes 3n-hsw 2t2c ndr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-hsw-2t2c-ndr"
   history:
-    - title: "rls1810"
+    -
+      title: "rls1807"
       data: "dpdk-performance-changes-3n-hsw-h1"
   reference:
-    title: "rls1901"
+    title: "rls1810"
     data: "dpdk-performance-changes-3n-hsw-ref"
   compare:
-    title: "rls1904"
+    title: "rls1901"
     data: "dpdk-performance-changes-3n-hsw-cmp"
   data: "dpdk-performance-changes-3n-hsw"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   - "throughput"
 
 # DPDK Performance Changes 3n-skx 2t1c pdr
-- type: "table"
+-
+  type: "table"
   title: "DPDK Performance Changes 3n-skx 2t1c pdr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-skx-2t1c-pdr"
   history:
-    - title: "rls1810"
+    -
+      title: "rls1807"
       data: "dpdk-performance-changes-3n-skx-h1"
   reference:
-    title: "rls1901"
+    title: "rls1810"
     data: "dpdk-performance-changes-3n-skx-ref"
   compare:
-    title: "rls1904"
+    title: "rls1901"
     data: "dpdk-performance-changes-3n-skx-cmp"
   data: "dpdk-performance-changes-3n-skx"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   - "throughput"
 
 # DPDK Performance Changes 3n-skx 4t2c pdr
-- type: "table"
+-
+  type: "table"
   title: "DPDK Performance Changes 3n-skx 4t2c pdr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-skx-4t2c-pdr"
   history:
-    - title: "rls1810"
+    -
+      title: "rls1807"
       data: "dpdk-performance-changes-3n-skx-h1"
   reference:
-    title: "rls1901"
+    title: "rls1810"
     data: "dpdk-performance-changes-3n-skx-ref"
   compare:
-    title: "rls1904"
+    title: "rls1901"
     data: "dpdk-performance-changes-3n-skx-cmp"
   data: "dpdk-performance-changes-3n-skx"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   - "throughput"
 
 # DPDK Performance Changes 3n-skx 2t1c ndr
-- type: "table"
+-
+  type: "table"
   title: "DPDK Performance Changes 3n-skx 2t1c ndr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-skx-2t1c-ndr"
   history:
-    - title: "rls1810"
+    -
+      title: "rls1807"
       data: "dpdk-performance-changes-3n-skx-h1"
   reference:
-    title: "rls1901"
+    title: "rls1810"
     data: "dpdk-performance-changes-3n-skx-ref"
   compare:
-    title: "rls1904"
+    title: "rls1901"
     data: "dpdk-performance-changes-3n-skx-cmp"
   data: "dpdk-performance-changes-3n-skx"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   - "throughput"
 
 # DPDK Performance Changes 3n-skx 4t2c ndr
-- type: "table"
+-
+  type: "table"
   title: "DPDK Performance Changes 3n-skx 4t2c ndr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-skx-4t2c-ndr"
   history:
-    - title: "rls1810"
+    -
+      title: "rls1807"
       data: "dpdk-performance-changes-3n-skx-h1"
   reference:
-    title: "rls1901"
+    title: "rls1810"
     data: "dpdk-performance-changes-3n-skx-ref"
   compare:
-    title: "rls1904"
+    title: "rls1901"
     data: "dpdk-performance-changes-3n-skx-cmp"
   data: "dpdk-performance-changes-3n-skx"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   - "throughput"
 
 # DPDK Comparison Across Testbeds 3n-hsw to 3n-skx ndr
-- type: "table"
+-
+  type: "table"
   title: "DPDK Comparison Across Testbeds 3n-hsw to 3n-skx ndr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-compare-testbeds-3n-hsw-3n-skx-ndr"
   - "throughput"
 
 # DPDK Comparison Across Testbeds 3n-hsw to 3n-skx pdr
-- type: "table"
+-
+  type: "table"
   title: "DPDK Comparison Across Testbeds 3n-hsw to 3n-skx pdr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-compare-testbeds-3n-hsw-3n-skx-pdr"
   - "throughput"
 
 # DPDK Comparison Across Topologies 3n-skx to 2n-skx ndr
-- type: "table"
+-
+  type: "table"
   title: "DPDK Comparison Across Topologies 3n-skx to 2n-skx ndr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-compare-topologies-3n-skx-2n-skx-ndr"
   - "throughput"
 
 # DPDK Comparison Across Topologies 3n-skx to 2n-skx pdr
-- type: "table"
+-
+  type: "table"
   title: "DPDK Comparison Across Topologies 3n-skx to 2n-skx pdr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-compare-topologies-3n-skx-2n-skx-pdr"
   - "throughput"
 
 # DPDK Performance Changes 2n-skx 2t1c pdr
-- type: "table"
+-
+  type: "table"
   title: "DPDK Performance Changes 2n-skx 2t1c pdr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-skx-2t1c-pdr"
-  history:
-    - title: "rls1810"
-      data: "dpdk-performance-changes-2n-skx-h1"
   reference:
-    title: "rls1901"
+    title: "rls1810"
     data: "dpdk-performance-changes-2n-skx-ref"
   compare:
-    title: "rls1904"
+    title: "rls1901"
     data: "dpdk-performance-changes-2n-skx-cmp"
   data: "dpdk-performance-changes-2n-skx"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   - "throughput"
 
 # DPDK Performance Changes 2n-skx 4t2c pdr
-- type: "table"
+-
+  type: "table"
   title: "DPDK Performance Changes 2n-skx 4t2c pdr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-skx-4t2c-pdr"
-  history:
-    - title: "rls1810"
-      data: "dpdk-performance-changes-2n-skx-h1"
   reference:
-    title: "rls1901"
+    title: "rls1810"
     data: "dpdk-performance-changes-2n-skx-ref"
   compare:
-    title: "rls1904"
+    title: "rls1901"
     data: "dpdk-performance-changes-2n-skx-cmp"
   data: "dpdk-performance-changes-2n-skx"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   - "throughput"
 
 # DPDK Performance Changes 2n-skx 2t1c ndr
-- type: "table"
+-
+  type: "table"
   title: "DPDK Performance Changes 2n-skx 2t1c ndr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-skx-2t1c-ndr"
-  history:
-    - title: "rls1810"
-      data: "dpdk-performance-changes-2n-skx-h1"
   reference:
-    title: "rls1901"
+    title: "rls1810"
     data: "dpdk-performance-changes-2n-skx-ref"
   compare:
-    title: "rls1904"
+    title: "rls1901"
     data: "dpdk-performance-changes-2n-skx-cmp"
   data: "dpdk-performance-changes-2n-skx"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   - "throughput"
 
 # DPDK Performance Changes 2n-skx 4t2c ndr
-- type: "table"
+-
+  type: "table"
   title: "DPDK Performance Changes 2n-skx 4t2c ndr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-skx-4t2c-ndr"
-  history:
-    - title: "rls1810"
-      data: "dpdk-performance-changes-2n-skx-h1"
   reference:
-    title: "rls1901"
+    title: "rls1810"
     data: "dpdk-performance-changes-2n-skx-ref"
   compare:
-    title: "rls1904"
+    title: "rls1901"
     data: "dpdk-performance-changes-2n-skx-cmp"
   data: "dpdk-performance-changes-2n-skx"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   - "throughput"
 
 # Detailed Test Results - DPDK Performance Results 3n-hsw
-- type: "table"
+-
+  type: "table"
   title: "Detailed Test Results - DPDK Performance Results 3n-hsw"
   algorithm: "table_details"
   output-file-ext: ".csv"
   output-file: "{DIR[DTR,PERF,DPDK,3N,HSW]}/dpdk_performance_results_3n_hsw"
   columns:
-  - title: "Name"
+  -
+    title: "Name"
     data: "data name"
-  - title: "Status"
+  -
+    title: "Status"
     data: "data msg"
   rows: "generated"
   data: "dpdk-perf-results-3n-hsw"
   - "msg"
 
 # Detailed Test Results - DPDK Performance Results 3n-skx
-- type: "table"
+-
+  type: "table"
   title: "Detailed Test Results - DPDK Performance Results 3n-skx"
   algorithm: "table_details"
   output-file-ext: ".csv"
   output-file: "{DIR[DTR,PERF,DPDK,3N,SKX]}/dpdk_performance_results_3n_skx"
   columns:
-  - title: "Name"
+  -
+    title: "Name"
     data: "data name"
-  - title: "Status"
+  -
+    title: "Status"
     data: "data msg"
   rows: "generated"
   data: "dpdk-perf-results-3n-skx"
   - "msg"
 
 # Detailed Test Results - DPDK Performance Results 2n-skx
-- type: "table"
+-
+  type: "table"
   title: "Detailed Test Results - DPDK Performance Results 2n-skx"
   algorithm: "table_details"
   output-file-ext: ".csv"
   output-file: "{DIR[DTR,PERF,DPDK,2N,SKX]}/dpdk_performance_results_2n_skx"
   columns:
-  - title: "Name"
+  -
+    title: "Name"
     data: "data name"
-  - title: "Status"
+  -
+    title: "Status"
     data: "data msg"
   rows: "generated"
   data: "dpdk-perf-results-2n-skx"
   - "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"
+## 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
+## NSH SFC
 #-
 #  type: "table"
 #  title: "Detailed Test Results - NSH SFC Functional Results"
 #  - "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"
+## 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
-- type: "file"
+-
+  type: "file"
   title: "VPP Performance Results 3n-hsw"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
   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"
-  filter: "not ('CFS_OPT' or ('NIC_Intel-X520-DA2' and 'IPSECHW') or ('NIC_Cisco-VIC-1385' and '9000B'))"
+  filter: "not 'NDRCHK' and not 'PDRCHK'"
   parameters:
   - "name"
   - "doc"
   data-start-level: 3
 
 # VPP Performance Results 3n-skx
-- type: "file"
+-
+  type: "file"
   title: "VPP Performance Results 3n-skx"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
   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 'CFS_OPT'"
+  filter: "not 'NDRCHK' and not 'PDRCHK'"
   parameters:
   - "name"
   - "doc"
   - "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 'CFS_OPT'"
-  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"
+#-
+#  type: "file"
 #  title: "VPP Performance Results 2n-dnv"
 #  algorithm: "file_test_results"
 #  output-file-ext: ".rst"
 #  data-start-level: 3
 
 # VPP Performance Configuration 3n-hsw
-- type: "file"
+-
+  type: "file"
   title: "VPP Performance Configuration 3n-hsw"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
   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 ('CFS_OPT' or ('NIC_Intel-X520-DA2' and 'IPSECHW') or ('NIC_Cisco-VIC-1385' and '9000B'))"
+  filter: "not 'NDRCHK' and not 'PDRCHK'"
   parameters:
   - "name"
   - "doc"
   data-start-level: 3
 
 # VPP Performance Configuration 3n-skx
-- type: "file"
+-
+  type: "file"
   title: "VPP Performance Configuration 3n-skx"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
   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,SKX]}"
   data: "vpp-perf-results-3n-skx"
-  filter: "not 'CFS_OPT'"
+  filter: "not 'NDRCHK' and not 'PDRCHK'"
   parameters:
   - "name"
   - "doc"
   - "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 'CFS_OPT'"
-  parameters:
-  - "name"
-  - "doc"
-  - "level"
-  - "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"
+#-
+#  type: "file"
 #  title: "VPP Performance Configuration 2n-dnv"
 #  algorithm: "file_test_results"
 #  output-file-ext: ".rst"
 #  data-start-level: 3
 
 # VPP Performance Operational Data 3n-hsw
-- type: "file"
+-
+  type: "file"
   title: "VPP Performance Operational Data 3n-hsw"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
   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 ('CFS_OPT' or ('NIC_Intel-X520-DA2' and 'IPSECHW') or ('NIC_Cisco-VIC-1385' and '9000B'))"
+  filter: "not 'NDRCHK' and not 'PDRCHK'"
   parameters:
   - "name"
   - "doc"
   data-start-level: 3
 
 # VPP Performance Operational Data 3n-skx
-- type: "file"
+-
+  type: "file"
   title: "VPP Performance Operational Data 3n-skx"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
   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,SKX]}"
   data: "vpp-perf-results-3n-skx"
-  filter: "not 'CFS_OPT'"
+  filter: "not 'NDRCHK' and not 'PDRCHK'"
   parameters:
   - "name"
   - "doc"
   - "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 'CFS_OPT'"
-  parameters:
-  - "name"
-  - "doc"
-  - "level"
-  - "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"
+#-
+#  type: "file"
 #  title: "VPP Performance Operational Data 2n-dnv"
 #  algorithm: "file_test_results"
 #  output-file-ext: ".rst"
 #  - "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-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 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-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"
+#-
+#  type: "file"
 #  title: "VPP MRR Results 2n-dnv"
 #  algorithm: "file_test_results"
 #  output-file-ext: ".rst"
 #  - "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-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 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-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"
+#-
+#  type: "file"
 #  title: "VPP MRR Configuration 2n-dnv"
 #  algorithm: "file_test_results"
 #  output-file-ext: ".rst"
 #  data-start-level: 3
 
 # VPP Functional Results - Ubuntu
-- type: "file"
+-
+  type: "file"
   title: "VPP Functional Results - Ubuntu"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
   data-start-level: 3
 
 # VPP Functional Results - CentOS
-- type: "file"
+-
+  type: "file"
   title: "VPP Functional Results - CentOS"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
   data-start-level: 3
 
 # VPP Functional Configuration - Ubuntu
-- type: "file"
+-
+  type: "file"
   title: "VPP Functional Configuration - Ubuntu"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
   data-start-level: 3
 
 # VPP Functional Configuration - CentOS
-- type: "file"
+-
+  type: "file"
   title: "VPP Functional Configuration - CentOS"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
   data-start-level: 3
 
 # VPP Device Results - Ubuntu
-- type: "file"
+-
+  type: "file"
   title: "VPP Device Results - Ubuntu"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
   data-start-level: 2
 
 # VPP Device Configuration - Ubuntu
-- type: "file"
+-
+  type: "file"
   title: "VPP Device Configuration - Ubuntu"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
   data-start-level: 2
 
 ## Container Orchestrated Performance Results 3n-hsw
-#- type: "file"
+#-
+#  type: "file"
 #  title: "Container Orchestrated Performance Results 3n-hsw"
 #  algorithm: "file_test_results"
 #  output-file-ext: ".rst"
 #  data-start-level: 3
 
 # DPDK Performance Results 3n-hsw
-- type: "file"
+-
+  type: "file"
   title: "DPDK Performance Results 3n-hsw"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
   data-start-level: 3
 
 # DPDK Performance Results 3n-skx
-- type: "file"
+-
+  type: "file"
   title: "DPDK Performance Results 3n-skx"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
   data-start-level: 3
 
 # DPDK Performance Results 2n-skx
-- type: "file"
+-
+  type: "file"
   title: "DPDK Performance Results 2n-skx"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
   - "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
+## 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
+## NSH SFC Functional Results
 #-
 #  type: "file"
 #  title: "NSH SFC Functional Results"
 #  - "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
+## 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 (PLRsearch), boxes
-- type: "plot"
-  title: "VPP Critical rate: 2 Hours Soak Test (PLRsearch)"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/soak-test-1"
-  data: "plot-vpp-soak-2n-skx"
-  filter: "('L2BDMACLRN' or 'L2PATCH' or 'L2XCBASE') and not 'VHOST' and not 'MEMIF'"
-  parameters:
-    - "throughput"
-    - "parent"
-    - "tags"
-  sort:
-    - "DRV_AVF"
-    - "DRV_AVF"
-    - "DRV_AVF"
-    - "L2BDMACLRN"
-    - "L2XCBASE"
-    - "L2PATCH"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "all"
-    whiskerwidth: 0
-  layout:
-    title: "2 Hours Soak Test (PLRsearch)"
-    layout: "plot-soak-throughput"
-
-# Soak Test (PLRsearch), boxes
-- type: "plot"
-  title: "VPP Critical rate: 2 Hours Soak Test (PLRsearch)"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/soak-test-2"
-  data: "plot-vpp-soak-2n-skx"
-  filter: "'L2BDMACLRN' and ('VHOST' or 'MEMIF') or 'IP4BASE' or 'IP6BASE'"
-  parameters:
-    - "throughput"
-    - "parent"
-    - "tags"
-  sort:
-    - "VHOST"
-    - "MEMIF"
-    - "IP4FWD"
-    - "IP6FWD"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "all"
-    whiskerwidth: 0
-  layout:
-    title: "2 Hours Soak Test (PLRsearch)"
-    layout: "plot-soak-throughput"
+## 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 - MRR 64b
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
-  algorithm: "plot_service_density_heatmap_compare"
-  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-64b"
-  filter: "'NIC_Intel-X710' and
-           'NF_DENSITY' and
-           'VHOST' and
-           'CHAIN' and
-           'NF_VPPIP4' and
-           '64B' and
-           '2T1C' and
-           'MRR'"
-  reference:
-    include: "2"
-    name: "VNF-1c"
-  compare:
-    include: "1"
-    name: "VNF-0.5c"
-  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-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
-    layout: "plot-service-density"
-
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
-  algorithm: "plot_service_density_heatmap_compare"
-  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-64b"
-  filter: "'NIC_Intel-X710' and
-           'NF_DENSITY' and
-           'VHOST' and
-           'CHAIN' and
-           'NF_VPPIP4' and
-           '64B' and
-           '4T2C' and
-           'MRR'"
-  reference:
-    include: "2"
-    name: "VNF-1c"
-  compare:
-    include: "1"
-    name: "VNF-0.5c"
-  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-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
-    layout: "plot-service-density"
-
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
-  algorithm: "plot_service_density_heatmap_compare"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-8t4c-base-vsc-mrr"
-  data: "plot-vpp-nfv-2n-skx-mrr-64b"
-  filter: "'NIC_Intel-X710' and
-           'NF_DENSITY' and
-           'VHOST' and
-           'CHAIN' and
-           'NF_VPPIP4' and
-           '64B' and
-           '8T4C' and
-           'MRR'"
-  reference:
-    include: "2"
-    name: "VNF-1c"
-  compare:
-    include: "1"
-    name: "VNF-0.5c"
-  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-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
-    layout: "plot-service-density"
-
-# Plots - NF Density - VSC - MRR IMIX
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
-  algorithm: "plot_service_density_heatmap_compare"
-  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-imix"
-  filter: "'NIC_Intel-X710' and
-           'NF_DENSITY' and
-           'VHOST' and
-           'CHAIN' and
-           'NF_VPPIP4' and
-           'IMIX' and
-           '2T1C' and
-           'MRR'"
-  reference:
-    include: "2"
-    name: "VNF-1c"
-  compare:
-    include: "1"
-    name: "VNF-0.5c"
-  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-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
-    layout: "plot-service-density"
-
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
-  algorithm: "plot_service_density_heatmap_compare"
-  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-imix"
-  filter: "'NIC_Intel-X710' and
-           'NF_DENSITY' and
-           'VHOST' and
-           'CHAIN' and
-           'NF_VPPIP4' and
-           'IMIX' and
-           '4T2C' and
-           'MRR'"
-  reference:
-    include: "2"
-    name: "VNF-1c"
-  compare:
-    include: "1"
-    name: "VNF-0.5c"
-  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-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
-    layout: "plot-service-density"
-
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
-  algorithm: "plot_service_density_heatmap_compare"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-8t4c-base-vsc-mrr"
-  data: "plot-vpp-nfv-2n-skx-mrr-imix"
-  filter: "'NIC_Intel-X710' and
-           'NF_DENSITY' and
-           'VHOST' and
-           'CHAIN' and
-           'NF_VPPIP4' and
-           'IMIX' and
-           '8T4C' and
-           'MRR'"
-  reference:
-    include: "2"
-    name: "VNF-1c"
-  compare:
-    include: "1"
-    name: "VNF-0.5c"
-  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-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
-    layout: "plot-service-density"
-
-# Plots - NF Density - VSC - NDR 64b
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-ndr"
-  algorithm: "plot_service_density_heatmap_compare"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-vsc-ndr"
-  data: "plot-vpp-nfv-2n-skx-ndrpdr-64b"
-  filter: "'NIC_Intel-X710' and
-           'NF_DENSITY' and
-           'VHOST' and
-           'CHAIN' and
-           'NF_VPPIP4' and
-           '64B' and
-           '2T1C' and
-           'NDRPDR'"
-  reference:
-    include: "2"
-    name: "VNF-1c"
-  compare:
-    include: "1"
-    name: "VNF-0.5c"
-  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-{Y}ch-{2XY}vh-{XY}vm-vppip4-ndr"
-    layout: "plot-service-density"
-
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-ndr"
-  algorithm: "plot_service_density_heatmap_compare"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-vsc-ndr"
-  data: "plot-vpp-nfv-2n-skx-ndrpdr-64b"
-  filter: "'NIC_Intel-X710' and
-           'NF_DENSITY' and
-           'VHOST' and
-           'CHAIN' and
-           'NF_VPPIP4' and
-           '64B' and
-           '4T2C' and
-           'NDRPDR'"
-  reference:
-    include: "2"
-    name: "VNF-1c"
-  compare:
-    include: "1"
-    name: "VNF-0.5c"
-  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-{Y}ch-{2XY}vh-{XY}vm-vppip4-ndr"
-    layout: "plot-service-density"
-
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-ndr"
-  algorithm: "plot_service_density_heatmap_compare"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-8t4c-base-vsc-ndr"
-  data: "plot-vpp-nfv-2n-skx-ndrpdr-64b"
-  filter: "'NIC_Intel-X710' and
-           'NF_DENSITY' and
-           'VHOST' and
-           'CHAIN' and
-           'NF_VPPIP4' and
-           '64B' and
-           '8T4C' and
-           'NDRPDR'"
-  reference:
-    include: "2"
-    name: "VNF-1c"
-  compare:
-    include: "1"
-    name: "VNF-0.5c"
-  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-{Y}ch-{2XY}vh-{XY}vm-vppip4-ndr"
-    layout: "plot-service-density"
-
-# Plots - NF Density - VSC - NDR IMIX
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-ndr"
-  algorithm: "plot_service_density_heatmap_compare"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-vsc-ndr"
-  data: "plot-vpp-nfv-2n-skx-ndrpdr-imix"
-  filter: "'NIC_Intel-X710' and
-           'NF_DENSITY' and
-           'VHOST' and
-           'CHAIN' and
-           'NF_VPPIP4' and
-           'IMIX' and
-           '2T1C' and
-           'NDRPDR'"
-  reference:
-    include: "2"
-    name: "VNF-1c"
-  compare:
-    include: "1"
-    name: "VNF-0.5c"
-  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-{Y}ch-{2XY}vh-{XY}vm-vppip4-ndr"
-    layout: "plot-service-density"
-
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-ndr"
-  algorithm: "plot_service_density_heatmap_compare"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-vsc-ndr"
-  data: "plot-vpp-nfv-2n-skx-ndrpdr-imix"
-  filter: "'NIC_Intel-X710' and
-           'NF_DENSITY' and
-           'VHOST' and
-           'CHAIN' and
-           'NF_VPPIP4' and
-           'IMIX' and
-           '4T2C' and
-           'NDRPDR'"
-  reference:
-    include: "2"
-    name: "VNF-1c"
-  compare:
-    include: "1"
-    name: "VNF-0.5c"
-  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-{Y}ch-{2XY}vh-{XY}vm-vppip4-ndr"
-    layout: "plot-service-density"
-
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-ndr"
-  algorithm: "plot_service_density_heatmap_compare"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-8t4c-base-vsc-ndr"
-  data: "plot-vpp-nfv-2n-skx-ndrpdr-imix"
-  filter: "'NIC_Intel-X710' and
-           'NF_DENSITY' and
-           'VHOST' and
-           'CHAIN' and
-           'NF_VPPIP4' and
-           'IMIX' and
-           '8T4C' and
-           'NDRPDR'"
-  reference:
-    include: "2"
-    name: "VNF-1c"
-  compare:
-    include: "1"
-    name: "VNF-0.5c"
-  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-{Y}ch-{2XY}vh-{XY}vm-vppip4-ndr"
-    layout: "plot-service-density"
-
-# Plots - NF Density - VSC - PDR 64b
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-pdr"
-  algorithm: "plot_service_density_heatmap_compare"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-vsc-pdr"
-  data: "plot-vpp-nfv-2n-skx-ndrpdr-64b"
-  filter: "'NIC_Intel-X710' and
-           'NF_DENSITY' and
-           'VHOST' and
-           'CHAIN' and
-           'NF_VPPIP4' and
-           '64B' and
-           '2T1C' and
-           'NDRPDR'"
-  reference:
-    include: "2"
-    name: "VNF-1c"
-  compare:
-    include: "1"
-    name: "VNF-0.5c"
-  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-{Y}ch-{2XY}vh-{XY}vm-vppip4-pdr"
-    layout: "plot-service-density"
-
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-pdr"
-  algorithm: "plot_service_density_heatmap_compare"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-vsc-pdr"
-  data: "plot-vpp-nfv-2n-skx-ndrpdr-64b"
-  filter: "'NIC_Intel-X710' and
-           'NF_DENSITY' and
-           'VHOST' and
-           'CHAIN' and
-           'NF_VPPIP4' and
-           '64B' and
-           '4T2C' and
-           'NDRPDR'"
-  reference:
-    include: "2"
-    name: "VNF-1c"
-  compare:
-    include: "1"
-    name: "VNF-0.5c"
-  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-{Y}ch-{2XY}vh-{XY}vm-vppip4-pdr"
-    layout: "plot-service-density"
-
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-pdr"
-  algorithm: "plot_service_density_heatmap_compare"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-8t4c-base-vsc-pdr"
-  data: "plot-vpp-nfv-2n-skx-ndrpdr-64b"
-  filter: "'NIC_Intel-X710' and
-           'NF_DENSITY' and
-           'VHOST' and
-           'CHAIN' and
-           'NF_VPPIP4' and
-           '64B' and
-           '8T4C' and
-           'NDRPDR'"
-  reference:
-    include: "2"
-    name: "VNF-1c"
-  compare:
-    include: "1"
-    name: "VNF-0.5c"
-  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-{Y}ch-{2XY}vh-{XY}vm-vppip4-pdr"
-    layout: "plot-service-density"
+# Plots - NF Density - VSC
 
-# Plots - NF Density - VSC - PDR IMIX
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-pdr"
-  algorithm: "plot_service_density_heatmap_compare"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-vsc-pdr"
-  data: "plot-vpp-nfv-2n-skx-ndrpdr-imix"
-  filter: "'NIC_Intel-X710' and
-           'NF_DENSITY' and
-           'VHOST' and
-           'CHAIN' and
-           'NF_VPPIP4' and
-           'IMIX' and
-           '2T1C' and
-           'NDRPDR'"
-  reference:
-    include: "2"
-    name: "VNF-1c"
-  compare:
-    include: "1"
-    name: "VNF-0.5c"
-  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-{Y}ch-{2XY}vh-{XY}vm-vppip4-pdr"
-    layout: "plot-service-density"
-
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-pdr"
-  algorithm: "plot_service_density_heatmap_compare"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-vsc-pdr"
-  data: "plot-vpp-nfv-2n-skx-ndrpdr-imix"
-  filter: "'NIC_Intel-X710' and
-           'NF_DENSITY' and
-           'VHOST' and
-           'CHAIN' and
-           'NF_VPPIP4' and
-           'IMIX' and
-           '4T2C' and
-           'NDRPDR'"
-  reference:
-    include: "2"
-    name: "VNF-1c"
-  compare:
-    include: "1"
-    name: "VNF-0.5c"
-  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-{Y}ch-{2XY}vh-{XY}vm-vppip4-pdr"
-    layout: "plot-service-density"
-
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-pdr"
-  algorithm: "plot_service_density_heatmap_compare"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-8t4c-base-vsc-pdr"
-  data: "plot-vpp-nfv-2n-skx-ndrpdr-imix"
-  filter: "'NIC_Intel-X710' and
-           'NF_DENSITY' and
-           'VHOST' and
-           'CHAIN' and
-           'NF_VPPIP4' and
-           'IMIX' and
-           '8T4C' and
-           'NDRPDR'"
-  reference:
-    include: "2"
-    name: "VNF-1c"
-  compare:
-    include: "1"
-    name: "VNF-0.5c"
-  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-{Y}ch-{2XY}vh-{XY}vm-vppip4-pdr"
-    layout: "plot-service-density"
-
-################################################################################
-# Plots - NF Density - CSC - MRR 64b
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
-  algorithm: "plot_service_density_heatmap_compare"
-  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-64b"
-  filter: "'NIC_Intel-X710' and
-           'NF_DENSITY' and
-           'DOCKER' and
-           'CHAIN' and
-           'NF_VPPIP4' and
-           '64B' and
-           '2T1C' and
-           'MRR'"
-  reference:
-    include: "2"
-    name: "CNF-1c"
-  compare:
-    include: "1"
-    name: "CNF-0.5c"
-  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-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
-    layout: "plot-service-density"
-
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
-  algorithm: "plot_service_density_heatmap_compare"
-  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-64b"
-  filter: "'NIC_Intel-X710' and
-           'NF_DENSITY' and
-           'DOCKER' and
-           'CHAIN' and
-           'NF_VPPIP4' and
-           '64B' and
-           '4T2C' and
-           'MRR'"
-  reference:
-    include: "2"
-    name: "CNF-1c"
-  compare:
-    include: "1"
-    name: "CNF-0.5c"
-  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-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
-    layout: "plot-service-density"
-
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
-  algorithm: "plot_service_density_heatmap_compare"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-8t4c-base-csc-mrr"
-  data: "plot-vpp-nfv-2n-skx-mrr-64b"
-  filter: "'NIC_Intel-X710' and
-           'NF_DENSITY' and
-           'DOCKER' and
-           'CHAIN' and
-           'NF_VPPIP4' and
-           '64B' and
-           '8T4C' and
-           'MRR'"
-  reference:
-    include: "2"
-    name: "CNF-1c"
-  compare:
-    include: "1"
-    name: "CNF-0.5c"
-  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-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
-    layout: "plot-service-density"
-
-# Plots - NF Density - CSC - MRR IMIX
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
-  algorithm: "plot_service_density_heatmap_compare"
-  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-imix"
-  filter: "'NIC_Intel-X710' and
-           'NF_DENSITY' and
-           'DOCKER' and
-           'CHAIN' and
-           'NF_VPPIP4' and
-           'IMIX' and
-           '2T1C' and
-           'MRR'"
-  reference:
-    include: "2"
-    name: "CNF-1c"
-  compare:
-    include: "1"
-    name: "CNF-0.5c"
-  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-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
-    layout: "plot-service-density"
-
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
-  algorithm: "plot_service_density_heatmap_compare"
-  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-imix"
-  filter: "'NIC_Intel-X710' and
-           'NF_DENSITY' and
-           'DOCKER' and
-           'CHAIN' and
-           'NF_VPPIP4' and
-           'IMIX' and
-           '4T2C' and
-           'MRR'"
-  reference:
-    include: "2"
-    name: "CNF-1c"
-  compare:
-    include: "1"
-    name: "CNF-0.5c"
-  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-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
-    layout: "plot-service-density"
-
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
-  algorithm: "plot_service_density_heatmap_compare"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-8t4c-base-csc-mrr"
-  data: "plot-vpp-nfv-2n-skx-mrr-imix"
-  filter: "'NIC_Intel-X710' and
-           'NF_DENSITY' and
-           'DOCKER' and
-           'CHAIN' and
-           'NF_VPPIP4' and
-           'IMIX' and
-           '8T4C' and
-           'MRR'"
-  reference:
-    include: "2"
-    name: "CNF-1c"
-  compare:
-    include: "1"
-    name: "CNF-0.5c"
-  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-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
-    layout: "plot-service-density"
-
-# Plots - NF Density - CSC - NDR 64b
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-ndr"
-  algorithm: "plot_service_density_heatmap_compare"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-csc-ndr"
-  data: "plot-vpp-nfv-2n-skx-ndrpdr-64b"
-  filter: "'NIC_Intel-X710' and
-           'NF_DENSITY' and
-           'DOCKER' and
-           'CHAIN' and
-           'NF_VPPIP4' and
-           '64B' and
-           '2T1C' and
-           'NDRPDR'"
-  reference:
-    include: "2"
-    name: "CNF-1c"
-  compare:
-    include: "1"
-    name: "CNF-0.5c"
-  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-{Y}ch-{2XY}mif-{XY}dcr-vppip4-ndr"
-    layout: "plot-service-density"
-
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-ndr"
-  algorithm: "plot_service_density_heatmap_compare"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-csc-ndr"
-  data: "plot-vpp-nfv-2n-skx-ndrpdr-64b"
-  filter: "'NIC_Intel-X710' and
-           'NF_DENSITY' and
-           'DOCKER' and
-           'CHAIN' and
-           'NF_VPPIP4' and
-           '64B' and
-           '4T2C' and
-           'NDRPDR'"
-  reference:
-    include: "2"
-    name: "CNF-1c"
-  compare:
-    include: "1"
-    name: "CNF-0.5c"
-  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-{Y}ch-{2XY}mif-{XY}dcr-vppip4-ndr"
-    layout: "plot-service-density"
-
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-ndr"
-  algorithm: "plot_service_density_heatmap_compare"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-8t4c-base-csc-ndr"
-  data: "plot-vpp-nfv-2n-skx-ndrpdr-64b"
-  filter: "'NIC_Intel-X710' and
-           'NF_DENSITY' and
-           'DOCKER' and
-           'CHAIN' and
-           'NF_VPPIP4' and
-           '64B' and
-           '8T4C' and
-           'NDRPDR'"
-  reference:
-    include: "2"
-    name: "CNF-1c"
-  compare:
-    include: "1"
-    name: "CNF-0.5c"
-  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-{Y}ch-{2XY}mif-{XY}dcr-vppip4-ndr"
-    layout: "plot-service-density"
-
-# Plots - NF Density - CSC - NDR IMIX
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-ndr"
-  algorithm: "plot_service_density_heatmap_compare"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-csc-ndr"
-  data: "plot-vpp-nfv-2n-skx-ndrpdr-imix"
-  filter: "'NIC_Intel-X710' and
-           'NF_DENSITY' and
-           'DOCKER' and
-           'CHAIN' and
-           'NF_VPPIP4' and
-           'IMIX' and
-           '2T1C' and
-           'NDRPDR'"
-  reference:
-    include: "2"
-    name: "CNF-1c"
-  compare:
-    include: "1"
-    name: "CNF-0.5c"
-  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-{Y}ch-{2XY}mif-{XY}dcr-vppip4-ndr"
-    layout: "plot-service-density"
-
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-ndr"
-  algorithm: "plot_service_density_heatmap_compare"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-csc-ndr"
-  data: "plot-vpp-nfv-2n-skx-ndrpdr-imix"
-  filter: "'NIC_Intel-X710' and
-           'NF_DENSITY' and
-           'DOCKER' and
-           'CHAIN' and
-           'NF_VPPIP4' and
-           'IMIX' and
-           '4T2C' and
-           'NDRPDR'"
-  reference:
-    include: "2"
-    name: "CNF-1c"
-  compare:
-    include: "1"
-    name: "CNF-0.5c"
-  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-{Y}ch-{2XY}mif-{XY}dcr-vppip4-ndr"
-    layout: "plot-service-density"
-
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-ndr"
-  algorithm: "plot_service_density_heatmap_compare"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-8t4c-base-csc-ndr"
-  data: "plot-vpp-nfv-2n-skx-ndrpdr-imix"
-  filter: "'NIC_Intel-X710' and
-           'NF_DENSITY' and
-           'DOCKER' and
-           'CHAIN' and
-           'NF_VPPIP4' and
-           'IMIX' and
-           '8T4C' and
-           'NDRPDR'"
-  reference:
-    include: "2"
-    name: "CNF-1c"
-  compare:
-    include: "1"
-    name: "CNF-0.5c"
-  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-{Y}ch-{2XY}mif-{XY}dcr-vppip4-ndr"
-    layout: "plot-service-density"
-
-# Plots - NF Density - CSC - PDR 64b
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-pdr"
-  algorithm: "plot_service_density_heatmap_compare"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-csc-pdr"
-  data: "plot-vpp-nfv-2n-skx-ndrpdr-64b"
-  filter: "'NIC_Intel-X710' and
-           'NF_DENSITY' and
-           'DOCKER' and
-           'CHAIN' and
-           'NF_VPPIP4' and
-           '64B' and
-           '2T1C' and
-           'NDRPDR'"
-  reference:
-    include: "2"
-    name: "CNF-1c"
-  compare:
-    include: "1"
-    name: "CNF-0.5c"
-  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-{Y}ch-{2XY}mif-{XY}dcr-vppip4-pdr"
-    layout: "plot-service-density"
-
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-pdr"
-  algorithm: "plot_service_density_heatmap_compare"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-csc-pdr"
-  data: "plot-vpp-nfv-2n-skx-ndrpdr-64b"
-  filter: "'NIC_Intel-X710' and
-           'NF_DENSITY' and
-           'DOCKER' and
-           'CHAIN' and
-           'NF_VPPIP4' and
-           '64B' and
-           '4T2C' and
-           'NDRPDR'"
-  reference:
-    include: "2"
-    name: "CNF-1c"
-  compare:
-    include: "1"
-    name: "CNF-0.5c"
-  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-{Y}ch-{2XY}mif-{XY}dcr-vppip4-pdr"
-    layout: "plot-service-density"
-
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-pdr"
-  algorithm: "plot_service_density_heatmap_compare"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-8t4c-base-csc-pdr"
-  data: "plot-vpp-nfv-2n-skx-ndrpdr-64b"
-  filter: "'NIC_Intel-X710' and
-           'NF_DENSITY' and
-           'DOCKER' and
-           'CHAIN' and
-           'NF_VPPIP4' and
-           '64B' and
-           '8T4C' and
-           'NDRPDR'"
-  reference:
-    include: "2"
-    name: "CNF-1c"
-  compare:
-    include: "1"
-    name: "CNF-0.5c"
-  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-{Y}ch-{2XY}mif-{XY}dcr-vppip4-pdr"
-    layout: "plot-service-density"
-
-# Plots - NF Density - CSC - PDR IMIX
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-pdr"
-  algorithm: "plot_service_density_heatmap_compare"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-csc-pdr"
-  data: "plot-vpp-nfv-2n-skx-ndrpdr-imix"
-  filter: "'NIC_Intel-X710' and
-           'NF_DENSITY' and
-           'DOCKER' and
-           'CHAIN' and
-           'NF_VPPIP4' and
-           'IMIX' and
-           '2T1C' and
-           'NDRPDR'"
-  reference:
-    include: "2"
-    name: "CNF-1c"
-  compare:
-    include: "1"
-    name: "CNF-0.5c"
-  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-{Y}ch-{2XY}mif-{XY}dcr-vppip4-pdr"
-    layout: "plot-service-density"
-
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-pdr"
-  algorithm: "plot_service_density_heatmap_compare"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-csc-pdr"
-  data: "plot-vpp-nfv-2n-skx-ndrpdr-imix"
-  filter: "'NIC_Intel-X710' and
-           'NF_DENSITY' and
-           'DOCKER' and
-           'CHAIN' and
-           'NF_VPPIP4' and
-           'IMIX' and
-           '4T2C' and
-           'NDRPDR'"
-  reference:
-    include: "2"
-    name: "CNF-1c"
-  compare:
-    include: "1"
-    name: "CNF-0.5c"
-  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-{Y}ch-{2XY}mif-{XY}dcr-vppip4-pdr"
-    layout: "plot-service-density"
-
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-pdr"
-  algorithm: "plot_service_density_heatmap_compare"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-8t4c-base-csc-pdr"
-  data: "plot-vpp-nfv-2n-skx-ndrpdr-imix"
-  filter: "'NIC_Intel-X710' and
-           'NF_DENSITY' and
-           'DOCKER' and
-           'CHAIN' and
-           'NF_VPPIP4' and
-           'IMIX' and
-           '8T4C' and
-           'NDRPDR'"
-  reference:
-    include: "2"
-    name: "CNF-1c"
-  compare:
-    include: "1"
-    name: "CNF-0.5c"
-  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-{Y}ch-{2XY}mif-{XY}dcr-vppip4-pdr"
-    layout: "plot-service-density"
-
-################################################################################
-# Plots - NF Density - CSP - MRR 64b
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
-  algorithm: "plot_service_density_heatmap_compare"
-  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-64b"
-  filter: "'NIC_Intel-X710' and
-           'NF_DENSITY' and
-           'DOCKER' and
-           'PIPELINE' and
-           'NF_VPPIP4' and
-           '64B' and
-           '2T1C' and
-           'MRR'"
-  reference:
-    include: "2"
-    name: "CNF-1c"
-  compare:
-    include: "1"
-    name: "CNF-0.5c"
-  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-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
-    layout: "plot-service-density"
-
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
-  algorithm: "plot_service_density_heatmap_compare"
-  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-64b"
-  filter: "'NIC_Intel-X710' and
-           'NF_DENSITY' and
-           'DOCKER' and
-           'PIPELINE' and
-           'NF_VPPIP4' and
-           '64B' and
-           '4T2C' and
-           'MRR'"
-  reference:
-    include: "2"
-    name: "CNF-1c"
-  compare:
-    include: "1"
-    name: "CNF-0.5c"
-  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-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
-    layout: "plot-service-density"
-
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
-  algorithm: "plot_service_density_heatmap_compare"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-8t4c-base-csp-mrr"
-  data: "plot-vpp-nfv-2n-skx-mrr-64b"
-  filter: "'NIC_Intel-X710' and
-           'NF_DENSITY' and
-           'DOCKER' and
-           'PIPELINE' and
-           'NF_VPPIP4' and
-           '64B' and
-           '8T4C' and
-           'MRR'"
-  reference:
-    include: "2"
-    name: "CNF-1c"
-  compare:
-    include: "1"
-    name: "CNF-0.5c"
-  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-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
-    layout: "plot-service-density"
-
-# Plots - NF Density - CSP - MRR IMIX
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
-  algorithm: "plot_service_density_heatmap_compare"
-  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-imix"
-  filter: "'NIC_Intel-X710' and
-           'NF_DENSITY' and
-           'DOCKER' and
-           'PIPELINE' and
-           'NF_VPPIP4' and
-           'IMIX' and
-           '2T1C' and
-           'MRR'"
-  reference:
-    include: "2"
-    name: "CNF-1c"
-  compare:
-    include: "1"
-    name: "CNF-0.5c"
-  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-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
-    layout: "plot-service-density"
-
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
-  algorithm: "plot_service_density_heatmap_compare"
-  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-imix"
-  filter: "'NIC_Intel-X710' and
-           'NF_DENSITY' and
-           'DOCKER' and
-           'PIPELINE' and
-           'NF_VPPIP4' and
-           'IMIX' and
-           '4T2C' and
-           'MRR'"
-  reference:
-    include: "2"
-    name: "CNF-1c"
-  compare:
-    include: "1"
-    name: "CNF-0.5c"
-  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-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
-    layout: "plot-service-density"
-
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
-  algorithm: "plot_service_density_heatmap_compare"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-8t4c-base-csp-mrr"
-  data: "plot-vpp-nfv-2n-skx-mrr-imix"
-  filter: "'NIC_Intel-X710' and
-           'NF_DENSITY' and
-           'DOCKER' and
-           'PIPELINE' and
-           'NF_VPPIP4' and
-           'IMIX' and
-           '8T4C' and
-           'MRR'"
-  reference:
-    include: "2"
-    name: "CNF-1c"
-  compare:
-    include: "1"
-    name: "CNF-0.5c"
-  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-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
-    layout: "plot-service-density"
-
-# Plots - NF Density - CSP - NDR 64b
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
-  algorithm: "plot_service_density_heatmap_compare"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-csp-ndr"
-  data: "plot-vpp-nfv-2n-skx-ndrpdr-64b"
-  filter: "'NIC_Intel-X710' and
-           'NF_DENSITY' and
-           'DOCKER' and
-           'PIPELINE' and
-           'NF_VPPIP4' and
-           '64B' and
-           '2T1C' and
-           'NDRPDR'"
-  reference:
-    include: "2"
-    name: "CNF-1c"
-  compare:
-    include: "1"
-    name: "CNF-0.5c"
-  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-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
-    layout: "plot-service-density"
-
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
-  algorithm: "plot_service_density_heatmap_compare"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-csp-ndr"
-  data: "plot-vpp-nfv-2n-skx-ndrpdr-64b"
-  filter: "'NIC_Intel-X710' and
-           'NF_DENSITY' and
-           'DOCKER' and
-           'PIPELINE' and
-           'NF_VPPIP4' and
-           '64B' and
-           '4T2C' and
-           'NDRPDR'"
-  reference:
-    include: "2"
-    name: "CNF-1c"
-  compare:
-    include: "1"
-    name: "CNF-0.5c"
-  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-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
-    layout: "plot-service-density"
-
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
-  algorithm: "plot_service_density_heatmap_compare"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-8t4c-base-csp-ndr"
-  data: "plot-vpp-nfv-2n-skx-ndrpdr-64b"
-  filter: "'NIC_Intel-X710' and
-           'NF_DENSITY' and
-           'DOCKER' and
-           'PIPELINE' and
-           'NF_VPPIP4' and
-           '64B' and
-           '8T4C' and
-           'NDRPDR'"
-  reference:
-    include: "2"
-    name: "CNF-1c"
-  compare:
-    include: "1"
-    name: "CNF-0.5c"
-  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-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
-    layout: "plot-service-density"
-
-# Plots - NF Density - CSP - NDR IMIX
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
-  algorithm: "plot_service_density_heatmap_compare"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-csp-ndr"
-  data: "plot-vpp-nfv-2n-skx-ndrpdr-imix"
-  filter: "'NIC_Intel-X710' and
-           'NF_DENSITY' and
-           'DOCKER' and
-           'PIPELINE' and
-           'NF_VPPIP4' and
-           'IMIX' and
-           '2T1C' and
-           'NDRPDR'"
-  reference:
-    include: "2"
-    name: "CNF-1c"
-  compare:
-    include: "1"
-    name: "CNF-0.5c"
-  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-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
-    layout: "plot-service-density"
-
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
-  algorithm: "plot_service_density_heatmap_compare"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-csp-ndr"
-  data: "plot-vpp-nfv-2n-skx-ndrpdr-imix"
-  filter: "'NIC_Intel-X710' and
-           'NF_DENSITY' and
-           'DOCKER' and
-           'PIPELINE' and
-           'NF_VPPIP4' and
-           'IMIX' and
-           '4T2C' and
-           'NDRPDR'"
-  reference:
-    include: "2"
-    name: "CNF-1c"
-  compare:
-    include: "1"
-    name: "CNF-0.5c"
-  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-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
-    layout: "plot-service-density"
-
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
-  algorithm: "plot_service_density_heatmap_compare"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-8t4c-base-csp-ndr"
-  data: "plot-vpp-nfv-2n-skx-ndrpdr-imix"
-  filter: "'NIC_Intel-X710' and
-           'NF_DENSITY' and
-           'DOCKER' and
-           'PIPELINE' and
-           'NF_VPPIP4' and
-           'IMIX' and
-           '8T4C' and
-           'NDRPDR'"
-  reference:
-    include: "2"
-    name: "CNF-1c"
-  compare:
-    include: "1"
-    name: "CNF-0.5c"
-  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-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
-    layout: "plot-service-density"
-
-# Plots - NF Density - CSP - PDR 64b
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
-  algorithm: "plot_service_density_heatmap_compare"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-csp-pdr"
-  data: "plot-vpp-nfv-2n-skx-ndrpdr-64b"
-  filter: "'NIC_Intel-X710' and
-           'NF_DENSITY' and
-           'DOCKER' and
-           'PIPELINE' and
-           'NF_VPPIP4' and
-           '64B' and
-           '2T1C' and
-           'NDRPDR'"
-  reference:
-    include: "2"
-    name: "CNF-1c"
-  compare:
-    include: "1"
-    name: "CNF-0.5c"
-  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-{Y}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
-    layout: "plot-service-density"
-
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
-  algorithm: "plot_service_density_heatmap_compare"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-csp-pdr"
-  data: "plot-vpp-nfv-2n-skx-ndrpdr-64b"
-  filter: "'NIC_Intel-X710' and
-           'NF_DENSITY' and
-           'DOCKER' and
-           'PIPELINE' and
-           'NF_VPPIP4' and
-           '64B' and
-           '4T2C' and
-           'NDRPDR'"
-  reference:
-    include: "2"
-    name: "CNF-1c"
-  compare:
-    include: "1"
-    name: "CNF-0.5c"
-  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-{Y}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
-    layout: "plot-service-density"
-
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
-  algorithm: "plot_service_density_heatmap_compare"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-8t4c-base-csp-pdr"
-  data: "plot-vpp-nfv-2n-skx-ndrpdr-64b"
-  filter: "'NIC_Intel-X710' and
-           'NF_DENSITY' and
-           'DOCKER' and
-           'PIPELINE' and
-           'NF_VPPIP4' and
-           '64B' and
-           '8T4C' and
-           'NDRPDR'"
-  reference:
-    include: "2"
-    name: "CNF-1c"
-  compare:
-    include: "1"
-    name: "CNF-0.5c"
-  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-{Y}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
-    layout: "plot-service-density"
-
-# Plots - NF Density - CSP - PDR IMIX
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
-  algorithm: "plot_service_density_heatmap_compare"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-csp-pdr"
-  data: "plot-vpp-nfv-2n-skx-ndrpdr-imix"
-  filter: "'NIC_Intel-X710' and
-           'NF_DENSITY' and
-           'DOCKER' and
-           'PIPELINE' and
-           'NF_VPPIP4' and
-           'IMIX' and
-           '2T1C' and
-           'NDRPDR'"
-  reference:
-    include: "2"
-    name: "CNF-1c"
-  compare:
-    include: "1"
-    name: "CNF-0.5c"
-  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-{Y}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
-    layout: "plot-service-density"
-
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
-  algorithm: "plot_service_density_heatmap_compare"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-csp-pdr"
-  data: "plot-vpp-nfv-2n-skx-ndrpdr-imix"
-  filter: "'NIC_Intel-X710' and
-           'NF_DENSITY' and
-           'DOCKER' and
-           'PIPELINE' and
-           'NF_VPPIP4' and
-           'IMIX' and
-           '4T2C' and
-           'NDRPDR'"
-  reference:
-    include: "2"
-    name: "CNF-1c"
-  compare:
-    include: "1"
-    name: "CNF-0.5c"
-  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-{Y}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
-    layout: "plot-service-density"
-
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
-  algorithm: "plot_service_density_heatmap_compare"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-8t4c-base-csp-pdr"
-  data: "plot-vpp-nfv-2n-skx-ndrpdr-imix"
-  filter: "'NIC_Intel-X710' and
-           'NF_DENSITY' and
-           'DOCKER' and
-           'PIPELINE' and
-           'NF_VPPIP4' and
-           'IMIX' and
-           '8T4C' and
-           'NDRPDR'"
-  reference:
-    include: "2"
-    name: "CNF-1c"
-  compare:
-    include: "1"
-    name: "CNF-0.5c"
-  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-{Y}pl-{2Y}mif-{XY}dcr-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-iacl
-- type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-1t1c-features-iacl-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-1t1c-features-iacl-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           '1T1C' and
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'IACL' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
-           not 'MACIP' and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l2sw-3n-hsw-x520-64b-1t1c-features-iacl-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-1t1c-features-iacl-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-1t1c-features-iacl-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           '1T1C' and
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'IACL' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
-           not 'MACIP' and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l2sw-3n-hsw-x520-64b-1t1c-features-iacl-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-2t2c-features-iacl-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-2t2c-features-iacl-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           '2T2C' and
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'IACL' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
-           not 'MACIP' and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l2sw-3n-hsw-x520-64b-2t2c-features-iacl-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-2t2c-features-iacl-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-2t2c-features-iacl-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           '2T2C' and
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'IACL' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
-           not 'MACIP' and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l2sw-3n-hsw-x520-64b-2t2c-features-iacl-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP L2 3n-hsw-x520 features-oacl
-- type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-1t1c-features-oacl-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-1t1c-features-oacl-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           '1T1C' and
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'OACL' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
-           not 'MACIP' and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l2sw-3n-hsw-x520-64b-1t1c-features-oacl-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-1t1c-features-oacl-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-1t1c-features-oacl-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           '1T1C' and
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'OACL' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
-           not 'MACIP' and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l2sw-3n-hsw-x520-64b-1t1c-features-oacl-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-2t2c-features-oacl-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-2t2c-features-oacl-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           '2T2C' and
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'OACL' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
-           not 'MACIP' and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l2sw-3n-hsw-x520-64b-2t2c-features-oacl-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-2t2c-features-oacl-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-2t2c-features-oacl-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           '2T2C' and
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'OACL' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
-           not 'MACIP' and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l2sw-3n-hsw-x520-64b-2t2c-features-oacl-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP L2 3n-hsw-x520 features-macip
-- type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-1t1c-features-macip-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-1t1c-features-macip-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           '1T1C' and
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'MACIP' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l2sw-3n-hsw-x520-64b-1t1c-features-macip-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-1t1c-features-macip-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-1t1c-features-macip-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           '1T1C' and
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'MACIP' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l2sw-3n-hsw-x520-64b-1t1c-features-macip-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-2t2c-features-macip-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-2t2c-features-macip-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           '2T2C' and
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'MACIP' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l2sw-3n-hsw-x520-64b-2t2c-features-macip-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-2t2c-features-macip-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-2t2c-features-macip-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           '2T2C' and
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'MACIP' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l2sw-3n-hsw-x520-64b-2t2c-features-macip-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-x710 features-iacl
-- type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x710-64b-1t1c-features-iacl-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-1t1c-features-iacl-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '1T1C' and
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'IACL' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
-           not 'MACIP' and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l2sw-3n-hsw-x710-64b-1t1c-features-iacl-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x710-64b-1t1c-features-iacl-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-1t1c-features-iacl-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '1T1C' and
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'IACL' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
-           not 'MACIP' and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l2sw-3n-hsw-x710-64b-1t1c-features-iacl-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x710-64b-2t2c-features-iacl-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-2t2c-features-iacl-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '2T2C' and
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'IACL' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
-           not 'MACIP' and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l2sw-3n-hsw-x710-64b-2t2c-features-iacl-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x710-64b-2t2c-features-iacl-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-2t2c-features-iacl-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '2T2C' and
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'IACL' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
-           not 'MACIP' and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l2sw-3n-hsw-x710-64b-2t2c-features-iacl-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"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'ETH' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF' and
-           not 'DRV_AVF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: l2sw-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'ETH' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF' and
-           not 'DRV_AVF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l2sw-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'ETH' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF' and
-           not 'DRV_AVF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: l2sw-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'ETH' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF' and
-           not 'DRV_AVF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l2sw-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP L2 3n-skx-x710 features
-- type: "plot"
-  title: "VPP Throughput: l2sw-3n-skx-x710-64b-2t1c-features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-2t1c-features-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '2T1C' and
-           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
-           not 'ACL' and
-           not 'VHOST' and
-           not 'DRV_AVF' and
-           not 'L2OVRLAY' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCBASE"    # l2xcbase
-  - "L2BDBASE"    # l2bdbase
-  - "L2XCFWD"     # dot1q-l2xcbase
-  - "L2BDMACLRN"  # dot1q-l2bdbase
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l2sw-3n-skx-x710-64b-2t1c-features-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: l2sw-3n-skx-x710-64b-2t1c-features-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-2t1c-features-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '2T1C' and
-           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
-           not 'ACL' and
-           not 'VHOST' and
-           not 'DRV_AVF' and
-           not 'L2OVRLAY' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCBASE"    # l2xcbase
-  - "L2BDBASE"    # l2bdbase
-  - "L2XCFWD"     # dot1q-l2xcbase
-  - "L2BDMACLRN"  # dot1q-l2bdbase
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l2sw-3n-skx-x710-64b-2t1c-features-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: l2sw-3n-skx-x710-64b-4t2c-features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-4t2c-features-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '4T2C' and
-           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
-           not 'ACL' and
-           not 'VHOST' and
-           not 'DRV_AVF' and
-           not 'L2OVRLAY' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCBASE"    # l2xcbase
-  - "L2BDBASE"    # l2bdbase
-  - "L2XCFWD"     # dot1q-l2xcbase
-  - "L2BDMACLRN"  # dot1q-l2bdbase
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l2sw-3n-skx-x710-64b-4t2c-features-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: l2sw-3n-skx-x710-64b-4t2c-features-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-4t2c-features-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '4T2C' and
-           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
-           not 'ACL' and
-           not 'VHOST' and
-           not 'DRV_AVF' and
-           not 'L2OVRLAY' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCBASE"    # l2xcbase
-  - "L2BDBASE"    # l2bdbase
-  - "L2XCFWD"     # dot1q-l2xcbase
-  - "L2BDMACLRN"  # dot1q-l2bdbase
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l2sw-3n-skx-x710-64b-4t2c-features-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP L2 3n-skx-x710 features-iacl
-- type: "plot"
-  title: "VPP Throughput: l2sw-3n-skx-x710-64b-2t1c-features-iacl-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-2t1c-features-iacl-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '2T1C' and
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'IACL' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
-           not 'MACIP' and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l2sw-3n-skx-x710-64b-2t1c-features-iacl-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: l2sw-3n-skx-x710-64b-2t1c-features-iacl-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-2t1c-features-iacl-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '2T1C' and
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'IACL' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
-           not 'MACIP' and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l2sw-3n-skx-x710-64b-2t1c-features-iacl-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: l2sw-3n-skx-x710-64b-4t2c-features-iacl-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-4t2c-features-iacl-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '4T2C' and
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'IACL' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
-           not 'MACIP' and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l2sw-3n-skx-x710-64b-4t2c-features-iacl-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: l2sw-3n-skx-x710-64b-4t2c-features-iacl-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-4t2c-features-iacl-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '4T2C' and
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'IACL' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
-           not 'MACIP' and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l2sw-3n-skx-x710-64b-4t2c-features-iacl-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP L2 3n-skx-xxv710 base
-- type: "plot"
-  title: "VPP Throughput: l2sw-3n-skx-xxv710-64b-2t1c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-2t1c-base-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'ETH' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "L2BDMACLRN"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l2sw-3n-skx-xxv710-64b-2t1c-base-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: l2sw-3n-skx-xxv710-64b-2t1c-base-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-2t1c-base-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'ETH' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "L2BDMACLRN"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l2sw-3n-skx-xxv710-64b-2t1c-base-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: l2sw-3n-skx-xxv710-64b-4t2c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-4t2c-base-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'ETH' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "L2BDMACLRN"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l2sw-3n-skx-xxv710-64b-4t2c-base-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: l2sw-3n-skx-xxv710-64b-4t2c-base-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-4t2c-base-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'ETH' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "L2BDMACLRN"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l2sw-3n-skx-xxv710-64b-4t2c-base-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"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  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
-           ('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-2t1c-base_and_features-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: memif-3n-skx-x710-64b-2t1c-base_and_features-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-2t1c-base_and_features-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "memif-3n-skx-x710-64b-2t1c-base_and_features-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: memif-3n-skx-x710-64b-4t2c-base_and_features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-4t2c-base_and_features-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "memif-3n-skx-x710-64b-4t2c-base_and_features-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: memif-3n-skx-x710-64b-4t2c-base_and_features-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-4t2c-base_and_features-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  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-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'L2XCFWD' and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-ndr"
-#    layout: "plot-throughput"
-#
-#- type: "plot"
-#  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-pdr"
-#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'L2XCFWD' and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-pdr"
-#    layout: "plot-throughput"
-#
-#- type: "plot"
-#  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-ndr"
-#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'L2XCFWD' and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-ndr"
-#    layout: "plot-throughput"
-#
-#- type: "plot"
-#  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-pdr"
-#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'L2XCFWD' and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-pdr"
-#    layout: "plot-throughput"
-#
-## Packet Throughput - VPP Container Orchestrated Memif 3n-hsw-x520 l2bd
-#- type: "plot"
-#  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-ndr"
-#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '1T1C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN') and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-ndr"
-#    layout: "plot-throughput"
-#
-#- type: "plot"
-#  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-pdr"
-#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '1T1C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN') and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-pdr"
-#    layout: "plot-throughput"
-#
-#- type: "plot"
-#  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-ndr"
-#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '2T2C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN') and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-ndr"
-#    layout: "plot-throughput"
-#
-#- type: "plot"
-#  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-pdr"
-#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '2T2C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN') and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-pdr"
-#    layout: "plot-throughput"
-#
-## Packet Throughput - VPP Container Orchestrated Memif 3n-hsw-x710 l2xc
-#- type: "plot"
-#  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-ndr"
-#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'L2XCFWD' and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-ndr"
-#    layout: "plot-throughput"
-#
-#- type: "plot"
-#  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-pdr"
-#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'L2XCFWD' and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-pdr"
-#    layout: "plot-throughput"
-#
-#- type: "plot"
-#  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-ndr"
-#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'L2XCFWD' and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-ndr"
-#    layout: "plot-throughput"
-#
-#- type: "plot"
-#  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-pdr"
-#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'L2XCFWD' and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-pdr"
-#    layout: "plot-throughput"
-#
-## Packet Throughput - VPP Container Orchestrated Memif 3n-hsw-x710 l2bd
-#- type: "plot"
-#  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-ndr"
-#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '1T1C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN') and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-ndr"
-#    layout: "plot-throughput"
-#
-#- type: "plot"
-#  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-pdr"
-#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '1T1C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN') and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-pdr"
-#    layout: "plot-throughput"
-#
-#- type: "plot"
-#  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-ndr"
-#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '2T2C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN') and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-ndr"
-#    layout: "plot-throughput"
-#
-#- type: "plot"
-#  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-pdr"
-#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           '2T2C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN') and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-pdr"
-#    layout: "plot-throughput"
-
-################################################################################
-
-# Packet Throughput - VPP IPv4 3n-hsw-x520 base and scale
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '1T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '1T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '2T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '2T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP IPv4 3n-hsw-x520 features
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('IP4BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            ('NAT44' and 'BASE') or
-            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
-           'NDRPDR' and
-           '1T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "DOT1Q"
-  - "IP4BASE"
-  - "NAT44"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACL"
-  - "OACL"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-x520-64b-1t1c-features-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-features-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('IP4BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            ('NAT44' and 'BASE') or
-            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
-           'NDRPDR' and
-           '1T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "DOT1Q"
-  - "IP4BASE"
-  - "NAT44"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACL"
-  - "OACL"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-x520-64b-1t1c-features-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('IP4BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            ('NAT44' and 'BASE') or
-            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
-           'NDRPDR' and
-           '2T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "DOT1Q"
-  - "IP4BASE"
-  - "NAT44"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACL"
-  - "OACL"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-x520-64b-2t2c-features-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-features-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('IP4BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            ('NAT44' and 'BASE') or
-            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
-           'NDRPDR' and
-           '2T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "DOT1Q"
-  - "IP4BASE"
-  - "NAT44"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACL"
-  - "OACL"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-x520-64b-2t2c-features-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP IPv4 3n-hsw-x520 features nat44
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-features-nat44-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-nat44-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           '1T1C' and
-           'IP4FWD' and
-           ('NAT44' or 'IP4BASE') and
-           not 'DOT1Q' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "BASE"
-  - "SRC_USER_10"
-  - "SRC_USER_100"
-  - "SRC_USER_1000"
-  - "SRC_USER_2000"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-x520-64b-1t1c-features-nat44-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-features-nat44-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-nat44-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           '1T1C' and
-           'IP4FWD' and
-           ('NAT44' or 'IP4BASE') and
-           not 'DOT1Q' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "BASE"
-  - "SRC_USER_10"
-  - "SRC_USER_100"
-  - "SRC_USER_1000"
-  - "SRC_USER_2000"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-x520-64b-1t1c-features-nat44-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-features-nat44-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-nat44-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           '2T2C' and
-           'IP4FWD' and
-           ('NAT44' or 'IP4BASE') and
-           not 'DOT1Q' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "BASE"
-  - "SRC_USER_10"
-  - "SRC_USER_100"
-  - "SRC_USER_1000"
-  - "SRC_USER_2000"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-x520-64b-2t2c-features-nat44-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-features-nat44-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-nat44-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           '2T2C' and
-           'IP4FWD' and
-           ('NAT44' or 'IP4BASE') and
-           not 'DOT1Q' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "BASE"
-  - "SRC_USER_10"
-  - "SRC_USER_100"
-  - "SRC_USER_1000"
-  - "SRC_USER_2000"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-x520-64b-2t2c-features-nat44-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP IPv4 3n-hsw-x520 features iacl
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-features-iacl-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-iacl-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           '1T1C' and
-           'IP4FWD' and
-           (('IACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-x520-64b-1t1c-features-iacl-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-features-iacl-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-iacl-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           '1T1C' and
-           'IP4FWD' and
-           (('IACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-x520-64b-1t1c-features-iacl-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-features-iacl-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-iacl-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           '2T2C' and
-           'IP4FWD' and
-           (('IACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-x520-64b-2t2c-features-iacl-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-features-iacl-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-iacl-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           '2T2C' and
-           'IP4FWD' and
-           (('IACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-x520-64b-2t2c-features-iacl-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP IPv4 3n-hsw-x520 features oacl
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-features-oacl-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-oacl-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           '1T1C' and
-           'IP4FWD' and
-           (('OACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-x520-64b-1t1c-features-oacl-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-features-oacl-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-oacl-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           '1T1C' and
-           'IP4FWD' and
-           (('OACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-x520-64b-1t1c-features-oacl-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-features-oacl-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-oacl-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           '2T2C' and
-           'IP4FWD' and
-           (('OACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-x520-64b-2t2c-features-oacl-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-features-oacl-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-oacl-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           '2T2C' and
-           'IP4FWD' and
-           (('OACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-x520-64b-2t2c-features-oacl-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP IPv4 3n-hsw-x710 base and scale
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '1T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '1T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '2T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '2T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP IPv4 3n-hsw-x710 features
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('IP4BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            ('NAT44' and 'BASE') or
-            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
-           'NDRPDR' and
-           '1T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "DOT1Q"
-  - "IP4BASE"
-  - "NAT44"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACL"
-  - "OACL"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-x710-64b-1t1c-features-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-features-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('IP4BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            ('NAT44' and 'BASE') or
-            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
-           'NDRPDR' and
-           '1T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "DOT1Q"
-  - "IP4BASE"
-  - "NAT44"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACL"
-  - "OACL"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-x710-64b-1t1c-features-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('IP4BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            ('NAT44' and 'BASE') or
-            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
-           'NDRPDR' and
-           '2T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "DOT1Q"
-  - "IP4BASE"
-  - "NAT44"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACL"
-  - "OACL"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-x710-64b-2t2c-features-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-features-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('IP4BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            ('NAT44' and 'BASE') or
-            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
-           'NDRPDR' and
-           '2T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "DOT1Q"
-  - "IP4BASE"
-  - "NAT44"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACL"
-  - "OACL"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-x710-64b-2t2c-features-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP IPv4 3n-hsw-x710 features nat44
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-nat44-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-nat44-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '2T1C' and
-           'IP4FWD' and
-           ('NAT44' or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "BASE"
-  - "SRC_USER_10"
-  - "SRC_USER_100"
-  - "SRC_USER_1000"
-  - "SRC_USER_2000"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-skx-x710-64b-2t1c-features-nat44-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-nat44-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-nat44-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '2T1C' and
-           'IP4FWD' and
-           ('NAT44' or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "BASE"
-  - "SRC_USER_10"
-  - "SRC_USER_100"
-  - "SRC_USER_1000"
-  - "SRC_USER_2000"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-skx-x710-64b-2t1c-features-nat44-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-nat44-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-nat44-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '4T2C' and
-           'IP4FWD' and
-           ('NAT44' or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "BASE"
-  - "SRC_USER_10"
-  - "SRC_USER_100"
-  - "SRC_USER_1000"
-  - "SRC_USER_2000"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-skx-x710-64b-4t2c-features-nat44-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-nat44-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-nat44-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '4T2C' and
-           'IP4FWD' and
-           ('NAT44' or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "BASE"
-  - "SRC_USER_10"
-  - "SRC_USER_100"
-  - "SRC_USER_1000"
-  - "SRC_USER_2000"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-skx-x710-64b-4t2c-features-nat44-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP IPv4 3n-hsw-x710 features iacl
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-iacl-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-iacl-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '2T1C' and
-           'IP4FWD' and
-           ('IACL' and ('ACL10' or 'ACL50') and '10K_FLOWS' or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-skx-x710-64b-2t1c-features-iacl-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-iacl-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-iacl-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '2T1C' and
-           'IP4FWD' and
-           ('IACL' and ('ACL10' or 'ACL50') and '10K_FLOWS' or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-skx-x710-64b-2t1c-features-iacl-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-iacl-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-iacl-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '4T2C' and
-           'IP4FWD' and
-           ('IACL' and ('ACL10' or 'ACL50') and '10K_FLOWS' or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-skx-x710-64b-4t2c-features-iacl-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-iacl-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-iacl-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '4T2C' and
-           'IP4FWD' and
-           ('IACL' and ('ACL10' or 'ACL50') and '10K_FLOWS' or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-skx-x710-64b-4t2c-features-iacl-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP IPv4 3n-hsw-xl710 base and scale
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-xl710-64b-1t1c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-1t1c-base-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '1T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-xl710-64b-1t1c-base-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-xl710-64b-1t1c-base-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-1t1c-base-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '1T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-xl710-64b-1t1c-base-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-xl710-64b-2t2c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-2t2c-base-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '2T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-xl710-64b-2t2c-base-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-xl710-64b-2t2c-base-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-2t2c-base-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '2T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-xl710-64b-2t2c-base-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP IPv4 3n-skx-x710 base and scale
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '2T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '2T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '4T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '4T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP IPv4 3n-skx-x710 features
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('IP4BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            ('NAT44' and 'BASE') or
-            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
-           'NDRPDR' and
-           '2T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "DOT1Q"
-  - "IP4BASE"
-  - "NAT44"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACL"
-  - "OACL"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-skx-x710-64b-2t1c-features-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('IP4BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            ('NAT44' and 'BASE') or
-            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
-           'NDRPDR' and
-           '2T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "DOT1Q"
-  - "IP4BASE"
-  - "NAT44"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACL"
-  - "OACL"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-skx-x710-64b-2t1c-features-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('IP4BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            ('NAT44' and 'BASE') or
-            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
-           'NDRPDR' and
-           '4T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "DOT1Q"
-  - "IP4BASE"
-  - "NAT44"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACL"
-  - "OACL"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-skx-x710-64b-4t2c-features-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('IP4BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            ('NAT44' and 'BASE') or
-            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
-           'NDRPDR' and
-           '4T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "DOT1Q"
-  - "IP4BASE"
-  - "NAT44"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACL"
-  - "OACL"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-skx-x710-64b-4t2c-features-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP IPv4 3n-skx-x710 features nat44
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-features-nat44-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-nat44-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '1T1C' and
-           'IP4FWD' and
-           ('NAT44' or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "BASE"
-  - "SRC_USER_10"
-  - "SRC_USER_100"
-  - "SRC_USER_1000"
-  - "SRC_USER_2000"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-x710-64b-1t1c-features-nat44-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-features-nat44-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-nat44-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '1T1C' and
-           'IP4FWD' and
-           ('NAT44' or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "BASE"
-  - "SRC_USER_10"
-  - "SRC_USER_100"
-  - "SRC_USER_1000"
-  - "SRC_USER_2000"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-x710-64b-1t1c-features-nat44-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-features-nat44-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-nat44-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '2T2C' and
-           'IP4FWD' and
-           ('NAT44' or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "BASE"
-  - "SRC_USER_10"
-  - "SRC_USER_100"
-  - "SRC_USER_1000"
-  - "SRC_USER_2000"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-x710-64b-2t2c-features-nat44-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-features-nat44-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-nat44-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '2T2C' and
-           'IP4FWD' and
-           ('NAT44' or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "BASE"
-  - "SRC_USER_10"
-  - "SRC_USER_100"
-  - "SRC_USER_1000"
-  - "SRC_USER_2000"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-x710-64b-2t2c-features-nat44-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP IPv4 3n-skx-x710 features iacl
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-features-iacl-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-iacl-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '1T1C' and
-           'IP4FWD' and
-           ('IACL' and ('ACL10' or 'ACL50') and '10K_FLOWS' or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-x710-64b-1t1c-features-iacl-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-features-iacl-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-iacl-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '1T1C' and
-           'IP4FWD' and
-           ('IACL' and ('ACL10' or 'ACL50') and '10K_FLOWS' or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-x710-64b-1t1c-features-iacl-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-features-iacl-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-iacl-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '2T2C' and
-           'IP4FWD' and
-           ('IACL' and ('ACL10' or 'ACL50') and '10K_FLOWS' or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-x710-64b-2t2c-features-iacl-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-features-iacl-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-iacl-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '2T2C' and
-           'IP4FWD' and
-           ('IACL' and ('ACL10' or 'ACL50') and '10K_FLOWS' or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-x710-64b-2t2c-features-iacl-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP IPv4 2n-skx-x710 base and scale
-- type: "plot"
-  title: "VPP Throughput: ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '2T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '2T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '4T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '4T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP IPv4 2n-skx-x710 features iacl
-- type: "plot"
-  title: "VPP Throughput: ip4-2n-skx-x710-64b-2t1c-features-iacl-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-2t1c-features-iacl-ndr"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           (('IACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
-           'NDRPDR' and
-           '2T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-2n-skx-x710-64b-2t1c-features-iacl-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-2n-skx-x710-64b-2t1c-features-iacl-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-2t1c-features-iacl-pdr"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           (('IACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
-           'NDRPDR' and
-           '2T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-2n-skx-x710-64b-2t1c-features-iacl-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-2n-skx-x710-64b-4t2c-features-iacl-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-4t2c-features-iacl-ndr"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           (('IACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
-           'NDRPDR' and
-           '4T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-2n-skx-x710-64b-4t2c-features-iacl-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-2n-skx-x710-64b-4t2c-features-iacl-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-4t2c-features-iacl-pdr"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           (('IACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
-           'NDRPDR' and
-           '4T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-2n-skx-x710-64b-4t2c-features-iacl-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP IPv4 2n-skx-xxv710 base and scale
-- type: "plot"
-  title: "VPP Throughput: ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '2T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '2T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '4T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '4T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
-## Packet Throughput - VPP IPv4 2n-dnv-x553 base and scale
-#- type: "plot"
-#  title: "VPP Throughput: ip4-2n-dnv-x553-64b-1t1c-base-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-2n-dnv-x553-64b-1t1c-base-ndr"
-#  data: "intel-dnv-vpp"
-#  filter: "'NIC_Intel-X553' and
-#           '64B' and
-#           'IP4BASE' and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'IP4FWD' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4-2n-dnv-x553-64b-1t1c-base-ndr"
-#    layout: "plot-throughput"
-#
-#- type: "plot"
-#  title: "VPP Throughput: ip4-2n-dnv-x553-64b-1t1c-base-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-2n-dnv-x553-64b-1t1c-base-pdr"
-#  data: "intel-dnv-vpp"
-#  filter: "'NIC_Intel-X553' and
-#           '64B' and
-#           'IP4BASE' and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'IP4FWD' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4-2n-dnv-x553-64b-1t1c-base-pdr"
-#    layout: "plot-throughput"
-#
-#- type: "plot"
-#  title: "VPP Throughput: ip4-2n-dnv-x553-64b-2t2c-base-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-2n-dnv-x553-64b-2t2c-base-ndr"
-#  data: "intel-dnv-vpp"
-#  filter: "'NIC_Intel-X553' and
-#           '64B' and
-#           'IP4BASE' and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'IP4FWD' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4-2n-dnv-x553-64b-2t2c-base-ndr"
-#    layout: "plot-throughput"
-#
-#- type: "plot"
-#  title: "VPP Throughput: ip4-2n-dnv-x553-64b-2t2c-base-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-2n-dnv-x553-64b-2t2c-base-pdr"
-#  data: "intel-dnv-vpp"
-#  filter: "'NIC_Intel-X553' and
-#           '64B' and
-#           'IP4BASE' and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'IP4FWD' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP4BASE"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4-2n-dnv-x553-64b-2t2c-base-pdr"
-#    layout: "plot-throughput"
-
-################################################################################
-
-# Packet Throughput - VPP IPv4 tunnels 3n-hsw-x520 - features
-- type: "plot"
-  title: "VPP Throughput: ip4tun-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'ENCAP' and
-           'NDRPDR' and
-           '1T1C' and
-           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
-           not 'DOT1Q' and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "LISP"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4tun-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4tun-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'ENCAP' and
-           'NDRPDR' and
-           '2T2C' and
-           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
-           not 'DOT1Q' and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "LISP"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4tun-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4tun-3n-hsw-x520-64b-1t1c-base_and_features-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-1t1c-base_and_features-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'ENCAP' and
-           'NDRPDR' and
-           '1T1C' and
-           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
-           not 'DOT1Q' and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "LISP"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4tun-3n-hsw-x520-64b-1t1c-base_and_features-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4tun-3n-hsw-x520-64b-2t2c-base_and_features-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-2t2c-base_and_features-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'ENCAP' and
-           'NDRPDR' and
-           '2T2C' and
-           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
-           not 'DOT1Q' and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "LISP"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4tun-3n-hsw-x520-64b-2t2c-base_and_features-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP IPv4 tunnels 3n-hsw-x710 base and scale
-- type: "plot"
-  title: "VPP Throughput: ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'ENCAP' and
-           'NDRPDR' and
-           '1T1C' and
-           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "LISP"
-  - "VXLAN_1"
-  - "VXLAN_10"
-  - "VXLAN_100"
-  - "VXLAN_1000"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'ENCAP' and
-           'NDRPDR' and
-           '1T1C' and
-           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "LISP"
-  - "VXLAN_1"
-  - "VXLAN_10"
-  - "VXLAN_100"
-  - "VXLAN_1000"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'ENCAP' and
-           'NDRPDR' and
-           '2T2C' and
-           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "LISP"
-  - "VXLAN_1"
-  - "VXLAN_10"
-  - "VXLAN_100"
-  - "VXLAN_1000"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'ENCAP' and
-           'NDRPDR' and
-           '2T2C' and
-           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "LISP"
-  - "VXLAN_1"
-  - "VXLAN_10"
-  - "VXLAN_100"
-  - "VXLAN_1000"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP IPv4 tunnels 3n-hsw-x710 - features
-- type: "plot"
-  title: "VPP Throughput: ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'ENCAP' and
-           'NDRPDR' and
-           '1T1C' and
-           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP' or 'IP4BASE') and
-           not 'DOT1Q' and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "LISP"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4tun-3n-hsw-x710-64b-2t2c-base_and_features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-2t2c-base_and_features-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'ENCAP' and
-           'NDRPDR' and
-           '2T2C' and
-           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
-           not 'DOT1Q' and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "LISP"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4tun-3n-hsw-x710-64b-2t2c-base_and_features-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'ENCAP' and
-           'NDRPDR' and
-           '1T1C' and
-           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
-           not 'DOT1Q' and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "LISP"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4tun-3n-hsw-x710-64b-2t2c-base_and_features-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-2t2c-base_and_features-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'ENCAP' and
-           'NDRPDR' and
-           '2T2C' and
-           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
-           not 'DOT1Q' and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "LISP"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4tun-3n-hsw-x710-64b-2t2c-base_and_features-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP IPv4 tunnels 3n-skx-x710 base and scale
-- type: "plot"
-  title: "VPP Throughput: ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'ENCAP' and
-           'NDRPDR' and
-           '2T1C' and
-           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "LISP"
-  - "VXLAN_1"
-  - "VXLAN_10"
-  - "VXLAN_100"
-  - "VXLAN_1000"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'ENCAP' and
-           'NDRPDR' and
-           '2T1C' and
-           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "LISP"
-  - "VXLAN_1"
-  - "VXLAN_10"
-  - "VXLAN_100"
-  - "VXLAN_1000"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'ENCAP' and
-           'NDRPDR' and
-           '4T2C' and
-           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "LISP"
-  - "VXLAN_1"
-  - "VXLAN_10"
-  - "VXLAN_100"
-  - "VXLAN_1000"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'ENCAP' and
-           'NDRPDR' and
-           '4T2C' and
-           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "LISP"
-  - "VXLAN_1"
-  - "VXLAN_10"
-  - "VXLAN_100"
-  - "VXLAN_1000"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP IPv4 tunnels 3n-skx-x710 - features
-- type: "plot"
-  title: "VPP Throughput: ip4tun-3n-skx-x710-64b-2t1c-base_and_features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-2t1c-base_and_features-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'ENCAP' and
-           'NDRPDR' and
-           '2T1C' and
-           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
-           not 'DOT1Q' and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "LISP"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4tun-3n-skx-x710-64b-2t1c-base_and_features-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4tun-3n-skx-x710-64b-4t2c-base_and_features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-4t2c-base_and_features-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'ENCAP' and
-           'NDRPDR' and
-           '4T2C' and
-           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
-           not 'DOT1Q' and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "LISP"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4tun-3n-skx-x710-64b-4t2c-base_and_features-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4tun-3n-skx-x710-64b-2t1c-base_and_features-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-2t1c-base_and_features-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'ENCAP' and
-           'NDRPDR' and
-           '2T1C' and
-           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
-           not 'DOT1Q' and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "LISP"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4tun-3n-skx-x710-64b-2t1c-base_and_features-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4tun-3n-skx-x710-64b-4t2c-base_and_features-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-4t2c-base_and_features-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'ENCAP' and
-           'NDRPDR' and
-           '4T2C' and
-           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
-           not 'DOT1Q' and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "LISP"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4tun-3n-skx-x710-64b-4t2c-base_and_features-pdr"
-    layout: "plot-throughput"
-
-################################################################################
-
-# Packet Throughput - VPP IPv6 3n-hsw-x520
-- type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-x520-78b-1t1c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-1t1c-base-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '1T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6-3n-hsw-x520-78b-1t1c-base-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-x520-78b-1t1c-base-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-1t1c-base-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '1T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6-3n-hsw-x520-78b-1t1c-base-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-x520-78b-2t2c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-2t2c-base-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '2T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6-3n-hsw-x520-78b-2t2c-base-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-x520-78b-2t2c-base-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-2t2c-base-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '2T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6-3n-hsw-x520-78b-2t2c-base-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP IPv6 3n-hsw-x710
-- type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-x710-78b-1t1c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-1t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '1T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6-3n-hsw-x710-78b-1t1c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-x710-78b-1t1c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-1t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '1T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6-3n-hsw-x710-78b-1t1c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-x710-78b-2t2c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-2t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '2T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6-3n-hsw-x710-78b-2t2c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-x710-78b-2t2c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-2t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '2T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6-3n-hsw-x710-78b-2t2c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP IPv6 3n-hsw-x710 - features
-- type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-x710-78b-1t1c-base_and_features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-1t1c-base_and_features-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            'IACLDST') and
-           'NDRPDR' and
-           '1T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACLDST"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6-3n-hsw-x710-78b-1t1c-base_and_features-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-x710-78b-2t2c-base_and_features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-2t2c-base_and_features-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            'IACLDST') and
-           'NDRPDR' and
-           '2T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACLDST"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6-3n-hsw-x710-78b-2t2c-base_and_features-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-x710-78b-1t1c-base_and_features-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-1t1c-base_and_features-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            'IACLDST') and
-           'NDRPDR' and
-           '1T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACLDST"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6-3n-hsw-x710-78b-1t1c-base_and_features-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-x710-78b-2t2c-base_and_features-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-2t2c-base_and_features-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            'IACLDST') and
-           'NDRPDR' and
-           '2T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACLDST"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6-3n-hsw-x710-78b-2t2c-base_and_features-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP IPv6 3n-hsw-xl710
-- type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-xl710-78b-1t1c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-1t1c-base-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '1T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6-3n-hsw-xl710-78b-1t1c-base-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-xl710-78b-1t1c-base-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-1t1c-base-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '1T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6-3n-hsw-xl710-78b-1t1c-base-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-xl710-78b-2t2c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-2t2c-base-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '2T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6-3n-hsw-xl710-78b-2t2c-base-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-xl710-78b-2t2c-base-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-2t2c-base-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '2T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6-3n-hsw-xl710-78b-2t2c-base-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP IPv6 3n-skx-x710
-- type: "plot"
-  title: "VPP Throughput: ip6-3n-skx-x710-78b-2t1c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '2T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6-3n-skx-x710-78b-2t1c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip6-3n-skx-x710-78b-2t1c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '2T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6-3n-skx-x710-78b-2t1c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip6-3n-skx-x710-78b-4t2c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '4T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6-3n-skx-x710-78b-4t2c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip6-3n-skx-x710-78b-4t2c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '4T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6-3n-skx-x710-78b-4t2c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP IPv6 3n-skx-x710 - features
-- type: "plot"
-  title: "VPP Throughput: ip6-3n-skx-x710-78b-2t1c-base_and_features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-2t1c-base_and_features-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            'IACLDST') and
-           'NDRPDR' and
-           '2T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACLDST"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6-3n-skx-x710-78b-2t1c-base_and_features-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip6-3n-skx-x710-78b-4t2c-base_and_features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-4t2c-base_and_features-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            'IACLDST') and
-           'NDRPDR' and
-           '4T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACLDST"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6-3n-skx-x710-78b-4t2c-base_and_features-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip6-3n-skx-x710-78b-2t1c-base_and_features-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-2t1c-base_and_features-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            'IACLDST') and
-           'NDRPDR' and
-           '2T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACLDST"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6-3n-skx-x710-78b-2t1c-base_and_features-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip6-3n-skx-x710-78b-4t2c-base_and_features-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-4t2c-base_and_features-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            'IACLDST') and
-           'NDRPDR' and
-           '4T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACLDST"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6-3n-skx-x710-78b-4t2c-base_and_features-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP IPv6 3n-skx-xxv710
-- type: "plot"
-  title: "VPP Throughput: ip6-3n-skx-xxv710-78b-2t1c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-xxv710-78b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '2T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6-3n-skx-xxv710-78b-2t1c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip6-3n-skx-xxv710-78b-2t1c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-xxv710-78b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '2T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6-3n-skx-xxv710-78b-2t1c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip6-3n-skx-xxv710-78b-4t2c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-xxv710-78b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '4T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6-3n-skx-xxv710-78b-4t2c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip6-3n-skx-xxv710-78b-4t2c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-xxv710-78b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '4T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6-3n-skx-xxv710-78b-4t2c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP IPv6 2n-skx-x710
-- type: "plot"
-  title: "VPP Throughput: ip6-2n-skx-x710-78b-2t1c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '2T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6-2n-skx-x710-78b-2t1c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip6-2n-skx-x710-78b-2t1c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '2T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6-2n-skx-x710-78b-2t1c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip6-2n-skx-x710-78b-4t2c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '4T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6-2n-skx-x710-78b-4t2c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip6-2n-skx-x710-78b-4t2c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '4T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6-2n-skx-x710-78b-4t2c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP IPv6 2n-skx-xxv710
-- type: "plot"
-  title: "VPP Throughput: ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '2T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '2T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '4T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '4T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
-## Packet Throughput - VPP IPv6 2n-dnv-x553 base
-#- type: "plot"
-#  title: "VPP Throughput: ip6-2n-dnv-x553-78b-1t1c-base-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip6-2n-dnv-x553-78b-1t1c-base-ndr"
-#  data: "intel-dnv-vpp"
-#  filter: "'NIC_Intel-X553' and
-#           '78B' and
-#           'IP6BASE' and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'IP6FWD' and
-#           not 'SRv6' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP6BASE"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip6-2n-dnv-x553-78b-1t1c-base-ndr"
-#    layout: "plot-throughput"
-#
-#- type: "plot"
-#  title: "VPP Throughput: ip6-2n-dnv-x553-78b-1t1c-base-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip6-2n-dnv-x553-78b-1t1c-base-pdr"
-#  data: "intel-dnv-vpp"
-#  filter: "'NIC_Intel-X553' and
-#           '78B' and
-#           'IP6BASE' and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'IP6FWD' and
-#           not 'SRv6' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP6BASE"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip6-2n-dnv-x553-78b-1t1c-base-pdr"
-#    layout: "plot-throughput"
-#
-#- type: "plot"
-#  title: "VPP Throughput: ip6-2n-dnv-x553-78b-2t2c-base-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip6-2n-dnv-x553-78b-2t2c-base-ndr"
-#  data: "intel-dnv-vpp"
-#  filter: "'NIC_Intel-X553' and
-#           '78B' and
-#           'IP6BASE' and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'IP6FWD' and
-#           not 'SRv6' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP6BASE"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip6-2n-dnv-x553-78b-2t2c-base-ndr"
-#    layout: "plot-throughput"
-#
-#- type: "plot"
-#  title: "VPP Throughput: ip6-2n-dnv-x553-78b-2t2c-base-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip6-2n-dnv-x553-78b-2t2c-base-pdr"
-#  data: "intel-dnv-vpp"
-#  filter: "'NIC_Intel-X553' and
-#           '78B' and
-#           'IP6BASE' and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'IP6FWD' and
-#           not 'SRv6' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP6BASE"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip6-2n-dnv-x553-78b-2t2c-base-pdr"
-#    layout: "plot-throughput"
-
-################################################################################
-
-# Packet Throughput - VPP IPv6 tunnels 3n-hsw-x520
-- type: "plot"
-  title: "VPP Throughput: ip6tun-3n-hsw-x520-78b-1t1c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-1t1c-base-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           'ENCAP' and
-           'NDRPDR' and
-           '1T1C' and
-           'LISP' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4UNRLAY"
-  - "IP6UNRLAY"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6tun-3n-hsw-x520-78b-1t1c-base-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip6tun-3n-hsw-x520-78b-1t1c-base-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-1t1c-base-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           'ENCAP' and
-           'NDRPDR' and
-           '1T1C' and
-           'LISP' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4UNRLAY"
-  - "IP6UNRLAY"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6tun-3n-hsw-x520-78b-1t1c-base-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip6tun-3n-hsw-x520-78b-2t2c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-2t2c-base-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           'ENCAP' and
-           'NDRPDR' and
-           '2T2C' and
-           'LISP' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4UNRLAY"
-  - "IP6UNRLAY"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6tun-3n-hsw-x520-78b-2t2c-base-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip6tun-3n-hsw-x520-78b-2t2c-base-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-2t2c-base-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           'ENCAP' and
-           'NDRPDR' and
-           '2T2C' and
-           'LISP' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4UNRLAY"
-  - "IP6UNRLAY"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6tun-3n-hsw-x520-78b-2t2c-base-pdr"
-    layout: "plot-throughput"
-
-################################################################################
-
-# Packet Throughput - VPP IPSec 3n-hsw-xl710 base
-- type: "plot"
-  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-1t1c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-base-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'IP4FWD' and
-           'NDRPDR' and
-           'BASE' and
-           '1T1C' and
-           'IPSECHW' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ipsec-3n-hsw-xl710-64b-1t1c-base-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-1t1c-base-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-base-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'IP4FWD' and
-           'NDRPDR' and
-           'BASE' and
-           '1T1C' and
-           'IPSECHW' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ipsec-3n-hsw-xl710-64b-1t1c-base-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-2t2c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-base-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'IP4FWD' and
-           'NDRPDR' and
-           'BASE' and
-           '2T2C' and
-           'IPSECHW' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ipsec-3n-hsw-xl710-64b-2t2c-base-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-2t2c-base-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-base-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'IP4FWD' and
-           'NDRPDR' and
-           'BASE' and
-           '2T2C' and
-           'IPSECHW' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ipsec-3n-hsw-xl710-64b-2t2c-base-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP IPSec 3n-hsw-xl710 scale
-- type: "plot"
-  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-1t1c-scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'IP4FWD' and
-           'NDRPDR' and
-           'SCALE' and
-           '1T1C' and
-           'IPSECHW' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ipsec-3n-hsw-xl710-64b-1t1c-scale-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-1t1c-scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'IP4FWD' and
-           'NDRPDR' and
-           'SCALE' and
-           '1T1C' and
-           'IPSECHW' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ipsec-3n-hsw-xl710-64b-1t1c-scale-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-2t2c-scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'IP4FWD' and
-           'NDRPDR' and
-           'SCALE' and
-           '2T2C' and
-           'IPSECHW' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ipsec-3n-hsw-xl710-64b-2t2c-scale-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-2t2c-scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'IP4FWD' and
-           'NDRPDR' and
-           'SCALE' and
-           '2T2C' and
-           'IPSECHW' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ipsec-3n-hsw-xl710-64b-2t2c-scale-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP IPSec 3n-hsw-xl710 SW
-- type: "plot"
-  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-1t1c-sw-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-sw-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'IP4FWD' and
-           'NDRPDR' and
-           '1T1C' and
-           'IPSECSW' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ipsec-3n-hsw-xl710-64b-1t1c-sw-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-1t1c-sw-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-sw-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'IP4FWD' and
-           'NDRPDR' and
-           '1T1C' and
-           'IPSECSW' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ipsec-3n-hsw-xl710-64b-1t1c-sw-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-2t2c-sw-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-sw-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'IP4FWD' and
-           'NDRPDR' and
-           '2T2C' and
-           'IPSECSW' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ipsec-3n-hsw-xl710-64b-2t2c-sw-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-2t2c-sw-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-sw-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'IP4FWD' and
-           'NDRPDR' and
-           '2T2C' and
-           'IPSECSW' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ipsec-3n-hsw-xl710-64b-2t2c-sw-pdr"
-    layout: "plot-throughput"
-
-################################################################################
-
-# Packet Throughput - VPP SRv6 3n-hsw-x520
-- type: "plot"
-  title: "VPP Throughput: srv6-3n-hsw-x520-78b-1t1c-features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-1t1c-features-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           'FEATURE' and
-           'NDRPDR' and
-           '1T1C' and
-           'IP6FWD' and
-           'SRv6'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "srv6-3n-hsw-x520-78b-1t1c-features-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: srv6-3n-hsw-x520-78b-1t1c-features-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-1t1c-features-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           'FEATURE' and
-           'NDRPDR' and
-           '1T1C' and
-           'IP6FWD' and
-           'SRv6'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "srv6-3n-hsw-x520-78b-1t1c-features-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: srv6-3n-hsw-x520-78b-2t2c-features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-2t2c-features-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           'FEATURE' and
-           'NDRPDR' and
-           '2T2C' and
-           'IP6FWD' and
-           'SRv6'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "srv6-3n-hsw-x520-78b-2t2c-features-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: srv6-3n-hsw-x520-78b-2t2c-features-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-2t2c-features-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           'FEATURE' and
-           'NDRPDR' and
-           '2T2C' and
-           'IP6FWD' and
-           'SRv6'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "srv6-3n-hsw-x520-78b-2t2c-features-pdr"
-    layout: "plot-throughput"
-
-################################################################################
-
-# Packet Throughput - VPP vhost ip4 3n-hsw-x520
-- type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           '1T1C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'DOT1Q'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "1VM"
-  - "2VM"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           '2T2C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'DOT1Q'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "1VM"
-  - "2VM"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           '1T1C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'DOT1Q'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "1VM"
-  - "2VM"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           '2T2C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'DOT1Q'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "1VM"
-  - "2VM"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP vhost l2sw 3n-hsw-x520 - base
-- type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           'BASE' and
-           '1T1C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_features-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_features-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           'BASE' and
-           '1T1C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_features-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           'BASE' and
-           '2T2C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_features-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_features-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           'BASE' and
-           '2T2C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_features-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP vhost l2sw 3n-hsw-x520 - base vm
-- type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '1T1C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'CFS_OPT' and
-           not 'DOT1Q' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'LBOND'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '1T1C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'CFS_OPT' and
-           not 'DOT1Q' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'LBOND'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '2T2C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'CFS_OPT' and
-           not 'DOT1Q' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'LBOND'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '2T2C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'CFS_OPT' and
-           not 'DOT1Q' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'LBOND'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP vhost ip4 3n-hsw-x710
-- type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           '1T1C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'CFS_OPT' and
-           not 'DOT1Q'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "1VM"
-  - "2VM"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           '2T2C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'CFS_OPT' and
-           not 'DOT1Q'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "1VM"
-  - "2VM"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           '1T1C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'CFS_OPT' and
-           not 'DOT1Q'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "1VM"
-  - "2VM"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           '2T2C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'CFS_OPT' and
-           not 'DOT1Q'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "1VM"
-  - "2VM"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP vhost l2sw 3n-hsw-x710 - base
-- type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           'BASE' and
-           '1T1C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           'BASE' and
-           '1T1C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           'BASE' and
-           '2T2C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           'BASE' and
-           '2T2C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP vhost l2sw 3n-hsw-x710 - base vm
-- type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-vm-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-vm-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '1T1C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'CFS_OPT' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'LBOND'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-vm-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-vm-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-vm-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '1T1C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'CFS_OPT' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'LBOND'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-vm-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-vm-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-vm-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '2T2C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'CFS_OPT' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'LBOND'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-vm-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-vm-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-vm-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '2T2C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'CFS_OPT' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'LBOND'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-vm-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP vhost ip4 3n-skx-x710
-- type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           '2T1C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'DOT1Q'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "1VM"
-  - "2VM"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           '4T2C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'DOT1Q'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "1VM"
-  - "2VM"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           '2T1C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'DOT1Q'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "1VM"
-  - "2VM"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           '4T2C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'DOT1Q'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "1VM"
-  - "2VM"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP vhost l2sw 3n-skx-x710 - base
-- type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           'BASE' and
-           '2T1C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           'BASE' and
-           '2T1C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           'BASE' and
-           '4T2C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           'BASE' and
-           '4T2C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP vhost l2sw 3n-skx-x710 - base vm
-- type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-vm-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-vm-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '2T1C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'CFS_OPT' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'LBOND'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-vm-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-vm-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-vm-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '2T1C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'CFS_OPT' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'LBOND'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-vm-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-vm-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-vm-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '4T2C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'CFS_OPT' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'LBOND'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-vm-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-vm-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-vm-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '4T2C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'CFS_OPT' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'LBOND'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-vm-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP vhost ip4 2n-skx-x710
-- type: "plot"
-  title: "VPP Throughput: vhost-ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           '2T1C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'NF_DENSITY' and
-           not 'CFS_OPT' and
-           not 'DOT1Q'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "1VM"
-  - "2VM"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: vhost-ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           '4T2C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'NF_DENSITY' and
-           not 'CFS_OPT' and
-           not 'DOT1Q'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "1VM"
-  - "2VM"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: vhost-ip4-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           '2T1C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'NF_DENSITY' and
-           not 'CFS_OPT' and
-           not 'DOT1Q'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "1VM"
-  - "2VM"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-ip4-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: vhost-ip4-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           '4T2C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'NF_DENSITY' and
-           not 'CFS_OPT' and
-           not 'DOT1Q'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "1VM"
-  - "2VM"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-ip4-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP vhost l2sw 2n-skx-x710 - base
-- type: "plot"
-  title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_features-ndr"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           'BASE' and
-           '2T1C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'NF_DENSITY' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_features-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_features-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_features-pdr"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           'BASE' and
-           '2T1C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'NF_DENSITY' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_features-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_features-ndr"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           'BASE' and
-           '4T2C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'NF_DENSITY' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_features-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_features-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_features-pdr"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           'BASE' and
-           '4T2C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'NF_DENSITY' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_features-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP vhost l2sw 2n-skx-x710 - base vm
-- type: "plot"
-  title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-2t1c-base-vm-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-2t1c-base-vm-ndr"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '2T1C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'CFS_OPT' and
-           not 'VXLAN' and
-           not 'NF_DENSITY' and
-           not 'DOT1Q' and
-           not 'IP4FWD'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-2n-skx-x710-64b-2t1c-base-vm-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-2t1c-base-vm-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-2t1c-base-vm-pdr"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '2T1C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'CFS_OPT' and
-           not 'VXLAN' and
-           not 'NF_DENSITY' and
-           not 'DOT1Q' and
-           not 'IP4FWD'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-2n-skx-x710-64b-2t1c-base-vm-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-4t2c-base-vm-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-4t2c-base-vm-ndr"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '4T2C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'CFS_OPT' and
-           not 'VXLAN' and
-           not 'NF_DENSITY' and
-           not 'DOT1Q' and
-           not 'IP4FWD'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-2n-skx-x710-64b-4t2c-base-vm-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-4t2c-base-vm-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-4t2c-base-vm-pdr"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '4T2C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'CFS_OPT' and
-           not 'VXLAN' and
-           not 'NF_DENSITY' and
-           not 'DOT1Q' and
-           not 'IP4FWD'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-2n-skx-x710-64b-4t2c-base-vm-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP vhost ip4 2n-skx-xxv710
-- type: "plot"
-  title: "VPP Throughput: vhost-ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           '2T1C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'CFS_OPT' and
-           not 'DOT1Q'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "1VM"
-  - "2VM"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: vhost-ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           '4T2C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'CFS_OPT' and
-           not 'DOT1Q'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "1VM"
-  - "2VM"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: vhost-ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           '2T1C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'CFS_OPT' and
-           not 'DOT1Q'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "1VM"
-  - "2VM"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: vhost-ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           '4T2C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'CFS_OPT' and
-           not 'DOT1Q'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "1VM"
-  - "2VM"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
-## Packet Throughput - VPP vhost l2sw 2n-skx-xxv710 - base
-#- type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_features-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_features-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           'BASE' and
-#           '2T1C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "not CFS_OPT"
-##  - "L2XCFWD"
-##  - "not CFS_OPT"
-##  - "CFS_OPT"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_features-ndr"
-#    layout: "plot-throughput"
-#
-#- type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_features-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_features-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           'BASE' and
-#           '2T1C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "not CFS_OPT"
-##  - "L2XCFWD"
-##  - "not CFS_OPT"
-##  - "CFS_OPT"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_features-pdr"
-#    layout: "plot-throughput"
-#
-#- type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_features-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_features-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           'BASE' and
-#           '4T2C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "not CFS_OPT"
-##  - "L2XCFWD"
-##  - "not CFS_OPT"
-##  - "CFS_OPT"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_features-ndr"
-#    layout: "plot-throughput"
-#
-#- type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_features-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_features-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           'BASE' and
-#           '4T2C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "not CFS_OPT"
-##  - "L2XCFWD"
-##  - "not CFS_OPT"
-##  - "CFS_OPT"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_features-pdr"
-#    layout: "plot-throughput"
-#
-## Packet Throughput - VPP vhost l2sw 2n-skx-xxv710 - base vm
-#- type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-vm-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-vm-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '2T1C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'CFS_OPT' and
-#           not 'VXLAN' and
-#           not 'DOT1Q' and
-#           not 'IP4FWD'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "1VM"
-##  - "L2XCFWD"
-##  - "1VM"
-##  - "L2BDMACLRN"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-vm-ndr"
-#    layout: "plot-throughput"
-#
-#- type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-vm-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-vm-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '2T1C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'CFS_OPT' and
-#           not 'VXLAN' and
-#           not 'DOT1Q' and
-#           not 'IP4FWD'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "1VM"
-##  - "L2XCFWD"
-##  - "1VM"
-##  - "L2BDMACLRN"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-vm-pdr"
-#    layout: "plot-throughput"
-#
-#- type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '4T2C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'CFS_OPT' and
-#           not 'VXLAN' and
-#           not 'DOT1Q' and
-#           not 'IP4FWD'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "1VM"
-##  - "L2XCFWD"
-##  - "1VM"
-##  - "L2BDMACLRN"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-ndr"
-#    layout: "plot-throughput"
-#
-#- type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '4T2C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'CFS_OPT' and
-#           not 'VXLAN' and
-#           not 'DOT1Q' and
-#           not 'IP4FWD'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "1VM"
-##  - "L2XCFWD"
-##  - "1VM"
-##  - "L2BDMACLRN"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-pdr"
-#    layout: "plot-throughput"
-
-################################################################################
-
-# Packet Throughput - VPP VTS 3n-hsw-x520
-- type: "plot"
-  title: "VPP Throughput: vts-3n-hsw-x520-114b-1t1c-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-114b-1t1c-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '114B' and
-           'NDRPDR' and
-           '1T1C' and
-           'VTS'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vts-3n-hsw-x520-114b-1t1c-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: vts-3n-hsw-x520-114b-2t2c-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-114b-2t2c-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '114B' and
-           'NDRPDR' and
-           '2T2C' and
-           'VTS'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vts-3n-hsw-x520-114b-2t2c-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: vts-3n-hsw-x520-114b-1t1c-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-114b-1t1c-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '114B' and
-           'NDRPDR' and
-           '1T1C' and
-           'VTS'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vts-3n-hsw-x520-114b-1t1c-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: vts-3n-hsw-x520-114b-2t2c-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-114b-2t2c-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '114B' and
-           'NDRPDR' and
-           '2T2C' and
-           'VTS'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vts-3n-hsw-x520-114b-2t2c-pdr"
-    layout: "plot-throughput"
-
-################################################################################
-
-# Packet Throughput - DPDK l3fwd 3n-hsw-x520
-- type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-hsw-x520-64b-1t1c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x520-64b-1t1c-base-ndr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '1T1C' and
-           'IP4FWD'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l3fwd-3n-hsw-x520-64b-1t1c-base-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-hsw-x520-64b-2t2c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x520-64b-2t2c-base-ndr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '2T2C' and
-           'IP4FWD'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l3fwd-3n-hsw-x520-64b-2t2c-base-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-hsw-x520-64b-1t1c-base-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x520-64b-1t1c-base-pdr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '1T1C' and
-           'IP4FWD'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l3fwd-3n-hsw-x520-64b-1t1c-base-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-hsw-x520-64b-2t2c-base-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x520-64b-2t2c-base-pdr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '2T2C' and
-           'IP4FWD'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l3fwd-3n-hsw-x520-64b-2t2c-base-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - DPDK l3fwd 3n-hsw-x710
-- type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-hsw-x710-64b-1t1c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x710-64b-1t1c-base-ndr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '1T1C' and
-           'IP4FWD'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l3fwd-3n-hsw-x710-64b-1t1c-base-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-hsw-x710-64b-2t2c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x710-64b-2t2c-base-ndr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '2T2C' and
-           'IP4FWD'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l3fwd-3n-hsw-x710-64b-2t2c-base-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-hsw-x710-64b-1t1c-base-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x710-64b-1t1c-base-pdr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '1T1C' and
-           'IP4FWD'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l3fwd-3n-hsw-x710-64b-1t1c-base-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-hsw-x710-64b-2t2c-base-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x710-64b-2t2c-base-pdr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '2T2C' and
-           'IP4FWD'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l3fwd-3n-hsw-x710-64b-2t2c-base-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - DPDK l3fwd 3n-hsw-xl710
-- type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-hsw-xl710-64b-1t1c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-xl710-64b-1t1c-base-ndr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '1T1C' and
-           'IP4FWD'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l3fwd-3n-hsw-xl710-64b-1t1c-base-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-hsw-xl710-64b-2t2c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-xl710-64b-2t2c-base-ndr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '2T2C' and
-           'IP4FWD'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l3fwd-3n-hsw-xl710-64b-2t2c-base-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-hsw-xl710-64b-1t1c-base-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-xl710-64b-1t1c-base-pdr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '1T1C' and
-           'IP4FWD'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l3fwd-3n-hsw-xl710-64b-1t1c-base-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-hsw-xl710-64b-2t2c-base-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-xl710-64b-2t2c-base-pdr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '2T2C' and
-           'IP4FWD'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l3fwd-3n-hsw-xl710-64b-2t2c-base-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - DPDK l3fwd 3n-skx-x710
-- type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-skx-x710-64b-2t1c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-skx-x710-64b-2t1c-base-ndr"
-  data: "plot-dpdk-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '2T1C' and
-           'IP4FWD'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l3fwd-3n-skx-x710-64b-2t1c-base-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-skx-x710-64b-4t2c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-skx-x710-64b-4t2c-base-ndr"
-  data: "plot-dpdk-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '4T2C' and
-           'IP4FWD'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l3fwd-3n-skx-x710-64b-4t2c-base-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-skx-x710-64b-2t1c-base-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-skx-x710-64b-2t1c-base-pdr"
-  data: "plot-dpdk-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '2T1C' and
-           'IP4FWD'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l3fwd-3n-skx-x710-64b-2t1c-base-pdr"
-    layout: "plot-throughput"
+#-
+#  type: "plot"
+#  title: "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"
 
-- type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-skx-x710-64b-4t2c-base-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-skx-x710-64b-4t2c-base-pdr"
-  data: "plot-dpdk-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '4T2C' and
-           'IP4FWD'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l3fwd-3n-skx-x710-64b-4t2c-base-pdr"
-    layout: "plot-throughput"
+################################################################################
+## 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 - DPDK l3fwd 3n-skx-xxv710
-- type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-skx-xxv710-64b-2t1c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-skx-xxv710-64b-2t1c-base-ndr"
-  data: "plot-dpdk-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '2T1C' and
-           'IP4FWD'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l3fwd-3n-skx-xxv710-64b-2t1c-base-ndr"
-    layout: "plot-throughput"
+################################################################################
+
+## 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
 - type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-skx-xxv710-64b-4t2c-base-ndr"
+  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-1t1c-features-oacl-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,VPP]}/l2sw-3n-hsw-x520-64b-1t1c-features-oacl-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           'BASE' and
            'NDRPDR' and
-           '4T2C' and
-           'IP4FWD'"
+           '1T1C' and
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'OACL' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
+           not 'MACIP' and
+           not 'VHOST' and
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l3fwd-3n-skx-xxv710-64b-4t2c-base-ndr"
+    title: "l2sw-3n-hsw-x520-64b-1t1c-features-oacl-ndr"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-skx-xxv710-64b-2t1c-base-pdr"
+  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-1t1c-features-oacl-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,VPP]}/l2sw-3n-hsw-x520-64b-1t1c-features-oacl-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           'BASE' and
            'NDRPDR' and
-           '2T1C' and
-           'IP4FWD'"
+           '1T1C' and
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'OACL' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
+           not 'MACIP' and
+           not 'VHOST' and
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l3fwd-3n-skx-xxv710-64b-2t1c-base-pdr"
+    title: "l2sw-3n-hsw-x520-64b-1t1c-features-oacl-pdr"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-skx-xxv710-64b-4t2c-base-pdr"
+  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-2t2c-features-oacl-ndr"
   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,VPP]}/l2sw-3n-hsw-x520-64b-2t2c-features-oacl-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           'BASE' and
            'NDRPDR' and
-           '4T2C' and
-           'IP4FWD'"
+           '2T2C' and
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'OACL' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
+           not 'MACIP' and
+           not 'VHOST' and
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l3fwd-3n-skx-xxv710-64b-4t2c-base-pdr"
+    title: "l2sw-3n-hsw-x520-64b-2t2c-features-oacl-ndr"
     layout: "plot-throughput"
 
-# Packet Throughput - DPDK l3fwd 2n-skx-x710
 - type: "plot"
-  title: "DPDK Throughput: l3fwd-2n-skx-x710-64b-2t1c-base-ndr"
+  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-2t2c-features-oacl-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-2n-skx-x710-64b-2t1c-base-ndr"
-  data: "plot-dpdk-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-2t2c-features-oacl-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           'BASE' and
            'NDRPDR' and
-           '2T1C' and
-           'IP4FWD'"
+           '2T2C' and
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'OACL' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
+           not 'MACIP' and
+           not 'VHOST' and
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l3fwd-2n-skx-x710-64b-2t1c-base-ndr"
+    title: "l2sw-3n-hsw-x520-64b-2t2c-features-oacl-pdr"
     layout: "plot-throughput"
 
+# Packet Throughput - VPP L2 3n-hsw-x520 features-macip
 - type: "plot"
-  title: "DPDK Throughput: l3fwd-2n-skx-x710-64b-4t2c-base-ndr"
+  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-1t1c-features-macip-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-2n-skx-x710-64b-4t2c-base-ndr"
-  data: "plot-dpdk-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-1t1c-features-macip-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           'BASE' and
            'NDRPDR' and
-           '4T2C' and
-           'IP4FWD'"
+           '1T1C' and
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'MACIP' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
+           not 'VHOST' and
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l3fwd-2n-skx-x710-64b-4t2c-base-ndr"
+    title: "l2sw-3n-hsw-x520-64b-1t1c-features-macip-ndr"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "DPDK Throughput: l3fwd-2n-skx-x710-64b-2t1c-base-pdr"
+  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-1t1c-features-macip-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-2n-skx-x710-64b-2t1c-base-pdr"
-  data: "plot-dpdk-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  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
            '64B' and
-           'BASE' and
            'NDRPDR' and
-           '2T1C' and
-           'IP4FWD'"
+           '1T1C' and
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'MACIP' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
+           not 'VHOST' and
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l3fwd-2n-skx-x710-64b-2t1c-base-pdr"
+    title: "l2sw-3n-hsw-x520-64b-1t1c-features-macip-pdr"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "DPDK Throughput: l3fwd-2n-skx-x710-64b-4t2c-base-pdr"
+  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-2t2c-features-macip-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-2n-skx-x710-64b-4t2c-base-pdr"
-  data: "plot-dpdk-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  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
            '64B' and
-           'BASE' and
            'NDRPDR' and
-           '4T2C' and
-           'IP4FWD'"
+           '2T2C' and
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'MACIP' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
+           not 'VHOST' and
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l3fwd-2n-skx-x710-64b-4t2c-base-pdr"
+    title: "l2sw-3n-hsw-x520-64b-2t2c-features-macip-ndr"
     layout: "plot-throughput"
 
-# Packet Throughput - DPDK l3fwd 2n-skx-xxv710
 - type: "plot"
-  title: "DPDK Throughput: l3fwd-2n-skx-xxv710-64b-2t1c-base-ndr"
+  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-2t2c-features-macip-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-2n-skx-xxv710-64b-2t1c-base-ndr"
-  data: "plot-dpdk-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-2t2c-features-macip-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           'BASE' and
            'NDRPDR' and
-           '2T1C' and
-           'IP4FWD'"
+           '2T2C' and
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'MACIP' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
+           not 'VHOST' and
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l3fwd-2n-skx-xxv710-64b-2t1c-base-ndr"
+    title: "l2sw-3n-hsw-x520-64b-2t2c-features-macip-pdr"
     layout: "plot-throughput"
 
-- type: "plot"
-  title: "DPDK Throughput: l3fwd-2n-skx-xxv710-64b-4t2c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-2n-skx-xxv710-64b-4t2c-base-ndr"
-  data: "plot-dpdk-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '4T2C' and
-           'IP4FWD'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l3fwd-2n-skx-xxv710-64b-4t2c-base-ndr"
-    layout: "plot-throughput"
+## 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"
 
-- type: "plot"
-  title: "DPDK Throughput: l3fwd-2n-skx-xxv710-64b-2t1c-base-pdr"
+# Packet Throughput - VPP L2 3n-skx-x710 base and scale
+-
+  type: "plot"
+  title: "VPP Throughput: l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,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-base_and_scale-ndr"
+  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'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l3fwd-2n-skx-xxv710-64b-2t1c-base-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "DPDK Throughput: l3fwd-2n-skx-xxv710-64b-4t2c-base-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-2n-skx-xxv710-64b-4t2c-base-pdr"
-  data: "plot-dpdk-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '4T2C' and
-           'IP4FWD'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l3fwd-2n-skx-xxv710-64b-4t2c-base-pdr"
-    layout: "plot-throughput"
-
-################################################################################
-
-# Packet Throughput - DPDK testpmd 3n-hsw-x520
-- type: "plot"
-  title: "DPDK Throughput: testpmd-3n-hsw-x520-64b-1t1c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x520-64b-1t1c-base-ndr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "testpmd-3n-hsw-x520-64b-1t1c-base-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "DPDK Throughput: testpmd-3n-hsw-x520-64b-2t2c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x520-64b-2t2c-base-ndr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           not 'MEMIF' and
+           not 'DRV_AVF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "testpmd-3n-hsw-x520-64b-2t2c-base-ndr"
+    title: "l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
-- type: "plot"
-  title: "DPDK Throughput: testpmd-3n-hsw-x520-64b-1t1c-base-pdr"
+-
+  type: "plot"
+  title: "VPP Throughput: l2sw-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x520-64b-1t1c-base-pdr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,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' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           'ETH' and
+           '2T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           not 'MEMIF' and
+           not 'DRV_AVF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "testpmd-3n-hsw-x520-64b-1t1c-base-pdr"
+    title: "l2sw-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
-- type: "plot"
-  title: "DPDK Throughput: testpmd-3n-hsw-x520-64b-2t2c-base-pdr"
+-
+  type: "plot"
+  title: "VPP Throughput: l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x520-64b-2t2c-base-pdr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,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' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           'ETH' and
+           '4T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           not 'MEMIF' and
+           not 'DRV_AVF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "testpmd-3n-hsw-x520-64b-2t2c-base-pdr"
+    title: "l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
-# Packet Throughput - DPDK testpmd 3n-hsw-x710
-- type: "plot"
-  title: "DPDK Throughput: testpmd-3n-hsw-x710-64b-1t1c-base-ndr"
+-
+  type: "plot"
+  title: "VPP Throughput: l2sw-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x710-64b-1t1c-base-ndr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
+  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' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           'ETH' and
+           '4T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           not 'MEMIF' and
+           not 'DRV_AVF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "testpmd-3n-hsw-x710-64b-1t1c-base-ndr"
+    title: "l2sw-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
-- type: "plot"
-  title: "DPDK Throughput: testpmd-3n-hsw-x710-64b-2t2c-base-ndr"
+# Packet Throughput - VPP L2 3n-skx-x710 features
+-
+  type: "plot"
+  title: "VPP Throughput: l2sw-3n-skx-x710-64b-2t1c-features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x710-64b-2t2c-base-ndr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
+  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
-           'BASE' and
            'NDRPDR' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           '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: "testpmd-3n-hsw-x710-64b-2t2c-base-ndr"
+    title: "l2sw-3n-skx-x710-64b-2t1c-features-ndr"
     layout: "plot-throughput"
 
-- type: "plot"
-  title: "DPDK Throughput: testpmd-3n-hsw-x710-64b-1t1c-base-pdr"
+-
+  type: "plot"
+  title: "VPP Throughput: l2sw-3n-skx-x710-64b-2t1c-features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x710-64b-1t1c-base-pdr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
+  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
-           'BASE' and
            'NDRPDR' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           '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: "testpmd-3n-hsw-x710-64b-1t1c-base-pdr"
+    title: "l2sw-3n-skx-x710-64b-2t1c-features-pdr"
     layout: "plot-throughput"
 
-- type: "plot"
-  title: "DPDK Throughput: testpmd-3n-hsw-x710-64b-2t2c-base-pdr"
+-
+  type: "plot"
+  title: "VPP Throughput: l2sw-3n-skx-x710-64b-4t2c-features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x710-64b-2t2c-base-pdr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
+  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
-           'BASE' and
            'NDRPDR' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           '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: "testpmd-3n-hsw-x710-64b-2t2c-base-pdr"
+    title: "l2sw-3n-skx-x710-64b-4t2c-features-ndr"
     layout: "plot-throughput"
 
-# Packet Throughput - DPDK testpmd 3n-hsw-xl710
-- type: "plot"
-  title: "DPDK Throughput: testpmd-3n-hsw-xl710-64b-1t1c-base-ndr"
+-
+  type: "plot"
+  title: "VPP Throughput: l2sw-3n-skx-x710-64b-4t2c-features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-xl710-64b-1t1c-base-ndr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-4t2c-features-pdr"
+  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')"
+           '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: "testpmd-3n-hsw-xl710-64b-1t1c-base-ndr"
+    title: "l2sw-3n-skx-x710-64b-4t2c-features-pdr"
     layout: "plot-throughput"
 
-- type: "plot"
-  title: "DPDK Throughput: testpmd-3n-hsw-xl710-64b-2t2c-base-ndr"
+# Packet Throughput - VPP L2 3n-skx-xxv710 base and scale
+-
+  type: "plot"
+  title: "VPP Throughput: l2sw-3n-skx-xxv710-64b-2t1c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-xl710-64b-2t2c-base-ndr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-2t1c-base-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
-           'BASE' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           'ETH' and
+           '2T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "L2PATCH"
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "testpmd-3n-hsw-xl710-64b-2t2c-base-ndr"
+    title: "l2sw-3n-skx-xxv710-64b-2t1c-base-ndr"
     layout: "plot-throughput"
 
-- type: "plot"
-  title: "DPDK Throughput: testpmd-3n-hsw-xl710-64b-1t1c-base-pdr"
+-
+  type: "plot"
+  title: "VPP Throughput: l2sw-3n-skx-xxv710-64b-2t1c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-xl710-64b-1t1c-base-pdr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-2t1c-base-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
-           'BASE' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           'ETH' and
+           '2T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "L2PATCH"
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "testpmd-3n-hsw-xl710-64b-1t1c-base-pdr"
+    title: "l2sw-3n-skx-xxv710-64b-2t1c-base-pdr"
     layout: "plot-throughput"
 
-- type: "plot"
-  title: "DPDK Throughput: testpmd-3n-hsw-xl710-64b-2t2c-base-pdr"
+-
+  type: "plot"
+  title: "VPP Throughput: l2sw-3n-skx-xxv710-64b-4t2c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-xl710-64b-2t2c-base-pdr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-4t2c-base-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
-           'BASE' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           'ETH' and
+           '4T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "L2PATCH"
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "testpmd-3n-hsw-xl710-64b-2t2c-base-pdr"
+    title: "l2sw-3n-skx-xxv710-64b-4t2c-base-ndr"
     layout: "plot-throughput"
 
-# Packet Throughput - DPDK testpmd 3n-skx-x710
-- type: "plot"
-  title: "DPDK Throughput: testpmd-3n-skx-x710-64b-2t1c-base-ndr"
+-
+  type: "plot"
+  title: "VPP Throughput: l2sw-3n-skx-xxv710-64b-4t2c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-skx-x710-64b-2t1c-base-ndr"
-  data: "plot-dpdk-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-4t2c-base-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
-           'BASE' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           'ETH' and
+           '4T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "L2PATCH"
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "testpmd-3n-skx-x710-64b-2t1c-base-ndr"
+    title: "l2sw-3n-skx-xxv710-64b-4t2c-base-pdr"
     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"
+## 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"
 
-- type: "plot"
-  title: "DPDK Throughput: testpmd-3n-skx-x710-64b-2t1c-base-pdr"
+# 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,DPDK]}/testpmd-3n-skx-x710-64b-2t1c-base-pdr"
-  data: "plot-dpdk-throughput-latency-3n-skx"
+  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' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           ('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: "testpmd-3n-skx-x710-64b-2t1c-base-pdr"
+    title: "memif-3n-skx-x710-64b-2t1c-base_and_features-ndr"
     layout: "plot-throughput"
 
-- type: "plot"
-  title: "DPDK Throughput: testpmd-3n-skx-x710-64b-4t2c-base-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,DPDK]}/testpmd-3n-skx-x710-64b-4t2c-base-pdr"
-  data: "plot-dpdk-throughput-latency-3n-skx"
+  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' 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
+           ('BASE' or 'SCALE') 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')"
+           ('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: "testpmd-3n-skx-xxv710-64b-4t2c-base-pdr"
+    title: "memif-3n-skx-x710-64b-2t1c-base_and_features-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - DPDK testpmd 2n-skx-x710
-- type: "plot"
-  title: "DPDK Throughput: testpmd-2n-skx-x710-64b-2t1c-base-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,DPDK]}/testpmd-2n-skx-x710-64b-2t1c-base-ndr"
-  data: "plot-dpdk-throughput-latency-2n-skx"
+  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' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           '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: "testpmd-2n-skx-x710-64b-2t1c-base-ndr"
+    title: "memif-3n-skx-x710-64b-4t2c-base_and_features-ndr"
     layout: "plot-throughput"
 
-- type: "plot"
-  title: "DPDK Throughput: testpmd-2n-skx-x710-64b-4t2c-base-ndr"
+-
+  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,DPDK]}/testpmd-2n-skx-x710-64b-4t2c-base-ndr"
-  data: "plot-dpdk-throughput-latency-2n-skx"
+  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' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
            '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           ('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: "testpmd-2n-skx-x710-64b-4t2c-base-ndr"
+    title: "memif-3n-skx-x710-64b-4t2c-base_and_features-pdr"
     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"
+## 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"
+
+################################################################################
 
-- 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 - 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 - 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"
+## 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"
 
-- type: "plot"
-  title: "DPDK Throughput: testpmd-2n-skx-xxv710-64b-2t1c-base-pdr"
+# 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,DPDK]}/testpmd-2n-skx-xxv710-64b-2t1c-base-pdr"
-  data: "plot-dpdk-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  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
-           'BASE' and
            'NDRPDR' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           '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: "testpmd-2n-skx-xxv710-64b-2t1c-base-pdr"
+    title: "ip4-3n-hsw-x520-64b-1t1c-features-oacl-ndr"
     layout: "plot-throughput"
 
-- type: "plot"
-  title: "DPDK Throughput: testpmd-2n-skx-xxv710-64b-4t2c-base-pdr"
+-
+  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,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"
+  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
-           (('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'"
+           'IP4FWD' and
+           ('OACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
+           not 'IPSEC' and
+           not 'DOT1Q' and
+           not 'VHOST'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2XCBASE"    # l2xcbase
-  - "L2BDBASE"    # l2bdbase
-  - "L2XCFWD"     # dot1q-l2xcbase
-  - "L2BDMACLRN"  # dot1q-l2bdbase
-  layout:
-    title: "l2sw-3n-hsw-x520-64b-2t2c-features-ndr"
-    layout: "plot-latency"
-
-# Packet Latency - VPP L2 3n-hsw-x520 features-iacl
-- type: "plot"
-  title: "VPP Latency: l2sw-3n-hsw-x520-64b-1t1c-features-iacl-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-1t1c-features-iacl-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           '1T1C' and
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'IACL' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
-           not 'MACIP' and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  layout:
-    title: "l2sw-3n-hsw-x520-64b-1t1c-features-iacl-ndr"
-    layout: "plot-latency"
-
-- type: "plot"
-  title: "VPP Latency: l2sw-3n-hsw-x520-64b-2t2c-features-iacl-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-2t2c-features-iacl-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           '2T2C' and
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'IACL' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
-           not 'MACIP' and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  layout:
-    title: "l2sw-3n-hsw-x520-64b-2t2c-features-iacl-ndr"
-    layout: "plot-latency"
-
-# Packet Latency - VPP L2 3n-hsw-x520 features-oacl
-- type: "plot"
-  title: "VPP Latency: l2sw-3n-hsw-x520-64b-1t1c-features-oacl-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-1t1c-features-oacl-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           '1T1C' and
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'OACL' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
-           not 'MACIP' and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
+  - "IP4BASE"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "l2sw-3n-hsw-x520-64b-1t1c-features-oacl-ndr"
-    layout: "plot-latency"
+    title: "ip4-3n-hsw-x520-64b-1t1c-features-oacl-pdr"
+    layout: "plot-throughput"
 
-- type: "plot"
-  title: "VPP Latency: l2sw-3n-hsw-x520-64b-2t2c-features-oacl-ndr-lat"
-  algorithm: "plot_latency_error_bars"
+-
+  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]}/l2sw-3n-hsw-x520-64b-2t2c-features-oacl-ndr-lat"
+  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
-           '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'"
+           'IP4FWD' and
+           ('OACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
+           not 'IPSEC' and
+           not 'DOT1Q' and
+           not 'VHOST'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "IP4BASE"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "l2sw-3n-hsw-x520-64b-2t2c-features-oacl-ndr"
-    layout: "plot-latency"
+    title: "ip4-3n-hsw-x520-64b-2t2c-features-oacl-ndr"
+    layout: "plot-throughput"
 
-# 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"
+-
+  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]}/l2sw-3n-hsw-x520-64b-1t1c-features-macip-ndr-lat"
+  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
-           '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'"
+           '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"
+  - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "IP4BASE"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "l2sw-3n-hsw-x520-64b-1t1c-features-macip-ndr"
-    layout: "plot-latency"
+    title: "ip4-3n-hsw-x520-64b-2t2c-features-oacl-pdr"
+    layout: "plot-throughput"
+
+## Packet Throughput - VPP IPv4 3n-hsw-x710 base and scale
+#-
+#  type: "plot"
+#  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
+#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+#           'NDRPDR' and
+#           '1T1C' and
+#           'IP4FWD' and
+#           not 'IPSEC' and
+#           not 'DOT1Q' and
+#           not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "IP4BASE"
+#  - "FIB_20K"
+#  - "FIB_200K"
+#  - "FIB_2M"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
+#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+#           'NDRPDR' and
+#           '1T1C' and
+#           'IP4FWD' and
+#           not 'IPSEC' and
+#           not 'DOT1Q' and
+#           not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "IP4BASE"
+#  - "FIB_20K"
+#  - "FIB_200K"
+#  - "FIB_2M"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+#           'NDRPDR' and
+#           '2T2C' and
+#           'IP4FWD' and
+#           not 'IPSEC' and
+#           not 'DOT1Q' and
+#           not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "IP4BASE"
+#  - "FIB_20K"
+#  - "FIB_200K"
+#  - "FIB_2M"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
+#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+#           'NDRPDR' and
+#           '2T2C' and
+#           'IP4FWD' and
+#           not 'IPSEC' and
+#           not 'DOT1Q' and
+#           not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "IP4BASE"
+#  - "FIB_20K"
+#  - "FIB_200K"
+#  - "FIB_2M"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "ip4-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
+#    layout: "plot-throughput"
+#
+## Packet Throughput - VPP IPv4 3n-hsw-x710 features
+#-
+#  type: "plot"
+#  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-features-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-ndr"
+#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           ('IP4BASE' or
+#            'POLICE_MARK' or
+#            'COPWHLIST' or
+#            ('NAT44' and 'BASE') or
+#            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
+#           'NDRPDR' and
+#           '1T1C' and
+#           'IP4FWD' and
+#           not 'IPSEC' and
+#           not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "DOT1Q"
+#  - "IP4BASE"
+#  - "NAT44"
+#  - "POLICE_MARK"
+#  - "COPWHLIST"
+#  - "IACL"
+#  - "OACL"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "ip4-3n-hsw-x710-64b-1t1c-features-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-features-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-pdr"
+#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           ('IP4BASE' or
+#            'POLICE_MARK' or
+#            'COPWHLIST' or
+#            ('NAT44' and 'BASE') or
+#            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
+#           'NDRPDR' and
+#           '1T1C' and
+#           'IP4FWD' and
+#           not 'IPSEC' and
+#           not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "DOT1Q"
+#  - "IP4BASE"
+#  - "NAT44"
+#  - "POLICE_MARK"
+#  - "COPWHLIST"
+#  - "IACL"
+#  - "OACL"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "ip4-3n-hsw-x710-64b-1t1c-features-pdr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-features-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-ndr"
+#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           ('IP4BASE' or
+#            'POLICE_MARK' or
+#            'COPWHLIST' or
+#            ('NAT44' and 'BASE') or
+#            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
+#           'NDRPDR' and
+#           '2T2C' and
+#           'IP4FWD' and
+#           not 'IPSEC' and
+#           not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "DOT1Q"
+#  - "IP4BASE"
+#  - "NAT44"
+#  - "POLICE_MARK"
+#  - "COPWHLIST"
+#  - "IACL"
+#  - "OACL"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "ip4-3n-hsw-x710-64b-2t2c-features-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-features-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-pdr"
+#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           ('IP4BASE' or
+#            'POLICE_MARK' or
+#            'COPWHLIST' or
+#            ('NAT44' and 'BASE') or
+#            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
+#           'NDRPDR' and
+#           '2T2C' and
+#           'IP4FWD' and
+#           not 'IPSEC' and
+#           not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "DOT1Q"
+#  - "IP4BASE"
+#  - "NAT44"
+#  - "POLICE_MARK"
+#  - "COPWHLIST"
+#  - "IACL"
+#  - "OACL"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "ip4-3n-hsw-x710-64b-2t2c-features-pdr"
+#    layout: "plot-throughput"
 
-- type: "plot"
-  title: "VPP Latency: l2sw-3n-hsw-x520-64b-2t2c-features-macip-ndr-lat"
-  algorithm: "plot_latency_error_bars"
+# Packet Throughput - VPP IPv4 3n-hsw-x710 features nat44
+-
+  type: "plot"
+  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-nat44-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-2t2c-features-macip-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-nat44-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           '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'"
+           '2T1C' and
+           'IP4FWD' and
+           ('NAT44' or 'IP4BASE') and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
-  - "latency"
+  - "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: "l2sw-3n-hsw-x520-64b-2t2c-features-macip-ndr"
-    layout: "plot-latency"
+    title: "ip4-3n-skx-x710-64b-2t1c-features-nat44-ndr"
+    layout: "plot-throughput"
 
-# 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"
+-
+  type: "plot"
+  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-nat44-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-nat44-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           'ETH' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
+           '2T1C' and
+           'IP4FWD' and
+           ('NAT44' or 'IP4BASE') and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2PATCH"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+  - "IP4BASE"
+  - "BASE"
+  - "SRC_USER_10"
+  - "SRC_USER_100"
+  - "SRC_USER_1000"
+  - "SRC_USER_2000"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
-    layout: "plot-latency"
+    title: "ip4-3n-skx-x710-64b-2t1c-features-nat44-pdr"
+    layout: "plot-throughput"
 
-- type: "plot"
-  title: "VPP Latency: l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
+-
+  type: "plot"
+  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-nat44-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-nat44-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           'ETH' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
+           '4T2C' and
+           'IP4FWD' and
+           ('NAT44' or 'IP4BASE') and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2PATCH"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+  - "IP4BASE"
+  - "BASE"
+  - "SRC_USER_10"
+  - "SRC_USER_100"
+  - "SRC_USER_1000"
+  - "SRC_USER_2000"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
-    layout: "plot-latency"
+    title: "ip4-3n-skx-x710-64b-4t2c-features-nat44-ndr"
+    layout: "plot-throughput"
 
-# 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"
+-
+  type: "plot"
+  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-nat44-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-1t1c-features-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-nat44-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           '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'"
+           '4T2C' and
+           'IP4FWD' and
+           ('NAT44' or 'IP4BASE') and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2XCBASE"    # l2xcbase
-  - "L2BDBASE"    # l2bdbase
-  - "L2XCFWD"     # dot1q-l2xcbase
-  - "L2BDMACLRN"  # dot1q-l2bdbase
+  - "IP4BASE"
+  - "BASE"
+  - "SRC_USER_10"
+  - "SRC_USER_100"
+  - "SRC_USER_1000"
+  - "SRC_USER_2000"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "l2sw-3n-hsw-x710-64b-1t1c-features-ndr"
-    layout: "plot-latency"
+    title: "ip4-3n-skx-x710-64b-4t2c-features-nat44-pdr"
+    layout: "plot-throughput"
 
-- type: "plot"
-  title: "VPP Latency: l2sw-3n-hsw-x710-64b-2t2c-features-ndr-lat"
-  algorithm: "plot_latency_error_bars"
+# Packet Throughput - VPP IPv4 3n-hsw-x710 features iacl
+-
+  type: "plot"
+  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-iacl-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-2t2c-features-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-iacl-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           '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'"
+           '2T1C' and
+           'IP4FWD' and
+           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2XCBASE"    # l2xcbase
-  - "L2BDBASE"    # l2bdbase
-  - "L2XCFWD"     # dot1q-l2xcbase
-  - "L2BDMACLRN"  # dot1q-l2bdbase
+  - "IP4BASE"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "l2sw-3n-hsw-x710-64b-2t2c-features-ndr"
-    layout: "plot-latency"
+    title: "ip4-3n-skx-x710-64b-2t1c-features-iacl-ndr"
+    layout: "plot-throughput"
 
-# Packet Latency - VPP L2 3n-hsw-x710 features-iacl
-- type: "plot"
-  title: "VPP Latency: l2sw-3n-hsw-x710-64b-1t1c-features-iacl-ndr-lat"
-  algorithm: "plot_latency_error_bars"
+-
+  type: "plot"
+  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-iacl-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-1t1c-features-iacl-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-iacl-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           '1T1C' and
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'IACL' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
-           not 'MACIP' and
-           not 'VHOST' and
-           not 'MEMIF'"
+           '2T1C' and
+           'IP4FWD' and
+           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "IP4BASE"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "l2sw-3n-hsw-x710-64b-1t1c-features-iacl-ndr"
-    layout: "plot-latency"
+    title: "ip4-3n-skx-x710-64b-2t1c-features-iacl-pdr"
+    layout: "plot-throughput"
 
-- type: "plot"
-  title: "VPP Latency: l2sw-3n-hsw-x710-64b-2t2c-features-iacl-ndr-lat"
-  algorithm: "plot_latency_error_bars"
+-
+  type: "plot"
+  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-iacl-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-2t2c-features-iacl-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-iacl-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '2T2C' and
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'IACL' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
-           not 'MACIP' and
-           not 'VHOST' and
-           not 'MEMIF'"
+           '64B' and
+           'NDRPDR' and
+           '4T2C' and
+           'IP4FWD' and
+           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "IP4BASE"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "l2sw-3n-hsw-x710-64b-2t2c-features-iacl-ndr"
-    layout: "plot-latency"
+    title: "ip4-3n-skx-x710-64b-4t2c-features-iacl-ndr"
+    layout: "plot-throughput"
 
-# 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"
+-
+  type: "plot"
+  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-iacl-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-iacl-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           'BASE' and
            'NDRPDR' and
-           'ETH' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
+           '4T2C' and
+           'IP4FWD' and
+           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2PATCH"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
+  - "IP4BASE"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "l2sw-3n-hsw-xl710-64b-1t1c-base-ndr"
-    layout: "plot-latency"
+    title: "ip4-3n-skx-x710-64b-4t2c-features-iacl-pdr"
+    layout: "plot-throughput"
 
-- type: "plot"
-  title: "VPP Latency: l2sw-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
-  algorithm: "plot_latency_error_bars"
+## Packet Throughput - VPP IPv4 3n-hsw-xl710 base and scale
+#-
+#  type: "plot"
+#  title: "VPP Throughput: ip4-3n-hsw-xl710-64b-1t1c-base-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-1t1c-base-ndr"
+#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-XL710' and
+#           '64B' and
+#           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+#           'NDRPDR' and
+#           '1T1C' and
+#           'IP4FWD' and
+#           not 'IPSEC' and
+#           not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "IP4BASE"
+#  - "FIB_20K"
+#  - "FIB_200K"
+#  - "FIB_2M"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "ip4-3n-hsw-xl710-64b-1t1c-base-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: ip4-3n-hsw-xl710-64b-1t1c-base-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-1t1c-base-pdr"
+#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-XL710' and
+#           '64B' and
+#           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+#           'NDRPDR' and
+#           '1T1C' and
+#           'IP4FWD' and
+#           not 'IPSEC' and
+#           not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "IP4BASE"
+#  - "FIB_20K"
+#  - "FIB_200K"
+#  - "FIB_2M"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "ip4-3n-hsw-xl710-64b-1t1c-base-pdr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: ip4-3n-hsw-xl710-64b-2t2c-base-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-2t2c-base-ndr"
+#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-XL710' and
+#           '64B' and
+#           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+#           'NDRPDR' and
+#           '2T2C' and
+#           'IP4FWD' and
+#           not 'IPSEC' and
+#           not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "IP4BASE"
+#  - "FIB_20K"
+#  - "FIB_200K"
+#  - "FIB_2M"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "ip4-3n-hsw-xl710-64b-2t2c-base-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: ip4-3n-hsw-xl710-64b-2t2c-base-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-2t2c-base-pdr"
+#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-XL710' and
+#           '64B' and
+#           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+#           'NDRPDR' and
+#           '2T2C' and
+#           'IP4FWD' and
+#           not 'IPSEC' and
+#           not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "IP4BASE"
+#  - "FIB_20K"
+#  - "FIB_200K"
+#  - "FIB_2M"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "ip4-3n-hsw-xl710-64b-2t2c-base-pdr"
+#    layout: "plot-throughput"
+
+# Packet Throughput - VPP IPv4 3n-skx-x710 base and scale
+-
+  type: "plot"
+  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           'BASE' and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
-           'ETH' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
+           '2T1C' and
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'DOT1Q' and
+           not 'VHOST'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2PATCH"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
+  - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "l2sw-3n-hsw-xl710-64b-2t2c-base-ndr"
-    layout: "plot-latency"
+    title: "ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+    layout: "plot-throughput"
 
-# 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"
+-
+  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-x710-64b-2t1c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           ('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' and
-           not 'DRV_AVF'"
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'DOT1Q' and
+           not 'VHOST'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+  - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
-    layout: "plot-latency"
+    title: "ip4-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
+    layout: "plot-throughput"
 
-- type: "plot"
-  title: "VPP Latency: l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
+-
+  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-x710-64b-4t2c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           ('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' and
-           not 'DRV_AVF'"
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'DOT1Q' and
+           not 'VHOST'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+  - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
-    layout: "plot-latency"
+    title: "ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
+    layout: "plot-throughput"
 
-# 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"
+-
+  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-x710-64b-2t1c-features-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
-           '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'"
+           '4T2C' and
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'DOT1Q' and
+           not 'VHOST'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2XCBASE"    # l2xcbase
-  - "L2BDBASE"    # l2bdbase
-  - "L2XCFWD"     # dot1q-l2xcbase
-  - "L2BDMACLRN"  # dot1q-l2bdbase
+  - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "l2sw-3n-skx-x710-64b-2t1c-features-ndr"
-    layout: "plot-latency"
+    title: "ip4-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
+    layout: "plot-throughput"
 
-- type: "plot"
-  title: "VPP Latency: l2sw-3n-skx-x710-64b-4t2c-features-ndr-lat"
-  algorithm: "plot_latency_error_bars"
+# 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]}/l2sw-3n-skx-x710-64b-4t2c-features-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-ndr"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
+           ('IP4BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            ('NAT44' and 'BASE') or
+            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
            'NDRPDR' and
-           '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'"
+           '2T1C' and
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2XCBASE"    # l2xcbase
-  - "L2BDBASE"    # l2bdbase
-  - "L2XCFWD"     # dot1q-l2xcbase
-  - "L2BDMACLRN"  # dot1q-l2bdbase
+  - "DOT1Q"
+  - "IP4BASE"
+  - "NAT44"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACL"
+  - "OACL"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "l2sw-3n-skx-x710-64b-4t2c-features-ndr"
-    layout: "plot-latency"
+    title: "ip4-3n-skx-x710-64b-2t1c-features-ndr"
+    layout: "plot-throughput"
 
-# 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"
+-
+  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]}/l2sw-3n-skx-x710-64b-2t1c-features-iacl-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-pdr"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
+           ('IP4BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            ('NAT44' and 'BASE') or
+            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
            'NDRPDR' and
            '2T1C' and
-           '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'"
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "DOT1Q"
+  - "IP4BASE"
+  - "NAT44"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACL"
+  - "OACL"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "l2sw-3n-skx-x710-64b-2t1c-features-iacl-ndr"
-    layout: "plot-latency"
+    title: "ip4-3n-skx-x710-64b-2t1c-features-pdr"
+    layout: "plot-throughput"
 
-- type: "plot"
-  title: "VPP Latency: l2sw-3n-skx-x710-64b-4t2c-features-iacl-ndr-lat"
-  algorithm: "plot_latency_error_bars"
+-
+  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]}/l2sw-3n-skx-x710-64b-4t2c-features-iacl-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-ndr"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
+           ('IP4BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            ('NAT44' and 'BASE') or
+            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
            'NDRPDR' and
            '4T2C' and
-           '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'"
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "DOT1Q"
+  - "IP4BASE"
+  - "NAT44"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACL"
+  - "OACL"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "l2sw-3n-skx-x710-64b-4t2c-features-iacl-ndr"
-    layout: "plot-latency"
+    title: "ip4-3n-skx-x710-64b-4t2c-features-ndr"
+    layout: "plot-throughput"
 
-# Packet Latency - VPP L2 3n-skx-xxv710 base
-- type: "plot"
-  title: "VPP Latency: l2sw-3n-skx-xxv710-64b-2t1c-base-ndr-lat"
-  algorithm: "plot_latency_error_bars"
+-
+  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]}/l2sw-3n-skx-xxv710-64b-2t1c-base-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-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
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            ('NAT44' and 'BASE') or
+            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
            'NDRPDR' and
-           'ETH' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
+           '4T2C' and
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2PATCH"
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "L2BDMACLRN"
+  - "DOT1Q"
+  - "IP4BASE"
+  - "NAT44"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACL"
+  - "OACL"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "l2sw-3n-skx-xxv710-64b-2t1c-base-ndr"
-    layout: "plot-latency"
+    title: "ip4-3n-skx-x710-64b-4t2c-features-pdr"
+    layout: "plot-throughput"
+
+## Packet Throughput - VPP IPv4 3n-skx-x710 features nat44
+#-
+#  type: "plot"
+#  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-features-nat44-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-nat44-ndr"
+#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           '1T1C' and
+#           'IP4FWD' and
+#           ('NAT44' or 'IP4BASE') and
+#           not 'IPSEC' and
+#           not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "IP4BASE"
+#  - "BASE"
+#  - "SRC_USER_10"
+#  - "SRC_USER_100"
+#  - "SRC_USER_1000"
+#  - "SRC_USER_2000"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "ip4-3n-hsw-x710-64b-1t1c-features-nat44-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-features-nat44-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-nat44-pdr"
+#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           '1T1C' and
+#           'IP4FWD' and
+#           ('NAT44' or 'IP4BASE') and
+#           not 'IPSEC' and
+#           not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "IP4BASE"
+#  - "BASE"
+#  - "SRC_USER_10"
+#  - "SRC_USER_100"
+#  - "SRC_USER_1000"
+#  - "SRC_USER_2000"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "ip4-3n-hsw-x710-64b-1t1c-features-nat44-pdr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-features-nat44-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-nat44-ndr"
+#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           '2T2C' and
+#           'IP4FWD' and
+#           ('NAT44' or 'IP4BASE') and
+#           not 'IPSEC' and
+#           not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "IP4BASE"
+#  - "BASE"
+#  - "SRC_USER_10"
+#  - "SRC_USER_100"
+#  - "SRC_USER_1000"
+#  - "SRC_USER_2000"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "ip4-3n-hsw-x710-64b-2t2c-features-nat44-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-features-nat44-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-nat44-pdr"
+#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           '2T2C' and
+#           'IP4FWD' and
+#           ('NAT44' or 'IP4BASE') and
+#           not 'IPSEC' and
+#           not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "IP4BASE"
+#  - "BASE"
+#  - "SRC_USER_10"
+#  - "SRC_USER_100"
+#  - "SRC_USER_1000"
+#  - "SRC_USER_2000"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "ip4-3n-hsw-x710-64b-2t2c-features-nat44-pdr"
+#    layout: "plot-throughput"
+#
+## Packet Throughput - VPP IPv4 3n-skx-x710 features iacl
+#-
+#  type: "plot"
+#  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-features-iacl-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-iacl-ndr"
+#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           '1T1C' and
+#           'IP4FWD' and
+#           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
+#           not 'IPSEC' and
+#           not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "IP4BASE"
+#  - "ACL_STATELESS"
+#  - "ACL_STATEFUL"
+#  - "ACL_STATELESS"
+#  - "ACL_STATEFUL"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "ip4-3n-hsw-x710-64b-1t1c-features-iacl-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-features-iacl-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-iacl-pdr"
+#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           '1T1C' and
+#           'IP4FWD' and
+#           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
+#           not 'IPSEC' and
+#           not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "IP4BASE"
+#  - "ACL_STATELESS"
+#  - "ACL_STATEFUL"
+#  - "ACL_STATELESS"
+#  - "ACL_STATEFUL"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "ip4-3n-hsw-x710-64b-1t1c-features-iacl-pdr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-features-iacl-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-iacl-ndr"
+#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           '2T2C' and
+#           'IP4FWD' and
+#           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
+#           not 'IPSEC' and
+#           not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "IP4BASE"
+#  - "ACL_STATELESS"
+#  - "ACL_STATEFUL"
+#  - "ACL_STATELESS"
+#  - "ACL_STATEFUL"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "ip4-3n-hsw-x710-64b-2t2c-features-iacl-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-features-iacl-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-iacl-pdr"
+#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           '2T2C' and
+#           'IP4FWD' and
+#           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
+#           not 'IPSEC' and
+#           not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "IP4BASE"
+#  - "ACL_STATELESS"
+#  - "ACL_STATEFUL"
+#  - "ACL_STATELESS"
+#  - "ACL_STATEFUL"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "ip4-3n-hsw-x710-64b-2t2c-features-iacl-pdr"
+#    layout: "plot-throughput"
 
-- 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 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 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"
+## 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"
 
-- type: "plot"
-  title: "VPP Latency: l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
+# 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]}/l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  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
-           ('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
+           'ENCAP' 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
+           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
            not 'VHOST' and
-           'MEMIF'"
+           not 'IPSECHW'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
+  - "IP4BASE"
+  - "LISP"
+  - "VXLAN_1"
+  - "VXLAN_10"
+  - "VXLAN_100"
+  - "VXLAN_1000"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "memif-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
-    layout: "plot-latency"
+    title: "ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+    layout: "plot-throughput"
 
-# 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"
+-
+  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]}/memif-3n-hsw-x710-64b-1t1c-base_and_features-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  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
-           ('BASE' or 'SCALE') and
+           'ENCAP' and
            'NDRPDR' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
+           '2T1C' and
+           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
            not 'VHOST' and
-           'MEMIF'"
+           not 'IPSECHW'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
+  - "IP4BASE"
+  - "LISP"
+  - "VXLAN_1"
+  - "VXLAN_10"
+  - "VXLAN_100"
+  - "VXLAN_1000"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "memif-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
-    layout: "plot-latency"
+    title: "ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
+    layout: "plot-throughput"
 
-- type: "plot"
-  title: "VPP Latency: memif-3n-hsw-x710-64b-2t2c-base_and_features-ndr-lat"
-  algorithm: "plot_latency_error_bars"
+-
+  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]}/memif-3n-hsw-x710-64b-2t2c-base_and_features-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  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
-           ('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
+           'ENCAP' and
            'NDRPDR' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
+           '4T2C' and
+           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
            not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
+           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: "memif-3n-hsw-xl710-64b-1t1c-base_and_features-ndr"
-    layout: "plot-latency"
+    title: "ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
+    layout: "plot-throughput"
 
-- type: "plot"
-  title: "VPP Latency: memif-3n-hsw-xl710-64b-2t2c-base_and_features-ndr-lat"
-  algorithm: "plot_latency_error_bars"
+-
+  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]}/memif-3n-hsw-xl710-64b-2t2c-base_and_features-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  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
-           ('BASE' or 'SCALE') and
+           'ENCAP' and
            'NDRPDR' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
+           '4T2C' and
+           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
            not 'VHOST' and
-           'MEMIF'"
+           not 'IPSECHW'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
+  - "IP4BASE"
+  - "LISP"
+  - "VXLAN_1"
+  - "VXLAN_10"
+  - "VXLAN_100"
+  - "VXLAN_1000"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "memif-3n-hsw-xl710-64b-2t2c-base_and_features-ndr"
-    layout: "plot-latency"
+    title: "ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
+    layout: "plot-throughput"
 
-# 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"
+# 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]}/memif-3n-skx-x710-64b-2t1c-base_and_features-ndr-lat"
+  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
-           ('BASE' or 'SCALE') and
+           'ENCAP' and
            'NDRPDR' and
            '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
+           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
+           not 'DOT1Q' and
            not 'VHOST' and
-           'MEMIF'"
+           not 'IPSECHW'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
+  - "IP4BASE"
   - "L2BDMACLRN"
-  - "IP4FWD"
+  - "L2XCFWD"
+  - "LISP"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "memif-3n-skx-x710-64b-2t1c-base_and_features-ndr"
-    layout: "plot-latency"
+    title: "ip4tun-3n-skx-x710-64b-2t1c-base_and_features-ndr"
+    layout: "plot-throughput"
 
-- type: "plot"
-  title: "VPP Latency: memif-3n-skx-x710-64b-4t2c-base_and_features-ndr-lat"
-  algorithm: "plot_latency_error_bars"
+-
+  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]}/memif-3n-skx-x710-64b-4t2c-base_and_features-ndr-lat"
+  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
-           ('BASE' or 'SCALE') and
+           'ENCAP' and
            'NDRPDR' and
            '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
+           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
+           not 'DOT1Q' and
            not 'VHOST' and
-           'MEMIF'"
+           not 'IPSECHW'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
+  - "IP4BASE"
   - "L2BDMACLRN"
-  - "IP4FWD"
+  - "L2XCFWD"
+  - "LISP"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "memif-3n-skx-x710-64b-4t2c-base_and_features-ndr"
-    layout: "plot-latency"
+    title: "ip4tun-3n-skx-x710-64b-4t2c-base_and_features-ndr"
+    layout: "plot-throughput"
 
-# 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"
+-
+  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]}/memif-2n-skx-x710-64b-2t1c-base_and_features-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  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
-           ('BASE' or 'SCALE') and
+           'ENCAP' and
            'NDRPDR' and
            '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
+           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
+           not 'DOT1Q' and
            not 'VHOST' and
-           not 'NF_DENSITY' and
-           'MEMIF'"
+           not 'IPSECHW'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
+  - "IP4BASE"
   - "L2BDMACLRN"
-  - "IP4FWD"
+  - "L2XCFWD"
+  - "LISP"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "memif-2n-skx-x710-64b-2t1c-base_and_features-ndr"
-    layout: "plot-latency"
+    title: "ip4tun-3n-skx-x710-64b-2t1c-base_and_features-pdr"
+    layout: "plot-throughput"
 
-- type: "plot"
-  title: "VPP Latency: memif-2n-skx-x710-64b-4t2c-base_and_features-ndr-lat"
-  algorithm: "plot_latency_error_bars"
+-
+  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]}/memif-2n-skx-x710-64b-4t2c-base_and_features-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  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
-           ('BASE' or 'SCALE') and
+           'ENCAP' and
            'NDRPDR' and
            '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
+           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
+           not 'DOT1Q' and
            not 'VHOST' and
-           not 'NF_DENSITY' and
-           'MEMIF'"
+           not 'IPSECHW'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
+  - "IP4BASE"
   - "L2BDMACLRN"
-  - "IP4FWD"
+  - "L2XCFWD"
+  - "LISP"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "memif-2n-skx-x710-64b-4t2c-base_and_features-ndr"
-    layout: "plot-latency"
+    title: "ip4tun-3n-skx-x710-64b-4t2c-base_and_features-pdr"
+    layout: "plot-throughput"
 
-## 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"
+################################################################################
+
+## 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]}/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
+#  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
-#           '2T1C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-#           not 'VHOST' and
-#           'MEMIF'"
+#           '2T2C' and
+#           'IP6FWD' and
+#           not 'SRv6' and
+#           not 'IPSEC' and
+#           not 'VHOST'"
 #  parameters:
-#  - "latency"
+#  - "throughput"
 #  - "parent"
 #  - "tags"
 #  sort:
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "IP4FWD"
+#  - "IP6BASE"
+#  - "FIB_20K"
+#  - "FIB_200K"
+#  - "FIB_2M"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
 #  layout:
-#    title: "memif-2n-skx-xxv710-64b-2t1c-base_and_features-ndr"
-#    layout: "plot-latency"
+#    title: "ip6-3n-hsw-x520-78b-2t2c-base-pdr"
+#    layout: "plot-throughput"
 #
-#- type: "plot"
-#  title: "VPP Latency: memif-2n-skx-xxv710-64b-4t2c-base_and_features-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
+## 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]}/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
+#  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
-#           '4T2C' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-#           not 'VHOST' and
-#           'MEMIF'"
+#           '1T1C' and
+#           'IP6FWD' and
+#           not 'SRv6' and
+#           not 'IPSEC' and
+#           not 'VHOST'"
 #  parameters:
-#  - "latency"
+#  - "throughput"
 #  - "parent"
 #  - "tags"
 #  sort:
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "IP4FWD"
+#  - "IP6BASE"
+#  - "FIB_20K"
+#  - "FIB_200K"
+#  - "FIB_2M"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
 #  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"
+#    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]}/k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-ndr-lat"
-#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
+#  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
-#           'L2XCFWD' and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
+#           'IP6FWD' and
+#           not 'SRv6' and
+#           not 'IPSEC' and
+#           not 'VHOST'"
 #  parameters:
-#  - "latency"
+#  - "throughput"
 #  - "parent"
 #  - "tags"
 #  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
+#  - "IP6BASE"
+#  - "FIB_20K"
+#  - "FIB_200K"
+#  - "FIB_2M"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
 #  layout:
-#    title: "k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-ndr"
-#    layout: "plot-latency"
+#    title: "ip6-3n-hsw-x710-78b-1t1c-base_and_scale-pdr"
+#    layout: "plot-throughput"
 #
-#- type: "plot"
-#  title: "VPP Latency: k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
+#-
+#  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]}/k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-ndr-lat"
-#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
+#  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
-#           'L2XCFWD' and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
+#           'IP6FWD' and
+#           not 'SRv6' and
+#           not 'IPSEC' and
+#           not 'VHOST'"
 #  parameters:
-#  - "latency"
+#  - "throughput"
 #  - "parent"
 #  - "tags"
 #  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
+#  - "IP6BASE"
+#  - "FIB_20K"
+#  - "FIB_200K"
+#  - "FIB_2M"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
 #  layout:
-#    title: "k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-ndr"
-#    layout: "plot-latency"
+#    title: "ip6-3n-hsw-x710-78b-2t2c-base_and_scale-ndr"
+#    layout: "plot-throughput"
 #
-## 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"
+#-
+#  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]}/k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-ndr-lat"
-#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
+#  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
-#           ('L2BDMACSTAT' or 'L2BDMACLRN') and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
+#           'IP6FWD' and
+#           not 'SRv6' and
+#           not 'IPSEC' and
+#           not 'VHOST'"
 #  parameters:
-#  - "latency"
+#  - "throughput"
 #  - "parent"
 #  - "tags"
 #  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
+#  - "IP6BASE"
+#  - "POLICE_MARK"
+#  - "COPWHLIST"
+#  - "IACLDST"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
 #  layout:
-#    title: "k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-ndr"
-#    layout: "plot-latency"
+#    title: "ip6-3n-hsw-x710-78b-1t1c-base_and_features-ndr"
+#    layout: "plot-throughput"
 #
-#- type: "plot"
-#  title: "VPP Latency: k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
+#-
+#  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]}/k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-ndr-lat"
-#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
+#  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
-#           ('L2BDMACSTAT' or 'L2BDMACLRN') and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
+#           'IP6FWD' and
+#           not 'SRv6' and
+#           not 'IPSEC' and
+#           not 'VHOST'"
 #  parameters:
-#  - "latency"
+#  - "throughput"
 #  - "parent"
 #  - "tags"
 #  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
+#  - "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: "k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-ndr"
-#    layout: "plot-latency"
+#    title: "ip6-3n-hsw-x710-78b-1t1c-base_and_features-pdr"
+#    layout: "plot-throughput"
 #
-## 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"
+#-
+#  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]}/k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-ndr-lat"
-#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
+#  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
-#           '64B' and
-#           ('BASE' or 'SCALE') and
+#           '78B' and
+#           ('IP6BASE' or
+#            'POLICE_MARK' or
+#            'COPWHLIST' or
+#            'IACLDST') and
 #           'NDRPDR' and
-#           '1T1C' and
-#           'L2XCFWD' and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
+#           '2T2C' and
+#           'IP6FWD' and
+#           not 'SRv6' and
+#           not 'IPSEC' and
+#           not 'VHOST'"
 #  parameters:
-#  - "latency"
+#  - "throughput"
 #  - "parent"
 #  - "tags"
 #  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
+#  - "IP6BASE"
+#  - "POLICE_MARK"
+#  - "COPWHLIST"
+#  - "IACLDST"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
 #  layout:
-#    title: "k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-ndr"
-#    layout: "plot-latency"
+#    title: "ip6-3n-hsw-x710-78b-2t2c-base_and_features-pdr"
+#    layout: "plot-throughput"
 #
-#- type: "plot"
-#  title: "VPP Latency: k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
+## 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]}/k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-ndr-lat"
-#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
+#  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
-#           '2T2C' and
-#           'L2XCFWD' and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
+#           '1T1C' and
+#           'IP6FWD' and
+#           not 'SRv6' and
+#           not 'IPSEC' and
+#           not 'VHOST'"
 #  parameters:
-#  - "latency"
+#  - "throughput"
 #  - "parent"
 #  - "tags"
 #  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
+#  - "IP6BASE"
+#  - "FIB_20K"
+#  - "FIB_200K"
+#  - "FIB_2M"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
 #  layout:
-#    title: "k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-ndr"
-#    layout: "plot-latency"
+#    title: "ip6-3n-hsw-xl710-78b-1t1c-base-ndr"
+#    layout: "plot-throughput"
 #
-## 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"
+#-
+#  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]}/k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-ndr-lat"
-#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
+#  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
-#           ('L2BDMACSTAT' or 'L2BDMACLRN') and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
+#           'IP6FWD' and
+#           not 'SRv6' and
+#           not 'IPSEC' and
+#           not 'VHOST'"
 #  parameters:
-#  - "latency"
+#  - "throughput"
 #  - "parent"
 #  - "tags"
 #  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
+#  - "IP6BASE"
+#  - "FIB_20K"
+#  - "FIB_200K"
+#  - "FIB_2M"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
 #  layout:
-#    title: "k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-ndr"
-#    layout: "plot-latency"
+#    title: "ip6-3n-hsw-xl710-78b-1t1c-base-pdr"
+#    layout: "plot-throughput"
 #
-#- type: "plot"
-#  title: "VPP Latency: k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
+#-
+#  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]}/k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-ndr-lat"
-#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
+#  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
-#           ('L2BDMACSTAT' or 'L2BDMACLRN') and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
+#           'IP6FWD' and
+#           not 'SRv6' and
+#           not 'IPSEC' and
+#           not 'VHOST'"
 #  parameters:
-#  - "latency"
+#  - "throughput"
 #  - "parent"
 #  - "tags"
 #  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
+#  - "IP6BASE"
+#  - "FIB_20K"
+#  - "FIB_200K"
+#  - "FIB_2M"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
 #  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"
+#    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 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"
+# 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]}/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
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-2t1c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '78B' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
-           '1T1C' and
-           'IP4FWD' and
-           ('NAT44' or 'IP4BASE') and
-           not 'DOT1Q' and
+           '2T1C' and
+           'IP6FWD' and
+           not 'SRv6' and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP4BASE"
-  - "BASE"
-  - "SRC_USER_10"
-  - "SRC_USER_100"
-  - "SRC_USER_1000"
-  - "SRC_USER_2000"
+  - "IP6BASE"
+  - "FIB_20k"
+  - "FIB_200k"
+  - "FIB_2M"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x520-64b-1t1c-features-nat44-ndr"
-    layout: "plot-latency"
+    title: "ip6-3n-skx-x710-78b-2t1c-base_and_scale-ndr"
+    layout: "plot-throughput"
 
-- type: "plot"
-  title: "VPP Latency: ip4-3n-hsw-x520-64b-2t2c-features-nat44-ndr-lat"
-  algorithm: "plot_latency_error_bars"
+-
+  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]}/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
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-2t1c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '78B' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
-           '2T2C' and
-           'IP4FWD' and
-           ('NAT44' or 'IP4BASE') and
-           not 'DOT1Q' and
+           '2T1C' and
+           'IP6FWD' and
+           not 'SRv6' and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP4BASE"
-  - "BASE"
-  - "SRC_USER_10"
-  - "SRC_USER_100"
-  - "SRC_USER_1000"
-  - "SRC_USER_2000"
+  - "IP6BASE"
+  - "FIB_20k"
+  - "FIB_200k"
+  - "FIB_2M"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x520-64b-2t2c-features-nat44-ndr"
-    layout: "plot-latency"
+    title: "ip6-3n-skx-x710-78b-2t1c-base_and_scale-pdr"
+    layout: "plot-throughput"
 
-# 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"
+-
+  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]}/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
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-4t2c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '78B' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
-           '1T1C' and
-           'IP4FWD' and
-           (('IACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
+           '4T2C' and
+           'IP6FWD' and
+           not 'SRv6' and
            not 'IPSEC' and
-           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
+  - "IP6BASE"
+  - "FIB_20k"
+  - "FIB_200k"
+  - "FIB_2M"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x520-64b-1t1c-features-iacl-ndr"
-    layout: "plot-latency"
+    title: "ip6-3n-skx-x710-78b-4t2c-base_and_scale-ndr"
+    layout: "plot-throughput"
 
-- type: "plot"
-  title: "VPP Latency: ip4-3n-hsw-x520-64b-2t2c-features-iacl-ndr-lat"
-  algorithm: "plot_latency_error_bars"
+-
+  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]}/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
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-4t2c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '78B' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
-           '2T2C' and
-           'IP4FWD' and
-           (('IACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
+           '4T2C' and
+           'IP6FWD' and
+           not 'SRv6' and
            not 'IPSEC' and
-           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
+  - "IP6BASE"
+  - "FIB_20k"
+  - "FIB_200k"
+  - "FIB_2M"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x520-64b-2t2c-features-iacl-ndr"
-    layout: "plot-latency"
+    title: "ip6-3n-skx-x710-78b-4t2c-base_and_scale-pdr"
+    layout: "plot-throughput"
 
-# 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"
+# 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]}/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
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-2t1c-base_and_features-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '78B' and
+           ('IP6BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            'IACLDST') and
            'NDRPDR' and
-           '1T1C' and
-           'IP4FWD' and
-           (('OACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
+           '2T1C' and
+           'IP6FWD' and
+           not 'SRv6' and
            not 'IPSEC' and
-           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
+  - "IP6BASE"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACLDST"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x520-64b-1t1c-features-oacl-ndr"
-    layout: "plot-latency"
+    title: "ip6-3n-skx-x710-78b-2t1c-base_and_features-ndr"
+    layout: "plot-throughput"
 
-- type: "plot"
-  title: "VPP Latency: ip4-3n-hsw-x520-64b-2t2c-features-oacl-ndr-lat"
-  algorithm: "plot_latency_error_bars"
+-
+  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]}/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
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-4t2c-base_and_features-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '78B' and
+           ('IP6BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            'IACLDST') and
            'NDRPDR' and
-           '2T2C' and
-           'IP4FWD' and
-           (('OACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
+           '4T2C' and
+           'IP6FWD' and
+           not 'SRv6' and
            not 'IPSEC' and
-           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
+  - "IP6BASE"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACLDST"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x520-64b-2t2c-features-oacl-ndr"
-    layout: "plot-latency"
+    title: "ip6-3n-skx-x710-78b-4t2c-base_and_features-ndr"
+    layout: "plot-throughput"
 
-# 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"
+-
+  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]}/ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  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
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           '78B' and
+           ('IP6BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            'IACLDST') and
            'NDRPDR' and
-           '1T1C' and
-           'IP4FWD' and
+           '2T1C' and
+           'IP6FWD' and
+           not 'SRv6' and
            not 'IPSEC' and
-           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  - "IP6BASE"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACLDST"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
-    layout: "plot-latency"
+    title: "ip6-3n-skx-x710-78b-2t1c-base_and_features-pdr"
+    layout: "plot-throughput"
 
-- type: "plot"
-  title: "VPP Latency: ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
+-
+  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]}/ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  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
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           '78B' and
+           ('IP6BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            'IACLDST') and
            'NDRPDR' and
-           '2T2C' and
-           'IP4FWD' and
+           '4T2C' and
+           'IP6FWD' and
+           not 'SRv6' and
            not 'IPSEC' and
-           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  - "IP6BASE"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACLDST"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
-    layout: "plot-latency"
+    title: "ip6-3n-skx-x710-78b-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 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"
+## 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"
 
-- 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 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 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"
+# Packet Throughput - VPP IPSec 3n-hsw-xl710 base
+-
+  type: "plot"
+  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-1t1c-base-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-nat44-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-base-ndr"
   data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  filter: "'NIC_Intel-XL710' and
            '64B' and
+           'IP4FWD' and
            'NDRPDR' and
+           'BASE' and
            '1T1C' and
-           'IP4FWD' and
-           ('NAT44' or 'IP4BASE') and
-           not 'IPSEC' and
+           'IPSECHW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
-  - "latency"
+  - "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-latency"
+    title: "ipsec-3n-hsw-xl710-64b-1t1c-base-ndr"
+    layout: "plot-throughput"
 
-- type: "plot"
-  title: "VPP Latency: ip4-3n-hsw-x710-64b-2t2c-features-nat44-ndr-lat"
-  algorithm: "plot_latency_error_bars"
+-
+  type: "plot"
+  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-1t1c-base-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-nat44-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-base-pdr"
   data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  filter: "'NIC_Intel-XL710' 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
+           'BASE' and
            '1T1C' and
-           'IP4FWD' and
-           ('IACL' and ('ACL10' or 'ACL50') and '10K_FLOWS' or 'IP4BASE') and
-           not 'IPSEC' and
+           'IPSECHW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
-  - "latency"
+  - "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-latency"
+    title: "ipsec-3n-hsw-xl710-64b-1t1c-base-pdr"
+    layout: "plot-throughput"
 
-- type: "plot"
-  title: "VPP Latency: ip4-3n-hsw-x710-64b-2t2c-features-iacl-ndr-lat"
-  algorithm: "plot_latency_error_bars"
+-
+  type: "plot"
+  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-2t2c-base-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-iacl-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-base-ndr"
   data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  filter: "'NIC_Intel-XL710' and
            '64B' and
+           'IP4FWD' and
            'NDRPDR' and
+           'BASE' and
            '2T2C' and
-           'IP4FWD' and
-           ('IACL' and ('ACL10' or 'ACL50') and '10K_FLOWS' or 'IP4BASE') and
-           not 'IPSEC' and
+           'IPSECHW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
-  - "latency"
+  - "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-latency"
+    title: "ipsec-3n-hsw-xl710-64b-2t2c-base-ndr"
+    layout: "plot-throughput"
 
-# 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"
+-
+  type: "plot"
+  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-2t2c-base-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-base-pdr"
   data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '1T1C' and
            'IP4FWD' and
-           not 'IPSEC' and
+           'NDRPDR' and
+           'BASE' and
+           '2T2C' and
+           'IPSECHW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
-  - "latency"
+  - "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-latency"
+    title: "ipsec-3n-hsw-xl710-64b-2t2c-base-pdr"
+    layout: "plot-throughput"
 
-- type: "plot"
-  title: "VPP Latency: ip4-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
-  algorithm: "plot_latency_error_bars"
+# Packet Throughput - VPP IPSec 3n-hsw-xl710 scale
+-
+  type: "plot"
+  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-1t1c-scale-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-scale-ndr"
   data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
-           ('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
+           'SCALE' and
+           '1T1C' and
+           'IPSECHW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
-    layout: "plot-latency"
+    title: "ipsec-3n-hsw-xl710-64b-1t1c-scale-ndr"
+    layout: "plot-throughput"
 
-- type: "plot"
-  title: "VPP Latency: ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
+-
+  type: "plot"
+  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-1t1c-scale-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-scale-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '4T2C' and
            'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
+           'NDRPDR' and
+           'SCALE' and
+           '1T1C' and
+           'IPSECHW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
-    layout: "plot-latency"
+    title: "ipsec-3n-hsw-xl710-64b-1t1c-scale-pdr"
+    layout: "plot-throughput"
 
-# 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"
+-
+  type: "plot"
+  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-2t2c-scale-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/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
+  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-scale-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
+           '64B' and
            'IP4FWD' and
-           not 'IPSEC' and
+           'NDRPDR' and
+           'SCALE' and
+           '2T2C' and
+           'IPSECHW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "DOT1Q"
-  - "IP4BASE"
-  - "NAT44"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACL"
-  - "OACL"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "ip4-3n-skx-x710-64b-2t1c-features-ndr"
-    layout: "plot-latency"
+    title: "ipsec-3n-hsw-xl710-64b-2t2c-scale-ndr"
+    layout: "plot-throughput"
 
-- type: "plot"
-  title: "VPP Latency: ip4-3n-skx-x710-64b-4t2c-features-ndr-lat"
-  algorithm: "plot_latency_error_bars"
+-
+  type: "plot"
+  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-2t2c-scale-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-scale-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '64B' and
-           ('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
+           'NDRPDR' and
+           'SCALE' and
+           '2T2C' and
+           'IPSECHW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "DOT1Q"
-  - "IP4BASE"
-  - "NAT44"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACL"
-  - "OACL"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "ip4-3n-skx-x710-64b-4t2c-features-ndr"
-    layout: "plot-latency"
+    title: "ipsec-3n-hsw-xl710-64b-2t2c-scale-pdr"
+    layout: "plot-throughput"
 
-# 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"
+# Packet Throughput - VPP IPSec 3n-hsw-xl710 SW
+-
+  type: "plot"
+  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-1t1c-sw-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-nat44-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-sw-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '64B' and
-           'NDRPDR' and
-           '2T1C' and
            'IP4FWD' and
-           ('NAT44' or 'IP4BASE') and
-           not 'IPSEC' and
+           'NDRPDR' and
+           '1T1C' and
+           'IPSECSW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "IP4BASE"
-  - "BASE"
-  - "SRC_USER_10"
-  - "SRC_USER_100"
-  - "SRC_USER_1000"
-  - "SRC_USER_2000"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "ip4-3n-skx-x710-64b-2t1c-features-nat44-ndr"
-    layout: "plot-latency"
+    title: "ipsec-3n-hsw-xl710-64b-1t1c-sw-ndr"
+    layout: "plot-throughput"
 
-- type: "plot"
-  title: "VPP Latency: ip4-3n-skx-x710-64b-4t2c-features-nat44-ndr-lat"
-  algorithm: "plot_latency_error_bars"
+-
+  type: "plot"
+  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-1t1c-sw-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-nat44-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-sw-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '64B' and
-           'NDRPDR' and
-           '4T2C' and
            'IP4FWD' and
-           ('NAT44' or 'IP4BASE') and
-           not 'IPSEC' and
+           'NDRPDR' and
+           '1T1C' and
+           'IPSECSW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "IP4BASE"
-  - "BASE"
-  - "SRC_USER_10"
-  - "SRC_USER_100"
-  - "SRC_USER_1000"
-  - "SRC_USER_2000"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "ip4-3n-skx-x710-64b-4t2c-features-nat44-ndr"
-    layout: "plot-latency"
+    title: "ipsec-3n-hsw-xl710-64b-1t1c-sw-pdr"
+    layout: "plot-throughput"
 
-# 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"
+-
+  type: "plot"
+  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-2t2c-sw-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-iacl-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-sw-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '64B' and
-           'NDRPDR' and
-           '2T1C' and
            'IP4FWD' and
-           ('IACL' and ('ACL10' or 'ACL50') and '10K_FLOWS' or 'IP4BASE') and
-           not 'IPSEC' and
+           'NDRPDR' and
+           '2T2C' and
+           'IPSECSW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "ip4-3n-skx-x710-64b-2t1c-features-iacl-ndr"
-    layout: "plot-latency"
+    title: "ipsec-3n-hsw-xl710-64b-2t2c-sw-ndr"
+    layout: "plot-throughput"
 
-- type: "plot"
-  title: "VPP Latency: ip4-3n-skx-x710-64b-4t2c-features-iacl-ndr-lat"
-  algorithm: "plot_latency_error_bars"
+-
+  type: "plot"
+  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-2t2c-sw-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-iacl-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-sw-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '64B' and
-           'NDRPDR' and
-           '4T2C' and
            'IP4FWD' and
-           'IACL' and
-           ('IACL' and ('ACL10' or 'ACL50') and '10K_FLOWS' or 'IP4BASE') and
-           not 'IPSEC' and
+           'NDRPDR' and
+           '2T2C' and
+           'IPSECSW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "ip4-3n-skx-x710-64b-4t2c-features-iacl-ndr"
-    layout: "plot-latency"
+    title: "ipsec-3n-hsw-xl710-64b-2t2c-sw-pdr"
+    layout: "plot-throughput"
 
-# 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"
+################################################################################
+
+# Packet Throughput - VPP SRv6 3n-hsw-x520
+-
+  type: "plot"
+  title: "VPP Throughput: srv6-3n-hsw-x520-78b-1t1c-features-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/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
+  output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-1t1c-features-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '78B' and
+           'FEATURE' and
            'NDRPDR' and
-           '2T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
+           '1T1C' and
+           'IP6FWD' and
+           'SRv6'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "srv6-3n-hsw-x520-78b-1t1c-features-ndr"
+    layout: "plot-throughput"
+
+-
+  type: "plot"
+  title: "VPP Throughput: srv6-3n-hsw-x520-78b-1t1c-features-pdr"
+  algorithm: "plot_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-1t1c-features-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '78B' and
+           'FEATURE' and
+           'NDRPDR' and
+           '1T1C' and
+           'IP6FWD' and
+           'SRv6'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
-    layout: "plot-latency"
+    title: "srv6-3n-hsw-x520-78b-1t1c-features-pdr"
+    layout: "plot-throughput"
 
-- type: "plot"
-  title: "VPP Latency: ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
+-
+  type: "plot"
+  title: "VPP Throughput: srv6-3n-hsw-x520-78b-2t2c-features-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/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
+  output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-2t2c-features-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '78B' and
+           'FEATURE' and
            'NDRPDR' and
-           '4T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
+           '2T2C' and
+           'IP6FWD' and
+           'SRv6'"
   parameters:
-  - "latency"
+  - "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-latency"
+    title: "srv6-3n-hsw-x520-78b-2t2c-features-ndr"
+    layout: "plot-throughput"
 
-# Packet Latency - VPP IPv4 2n-skx-x710 base and scale
-- type: "plot"
-  title: "VPP Latency: ip4-2n-skx-x710-64b-2t1c-features-iacl-ndr-lat"
-  algorithm: "plot_latency_error_bars"
+-
+  type: "plot"
+  title: "VPP Throughput: srv6-3n-hsw-x520-78b-2t2c-features-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-2t1c-features-iacl-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           (('IACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
+  output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-2t2c-features-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '78B' and
+           'FEATURE' and
            'NDRPDR' and
-           '2T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
+           '2T2C' and
+           'IP6FWD' and
+           'SRv6'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "ip4-2n-skx-x710-64b-2t1c-features-iacl-ndr"
-    layout: "plot-latency"
+    title: "srv6-3n-hsw-x520-78b-2t2c-features-pdr"
+    layout: "plot-throughput"
+
+#################################################################################
+#
+## Packet Throughput - VPP vhost ip4 3n-hsw-x520
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
+#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X520-DA2' and
+#           '64B' and
+#           'NDRPDR' and
+#           'ETH' and
+#           'IP4FWD' and
+#           '1T1C' and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'DOT1Q'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "not CFS_OPT"
+#  - "1VM"
+#  - "2VM"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
+#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X520-DA2' and
+#           '64B' and
+#           'NDRPDR' and
+#           'ETH' and
+#           'IP4FWD' and
+#           '2T2C' and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'DOT1Q'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "not CFS_OPT"
+#  - "1VM"
+#  - "2VM"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
+#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X520-DA2' and
+#           '64B' and
+#           'NDRPDR' and
+#           'ETH' and
+#           'IP4FWD' and
+#           '1T1C' and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'DOT1Q'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "not CFS_OPT"
+#  - "1VM"
+#  - "2VM"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
+#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X520-DA2' and
+#           '64B' and
+#           'NDRPDR' and
+#           'ETH' and
+#           'IP4FWD' and
+#           '2T2C' and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'DOT1Q'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "not CFS_OPT"
+#  - "1VM"
+#  - "2VM"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
+#    layout: "plot-throughput"
+#
+## Packet Throughput - VPP vhost l2sw 3n-hsw-x520 - base
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
+#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X520-DA2' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           'BASE' and
+#           '1T1C' and
+#           ('L2BDMACLRN' or 'L2XCFWD') and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "L2BDMACLRN"
+#  - "L2BDMACLRN"
+#  - "L2BDMACLRN"
+#  - "L2XCFWD"
+#  - "L2XCFWD"
+#  - "L2XCFWD"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_features-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_features-pdr"
+#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X520-DA2' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           'BASE' and
+#           '1T1C' and
+#           ('L2BDMACLRN' or 'L2XCFWD') and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "L2BDMACLRN"
+#  - "L2BDMACLRN"
+#  - "L2BDMACLRN"
+#  - "L2XCFWD"
+#  - "L2XCFWD"
+#  - "L2XCFWD"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_features-pdr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
+#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X520-DA2' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           'BASE' and
+#           '2T2C' and
+#           ('L2BDMACLRN' or 'L2XCFWD') and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "L2BDMACLRN"
+#  - "L2BDMACLRN"
+#  - "L2BDMACLRN"
+#  - "L2XCFWD"
+#  - "L2XCFWD"
+#  - "L2XCFWD"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_features-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_features-pdr"
+#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X520-DA2' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           'BASE' and
+#           '2T2C' and
+#           ('L2BDMACLRN' or 'L2XCFWD') and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "L2BDMACLRN"
+#  - "L2BDMACLRN"
+#  - "L2BDMACLRN"
+#  - "L2XCFWD"
+#  - "L2XCFWD"
+#  - "L2XCFWD"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_features-pdr"
+#    layout: "plot-throughput"
+#
+## Packet Throughput - VPP vhost l2sw 3n-hsw-x520 - base vm
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-ndr"
+#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X520-DA2' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           '1T1C' and
+#           ('L2BDMACLRN' or 'L2XCFWD') and
+#           'VHOST_1024' and
+#           not 'CFS_OPT' and
+#           not 'DOT1Q' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not 'LBOND'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "1VM"
+##  - "L2XCFWD"
+##  - "1VM"
+##  - "L2BDMACLRN"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-pdr"
+#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X520-DA2' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           '1T1C' and
+#           ('L2BDMACLRN' or 'L2XCFWD') and
+#           'VHOST_1024' and
+#           not 'CFS_OPT' and
+#           not 'DOT1Q' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not 'LBOND'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "1VM"
+##  - "L2XCFWD"
+##  - "1VM"
+##  - "L2BDMACLRN"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-pdr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-ndr"
+#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X520-DA2' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           '2T2C' and
+#           ('L2BDMACLRN' or 'L2XCFWD') and
+#           'VHOST_1024' and
+#           not 'CFS_OPT' and
+#           not 'DOT1Q' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not 'LBOND'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "1VM"
+##  - "L2XCFWD"
+##  - "1VM"
+##  - "L2BDMACLRN"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-pdr"
+#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X520-DA2' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           '2T2C' and
+#           ('L2BDMACLRN' or 'L2XCFWD') and
+#           'VHOST_1024' and
+#           not 'CFS_OPT' and
+#           not 'DOT1Q' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not 'LBOND'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "1VM"
+##  - "L2XCFWD"
+##  - "1VM"
+##  - "L2BDMACLRN"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-pdr"
+#    layout: "plot-throughput"
+#
+## Packet Throughput - VPP vhost ip4 3n-hsw-x710
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
+#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           'ETH' and
+#           'IP4FWD' and
+#           '1T1C' and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'CFS_OPT' and
+#           not 'DOT1Q'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "1VM"
+#  - "2VM"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           'ETH' and
+#           'IP4FWD' and
+#           '2T2C' and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'CFS_OPT' and
+#           not 'DOT1Q'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "1VM"
+#  - "2VM"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
+#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           'ETH' and
+#           'IP4FWD' and
+#           '1T1C' and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'CFS_OPT' and
+#           not 'DOT1Q'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "1VM"
+#  - "2VM"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
+#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           'ETH' and
+#           'IP4FWD' and
+#           '2T2C' and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'CFS_OPT' and
+#           not 'DOT1Q'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "1VM"
+#  - "2VM"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
+#    layout: "plot-throughput"
+#
+## Packet Throughput - VPP vhost l2sw 3n-hsw-x710 - base
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
+#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           'BASE' and
+#           '1T1C' and
+#           ('L2BDMACLRN' or 'L2XCFWD') and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "L2BDMACLRN"
+#  - "L2BDMACLRN"
+#  - "L2BDMACLRN"
+#  - "L2XCFWD"
+#  - "L2XCFWD"
+#  - "L2XCFWD"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-pdr"
+#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           'BASE' and
+#           '1T1C' and
+#           ('L2BDMACLRN' or 'L2XCFWD') and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "L2BDMACLRN"
+#  - "L2BDMACLRN"
+#  - "L2BDMACLRN"
+#  - "L2XCFWD"
+#  - "L2XCFWD"
+#  - "L2XCFWD"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-pdr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-ndr"
+#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           'BASE' and
+#           '2T2C' and
+#           ('L2BDMACLRN' or 'L2XCFWD') and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "L2BDMACLRN"
+#  - "L2BDMACLRN"
+#  - "L2BDMACLRN"
+#  - "L2XCFWD"
+#  - "L2XCFWD"
+#  - "L2XCFWD"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-pdr"
+#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           'BASE' and
+#           '2T2C' and
+#           ('L2BDMACLRN' or 'L2XCFWD') and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "L2BDMACLRN"
+#  - "L2BDMACLRN"
+#  - "L2BDMACLRN"
+#  - "L2XCFWD"
+#  - "L2XCFWD"
+#  - "L2XCFWD"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-pdr"
+#    layout: "plot-throughput"
+#
+## Packet Throughput - VPP vhost l2sw 3n-hsw-x710 - base vm
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-vm-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-vm-ndr"
+#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           '1T1C' and
+#           ('L2BDMACLRN' or 'L2XCFWD') and
+#           'VHOST_1024' and
+#           not 'CFS_OPT' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not 'LBOND'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "L2BDMACLRN"
+#  - "L2BDMACLRN"
+#  - "L2BDMACLRN"
+#  - "L2XCFWD"
+#  - "L2XCFWD"
+#  - "L2XCFWD"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-vm-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-vm-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-vm-pdr"
+#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           '1T1C' and
+#           ('L2BDMACLRN' or 'L2XCFWD') and
+#           'VHOST_1024' and
+#           not 'CFS_OPT' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not 'LBOND'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "L2BDMACLRN"
+#  - "L2BDMACLRN"
+#  - "L2BDMACLRN"
+#  - "L2XCFWD"
+#  - "L2XCFWD"
+#  - "L2XCFWD"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-vm-pdr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-vm-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-vm-ndr"
+#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           '2T2C' and
+#           ('L2BDMACLRN' or 'L2XCFWD') and
+#           'VHOST_1024' and
+#           not 'CFS_OPT' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not 'LBOND'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "L2BDMACLRN"
+#  - "L2BDMACLRN"
+#  - "L2BDMACLRN"
+#  - "L2XCFWD"
+#  - "L2XCFWD"
+#  - "L2XCFWD"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-vm-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-vm-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-vm-pdr"
+#  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           '2T2C' and
+#           ('L2BDMACLRN' or 'L2XCFWD') and
+#           'VHOST_1024' and
+#           not 'CFS_OPT' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not 'LBOND'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "L2BDMACLRN"
+#  - "L2BDMACLRN"
+#  - "L2BDMACLRN"
+#  - "L2XCFWD"
+#  - "L2XCFWD"
+#  - "L2XCFWD"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-vm-pdr"
+#    layout: "plot-throughput"
 
-- type: "plot"
-  title: "VPP Latency: ip4-2n-skx-x710-64b-4t2c-features-iacl-ndr-lat"
-  algorithm: "plot_latency_error_bars"
+# 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]}/ip4-2n-skx-x710-64b-4t2c-features-iacl-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           (('IACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
            'NDRPDR' and
-           '4T2C' and
+           'ETH' and
            'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  layout:
-    title: "ip4-2n-skx-x710-64b-4t2c-features-iacl-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'"
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'DOT1Q'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  - "1VM"
+  - "2VM"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
-    layout: "plot-latency"
+    title: "vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+    layout: "plot-throughput"
 
-- type: "plot"
-  title: "VPP Latency: ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
+-
+  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]}/ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
-           '4T2C' and
+           'ETH' 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'"
+           '4T2C' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'DOT1Q'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP4BASE"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "LISP"
+  - "1VM"
+  - "2VM"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "ip4tun-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
-    layout: "plot-latency"
+    title: "vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
+    layout: "plot-throughput"
 
-# 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"
+-
+  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]}/ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           'ENCAP' and
            'NDRPDR' and
-           '1T1C' and
-           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           'ETH' and
+           'IP4FWD' and
+           '2T1C' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'DOT1Q'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP4BASE"
-  - "LISP"
-  - "VXLAN_1"
-  - "VXLAN_10"
-  - "VXLAN_100"
-  - "VXLAN_1000"
+  - "1VM"
+  - "2VM"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
-    layout: "plot-latency"
+    title: "vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
+    layout: "plot-throughput"
 
-- type: "plot"
-  title: "VPP Latency: ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
+-
+  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]}/ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           'ENCAP' and
            'NDRPDR' and
-           '2T2C' and
-           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           'ETH' and
+           'IP4FWD' and
+           '4T2C' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'DOT1Q'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP4BASE"
-  - "LISP"
-  - "VXLAN_1"
-  - "VXLAN_10"
-  - "VXLAN_100"
-  - "VXLAN_1000"
+  - "1VM"
+  - "2VM"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
-    layout: "plot-latency"
+    title: "vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
+    layout: "plot-throughput"
 
-# 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"
+# 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]}/ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           'ENCAP' and
            'NDRPDR' and
-           '1T1C' and
-           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP' or 'IP4BASE') and
-           not 'DOT1Q' and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           ('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"
+  - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP4BASE"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2XCFWD"
-  - "LISP"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
-    layout: "plot-latency"
+    title: "vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-ndr"
+    layout: "plot-throughput"
 
-- type: "plot"
-  title: "VPP Latency: ip4tun-3n-hsw-x710-64b-2t2c-base_and_features-ndr-lat"
-  algorithm: "plot_latency_error_bars"
+-
+  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]}/ip4tun-3n-hsw-x710-64b-2t2c-base_and_features-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           'ENCAP' and
            'NDRPDR' and
-           '2T2C' and
-           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP' or 'IP4BASE') and
-           not 'DOT1Q' and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           ('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"
+  - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP4BASE"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2XCFWD"
-  - "LISP"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "ip4tun-3n-hsw-x710-64b-2t2c-base_and_features-ndr"
-    layout: "plot-latency"
+    title: "vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-pdr"
+    layout: "plot-throughput"
 
-# 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"
+-
+  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]}/ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-ndr"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           'ENCAP' and
            'NDRPDR' and
-           '2T1C' and
-           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           ('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"
+  - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP4BASE"
-  - "LISP"
-  - "VXLAN_1"
-  - "VXLAN_10"
-  - "VXLAN_100"
-  - "VXLAN_1000"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
-    layout: "plot-latency"
+    title: "vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-ndr"
+    layout: "plot-throughput"
 
-- type: "plot"
-  title: "VPP Latency: ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
+-
+  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]}/ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-pdr"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           'ENCAP' and
            'NDRPDR' and
+           ('ETH' or 'DOT1Q') and
+           'BASE' and
            '4T2C' and
-           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP4BASE"
-  - "LISP"
-  - "VXLAN_1"
-  - "VXLAN_10"
-  - "VXLAN_100"
-  - "VXLAN_1000"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
-    layout: "plot-latency"
+    title: "vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-pdr"
+    layout: "plot-throughput"
 
-# 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"
+# 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]}/ip4tun-3n-skx-x710-64b-2t1c-base_and_features-ndr-lat"
+  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
-           'ENCAP' and
            'NDRPDR' and
+           ('ETH' or 'DOT1Q') and
            '2T1C' and
-           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
-           not 'DOT1Q' and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'CFS_OPT' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not 'LBOND'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP4BASE"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2XCFWD"
-  - "LISP"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "ip4tun-3n-skx-x710-64b-2t1c-base_and_features-ndr"
-    layout: "plot-latency"
+    title: "vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-vm-ndr"
+    layout: "plot-throughput"
 
-- type: "plot"
-  title: "VPP Latency: ip4tun-3n-skx-x710-64b-4t2c-base_and_features-ndr-lat"
-  algorithm: "plot_latency_error_bars"
+-
+  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]}/ip4tun-3n-skx-x710-64b-4t2c-base_and_features-ndr-lat"
+  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
-           'ENCAP' and
            'NDRPDR' and
-           '4T2C' and
-           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
-           not 'DOT1Q' and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           ('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"
+  - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP4BASE"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2XCFWD"
-  - "LISP"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "ip4tun-3n-skx-x710-64b-4t2c-base_and_features-ndr"
-    layout: "plot-latency"
-
-################################################################################
+    title: "vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-vm-pdr"
+    layout: "plot-throughput"
 
-# 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"
+-
+  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]}/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
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-vm-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
            'NDRPDR' and
-           '1T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' 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:
-  - "latency"
+  - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "ip6-3n-hsw-x520-78b-1t1c-base-ndr"
-    layout: "plot-latency"
+    title: "vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-vm-ndr"
+    layout: "plot-throughput"
 
-- type: "plot"
-  title: "VPP Latency: ip6-3n-hsw-x520-78b-2t2c-base-ndr-lat"
-  algorithm: "plot_latency_error_bars"
+-
+  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]}/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
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-vm-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
            'NDRPDR' and
-           '2T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' 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:
-  - "latency"
+  - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "ip6-3n-hsw-x520-78b-2t2c-base-ndr"
-    layout: "plot-latency"
+    title: "vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-vm-pdr"
+    layout: "plot-throughput"
+
+## Packet Throughput - VPP vhost ip4 2n-skx-x710
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
+#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           'ETH' and
+#           'IP4FWD' and
+#           '2T1C' and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'NF_DENSITY' and
+#           not 'CFS_OPT' and
+#           not 'DOT1Q'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "1VM"
+#  - "2VM"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
+#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           'ETH' and
+#           'IP4FWD' and
+#           '4T2C' and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'NF_DENSITY' and
+#           not 'CFS_OPT' and
+#           not 'DOT1Q'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "1VM"
+#  - "2VM"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-ip4-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
+#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           'ETH' and
+#           'IP4FWD' and
+#           '2T1C' and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'NF_DENSITY' and
+#           not 'CFS_OPT' and
+#           not 'DOT1Q'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "1VM"
+#  - "2VM"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-ip4-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-ip4-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
+#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           'ETH' and
+#           'IP4FWD' and
+#           '4T2C' and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'NF_DENSITY' and
+#           not 'CFS_OPT' and
+#           not 'DOT1Q'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "1VM"
+#  - "2VM"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-ip4-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
+#    layout: "plot-throughput"
+#
+## Packet Throughput - VPP vhost l2sw 2n-skx-x710 - base
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_features-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_features-ndr"
+#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           'BASE' and
+#           '2T1C' and
+#           ('L2BDMACLRN' or 'L2XCFWD') and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'NF_DENSITY' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "not CFS_OPT"
+##  - "L2XCFWD"
+##  - "not CFS_OPT"
+##  - "CFS_OPT"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_features-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_features-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_features-pdr"
+#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           'BASE' and
+#           '2T1C' and
+#           ('L2BDMACLRN' or 'L2XCFWD') and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'NF_DENSITY' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "not CFS_OPT"
+##  - "L2XCFWD"
+##  - "not CFS_OPT"
+##  - "CFS_OPT"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_features-pdr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_features-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_features-ndr"
+#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           'BASE' and
+#           '4T2C' and
+#           ('L2BDMACLRN' or 'L2XCFWD') and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'NF_DENSITY' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "not CFS_OPT"
+##  - "L2XCFWD"
+##  - "not CFS_OPT"
+##  - "CFS_OPT"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_features-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_features-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_features-pdr"
+#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           'BASE' and
+#           '4T2C' and
+#           ('L2BDMACLRN' or 'L2XCFWD') and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'NF_DENSITY' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "not CFS_OPT"
+##  - "L2XCFWD"
+##  - "not CFS_OPT"
+##  - "CFS_OPT"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_features-pdr"
+#    layout: "plot-throughput"
+#
+## Packet Throughput - VPP vhost l2sw 2n-skx-x710 - base vm
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-2t1c-base-vm-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-2t1c-base-vm-ndr"
+#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           '2T1C' and
+#           ('L2BDMACLRN' or 'L2XCFWD') and
+#           'VHOST_1024' and
+#           not 'CFS_OPT' and
+#           not 'VXLAN' and
+#           not 'NF_DENSITY' and
+#           not 'DOT1Q' and
+#           not 'IP4FWD'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "1VM"
+##  - "L2XCFWD"
+##  - "1VM"
+##  - "L2BDMACLRN"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-2n-skx-x710-64b-2t1c-base-vm-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-2t1c-base-vm-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-2t1c-base-vm-pdr"
+#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           '2T1C' and
+#           ('L2BDMACLRN' or 'L2XCFWD') and
+#           'VHOST_1024' and
+#           not 'CFS_OPT' and
+#           not 'VXLAN' and
+#           not 'NF_DENSITY' and
+#           not 'DOT1Q' and
+#           not 'IP4FWD'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "1VM"
+##  - "L2XCFWD"
+##  - "1VM"
+##  - "L2BDMACLRN"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-2n-skx-x710-64b-2t1c-base-vm-pdr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-4t2c-base-vm-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-4t2c-base-vm-ndr"
+#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           '4T2C' and
+#           ('L2BDMACLRN' or 'L2XCFWD') and
+#           'VHOST_1024' and
+#           not 'CFS_OPT' and
+#           not 'VXLAN' and
+#           not 'NF_DENSITY' and
+#           not 'DOT1Q' and
+#           not 'IP4FWD'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "1VM"
+##  - "L2XCFWD"
+##  - "1VM"
+##  - "L2BDMACLRN"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-2n-skx-x710-64b-4t2c-base-vm-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-4t2c-base-vm-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-4t2c-base-vm-pdr"
+#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           '4T2C' and
+#           ('L2BDMACLRN' or 'L2XCFWD') and
+#           'VHOST_1024' and
+#           not 'CFS_OPT' and
+#           not 'VXLAN' and
+#           not 'NF_DENSITY' and
+#           not 'DOT1Q' and
+#           not 'IP4FWD'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "1VM"
+##  - "L2XCFWD"
+##  - "1VM"
+##  - "L2BDMACLRN"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-2n-skx-x710-64b-4t2c-base-vm-pdr"
+#    layout: "plot-throughput"
+#
+## Packet Throughput - VPP vhost ip4 2n-skx-xxv710
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
+#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+#  filter: "'NIC_Intel-XXV710' and
+#           '64B' and
+#           'NDRPDR' and
+#           'ETH' and
+#           'IP4FWD' and
+#           '2T1C' and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'CFS_OPT' and
+#           not 'DOT1Q'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "1VM"
+#  - "2VM"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
+#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+#  filter: "'NIC_Intel-XXV710' and
+#           '64B' and
+#           'NDRPDR' and
+#           'ETH' and
+#           'IP4FWD' and
+#           '4T2C' and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'CFS_OPT' and
+#           not 'DOT1Q'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "1VM"
+#  - "2VM"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
+#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+#  filter: "'NIC_Intel-XXV710' and
+#           '64B' and
+#           'NDRPDR' and
+#           'ETH' and
+#           'IP4FWD' and
+#           '2T1C' and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'CFS_OPT' and
+#           not 'DOT1Q'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "1VM"
+#  - "2VM"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
+#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+#  filter: "'NIC_Intel-XXV710' and
+#           '64B' and
+#           'NDRPDR' and
+#           'ETH' and
+#           'IP4FWD' and
+#           '4T2C' and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'CFS_OPT' and
+#           not 'DOT1Q'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "1VM"
+#  - "2VM"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
+#    layout: "plot-throughput"
+#
+## Packet Throughput - VPP vhost l2sw 2n-skx-xxv710 - base
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_features-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_features-ndr"
+#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+#  filter: "'NIC_Intel-XXV710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           'BASE' and
+#           '2T1C' and
+#           ('L2BDMACLRN' or 'L2XCFWD') and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "not CFS_OPT"
+##  - "L2XCFWD"
+##  - "not CFS_OPT"
+##  - "CFS_OPT"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_features-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_features-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_features-pdr"
+#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+#  filter: "'NIC_Intel-XXV710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           'BASE' and
+#           '2T1C' and
+#           ('L2BDMACLRN' or 'L2XCFWD') and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "not CFS_OPT"
+##  - "L2XCFWD"
+##  - "not CFS_OPT"
+##  - "CFS_OPT"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_features-pdr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_features-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_features-ndr"
+#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+#  filter: "'NIC_Intel-XXV710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           'BASE' and
+#           '4T2C' and
+#           ('L2BDMACLRN' or 'L2XCFWD') and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "not CFS_OPT"
+##  - "L2XCFWD"
+##  - "not CFS_OPT"
+##  - "CFS_OPT"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_features-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_features-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_features-pdr"
+#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+#  filter: "'NIC_Intel-XXV710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           'BASE' and
+#           '4T2C' and
+#           ('L2BDMACLRN' or 'L2XCFWD') and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "not CFS_OPT"
+##  - "L2XCFWD"
+##  - "not CFS_OPT"
+##  - "CFS_OPT"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_features-pdr"
+#    layout: "plot-throughput"
+#
+## Packet Throughput - VPP vhost l2sw 2n-skx-xxv710 - base vm
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-vm-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-vm-ndr"
+#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+#  filter: "'NIC_Intel-XXV710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           '2T1C' and
+#           ('L2BDMACLRN' or 'L2XCFWD') and
+#           'VHOST_1024' and
+#           not 'CFS_OPT' and
+#           not 'VXLAN' and
+#           not 'DOT1Q' and
+#           not 'IP4FWD'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "1VM"
+##  - "L2XCFWD"
+##  - "1VM"
+##  - "L2BDMACLRN"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-vm-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-vm-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-vm-pdr"
+#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+#  filter: "'NIC_Intel-XXV710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           '2T1C' and
+#           ('L2BDMACLRN' or 'L2XCFWD') and
+#           'VHOST_1024' and
+#           not 'CFS_OPT' and
+#           not 'VXLAN' and
+#           not 'DOT1Q' and
+#           not 'IP4FWD'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "1VM"
+##  - "L2XCFWD"
+##  - "1VM"
+##  - "L2BDMACLRN"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-vm-pdr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-ndr"
+#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+#  filter: "'NIC_Intel-XXV710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           '4T2C' and
+#           ('L2BDMACLRN' or 'L2XCFWD') and
+#           'VHOST_1024' and
+#           not 'CFS_OPT' and
+#           not 'VXLAN' and
+#           not 'DOT1Q' and
+#           not 'IP4FWD'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "1VM"
+##  - "L2XCFWD"
+##  - "1VM"
+##  - "L2BDMACLRN"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-pdr"
+#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+#  filter: "'NIC_Intel-XXV710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           '4T2C' and
+#           ('L2BDMACLRN' or 'L2XCFWD') and
+#           'VHOST_1024' and
+#           not 'CFS_OPT' and
+#           not 'VXLAN' and
+#           not 'DOT1Q' and
+#           not 'IP4FWD'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "1VM"
+##  - "L2XCFWD"
+##  - "1VM"
+##  - "L2BDMACLRN"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-pdr"
+#    layout: "plot-throughput"
 
-# Packet 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"
+###############################################################################
+
+# Packet Throughput - VPP VTS 3n-hsw-x520
+-
+  type: "plot"
+  title: "VPP Throughput: vts-3n-hsw-x520-114b-1t1c-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-1t1c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-114b-1t1c-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
+  filter: "'NIC_Intel-X520-DA2' and
+           '114B' and
            'NDRPDR' and
            '1T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           'VTS'"
   parameters:
-  - "latency"
+  - "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-latency"
+    title: "vts-3n-hsw-x520-114b-1t1c-ndr"
+    layout: "plot-throughput"
 
-- type: "plot"
-  title: "VPP Latency: ip6-3n-hsw-x710-78b-2t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
+-
+  type: "plot"
+  title: "VPP Throughput: vts-3n-hsw-x520-114b-2t2c-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-2t2c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-114b-2t2c-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
+  filter: "'NIC_Intel-X520-DA2' and
+           '114B' and
            'NDRPDR' and
            '2T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           'VTS'"
   parameters:
-  - "latency"
+  - "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-latency"
+    title: "vts-3n-hsw-x520-114b-2t2c-ndr"
+    layout: "plot-throughput"
 
-# 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"
+-
+  type: "plot"
+  title: "VPP Throughput: vts-3n-hsw-x520-114b-1t1c-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-1t1c-base-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-114b-1t1c-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
+  filter: "'NIC_Intel-X520-DA2' and
+           '114B' and
            'NDRPDR' and
            '1T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           'VTS'"
   parameters:
-  - "latency"
+  - "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-latency"
+    title: "vts-3n-hsw-x520-114b-1t1c-pdr"
+    layout: "plot-throughput"
 
-- type: "plot"
-  title: "VPP Latency: ip6-3n-hsw-xl710-78b-2t2c-base-ndr-lat"
-  algorithm: "plot_latency_error_bars"
+-
+  type: "plot"
+  title: "VPP Throughput: vts-3n-hsw-x520-114b-2t2c-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-2t2c-base-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-114b-2t2c-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
+  filter: "'NIC_Intel-X520-DA2' and
+           '114B' 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'"
+           'VTS'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "ip6-3n-skx-x710-78b-2t1c-base_and_scale-ndr"
-    layout: "plot-latency"
+    title: "vts-3n-hsw-x520-114b-2t2c-pdr"
+    layout: "plot-throughput"
 
-- 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 3n-skx-xxv710
-- type: "plot"
-  title: "VPP Latency: ip6-3n-skx-xxv710-78b-2t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
+# Packet Throughput - DPDK l3fwd 3n-hsw-x520
+-
+  type: "plot"
+  title: "DPDK Throughput: l3fwd-3n-hsw-x520-64b-1t1c-base-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-xxv710-78b-2t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x520-64b-1t1c-base-ndr"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           'BASE' and
            'NDRPDR' and
-           '2T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '1T1C' and
+           'IP4FWD'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "ip6-3n-skx-xxv710-78b-2t1c-base_and_scale-ndr"
-    layout: "plot-latency"
+    title: "l3fwd-3n-hsw-x520-64b-1t1c-base-ndr"
+    layout: "plot-throughput"
 
-- type: "plot"
-  title: "VPP Latency: ip6-3n-skx-xxv710-78b-4t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
+-
+  type: "plot"
+  title: "DPDK Throughput: l3fwd-3n-hsw-x520-64b-2t2c-base-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-xxv710-78b-4t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x520-64b-2t2c-base-ndr"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           'BASE' and
            'NDRPDR' and
-           '4T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '2T2C' and
+           'IP4FWD'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "ip6-3n-skx-xxv710-78b-4t2c-base_and_scale-ndr"
-    layout: "plot-latency"
+    title: "l3fwd-3n-hsw-x520-64b-2t2c-base-ndr"
+    layout: "plot-throughput"
 
-# 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"
+-
+  type: "plot"
+  title: "DPDK Throughput: l3fwd-3n-hsw-x520-64b-1t1c-base-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,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
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x520-64b-1t1c-base-pdr"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           'BASE' and
            'NDRPDR' and
-           '2T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '1T1C' and
+           'IP4FWD'"
   parameters:
-  - "latency"
+  - "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-latency"
+    title: "l3fwd-3n-hsw-x520-64b-1t1c-base-pdr"
+    layout: "plot-throughput"
 
-- type: "plot"
-  title: "VPP Latency: ip6-2n-skx-x710-78b-4t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
+-
+  type: "plot"
+  title: "DPDK Throughput: l3fwd-3n-hsw-x520-64b-2t2c-base-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,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
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x520-64b-2t2c-base-pdr"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           'BASE' and
            'NDRPDR' and
-           '4T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '2T2C' and
+           'IP4FWD'"
   parameters:
-  - "latency"
+  - "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-latency"
+    title: "l3fwd-3n-hsw-x520-64b-2t2c-base-pdr"
+    layout: "plot-throughput"
 
-# 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"
+# Packet Throughput - DPDK l3fwd 3n-hsw-x710
+-
+  type: "plot"
+  title: "DPDK Throughput: l3fwd-3n-hsw-x710-64b-1t1c-base-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,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
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x710-64b-1t1c-base-ndr"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'BASE' and
            'NDRPDR' and
-           '2T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '1T1C' and
+           'IP4FWD'"
   parameters:
-  - "latency"
+  - "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-latency"
+    title: "l3fwd-3n-hsw-x710-64b-1t1c-base-ndr"
+    layout: "plot-throughput"
 
-- type: "plot"
-  title: "VPP Latency: ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
+-
+  type: "plot"
+  title: "DPDK Throughput: l3fwd-3n-hsw-x710-64b-2t2c-base-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,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
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x710-64b-2t2c-base-ndr"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'BASE' and
            'NDRPDR' and
-           '4T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '2T2C' and
+           'IP4FWD'"
   parameters:
-  - "latency"
+  - "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-latency"
-
-################################################################################
+    title: "l3fwd-3n-hsw-x710-64b-2t2c-base-ndr"
+    layout: "plot-throughput"
 
-# 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"
+-
+  type: "plot"
+  title: "DPDK Throughput: l3fwd-3n-hsw-x710-64b-1t1c-base-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,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
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x710-64b-1t1c-base-pdr"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'BASE' and
            'NDRPDR' and
            '1T1C' and
-           'LISP' and
-           not 'VHOST'"
+           'IP4FWD'"
   parameters:
-  - "latency"
+  - "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-latency"
+    title: "l3fwd-3n-hsw-x710-64b-1t1c-base-pdr"
+    layout: "plot-throughput"
 
-- type: "plot"
-  title: "VPP Latency: ip6tun-3n-hsw-x520-78b-2t2c-base-ndr-lat"
-  algorithm: "plot_latency_error_bars"
+-
+  type: "plot"
+  title: "DPDK Throughput: l3fwd-3n-hsw-x710-64b-2t2c-base-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,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
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x710-64b-2t2c-base-pdr"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'BASE' and
            'NDRPDR' and
            '2T2C' and
-           'LISP' and
-           not 'VHOST'"
+           'IP4FWD'"
   parameters:
-  - "latency"
+  - "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-latency"
-
-################################################################################
+    title: "l3fwd-3n-hsw-x710-64b-2t2c-base-pdr"
+    layout: "plot-throughput"
 
-# 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"
+# Packet Throughput - DPDK l3fwd 3n-hsw-xl710
+-
+  type: "plot"
+  title: "DPDK Throughput: l3fwd-3n-hsw-xl710-64b-1t1c-base-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-xl710-64b-1t1c-base-ndr"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
-           'IP4FWD' and
-           'NDRPDR' and
            'BASE' and
+           'NDRPDR' and
            '1T1C' and
-           'IPSECHW' and
-           not 'VHOST'"
+           'IP4FWD'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
   - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "ipsec-3n-hsw-xl710-64b-1t1c-base-ndr"
-    layout: "plot-latency"
+    title: "l3fwd-3n-hsw-xl710-64b-1t1c-base-ndr"
+    layout: "plot-throughput"
 
-- type: "plot"
-  title: "VPP Latency: ipsec-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
-  algorithm: "plot_latency_error_bars"
+-
+  type: "plot"
+  title: "DPDK Throughput: l3fwd-3n-hsw-xl710-64b-2t2c-base-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-xl710-64b-2t2c-base-ndr"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
-           'IP4FWD' and
-           'NDRPDR' and
            'BASE' and
+           'NDRPDR' and
            '2T2C' and
-           'IPSECHW' and
-           not 'VHOST'"
+           'IP4FWD'"
   parameters:
-  - "latency"
+  - "throughput"
+  - "parent"
+  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "l3fwd-3n-hsw-xl710-64b-2t2c-base-ndr"
+    layout: "plot-throughput"
+
+-
+  type: "plot"
+  title: "DPDK Throughput: l3fwd-3n-hsw-xl710-64b-1t1c-base-pdr"
+  algorithm: "plot_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-xl710-64b-1t1c-base-pdr"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
+           '64B' and
+           'BASE' and
+           'NDRPDR' and
+           '1T1C' and
+           'IP4FWD'"
+  parameters:
+  - "throughput"
   - "parent"
   - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "ipsec-3n-hsw-xl710-64b-2t2c-base-ndr"
-    layout: "plot-latency"
+    title: "l3fwd-3n-hsw-xl710-64b-1t1c-base-pdr"
+    layout: "plot-throughput"
 
-# 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"
+-
+  type: "plot"
+  title: "DPDK Throughput: l3fwd-3n-hsw-xl710-64b-2t2c-base-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-scale-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-xl710-64b-2t2c-base-pdr"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
-           'IP4FWD' and
+           'BASE' and
            'NDRPDR' and
-           'SCALE' and
-           '1T1C' and
-           'IPSECHW' and
-           not 'VHOST'"
+           '2T2C' and
+           'IP4FWD'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
   - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "ipsec-3n-hsw-xl710-64b-1t1c-scale-ndr"
-    layout: "plot-latency"
+    title: "l3fwd-3n-hsw-xl710-64b-2t2c-base-pdr"
+    layout: "plot-throughput"
 
-- type: "plot"
-  title: "VPP Latency: ipsec-3n-hsw-xl710-64b-2t2c-scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
+# 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]}/ipsec-3n-hsw-xl710-64b-2t2c-scale-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-skx-x710-64b-2t1c-base-ndr"
+  data: "plot-dpdk-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           'IP4FWD' and
+           'BASE' and
            'NDRPDR' and
-           'SCALE' and
-           '2T2C' and
-           'IPSECHW' and
-           not 'VHOST'"
+           '2T1C' and
+           'IP4FWD'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
   - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "ipsec-3n-hsw-xl710-64b-2t2c-scale-ndr"
-    layout: "plot-latency"
+    title: "l3fwd-3n-skx-x710-64b-2t1c-base-ndr"
+    layout: "plot-throughput"
 
-# Packet Latency - VPP IPSec 3n-hsw-xl710 sw
-- type: "plot"
-  title: "VPP Latency: ipsec-3n-hsw-xl710-64b-1t1c-sw-ndr-lat"
-  algorithm: "plot_latency_error_bars"
+-
+  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]}/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,DPDK]}/l3fwd-3n-skx-x710-64b-4t2c-base-ndr"
+  data: "plot-dpdk-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           'IP4FWD' and
+           'BASE' and
            'NDRPDR' and
-           '1T1C' and
-           'IPSECSW' and
-           not 'VHOST'"
+           '4T2C' and
+           'IP4FWD'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
   - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "ipsec-3n-hsw-xl710-64b-1t1c-sw-ndr"
-    layout: "plot-latency"
+    title: "l3fwd-3n-skx-x710-64b-4t2c-base-ndr"
+    layout: "plot-throughput"
 
-- type: "plot"
-  title: "VPP Latency: ipsec-3n-hsw-xl710-64b-2t2c-sw-ndr-lat"
-  algorithm: "plot_latency_error_bars"
+-
+  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]}/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,DPDK]}/l3fwd-3n-skx-x710-64b-2t1c-base-pdr"
+  data: "plot-dpdk-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           'IP4FWD' and
+           'BASE' and
            'NDRPDR' and
-           '2T2C' and
-           'IPSECSW' and
-           not 'VHOST'"
+           '2T1C' and
+           'IP4FWD'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
   - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "ipsec-3n-hsw-xl710-64b-2t2c-sw-ndr"
-    layout: "plot-latency"
-
-################################################################################
+    title: "l3fwd-3n-skx-x710-64b-2t1c-base-pdr"
+    layout: "plot-throughput"
 
-# 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"
+-
+  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-1t1c-features-ndr-lat"
-  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
-           '1T1C' and
-           'IP6FWD' and
-           'SRv6'"
+           '4T2C' and
+           'IP4FWD'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
   - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "srv6-3n-hsw-x520-78b-1t1c-features-ndr"
-    layout: "plot-latency"
+    title: "l3fwd-3n-skx-x710-64b-4t2c-base-pdr"
+    layout: "plot-throughput"
 
-- type: "plot"
-  title: "VPP Latency: srv6-3n-hsw-x520-78b-2t2c-features-ndr-lat"
-  algorithm: "plot_latency_error_bars"
+# 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]}/srv6-3n-hsw-x520-78b-2t2c-features-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           'FEATURE' and
+  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
-           '2T2C' and
-           'IP6FWD' and
-           'SRv6'"
+           '2T1C' and
+           'IP4FWD'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
   - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "srv6-3n-hsw-x520-78b-2t2c-features-ndr"
-    layout: "plot-latency"
-
-################################################################################
+    title: "l3fwd-3n-skx-xxv710-64b-2t1c-base-ndr"
+    layout: "plot-throughput"
 
-# 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"
+-
+  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-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-skx-xxv710-64b-4t2c-base-ndr"
+  data: "plot-dpdk-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
+           'BASE' and
            'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           '1T1C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'DOT1Q'"
+           '4T2C' and
+           'IP4FWD'"
   parameters:
-  - "latency"
+  - "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-latency"
+    title: "l3fwd-3n-skx-xxv710-64b-4t2c-base-ndr"
+    layout: "plot-throughput"
 
-- type: "plot"
-  title: "VPP Latency: vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
+-
+  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-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-skx-xxv710-64b-2t1c-base-pdr"
+  data: "plot-dpdk-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
+           'BASE' and
            'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           '2T2C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'DOT1Q'"
+           '2T1C' and
+           'IP4FWD'"
   parameters:
-  - "latency"
+  - "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-latency"
+    title: "l3fwd-3n-skx-xxv710-64b-2t1c-base-pdr"
+    layout: "plot-throughput"
 
-# 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"
+-
+  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-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
+  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
-           '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'"
+           'NDRPDR' and
+           '4T2C' and
+           'IP4FWD'"
   parameters:
-  - "latency"
+  - "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-latency"
+    title: "l3fwd-3n-skx-xxv710-64b-4t2c-base-pdr"
+    layout: "plot-throughput"
 
-- type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_features-ndr-lat"
-  algorithm: "plot_latency_error_bars"
+# 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-hsw-x520-64b-2t2c-base_and_features-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-2n-skx-x710-64b-2t1c-base-ndr"
+  data: "plot-dpdk-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           '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'"
+           'NDRPDR' and
+           '2T1C' and
+           'IP4FWD'"
   parameters:
-  - "latency"
+  - "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-latency"
+    title: "l3fwd-2n-skx-x710-64b-2t1c-base-ndr"
+    layout: "plot-throughput"
 
-# 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"
+-
+  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-hsw-x520-64b-1t1c-base-vm-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-2n-skx-x710-64b-4t2c-base-ndr"
+  data: "plot-dpdk-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
+           'BASE' and
            'NDRPDR' and
-           ('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'"
+           '4T2C' and
+           'IP4FWD'"
   parameters:
-  - "latency"
+  - "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-latency"
+    title: "l3fwd-2n-skx-x710-64b-4t2c-base-ndr"
+    layout: "plot-throughput"
 
-- type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-ndr-lat"
-  algorithm: "plot_latency_error_bars"
+-
+  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-hsw-x520-64b-2t2c-base-vm-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-2n-skx-x710-64b-2t1c-base-pdr"
+  data: "plot-dpdk-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
+           'BASE' and
            'NDRPDR' and
-           ('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'"
+           '2T1C' and
+           'IP4FWD'"
   parameters:
-  - "latency"
+  - "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-latency"
+    title: "l3fwd-2n-skx-x710-64b-2t1c-base-pdr"
+    layout: "plot-throughput"
 
-# 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"
+-
+  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-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-2n-skx-x710-64b-4t2c-base-pdr"
+  data: "plot-dpdk-throughput-latency-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
+           'BASE' and
            'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           '1T1C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'CFS_OPT' and
-           not 'DOT1Q'"
+           '4T2C' and
+           'IP4FWD'"
   parameters:
-  - "latency"
+  - "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-latency"
+    title: "l3fwd-2n-skx-x710-64b-4t2c-base-pdr"
+    layout: "plot-throughput"
 
-- type: "plot"
-  title: "VPP Latency: vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
+# 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-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-2n-skx-xxv710-64b-2t1c-base-ndr"
+  data: "plot-dpdk-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
+           'BASE' and
            'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           '2T2C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'CFS_OPT' and
-           not 'DOT1Q'"
+           '2T1C' and
+           'IP4FWD'"
   parameters:
-  - "latency"
+  - "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-latency"
+    title: "l3fwd-2n-skx-xxv710-64b-2t1c-base-ndr"
+    layout: "plot-throughput"
 
-# 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"
+-
+  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-hsw-x710-64b-1t1c-base_and_features-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-2n-skx-xxv710-64b-4t2c-base-ndr"
+  data: "plot-dpdk-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' 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'"
+           'NDRPDR' and
+           '4T2C' and
+           'IP4FWD'"
   parameters:
-  - "latency"
+  - "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-latency"
+    title: "l3fwd-2n-skx-xxv710-64b-4t2c-base-ndr"
+    layout: "plot-throughput"
 
-- type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-ndr-lat"
-  algorithm: "plot_latency_error_bars"
+-
+  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-hsw-x710-64b-2t2c-base_and_features-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-2n-skx-xxv710-64b-2t1c-base-pdr"
+  data: "plot-dpdk-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' 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'"
+           'NDRPDR' and
+           '2T1C' and
+           'IP4FWD'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "l3fwd-2n-skx-xxv710-64b-2t1c-base-pdr"
+    layout: "plot-throughput"
+
+-
+  type: "plot"
+  title: "DPDK Throughput: l3fwd-2n-skx-xxv710-64b-4t2c-base-pdr"
+  algorithm: "plot_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-2n-skx-xxv710-64b-4t2c-base-pdr"
+  data: "plot-dpdk-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
+           '64B' and
+           'BASE' and
+           'NDRPDR' and
+           '4T2C' and
+           'IP4FWD'"
   parameters:
-  - "latency"
+  - "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-latency"
+    title: "l3fwd-2n-skx-xxv710-64b-4t2c-base-pdr"
+    layout: "plot-throughput"
 
-# 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"
+################################################################################
+
+# 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]}/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
+  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
-           ('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'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
-  - "latency"
+  - "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-latency"
+    title: "testpmd-3n-hsw-x520-64b-1t1c-base-ndr"
+    layout: "plot-throughput"
 
-- type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-vm-ndr-lat"
-  algorithm: "plot_latency_error_bars"
+-
+  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]}/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
+  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
-           ('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'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
-  - "latency"
+  - "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-latency"
+    title: "testpmd-3n-hsw-x520-64b-2t2c-base-ndr"
+    layout: "plot-throughput"
 
-# 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"
+-
+  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]}/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
+  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
-           'ETH' and
-           'IP4FWD' and
-           '2T1C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'DOT1Q'"
+           '1T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "1VM"
-  - "2VM"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
-    layout: "plot-latency"
+    title: "testpmd-3n-hsw-x520-64b-1t1c-base-pdr"
+    layout: "plot-throughput"
 
-- type: "plot"
-  title: "VPP Latency: vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
+-
+  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]}/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
+  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
-           'ETH' and
-           'IP4FWD' and
-           '4T2C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'DOT1Q'"
+           '2T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "1VM"
-  - "2VM"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
-    layout: "plot-latency"
+    title: "testpmd-3n-hsw-x520-64b-2t2c-base-pdr"
+    layout: "plot-throughput"
 
-# 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"
+# 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,VPP]}/vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x710-64b-1t1c-base-ndr"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           '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
+           '1T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-ndr"
-    layout: "plot-latency"
+    title: "testpmd-3n-hsw-x710-64b-1t1c-base-ndr"
+    layout: "plot-throughput"
 
-- type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-ndr-lat"
-  algorithm: "plot_latency_error_bars"
+-
+  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,VPP]}/vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x710-64b-2t2c-base-ndr"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           '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
+           '2T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-ndr"
-    layout: "plot-latency"
+    title: "testpmd-3n-hsw-x710-64b-2t2c-base-ndr"
+    layout: "plot-throughput"
 
-# 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"
+-
+  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,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
-           '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'"
+  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:
-  - "latency"
+  - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-vm-ndr"
-    layout: "plot-latency"
+    title: "testpmd-3n-hsw-x710-64b-1t1c-base-pdr"
+    layout: "plot-throughput"
 
-- type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-vm-ndr-lat"
-  algorithm: "plot_latency_error_bars"
+-
+  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,VPP]}/vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-vm-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x710-64b-2t2c-base-pdr"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
+           'BASE' and
            'NDRPDR' and
-           ('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'"
+           '2T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-vm-ndr"
-    layout: "plot-latency"
+    title: "testpmd-3n-hsw-x710-64b-2t2c-base-pdr"
+    layout: "plot-throughput"
 
-# 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"
+# 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,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
+  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
-           'ETH' and
-           'IP4FWD' and
-           '2T1C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'NF_DENSITY' and
-           not 'CFS_OPT' and
-           not 'DOT1Q'"
+           '1T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
-  - "latency"
+  - "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-latency"
+    title: "testpmd-3n-hsw-xl710-64b-1t1c-base-ndr"
+    layout: "plot-throughput"
 
-- type: "plot"
-  title: "VPP Latency: vhost-ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
+-
+  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,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
+  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
-           'ETH' and
-           'IP4FWD' and
-           '4T2C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'NF_DENSITY' and
-           not 'CFS_OPT' and
-           not 'DOT1Q'"
+           '2T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
-  - "latency"
+  - "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-latency"
+    title: "testpmd-3n-hsw-xl710-64b-2t2c-base-ndr"
+    layout: "plot-throughput"
 
-# 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"
+-
+  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,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
+  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
-           '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'"
+           'NDRPDR' and
+           '1T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
-  - "latency"
+  - "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-latency"
+    title: "testpmd-3n-hsw-xl710-64b-1t1c-base-pdr"
+    layout: "plot-throughput"
 
-- type: "plot"
-  title: "VPP Latency: vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_features-ndr-lat"
-  algorithm: "plot_latency_error_bars"
+-
+  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,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
+  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
-           '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'"
+           'NDRPDR' and
+           '2T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
-  - "latency"
+  - "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-latency"
+    title: "testpmd-3n-hsw-xl710-64b-2t2c-base-pdr"
+    layout: "plot-throughput"
 
-# 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"
+# 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,VPP]}/vhost-l2sw-2n-skx-x710-64b-2t1c-base-vm-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-skx-x710-64b-2t1c-base-ndr"
+  data: "plot-dpdk-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
+           'BASE' and
            'NDRPDR' and
-           ('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'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
-  - "latency"
+  - "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-latency"
+    title: "testpmd-3n-skx-x710-64b-2t1c-base-ndr"
+    layout: "plot-throughput"
 
-- type: "plot"
-  title: "VPP Latency: vhost-l2sw-2n-skx-x710-64b-4t2c-base-vm-ndr-lat"
-  algorithm: "plot_latency_error_bars"
+-
+  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,VPP]}/vhost-l2sw-2n-skx-x710-64b-4t2c-base-vm-ndr-lat"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-skx-x710-64b-4t2c-base-ndr"
+  data: "plot-dpdk-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
+           'BASE' and
            'NDRPDR' and
-           ('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'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
-  - "latency"
+  - "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-latency"
+    title: "testpmd-3n-skx-x710-64b-4t2c-base-ndr"
+    layout: "plot-throughput"
 
-# 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"
+-
+  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,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
+  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
-           'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
+           'BASE' and
+           'NDRPDR' and
            '2T1C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'CFS_OPT' and
-           not 'DOT1Q'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "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-latency"
+    title: "testpmd-3n-skx-x710-64b-2t1c-base-pdr"
+    layout: "plot-throughput"
 
-- type: "plot"
-  title: "VPP Latency: vhost-ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
+-
+  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,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
+  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
-           'ETH' and
-           'IP4FWD' and
            '4T2C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'CFS_OPT' and
-           not 'DOT1Q'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "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-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"
-
-################################################################################
+    title: "testpmd-3n-skx-x710-64b-4t2c-base-pdr"
+    layout: "plot-throughput"
 
-# 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"
+# 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,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
+  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
-           '1T1C' and
-           'VTS'"
+           '2T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
   - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "vts-3n-hsw-x520-114b-1t1c-ndr"
-    layout: "plot-latency"
+    title: "testpmd-3n-skx-xxv710-64b-2t1c-base-ndr"
+    layout: "plot-throughput"
 
-- type: "plot"
-  title: "VPP Latency: vts-3n-hsw-x520-114b-2t2c-ndr-lat"
-  algorithm: "plot_latency_error_bars"
+-
+  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,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
+  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
-           '2T2C' and
-           'VTS'"
+           '4T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
   - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "vts-3n-hsw-x520-114b-2t2c-ndr"
-    layout: "plot-latency"
-
-################################################################################
+    title: "testpmd-3n-skx-xxv710-64b-4t2c-base-ndr"
+    layout: "plot-throughput"
 
-# Packet Latency - DPDK l3fwd 3n-hsw-x520
-- type: "plot"
-  title: "DPDK Latency: l3fwd-3n-hsw-x520-64b-1t1c-base-ndr-lat"
-  algorithm: "plot_latency_error_bars"
+-
+  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-hsw-x520-64b-1t1c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-skx-xxv710-64b-2t1c-base-pdr"
+  data: "plot-dpdk-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
            'BASE' and
            'NDRPDR' and
-           '1T1C' and
-           'IP4FWD'"
+           '2T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
   - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "l3fwd-3n-hsw-x520-64b-1t1c-base-ndr"
-    layout: "plot-latency"
+    title: "testpmd-3n-skx-xxv710-64b-2t1c-base-pdr"
+    layout: "plot-throughput"
 
-- type: "plot"
-  title: "DPDK Latency: l3fwd-3n-hsw-x520-64b-2t2c-base-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x520-64b-2t2c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+-
+  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
-           '2T2C' and
-           'IP4FWD'"
+           '4T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
   - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "l3fwd-3n-hsw-x520-64b-2t2c-base-ndr"
-    layout: "plot-latency"
+    title: "testpmd-3n-skx-xxv710-64b-4t2c-base-pdr"
+    layout: "plot-throughput"
 
-# Packet Latency - DPDK l3fwd 3n-hsw-x710
-- type: "plot"
-  title: "DPDK Latency: l3fwd-3n-hsw-x710-64b-1t1c-base-ndr-lat"
-  algorithm: "plot_latency_error_bars"
+# 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-hsw-x710-64b-1t1c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-x710-64b-2t1c-base-ndr"
+  data: "plot-dpdk-throughput-latency-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'BASE' and
            'NDRPDR' and
-           '1T1C' and
-           'IP4FWD'"
+           '2T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
   - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "l3fwd-3n-hsw-x710-64b-1t1c-base-ndr"
-    layout: "plot-latency"
+    title: "testpmd-2n-skx-x710-64b-2t1c-base-ndr"
+    layout: "plot-throughput"
 
-- type: "plot"
-  title: "DPDK Latency: l3fwd-3n-hsw-x710-64b-2t2c-base-ndr-lat"
-  algorithm: "plot_latency_error_bars"
+-
+  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-hsw-x710-64b-2t2c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-x710-64b-4t2c-base-ndr"
+  data: "plot-dpdk-throughput-latency-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'BASE' and
            'NDRPDR' and
-           '2T2C' and
-           'IP4FWD'"
+           '4T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
   - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "l3fwd-3n-hsw-x710-64b-2t2c-base-ndr"
-    layout: "plot-latency"
+    title: "testpmd-2n-skx-x710-64b-4t2c-base-ndr"
+    layout: "plot-throughput"
 
-# Packet Latency - DPDK l3fwd 3n-hsw-xl710
-- type: "plot"
-  title: "DPDK Latency: l3fwd-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
-  algorithm: "plot_latency_error_bars"
+-
+  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-hsw-xl710-64b-1t1c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-x710-64b-2t1c-base-pdr"
+  data: "plot-dpdk-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            'BASE' and
            'NDRPDR' and
-           '1T1C' and
-           'IP4FWD'"
+           '2T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
   - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "l3fwd-3n-hsw-xl710-64b-1t1c-base-ndr"
-    layout: "plot-latency"
+    title: "testpmd-2n-skx-x710-64b-2t1c-base-pdr"
+    layout: "plot-throughput"
 
-- type: "plot"
-  title: "DPDK Latency: l3fwd-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
-  algorithm: "plot_latency_error_bars"
+-
+  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-hsw-xl710-64b-2t2c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-x710-64b-4t2c-base-pdr"
+  data: "plot-dpdk-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            'BASE' and
            'NDRPDR' and
-           '2T2C' and
-           'IP4FWD'"
+           '4T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
   - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "l3fwd-3n-hsw-xl710-64b-2t2c-base-ndr"
-    layout: "plot-latency"
+    title: "testpmd-2n-skx-x710-64b-4t2c-base-pdr"
+    layout: "plot-throughput"
 
-# 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"
+# 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-3n-skx-x710-64b-2t1c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-xxv710-64b-2t1c-base-ndr"
+  data: "plot-dpdk-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
            'BASE' and
            'NDRPDR' and
            '2T1C' and
-           'IP4FWD'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
   - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "l3fwd-3n-skx-x710-64b-2t1c-base-ndr"
-    layout: "plot-latency"
+    title: "testpmd-2n-skx-xxv710-64b-2t1c-base-ndr"
+    layout: "plot-throughput"
 
-- type: "plot"
-  title: "DPDK Latency: l3fwd-3n-skx-x710-64b-4t2c-base-ndr-lat"
-  algorithm: "plot_latency_error_bars"
+-
+  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-3n-skx-x710-64b-4t2c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-xxv710-64b-4t2c-base-ndr"
+  data: "plot-dpdk-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
            'BASE' and
            'NDRPDR' and
            '4T2C' and
-           'IP4FWD'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
   - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "l3fwd-3n-skx-x710-64b-4t2c-base-ndr"
-    layout: "plot-latency"
+    title: "testpmd-2n-skx-xxv710-64b-4t2c-base-ndr"
+    layout: "plot-throughput"
 
-# 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"
+-
+  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-3n-skx-xxv710-64b-2t1c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-3n-skx"
+  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
-           'IP4FWD'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
   - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "l3fwd-3n-skx-xxv710-64b-2t1c-base-ndr"
-    layout: "plot-latency"
+    title: "testpmd-2n-skx-xxv710-64b-2t1c-base-pdr"
+    layout: "plot-throughput"
 
-- type: "plot"
-  title: "DPDK Latency: l3fwd-3n-skx-xxv710-64b-4t2c-base-ndr-lat"
-  algorithm: "plot_latency_error_bars"
+-
+  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-3n-skx-xxv710-64b-4t2c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-3n-skx"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-xxv710-64b-4t2c-base-pdr"
+  data: "plot-dpdk-throughput-latency-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'BASE' and
            'NDRPDR' and
            '4T2C' and
-           'IP4FWD'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
   - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: "l3fwd-3n-skx-xxv710-64b-4t2c-base-ndr"
-    layout: "plot-latency"
+    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 - DPDK l3fwd 2n-skx-x710
+# Packet Latency - VPP L2 3n-hsw-x520 features-oacl
 - type: "plot"
-  title: "DPDK Latency: l3fwd-2n-skx-x710-64b-2t1c-base-ndr-lat"
+  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,DPDK]}/l3fwd-2n-skx-x710-64b-2t1c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/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
-           'BASE' and
            'NDRPDR' and
-           '2T1C' and
-           'IP4FWD'"
+           '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: "l3fwd-2n-skx-x710-64b-2t1c-base-ndr"
+    title: "l2sw-3n-hsw-x520-64b-1t1c-features-oacl-ndr"
     layout: "plot-latency"
 
 - type: "plot"
-  title: "DPDK Latency: l3fwd-2n-skx-x710-64b-4t2c-base-ndr-lat"
+  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,DPDK]}/l3fwd-2n-skx-x710-64b-4t2c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/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
-           'BASE' and
            'NDRPDR' and
-           '4T2C' and
-           'IP4FWD'"
+           '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: "l3fwd-2n-skx-x710-64b-4t2c-base-ndr"
+    title: "l2sw-3n-hsw-x520-64b-2t2c-features-oacl-ndr"
     layout: "plot-latency"
 
-# Packet Latency - DPDK l3fwd 2n-skx-xxv710
+# Packet Latency - VPP L2 3n-hsw-x520 features-macip
 - type: "plot"
-  title: "DPDK Latency: l3fwd-2n-skx-xxv710-64b-2t1c-base-ndr-lat"
+  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,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]}/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
-           'BASE' and
            'NDRPDR' and
-           '2T1C' and
-           'IP4FWD'"
+           '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: "l3fwd-2n-skx-xxv710-64b-2t1c-base-ndr"
+    title: "l2sw-3n-hsw-x520-64b-1t1c-features-macip-ndr"
     layout: "plot-latency"
 
 - type: "plot"
-  title: "DPDK Latency: l3fwd-2n-skx-xxv710-64b-4t2c-base-ndr-lat"
+  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,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]}/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
-           'BASE' and
            'NDRPDR' and
-           '4T2C' and
-           'IP4FWD'"
+           '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: "l3fwd-2n-skx-xxv710-64b-4t2c-base-ndr"
+    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 - DPDK testpmd 3n-hsw-x520
-- type: "plot"
-  title: "DPDK Latency: testpmd-3n-hsw-x520-64b-1t1c-base-ndr-lat"
+# 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]}/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]}/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
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           '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: "testpmd-3n-hsw-x520-64b-1t1c-base-ndr"
+    title: "l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
     layout: "plot-latency"
 
-- type: "plot"
-  title: "DPDK Latency: testpmd-3n-hsw-x520-64b-2t2c-base-ndr-lat"
+-
+  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]}/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]}/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
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           '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: "testpmd-3n-hsw-x520-64b-2t2c-base-ndr"
+    title: "l2sw-3n-skx-x710-64b-4t2c-base_and_scale-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 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]}/testpmd-3n-hsw-x710-64b-1t1c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
+  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
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           '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: "testpmd-3n-hsw-x710-64b-1t1c-base-ndr"
+    title: "l2sw-3n-skx-x710-64b-2t1c-features-ndr"
     layout: "plot-latency"
 
-- type: "plot"
-  title: "DPDK Latency: testpmd-3n-hsw-x710-64b-2t2c-base-ndr-lat"
+-
+  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]}/testpmd-3n-hsw-x710-64b-2t2c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
+  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
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           '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: "testpmd-3n-hsw-x710-64b-2t2c-base-ndr"
+    title: "l2sw-3n-skx-x710-64b-4t2c-features-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 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,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]}/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' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           '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: "testpmd-3n-hsw-xl710-64b-1t1c-base-ndr"
+    title: "l2sw-3n-skx-xxv710-64b-2t1c-base-ndr"
     layout: "plot-latency"
 
-- type: "plot"
-  title: "DPDK Latency: testpmd-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
+-
+  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,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]}/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' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           '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: "testpmd-3n-hsw-xl710-64b-2t2c-base-ndr"
+    title: "l2sw-3n-skx-xxv710-64b-4t2c-base-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 - 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,DPDK]}/testpmd-3n-skx-x710-64b-2t1c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-3n-skx"
+  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' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           ('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: "testpmd-3n-skx-x710-64b-2t1c-base-ndr"
+    title: "memif-3n-skx-x710-64b-2t1c-base_and_features-ndr"
     layout: "plot-latency"
 
-- type: "plot"
-  title: "DPDK Latency: testpmd-3n-skx-x710-64b-4t2c-base-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,DPDK]}/testpmd-3n-skx-x710-64b-4t2c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-3n-skx"
+  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' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
            '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           ('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: "testpmd-3n-skx-x710-64b-4t2c-base-ndr"
+    title: "memif-3n-skx-x710-64b-4t2c-base_and_features-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"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-skx-xxv710-64b-2t1c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  layout:
-    title: "testpmd-3n-skx-xxv710-64b-2t1c-base-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"
+
+################################################################################
 
-- type: "plot"
-  title: "DPDK Latency: testpmd-3n-skx-xxv710-64b-4t2c-base-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-skx-xxv710-64b-4t2c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  layout:
-    title: "testpmd-3n-skx-xxv710-64b-4t2c-base-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 - DPDK testpmd 2n-skx-x710
-- type: "plot"
-  title: "DPDK Latency: testpmd-2n-skx-x710-64b-2t1c-base-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-x710-64b-2t1c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  layout:
-    title: "testpmd-2n-skx-x710-64b-2t1c-base-ndr"
-    layout: "plot-latency"
+################################################################################
 
-- type: "plot"
-  title: "DPDK Latency: testpmd-2n-skx-x710-64b-4t2c-base-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-x710-64b-4t2c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  layout:
-    title: "testpmd-2n-skx-x710-64b-4t2c-base-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 - DPDK testpmd 2n-skx-xxv710
-- type: "plot"
-  title: "DPDK Latency: testpmd-2n-skx-xxv710-64b-2t1c-base-ndr-lat"
+# 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,DPDK]}/testpmd-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]}/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
-           'BASE' and
            'NDRPDR' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           '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: "testpmd-2n-skx-xxv710-64b-2t1c-base-ndr"
+    title: "ip4-3n-hsw-x520-64b-1t1c-features-oacl-ndr"
     layout: "plot-latency"
 
-- type: "plot"
-  title: "DPDK Latency: testpmd-2n-skx-xxv710-64b-4t2c-base-ndr-lat"
+-
+  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,DPDK]}/testpmd-2n-skx-xxv710-64b-4t2c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  layout:
-    title: "testpmd-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"
+  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
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-           not 'VHOST' and
-           'MEMIF'"
+           '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"
+  - "latency"
   - "parent"
   - "tags"
   sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
+  - "IP4BASE"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
   layout:
-    title: "memif-3n-hsw-x520-64b-base_and_features-ndr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "ip4-3n-hsw-x520-64b-2t2c-features-oacl-ndr"
+    layout: "plot-latency"
 
-- 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"
+## 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"
 
-# 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"
+# 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]}/memif-3n-hsw-x710-64b-base_and_features-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  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
-           ('BASE' or 'SCALE') and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-           not 'VHOST' and
-           'MEMIF'"
+           '2T1C' and
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'DOT1Q' and
+           not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
+  - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   layout:
-    title: "memif-3n-hsw-x710-64b-base_and_features-ndr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+    layout: "plot-latency"
 
-- type: "plot"
-  title: "Speedup: memif-3n-hsw-x710-64b-base_and_features-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+-
+  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]}/memif-3n-hsw-x710-64b-base_and_features-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  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
-           ('BASE' or 'SCALE') and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-           not 'VHOST' and
-           'MEMIF'"
+           '4T2C' and
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'DOT1Q' and
+           not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
+  - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   layout:
-    title: "memif-3n-hsw-x710-64b-base_and_features-pdr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
+    layout: "plot-latency"
 
-# 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"
+# 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]}/memif-3n-hsw-xl710-64b-base_and_features-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-2t1c-features-ndr-lat"
+  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
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-           not 'VHOST' and
-           'MEMIF'"
+           '2T1C' and
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
+  - "DOT1Q"
+  - "IP4BASE"
+  - "NAT44"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACL"
+  - "OACL"
   layout:
-    title: "memif-3n-hsw-xl710-64b-base_and_features-ndr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "ip4-3n-skx-x710-64b-2t1c-features-ndr"
+    layout: "plot-latency"
 
-- type: "plot"
-  title: "Speedup: memif-3n-hsw-xl710-64b-base_and_features-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+-
+  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]}/memif-3n-hsw-xl710-64b-base_and_features-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-4t2c-features-ndr-lat"
+  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
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-           not 'VHOST' and
-           'MEMIF'"
+           '4T2C' and
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
+  - "DOT1Q"
+  - "IP4BASE"
+  - "NAT44"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACL"
+  - "OACL"
   layout:
-    title: "memif-3n-hsw-xl710-64b-base_and_features-pdr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "ip4-3n-skx-x710-64b-4t2c-features-ndr"
+    layout: "plot-latency"
 
-# 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 - 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]}/memif-3n-skx-x710-64b-base_and_features-ndr-tsa"
+  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' or 'SCALE') and
            'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-           not 'VHOST' and
-           'MEMIF'"
+           '2T1C' and
+           'IP4FWD' and
+           ('NAT44' or 'IP4BASE') and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
+  - "IP4BASE"
+  - "BASE"
+  - "SRC_USER_10"
+  - "SRC_USER_100"
+  - "SRC_USER_1000"
+  - "SRC_USER_2000"
   layout:
-    title: "memif-3n-skx-x710-64b-base_and_features-ndr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "ip4-3n-skx-x710-64b-2t1c-features-nat44-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: "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]}/memif-3n-skx-x710-64b-base_and_features-pdr-tsa"
+  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' or 'SCALE') and
            'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-           not 'VHOST' and
-           'MEMIF'"
+           '4T2C' and
+           'IP4FWD' and
+           ('NAT44' or 'IP4BASE') and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
+  - "IP4BASE"
+  - "BASE"
+  - "SRC_USER_10"
+  - "SRC_USER_100"
+  - "SRC_USER_1000"
+  - "SRC_USER_2000"
   layout:
-    title: "memif-3n-skx-x710-64b-base_and_features-pdr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "ip4-3n-skx-x710-64b-4t2c-features-nat44-ndr"
+    layout: "plot-latency"
 
-# 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"
+# 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]}/memif-2n-skx-x710-64b-base_and_features-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  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' or 'SCALE') and
            'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-           not 'VHOST' and
-           not 'NF_DENSITY' and
-           'MEMIF'"
+           '2T1C' and
+           'IP4FWD' and
+           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
+  - "IP4BASE"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
   layout:
-    title: "memif-2n-skx-x710-64b-base_and_features-ndr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "ip4-3n-skx-x710-64b-2t1c-features-iacl-ndr"
+    layout: "plot-latency"
 
-- type: "plot"
-  title: "Speedup: memif-2n-skx-x710-64b-base_and_features-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+-
+  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]}/memif-2n-skx-x710-64b-base_and_features-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  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' or 'SCALE') and
            'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-           not 'VHOST' and
-           not 'NF_DENSITY' and
-           'MEMIF'"
+           '4T2C' and
+           'IP4FWD' and
+           'IACL' and
+           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
+  - "IP4BASE"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
   layout:
-    title: "memif-2n-skx-x710-64b-base_and_features-pdr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "ip4-3n-skx-x710-64b-4t2c-features-iacl-ndr"
+    layout: "plot-latency"
 
-## 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"
+## 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]}/memif-2n-skx-xxv710-64b-base_and_features-ndr-tsa"
+#  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-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
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-#           not 'VHOST' and
-#           'MEMIF'"
+#           '2T1C' and
+#           'IP4FWD' and
+#           not 'IPSEC' and
+#           not 'DOT1Q' and
+#           not 'VHOST'"
 #  parameters:
-#  - "throughput"
+#  - "latency"
 #  - "parent"
 #  - "tags"
 #  sort:
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "IP4FWD"
+#  - "IP4BASE"
+#  - "FIB_20k"
+#  - "FIB_200k"
+#  - "FIB_2M"
 #  layout:
-#    title: "memif-2n-skx-xxv710-64b-base_and_features-ndr"
-#    layout: "plot-throughput-speedup-analysis"
+#    title: "ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
+#    layout: "plot-latency"
 #
-#- type: "plot"
-#  title: "Speedup: memif-2n-skx-xxv710-64b-base_and_features-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
+#-
+#  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]}/memif-2n-skx-xxv710-64b-base_and_features-pdr-tsa"
+#  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-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
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-#           not 'VHOST' and
-#           'MEMIF'"
+#           '4T2C' and
+#           'IP4FWD' and
+#           not 'IPSEC' and
+#           not 'DOT1Q' and
+#           not 'VHOST'"
 #  parameters:
-#  - "throughput"
+#  - "latency"
 #  - "parent"
 #  - "tags"
 #  sort:
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "IP4FWD"
+#  - "IP4BASE"
+#  - "FIB_20k"
+#  - "FIB_200k"
+#  - "FIB_2M"
 #  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"
+#    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]}/k8s-memif-3n-hsw-x520-64b-base_and_scale-l2xc-ndr-tsa"
-#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
+#  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
-#           ('BASE' or 'SCALE') and
+#           ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
 #           'NDRPDR' and
-#           'L2XCFWD' and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
+#           '2T1C' and
+#           'IP4FWD' and
+#           not 'IPSEC' and
+#           not 'DOT1Q' and
+#           not 'VHOST'"
 #  parameters:
-#  - "throughput"
+#  - "latency"
 #  - "parent"
 #  - "tags"
 #  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
+#  - "IP4BASE"
+#  - "FIB_20k"
+#  - "FIB_200k"
+#  - "FIB_2M"
 #  layout:
-#    title: "k8s-memif-3n-hsw-x520-64b-base_and_scale-ndr-l2xc"
-#    layout: "plot-throughput-speedup-analysis"
+#    title: "ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
+#    layout: "plot-latency"
 #
-#- type: "plot"
-#  title: "Speedup: k8s-memif-3n-hsw-x520-64b-base_and_scale-l2xc-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
+#-
+#  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]}/k8s-memif-3n-hsw-x520-64b-base_and_scale-l2xc-pdr-tsa"
-#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
+#  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
-#           ('BASE' or 'SCALE') and
+#           ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
 #           'NDRPDR' and
-#           'L2XCFWD' and
-#           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
+#           '4T2C' and
+#           'IP4FWD' and
+#           not 'IPSEC' and
+#           not 'DOT1Q' and
+#           not 'VHOST'"
 #  parameters:
-#  - "throughput"
+#  - "latency"
 #  - "parent"
 #  - "tags"
 #  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
+#  - "IP4BASE"
+#  - "FIB_20k"
+#  - "FIB_200k"
+#  - "FIB_2M"
 #  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"
+#    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]}/k8s-memif-3n-hsw-x520-64b-base_and_scale-l2bd-ndr-tsa"
-#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
+#  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
-#           ('BASE' or 'SCALE') and
+#           'ENCAP' and
 #           'NDRPDR' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+#           '1T1C' and
+#           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
+#           not 'DOT1Q' and
 #           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
+#           not 'IPSECHW'"
 #  parameters:
-#  - "throughput"
+#  - "latency"
 #  - "parent"
 #  - "tags"
 #  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
+#  - "IP4BASE"
+#  - "L2BDMACLRN"
+#  - "L2XCFWD"
+#  - "LISP"
 #  layout:
-#    title: "k8s-memif-3n-hsw-x520-64b-base_and_scale-ndr-l2bd"
-#    layout: "plot-throughput-speedup-analysis"
+#    title: "ip4tun-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
+#    layout: "plot-latency"
 #
-#- type: "plot"
-#  title: "Speedup: k8s-memif-3n-hsw-x520-64b-base_and_scale-l2bd-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
+#-
+#  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]}/k8s-memif-3n-hsw-x520-64b-base_and_scale-l2bd-pdr-tsa"
-#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
+#  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
-#           ('BASE' or 'SCALE') and
+#           'ENCAP' and
 #           'NDRPDR' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+#           '2T2C' and
+#           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
+#           not 'DOT1Q' and
 #           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
+#           not 'IPSECHW'"
 #  parameters:
-#  - "throughput"
+#  - "latency"
 #  - "parent"
 #  - "tags"
 #  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
+#  - "IP4BASE"
+#  - "L2BDMACLRN"
+#  - "L2XCFWD"
+#  - "LISP"
 #  layout:
-#    title: "k8s-memif-3n-hsw-x520-64b-base_and_scale-l2bd-pdr"
-#    layout: "plot-throughput-speedup-analysis"
+#    title: "ip4tun-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
+#    layout: "plot-latency"
 #
-## 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"
+## 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]}/k8s-memif-3n-hsw-x710-64b-base_and_scale-l2xc-ndr-tsa"
-#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
+#  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
-#           ('BASE' or 'SCALE') and
+#           'ENCAP' and
 #           'NDRPDR' and
-#           'L2XCFWD' and
+#           '1T1C' and
+#           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
 #           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
+#           not 'IPSECHW'"
 #  parameters:
-#  - "throughput"
+#  - "latency"
 #  - "parent"
 #  - "tags"
 #  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
+#  - "IP4BASE"
+#  - "LISP"
+#  - "VXLAN_1"
+#  - "VXLAN_10"
+#  - "VXLAN_100"
+#  - "VXLAN_1000"
 #  layout:
-#    title: "k8s-memif-3n-hsw-x710-64b-base_and_scale-l2xc-ndr"
-#    layout: "plot-throughput-speedup-analysis"
+#    title: "ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
+#    layout: "plot-latency"
 #
-#- type: "plot"
-#  title: "Speedup: k8s-memif-3n-hsw-x710-64b-base_and_scale-l2xc-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
+#-
+#  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]}/k8s-memif-3n-hsw-x710-64b-base_and_scale-l2xc-pdr-tsa"
-#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
+#  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
-#           ('BASE' or 'SCALE') and
+#           'ENCAP' and
 #           'NDRPDR' and
-#           'L2XCFWD' and
+#           '2T2C' and
+#           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
 #           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
+#           not 'IPSECHW'"
 #  parameters:
-#  - "throughput"
+#  - "latency"
 #  - "parent"
 #  - "tags"
 #  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
+#  - "IP4BASE"
+#  - "LISP"
+#  - "VXLAN_1"
+#  - "VXLAN_10"
+#  - "VXLAN_100"
+#  - "VXLAN_1000"
 #  layout:
-#    title: "k8s-memif-3n-hsw-x710-64b-base_and_scale-l2xc-pdr"
-#    layout: "plot-throughput-speedup-analysis"
+#    title: "ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+#    layout: "plot-latency"
 #
-## 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"
+## 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]}/k8s-memif-3n-hsw-x710-64b-base_and_scale-l2bd-ndr-tsa"
-#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
+#  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
-#           ('BASE' or 'SCALE') and
+#           'ENCAP' and
 #           'NDRPDR' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+#           '1T1C' and
+#           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP' or 'IP4BASE') and
+#           not 'DOT1Q' and
 #           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
+#           not 'IPSECHW'"
 #  parameters:
-#  - "throughput"
+#  - "latency"
 #  - "parent"
 #  - "tags"
 #  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
+#  - "IP4BASE"
+#  - "L2BDMACLRN"
+#  - "L2XCFWD"
+#  - "LISP"
 #  layout:
-#    title: "k8s-memif-3n-hsw-x710-64b-base_and_scale-l2bd-ndr"
-#    layout: "plot-throughput-speedup-analysis"
+#    title: "ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
+#    layout: "plot-latency"
 #
-#- type: "plot"
-#  title: "Speedup: k8s-memif-3n-hsw-x710-64b-base_and_scale-l2bd-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
+#-
+#  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]}/k8s-memif-3n-hsw-x710-64b-base_and_scale-l2bd-pdr-tsa"
-#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
+#  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
-#           ('BASE' or 'SCALE') and
+#           'ENCAP' and
 #           'NDRPDR' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+#           '2T2C' and
+#           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP' or 'IP4BASE') and
+#           not 'DOT1Q' and
 #           not 'VHOST' and
-#           not 'NF_DENSITY' and
-#           'MEMIF'"
+#           not 'IPSECHW'"
 #  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "1VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  - "2VNF"
-#  - "4VNF"
-#  layout:
-#    title: "k8s-memif-3n-hsw-x710-64b-base_and_scale-l2bd-pdr"
-#    layout: "plot-throughput-speedup-analysis"
-
-################################################################################
-
-# Speedup - VPP IPv4 3n-hsw-x520 base and scale
-- type: "plot"
-  title: "Speedup: ip4-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "DOT1Q"
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  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"
+#  - "latency"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "IP4BASE"
+#  - "L2BDMACLRN"
+#  - "L2XCFWD"
+#  - "LISP"
+#  layout:
+#    title: "ip4tun-3n-hsw-x710-64b-2t2c-base_and_features-ndr"
+#    layout: "plot-latency"
 
-# 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"
+# 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]}/ip4-3n-hsw-x520-64b-features-iacl-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' 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
+           'ENCAP' and
            'NDRPDR' and
-           'IP4FWD' and
-           (('IACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
+           '2T1C' and
+           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
+           not 'VHOST' and
+           not 'IPSECHW'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
   - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
+  - "LISP"
+  - "VXLAN_1"
+  - "VXLAN_10"
+  - "VXLAN_100"
+  - "VXLAN_1000"
   layout:
-    title: "ip4-3n-hsw-x520-64b-features-iacl-ndr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+    layout: "plot-latency"
 
-- type: "plot"
-  title: "Speedup: ip4-3n-hsw-x520-64b-features-iacl-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+-
+  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]}/ip4-3n-hsw-x520-64b-features-iacl-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' 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
+           'ENCAP' and
            'NDRPDR' and
-           'IP4FWD' and
-           (('IACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
+           '4T2C' and
+           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
+           not 'VHOST' and
+           not 'IPSECHW'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
   - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
+  - "LISP"
+  - "VXLAN_1"
+  - "VXLAN_10"
+  - "VXLAN_100"
+  - "VXLAN_1000"
   layout:
-    title: "ip4-3n-hsw-x520-64b-features-iacl-pdr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
+    layout: "plot-latency"
 
-# 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 - 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]}/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,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
-           'IP4FWD' and
-           (('OACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
-           not 'IPSEC' and
+           '2T1C' and
+           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
            not 'DOT1Q' and
-           not 'VHOST'"
+           not 'VHOST' and
+           not 'IPSECHW'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
   - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "LISP"
   layout:
-    title: "ip4-3n-hsw-x520-64b-features-oacl-ndr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "ip4tun-3n-skx-x710-64b-2t1c-base_and_features-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: "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]}/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,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
-           'IP4FWD' and
-           (('OACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
-           not 'IPSEC' and
+           '4T2C' and
+           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
            not 'DOT1Q' and
-           not 'VHOST'"
+           not 'VHOST' and
+           not 'IPSECHW'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
   - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "LISP"
   layout:
-    title: "ip4-3n-hsw-x520-64b-features-oacl-pdr"
-    layout: "plot-throughput-speedup-analysis"
+    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"
 
-# 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"
+# 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]}/ip4-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  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
-           '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           '78B' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
-           'IP4FWD' and
+           '2T1C' and
+           'IP6FWD' and
+           not 'SRv6' and
            not 'IPSEC' and
-           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
-  - "IP4BASE"
+  - "IP6BASE"
   - "FIB_20K"
   - "FIB_200K"
   - "FIB_2M"
   layout:
-    title: "ip4-3n-hsw-x710-64b-base_and_scale-ndr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "ip6-3n-skx-x710-78b-2t1c-base_and_scale-ndr"
+    layout: "plot-latency"
 
-- type: "plot"
-  title: "Speedup: ip4-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+-
+  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]}/ip4-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  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
-           '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           '78B' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
-           'IP4FWD' and
+           '4T2C' and
+           'IP6FWD' and
+           not 'SRv6' and
            not 'IPSEC' and
-           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
-  - "IP4BASE"
+  - "IP6BASE"
   - "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"
+    title: "ip6-3n-skx-x710-78b-4t2c-base_and_scale-ndr"
+    layout: "plot-latency"
 
-- 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"
+## 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"
 
-# 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"
+## 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"
 
-# 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 ('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: "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"
+# 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]}/ip4-3n-hsw-x710-64b-features-iacl-pdr-tsa"
+  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-X710' and
+  filter: "'NIC_Intel-XL710' and
            '64B' and
-           'NDRPDR' and
            'IP4FWD' and
-           (('IACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
-           not 'IPSEC' and
+           'NDRPDR' and
+           'BASE' and
+           '1T1C' and
+           'IPSECHW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "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"
+    title: "ipsec-3n-hsw-xl710-64b-1t1c-base-ndr"
+    layout: "plot-latency"
 
-# 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"
+-
+  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]}/ip4-3n-hsw-xl710-64b-base-ndr-tsa"
+  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
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
            'IP4FWD' and
-           not 'IPSEC' and
+           'NDRPDR' and
+           'BASE' and
+           '2T2C' and
+           'IPSECHW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
   layout:
-    title: "ip4-3n-hsw-xl710-64b-base-ndr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "ipsec-3n-hsw-xl710-64b-2t2c-base-ndr"
+    layout: "plot-latency"
 
-- type: "plot"
-  title: "Speedup: ip4-3n-hsw-xl710-64b-base-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+# 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]}/ip4-3n-hsw-xl710-64b-base-pdr-tsa"
+  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
-           ('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"
-
-# Speedup - VPP IPv4 3n-skx-x710 base and scale
-- type: "plot"
-  title: "Speedup: ip4-3n-skx-x710-64b-base_and_scale-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-base_and_scale-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
+           'SCALE' and
+           '1T1C' and
+           'IPSECHW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   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: "ipsec-3n-hsw-xl710-64b-1t1c-scale-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: "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]}/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,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
-           ('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-skx-x710-64b-base_and_scale-pdr"
-    layout: "plot-throughput-speedup-analysis"
-
-# Speedup - VPP IPv4 3n-skx-x710 features
-- type: "plot"
-  title: "Speedup: ip4-3n-skx-x710-64b-features-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-features-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('IP4BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            ('NAT44' and 'BASE') or
-            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
            'NDRPDR' and
-           'IP4FWD' and
-           not 'IPSEC' and
+           'SCALE' and
+           '2T2C' and
+           'IPSECHW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   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: "ipsec-3n-hsw-xl710-64b-2t2c-scale-ndr"
+    layout: "plot-latency"
 
-- type: "plot"
-  title: "Speedup: ip4-3n-skx-x710-64b-features-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+# Packet Latency - VPP IPSec 3n-hsw-xl710 sw
+-
+  type: "plot"
+  title: "VPP Latency: ipsec-3n-hsw-xl710-64b-1t1c-sw-ndr-lat"
+  algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-features-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  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
            '64B' and
-           ('IP4BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            ('NAT44' and 'BASE') or
-            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
-           'NDRPDR' and
            'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "DOT1Q"
-  - "IP4BASE"
-  - "NAT44"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACL"
-  - "OACL"
-  layout:
-    title: "ip4-3n-skx-x710-64b-features-pdr"
-    layout: "plot-throughput-speedup-analysis"
-
-# Speedup - VPP IPv4 3n-skx-x710 features nat44
-- type: "plot"
-  title: "Speedup: ip4-3n-skx-x710-64b-features-nat44-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-features-nat44-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
            'NDRPDR' and
-           'IP4FWD' and
-           ('NAT44' or 'IP4BASE') and
-           not 'IPSEC' and
+           '1T1C' and
+           'IPSECSW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   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: "ipsec-3n-hsw-xl710-64b-1t1c-sw-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: "VPP Latency: ipsec-3n-hsw-xl710-64b-2t2c-sw-ndr-lat"
+  algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/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,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-sw-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '64B' and
-           'NDRPDR' and
            'IP4FWD' and
-           ('NAT44' or 'IP4BASE') and
-           not 'IPSEC' and
+           'NDRPDR' and
+           '2T2C' and
+           'IPSECSW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   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: "ipsec-3n-hsw-xl710-64b-2t2c-sw-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 - 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]}/ip4-3n-skx-x710-64b-features-iacl-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
+  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
-           'IP4FWD' and
-           (('IACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '1T1C' and
+           'IP6FWD' and
+           'SRv6'"
   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: "srv6-3n-hsw-x520-78b-1t1c-features-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: "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]}/ip4-3n-skx-x710-64b-features-iacl-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
+  output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-2t2c-features-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '78B' and
+           'FEATURE' and
            'NDRPDR' and
-           'IP4FWD' and
-           (('IACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '2T2C' and
+           'IP6FWD' and
+           'SRv6'"
   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: "srv6-3n-hsw-x520-78b-2t2c-features-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 - 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]}/ip4-3n-skx-x710-64b-features-oacl-ndr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+#  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
-#           'OACL' and
-#           ('ACL10' or 'ACL50') and '10K_FLOWS' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
+#           '2T2C' and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'CFS_OPT' and
+#           not 'DOT1Q'"
 #  parameters:
-#  - "throughput"
+#  - "latency"
 #  - "parent"
 #  - "tags"
 #  sort:
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
+#  - "1VM"
+#  - "2VM"
 #  layout:
-#    title: "ip4-3n-skx-x710-64b-features-oacl-ndr"
-#    layout: "plot-throughput-speedup-analysis"
+#    title: "vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+#    layout: "plot-latency"
 #
-#- type: "plot"
-#  title: "Speedup: ip4-3n-skx-x710-64b-features-oacl-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
+## 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]}/ip4-3n-skx-x710-64b-features-oacl-pdr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+#  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
-#           'IP4FWD' and
-#           'OACL' and
-#           ('ACL10' or 'ACL50') and '10K_FLOWS' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
+#           ('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"
+#  - "latency"
 #  - "parent"
 #  - "tags"
 #  sort:
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
+#  - "L2BDMACLRN"
+#  - "L2BDMACLRN"
+#  - "L2BDMACLRN"
+#  - "L2XCFWD"
+#  - "L2XCFWD"
+#  - "L2XCFWD"
 #  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-x710 features iacl
-- type: "plot"
-  title: "Speedup: ip4-2n-skx-x710-64b-features-iacl-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-features-iacl-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           'IP4FWD' and
-           (('IACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  layout:
-    title: "ip4-2n-skx-x710-64b-features-iacl-ndr"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: ip4-2n-skx-x710-64b-features-iacl-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-features-iacl-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           'IP4FWD' and
-           (('IACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  layout:
-    title: "ip4-2n-skx-x710-64b-features-iacl-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"
+#    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]}/ip4-2n-dnv-x553-64b-base-ndr-tsa"
-#  data: "intel-dnv-vpp"
-#  filter: "'NIC_Intel-X553' and
+#  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
-#           'IP4BASE' and
 #           'NDRPDR' and
-#           'IP4FWD' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
+#           ('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"
+#  - "latency"
 #  - "parent"
 #  - "tags"
 #  sort:
-#  - "IP4BASE"
+#  - "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: "ip4-2n-dnv-x553-64b-base-ndr"
-#    layout: "plot-throughput-speedup-analysis"
+#    title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-vm-ndr"
+#    layout: "plot-latency"
 #
-#- type: "plot"
-#  title: "Speedup: ip4-2n-dnv-x553-64b-base-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
+#-
+#  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]}/ip4-2n-dnv-x553-64b-base-pdr-tsa"
-#  data: "intel-dnv-vpp"
-#  filter: "'NIC_Intel-X553' and
+#  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
-#           'IP4BASE' and
 #           'NDRPDR' and
-#           'IP4FWD' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
+#           ('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"
+#  - "latency"
 #  - "parent"
 #  - "tags"
 #  sort:
-#  - "IP4BASE"
+#  - "L2BDMACLRN"
+#  - "L2BDMACLRN"
+#  - "L2BDMACLRN"
+#  - "L2XCFWD"
+#  - "L2XCFWD"
+#  - "L2XCFWD"
 #  layout:
-#    title: "ip4-2n-dnv-x553-64b-base-pdr"
-#    layout: "plot-throughput-speedup-analysis"
-
-################################################################################
-
-# Speedup - VPP IPv4 Tunnels 3n-hsw-x520 - features
-- type: "plot"
-  title: "Speedup: ip4tun-3n-hsw-x520-64b-base_and_features-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-base_and_features-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'ENCAP' and
-           'NDRPDR' and
-           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
-           not 'DOT1Q' and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "LISP"
-  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"
+#    title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-vm-ndr"
+#    layout: "plot-latency"
 
-# 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"
+# Packet Latency - VPP vhost ip4 3n-skx-x710
+-
+  type: "plot"
+  title: "VPP Latency: vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  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
-           'ENCAP' and
            'NDRPDR' and
-           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           'ETH' and
+           'IP4FWD' and
+           '2T1C' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'DOT1Q'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
-  - "IP4BASE"
-  - "LISP"
-  - "VXLAN_1"
-  - "VXLAN_10"
-  - "VXLAN_100"
-  - "VXLAN_1000"
+  - "1VM"
+  - "2VM"
   layout:
-    title: "ip4tun-3n-hsw-x710-64b-base_and_scale-ndr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+    layout: "plot-latency"
 
-- type: "plot"
-  title: "Speedup: ip4tun-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+-
+  type: "plot"
+  title: "VPP Latency: vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  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
-           'ENCAP' and
            'NDRPDR' and
-           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           'ETH' and
+           'IP4FWD' and
+           '4T2C' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'DOT1Q'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
-  - "IP4BASE"
-  - "LISP"
-  - "VXLAN_1"
-  - "VXLAN_10"
-  - "VXLAN_100"
-  - "VXLAN_1000"
+  - "1VM"
+  - "2VM"
   layout:
-    title: "ip4tun-3n-hsw-x710-64b-base_and_scale-pdr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
+    layout: "plot-latency"
 
-# 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"
+# Packet Latency - VPP vhost l2sw 3n-skx-x710 - base
+-
+  type: "plot"
+  title: "VPP Latency: vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-ndr-lat"
+  algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-base_and_features-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  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
-           'ENCAP' and
            'NDRPDR' and
-           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP' or 'IP4BASE') and
-           not 'DOT1Q' and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           ('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"
+  - "latency"
   - "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"
   - "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"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-base_and_scale-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'ENCAP' and
-           'NDRPDR' and
-           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "LISP"
-  - "VXLAN_1"
-  - "VXLAN_10"
-  - "VXLAN_100"
-  - "VXLAN_1000"
+  - "L2XCFWD"
+  - "L2XCFWD"
   layout:
-    title: "ip4tun-3n-skx-x710-64b-base_and_scale-ndr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-ndr"
+    layout: "plot-latency"
 
-- type: "plot"
-  title: "Speedup: ip4tun-3n-skx-x710-64b-base_and_scale-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+-
+  type: "plot"
+  title: "VPP Latency: vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-ndr-lat"
+  algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-base_and_scale-pdr-tsa"
+  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
-           'ENCAP' and
            'NDRPDR' and
-           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           ('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"
+  - "latency"
   - "parent"
   - "tags"
   sort:
-  - "IP4BASE"
-  - "LISP"
-  - "VXLAN_1"
-  - "VXLAN_10"
-  - "VXLAN_100"
-  - "VXLAN_1000"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
   layout:
-    title: "ip4tun-3n-skx-x710-64b-base_and_scale-pdr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-ndr"
+    layout: "plot-latency"
 
-# 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"
+# Packet Latency - VPP vhost l2sw 3n-skx-x710 - base vm
+-
+  type: "plot"
+  title: "VPP Latency: vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-vm-ndr-lat"
+  algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-base_and_features-ndr-tsa"
+  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
-           'ENCAP' and
            'NDRPDR' and
-           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
-           not 'DOT1Q' and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           ('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"
+  - "latency"
   - "parent"
   - "tags"
   sort:
-  - "IP4BASE"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2XCFWD"
-  - "LISP"
+  - "L2XCFWD"
+  - "L2XCFWD"
   layout:
-    title: "ip4tun-3n-skx-x710-64b-base_and_features-ndr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-vm-ndr"
+    layout: "plot-latency"
 
-- type: "plot"
-  title: "Speedup: ip4tun-3n-skx-x710-64b-base_and_features-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+-
+  type: "plot"
+  title: "VPP Latency: vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-vm-ndr-lat"
+  algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-base_and_features-pdr-tsa"
+  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
-           'ENCAP' and
            'NDRPDR' and
-           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
-           not 'DOT1Q' and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           ('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"
+  - "latency"
   - "parent"
   - "tags"
   sort:
-  - "IP4BASE"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2XCFWD"
-  - "LISP"
+  - "L2XCFWD"
+  - "L2XCFWD"
   layout:
-    title: "ip4tun-3n-skx-x710-64b-base_and_features-pdr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-vm-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"
 
 ################################################################################
 
-# 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"
+## 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"
 
-# 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"
+################################################################################
+
+# Packet Latency - DPDK l3fwd 3n-hsw-x520
+-
+  type: "plot"
+  title: "DPDK Latency: l3fwd-3n-hsw-x520-64b-1t1c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,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
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x520-64b-1t1c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           'BASE' and
            'NDRPDR' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '1T1C' and
+           'IP4FWD'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "IP6BASE"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACLDST"
   layout:
-    title: "ip6-3n-hsw-x710-78b-base_and_features-ndr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "l3fwd-3n-hsw-x520-64b-1t1c-base-ndr"
+    layout: "plot-latency"
 
-- type: "plot"
-  title: "Speedup: ip6-3n-hsw-x710-78b-base_and_features-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+-
+  type: "plot"
+  title: "DPDK Latency: l3fwd-3n-hsw-x520-64b-2t2c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,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
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x520-64b-2t2c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           'BASE' and
            'NDRPDR' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '2T2C' and
+           'IP4FWD'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "IP6BASE"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACLDST"
   layout:
-    title: "ip6-3n-hsw-x710-78b-base_and_features-pdr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "l3fwd-3n-hsw-x520-64b-2t2c-base-ndr"
+    layout: "plot-latency"
 
-# Speedup - VPP IPv6 3n-hsw-xl710
-- type: "plot"
-  title: "Speedup: ip6-3n-hsw-xl710-78b-base-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+# Packet Latency - DPDK l3fwd 3n-hsw-x710
+-
+  type: "plot"
+  title: "DPDK Latency: l3fwd-3n-hsw-x710-64b-1t1c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-base-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x710-64b-1t1c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'BASE' and
            'NDRPDR' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '1T1C' and
+           'IP4FWD'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
   layout:
-    title: "ip6-3n-hsw-xl710-78b-base-ndr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "l3fwd-3n-hsw-x710-64b-1t1c-base-ndr"
+    layout: "plot-latency"
 
-- type: "plot"
-  title: "Speedup: ip6-3n-hsw-xl710-78b-base-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+-
+  type: "plot"
+  title: "DPDK Latency: l3fwd-3n-hsw-x710-64b-2t2c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,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
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x710-64b-2t2c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'BASE' and
            'NDRPDR' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '2T2C' and
+           'IP4FWD'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
   layout:
-    title: "ip6-3n-hsw-xl710-78b-base-pdr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "l3fwd-3n-hsw-x710-64b-2t2c-base-ndr"
+    layout: "plot-latency"
 
-# Speedup - VPP IPv6 3n-skx-x710
-- type: "plot"
-  title: "Speedup: ip6-3n-skx-x710-78b-base_and_scale-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+# Packet Latency - DPDK l3fwd 3n-hsw-xl710
+-
+  type: "plot"
+  title: "DPDK Latency: l3fwd-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-base_and_scale-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
+           '64B' and
+           'BASE' and
            'NDRPDR' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '1T1C' and
+           'IP4FWD'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
   layout:
-    title: "ip6-3n-skx-x710-78b-base_and_scale-ndr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "l3fwd-3n-hsw-xl710-64b-1t1c-base-ndr"
+    layout: "plot-latency"
 
-- type: "plot"
-  title: "Speedup: ip6-3n-skx-x710-78b-base_and_scale-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+-
+  type: "plot"
+  title: "DPDK Latency: l3fwd-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-base_and_scale-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
+           '64B' and
+           'BASE' and
            'NDRPDR' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '2T2C' and
+           'IP4FWD'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
   layout:
-    title: "ip6-3n-skx-x710-78b-base_and_scale-pdr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "l3fwd-3n-hsw-xl710-64b-2t2c-base-ndr"
+    layout: "plot-latency"
 
-# Speedup - VPP IPv6 3n-skx-x710 features
-- type: "plot"
-  title: "Speedup: ip6-3n-skx-x710-78b-base_and_features-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+# 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,VPP]}/ip6-3n-skx-x710-78b-base_and_features-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  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
-           '78B' and
-           ('IP6BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            'IACLDST') and
+           '64B' and
+           'BASE' and
            'NDRPDR' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '2T1C' and
+           'IP4FWD'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "IP6BASE"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACLDST"
   layout:
-    title: "ip6-3n-skx-x710-78b-base_and_features-ndr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "l3fwd-3n-skx-x710-64b-2t1c-base-ndr"
+    layout: "plot-latency"
 
-- type: "plot"
-  title: "Speedup: ip6-3n-skx-x710-78b-base_and_features-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+-
+  type: "plot"
+  title: "DPDK Latency: l3fwd-3n-skx-x710-64b-4t2c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-base_and_features-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-skx-x710-64b-4t2c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            'IACLDST') and
+           '64B' and
+           'BASE' and
            'NDRPDR' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '4T2C' and
+           'IP4FWD'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "IP6BASE"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACLDST"
   layout:
-    title: "ip6-3n-skx-x710-78b-base_and_features-pdr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "l3fwd-3n-skx-x710-64b-4t2c-base-ndr"
+    layout: "plot-latency"
 
-# Speedup - VPP IPv6 3n-skx-xxv710
-- type: "plot"
-  title: "Speedup: ip6-3n-skx-xxv710-78b-base_and_scale-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+# 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,VPP]}/ip6-3n-skx-xxv710-78b-base_and_scale-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  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
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           '64B' and
+           'BASE' and
            'NDRPDR' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '2T1C' and
+           'IP4FWD'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
   layout:
-    title: "ip6-3n-skx-xxv710-78b-base_and_scale-ndr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "l3fwd-3n-skx-xxv710-64b-2t1c-base-ndr"
+    layout: "plot-latency"
 
-- type: "plot"
-  title: "Speedup: ip6-3n-skx-xxv710-78b-base_and_scale-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+-
+  type: "plot"
+  title: "DPDK Latency: l3fwd-3n-skx-xxv710-64b-4t2c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-xxv710-78b-base_and_scale-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  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
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           '64B' and
+           'BASE' and
            'NDRPDR' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '4T2C' and
+           'IP4FWD'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
   layout:
-    title: "ip6-3n-skx-xxv710-78b-base_and_scale-pdr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "l3fwd-3n-skx-xxv710-64b-4t2c-base-ndr"
+    layout: "plot-latency"
 
-# 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"
+# 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,VPP]}/ip6-2n-skx-x710-78b-base_and_scale-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-2n-skx-x710-64b-2t1c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-2n-skx"
   filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           '64B' and
+           'BASE' and
            'NDRPDR' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '2T1C' and
+           'IP4FWD'"
   parameters:
-  - "throughput"
+  - "latency"
   - "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"
+    title: "l3fwd-2n-skx-x710-64b-2t1c-base-ndr"
+    layout: "plot-latency"
 
-- type: "plot"
-  title: "Speedup: ip6-2n-skx-x710-78b-base_and_scale-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+-
+  type: "plot"
+  title: "DPDK Latency: l3fwd-2n-skx-x710-64b-4t2c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-base_and_scale-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  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
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           '64B' and
+           'BASE' and
            'NDRPDR' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '4T2C' and
+           'IP4FWD'"
   parameters:
-  - "throughput"
+  - "latency"
   - "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"
+    title: "l3fwd-2n-skx-x710-64b-4t2c-base-ndr"
+    layout: "plot-latency"
 
-# 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"
+# 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,VPP]}/ip6-2n-skx-xxv710-78b-base_and_scale-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-2n-skx-xxv710-64b-2t1c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-2n-skx"
   filter: "'NIC_Intel-XXV710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           '64B' and
+           'BASE' and
            'NDRPDR' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '2T1C' and
+           'IP4FWD'"
   parameters:
-  - "throughput"
+  - "latency"
   - "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"
+    title: "l3fwd-2n-skx-xxv710-64b-2t1c-base-ndr"
+    layout: "plot-latency"
 
-- type: "plot"
-  title: "Speedup: ip6-2n-skx-xxv710-78b-base_and_scale-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+-
+  type: "plot"
+  title: "DPDK Latency: l3fwd-2n-skx-xxv710-64b-4t2c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-base_and_scale-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-2n-skx-xxv710-64b-4t2c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-2n-skx"
   filter: "'NIC_Intel-XXV710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           '64B' and
+           'BASE' and
            'NDRPDR' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '4T2C' and
+           'IP4FWD'"
   parameters:
-  - "throughput"
+  - "latency"
   - "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"
+    title: "l3fwd-2n-skx-xxv710-64b-4t2c-base-ndr"
+    layout: "plot-latency"
 
 ################################################################################
 
-# Speedup - VPP IPv6 tunnels 3n-hsw-x520
-- type: "plot"
-  title: "Speedup: ip6tun-3n-hsw-x520-78b-base-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]}/ip6tun-3n-hsw-x520-78b-base-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x520-64b-1t1c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           'ENCAP' and
+           '64B' and
+           'BASE' and
            'NDRPDR' and
-           'LISP' and
-           not 'VHOST'"
+           '1T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
-  - "throughput"
+  - "latency"
+  - "parent"
+  - "tags"
+  layout:
+    title: "testpmd-3n-hsw-x520-64b-1t1c-base-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "DPDK Latency: testpmd-3n-hsw-x520-64b-2t2c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x520-64b-2t2c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           'BASE' and
+           'NDRPDR' and
+           '2T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+  parameters:
+  - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "IP4UNRLAY"
-  - "IP6UNRLAY"
   layout:
-    title: "ip6tun-3n-hsw-x520-78b-base-ndr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "testpmd-3n-hsw-x520-64b-2t2c-base-ndr"
+    layout: "plot-latency"
 
-- type: "plot"
-  title: "Speedup: ip6tun-3n-hsw-x520-78b-base-pdr-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]}/ip6tun-3n-hsw-x520-78b-base-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           'ENCAP' and
+  output-file: "{DIR[STATIC,DPDK]}/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
-           'LISP' and
-           not 'VHOST'"
+           '1T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "IP4UNRLAY"
-  - "IP6UNRLAY"
   layout:
-    title: "ip6tun-3n-hsw-x520-78b-base-pdr"
-    layout: "plot-throughput-speedup-analysis"
-
-################################################################################
+    title: "testpmd-3n-hsw-x710-64b-1t1c-base-ndr"
+    layout: "plot-latency"
 
-# Speedup - VPP IPSec 3n-hsw-xl710 base
-- type: "plot"
-  title: "Speedup: ipsec-3n-hsw-xl710-64b-base-ndr-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]}/ipsec-3n-hsw-xl710-64b-base-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x710-64b-2t2c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           'IP4FWD' and
-           'NDRPDR' and
            'BASE' and
-           'IPSECHW' and
-           not 'VHOST'"
+           'NDRPDR' and
+           '2T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   layout:
-    title: "ipsec-3n-hsw-xl710-64b-base-ndr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "testpmd-3n-hsw-x710-64b-2t2c-base-ndr"
+    layout: "plot-latency"
 
-- type: "plot"
-  title: "Speedup: ipsec-3n-hsw-xl710-64b-base-pdr-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]}/ipsec-3n-hsw-xl710-64b-base-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
-           'IP4FWD' and
-           'NDRPDR' and
            'BASE' and
-           'IPSECHW' and
-           not 'VHOST'"
+           'NDRPDR' and
+           '1T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   layout:
-    title: "ipsec-3n-hsw-xl710-64b-base-pdr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "testpmd-3n-hsw-xl710-64b-1t1c-base-ndr"
+    layout: "plot-latency"
 
-# Speedup - VPP IPSec 3n-hsw-xl710 scale
-- type: "plot"
-  title: "Speedup: ipsec-3n-hsw-xl710-64b-scale-ndr-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]}/ipsec-3n-hsw-xl710-64b-scale-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
-           'IP4FWD' and
+           'BASE' and
            'NDRPDR' and
-           'SCALE' and
-           'IPSECHW' and
-           not 'VHOST'"
+           '2T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   layout:
-    title: "ipsec-3n-hsw-xl710-64b-scale-ndr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "testpmd-3n-hsw-xl710-64b-2t2c-base-ndr"
+    layout: "plot-latency"
 
-- type: "plot"
-  title: "Speedup: ipsec-3n-hsw-xl710-64b-scale-pdr-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]}/ipsec-3n-hsw-xl710-64b-scale-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-skx-x710-64b-2t1c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           'IP4FWD' and
+           'BASE' and
            'NDRPDR' and
-           'SCALE' and
-           'IPSECHW' and
-           not 'VHOST'"
+           '2T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   layout:
-    title: "ipsec-3n-hsw-xl710-64b-scale-pdr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "testpmd-3n-skx-x710-64b-2t1c-base-ndr"
+    layout: "plot-latency"
 
-# Speedup - VPP IPSec 3n-hsw-xl710 sw
-- type: "plot"
-  title: "Speedup: ipsec-3n-hsw-xl710-64b-sw-ndr-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]}/ipsec-3n-hsw-xl710-64b-sw-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-skx-x710-64b-4t2c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           'IP4FWD' and
+           'BASE' and
            'NDRPDR' and
-           'IPSECSW' and
-           not 'VHOST'"
+           '4T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   layout:
-    title: "ipsec-3n-hsw-xl710-64b-sw-ndr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "testpmd-3n-skx-x710-64b-4t2c-base-ndr"
+    layout: "plot-latency"
 
-- type: "plot"
-  title: "Speedup: ipsec-3n-hsw-xl710-64b-sw-pdr-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]}/ipsec-3n-hsw-xl710-64b-sw-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-skx-xxv710-64b-2t1c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
-           'IP4FWD' and
+           'BASE' and
            'NDRPDR' and
-           'IPSECSW' and
-           not 'VHOST'"
+           '2T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   layout:
-    title: "ipsec-3n-hsw-xl710-64b-sw-pdr"
-    layout: "plot-throughput-speedup-analysis"
-
-################################################################################
+    title: "testpmd-3n-skx-xxv710-64b-2t1c-base-ndr"
+    layout: "plot-latency"
 
-# Speedup - VPP SRv6 3n-hsw-x520
-- type: "plot"
-  title: "Speedup: srv6-3n-hsw-x520-78b-features-ndr-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]}/srv6-3n-hsw-x520-78b-features-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           'FEATURE' and
+  output-file: "{DIR[STATIC,DPDK]}/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
-           'IP6FWD' and
-           'SRv6'"
+           '4T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   layout:
-    title: "srv6-3n-hsw-x520-78b-features-ndr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "testpmd-3n-skx-xxv710-64b-4t2c-base-ndr"
+    layout: "plot-latency"
 
-- type: "plot"
-  title: "Speedup: srv6-3n-hsw-x520-78b-features-pdr-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]}/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,DPDK]}/testpmd-2n-skx-x710-64b-2t1c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'BASE' and
            'NDRPDR' and
-           'IP6FWD' and
-           'SRv6'"
+           '2T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   layout:
-    title: "srv6-3n-hsw-x520-78b-features-pdr"
-    layout: "plot-throughput-speedup-analysis"
-
-################################################################################
+    title: "testpmd-2n-skx-x710-64b-2t1c-base-ndr"
+    layout: "plot-latency"
 
-# 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"
+-
+  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]}/l2sw-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-x710-64b-4t2c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           ('BASE' or 'SCALE') and
+           'BASE' and
            'NDRPDR' and
-           'ETH' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
+           '4T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCFWD"
-  - "L2PATCH"
-  - "L2BDMACLRN"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+  - "latency"
+  - "parent"
+  - "tags"
   layout:
-    title: "l2sw-3n-hsw-x520-64b-base_and_scale-ndr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "testpmd-2n-skx-x710-64b-4t2c-base-ndr"
+    layout: "plot-latency"
 
-- type: "plot"
-  title: "Speedup: l2sw-3n-hsw-x520-64b-base_and_scale-pdr-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]}/l2sw-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-xxv710-64b-2t1c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
-           ('BASE' or 'SCALE') and
+           'BASE' and
            'NDRPDR' and
-           'ETH' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
+           '2T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
-  - "throughput"
+  - "latency"
   - "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"
+    title: "testpmd-2n-skx-xxv710-64b-2t1c-base-ndr"
+    layout: "plot-latency"
 
-# Speedup - VPP L2 3n-hsw-x520 features
-- type: "plot"
-  title: "Speedup: l2sw-3n-hsw-x520-64b-features-ndr-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]}/l2sw-3n-hsw-x520-64b-features-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-xxv710-64b-4t2c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
+           'BASE' and
            'NDRPDR' and
-           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
-           not 'ACL' and
-           not 'VHOST' and
-           not 'MEMIF'"
+           '4T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
-  - "throughput"
+  - "latency"
   - "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"
+    title: "testpmd-2n-skx-xxv710-64b-4t2c-base-ndr"
+    layout: "plot-latency"
 
-- type: "plot"
-  title: "Speedup: l2sw-3n-hsw-x520-64b-features-pdr-tsa"
+################################################################################
+
+## 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"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-features-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,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
+           ('BASE' or 'SCALE') and
            'NDRPDR' 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 'MEMIF'"
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2XCBASE"    # l2xcbase
-  - "L2BDBASE"    # l2bdbase
-  - "L2XCFWD"     # dot1q-l2xcbase
-  - "L2BDMACLRN"  # dot1q-l2bdbase
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "IP4FWD"
   layout:
-    title: "l2sw-3n-hsw-x520-64b-features-pdr"
+    title: "memif-3n-skx-x710-64b-base_and_features-ndr"
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP L2 3n-hsw-x520 features-iacl
-- type: "plot"
-  title: "Speedup: l2sw-3n-hsw-x520-64b-features-iacl-ndr-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]}/l2sw-3n-hsw-x520-64b-features-iacl-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           'NDRPDR' and
+  output-file: "{DIR[STATIC,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
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'IACL' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
-           not 'MACIP' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
-           not 'MEMIF'"
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "IP4FWD"
   layout:
-    title: "l2sw-3n-hsw-x520-64b-features-iacl-ndr"
+    title: "memif-3n-skx-x710-64b-base_and_features-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-- type: "plot"
-  title: "Speedup: l2sw-3n-hsw-x520-64b-features-iacl-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-features-iacl-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           'NDRPDR' and
-           '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"
-  layout:
-    title: "l2sw-3n-hsw-x520-64b-features-iacl-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"
+
+################################################################################
 
-# Speedup - VPP L2 3n-hsw-x520 features-oacl
-- type: "plot"
-  title: "Speedup: l2sw-3n-hsw-x520-64b-features-oacl-ndr-tsa"
+## 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"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-features-oacl-ndr-tsa"
+  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
-           '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'"
+           'NDRPDR' 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"
   layout:
-    title: "l2sw-3n-hsw-x520-64b-features-oacl-ndr"
+    title: "ip4-3n-hsw-x520-64b-features-oacl-ndr"
     layout: "plot-throughput-speedup-analysis"
 
-- type: "plot"
-  title: "Speedup: l2sw-3n-hsw-x520-64b-features-oacl-pdr-tsa"
+-
+  type: "plot"
+  title: "Speedup: ip4-3n-hsw-x520-64b-features-oacl-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-features-oacl-pdr-tsa"
+  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
-           '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'"
+           'NDRPDR' 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"
   layout:
-    title: "l2sw-3n-hsw-x520-64b-features-oacl-pdr"
+    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"
 
-# Speedup - VPP L2 3n-hsw-x520 features-oacl
-- type: "plot"
-  title: "Speedup: l2sw-3n-hsw-x520-64b-features-oacl-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]}/l2sw-3n-hsw-x520-64b-features-oacl-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           'NDRPDR' and
+  output-file: "{DIR[STATIC,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
-           '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'"
+           ('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: "l2sw-3n-hsw-x520-64b-features-oacl-ndr"
+    title: "ip4-3n-skx-x710-64b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
-- type: "plot"
-  title: "Speedup: l2sw-3n-hsw-x520-64b-features-oacl-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]}/l2sw-3n-hsw-x520-64b-features-oacl-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           'NDRPDR' and
+  output-file: "{DIR[STATIC,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
-           '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'"
+           ('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: "l2sw-3n-hsw-x520-64b-features-oacl-pdr"
+    title: "ip4-3n-skx-x710-64b-base_and_scale-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP L2 3n-hsw-x520 features-macip
-- type: "plot"
-  title: "Speedup: l2sw-3n-hsw-x520-64b-features-macip-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]}/l2sw-3n-hsw-x520-64b-features-macip-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           'NDRPDR' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-features-ndr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'MACIP' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
-           not 'VHOST' and
-           not 'MEMIF'"
+           ('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: "l2sw-3n-hsw-x520-64b-features-macip-ndr"
+    title: "ip4-3n-skx-x710-64b-features-ndr"
     layout: "plot-throughput-speedup-analysis"
 
-- type: "plot"
-  title: "Speedup: l2sw-3n-hsw-x520-64b-features-macip-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]}/l2sw-3n-hsw-x520-64b-features-macip-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           'NDRPDR' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-features-pdr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           'FEATURE' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           'MACIP' and
-           ('ACL1' or 'ACL50') and
-           ('10K_FLOWS' or '10k_FLOWS') and
-           not 'VHOST' and
-           not 'MEMIF'"
+           ('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: "l2sw-3n-hsw-x520-64b-features-macip-pdr"
+    title: "ip4-3n-skx-x710-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"
+# 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]}/l2sw-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  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
            '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'"
+           'IP4FWD' and
+           ('NAT44' or 'IP4BASE') and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2PATCH"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+  - "IP4BASE"
+  - "BASE"
+  - "SRC_USER_10"
+  - "SRC_USER_100"
+  - "SRC_USER_1000"
+  - "SRC_USER_2000"
   layout:
-    title: "l2sw-3n-hsw-x710-64b-base_and_scale-ndr"
+    title: "ip4-3n-skx-x710-64b-features-nat44-ndr"
     layout: "plot-throughput-speedup-analysis"
 
-- type: "plot"
-  title: "Speedup: l2sw-3n-hsw-x710-64b-base_and_scale-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]}/l2sw-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  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
            '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'"
+           'IP4FWD' and
+           ('NAT44' or 'IP4BASE') and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2PATCH"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+  - "IP4BASE"
+  - "BASE"
+  - "SRC_USER_10"
+  - "SRC_USER_100"
+  - "SRC_USER_1000"
+  - "SRC_USER_2000"
   layout:
-    title: "l2sw-3n-hsw-x710-64b-base_and_scale-pdr"
+    title: "ip4-3n-skx-x710-64b-features-nat44-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"
+# 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]}/l2sw-3n-hsw-x710-64b-features-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  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
            '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'"
+           'IP4FWD' and
+           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2XCBASE"    # l2xcbase
-  - "L2BDBASE"    # l2bdbase
-  - "L2XCFWD"     # dot1q-l2xcbase
-  - "L2BDMACLRN"  # dot1q-l2bdbase
+  - "IP4BASE"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
   layout:
-    title: "l2sw-3n-hsw-x710-64b-features-ndr"
+    title: "ip4-3n-skx-x710-64b-features-iacl-ndr"
     layout: "plot-throughput-speedup-analysis"
 
-- type: "plot"
-  title: "Speedup: l2sw-3n-hsw-x710-64b-features-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]}/l2sw-3n-hsw-x710-64b-features-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-features-iacl-pdr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
-           not 'ACL' and
-           not 'VHOST' and
-           not 'L2OVRLAY' and
-           not 'MEMIF'"
+           'IP4FWD' and
+           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2XCBASE"    # l2xcbase
-  - "L2BDBASE"    # l2bdbase
-  - "L2XCFWD"     # dot1q-l2xcbase
-  - "L2BDMACLRN"  # dot1q-l2bdbase
+  - "IP4BASE"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
   layout:
-    title: "l2sw-3n-hsw-x710-64b-features-pdr"
+    title: "ip4-3n-skx-x710-64b-features-iacl-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP L2 3n-hsw-x710 features-iacl
-- type: "plot"
-  title: "Speedup: l2sw-3n-hsw-x710-64b-features-iacl-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]}/l2sw-3n-hsw-x710-64b-features-iacl-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  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
-           'NDRPDR' 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'"
+           'NDRPDR' and
+           'IP4FWD' and
+           'OACL' and
+           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
   layout:
-    title: "l2sw-3n-hsw-x710-64b-features-iacl-ndr"
+    title: "ip4-3n-skx-x710-64b-features-oacl-ndr"
     layout: "plot-throughput-speedup-analysis"
 
-- type: "plot"
-  title: "Speedup: l2sw-3n-hsw-x710-64b-features-iacl-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]}/l2sw-3n-hsw-x710-64b-features-iacl-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  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
-           'NDRPDR' 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'"
+           'NDRPDR' and
+           'IP4FWD' and
+           'OACL' and
+           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
   layout:
-    title: "l2sw-3n-hsw-x710-64b-features-iacl-pdr"
+    title: "ip4-3n-skx-x710-64b-features-oacl-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"
+## 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"
+
+################################################################################
+
+## 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"
   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
+  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
-           'BASE' and
+           'ENCAP' and
            'NDRPDR' and
-           'ETH' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
            not 'VHOST' and
-           not 'MEMIF'"
+           not 'IPSECHW'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2PATCH"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
+  - "IP4BASE"
+  - "LISP"
+  - "VXLAN_1"
+  - "VXLAN_10"
+  - "VXLAN_100"
+  - "VXLAN_1000"
   layout:
-    title: "l2sw-3n-hsw-xl710-64b-base-ndr"
+    title: "ip4tun-3n-skx-x710-64b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
-- type: "plot"
-  title: "Speedup: l2sw-3n-hsw-xl710-64b-base-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]}/l2sw-3n-hsw-xl710-64b-base-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,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
-           'BASE' and
+           'ENCAP' and
            'NDRPDR' and
-           'ETH' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
            not 'VHOST' and
-           not 'MEMIF'"
+           not 'IPSECHW'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2PATCH"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
+  - "IP4BASE"
+  - "LISP"
+  - "VXLAN_1"
+  - "VXLAN_10"
+  - "VXLAN_100"
+  - "VXLAN_1000"
   layout:
-    title: "l2sw-3n-hsw-xl710-64b-base-pdr"
+    title: "ip4tun-3n-skx-x710-64b-base_and_scale-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP L2 3n-skx-x710 base and scale
-- type: "plot"
-  title: "Speedup: l2sw-3n-skx-x710-64b-base_and_scale-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]}/l2sw-3n-skx-x710-64b-base_and_scale-ndr-tsa"
+  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
-           ('BASE' or 'SCALE') and
+           'ENCAP' and
            'NDRPDR' and
-           'ETH' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
+           not 'DOT1Q' and
            not 'VHOST' and
-           not 'DRV_AVF' and
-           not 'MEMIF'"
+           not 'IPSECHW'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+  - "IP4BASE"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "LISP"
   layout:
-    title: "l2sw-3n-skx-x710-64b-base_and_scale-ndr"
+    title: "ip4tun-3n-skx-x710-64b-base_and_features-ndr"
     layout: "plot-throughput-speedup-analysis"
 
-- type: "plot"
-  title: "Speedup: l2sw-3n-skx-x710-64b-base_and_scale-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]}/l2sw-3n-skx-x710-64b-base_and_scale-pdr-tsa"
+  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
-           ('BASE' or 'SCALE') and
+           'ENCAP' and
            'NDRPDR' and
-           'ETH' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
+           not 'DOT1Q' and
            not 'VHOST' and
-           not 'DRV_AVF' and
-           not 'MEMIF'"
+           not 'IPSECHW'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+  - "IP4BASE"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "LISP"
   layout:
-    title: "l2sw-3n-skx-x710-64b-base_and_scale-pdr"
+    title: "ip4tun-3n-skx-x710-64b-base_and_features-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP L2 3n-skx-x710 features
-- type: "plot"
-  title: "Speedup: l2sw-3n-skx-x710-64b-features-ndr-tsa"
+################################################################################
+
+## 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"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-features-ndr-tsa"
+  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
-           '64B' and
+           '78B' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
-           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
-           not 'ACL' and
-           not 'VHOST' and
-           not 'DRV_AVF' and
-           not 'L2OVRLAY' and
-           not 'MEMIF'"
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2XCBASE"    # l2xcbase
-  - "L2BDBASE"    # l2bdbase
-  - "L2XCFWD"     # dot1q-l2xcbase
-  - "L2BDMACLRN"  # dot1q-l2bdbase
+  - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   layout:
-    title: "l2sw-3n-skx-x710-64b-features-ndr"
+    title: "ip6-3n-skx-x710-78b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
-- type: "plot"
-  title: "Speedup: l2sw-3n-skx-x710-64b-features-pdr-tsa"
+-
+  type: "plot"
+  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-skx-x710-64b-features-pdr-tsa"
+  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
-           '64B' and
+           '78B' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
-           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
-           not 'ACL' and
-           not 'VHOST' and
-           not 'DRV_AVF' and
-           not 'L2OVRLAY' and
-           not 'MEMIF'"
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2XCBASE"    # l2xcbase
-  - "L2BDBASE"    # l2bdbase
-  - "L2XCFWD"     # dot1q-l2xcbase
-  - "L2BDMACLRN"  # dot1q-l2bdbase
+  - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   layout:
-    title: "l2sw-3n-skx-x710-64b-features-pdr"
+    title: "ip6-3n-skx-x710-78b-base_and_scale-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP L2 3n-skx-x710 features-iacl
-- type: "plot"
-  title: "Speedup: l2sw-3n-skx-x710-64b-features-iacl-ndr-tsa"
+# Speedup - VPP IPv6 3n-skx-x710 features
+-
+  type: "plot"
+  title: "Speedup: ip6-3n-skx-x710-78b-base_and_features-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-features-iacl-ndr-tsa"
+  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
-           'IACL' 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"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACLDST"
   layout:
-    title: "l2sw-3n-skx-x710-64b-features-iacl-ndr"
+    title: "ip6-3n-skx-x710-78b-base_and_features-ndr"
     layout: "plot-throughput-speedup-analysis"
 
-- type: "plot"
-  title: "Speedup: l2sw-3n-skx-x710-64b-features-iacl-pdr-tsa"
+-
+  type: "plot"
+  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-skx-x710-64b-features-iacl-pdr-tsa"
+  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
-           'IACL' 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"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACLDST"
   layout:
-    title: "l2sw-3n-skx-x710-64b-features-iacl-pdr"
+    title: "ip6-3n-skx-x710-78b-base_and_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_and_scale-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-base_and_scale-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'ETH' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'DRV_AVF' and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
+## 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:
-#  - "L2PATCH"
-#  - "L2PATCH"
-#  - "L2XCBASE"
-#  - "L2BDMACLRN"
-  layout:
-    title: "l2sw-3n-skx-xxv710-64b-base_and_scale-ndr"
-    layout: "plot-throughput-speedup-analysis"
+#  - "IP6BASE"
+#  layout:
+#    title: "ip6-2n-dnv-x553-78b-base-pdr"
+#    layout: "plot-throughput-speedup-analysis"
 
-- type: "plot"
-  title: "Speedup: l2sw-3n-skx-xxv710-64b-base_and_scale-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-base_and_scale-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'ETH' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'DRV_AVF' and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "L2PATCH"
-#  - "L2PATCH"
-#  - "L2XCBASE"
-#  - "L2BDMACLRN"
-  layout:
-    title: "l2sw-3n-skx-xxv710-64b-base_and_scale-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"
+## 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"
+#
+#################################################################################
 
-- type: "plot"
-  title: "Speedup: l2sw-2n-skx-x710-64b-base_and_scale-pdr-tsa"
+# Speedup - VPP IPSec 3n-hsw-xl710 base
+-
+  type: "plot"
+  title: "Speedup: ipsec-3n-hsw-xl710-64b-base-ndr-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
+  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
            '64B' and
-           ('BASE' or 'SCALE') and
+           'IP4FWD' and
            'NDRPDR' and
-           'ETH' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
+           'BASE' and
+           'IPSECHW' and
+           not 'VHOST'"
   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"
+    title: "ipsec-3n-hsw-xl710-64b-base-ndr"
     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"
+-
+  type: "plot"
+  title: "Speedup: ipsec-3n-hsw-xl710-64b-base-pdr-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
+  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
            '64B' and
-           ('BASE' or 'SCALE') and
+           'IP4FWD' and
            'NDRPDR' and
-           'ETH' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
+           'BASE' and
+           'IPSECHW' and
+           not 'VHOST'"
   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"
+    title: "ipsec-3n-hsw-xl710-64b-base-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-- type: "plot"
-  title: "Speedup: l2sw-2n-skx-xxv710-64b-base_and_scale-pdr-tsa"
+# Speedup - VPP IPSec 3n-hsw-xl710 scale
+-
+  type: "plot"
+  title: "Speedup: ipsec-3n-hsw-xl710-64b-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-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  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
            '64B' and
-           ('BASE' or 'SCALE') and
+           'IP4FWD' and
            'NDRPDR' and
-           'ETH' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
+           'SCALE' and
+           'IPSECHW' and
+           not 'VHOST'"
   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"
+    title: "ipsec-3n-hsw-xl710-64b-scale-ndr"
     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"
+-
+  type: "plot"
+  title: "Speedup: ipsec-3n-hsw-xl710-64b-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-ndr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-scale-pdr-tsa"
   data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  filter: "'NIC_Intel-XL710' and
            '64B' and
-           'NDRPDR' and
-           'ETH' and
            'IP4FWD' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'DOT1Q'"
+           'NDRPDR' and
+           'SCALE' and
+           'IPSECHW' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "1VM"
-  - "2VM"
   layout:
-    title: "vhost-ip4-3n-hsw-x520-64b-base_and_scale-ndr"
+    title: "ipsec-3n-hsw-xl710-64b-scale-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-- type: "plot"
-  title: "VPP Speedup: vhost-ip4-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
+# Speedup - VPP IPSec 3n-hsw-xl710 sw
+-
+  type: "plot"
+  title: "Speedup: ipsec-3n-hsw-xl710-64b-sw-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-pdr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-sw-ndr-tsa"
   data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  filter: "'NIC_Intel-XL710' and
            '64B' and
-           'NDRPDR' and
-           'ETH' and
            'IP4FWD' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'DOT1Q'"
+           'NDRPDR' and
+           'IPSECSW' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "1VM"
-  - "2VM"
   layout:
-    title: "vhost-ip4-3n-hsw-x520-64b-base_and_scale-pdr"
+    title: "ipsec-3n-hsw-xl710-64b-sw-ndr"
     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"
+-
+  type: "plot"
+  title: "Speedup: ipsec-3n-hsw-xl710-64b-sw-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-ndr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-sw-pdr-tsa"
   data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  filter: "'NIC_Intel-XL710' and
            '64B' and
+           'IP4FWD' and
            'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           'BASE' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
+           'IPSECSW' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
   layout:
-    title: "vhost-l2sw-3n-hsw-x520-64b-base_and_features-ndr"
+    title: "ipsec-3n-hsw-xl710-64b-sw-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-- type: "plot"
-  title: "VPP Speedup: vhost-l2sw-3n-hsw-x520-64b-base_and_features-pdr-tsa"
+################################################################################
+
+# Speedup - VPP SRv6 3n-hsw-x520
+-
+  type: "plot"
+  title: "Speedup: srv6-3n-hsw-x520-78b-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-pdr-tsa"
+  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
-           '64B' and
+           '78B' and
+           'FEATURE' and
            'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           'BASE' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
+           'IP6FWD' and
+           'SRv6'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
   layout:
-    title: "vhost-l2sw-3n-hsw-x520-64b-base_and_features-pdr"
+    title: "srv6-3n-hsw-x520-78b-features-ndr"
     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"
+-
+  type: "plot"
+  title: "Speedup: srv6-3n-hsw-x520-78b-features-pdr-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"
+  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
-           '64B' and
+           '78B' and
+           'FEATURE' 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'"
+           'IP6FWD' and
+           'SRv6'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  layout:
+    title: "srv6-3n-hsw-x520-78b-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:
-#  - "1VM"
 #  - "L2XCFWD"
-#  - "1VM"
+#  - "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: "vhost-l2sw-3n-hsw-x520-64b-base-vm-ndr"
-    layout: "plot-throughput-speedup-analysis"
+#  layout:
+#    title: "l2sw-3n-hsw-xl710-64b-base-pdr"
+#    layout: "plot-throughput-speedup-analysis"
 
+# Speedup - VPP L2 3n-hsw-x520 features-oacl
 - type: "plot"
-  title: "VPP Speedup: vhost-l2sw-3n-hsw-x520-64b-base-vm-pdr-tsa"
+  title: "Speedup: l2sw-3n-hsw-x520-64b-features-oacl-ndr-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"
+  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
-           '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'"
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'OACL' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
+           not 'MACIP' and
+           not 'VHOST' and
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "1VM"
-  - "2VM"
   layout:
-    title: "vhost-ip4-3n-hsw-x710-64b-base_and_scale-ndr"
+    title: "l2sw-3n-hsw-x520-64b-features-oacl-ndr"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "VPP Speedup: vhost-ip4-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
+  title: "Speedup: l2sw-3n-hsw-x520-64b-features-oacl-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"
+  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-X710' and
-           '64B' and
+  filter: "'NIC_Intel-X520-DA2' 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'"
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'OACL' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
+           not 'MACIP' and
+           not 'VHOST' and
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
   layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-base_and_features-ndr"
+    title: "l2sw-3n-hsw-x520-64b-features-oacl-pdr"
     layout: "plot-throughput-speedup-analysis"
 
+# Speedup - VPP L2 3n-hsw-x520 features-macip
 - type: "plot"
-  title: "VPP Speedup: vhost-l2sw-3n-hsw-x710-64b-base_and_features-pdr-tsa"
+  title: "Speedup: l2sw-3n-hsw-x520-64b-features-macip-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-pdr-tsa"
+  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-X710' and
-           '64B' and
+  filter: "'NIC_Intel-X520-DA2' and
            'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           'BASE' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
+           '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'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
   layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-base_and_features-pdr"
+    title: "l2sw-3n-hsw-x520-64b-features-macip-ndr"
     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"
+  title: "Speedup: l2sw-3n-hsw-x520-64b-features-macip-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-ndr-tsa"
+  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-X710' and
-           '64B' and
+  filter: "'NIC_Intel-X520-DA2' 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'"
+           '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'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
   layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-base_and_features-vm-ndr"
+    title: "l2sw-3n-hsw-x520-64b-features-macip-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-- type: "plot"
-  title: "VPP Speedup: vhost-l2sw-3n-hsw-x710-64b-base_and_features-vm-pdr-tsa"
+# Speedup - VPP L2 3n-skx-x710 base and scale
+-
+  type: "plot"
+  title: "Speedup: l2sw-3n-skx-x710-64b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   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"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-base_and_scale-ndr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
+           ('BASE' or 'SCALE') 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'"
+           'ETH' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           not 'DRV_AVF' and
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-base_and_features-vm-pdr"
+    title: "l2sw-3n-skx-x710-64b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
-# Packet Speedup - VPP vhost ip4 3n-skx-x710
-- type: "plot"
-  title: "VPP Speedup: vhost-ip4-3n-skx-x710-64b-base_and_scale-ndr-tsa"
+-
+  type: "plot"
+  title: "Speedup: l2sw-3n-skx-x710-64b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-skx-x710-64b-base_and_scale-ndr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-base_and_scale-pdr-tsa"
   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
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'DOT1Q'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           not 'DRV_AVF' and
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "1VM"
-  - "2VM"
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   layout:
-    title: "vhost-ip4-3n-skx-x710-64b-base_and_scale-ndr"
+    title: "l2sw-3n-skx-x710-64b-base_and_scale-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-- type: "plot"
-  title: "VPP Speedup: vhost-ip4-3n-skx-x710-64b-base_and_scale-pdr-tsa"
+# Speedup - VPP L2 3n-skx-x710 features
+-
+  type: "plot"
+  title: "Speedup: l2sw-3n-skx-x710-64b-features-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-skx-x710-64b-base_and_scale-pdr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-features-ndr-tsa"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'DOT1Q'"
+           (('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:
-  - "1VM"
-  - "2VM"
+  - "L2XCBASE"    # l2xcbase
+  - "L2BDBASE"    # l2bdbase
+  - "L2XCFWD"     # dot1q-l2xcbase
+  - "L2BDMACLRN"  # dot1q-l2bdbase
   layout:
-    title: "vhost-ip4-3n-skx-x710-64b-base_and_scale-pdr"
+    title: "l2sw-3n-skx-x710-64b-features-ndr"
     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"
+-
+  type: "plot"
+  title: "Speedup: l2sw-3n-skx-x710-64b-features-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-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'"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-features-pdr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'NDRPDR' and
+           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
+           not 'ACL' and
+           not 'VHOST' and
+           not 'DRV_AVF' and
+           not 'L2OVRLAY' and
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "1VM"
-  - "2VM"
+  - "L2XCBASE"    # l2xcbase
+  - "L2BDBASE"    # l2bdbase
+  - "L2XCFWD"     # dot1q-l2xcbase
+  - "L2BDMACLRN"  # dot1q-l2bdbase
   layout:
-    title: "vhost-ip4-2n-skx-x710-64b-base_and_scale-ndr"
+    title: "l2sw-3n-skx-x710-64b-features-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-- type: "plot"
-  title: "VPP Speedup: vhost-ip4-2n-skx-x710-64b-base_and_scale-pdr-tsa"
+# Speedup - VPP L2 3n-skx-xxv710 base and scale
+-
+  type: "plot"
+  title: "Speedup: l2sw-3n-skx-xxv710-64b-base-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-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-base-ndr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
            'ETH' and
-           'IP4FWD' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'NF_DENSITY' and
-           not 'CFS_OPT' and
-           not 'DOT1Q'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "1VM"
-  - "2VM"
+  - "L2PATCH"
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "L2BDMACLRN"
   layout:
-    title: "vhost-ip4-2n-skx-x710-64b-base_and_scale-pdr"
+    title: "l2sw-3n-skx-xxv710-64b-base-ndr"
     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"
+-
+  type: "plot"
+  title: "Speedup: l2sw-3n-skx-xxv710-64b-base-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-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-base-pdr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
+           ('BASE' or 'SCALE') 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'"
+           'ETH' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "L2PATCH"
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "L2BDMACLRN"
+  layout:
+    title: "l2sw-3n-skx-xxv710-64b-base-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:
-#  - "not CFS_OPT"
+#  - "L2BDMACLRN"
+#  - "L2BDMACLRN"
+#  - "L2BDMACLRN"
 #  - "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"
+#  - "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:
-#  - "not CFS_OPT"
+#  - "L2BDMACLRN"
+#  - "L2BDMACLRN"
+#  - "L2BDMACLRN"
 #  - "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"
+#  - "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"
-#  - "L2XCFWD"
+#  - "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"
-  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"
+#  - "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:
-#  - "1VM"
+#  - "L2BDMACLRN"
+#  - "L2BDMACLRN"
+#  - "L2BDMACLRN"
 #  - "L2XCFWD"
-#  - "1VM"
+#  - "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"
-  layout:
-    title: "vhost-l2sw-2n-skx-x710-64b-base-vm-pdr"
-    layout: "plot-throughput-speedup-analysis"
+#  - "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 2n-skx-xxv710
-- type: "plot"
-  title: "VPP Speedup: vhost-ip4-2n-skx-xxv710-64b-base_and_scale-ndr-tsa"
+# Packet Speedup - VPP vhost ip4 3n-skx-x710
+-
+  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"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-xxv710-64b-base_and_scale-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/vhost-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
            '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"
+    title: "vhost-ip4-3n-skx-x710-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"
+-
+  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"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-xxv710-64b-base_and_scale-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/vhost-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
            '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"
+    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"
+#-
+#  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"
 #    title: "vhost-l2sw-2n-skx-xxv710-64b-base_and_features-ndr"
 #    layout: "plot-throughput-speedup-analysis"
 #
-#- type: "plot"
+#-
+#  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"
 #    layout: "plot-throughput-speedup-analysis"
 #
 ## Packet Speedup - VPP vhost l2sw 2n-skx-xxv710 - base vm
-#- type: "plot"
+#-
+#  type: "plot"
 #  title: "VPP Speedup: vhost-l2sw-2n-skx-xxv710-64b-base-vm-ndr-tsa"
 #  algorithm: "plot_throughput_speedup_analysis"
 #  output-file-type: ".html"
 #    title: "vhost-l2sw-2n-skx-xxv710-64b-base-vm-ndr"
 #    layout: "plot-throughput-speedup-analysis"
 #
-#- type: "plot"
+#-
+#  type: "plot"
 #  title: "VPP Speedup: vhost-l2sw-2n-skx-xxv710-64b-base-vm-pdr-tsa"
 #  algorithm: "plot_throughput_speedup_analysis"
 #  output-file-type: ".html"
 #    title: "vhost-l2sw-2n-skx-xxv710-64b-base-vm-pdr"
 #    layout: "plot-throughput-speedup-analysis"
 
-################################################################################
+###############################################################################
 
 # Speedup - VPP vts 3n-hsw-x520
-- type: "plot"
+-
+  type: "plot"
   title: "VPP Speedup: vts-3n-hsw-x520-114b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
     title: "vts-3n-hsw-x520-114b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
-- type: "plot"
+-
+  type: "plot"
   title: "VPP Speedup: vts-3n-hsw-x520-114b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"