X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fspecification.yaml;h=a579f21d9e7f94153577833d2b5fc8be69bce236;hp=a02ce84e0e533f28024b5b0d629b432e29852606;hb=ad4f18fdb7b46c3c2b95813c1fdbe428295ef61b;hpb=c33172ceb416c8bf05f34dab93ba8fd9190fc2af

diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml
index a02ce84e0e..a579f21d9e 100644
--- a/resources/tools/presentation/specification.yaml
+++ b/resources/tools/presentation/specification.yaml
@@ -1,5 +1,4 @@
--
-  type: "environment"
+- type: "environment"
 
   paths:
     # Top level directories:
@@ -33,9 +32,11 @@
     DIR[DTR,PERF,VPP,3N,HSW]: "{DIR[DTR]}/vpp_performance_results_3n_hsw"
     DIR[DTR,PERF,VPP,3N,SKX]: "{DIR[DTR]}/vpp_performance_results_3n_skx"
     DIR[DTR,PERF,VPP,2N,SKX]: "{DIR[DTR]}/vpp_performance_results_2n_skx"
+    DIR[DTR,PERF,VPP,2N,DNV]: "{DIR[DTR]}/vpp_performance_results_2n_dnv"
     DIR[DTR,MRR,VPP,3N,HSW]: "{DIR[DTR]}/vpp_mrr_results_3n_hsw"
     DIR[DTR,MRR,VPP,3N,SKX]: "{DIR[DTR]}/vpp_mrr_results_3n_skx"
     DIR[DTR,MRR,VPP,2N,SKX]: "{DIR[DTR]}/vpp_mrr_results_2n_skx"
+    DIR[DTR,MRR,VPP,2N,DNV]: "{DIR[DTR]}/vpp_mrr_results_2n_dnv"
     DIR[DTR,PERF,COT,3N,HSW]: "{DIR[DTR]}/cot_performance_results_3n_hsw"
     DIR[DTR,FUNC,VPP,UBUNTU]: "{DIR[DTR]}/vpp_functional_results_ubuntu"
     DIR[DTR,FUNC,VPP,CENTOS]: "{DIR[DTR]}/vpp_functional_results_centos"
@@ -50,9 +51,11 @@
     DIR[DTC,PERF,VPP,3N,HSW]: "{DIR[DTC]}/vpp_performance_configuration_3n_hsw"
     DIR[DTC,PERF,VPP,3N,SKX]: "{DIR[DTC]}/vpp_performance_configuration_3n_skx"
     DIR[DTC,PERF,VPP,2N,SKX]: "{DIR[DTC]}/vpp_performance_configuration_2n_skx"
+    DIR[DTC,PERF,VPP,2N,DNV]: "{DIR[DTC]}/vpp_performance_configuration_2n_dnv"
     DIR[DTC,MRR,VPP,3N,HSW]: "{DIR[DTC]}/vpp_mrr_configuration_3n_hsw"
     DIR[DTC,MRR,VPP,3N,SKX]: "{DIR[DTC]}/vpp_mrr_configuration_3n_skx"
     DIR[DTC,MRR,VPP,2N,SKX]: "{DIR[DTC]}/vpp_mrr_configuration_2n_skx"
+    DIR[DTC,MRR,VPP,2N,DNV]: "{DIR[DTC]}/vpp_mrr_configuration_2n_dnv"
     DIR[DTC,FUNC,VPP,UBUNTU]: "{DIR[DTC]}/vpp_functional_configuration_ubuntu"
     DIR[DTC,FUNC,VPP,CENTOS]: "{DIR[DTC]}/vpp_functional_configuration_centos"
     DIR[DTC,FUNC,VPP,DEVICE,UBUNTU]: "{DIR[DTC]}/vpp_device_configuration_ubuntu"
@@ -62,6 +65,7 @@
     DIR[DTO,PERF,VPP,3N,HSW]: "{DIR[DTO]}/vpp_performance_operational_data_3n_hsw"
     DIR[DTO,PERF,VPP,3N,SKX]: "{DIR[DTO]}/vpp_performance_operational_data_3n_skx"
     DIR[DTO,PERF,VPP,2N,SKX]: "{DIR[DTO]}/vpp_performance_operational_data_2n_skx"
+    DIR[DTO,PERF,VPP,2N,DNV]: "{DIR[DTO]}/vpp_performance_operational_data_2n_dnv"
 
     # .css patch file to fix tables generated by Sphinx
     DIR[CSS_PATCH_FILE]: "{DIR[STATIC]}/theme_overrides.css"
@@ -70,6 +74,8 @@
   urls:
     URL[JENKINS,CSIT]: "https://jenkins.fd.io/view/csit/job"
     URL[JENKINS,HC]: "https://jenkins.fd.io/view/hc2vpp/job"
+    URL[VIRL,DNV]: "http://10.30.51.28/download/denverton/{release}/robot-plugin.zip"
+    # URL[VIRL,DNV]: "http://download.it/from/nexus"
     URL[NEXUS]: "https://docs.fd.io/csit"
     DIR[NEXUS]: "report/_static/archive"
 
@@ -96,12 +102,12 @@
   - "DIR[BUILD,HTML]"
   - "DIR[BUILD,LATEX]"
 
--
-  type: "configuration"
+- type: "configuration"
 
   limits:
     nic:
       x520: 24460000
+      x553: 29761905
       x710: 35800000
       xxv710: 35800000
       xl710: 35800000
@@ -118,406 +124,756 @@
 
   data-sets:
 
-    # VPP Performance
-    vpp-performance-changes:
-      csit-vpp-perf-1804-all:
-      - 21  # sel
-      - 22  # sel
-      - 23  # sel
-      - 24  # sel
-      - 27  # sel
-      - 28  # sel
-      - 29  # sel
-      - 30  # sel
-      - 31  # sel
-      - 35  # sel
-      csit-vpp-perf-verify-1807-3n-hsw:
-      - 11  # NDRPDR full 1
-      - 22  # NDRPDR full 2
-      - 45  # NDRPDR full 3
-      - 46  # NDRPDR full 4
-      - 15  # NDRPDR sel
-      - 16  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 18  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 38  # NDRPDR sel
-      - 40  # NDRPDR sel
-      - 44  # NDRPDR sel
-      - 47  # NDRPDR sel
-      csit-vpp-perf-verify-1810-3n-hsw:
-      - 8   # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 14  # NDRPDR sel
-      - 18  # NDRPDR sel
-      - 23  # NDRPDR sel
-      - 25  # NDRPDR sel
-      - 38  # NDRPDR sel
-      - 39  # NDRPDR sel
-      - 41  # NDRPDR sel
-      - 42  # NDRPDR sel
+    ###########################################################################
+    # Plots:
 
-    vpp-compare-testbeds:
-      csit-vpp-perf-verify-1810-3n-hsw:
-      - 8   # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 14  # NDRPDR sel
-      - 18  # NDRPDR sel
-      - 23  # NDRPDR sel
-      - 25  # NDRPDR sel
-      - 38  # NDRPDR sel
-      - 39  # NDRPDR sel
-      - 41  # NDRPDR sel
-      - 42  # NDRPDR sel
-      csit-vpp-perf-verify-1810-3n-skx:
-      - 24  # NDRPDR full
-      - 10  # NDRPDR sel
-      - 14  # NDRPDR sel
-      - 15  # NDRPDR sel
-      - 16  # NDRPDR sel
-      - 17  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 21  # NDRPDR sel
-      - 22  # NDRPDR sel
-      - 25  # NDRPDR sel
+    # 3n-hsw
 
-    vpp-compare-testbeds-mrr:
-      csit-vpp-perf-verify-1810-3n-hsw:
-      - 9   # MRR sel
-      csit-vpp-perf-verify-1810-3n-skx:
-      - 9   # MRR sel
-      - 11  # MRR sel
-      - 12  # MRR sel
-      - 13  # MRR sel
+    plot-vpp-throughput-lat-tsa-3n-hsw:
+      # TODO: Add 1904 data
+      csit-vpp-perf-verify-1904-3n-hsw:
+        - 12   # NDRPDR sel
 
-    vpp-performance-changes-mrr:
-      csit-vpp-perf-check-1804:
-      - 6   # mrr - sel
-      - 13  # mrr - sel
-      - 14  # mrr - sel
-      - 15  # mrr - sel
-      - 16  # mrr - sel
-      - 17  # mrr - sel
-      - 19  # mrr - sel
-      - 20  # mrr - sel
-      - 21  # mrr - sel
-      - 22  # mrr - sel
-      csit-vpp-perf-verify-1807-3n-hsw:
-      - 8   # MRR full
-      - 9   # MRR sel
-      - 21  # MRR sel
-      - 31  # MRR sel
-      - 33  # MRR sel
-      - 36  # MRR sel
-      - 41  # MRR sel
-      - 42  # MRR sel
-      - 48  # MRR sel
+    plot-vpp-http-server-performance:
+      # TODO: Replace with 1904 data
+      # csit-vpp-perf-verify-1904-3n-hsw:
       csit-vpp-perf-verify-1810-3n-hsw:
-      - 9   # MRR sel
+        - 28  # WRK
+        - 29  # WRK
+        - 30  # WRK
+        - 31  # WRK
+        - 32  # WRK
+        - 33  # WRK
+        - 34  # WRK
+        - 35  # WRK
+        - 36  # WRK
+        - 37  # WRK
+
+    plot-ligato-throughput-lat-tsa-3n-hsw:
+      # TODO: Replace with 1904 data
+      # csit-ligato-perf-verify-1904-3n-hsw:
+      csit-ligato-perf-verify-1901-3n-hsw:
+        - 8   # NDRPDR sel
+        - 9   # NDRPDR sel
+        - 11  # NDRPDR sel
+        - 12  # NDRPDR sel
+        - 13  # NDRPDR sel
+        - 14  # NDRPDR sel
+        - 15  # NDRPDR sel
+        - 16  # NDRPDR sel
+        - 17  # NDRPDR sel
+        - 18  # NDRPDR sel
+
+    plot-dpdk-throughput-latency-3n-hsw:
+      # TODO: Add 1904 data
+      csit-dpdk-perf-verify-1904-3n-hsw:
+        - 2   # NDRPDR sel
+        - 3   # NDRPDR sel
+        - 5   # NDRPDR sel
+
+    # 3n-skx
+
+    plot-vpp-throughput-lat-tsa-3n-skx:
+      # TODO: Add 1904 data
+      csit-vpp-perf-verify-1904-3n-skx:
+        - 8   # NDRPDR sel
+        - 9   # NDRPDR sel
+        - 10  # NDRPDR sel
+        - 11  # NDRPDR sel
+        - 12  # NDRPDR sel
+
+    plot-dpdk-throughput-latency-3n-skx:
+      # TODO: Add 1904 data
+      csit-dpdk-perf-verify-1904-3n-skx:
+        - 2   # NDRPDR sel
+        - 3   # NDRPDR sel
+        - 4   # NDRPDR sel
+        - 5   # NDRPDR sel
+        - 6   # NDRPDR sel
+
+    # 2n-skx
+
+    plot-vpp-throughput-lat-tsa-2n-skx:
+      # TODO: Add 1904 data
+      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
+
+    plot-vpp-soak-2n-skx:
+      # TODO: Replace with 1904 data
+      # csit-vpp-perf-verify-1904-2n-skx:
+      csit-vpp-perf-verify-1901-2n-skx:
+        - 45  # SOAK sel
+
+    plot-vpp-nfv-2n-skx:
+      # TODO: Add 1904 data
+      csit-vpp-perf-verify-1904-2n-skx:
+        - 9   # NFV NDRPDR
+
+    plot-vpp-nfv-2n-skx-mrr:
+      # TODO: Add 1904 data
+      csit-vpp-perf-verify-1904-2n-skx:
+        - 10  # NFV MRR
+
+    plot-dpdk-throughput-latency-2n-skx:
+      # TODO: Add 1904 data
+      csit-dpdk-perf-verify-1904-2n-skx:
+        - 2   # NDRPDR sel
+        - 3   # NDRPDR sel
+        - 4   # NDRPDR sel
+        - 5   # NDRPDR sel
+        - 7   # NDRPDR sel
+        - 8   # NDRPDR sel
+        - 9   # NDRPDR sel
+        - 10  # NDRPDR sel
+        - 11  # NDRPDR sel
+
+    # 3rd party
+
+    # Denverton:
+    intel-dnv-vpp:
+      # TODO: Replace with 1904 data
+      # intel-dnv-vpp-release-1904:
+      intel-dnv-vpp-release-1901:
+        - 1
+
+    ###########################################################################
+    # Simple tables (only one data set):
+
+    # NIC Comparisons
+
+    vpp-nic-comparison-3n-hsw:
+      # TODO: Add 1904 data
+      csit-vpp-perf-verify-1904-3n-hsw:
+        - 12   # NDRPDR sel
+
+    vpp-nic-comparison-3n-skx:
+      # TODO: Add 1904 data
+      csit-vpp-perf-verify-1904-3n-skx:
+        - 8   # NDRPDR sel
+        - 9   # NDRPDR sel
+        - 10  # NDRPDR sel
+        - 11  # NDRPDR sel
+        - 12  # NDRPDR sel
+
+    vpp-nic-comparison-2n-skx:
+      # TODO: Add 1904 data
+      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
+
+    vpp-nic-comparison-3n-hsw-mrr:
+      csit-vpp-perf-verify-1904-3n-hsw:
+        - 1   # 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
+
+    # Results
 
     vpp-perf-results-3n-hsw:
-      csit-vpp-perf-verify-1810-3n-hsw:
-      - 20  # NDRPDR full
-      - 21  # NDRPDR full
-      - 22  # NDRPDR full
-      - 27  # NDRPDR full
+      # TODO: Replace with 1904 data
+      # csit-vpp-perf-verify-1904-3n-hsw:
+      csit-vpp-perf-verify-1901-3n-hsw:
+        - 38  # NDRPDR full
+        - 43  # NDRPDR full
+        - 45  # NDRPDR full
+        - 49  # NDRPDR full
 
     vpp-perf-results-3n-skx:
-      csit-vpp-perf-verify-1810-3n-skx:
-      - 23  # NDRPDR full
-      - 24  # NDRPDR full
+      # TODO: Replace with 1904 data
+      # csit-vpp-perf-verify-1904-3n-skx:
+      csit-vpp-perf-verify-1901-3n-skx:
+        - 37  # NDRPDR full
+        - 39  # NDRPDR full
+        - 40  # NDRPDR full
+        - 49  # NDRPDR full
 
     vpp-perf-results-2n-skx:
-      csit-vpp-perf-verify-1810-2n-skx:
-      - 25  # NDRPDR full
-      - 26  # NDRPDR full
+      # TODO: Replace with 1904 data
+      # csit-vpp-perf-verify-1904-2n-skx:
+      csit-vpp-perf-verify-1901-2n-skx:
+        - 25  # NDRPDR full
+        - 30  # NDRPDR full
+        - 33  # NDRPDR full
+        - 44  # NDRPDR full
 
     vpp-mrr-results-3n-hsw:
-      csit-vpp-perf-verify-1810-3n-hsw:
-      - 9   # MRR sel
+      csit-vpp-perf-verify-1904-3n-hsw:
+        - 1   # MRR sel
 
     vpp-mrr-results-3n-skx:
-      csit-vpp-perf-verify-1810-3n-skx:
-      - 9   # MRR sel
+      csit-vpp-perf-verify-1904-3n-skx:
+        - 7   # MRR sel
 
     vpp-mrr-results-2n-skx:
-      csit-vpp-perf-verify-1810-2n-skx:
-      - 8   # MRR sel
-
-    plot-throughput-speedup-analysis-3n-hsw:
-      csit-vpp-perf-verify-1810-3n-hsw:
-      - 8   # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 14  # NDRPDR sel
-      - 18  # NDRPDR sel
-      - 23  # NDRPDR sel
-      - 25  # NDRPDR sel
-      - 38  # NDRPDR sel
-      - 39  # NDRPDR sel
-      - 41  # NDRPDR sel
-      - 42  # NDRPDR sel
-
-    plot-throughput-speedup-analysis-3n-skx:
-      csit-vpp-perf-verify-1810-3n-skx:
-      - 24  # NDRPDR full
-      - 10  # NDRPDR sel
-      - 14  # NDRPDR sel
-      - 15  # NDRPDR sel
-      - 16  # NDRPDR sel
-      - 17  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 21  # NDRPDR sel
-      - 22  # NDRPDR sel
-      - 25  # NDRPDR sel
-
-    plot-throughput-speedup-analysis-2n-skx:
-      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
-
-    plot-vpp-throughput-latency-3n-hsw:
-      csit-vpp-perf-verify-1810-3n-hsw:
-      - 8   # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 14  # NDRPDR sel
-      - 18  # NDRPDR sel
-      - 23  # NDRPDR sel
-      - 25  # NDRPDR sel
-      - 38  # NDRPDR sel
-      - 39  # NDRPDR sel
-      - 41  # NDRPDR sel
-      - 42  # NDRPDR sel
-
-    plot-vpp-throughput-latency-3n-skx:
-      csit-vpp-perf-verify-1810-3n-skx:
-      - 24  # NDRPDR full
-      - 10  # NDRPDR sel
-      - 14  # NDRPDR sel
-      - 15  # NDRPDR sel
-      - 16  # NDRPDR sel
-      - 17  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 21  # NDRPDR sel
-      - 22  # NDRPDR sel
-      - 25  # NDRPDR sel
-
-    plot-vpp-throughput-latency-2n-skx:
-      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
-
-    plot-vpp-http-server-performance:
-      csit-vpp-perf-verify-1810-3n-hsw:
-      - 28  # WRK
-      - 29  # WRK
-      - 30  # WRK
-      - 31  # WRK
-      - 32  # WRK
-      - 33  # WRK
-      - 34  # WRK
-      - 35  # WRK
-      - 36  # WRK
-      - 37  # WRK
+      csit-vpp-perf-verify-1904-2n-skx:
+        - 11  # MRR sel
 
-    # VPP Functional
     vpp-func-results-ubuntu:
-      csit-vpp-functional-1810-ubuntu1604-virl:
-      - 44
+      csit-vpp-functional-1904-ubuntu1604-virl:
+        - 29
 
     vpp-func-results-centos:
-      csit-vpp-functional-1810-centos7-virl:
-      - 44
+      csit-vpp-functional-1904-centos7-virl:
+        - 32
 
     vpp-device-results-ubuntu:
-      csit-vpp-device-1810-ubuntu1804-1n-skx:
-      - 2
+      csit-vpp-device-1904-ubuntu1804-1n-skx:
+        - 33
 
     # VPP Ligato
     ligato-perf-results-3n-hsw:
-      csit-ligato-perf-verify-1810-3n-hsw:
-      - 5   # full
-
-    plot-ligato-throughput-speedup-analysis-3n-hsw:
-      csit-ligato-perf-verify-1810-3n-hsw:
-      - 5   # full
-      - 6   # sel
-      - 8   # sel
-      - 9   # sel
-      - 11  # sel
-      - 12  # sel
-      - 13  # sel
-      - 14  # sel
-      - 16  # sel
-      - 17  # sel
-      - 18  # sel
-
-    plot-ligato-throughput-latency-3n-hsw:
-      csit-ligato-perf-verify-1810-3n-hsw:
-      - 5   # full
-      - 6   # sel
-      - 8   # sel
-      - 9   # sel
-      - 11  # sel
-      - 12  # sel
-      - 13  # sel
-      - 14  # sel
-      - 16  # sel
-      - 17  # sel
-      - 18  # sel
-
-    # DPDK Performance
-    dpdk-performance-changes:
-      csit-dpdk-perf-1804-all:
-      - 4
-      - 5
-      - 6
-      - 7
-      - 8
-      - 9
-      - 10
-      - 11
-      - 12
-      - 13
-      csit-dpdk-perf-verify-1807-3n-hsw:
-      - 11
-      - 12  # full
-      - 14
-      - 15
-      - 16
-      - 17
-      - 20
-      - 21
-      - 22
-      - 23
-      csit-dpdk-perf-verify-1810-3n-hsw:
-      - 1   # NDRPDR sel
-      - 2   # NDRPDR sel
-      - 3   # NDRPDR sel
-      - 4   # NDRPDR sel
-      - 5   # NDRPDR sel
-      - 6   # NDRPDR sel
-      - 7   # NDRPDR sel
-      - 8   # NDRPDR sel
-      - 9   # NDRPDR sel
-      - 10  # NDRPDR sel
-
-    dpdk-compare-testbeds:
-      csit-dpdk-perf-verify-1810-3n-skx:
-      - 3   # NDRPDR sel
-      - 4   # NDRPDR sel
-      - 6   # NDRPDR sel
-      - 7   # NDRPDR sel
-      - 8   # NDRPDR sel
-      - 9   # NDRPDR sel
-      - 10  # NDRPDR sel
-      - 11  # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
-      csit-dpdk-perf-verify-1810-3n-hsw:
-      - 1   # NDRPDR sel
-      - 2   # NDRPDR sel
-      - 3   # NDRPDR sel
-      - 4   # NDRPDR sel
-      - 5   # NDRPDR sel
-      - 6   # NDRPDR sel
-      - 7   # NDRPDR sel
-      - 8   # NDRPDR sel
-      - 9   # NDRPDR sel
-      - 10  # NDRPDR sel
+      # TODO: Replace with 1904 data
+      # csit-ligato-perf-verify-1904-3n-hsw:
+      csit-ligato-perf-verify-1901-3n-hsw:
+        - 10  # NDRPDR full
 
     dpdk-perf-results-3n-hsw:
-      csit-dpdk-perf-verify-1810-3n-hsw:
-      - 1
+      csit-dpdk-perf-verify-1904-3n-hsw:
+        - 5   # NDRPDR sel
 
     dpdk-perf-results-3n-skx:
-      csit-dpdk-perf-verify-1810-3n-skx:
-      - 3   # NDRPDR sel
+      csit-dpdk-perf-verify-1904-3n-skx:
+        - 10  # NDRPDR sel
 
     dpdk-perf-results-2n-skx:
-      csit-dpdk-perf-verify-1810-2n-skx:
-      - 3
-
-    plot-dpdk-throughput-latency-3n-hsw:
-      csit-dpdk-perf-verify-1810-3n-hsw:
-      - 1   # NDRPDR sel
-      - 2   # NDRPDR sel
-      - 3   # NDRPDR sel
-      - 4   # NDRPDR sel
-      - 5   # NDRPDR sel
-      - 6   # NDRPDR sel
-      - 7   # NDRPDR sel
-      - 8   # NDRPDR sel
-      - 9   # NDRPDR sel
-      - 10  # NDRPDR sel
-
-    plot-dpdk-throughput-latency-3n-skx:
-      csit-dpdk-perf-verify-1810-3n-skx:
-      - 3   # NDRPDR sel
-      - 4   # NDRPDR sel
-      - 6   # NDRPDR sel
-      - 7   # NDRPDR sel
-      - 8   # NDRPDR sel
-      - 9   # NDRPDR sel
-      - 10  # NDRPDR sel
-      - 11  # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
-
-    plot-dpdk-throughput-latency-2n-skx:
-      csit-dpdk-perf-verify-1810-2n-skx:
-      - 3   # NDRPDR sel
-      - 4   # NDRPDR sel
-      - 5   # NDRPDR sel
-      - 7   # NDRPDR sel
-      - 8   # NDRPDR sel
-      - 9   # NDRPDR sel
-      - 10  # NDRPDR sel
-      - 11  # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
+      csit-dpdk-perf-verify-1904-2n-skx:
+        - 9   # NDRPDR sel
 
     # HoneyComb Functional
     hc-func-results:
-      csit-hc2vpp-verify-func-1810-ubuntu1604:
-      - 1
+      csit-hc2vpp-verify-func-1904-ubuntu1604:
+        - 1
 
-    # NSH SFC Functional
-    nsh-func-results:
-      csit-nsh_sfc-verify-func-1810-ubuntu1604-virl:
-      - 1
+#    # NSH SFC Functional
+#    nsh-func-results:
+#      # Not used
+#      csit-nsh_sfc-verify-func-1810-ubuntu1604-virl:
+#        - 1
 
     # DMM Functional
     dmm-func-results:
-      csit-dmm-functional-1810-ubuntu1604-virl:
-      - 1
-
-  plot-layouts:
-
-    plot-cps:
-      titlefont:
-        size: 18
-      xaxis:
-        title: "<b>Test Cases [Index]</b>"
-        titlefont:
+      csit-dmm-functional-1904-ubuntu1604-virl:
+        - 1
+
+    ###########################################################################
+    # Tables (more than one data set)
+
+    # Performance changes
+
+    intel-dnv-vpp-changes-2n-dnv-h1:
+      intel-dnv-vpp-release-1810:
+        - 1
+    intel-dnv-vpp-changes-2n-dnv-ref:
+      intel-dnv-vpp-release-1901:
+        - 1
+    intel-dnv-vpp-changes-2n-dnv-cmp:
+      # TODO: Replace with 1904 data
+      # intel-dnv-vpp-release-1904:
+      intel-dnv-vpp-release-1901:
+        - 1
+    intel-dnv-vpp-changes-2n-dnv:
+      - "intel-dnv-vpp-changes-2n-dnv-h1"
+      - "intel-dnv-vpp-changes-2n-dnv-ref"
+      - "intel-dnv-vpp-changes-2n-dnv-cmp"
+
+    vpp-performance-changes-3n-hsw-h1:
+      csit-vpp-perf-verify-1810-3n-hsw:
+        - 8   # NDRPDR sel
+        - 12  # NDRPDR sel
+        - 14  # NDRPDR sel
+        - 18  # NDRPDR sel
+        - 23  # NDRPDR sel
+        - 25  # NDRPDR sel
+        - 38  # NDRPDR sel
+        - 39  # NDRPDR sel
+        - 41  # NDRPDR sel
+        - 42  # NDRPDR sel
+    vpp-performance-changes-3n-hsw-ref:
+      csit-vpp-perf-verify-1901-3n-hsw:
+        - 10  # NDRPDR sel
+        - 19  # NDRPDR sel
+        - 31  # NDRPDR sel
+        - 36  # NDRPDR sel
+        - 40  # NDRPDR sel
+        - 42  # NDRPDR sel
+        - 44  # NDRPDR sel
+        - 46  # NDRPDR sel
+        - 47  # NDRPDR sel
+        - 48  # NDRPDR sel
+        - 61  # NDRPDR LB
+        - 62  # NDRPDR LB
+        - 63  # NDRPDR LB
+        - 64  # NDRPDR LB
+        - 65  # NDRPDR LB
+        - 66  # NDRPDR LB
+        - 67  # NDRPDR LB
+        - 69  # NDRPDR LB
+        - 70  # NDRPDR LB
+        - 71  # NDRPDR LB
+    vpp-performance-changes-3n-hsw-cmp:
+      # TODO: Add 1904 data
+      csit-vpp-perf-verify-1904-3n-hsw:
+        - 12   # NDRPDR sel
+    vpp-performance-changes-3n-hsw:
+      - "vpp-performance-changes-3n-hsw-h1"
+      - "vpp-performance-changes-3n-hsw-ref"
+      - "vpp-performance-changes-3n-hsw-cmp"
+
+    vpp-performance-changes-3n-skx-h1:
+      csit-vpp-perf-verify-1810-3n-skx:
+        - 10  # NDRPDR sel
+        - 14  # NDRPDR sel
+        - 15  # NDRPDR sel
+        - 16  # NDRPDR sel
+        - 17  # NDRPDR sel
+        - 19  # NDRPDR sel
+        - 20  # NDRPDR sel
+        - 21  # NDRPDR sel
+        - 22  # NDRPDR sel
+        - 25  # NDRPDR sel
+    vpp-performance-changes-3n-skx-ref:
+      csit-vpp-perf-verify-1901-3n-skx:
+        - 18  # NDRPDR sel
+        - 19  # NDRPDR sel
+        - 20  # NDRPDR sel
+        - 28  # NDRPDR sel
+        - 31  # NDRPDR sel
+        - 33  # NDRPDR sel
+        - 36  # 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
+    vpp-performance-changes-3n-skx-cmp:
+      # TODO: Add 1904 data
+      csit-vpp-perf-verify-1904-3n-skx:
+        - 8   # NDRPDR sel
+        - 9   # NDRPDR sel
+        - 10  # NDRPDR sel
+        - 11  # NDRPDR sel
+        - 12  # 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:
+      # TODO: Add 1904 data
+      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
+    vpp-performance-changes-2n-skx:
+      - "vpp-performance-changes-2n-skx-h1"
+      - "vpp-performance-changes-2n-skx-ref"
+      - "vpp-performance-changes-2n-skx-cmp"
+
+    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:
+        - 1   # 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:
+        - 1   # NDRPDR sel
+        - 2   # NDRPDR sel
+        - 3   # NDRPDR sel
+        - 4   # NDRPDR sel
+        - 5   # NDRPDR sel
+        - 6   # NDRPDR sel
+        - 7   # NDRPDR sel
+        - 8   # NDRPDR sel
+        - 9   # NDRPDR sel
+        - 10  # NDRPDR sel
+    dpdk-performance-changes-3n-hsw-ref:
+      csit-dpdk-perf-verify-1901-3n-hsw:
+        - 13  # NDRPDR sel
+        - 14  # NDRPDR sel
+        - 16  # NDRPDR sel
+        - 17  # NDRPDR sel
+        - 18  # NDRPDR sel
+        - 19  # NDRPDR sel
+        - 20  # NDRPDR sel
+        - 21  # NDRPDR sel
+        - 22  # NDRPDR sel
+        - 23  # NDRPDR sel
+    dpdk-performance-changes-3n-hsw-cmp:
+      # TODO: Add 1904 data
+      csit-dpdk-perf-verify-1904-3n-hsw:
+        - 2   # NDRPDR sel
+        - 3   # NDRPDR sel
+        - 5   # NDRPDR sel
+    dpdk-performance-changes-3n-hsw:
+      - "dpdk-performance-changes-3n-hsw-h1"
+      - "dpdk-performance-changes-3n-hsw-ref"
+      - "dpdk-performance-changes-3n-hsw-cmp"
+
+    dpdk-performance-changes-3n-skx-h1:
+      csit-dpdk-perf-verify-1810-3n-skx:
+        - 3   # NDRPDR sel
+        - 4   # NDRPDR sel
+        - 6   # NDRPDR sel
+        - 7   # NDRPDR sel
+        - 8   # NDRPDR sel
+        - 9   # NDRPDR sel
+        - 10  # NDRPDR sel
+        - 11  # NDRPDR sel
+        - 12  # NDRPDR sel
+        - 13  # NDRPDR sel
+    dpdk-performance-changes-3n-skx-ref:
+      csit-dpdk-perf-verify-1901-3n-skx:
+        - 3   # NDRPDR sel
+        - 5   # NDRPDR sel
+        - 6   # NDRPDR sel
+        - 7   # NDRPDR sel
+        - 8   # NDRPDR sel
+        - 9   # NDRPDR sel
+        - 10  # NDRPDR sel
+        - 11  # NDRPDR sel
+        - 12  # NDRPDR sel
+        - 13  # NDRPDR sel
+    dpdk-performance-changes-3n-skx-cmp:
+      # TODO: Add 1904 data
+      csit-dpdk-perf-verify-1904-3n-skx:
+        - 2   # NDRPDR sel
+        - 3   # NDRPDR sel
+        - 4   # NDRPDR sel
+        - 5   # NDRPDR sel
+        - 6   # NDRPDR sel
+    dpdk-performance-changes-3n-skx:
+      - "dpdk-performance-changes-3n-skx-h1"
+      - "dpdk-performance-changes-3n-skx-ref"
+      - "dpdk-performance-changes-3n-skx-cmp"
+
+    dpdk-performance-changes-2n-skx-h1:
+      csit-dpdk-perf-verify-1810-2n-skx:
+        - 3   # NDRPDR sel
+        - 4   # NDRPDR sel
+        - 5   # NDRPDR sel
+        - 7   # NDRPDR sel
+        - 8   # NDRPDR sel
+        - 9   # NDRPDR sel
+        - 10  # NDRPDR sel
+        - 11  # NDRPDR sel
+        - 12  # NDRPDR sel
+        - 13  # NDRPDR sel
+    dpdk-performance-changes-2n-skx-ref:
+      csit-dpdk-perf-verify-1901-2n-skx:
+        - 12  # NDRPDR sel
+        - 13  # NDRPDR sel
+        - 14  # NDRPDR sel
+        - 15  # NDRPDR sel
+        - 16  # NDRPDR sel
+        - 17  # NDRPDR sel
+        - 18  # NDRPDR sel
+        - 19  # NDRPDR sel
+        - 20  # NDRPDR sel
+        - 21  # NDRPDR sel
+    dpdk-performance-changes-2n-skx-cmp:
+      # TODO: Add 1904 data
+      csit-dpdk-perf-verify-1904-2n-skx:
+        - 2   # NDRPDR sel
+        - 3   # NDRPDR sel
+        - 4   # NDRPDR sel
+        - 5   # NDRPDR sel
+        - 7   # NDRPDR sel
+        - 8   # NDRPDR sel
+        - 9   # NDRPDR sel
+        - 10  # NDRPDR sel
+        - 11  # NDRPDR sel
+    dpdk-performance-changes-2n-skx:
+      - "dpdk-performance-changes-2n-skx-h1"
+      - "dpdk-performance-changes-2n-skx-ref"
+      - "dpdk-performance-changes-2n-skx-cmp"
+
+    # Compare testbeds
+
+    vpp-compare-testbeds-ref:
+      # TODO: Add 1904 data
+      csit-vpp-perf-verify-1904-3n-hsw:
+        - 12   # NDRPDR sel
+    vpp-compare-testbeds-cmp:
+      # TODO: Add 1904 data
+      csit-vpp-perf-verify-1904-3n-skx:
+        - 8   # NDRPDR sel
+        - 9   # NDRPDR sel
+        - 10  # NDRPDR sel
+        - 11  # NDRPDR sel
+        - 12  # 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:
+        - 1   # 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:
+      # TODO: Add 1904 data
+      csit-dpdk-perf-verify-1904-3n-hsw:
+        - 2   # NDRPDR sel
+        - 3   # NDRPDR sel
+        - 5   # NDRPDR sel
+    dpdk-compare-testbeds-cmp:
+      # TODO: Add 1904 data
+      csit-dpdk-perf-verify-1904-3n-skx:
+        - 2   # NDRPDR sel
+        - 3   # NDRPDR sel
+        - 4   # NDRPDR sel
+        - 5   # NDRPDR sel
+        - 6   # NDRPDR sel
+    dpdk-compare-testbeds:
+      - "dpdk-compare-testbeds-ref"
+      - "dpdk-compare-testbeds-cmp"
+
+    # Compare topologies
+
+    vpp-compare-topologies-ref:
+      # TODO: Add 1904 data
+      csit-vpp-perf-verify-1904-3n-skx:
+        - 8   # NDRPDR sel
+        - 9   # NDRPDR sel
+        - 10  # NDRPDR sel
+        - 11  # NDRPDR sel
+        - 12  # NDRPDR sel
+    vpp-compare-topologies-cmp:
+      # TODO: Add 1904 data
+      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
+    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:
+      # TODO: Add 1904 data
+      csit-dpdk-perf-verify-1904-3n-skx:
+        - 2   # NDRPDR sel
+        - 3   # NDRPDR sel
+        - 4   # NDRPDR sel
+        - 5   # NDRPDR sel
+        - 6   # NDRPDR sel
+    dpdk-compare-topologies-cmp:
+      # TODO: Add 1904 data
+      csit-dpdk-perf-verify-1904-2n-skx:
+        - 2   # NDRPDR sel
+        - 3   # NDRPDR sel
+        - 4   # NDRPDR sel
+        - 5   # NDRPDR sel
+        - 7   # NDRPDR sel
+        - 8   # NDRPDR sel
+        - 9   # NDRPDR sel
+        - 10  # NDRPDR sel
+        - 11  # NDRPDR sel
+    dpdk-compare-topologies:
+      - "dpdk-compare-topologies-ref"
+      - "dpdk-compare-topologies-cmp"
+
+  plot-layouts:
+
+    plot-soak-throughput:
+      titlefont:
+        size: 18
+      xaxis:
+        title: "<b>Test Cases [Index]</b>"
+        titlefont:
+          size: 16
+        autorange: True
+        fixedrange: False
+        gridcolor: "rgb(230, 230, 230)"
+        linecolor: "rgb(220, 220, 220)"
+        linewidth: 1
+        showgrid: True
+        showline: True
+        showticklabels: True
+        tickcolor: "rgb(220, 220, 220)"
+        tickmode: "linear"
+        tickfont:
+          size: 16
+        zeroline: False
+      yaxis:
+        title: "<b>Packet Throughput [Mpps]</b>"
+        titlefont:
+          size: 16
+        gridcolor: "rgb(230, 230, 230)"
+        hoverformat: ".4s"
+        tickformat: ".3s"
+        linecolor: "rgb(220, 220, 220)"
+        linewidth: 1
+        showgrid: True
+        showline: True
+        showticklabels: True
+        tickcolor: "rgb(220, 220, 220)"
+        tickfont:
+          size: 16
+        zeroline: False
+        range: [0,50]
+      autosize: False
+      margin:
+        t: 50
+        b: 0
+        l: 80
+        r: 20
+      showlegend: True
+      legend:
+        orientation: "h"
+        font:
+          size: 16
+      width: 700
+      height: 900
+
+    plot-service-density:
+      titlefont:
+        size: 18
+      xaxis:
+        side: "top"
+        autorange: True
+        fixedrange: False
+        showgrid: False
+        showline: False
+        showticklabels: False
+        ticks: ""
+        ticklen: 0
+        tickwidth: 0
+        zeroline: False
+      yaxis:
+        autorange: "reversed"
+        showgrid: False
+        showline: False
+        showticklabels: False
+        ticks: ""
+        ticklen: 0
+        tickwidth: 0
+        zeroline: False
+      autosize: True
+      showlegend: False
+      width: 700
+      height: 700
+
+    plot-cps:
+      titlefont:
+        size: 18
+      xaxis:
+        title: "<b>Test Cases [Index]</b>"
+        titlefont:
           size: 16
         autorange: True
         fixedrange: False
@@ -660,7 +1016,7 @@
       autosize: False
       margin:
         t: 50
-        b: 20
+        b: 0
         l: 80
         r: 20
       showlegend: True
@@ -709,7 +1065,7 @@
           size: 16
         zeroline: True
         rangemode: "tozero"
-        # range: [0,100]
+        range: [0,100]
       legend:
         orientation: "h"
         font:
@@ -820,13 +1176,11 @@
       hoverlabel:
         namelength: -1
 
--
-  type: "static"
+- type: "static"
   src-path: "{DIR[RST]}"
   dst-path: "{DIR[WORKING,SRC]}"
 
--
-  type: "input"
+- type: "input"
   general:
     file-name: "robot-plugin.zip"
     file-format: ".zip"
@@ -834,320 +1188,22 @@
     extract: "robot-plugin/output.xml"
 
   builds:
+    # TODO: Add 1904 data
+#    intel-dnv-vpp-release-1904:
+#      - 1
 
-    csit-vpp-perf-1804-all:
-    - 21  # sel
-    - 22  # sel
-    - 23  # sel
-    - 24  # sel
-    - 27  # sel
-    - 28  # sel
-    - 29  # sel
-    - 30  # sel
-    - 31  # sel
-    - 35  # sel
-    csit-vpp-perf-verify-1807-3n-hsw:
-    - 8   # MRR full
-    - 9   # MRR sel
-    - 21  # MRR sel
-    - 31  # MRR sel
-    - 33  # MRR sel
-    - 36  # MRR sel
-    - 41  # MRR sel
-    - 42  # MRR sel
-    - 48  # MRR sel
-    - 11  # NDRPDR full 1
-    - 22  # NDRPDR full 2
-    - 45  # NDRPDR full 3
-    - 46  # NDRPDR full 4
-    - 15  # NDRPDR sel
-    - 16  # NDRPDR sel
-    - 19  # NDRPDR sel
-    - 18  # NDRPDR sel
-    - 20  # NDRPDR sel
-    - 38  # NDRPDR sel
-    - 40  # NDRPDR sel
-    - 44  # NDRPDR sel
-    - 47  # NDRPDR sel
-    - 24  # WRK
-    - 25  # WRK
-    - 23  # WRK
-    - 26  # WRK
-    - 27  # WRK
-    - 28  # WRK
-    - 29  # WRK
-    - 30  # WRK
-    - 32  # WRK
-    - 35  # WRK
-    csit-vpp-perf-verify-1810-3n-hsw:
-    - 9   # MRR sel
-    - 20  # NDRPDR full
-    - 21  # NDRPDR full
-    - 22  # NDRPDR full
-    - 27  # NDRPDR full
-    - 8   # NDRPDR sel
-    - 12  # NDRPDR sel
-    - 14  # NDRPDR sel
-    - 18  # NDRPDR sel
-    - 23  # NDRPDR sel
-    - 25  # NDRPDR sel
-    - 38  # NDRPDR sel
-    - 39  # NDRPDR sel
-    - 41  # NDRPDR sel
-    - 42  # NDRPDR sel
-    - 28  # WRK
-    - 29  # WRK
-    - 30  # WRK
-    - 31  # WRK
-    - 32  # WRK
-    - 33  # WRK
-    - 34  # WRK
-    - 35  # WRK
-    - 36  # WRK
-    - 37  # WRK
-    csit-vpp-perf-verify-1807-3n-skx:
-    - 31  # MRR full
-    - 28  # MRR sel
-    - 32  # MRR sel
-    - 36  # MRR sel
-    - 42  # MRR sel
-    - 47  # MRR sel
-    - 48  # MRR sel
-    - 51  # MRR sel
-    - 52  # MRR sel
-    - 53  # MRR sel
-    - 54  # MRR sel
-    - 40  # NDRPDR full 1
-    - 41  # NDRPDR full 2
-    - 33  # NDRPDR sel
-    - 35  # NDRPDR sel
-    - 37  # NDRPDR sel
-    - 38  # NDRPDR sel
-    - 39  # NDRPDR sel
-    - 43  # NDRPDR sel
-    - 44  # NDRPDR sel
-    - 49  # NDRPDR sel
-    - 50  # NDRPDR sel
-    - 56  # NDRPDR sel
-    csit-vpp-perf-verify-1810-3n-skx:
-    - 9   # MRR sel
-    - 11  # MRR sel
-    - 12  # MRR sel
-    - 13  # MRR sel
-    - 23  # NDRPDR full
-    - 24  # NDRPDR full
-    - 10  # NDRPDR sel
-    - 14  # NDRPDR sel
-    - 15  # NDRPDR sel
-    - 16  # NDRPDR sel
-    - 17  # NDRPDR sel
-    - 19  # NDRPDR sel
-    - 20  # NDRPDR sel
-    - 21  # NDRPDR sel
-    - 22  # NDRPDR sel
-    - 25  # NDRPDR sel
-    csit-vpp-perf-verify-1807-2n-skx:
-    - 27  # MRR full
-    - 31  # MRR sel
-    - 33  # MRR sel
-    - 37  # MRR sel
-    - 38  # MRR sel
-    - 41  # MRR sel
-    - 43  # MRR sel
-    - 44  # MRR sel
-    - 45  # MRR sel
-    - 46  # MRR sel
-    - 47  # MRR sel
-    - 32  # NDRPDR full
-    - 26  # NDRPDR sel
-    - 28  # NDRPDR sel
-    - 29  # NDRPDR sel
-    - 30  # NDRPDR sel
-    - 34  # NDRPDR sel
-    - 35  # NDRPDR sel
-    - 36  # NDRPDR sel
-    - 39  # NDRPDR sel
-    - 40  # NDRPDR sel
-    - 42  # NDRPDR sel
-    csit-vpp-perf-verify-1810-2n-skx:
-    - 8   # MRR sel
-    - 10  # MRR sel
-    - 11  # MRR sel
-    - 12  # MRR sel
-    - 25  # NDRPDR full
-    - 26  # NDRPDR full
-    - 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-check-1804:
-    - 5   # mrr - full
-    - 6   # mrr - sel
-    - 13  # mrr - sel
-    - 14  # mrr - sel
-    - 15  # mrr - sel
-    - 16  # mrr - sel
-    - 17  # mrr - sel
-    - 19  # mrr - sel
-    - 20  # mrr - sel
-    - 21  # mrr - sel
-    - 22  # mrr - sel
-    csit-ligato-perf-verify-1810-3n-hsw:
-    - 5   # full
-    - 6   # sel
-    - 8   # sel
-    - 9   # sel
-    - 11  # sel
-    - 12  # sel
-    - 13  # sel
-    - 14  # sel
-    - 16  # sel
-    - 17  # sel
-    - 18  # sel
-    csit-dpdk-perf-1804-all:
-    - 4
-    - 5
-    - 6
-    - 7
-    - 8
-    - 9
-    - 10
-    - 11
-    - 12
-    - 13
-    csit-dpdk-perf-verify-1807-3n-hsw:
-    - 11
-    - 12  # full
-    - 14
-    - 15
-    - 16
-    - 17
-    - 20
-    - 21
-    - 22
-    - 23
-    csit-dpdk-perf-verify-1810-3n-hsw:
-    - 1   # NDRPDR sel
-    - 2   # NDRPDR sel
-    - 3   # NDRPDR sel
-    - 4   # NDRPDR sel
-    - 5   # NDRPDR sel
-    - 6   # NDRPDR sel
-    - 7   # NDRPDR sel
-    - 8   # NDRPDR sel
-    - 9   # NDRPDR sel
-    - 10  # NDRPDR sel
-    csit-dpdk-perf-verify-1807-3n-skx:
-    - 1
-    - 2
-    - 3
-    - 6
-    - 7
-    - 8
-    - 9
-    - 10
-    - 11
-    - 12
-    csit-dpdk-perf-verify-1810-3n-skx:
-    - 3   # NDRPDR sel
-    - 4   # NDRPDR sel
-    - 6   # NDRPDR sel
-    - 7   # NDRPDR sel
-    - 8   # NDRPDR sel
-    - 9   # NDRPDR sel
-    - 10  # NDRPDR sel
-    - 11  # NDRPDR sel
-    - 12  # NDRPDR sel
-    - 13  # NDRPDR sel
-    csit-dpdk-perf-verify-1810-2n-skx:
-    - 3   # NDRPDR sel
-    - 4   # NDRPDR sel
-    - 5   # NDRPDR sel
-    - 7   # NDRPDR sel
-    - 8   # NDRPDR sel
-    - 9   # NDRPDR sel
-    - 10  # NDRPDR sel
-    - 11  # NDRPDR sel
-    - 12  # NDRPDR sel
-    - 13  # NDRPDR sel
-
-    csit-vpp-functional-1810-ubuntu1604-virl:
-    - 44
-    csit-vpp-functional-1810-centos7-virl:
-    - 44
-    csit-vpp-device-1810-ubuntu1804-1n-skx:
-    - 2
-    csit-nsh_sfc-verify-func-1810-ubuntu1604-virl:
-    - 1
-    csit-dmm-functional-1810-ubuntu1604-virl:
-    - 1
-    csit-hc2vpp-verify-func-1810-ubuntu1604:
-    - 1
-
--
-  type: "output"
-  output: "report"
-  format:
-    html:
-    - full
-    pdf:
-    - minimal
-
-################################################################################
-###                               T A B L E S                                ###
-################################################################################
+    intel-dnv-vpp-release-1901:
+      - 1
 
-################################################################################
-# VPP
+    intel-dnv-vpp-release-1810:
+      - 1
 
-# VPP Performance Changes 1t1c pdr
--
-  type: "table"
-  title: "VPP Performance Changes 1t1c pdr"
-  algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-1t1c-pdr"
-  history:
-    -
-      title: "rls1804"
-      data:
-        csit-vpp-perf-1804-all:
-        - 21  # sel
-        - 22  # sel
-        - 23  # sel
-        - 24  # sel
-        - 27  # sel
-        - 28  # sel
-        - 29  # sel
-        - 30  # sel
-        - 31  # sel
-        - 35  # sel
-  reference:
-    title: "rls1807"
-    data:
-      csit-vpp-perf-verify-1807-3n-hsw:
-      - 11  # NDRPDR full 1
-      - 22  # NDRPDR full 2
-      - 45  # NDRPDR full 3
-      - 46  # NDRPDR full 4
-      - 15  # NDRPDR sel
-      - 16  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 18  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 38  # NDRPDR sel
-      - 40  # NDRPDR sel
-      - 44  # NDRPDR sel
-      - 47  # NDRPDR sel
-  compare:
-    title: "rls1810"
-    data:
-      csit-vpp-perf-verify-1810-3n-hsw:
+    csit-vpp-perf-verify-1810-3n-hsw:
+      - 9   # MRR sel
+      - 20  # NDRPDR full
+      - 21  # NDRPDR full
+      - 22  # NDRPDR full
+      - 27  # NDRPDR full
       - 8   # NDRPDR sel
       - 12  # NDRPDR sel
       - 14  # NDRPDR sel
@@ -1158,459 +1214,1606 @@
       - 39  # NDRPDR sel
       - 41  # NDRPDR sel
       - 42  # NDRPDR sel
-  data: "vpp-performance-changes"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'1T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
-  parameters:
-  - "name"
-  - "parent"
-  - "throughput"
-
-# VPP Performance Changes 2t2c pdr
--
-  type: "table"
-  title: "VPP Performance Changes 2t2c pdr"
-  algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2t2c-pdr"
-  history:
-    -
-      title: "rls1804"
-      data:
-        csit-vpp-perf-1804-all:
-        - 21  # sel
-        - 22  # sel
-        - 23  # sel
-        - 24  # sel
-        - 27  # sel
-        - 28  # sel
-        - 29  # sel
-        - 30  # sel
-        - 31  # sel
-        - 35  # sel
-  reference:
-    title: "rls1807"
-    data:
-      csit-vpp-perf-verify-1807-3n-hsw:
-      - 11  # NDRPDR full 1
-      - 22  # NDRPDR full 2
-      - 45  # NDRPDR full 3
-      - 46  # NDRPDR full 4
-      - 15  # NDRPDR sel
-      - 16  # NDRPDR sel
+      - 28  # WRK
+      - 29  # WRK
+      - 30  # WRK
+      - 31  # WRK
+      - 32  # WRK
+      - 33  # WRK
+      - 34  # WRK
+      - 35  # WRK
+      - 36  # WRK
+      - 37  # WRK
+    csit-vpp-perf-verify-1901-3n-hsw:
+      - 35  # MRR sel
+      - 38  # NDRPDR full
+      - 43  # NDRPDR full
+      - 45  # NDRPDR full
+      - 49  # NDRPDR full
+      - 10  # NDRPDR sel
       - 19  # NDRPDR sel
-      - 18  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 38  # NDRPDR sel
+      - 31  # NDRPDR sel
+      - 36  # NDRPDR sel
       - 40  # NDRPDR sel
+      - 42  # NDRPDR sel
       - 44  # NDRPDR sel
+      - 46  # NDRPDR sel
       - 47  # NDRPDR sel
-  compare:
-    title: "rls1810"
-    data:
-      csit-vpp-perf-verify-1810-3n-hsw:
-      - 8   # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 14  # NDRPDR sel
-      - 18  # NDRPDR sel
-      - 23  # NDRPDR sel
-      - 25  # NDRPDR sel
-      - 38  # NDRPDR sel
-      - 39  # NDRPDR sel
-      - 41  # NDRPDR sel
-      - 42  # NDRPDR sel
-  data: "vpp-performance-changes"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
-  parameters:
-  - "name"
-  - "parent"
-  - "throughput"
+      - 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
+    # TODO: Add 1904 Data
+    csit-vpp-perf-verify-1904-3n-hsw:
+      - 1   # MRR sel - replace
+      - 12   # NDRPDR sel
 
-# VPP Performance Changes 1t1c ndr
--
-  type: "table"
-  title: "VPP Performance Changes 1t1c ndr"
-  algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-1t1c-ndr"
-  history:
-    -
-      title: "rls1804"
-      data:
-        csit-vpp-perf-1804-all:
-        - 21  # sel
-        - 22  # sel
-        - 23  # sel
-        - 24  # sel
-        - 27  # sel
-        - 28  # sel
-        - 29  # sel
-        - 30  # sel
-        - 31  # sel
-        - 35  # sel
-  reference:
-    title: "rls1807"
-    data:
-      csit-vpp-perf-verify-1807-3n-hsw:
-      - 11  # NDRPDR full 1
-      - 22  # NDRPDR full 2
-      - 45  # NDRPDR full 3
-      - 46  # NDRPDR full 4
+    csit-vpp-perf-verify-1810-3n-skx:
+      - 9   # MRR sel
+      - 11  # MRR sel
+      - 12  # MRR sel
+      - 13  # MRR sel
+      - 23  # NDRPDR full
+      - 24  # NDRPDR full
+      - 10  # NDRPDR sel
+      - 14  # NDRPDR sel
       - 15  # NDRPDR sel
       - 16  # NDRPDR sel
+      - 17  # NDRPDR sel
       - 19  # NDRPDR sel
+      - 20  # NDRPDR sel
+      - 21  # NDRPDR sel
+      - 22  # NDRPDR sel
+      - 25  # NDRPDR sel
+    csit-vpp-perf-verify-1901-3n-skx:
+      - 32  # MRR sel
+      - 37  # NDRPDR full
+      - 39  # NDRPDR full
+      - 40  # NDRPDR full
+      - 49  # NDRPDR full
       - 18  # NDRPDR sel
+      - 19  # NDRPDR sel
       - 20  # NDRPDR sel
+      - 28  # NDRPDR sel
+      - 31  # NDRPDR sel
+      - 33  # NDRPDR sel
+      - 36  # NDRPDR sel
       - 38  # NDRPDR sel
-      - 40  # NDRPDR sel
-      - 44  # NDRPDR sel
       - 47  # NDRPDR sel
-  compare:
-    title: "rls1810"
-    data:
-      csit-vpp-perf-verify-1810-3n-hsw:
+      - 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
+    # TODO: Add 1904 data
+    csit-vpp-perf-verify-1904-3n-skx:
+      - 7   # MRR sel
       - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
+      - 11  # NDRPDR sel
       - 12  # NDRPDR sel
+
+    csit-vpp-perf-verify-1810-2n-skx:
+      - 8   # MRR sel
+      - 10  # MRR sel
+      - 11  # MRR sel
+      - 12  # MRR sel
+      - 25  # NDRPDR full
+      - 26  # NDRPDR full
+      - 9   # NDRPDR sel
+      - 13  # NDRPDR sel
       - 14  # NDRPDR sel
-      - 18  # NDRPDR sel
+      - 19  # NDRPDR sel
+      - 20  # NDRPDR sel
+      - 21  # NDRPDR sel
+      - 22  # NDRPDR sel
       - 23  # NDRPDR sel
-      - 25  # NDRPDR sel
-      - 38  # NDRPDR sel
-      - 39  # NDRPDR sel
-      - 41  # NDRPDR sel
+      - 24  # NDRPDR sel
+      - 27  # NDRPDR sel
+    csit-vpp-perf-verify-1901-2n-skx:
+      - 22  # MRR sel
+      - 25  # NDRPDR full
+      - 30  # NDRPDR full
+      - 33  # NDRPDR full
+      - 44  # NDRPDR full
+      - 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
-  data: "vpp-performance-changes"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'1T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
-  parameters:
-  - "name"
-  - "parent"
-  - "throughput"
+      - 43  # NDRPDR sel
+      - 24  # NFV MRR
+      - 26  # NFV MRR
+      - 27  # NFV MRR
+      - 35  # NFV MRR
+      - 37  # NFV MRR
+      - 28  # NFV NDRPDR
+      - 29  # NFV NDRPDR
+      - 32  # NFV NDRPDR
+      - 39  # NFV NDRPDR
+      - 46  # NFV NDRPDR
+      - 45  # SOAK
+    # TODO: Add 1904 data
+    csit-vpp-perf-verify-1904-2n-skx:
+      - 11  # MRR sel
+      - 12  # NDRPDR sel
+      - 14  # NDRPDR sel
+      - 16  # NDRPDR sel
+      - 17  # NDRPDR sel
+      - 18  # NDRPDR sel
+      - 21  # NDRPDR sel
+      - 27  # NDRPDR sel
+      - 10  # NFV MRR
+      - 9   # NFV NDRPDR
 
-# VPP Performance Changes 2t2c ndr
--
-  type: "table"
-  title: "VPP Performance Changes 2t2c ndr"
-  algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2t2c-ndr"
-  history:
-    -
-      title: "rls1804"
-      data:
-        csit-vpp-perf-1804-all:
-        - 21  # sel
-        - 22  # sel
-        - 23  # sel
-        - 24  # sel
-        - 27  # sel
-        - 28  # sel
-        - 29  # sel
-        - 30  # sel
-        - 31  # sel
-        - 35  # sel
-  reference:
-    title: "rls1807"
-    data:
-      csit-vpp-perf-verify-1807-3n-hsw:
-      - 11  # NDRPDR full 1
-      - 22  # NDRPDR full 2
-      - 45  # NDRPDR full 3
-      - 46  # NDRPDR full 4
+    # TODO: Remove
+    csit-ligato-perf-verify-1901-3n-hsw:
+      - 10  # NDRPDR full
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 11  # NDRPDR sel
+      - 12  # NDRPDR sel
+      - 13  # NDRPDR sel
+      - 14  # NDRPDR sel
       - 15  # NDRPDR sel
       - 16  # NDRPDR sel
-      - 19  # NDRPDR sel
+      - 17  # NDRPDR sel
       - 18  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 38  # NDRPDR sel
-      - 40  # NDRPDR sel
-      - 44  # NDRPDR sel
-      - 47  # NDRPDR sel
+    # TODO: Add 1904 data
+#    csit-ligato-perf-verify-1904-3n-hsw:
+#      -
+
+    csit-dpdk-perf-verify-1810-3n-hsw:
+      - 1   # NDRPDR sel
+      - 2   # NDRPDR sel
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 5   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
+    csit-dpdk-perf-verify-1901-3n-hsw:
+      - 13  # NDRPDR sel
+      - 14  # NDRPDR sel
+      - 16  # NDRPDR sel
+      - 17  # NDRPDR sel
+      - 18  # NDRPDR sel
+      - 19  # NDRPDR sel
+      - 20  # NDRPDR sel
+      - 21  # NDRPDR sel
+      - 22  # NDRPDR sel
+      - 23  # NDRPDR sel
+    # TODO: Add 1904 data
+    csit-dpdk-perf-verify-1904-3n-hsw:
+      - 2   # NDRPDR sel
+      - 3   # NDRPDR sel
+      - 5   # NDRPDR sel
+
+    csit-dpdk-perf-verify-1810-3n-skx:
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
+      - 11  # NDRPDR sel
+      - 12  # NDRPDR sel
+      - 13  # NDRPDR sel
+    csit-dpdk-perf-verify-1901-3n-skx:
+      - 3   # NDRPDR sel
+      - 5   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
+      - 11  # NDRPDR sel
+      - 12  # NDRPDR sel
+      - 13  # NDRPDR sel
+    # TODO: Add 1904 data
+    csit-dpdk-perf-verify-1904-3n-skx:
+      - 2   # NDRPDR sel
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 5   # NDRPDR sel
+      - 6   # NDRPDR sel
+
+    csit-dpdk-perf-verify-1810-2n-skx:
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 5   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
+      - 11  # NDRPDR sel
+      - 12  # NDRPDR sel
+      - 13  # NDRPDR sel
+    csit-dpdk-perf-verify-1901-2n-skx:
+      - 12  # NDRPDR sel
+      - 13  # NDRPDR sel
+      - 14  # NDRPDR sel
+      - 15  # NDRPDR sel
+      - 16  # NDRPDR sel
+      - 17  # NDRPDR sel
+      - 18  # NDRPDR sel
+      - 19  # NDRPDR sel
+      - 20  # NDRPDR sel
+      - 21  # NDRPDR sel
+    # TODO: Add 1904 data
+    csit-dpdk-perf-verify-1904-2n-skx:
+      - 2   # NDRPDR sel
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 5   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
+      - 11  # NDRPDR sel
+
+    csit-vpp-functional-1904-ubuntu1604-virl:
+      - 33
+    csit-vpp-functional-1904-centos7-virl:
+      - 32
+    csit-vpp-device-1904-ubuntu1804-1n-skx:
+      - 32
+#    # Not used
+#    csit-nsh_sfc-verify-func-1810-ubuntu1604-virl:
+#      - 1
+    csit-dmm-functional-1904-ubuntu1604-virl:
+      - 1
+    csit-hc2vpp-verify-func-1904-ubuntu1604:
+      - 1
+
+- type: "output"
+  output: "report"
+  format:
+    html:
+    - full
+#    pdf:
+#    - minimal
+
+################################################################################
+###                               T A B L E S                                ###
+################################################################################
+
+# VPP Compare NICs 3n-hsw 1t1c ndr
+- type: "table"
+  title: "VPP Compare NICs 3n-hsw 1t1c ndr"
+  algorithm: "table_nics_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-1t1c-nics-ndr"
+  reference:
+    title: "Intel-x520"
+    nic: "NIC_Intel-X520-DA2"
+  compare:
+    title: "Intel-x710"
+    nic: "NIC_Intel-X710"
+  data: "vpp-nic-comparison-3n-hsw"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'1T1C' and 'NDRPDR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+  - "tags"
+
+# VPP Compare NICs 3n-hsw 2t2c ndr
+- type: "table"
+  title: "VPP Compare NICs 3n-hsw 2t2c ndr"
+  algorithm: "table_nics_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-2t2c-nics-ndr"
+  reference:
+    title: "Intel-x520"
+    nic: "NIC_Intel-X520-DA2"
+  compare:
+    title: "Intel-x710"
+    nic: "NIC_Intel-X710"
+  data: "vpp-nic-comparison-3n-hsw"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T2C' and 'NDRPDR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+  - "tags"
+
+# VPP Compare NICs 3n-hsw 1t1c pdr
+- type: "table"
+  title: "VPP Compare NICs 3n-hsw 1t1c pdr"
+  algorithm: "table_nics_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-1t1c-nics-pdr"
+  reference:
+    title: "Intel-x520"
+    nic: "NIC_Intel-X520-DA2"
+  compare:
+    title: "Intel-x710"
+    nic: "NIC_Intel-X710"
+  data: "vpp-nic-comparison-3n-hsw"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'1T1C' and 'NDRPDR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+  - "tags"
+
+# VPP Compare NICs 3n-hsw 2t2c pdr
+- type: "table"
+  title: "VPP Compare NICs 3n-hsw 2t2c pdr"
+  algorithm: "table_nics_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-2t2c-nics-pdr"
+  reference:
+    title: "Intel-x520"
+    nic: "NIC_Intel-X520-DA2"
+  compare:
+    title: "Intel-x710"
+    nic: "NIC_Intel-X710"
+  data: "vpp-nic-comparison-3n-hsw"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T2C' and 'NDRPDR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+  - "tags"
+
+# VPP Compare NICs 3n-hsw 1t1c mrr
+- type: "table"
+  title: "VPP Compare NICs 3n-hsw 1t1c mrr"
+  algorithm: "table_nics_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-1t1c-nics-mrr"
+  reference:
+    title: "Intel-x520"
+    nic: "NIC_Intel-X520-DA2"
+  compare:
+    title: "Intel-x710"
+    nic: "NIC_Intel-X710"
+  data: "vpp-nic-comparison-3n-hsw-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'1T1C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "result"
+  - "tags"
+
+# VPP Compare NICs 3n-hsw 2t2c mrr
+- type: "table"
+  title: "VPP Compare NICs 3n-hsw 2t2c mrr"
+  algorithm: "table_nics_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-2t2c-nics-mrr"
+  reference:
+    title: "Intel-x520"
+    nic: "NIC_Intel-X520-DA2"
+  compare:
+    title: "Intel-x710"
+    nic: "NIC_Intel-X710"
+  data: "vpp-nic-comparison-3n-hsw-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T2C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "result"
+  - "tags"
+
+# VPP Compare NICs 3n-hsw 4t4c mrr
+- type: "table"
+  title: "VPP Compare NICs 3n-hsw 4t4c mrr"
+  algorithm: "table_nics_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-4t4c-nics-mrr"
+  reference:
+    title: "Intel-x520"
+    nic: "NIC_Intel-X520-DA2"
+  compare:
+    title: "Intel-x710"
+    nic: "NIC_Intel-X710"
+  data: "vpp-nic-comparison-3n-hsw-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T4C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "result"
+  - "tags"
+
+# VPP Compare NICs 3n-skx 2t1c ndr
+- type: "table"
+  title: "VPP Compare NICs 3n-skx 2t1c ndr"
+  algorithm: "table_nics_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-2t1c-nics-ndr"
+  reference:
+    title: "Intel-x710"
+    nic: "NIC_Intel-X710"
+  compare:
+    title: "Intel-xxv710"
+    nic: "NIC_Intel-XXV710"
+  data: "vpp-nic-comparison-3n-skx"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T1C' and 'NDRPDR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+  - "tags"
+
+# VPP Compare NICs 3n-skx 4t2c ndr
+- type: "table"
+  title: "VPP Compare NICs 3n-skx 4t2c ndr"
+  algorithm: "table_nics_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-4t2c-nics-ndr"
+  reference:
+    title: "Intel-x710"
+    nic: "NIC_Intel-X710"
+  compare:
+    title: "Intel-xxv710"
+    nic: "NIC_Intel-XXV710"
+  data: "vpp-nic-comparison-3n-skx"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T2C' and 'NDRPDR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+  - "tags"
+
+# VPP Compare NICs 3n-skx 2t1c pdr
+- type: "table"
+  title: "VPP Compare NICs 3n-skx 2t1c pdr"
+  algorithm: "table_nics_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-2t1c-nics-pdr"
+  reference:
+    title: "Intel-x710"
+    nic: "NIC_Intel-X710"
+  compare:
+    title: "Intel-xxv710"
+    nic: "NIC_Intel-XXV710"
+  data: "vpp-nic-comparison-3n-skx"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T1C' and 'NDRPDR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+  - "tags"
+
+ # VPP Compare NICs 3n-skx 4t2c pdr
+- type: "table"
+  title: "VPP Compare NICs 3n-skx 4t2c pdr"
+  algorithm: "table_nics_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-4t2c-nics-pdr"
+  reference:
+    title: "Intel-x710"
+    nic: "NIC_Intel-X710"
+  compare:
+    title: "Intel-xxv710"
+    nic: "NIC_Intel-XXV710"
+  data: "vpp-nic-comparison-3n-skx"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T2C' and 'NDRPDR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+  - "tags"
+
+# VPP Compare NICs 3n-skx 2t1c mrr
+- type: "table"
+  title: "VPP Compare NICs 3n-skx 2t1c mrr"
+  algorithm: "table_nics_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-2t1c-nics-mrr"
+  reference:
+    title: "Intel-x710"
+    nic: "NIC_Intel-X710"
+  compare:
+    title: "Intel-xxv710"
+    nic: "NIC_Intel-XXV710"
+  data: "vpp-nic-comparison-3n-skx-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T1C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "result"
+  - "tags"
+
+# VPP Compare NICs 3n-skx 4t2c mrr
+- type: "table"
+  title: "VPP Compare NICs 3n-skx 4t2c mrr"
+  algorithm: "table_nics_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-4t2c-nics-mrr"
+  reference:
+    title: "Intel-x710"
+    nic: "NIC_Intel-X710"
+  compare:
+    title: "Intel-xxv710"
+    nic: "NIC_Intel-XXV710"
+  data: "vpp-nic-comparison-3n-skx-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T2C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "result"
+  - "tags"
+
+ # VPP Compare NICs 3n-skx 8t4c mrr
+- type: "table"
+  title: "VPP Compare NICs 3n-skx 8t4c mrr"
+  algorithm: "table_nics_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-8t4c-nics-mrr"
+  reference:
+    title: "Intel-x710"
+    nic: "NIC_Intel-X710"
+  compare:
+    title: "Intel-xxv710"
+    nic: "NIC_Intel-XXV710"
+  data: "vpp-nic-comparison-3n-skx-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'8T4C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "result"
+  - "tags"
+
+# VPP Compare NICs 2n-skx 2t1c ndr
+- type: "table"
+  title: "VPP Compare NICs 2n-skx 2t1c ndr"
+  algorithm: "table_nics_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-2t1c-nics-ndr"
+  reference:
+    title: "Intel-x710"
+    nic: "NIC_Intel-X710"
+  compare:
+    title: "Intel-xxv710"
+    nic: "NIC_Intel-XXV710"
+  data: "vpp-nic-comparison-2n-skx"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T1C' and 'NDRPDR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+  - "tags"
+
+# VPP Compare NICs 2n-skx 4t2c ndr
+- type: "table"
+  title: "VPP Compare NICs 2n-skx 4t2c ndr"
+  algorithm: "table_nics_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-4t2c-nics-ndr"
+  reference:
+    title: "Intel-x710"
+    nic: "NIC_Intel-X710"
+  compare:
+    title: "Intel-xxv710"
+    nic: "NIC_Intel-XXV710"
+  data: "vpp-nic-comparison-2n-skx"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T2C' and 'NDRPDR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+  - "tags"
+
+ # VPP Compare NICs 2n-skx 2t1c pdr
+- type: "table"
+  title: "VPP Compare NICs 2n-skx 2t1c pdr"
+  algorithm: "table_nics_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-2t1c-nics-pdr"
+  reference:
+    title: "Intel-x710"
+    nic: "NIC_Intel-X710"
+  compare:
+    title: "Intel-xxv710"
+    nic: "NIC_Intel-XXV710"
+  data: "vpp-nic-comparison-2n-skx"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T1C' and 'NDRPDR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+  - "tags"
+
+# VPP Compare NICs 2n-skx 4t2c pdr
+- type: "table"
+  title: "VPP Compare NICs 2n-skx 4t2c pdr"
+  algorithm: "table_nics_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-4t2c-nics-pdr"
+  reference:
+    title: "Intel-x710"
+    nic: "NIC_Intel-X710"
+  compare:
+    title: "Intel-xxv710"
+    nic: "NIC_Intel-XXV710"
+  data: "vpp-nic-comparison-2n-skx"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T2C' and 'NDRPDR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+  - "tags"
+
+# VPP Compare NICs 2n-skx 2t1c mrr
+- type: "table"
+  title: "VPP Compare NICs 2n-skx 2t1c mrr"
+  algorithm: "table_nics_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-2t1c-nics-mrr"
+  reference:
+    title: "Intel-x710"
+    nic: "NIC_Intel-X710"
+  compare:
+    title: "Intel-xxv710"
+    nic: "NIC_Intel-XXV710"
+  data: "vpp-nic-comparison-2n-skx-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T1C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "result"
+  - "tags"
+
+# VPP Compare NICs 2n-skx 4t2c mrr
+- type: "table"
+  title: "VPP Compare NICs 2n-skx 4t2c mrr"
+  algorithm: "table_nics_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-4t2c-nics-mrr"
+  reference:
+    title: "Intel-x710"
+    nic: "NIC_Intel-X710"
+  compare:
+    title: "Intel-xxv710"
+    nic: "NIC_Intel-XXV710"
+  data: "vpp-nic-comparison-2n-skx-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T2C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "result"
+  - "tags"
+
+# VPP Compare NICs 2n-skx 8t4c mrr
+- type: "table"
+  title: "VPP Compare NICs 2n-skx 8t4c mrr"
+  algorithm: "table_nics_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-8t4c-nics-mrr"
+  reference:
+    title: "Intel-x710"
+    nic: "NIC_Intel-X710"
+  compare:
+    title: "Intel-xxv710"
+    nic: "NIC_Intel-XXV710"
+  data: "vpp-nic-comparison-2n-skx-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'8T4C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "result"
+  - "tags"
+
+################################################################################
+# VPP
+
+# VPP Performance Changes 2n-dnv 1t1c pdr
+- type: "table"
+  title: "VPP Performance Changes 2n-dnv 1t1c pdr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-dnv-1t1c-pdr"
+  history:
+    - title: "rls1810"
+      data: "intel-dnv-vpp-changes-2n-dnv-h1"
+  reference:
+    title: "rls1901"
+    data: "intel-dnv-vpp-changes-2n-dnv-ref"
+  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')"
+  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"
+  history:
+    - title: "rls1810"
+      data: "intel-dnv-vpp-changes-2n-dnv-h1"
+  reference:
+    title: "rls1901"
+    data: "intel-dnv-vpp-changes-2n-dnv-ref"
+  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')"
+  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"
+  history:
+    - title: "rls1810"
+      data: "intel-dnv-vpp-changes-2n-dnv-h1"
+  reference:
+    title: "rls1901"
+    data: "intel-dnv-vpp-changes-2n-dnv-ref"
+  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')"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+
+# VPP Performance Changes 2n-dnv 2t2c ndr
+- type: "table"
+  title: "VPP Performance Changes 2n-dnv 2t2c ndr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-dnv-2t2c-ndr"
+  history:
+    - title: "rls1810"
+      data: "intel-dnv-vpp-changes-2n-dnv-h1"
+  reference:
+    title: "rls1901"
+    data: "intel-dnv-vpp-changes-2n-dnv-ref"
+  compare:
+    title: "rls1904"
+    data: "intel-dnv-vpp-changes-2n-dnv-cmp"
+  data: "intel-dnv-vpp-changes-2n-dnv"
+  include-tests: "NDR"
+  filter: "'2T2C' and ('NDRPDR' or 'NDRPDRDISC')"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+
+# VPP Performance Changes 2n-dnv 1t1c MRR
+- type: "table"
+  title: "VPP Performance Changes 2n-dnv 1t1c MRR"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-dnv-1t1c-mrr"
+  history:
+    - title: "rls1810"
+      data: "intel-dnv-vpp-changes-2n-dnv-h1"
+  reference:
+    title: "rls1901"
+    data: "intel-dnv-vpp-changes-2n-dnv-ref"
+  compare:
+    title: "rls1904"
+    data: "intel-dnv-vpp-changes-2n-dnv-cmp"
+  data: "intel-dnv-vpp-changes-2n-dnv"
+  include-tests: "MRR"
+  filter: "'1T1C' and 'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "result"
+
+# VPP Performance Changes 2n-dnv 2t2c MRR
+- type: "table"
+  title: "VPP Performance Changes 2n-dnv 2t2c MRR"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-dnv-2t2c-mrr"
+  history:
+    - title: "rls1810"
+      data: "intel-dnv-vpp-changes-2n-dnv-h1"
+  reference:
+    title: "rls1901"
+    data: "intel-dnv-vpp-changes-2n-dnv-ref"
+  compare:
+    title: "rls1904"
+    data: "intel-dnv-vpp-changes-2n-dnv-cmp"
+  data: "intel-dnv-vpp-changes-2n-dnv"
+  include-tests: "MRR"
+  filter: "'2T2C' and 'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "result"
+
+# VPP Performance Changes 2n-dnv 4t4c MRR
+- type: "table"
+  title: "VPP Performance Changes 2n-dnv 4t4c MRR"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-dnv-4t4c-mrr"
+  history:
+    - title: "rls1810"
+      data: "intel-dnv-vpp-changes-2n-dnv-h1"
+  reference:
+    title: "rls1901"
+    data: "intel-dnv-vpp-changes-2n-dnv-ref"
+  compare:
+    title: "rls1904"
+    data: "intel-dnv-vpp-changes-2n-dnv-cmp"
+  data: "intel-dnv-vpp-changes-2n-dnv"
+  include-tests: "MRR"
+  filter: "'4T4C' and 'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "result"
+
+# VPP Performance Changes 3n-hsw 1t1c pdr
+- type: "table"
+  title: "VPP Performance Changes 3n-hsw 1t1c pdr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-1t1c-pdr"
+  history:
+    - title: "rls1810"
+      data: "vpp-performance-changes-3n-hsw-h1"
+  reference:
+    title: "rls1901"
+    data: "vpp-performance-changes-3n-hsw-ref"
+  compare:
+    title: "rls1904"
+    data: "vpp-performance-changes-3n-hsw-cmp"
+  data: "vpp-performance-changes-3n-hsw"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'1T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+
+# VPP Performance Changes 3n-hsw 2t2c pdr
+- type: "table"
+  title: "VPP Performance Changes 3n-hsw 2t2c pdr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-2t2c-pdr"
+  history:
+    - title: "rls1810"
+      data: "vpp-performance-changes-3n-hsw-h1"
+  reference:
+    title: "rls1901"
+    data: "vpp-performance-changes-3n-hsw-ref"
+  compare:
+    title: "rls1904"
+    data: "vpp-performance-changes-3n-hsw-cmp"
+  data: "vpp-performance-changes-3n-hsw"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+
+# VPP Performance Changes 3n-hsw 1t1c ndr
+- type: "table"
+  title: "VPP Performance Changes 3n-hsw 1t1c ndr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-1t1c-ndr"
+  history:
+    - title: "rls1810"
+      data: "vpp-performance-changes-3n-hsw-h1"
+  reference:
+    title: "rls1901"
+    data: "vpp-performance-changes-3n-hsw-ref"
+  compare:
+    title: "rls1904"
+    data: "vpp-performance-changes-3n-hsw-cmp"
+  data: "vpp-performance-changes-3n-hsw"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'1T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+
+# VPP Performance Changes 3n-hsw 2t2c ndr
+- type: "table"
+  title: "VPP Performance Changes 3n-hsw 2t2c ndr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-2t2c-ndr"
+  history:
+    - title: "rls1810"
+      data: "vpp-performance-changes-3n-hsw-h1"
+  reference:
+    title: "rls1901"
+    data: "vpp-performance-changes-3n-hsw-ref"
+  compare:
+    title: "rls1904"
+    data: "vpp-performance-changes-3n-hsw-cmp"
+  data: "vpp-performance-changes-3n-hsw"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+
+# VPP Performance Changes 3n-skx 2t1c pdr
+- type: "table"
+  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"
+      data: "vpp-performance-changes-3n-skx-h1"
+  reference:
+    title: "rls1901"
+    data: "vpp-performance-changes-3n-skx-ref"
+  compare:
+    title: "rls1904"
+    data: "vpp-performance-changes-3n-skx-cmp"
+  data: "vpp-performance-changes-3n-skx"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+
+# VPP Performance Changes 3n-skx 4t2c pdr
+- 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"
+      data: "vpp-performance-changes-3n-skx-h1"
+  reference:
+    title: "rls1901"
+    data: "vpp-performance-changes-3n-skx-ref"
+  compare:
+    title: "rls1904"
+    data: "vpp-performance-changes-3n-skx-cmp"
+  data: "vpp-performance-changes-3n-skx"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+
+# VPP Performance Changes 3n-skx 2t1c ndr
+- 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"
+      data: "vpp-performance-changes-3n-skx-h1"
+  reference:
+    title: "rls1901"
+    data: "vpp-performance-changes-3n-skx-ref"
+  compare:
+    title: "rls1904"
+    data: "vpp-performance-changes-3n-skx-cmp"
+  data: "vpp-performance-changes-3n-skx"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+
+# VPP Performance Changes 3n-skx 4t2c ndr
+- 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"
+      data: "vpp-performance-changes-3n-skx-h1"
+  reference:
+    title: "rls1901"
+    data: "vpp-performance-changes-3n-skx-ref"
+  compare:
+    title: "rls1904"
+    data: "vpp-performance-changes-3n-skx-cmp"
+  data: "vpp-performance-changes-3n-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 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 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 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 Testbeds 3n-hsw to 3n-skx 1c ndr
+- type: "table"
+  title: "VPP Comparison Across Testbeds 3n-hsw to 3n-skx 1c ndr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-hsw-3n-skx-1c-ndr"
+  reference:
+    title: "3-Node Hsw"
+    data: "vpp-compare-testbeds-ref"
+  compare:
+    title: "3-Node Skx"
+    data: "vpp-compare-testbeds-cmp"
+  data: "vpp-compare-testbeds"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'NIC_Intel-X710' and 'NDRPDR' and '1C'"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+
+# VPP Comparison Across Testbeds 3n-hsw to 3n-skx 2c ndr
+- type: "table"
+  title: "VPP Comparison Across Testbeds 3n-hsw to 3n-skx 2c ndr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-hsw-3n-skx-2c-ndr"
+  reference:
+    title: "3-Node Hsw"
+    data: "vpp-compare-testbeds-ref"
+  compare:
+    title: "3-Node Skx"
+    data: "vpp-compare-testbeds-cmp"
+  data: "vpp-compare-testbeds"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'NIC_Intel-X710' and 'NDRPDR' and '2C'"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+
+# VPP Comparison Across Testbeds 3n-hsw to 3n-skx 1c pdr
+- type: "table"
+  title: "VPP Comparison Across Testbeds 3n-hsw to 3n-skx 1c pdr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-hsw-3n-skx-1c-pdr"
+  reference:
+    title: "3-Node Hsw"
+    data: "vpp-compare-testbeds-ref"
+  compare:
+    title: "3-Node Skx"
+    data: "vpp-compare-testbeds-cmp"
+  data: "vpp-compare-testbeds"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'NIC_Intel-X710' and 'NDRPDR' and '1C'"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+
+# VPP Comparison Across Testbeds 3n-hsw to 3n-skx 2c pdr
+- type: "table"
+  title: "VPP Comparison Across Testbeds 3n-hsw to 3n-skx 2c pdr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-hsw-3n-skx-2c-pdr"
+  reference:
+    title: "3-Node Hsw"
+    data: "vpp-compare-testbeds-ref"
+  compare:
+    title: "3-Node Skx"
+    data: "vpp-compare-testbeds-cmp"
+  data: "vpp-compare-testbeds"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'NIC_Intel-X710' and 'NDRPDR' and '2C'"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+
+# VPP Comparison Across Topologies 3n-skx to 2n-skx 1c ndr
+- type: "table"
+  title: "VPP Comparison Across Topologies 3n-skx to 2n-skx 1c ndr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-topologies-3n-skx-2n-skx-1c-ndr"
+  reference:
+    title: "3-Node Skx"
+    data: "vpp-compare-topologies-ref"
+  compare:
+    title: "2-Node Skx"
+    data: "vpp-compare-topologies-cmp"
+  data: "vpp-compare-topologies"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'NDRPDR' and '1C'"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+
+# VPP Comparison Across Topologies 3n-skx to 2n-skx 2c ndr
+- type: "table"
+  title: "VPP Comparison Across Topologies 3n-skx to 2n-skx 2c ndr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-topologies-3n-skx-2n-skx-2c-ndr"
+  reference:
+    title: "3-Node Skx"
+    data: "vpp-compare-topologies-ref"
+  compare:
+    title: "2-Node Skx"
+    data: "vpp-compare-topologies-cmp"
+  data: "vpp-compare-topologies"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'NDRPDR' and '2C'"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+
+# VPP Comparison Across Topologies 3n-skx to 2n-skx 1c pdr
+- type: "table"
+  title: "VPP Comparison Across Topologies 3n-skx to 2n-skx 1c pdr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-topologies-3n-skx-2n-skx-1c-pdr"
+  reference:
+    title: "3-Node Skx"
+    data: "vpp-compare-topologies-ref"
+  compare:
+    title: "2-Node Skx"
+    data: "vpp-compare-topologies-cmp"
+  data: "vpp-compare-topologies"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'NDRPDR' and '1C'"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+
+# VPP Comparison Across Topologies 3n-skx to 2n-skx 2c pdr
+- type: "table"
+  title: "VPP Comparison Across Topologies 3n-skx to 2n-skx 2c pdr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-topologies-3n-skx-2n-skx-2c-pdr"
+  reference:
+    title: "3-Node Skx"
+    data: "vpp-compare-topologies-ref"
+  compare:
+    title: "2-Node Skx"
+    data: "vpp-compare-topologies-cmp"
+  data: "vpp-compare-topologies"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'NDRPDR' and '2C'"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+
+# VPP Performance Changes 3n-hsw 1t1c MRR
+- type: "table"
+  title: "VPP Performance Changes 3n-hsw 1t1c MRR"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-1t1c-mrr"
+  history:
+    - title: "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"
+
+# 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'"
+  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: "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'"
+  parameters:
+  - "name"
+  - "parent"
+  - "result"
+
+# VPP Performance Changes 3n-skx 2t1c MRR
+- type: "table"
+  title: "VPP Performance Changes 3n-skx 2t1c MRR"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-2t1c-mrr"
+  history:
+    - title: "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: "rls1810"
-    data:
-      csit-vpp-perf-verify-1810-3n-hsw:
-      - 8   # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 14  # NDRPDR sel
-      - 18  # NDRPDR sel
-      - 23  # NDRPDR sel
-      - 25  # NDRPDR sel
-      - 38  # NDRPDR sel
-      - 39  # NDRPDR sel
-      - 41  # NDRPDR sel
-      - 42  # NDRPDR sel
-  data: "vpp-performance-changes"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+    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"
-  - "throughput"
+  - "result"
 
-# VPP Comparison Across Testbeds 3n-hsw to 3n-skx ndr
--
-  type: "table"
-  title: "VPP Comparison Across Testbeds 3n-hsw to 3n-skx ndr"
+# 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-ndr"
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-hsw-3n-skx-1c-mrr"
   reference:
     title: "3-Node Hsw"
-    data:
-      csit-vpp-perf-verify-1810-3n-hsw:
-      - 8   # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 14  # NDRPDR sel
-      - 18  # NDRPDR sel
-      - 23  # NDRPDR sel
-      - 25  # NDRPDR sel
-      - 38  # NDRPDR sel
-      - 39  # NDRPDR sel
-      - 41  # NDRPDR sel
-      - 42  # NDRPDR sel
+    data: "vpp-compare-testbeds-mrr-ref"
   compare:
     title: "3-Node Skx"
-    data:
-      csit-vpp-perf-verify-1810-3n-skx:
-      - 10  # NDRPDR sel
-      - 14  # NDRPDR sel
-      - 15  # NDRPDR sel
-      - 16  # NDRPDR sel
-      - 17  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 21  # NDRPDR sel
-      - 22  # NDRPDR sel
-      - 25  # NDRPDR sel
-  data: "vpp-compare-testbeds"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'NIC_Intel-X710' and 'NDRPDR'"
+    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"
-  - "throughput"
+  - "result"
 
-# VPP Comparison Across Testbeds 3n-hsw to 3n-skx pdr
--
-  type: "table"
-  title: "VPP Comparison Across Testbeds 3n-hsw to 3n-skx pdr"
+# 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-pdr"
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-hsw-3n-skx-2c-mrr"
   reference:
     title: "3-Node Hsw"
-    data:
-      csit-vpp-perf-verify-1810-3n-hsw:
-      - 8   # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 14  # NDRPDR sel
-      - 18  # NDRPDR sel
-      - 23  # NDRPDR sel
-      - 25  # NDRPDR sel
-      - 38  # NDRPDR sel
-      - 39  # NDRPDR sel
-      - 41  # NDRPDR sel
-      - 42  # NDRPDR sel
+    data: "vpp-compare-testbeds-mrr-ref"
   compare:
     title: "3-Node Skx"
-    data:
-      csit-vpp-perf-verify-1810-3n-skx:
-      - 10  # NDRPDR sel
-      - 14  # NDRPDR sel
-      - 15  # NDRPDR sel
-      - 16  # NDRPDR sel
-      - 17  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 21  # NDRPDR sel
-      - 22  # NDRPDR sel
-      - 25  # NDRPDR sel
-  data: "vpp-compare-testbeds"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'NIC_Intel-X710' and 'NDRPDR'"
+    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"
-  - "throughput"
+  - "result"
 
-# VPP Performance Changes - 1t1c MRR
--
-  type: "table"
-  title: "VPP Performance Changes - 1t1c MRR"
+# 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-changes-1t1c-mrr"
-  history:
-    -
-      title: "rls1804"
-      data:
-        csit-vpp-perf-check-1804:
-        - 6   # mrr - sel
-        - 13  # mrr - sel
-        - 14  # mrr - sel
-        - 15  # mrr - sel
-        - 16  # mrr - sel
-        - 17  # mrr - sel
-        - 19  # mrr - sel
-        - 20  # mrr - sel
-        - 21  # mrr - sel
-        - 22  # mrr - sel
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-hsw-3n-skx-4c-mrr"
   reference:
-    title: "rls1807"
-    data:
-      csit-vpp-perf-verify-1807-3n-hsw:
-      - 8   # MRR full
-      - 9   # MRR sel
-      - 21  # MRR sel
-      - 31  # MRR sel
-      - 33  # MRR sel
-      - 36  # MRR sel
-      - 41  # MRR sel
-      - 42  # MRR sel
-      - 48  # MRR sel
+    title: "3-Node Hsw"
+    data: "vpp-compare-testbeds-mrr-ref"
   compare:
-    title: "rls1810"
-    data:
-      csit-vpp-perf-verify-1810-3n-hsw:
-      - 9   # MRR sel
-  data: "vpp-performance-changes-mrr"
+    title: "3-Node Skx"
+    data: "vpp-compare-testbeds-mrr-cmp"
+  data: "vpp-compare-testbeds-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'1T1C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  filter: "'NIC_Intel-X710' and 'MRR' and '4C'"
   parameters:
   - "name"
   - "parent"
   - "result"
 
-# VPP Performance Changes - 2t2c MRR
--
-  type: "table"
-  title: "VPP Performance Changes - 2t2c MRR"
+# 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-changes-2t2c-mrr"
-  history:
-    -
-      title: "rls1804"
-      data:
-        csit-vpp-perf-check-1804:
-        - 6   # mrr - sel
-        - 13  # mrr - sel
-        - 14  # mrr - sel
-        - 15  # mrr - sel
-        - 16  # mrr - sel
-        - 17  # mrr - sel
-        - 19  # mrr - sel
-        - 20  # mrr - sel
-        - 21  # mrr - sel
-        - 22  # mrr - sel
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-topologies-3n-skx-2n-skx-1c-mrr"
   reference:
-    title: "rls1807"
-    data:
-      csit-vpp-perf-verify-1807-3n-hsw:
-      - 8   # MRR full
-      - 9   # MRR sel
-      - 21  # MRR sel
-      - 31  # MRR sel
-      - 33  # MRR sel
-      - 36  # MRR sel
-      - 41  # MRR sel
-      - 42  # MRR sel
-      - 48  # MRR sel
+    title: "3-Node Skx"
+    data: "vpp-compare-topologies-mrr-ref"
   compare:
-    title: "rls1810"
-    data:
-      csit-vpp-perf-verify-1810-3n-hsw:
-      - 9   # MRR sel
-  data: "vpp-performance-changes-mrr"
+    title: "2-Node Skx"
+    data: "vpp-compare-topologies-mrr-cmp"
+  data: "vpp-compare-topologies-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T2C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  filter: "'MRR' and '1C'"
   parameters:
   - "name"
   - "parent"
   - "result"
 
-# VPP Performance Changes - 4t4c MRR
--
-  type: "table"
-  title: "VPP Performance Changes - 4t4c MRR"
+# 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-changes-4t4c-mrr"
-  history:
-    -
-      title: "rls1804"
-      data:
-        csit-vpp-perf-check-1804:
-        - 6   # mrr - sel
-        - 13  # mrr - sel
-        - 14  # mrr - sel
-        - 15  # mrr - sel
-        - 16  # mrr - sel
-        - 17  # mrr - sel
-        - 19  # mrr - sel
-        - 20  # mrr - sel
-        - 21  # mrr - sel
-        - 22  # mrr - sel
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-topologies-3n-skx-2n-skx-2c-mrr"
   reference:
-    title: "rls1807"
-    data:
-      csit-vpp-perf-verify-1807-3n-hsw:
-      - 8   # MRR full
-      - 9   # MRR sel
-      - 21  # MRR sel
-      - 31  # MRR sel
-      - 33  # MRR sel
-      - 36  # MRR sel
-      - 41  # MRR sel
-      - 42  # MRR sel
-      - 48  # MRR sel
+    title: "3-Node Skx"
+    data: "vpp-compare-topologies-mrr-ref"
   compare:
-    title: "rls1810"
-    data:
-      csit-vpp-perf-verify-1810-3n-hsw:
-      - 9   # MRR sel
-  data: "vpp-performance-changes-mrr"
+    title: "2-Node Skx"
+    data: "vpp-compare-topologies-mrr-cmp"
+  data: "vpp-compare-topologies-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T4C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  filter: "'MRR' and '2C'"
   parameters:
   - "name"
   - "parent"
   - "result"
 
-# VPP Comparison Across Testbeds 3n-hsw to 3n-skx mrr
--
-  type: "table"
-  title: "VPP Comparison Across Testbeds 3n-hsw to 3n-skx mrr"
+# 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-testbeds-3n-hsw-3n-skx-mrr"
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-topologies-3n-skx-2n-skx-4c-mrr"
   reference:
-    title: "3-Node Hsw"
-    data:
-      csit-vpp-perf-verify-1810-3n-hsw:
-      - 9   # MRR sel
-  compare:
     title: "3-Node Skx"
-    data:
-      csit-vpp-perf-verify-1810-3n-skx:
-      - 9   # MRR sel
-      - 11  # MRR sel
-      - 12  # MRR sel
-      - 13  # MRR sel
-  data: "vpp-compare-testbeds-mrr"
+    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: "'NIC_Intel-X710' and 'MRR'"
+  filter: "'MRR' and '4C'"
   parameters:
   - "name"
   - "parent"
   - "result"
 
 # Detailed Test Results - VPP Performance Results 3n-hsw
--
-  type: "table"
+- 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"
+  - title: "Name"
     data: "data name"
-  -
-    title: "Status"
+  - title: "Status"
     data: "data msg"
   rows: "generated"
   data: "vpp-perf-results-3n-hsw"
@@ -1621,18 +2824,15 @@
   - "msg"
 
 # Detailed Test Results - VPP Performance Results 3n-skx
--
-  type: "table"
+- 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"
+  - title: "Name"
     data: "data name"
-  -
-    title: "Status"
+  - title: "Status"
     data: "data msg"
   rows: "generated"
   data: "vpp-perf-results-3n-skx"
@@ -1643,18 +2843,15 @@
   - "msg"
 
 # Detailed Test Results - VPP Performance Results 2n-skx
--
-  type: "table"
+- 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"
+  - title: "Name"
     data: "data name"
-  -
-    title: "Status"
+  - title: "Status"
     data: "data msg"
   rows: "generated"
   data: "vpp-perf-results-2n-skx"
@@ -1664,85 +2861,111 @@
   - "parent"
   - "msg"
 
+# Detailed Test Results - VPP Performance Results 2n-dnv
+- type: "table"
+  title: "Detailed Test Results - VPP Performance Results 2n-dnv"
+  algorithm: "table_details"
+  output-file-ext: ".csv"
+  output-file: "{DIR[DTR,PERF,VPP,2N,DNV]}/vpp_performance_results_2n_dnv"
+  columns:
+  - title: "Name"
+    data: "data name"
+  - title: "Status"
+    data: "data msg"
+  rows: "generated"
+  data: "intel-dnv-vpp"
+  filter: "'NDRPDR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "msg"
+
 # Test configuration - VPP Performance Test Configs 3n-hsw
--
-  type: "table"
+- 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"
+  - title: "Name"
     data: "data name"
-  -
-    title: "VPP API Test (VAT) Commands History - Commands Used Per Test Case"
-    data: "data vat-history"
+  - title: "VPP API Test Commands History - Commands Used Per Test Case"
+    data: "data conf-history"
   rows: "generated"
   data: "vpp-perf-results-3n-hsw"
   filter: "not 'NDRCHK' and not 'PDRCHK'"
   parameters:
   - "parent"
   - "name"
-  - "vat-history"
+  - "conf-history"
 
 # Test configuration - VPP Performance Test Configs 3n-skx
--
-  type: "table"
+- 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"
+  - title: "Name"
     data: "data name"
-  -
-    title: "VPP API Test (VAT) Commands History - Commands Used Per Test Case"
-    data: "data vat-history"
+  - 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:
   - "parent"
   - "name"
-  - "vat-history"
+  - "conf-history"
 
 # Test configuration - VPP Performance Test Configs 2n-skx
--
-  type: "table"
+- 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"
+  - title: "Name"
     data: "data name"
-  -
-    title: "VPP API Test (VAT) Commands History - Commands Used Per Test Case"
-    data: "data vat-history"
+  - title: "VPP API Test Commands History - Commands Used Per Test Case"
+    data: "data conf-history"
   rows: "generated"
   data: "vpp-perf-results-2n-skx"
   filter: "not 'NDRCHK' and not 'PDRCHK'"
   parameters:
   - "parent"
   - "name"
-  - "vat-history"
+  - "conf-history"
+
+# Test configuration - VPP Performance Test Configs 2n-dnv
+- type: "table"
+  title: "Test configuration - VPP Performance Test Configs 2n-dnv"
+  algorithm: "table_details"
+  output-file-ext: ".csv"
+  output-file: "{DIR[DTC,PERF,VPP,2N,DNV]}/vpp_test_configuration_2n_dnv"
+  columns:
+  - title: "Name"
+    data: "data name"
+  - title: "VPP API Test Commands History - Commands Used Per Test Case"
+    data: "data conf-history"
+  rows: "generated"
+  data: "intel-dnv-vpp"
+  filter: "'NDRPDR'"
+  parameters:
+  - "parent"
+  - "name"
+  - "conf-history"
 
 # Test Operational Data - VPP Performance Operational Data 3n-hsw
--
-  type: "table"
+- 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"
@@ -1753,18 +2976,15 @@
   - "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"
@@ -1775,18 +2995,15 @@
   - "show-run"
 
 # Test Operational Data - VPP Performance Operational Data 2n-skx
--
-  type: "table"
+- 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"
+  - 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-2n-skx"
@@ -1796,19 +3013,35 @@
   - "name"
   - "show-run"
 
+# Test Operational Data - VPP Performance Operational Data 2n-dnv
+- type: "table"
+  title: "Test Operational Data - VPP Performance Operational Data 2n-dnv"
+  algorithm: "table_details"
+  output-file-ext: ".csv"
+  output-file: "{DIR[DTO,PERF,VPP,2N,DNV]}/vpp_test_operational_2n_dnv"
+  columns:
+  - title: "Name"
+    data: "data name"
+  - title: "VPP Operational Data - Outputs of 'show runtime' at NDR packet rate"
+    data: "data show-run"
+  rows: "generated"
+  data: "intel-dnv-vpp"
+  filter: "'NDRPDR'"
+  parameters:
+  - "parent"
+  - "name"
+  - "show-run"
+
 # Detailed Test Results - VPP MRR Results 3n-hsw
--
-  type: "table"
+- 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"
+  - title: "Name"
     data: "data name"
-  -
-    title: "Status"
+  - title: "Status"
     data: "data msg"
   rows: "generated"
   data: "vpp-mrr-results-3n-hsw"
@@ -1819,18 +3052,15 @@
   - "msg"
 
 # Detailed Test Results - VPP MRR Results 3n-skx
--
-  type: "table"
+- 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"
+  - title: "Name"
     data: "data name"
-  -
-    title: "Status"
+  - title: "Status"
     data: "data msg"
   rows: "generated"
   data: "vpp-mrr-results-3n-skx"
@@ -1841,18 +3071,15 @@
   - "msg"
 
 # Detailed Test Results - VPP MRR Results 2n-skx
--
-  type: "table"
+- 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"
+  - title: "Name"
     data: "data name"
-  -
-    title: "Status"
+  - title: "Status"
     data: "data msg"
   rows: "generated"
   data: "vpp-mrr-results-2n-skx"
@@ -1862,88 +3089,113 @@
   - "parent"
   - "msg"
 
+# Detailed Test Results - VPP MRR Results 2n-dnv
+- type: "table"
+  title: "Detailed Test Results - VPP MRR Results 2n-dnv"
+  algorithm: "table_details"
+  output-file-ext: ".csv"
+  output-file: "{DIR[DTR,MRR,VPP,2N,DNV]}/vpp_mrr_results_2n_dnv"
+  columns:
+  - title: "Name"
+    data: "data name"
+  - title: "Status"
+    data: "data msg"
+  rows: "generated"
+  data: "intel-dnv-vpp"
+  filter: "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "msg"
+
 # Test configuration - VPP MRR Test Configs 3n-hsw
--
-  type: "table"
+- 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"
+  - title: "Name"
     data: "data name"
-  -
-    title: "VPP API Test (VAT) Commands History - Commands Used Per Test Case"
-    data: "data vat-history"
+  - 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"
-  - "vat-history"
+  - "conf-history"
 
 # Test configuration - VPP MRR Test Configs 3n-skx
--
-  type: "table"
+- 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"
+  - title: "Name"
     data: "data name"
-  -
-    title: "VPP API Test (VAT) Commands History - Commands Used Per Test Case"
-    data: "data vat-history"
+  - 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"
-  - "vat-history"
+  - "conf-history"
 
 # Test configuration - VPP MRR Test Configs 2n-skx
--
-  type: "table"
+- 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"
+  - title: "Name"
     data: "data name"
-  -
-    title: "VPP API Test (VAT) Commands History - Commands Used Per Test Case"
-    data: "data vat-history"
+  - 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"
-  - "vat-history"
+  - "conf-history"
+
+# Test configuration - VPP MRR Test Configs 2n-dnv
+- type: "table"
+  title: "Test configuration - VPP MRR Test Configs 2n-dnv"
+  algorithm: "table_details"
+  output-file-ext: ".csv"
+  output-file: "{DIR[DTC,MRR,VPP,2N,DNV]}/vpp_mrr_test_configuration_2n_dnv"
+  columns:
+  - title: "Name"
+    data: "data name"
+  - title: "VPP API Test Commands History - Commands Used Per Test Case"
+    data: "data conf-history"
+  rows: "generated"
+  data: "intel-dnv-vpp"
+  filter: "'MRR'"
+  parameters:
+  - "parent"
+  - "name"
+  - "conf-history"
 
 # Detailed Test Results - VPP Functional Results - Ubuntu
--
-  type: "table"
+- 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"
@@ -1955,18 +3207,15 @@
   - "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"
@@ -1982,62 +3231,53 @@
   - "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 (VAT) Commands History - Commands Used Per Test Case"
-    data: "data vat-history"
+  - title: "VPP API Test Commands History - Commands Used Per Test Case"
+    data: "data conf-history"
   rows: "generated"
   data: "vpp-func-results-ubuntu"
   filter: "all"
   parameters:
   - "parent"
   - "name"
-  - "vat-history"
+  - "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 (VAT) Commands History - Commands Used Per Test Case"
-    data: "data vat-history"
+  - title: "VPP API Test Commands History - Commands Used Per Test Case"
+    data: "data conf-history"
   rows: "generated"
   data: "vpp-func-results-centos"
   filter: "all"
   parameters:
   - "parent"
   - "name"
-  - "vat-history"
+  - "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"
@@ -2048,21 +3288,17 @@
   - "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"
@@ -2070,295 +3306,217 @@
   parameters:
   - "name"
   - "parent"
-  - "doc"
-  - "status"
+  - "doc"
+  - "status"
+
+# Test configuration - VPP Device Test Configs - Ubuntu
+- 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"
+    data: "data name"
+  - title: "VPP API Test Commands History - Commands Used Per Test Case"
+    data: "data conf-history"
+  rows: "generated"
+  data: "vpp-device-results-ubuntu"
+  filter: "all"
+  parameters:
+  - "parent"
+  - "name"
+  - "conf-history"
+
+################################################################################
+
+# DPDK Performance Changes 3n-hsw 1t1c pdr
+- 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"
+      data: "dpdk-performance-changes-3n-hsw-h1"
+  reference:
+    title: "rls1901"
+    data: "dpdk-performance-changes-3n-hsw-ref"
+  compare:
+    title: "rls1904"
+    data: "dpdk-performance-changes-3n-hsw-cmp"
+  data: "dpdk-performance-changes-3n-hsw"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'1T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+
+# DPDK Performance Changes 3n-hsw 2t2c pdr
+- 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"
+      data: "dpdk-performance-changes-3n-hsw-h1"
+  reference:
+    title: "rls1901"
+    data: "dpdk-performance-changes-3n-hsw-ref"
+  compare:
+    title: "rls1904"
+    data: "dpdk-performance-changes-3n-hsw-cmp"
+  data: "dpdk-performance-changes-3n-hsw"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+
+# DPDK Performance Changes 3n-hsw 1t1c ndr
+- 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"
+      data: "dpdk-performance-changes-3n-hsw-h1"
+  reference:
+    title: "rls1901"
+    data: "dpdk-performance-changes-3n-hsw-ref"
+  compare:
+    title: "rls1904"
+    data: "dpdk-performance-changes-3n-hsw-cmp"
+  data: "dpdk-performance-changes-3n-hsw"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'1T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
 
-# Test configuration - VPP Device Test Configs - Ubuntu
--
-  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"
-    data: "data name"
-  -
-    title: "VPP API Test (VAT) Commands History - Commands Used Per Test Case"
-    data: "data vat-history"
-  rows: "generated"
-  data: "vpp-device-results-ubuntu"
-  filter: "all"
+# DPDK Performance Changes 3n-hsw 2t2c ndr
+- 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"
+      data: "dpdk-performance-changes-3n-hsw-h1"
+  reference:
+    title: "rls1901"
+    data: "dpdk-performance-changes-3n-hsw-ref"
+  compare:
+    title: "rls1904"
+    data: "dpdk-performance-changes-3n-hsw-cmp"
+  data: "dpdk-performance-changes-3n-hsw"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
-  - "parent"
   - "name"
-  - "vat-history"
-
-################################################################################
+  - "parent"
+  - "throughput"
 
-# DPDK Performance Changes 1t1c pdr
--
-  type: "table"
-  title: "DPDK Performance Changes 1t1c pdr"
+# DPDK Performance Changes 3n-skx 2t1c pdr
+- type: "table"
+  title: "DPDK Performance Changes 3n-skx 2t1c pdr"
   algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-changes-1t1c-pdr"
+  output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-skx-2t1c-pdr"
   history:
-    -
-      title: "rls1804"
-      data:
-        csit-dpdk-perf-1804-all:
-        - 4
-        - 5
-        - 6
-        - 7
-        - 8
-        - 9
-        - 10
-        - 11
-        - 12
-        - 13
+    - title: "rls1810"
+      data: "dpdk-performance-changes-3n-skx-h1"
   reference:
-    title: "rls1807"
-    data:
-      csit-dpdk-perf-verify-1807-3n-hsw:
-      - 11
-      - 12  # full
-      - 14
-      - 15
-      - 16
-      - 17
-      - 20
-      - 21
-      - 22
-      - 23
+    title: "rls1901"
+    data: "dpdk-performance-changes-3n-skx-ref"
   compare:
-    title: "rls1810"
-    data:
-      csit-dpdk-perf-verify-1810-3n-hsw:
-      - 1   # NDRPDR sel
-      - 2   # NDRPDR sel
-      - 3   # NDRPDR sel
-      - 4   # NDRPDR sel
-      - 5   # NDRPDR sel
-      - 6   # NDRPDR sel
-      - 7   # NDRPDR sel
-      - 8   # NDRPDR sel
-      - 9   # NDRPDR sel
-      - 10  # NDRPDR sel
-  data: "dpdk-performance-changes"
+    title: "rls1904"
+    data: "dpdk-performance-changes-3n-skx-cmp"
+  data: "dpdk-performance-changes-3n-skx"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'1T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  filter: "'2T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
   - "name"
   - "parent"
   - "throughput"
 
-# DPDK Performance Changes 2t2c pdr
--
-  type: "table"
-  title: "DPDK Performance Changes 2t2c pdr"
+# DPDK Performance Changes 3n-skx 4t2c pdr
+- type: "table"
+  title: "DPDK Performance Changes 3n-skx 4t2c pdr"
   algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-changes-2t2c-pdr"
+  output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-skx-4t2c-pdr"
   history:
-    -
-      title: "rls1804"
-      data:
-        csit-dpdk-perf-1804-all:
-        - 4
-        - 5
-        - 6
-        - 7
-        - 8
-        - 9
-        - 10
-        - 11
-        - 12
-        - 13
+    - title: "rls1810"
+      data: "dpdk-performance-changes-3n-skx-h1"
   reference:
-    title: "rls1807"
-    data:
-      csit-dpdk-perf-verify-1807-3n-hsw:
-      - 11
-      - 12  # full
-      - 14
-      - 15
-      - 16
-      - 17
-      - 20
-      - 21
-      - 22
-      - 23
+    title: "rls1901"
+    data: "dpdk-performance-changes-3n-skx-ref"
   compare:
-    title: "rls1810"
-    data:
-      csit-dpdk-perf-verify-1810-3n-hsw:
-      - 1   # NDRPDR sel
-      - 2   # NDRPDR sel
-      - 3   # NDRPDR sel
-      - 4   # NDRPDR sel
-      - 5   # NDRPDR sel
-      - 6   # NDRPDR sel
-      - 7   # NDRPDR sel
-      - 8   # NDRPDR sel
-      - 9   # NDRPDR sel
-      - 10  # NDRPDR sel
-  data: "dpdk-performance-changes"
+    title: "rls1904"
+    data: "dpdk-performance-changes-3n-skx-cmp"
+  data: "dpdk-performance-changes-3n-skx"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  filter: "'4T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
   - "name"
   - "parent"
   - "throughput"
 
-# DPDK Performance Changes 1t1c ndr
--
-  type: "table"
-  title: "DPDK Performance Changes 1t1c ndr"
+# DPDK Performance Changes 3n-skx 2t1c ndr
+- type: "table"
+  title: "DPDK Performance Changes 3n-skx 2t1c ndr"
   algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-changes-1t1c-ndr"
+  output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-skx-2t1c-ndr"
   history:
-    -
-      title: "rls1804"
-      data:
-        csit-dpdk-perf-1804-all:
-        - 4
-        - 5
-        - 6
-        - 7
-        - 8
-        - 9
-        - 10
-        - 11
-        - 12
-        - 13
+    - title: "rls1810"
+      data: "dpdk-performance-changes-3n-skx-h1"
   reference:
-    title: "rls1807"
-    data:
-      csit-dpdk-perf-verify-1807-3n-hsw:
-      - 11
-      - 12  # full
-      - 14
-      - 15
-      - 16
-      - 17
-      - 20
-      - 21
-      - 22
-      - 23
+    title: "rls1901"
+    data: "dpdk-performance-changes-3n-skx-ref"
   compare:
-    title: "rls1810"
-    data:
-      csit-dpdk-perf-verify-1810-3n-hsw:
-      - 1   # NDRPDR sel
-      - 2   # NDRPDR sel
-      - 3   # NDRPDR sel
-      - 4   # NDRPDR sel
-      - 5   # NDRPDR sel
-      - 6   # NDRPDR sel
-      - 7   # NDRPDR sel
-      - 8   # NDRPDR sel
-      - 9   # NDRPDR sel
-      - 10  # NDRPDR sel
-  data: "dpdk-performance-changes"
+    title: "rls1904"
+    data: "dpdk-performance-changes-3n-skx-cmp"
+  data: "dpdk-performance-changes-3n-skx"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'1T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  filter: "'2T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
   - "name"
   - "parent"
   - "throughput"
 
-# DPDK Performance Changes 2t2c ndr
--
-  type: "table"
-  title: "DPDK Performance Changes 2t2c ndr"
+# DPDK Performance Changes 3n-skx 4t2c ndr
+- type: "table"
+  title: "DPDK Performance Changes 3n-skx 4t2c ndr"
   algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-changes-2t2c-ndr"
+  output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-skx-4t2c-ndr"
   history:
-    -
-      title: "rls1804"
-      data:
-        csit-dpdk-perf-1804-all:
-        - 4
-        - 5
-        - 6
-        - 7
-        - 8
-        - 9
-        - 10
-        - 11
-        - 12
-        - 13
+    - title: "rls1810"
+      data: "dpdk-performance-changes-3n-skx-h1"
   reference:
-    title: "rls1807"
-    data:
-      csit-dpdk-perf-verify-1807-3n-hsw:
-      - 11
-      - 12  # full
-      - 14
-      - 15
-      - 16
-      - 17
-      - 20
-      - 21
-      - 22
-      - 23
+    title: "rls1901"
+    data: "dpdk-performance-changes-3n-skx-ref"
   compare:
-    title: "rls1810"
-    data:
-      csit-dpdk-perf-verify-1810-3n-hsw:
-      - 1   # NDRPDR sel
-      - 2   # NDRPDR sel
-      - 3   # NDRPDR sel
-      - 4   # NDRPDR sel
-      - 5   # NDRPDR sel
-      - 6   # NDRPDR sel
-      - 7   # NDRPDR sel
-      - 8   # NDRPDR sel
-      - 9   # NDRPDR sel
-      - 10  # NDRPDR sel
-  data: "dpdk-performance-changes"
+    title: "rls1904"
+    data: "dpdk-performance-changes-3n-skx-cmp"
+  data: "dpdk-performance-changes-3n-skx"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  filter: "'4T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
   - "name"
   - "parent"
   - "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"
   reference:
     title: "3-Node Hsw"
-    data:
-      csit-dpdk-perf-verify-1810-3n-hsw:
-      - 1   # NDRPDR sel
-      - 2   # NDRPDR sel
-      - 3   # NDRPDR sel
-      - 4   # NDRPDR sel
-      - 5   # NDRPDR sel
-      - 6   # NDRPDR sel
-      - 7   # NDRPDR sel
-      - 8   # NDRPDR sel
-      - 9   # NDRPDR sel
-      - 10  # NDRPDR sel
+    data: "dpdk-compare-testbeds-ref"
   compare:
     title: "3-Node Skx"
-    data:
-      csit-dpdk-perf-verify-1810-3n-skx:
-      - 3   # NDRPDR sel
-      - 4   # NDRPDR sel
-      - 6   # NDRPDR sel
-      - 7   # NDRPDR sel
-      - 8   # NDRPDR sel
-      - 9   # NDRPDR sel
-      - 10  # NDRPDR sel
-      - 11  # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
+    data: "dpdk-compare-testbeds-cmp"
   data: "dpdk-compare-testbeds"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'NIC_Intel-X710' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -2368,39 +3526,16 @@
   - "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"
   reference:
     title: "3-Node Hsw"
-    data:
-      csit-dpdk-perf-verify-1810-3n-hsw:
-      - 1   # NDRPDR sel
-      - 2   # NDRPDR sel
-      - 3   # NDRPDR sel
-      - 4   # NDRPDR sel
-      - 5   # NDRPDR sel
-      - 6   # NDRPDR sel
-      - 7   # NDRPDR sel
-      - 8   # NDRPDR sel
-      - 9   # NDRPDR sel
-      - 10  # NDRPDR sel
+    data: "dpdk-compare-testbeds-ref"
   compare:
     title: "3-Node Skx"
-    data:
-      csit-dpdk-perf-verify-1810-3n-skx:
-      - 3   # NDRPDR sel
-      - 4   # NDRPDR sel
-      - 6   # NDRPDR sel
-      - 7   # NDRPDR sel
-      - 8   # NDRPDR sel
-      - 9   # NDRPDR sel
-      - 10  # NDRPDR sel
-      - 11  # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
+    data: "dpdk-compare-testbeds-cmp"
   data: "dpdk-compare-testbeds"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'NIC_Intel-X710' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -2409,62 +3544,142 @@
   - "parent"
   - "throughput"
 
-# DPDK Comparison Across Testbeds 3n-hsw to 3n-skx mrr
-# NOTE: Not used in 18.10
-#-
-#  type: "table"
-#  title: "DPDK Comparison Across Testbeds 3n-hsw to 3n-skx mrr"
-#  algorithm: "table_performance_comparison"
-#  output-file: "{DIR[STATIC,DPDK]}/performance-compare-testbeds-3n-hsw-3n-skx-mrr"
-#  reference:
-#    title: "3-Node Hsw"
-#    data:
-#      csit-dpdk-perf-verify-1807-3n-hsw:
-#      - 11
-#      - 12  # full
-#      - 14
-#      - 15
-#      - 16
-#      - 17
-#      - 20
-#      - 21
-#      - 22
-#      - 23
-#  compare:
-#    title: "3-Node Skx"
-#    data:
-#      csit-dpdk-perf-verify-1807-3n-skx:
-#      - 1
-#      - 2
-#      - 3
-#      - 6
-#      - 7
-#      - 8
-#      - 9
-#      - 10
-#      - 11
-#      - 12
-#  data: "dpdk-compare-testbeds"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  filter: "'NIC_Intel-X710' and MRR" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "result"
+# DPDK Comparison Across Topologies 3n-skx to 2n-skx ndr
+- type: "table"
+  title: "DPDK Comparison Across Topologies 3n-skx to 2n-skx ndr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-compare-topologies-3n-skx-2n-skx-ndr"
+  reference:
+    title: "3-Node Skx"
+    data: "dpdk-compare-topologies-ref"
+  compare:
+    title: "2-Node Skx"
+    data: "dpdk-compare-topologies-cmp"
+  data: "dpdk-compare-topologies"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'NDRPDR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+
+# DPDK Comparison Across Topologies 3n-skx to 2n-skx pdr
+- type: "table"
+  title: "DPDK Comparison Across Topologies 3n-skx to 2n-skx pdr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-compare-topologies-3n-skx-2n-skx-pdr"
+  reference:
+    title: "3-Node Skx"
+    data: "dpdk-compare-topologies-ref"
+  compare:
+    title: "2-Node Skx"
+    data: "dpdk-compare-topologies-cmp"
+  data: "dpdk-compare-topologies"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'NDRPDR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+
+# DPDK Performance Changes 2n-skx 2t1c pdr
+- 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"
+    data: "dpdk-performance-changes-2n-skx-ref"
+  compare:
+    title: "rls1904"
+    data: "dpdk-performance-changes-2n-skx-cmp"
+  data: "dpdk-performance-changes-2n-skx"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+
+# DPDK Performance Changes 2n-skx 4t2c pdr
+- 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"
+    data: "dpdk-performance-changes-2n-skx-ref"
+  compare:
+    title: "rls1904"
+    data: "dpdk-performance-changes-2n-skx-cmp"
+  data: "dpdk-performance-changes-2n-skx"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+
+# DPDK Performance Changes 2n-skx 2t1c ndr
+- 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"
+    data: "dpdk-performance-changes-2n-skx-ref"
+  compare:
+    title: "rls1904"
+    data: "dpdk-performance-changes-2n-skx-cmp"
+  data: "dpdk-performance-changes-2n-skx"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+
+# DPDK Performance Changes 2n-skx 4t2c ndr
+- 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"
+    data: "dpdk-performance-changes-2n-skx-ref"
+  compare:
+    title: "rls1904"
+    data: "dpdk-performance-changes-2n-skx-cmp"
+  data: "dpdk-performance-changes-2n-skx"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "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"
@@ -2475,18 +3690,15 @@
   - "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"
@@ -2497,18 +3709,15 @@
   - "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"
@@ -2520,21 +3729,17 @@
 
 ################################################################################
 # HoneyComb
--
-  type: "table"
+- 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"
+  - title: "Name"
     data: "data name"
-  -
-    title: "Documentation"
+  - title: "Documentation"
     data: "data doc"
-  -
-    title: "Status"
+  - title: "Status"
     data: "data status"
   rows: "generated"
   data:
@@ -2548,49 +3753,45 @@
 
 ################################################################################
 # NSH SFC
--
-  type: "table"
-  title: "Detailed Test Results - NSH SFC Functional Results"
-  algorithm: "table_details"
-  output-file-ext: ".csv"
-  output-file: "{DIR[DTR,FUNC,NSHSFC]}/nsh_sfc_functional_results"
-  columns:
-  -
-    title: "Name"
-    data: "data name"
-  -
-    title: "Documentation"
-    data: "data doc"
-  -
-    title: "Status"
-    data: "data status"
-  rows: "generated"
-  data:
-    "nsh-func-results"
-  filter: "all"
-  parameters:
-  - "name"
-  - "parent"
-  - "doc"
-  - "status"
+#-
+#  type: "table"
+#  title: "Detailed Test Results - NSH SFC Functional Results"
+#  algorithm: "table_details"
+#  output-file-ext: ".csv"
+#  output-file: "{DIR[DTR,FUNC,NSHSFC]}/nsh_sfc_functional_results"
+#  columns:
+#  -
+#    title: "Name"
+#    data: "data name"
+#  -
+#    title: "Documentation"
+#    data: "data doc"
+#  -
+#    title: "Status"
+#    data: "data status"
+#  rows: "generated"
+#  data:
+#    "nsh-func-results"
+#  filter: "all"
+#  parameters:
+#  - "name"
+#  - "parent"
+#  - "doc"
+#  - "status"
 
 ################################################################################
 # DMM
--
-  type: "table"
+- 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"
+  - title: "Name"
     data: "data name"
-  -
-    title: "Documentation"
+  - title: "Documentation"
     data: "data doc"
-  -
-    title: "Status"
+  - title: "Status"
     data: "data status"
   rows: "generated"
   data:
@@ -2607,8 +3808,7 @@
 ################################################################################
 
 # VPP Performance Results 3n-hsw
--
-  type: "file"
+- type: "file"
   title: "VPP Performance Results 3n-hsw"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
@@ -2625,8 +3825,7 @@
   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"
@@ -2643,8 +3842,7 @@
   data-start-level: 3
 
 # VPP Performance Results 2n-skx
--
-  type: "file"
+- type: "file"
   title: "VPP Performance Results 2n-skx"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
@@ -2660,9 +3858,25 @@
   - "parent"
   data-start-level: 3
 
+# VPP Performance Results 2n-dnv
+- type: "file"
+  title: "VPP Performance Results 2n-dnv"
+  algorithm: "file_test_results"
+  output-file-ext: ".rst"
+  output-file: "{DIR[DTR,PERF,VPP,2N,DNV]}/vpp_performance_results_2n_dnv"
+  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
+  dir-tables: "{DIR[DTR,PERF,VPP,2N,DNV]}"
+  data: "intel-dnv-vpp"
+  filter: "'NDRPDR'"
+  parameters:
+  - "name"
+  - "doc"
+  - "level"
+  - "parent"
+  data-start-level: 3
+
 # VPP Performance Configuration 3n-hsw
--
-  type: "file"
+- type: "file"
   title: "VPP Performance Configuration 3n-hsw"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
@@ -2679,8 +3893,7 @@
   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"
@@ -2697,8 +3910,7 @@
   data-start-level: 3
 
 # VPP Performance Configuration 2n-skx
--
-  type: "file"
+- type: "file"
   title: "VPP Performance Configuration 2n-skx"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
@@ -2714,9 +3926,25 @@
   - "parent"
   data-start-level: 3
 
+# VPP Performance Configuration 2n-dnv
+- type: "file"
+  title: "VPP Performance Configuration 2n-dnv"
+  algorithm: "file_test_results"
+  output-file-ext: ".rst"
+  output-file: "{DIR[DTC,PERF,VPP,2N,DNV]}/vpp_performance_configuration_2n_dnv"
+  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
+  dir-tables: "{DIR[DTC,PERF,VPP,2N,DNV]}"
+  data: "intel-dnv-vpp"
+  filter: "'NDRPDR'"
+  parameters:
+  - "name"
+  - "doc"
+  - "level"
+  - "parent"
+  data-start-level: 3
+
 # VPP Performance Operational Data 3n-hsw
--
-  type: "file"
+- type: "file"
   title: "VPP Performance Operational Data 3n-hsw"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
@@ -2733,8 +3961,7 @@
   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"
@@ -2751,8 +3978,7 @@
   data-start-level: 3
 
 # VPP Performance Operational Data 2n-skx
--
-  type: "file"
+- type: "file"
   title: "VPP Performance Operational Data 2n-skx"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
@@ -2768,9 +3994,25 @@
   - "parent"
   data-start-level: 3
 
+# VPP Performance Operational Data 2n-dnv
+- type: "file"
+  title: "VPP Performance Operational Data 2n-dnv"
+  algorithm: "file_test_results"
+  output-file-ext: ".rst"
+  output-file: "{DIR[DTO,PERF,VPP,2N,DNV]}/vpp_performance_operational_data_2n_dnv"
+  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
+  dir-tables: "{DIR[DTO,PERF,VPP,2N,DNV]}"
+  data: "intel-dnv-vpp"
+  filter: "'NDRPDR'"
+  parameters:
+  - "name"
+  - "doc"
+  - "level"
+  - "parent"
+  data-start-level: 3
+
 # VPP MRR Results 3n-hsw
--
-  type: "file"
+- type: "file"
   title: "VPP MRR Results 3n-hsw"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
@@ -2787,8 +4029,7 @@
   data-start-level: 3
 
 # VPP MRR Results 3n-skx
--
-  type: "file"
+- type: "file"
   title: "VPP MRR Results 3n-skx"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
@@ -2805,8 +4046,7 @@
   data-start-level: 3
 
 # VPP MRR Results 2n-skx
--
-  type: "file"
+- type: "file"
   title: "VPP MRR Results 2n-skx"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
@@ -2822,9 +4062,25 @@
   - "parent"
   data-start-level: 3
 
+# VPP MRR Results 2n-dnv
+- type: "file"
+  title: "VPP MRR Results 2n-dnv"
+  algorithm: "file_test_results"
+  output-file-ext: ".rst"
+  output-file: "{DIR[DTR,MRR,VPP,2N,DNV]}/vpp_mrr_results_2n_dnv"
+  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
+  dir-tables: "{DIR[DTR,MRR,VPP,2N,DNV]}"
+  data: "intel-dnv-vpp"
+  filter: "'MRR'"
+  parameters:
+  - "name"
+  - "doc"
+  - "level"
+  - "parent"
+  data-start-level: 3
+
 # VPP MRR Configuration 3n-hsw
--
-  type: "file"
+- type: "file"
   title: "VPP MRR Configuration 3n-hsw"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
@@ -2841,8 +4097,7 @@
   data-start-level: 3
 
 # VPP MRR Configuration 3n-skx
--
-  type: "file"
+- type: "file"
   title: "VPP MRR Configuration 3n-skx"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
@@ -2859,8 +4114,7 @@
   data-start-level: 3
 
 # VPP MRR Configuration 2n-skx
--
-  type: "file"
+- type: "file"
   title: "VPP MRR Configuration 2n-skx"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
@@ -2876,9 +4130,25 @@
   - "parent"
   data-start-level: 3
 
+# VPP MRR Configuration 2n-dnv
+- type: "file"
+  title: "VPP MRR Configuration 2n-dnv"
+  algorithm: "file_test_results"
+  output-file-ext: ".rst"
+  output-file: "{DIR[DTC,MRR,VPP,2N,DNV]}/vpp_mrr_configuration_2n_dnv"
+  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
+  dir-tables: "{DIR[DTC,MRR,VPP,2N,DNV]}"
+  data: "intel-dnv-vpp"
+  filter: "'MRR'"
+  parameters:
+  - "name"
+  - "doc"
+  - "level"
+  - "parent"
+  data-start-level: 3
+
 # VPP Functional Results - Ubuntu
--
-  type: "file"
+- type: "file"
   title: "VPP Functional Results - Ubuntu"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
@@ -2895,8 +4165,7 @@
   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"
@@ -2914,8 +4183,7 @@
   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"
@@ -2932,8 +4200,7 @@
   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"
@@ -2951,8 +4218,7 @@
   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"
@@ -2969,8 +4235,7 @@
   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"
@@ -2987,8 +4252,7 @@
   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"
@@ -3005,8 +4269,7 @@
   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"
@@ -3023,8 +4286,7 @@
   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"
@@ -3041,8 +4303,7 @@
   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"
@@ -3059,8 +4320,7 @@
   data-start-level: 3
 
 # Honeycomb Functional Results
--
-  type: "file"
+- type: "file"
   title: "Honeycomb Functional Results"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
@@ -3078,27 +4338,26 @@
   data-start-level: 3
 
 # NSH SFC Functional Results
--
-  type: "file"
-  title: "NSH SFC Functional Results"
-  algorithm: "file_test_results"
-  output-file-ext: ".rst"
-  output-file: "{DIR[DTR,FUNC,NSHSFC]}/nshsfc_functional_results"
-  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
-  dir-tables: "{DIR[DTR,FUNC,NSHSFC]}"
-  data:
-    "nsh-func-results"
-  filter: "all"
-  parameters:
-  - "name"
-  - "doc"
-  - "level"
-  - "parent"
-  data-start-level: 3
+#-
+#  type: "file"
+#  title: "NSH SFC Functional Results"
+#  algorithm: "file_test_results"
+#  output-file-ext: ".rst"
+#  output-file: "{DIR[DTR,FUNC,NSHSFC]}/nshsfc_functional_results"
+#  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
+#  dir-tables: "{DIR[DTR,FUNC,NSHSFC]}"
+#  data:
+#    "nsh-func-results"
+#  filter: "all"
+#  parameters:
+#  - "name"
+#  - "doc"
+#  - "level"
+#  - "parent"
+#  data-start-level: 3
 
 # DMM Functional Results
--
-  type: "file"
+- type: "file"
   title: "DMM Functional Results"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
@@ -3119,749 +4378,1020 @@
 ###                                P L O T S                                 ###
 ################################################################################
 
+# Soak test - 30min Soak Test (PLRsearch), boxes
+- type: "plot"
+  title: "VPP Throughput: 30min Soak Test (PLRsearch) boxes"
+  algorithm: "plot_soak_boxes"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/example-soak-boxes"
+  data: "plot-vpp-soak-2n-skx"
+  filter: "'SOAK'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  sort:
+  - "L2PATCH"
+#  - "L2XCBASE"
+#  - "L2BDMACLRN"
+#  - "IP4FWD"
+#  - "IP6FWD"
+  - "VHOST"
+  layout:
+    title: "30min Soak Test (PLRsearch)"
+    layout: "plot-soak-throughput"
+
+# Soak test - example, not used
+- type: "plot"
+  title: "VPP Throughput: 30min Soak Test (PLRsearch) bars"
+  algorithm: "plot_soak_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/example-soak-bars"
+  data: "plot-vpp-soak-2n-skx"
+  filter: "'SOAK'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  sort:
+  - "L2PATCH"
+#  - "L2XCBASE"
+#  - "L2BDMACLRN"
+#  - "IP4FWD"
+#  - "IP6FWD"
+  - "VHOST"
+  layout:
+    title: "30min Soak Test (PLRsearch)"
+    layout: "plot-soak-throughput"
+
 ################################################################################
-# Plots VPP HTTP Server Performance
--
-  type: "plot"
-  title: "VPP HTTP Server Performance"
-  algorithm: "plot_http_server_performance_box"
+# Plots - NF Density - VSC
+
+- type: "plot"
+  title: "Packet Throughput: 64B-1c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-mrr"
+  algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/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'"
+  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"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  - "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: "VPP HTTP Server Performance"
-    layout:
-      "plot-cps"
+    title: "<b>Throughput:</b> eth-l2bd-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-mrr"
+    layout: "plot-service-density"
 
--
-  type: "plot"
-  title: "VPP HTTP Server Performance"
-  algorithm: "plot_http_server_performance_box"
+- 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]}/http-server-performance-rps"
-  data:
-    "plot-vpp-http-server-performance"
-  filter: "'HTTP' and 'TCP_RPS'"
+  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"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  - "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: "VPP HTTP Server Performance"
-    layout:
-      "plot-rps"
+    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
 
-# 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"
+- 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]}/l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  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
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'ETH' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
+           '4T2C' and
+           'NDRPDR'"
   parameters:
   - "throughput"
-  - "parent"
+  - "name"
   - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  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: "l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
-    layout: "plot-throughput"
+    title: "<b>Throughput:</b> eth-l2bd-{2XY}memif-{Y}chain-{XY}drc-vppip4-ndr"
+    layout: "plot-service-density"
 
--
-  type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
+- 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]}/l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'ETH' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
+  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"
-  - "parent"
+  - "name"
   - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  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: "l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
-    layout: "plot-throughput"
+    title: "<b>Throughput:</b> eth-l2bd-{2XY}memif-{Y}chain-{XY}drc-vppip4-ndr"
+    layout: "plot-service-density"
 
--
-  type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
+- 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]}/l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'ETH' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
+  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"
-  - "parent"
+  - "name"
   - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  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: "l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
-    layout: "plot-throughput"
+    title: "<b>Throughput:</b> eth-l2bd-{2XY}memif-{Y}chain-{XY}drc-vppip4-ndr"
+    layout: "plot-service-density"
 
--
-  type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
+- 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]}/l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  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
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'ETH' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
+           '2T1C' and
+           'NDRPDR'"
   parameters:
   - "throughput"
-  - "parent"
+  - "name"
   - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  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: "l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
-    layout: "plot-throughput"
+    title: "<b>Throughput:</b> eth-l2bd-{2XY}memif-{Y}chain-{XY}drc-vppip4-pdr"
+    layout: "plot-service-density"
 
-# 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"
+- 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]}/l2sw-3n-hsw-x520-64b-1t1c-features-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  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
-           'NDRPDR' and
-           '1T1C' and
-           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
-           not 'ACL' and
-           not 'VHOST' and
-           not 'MEMIF'"
+           '4T2C' and
+           'NDRPDR'"
   parameters:
   - "throughput"
-  - "parent"
+  - "name"
   - "tags"
-  sort:
-  - "L2XCBASE"    # l2xcbase
-  - "L2BDBASE"    # l2bdbase
-  - "L2XCFWD"     # dot1q-l2xcbase
-  - "L2BDMACLRN"  # dot1q-l2bdbase
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  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: "l2sw-3n-hsw-x520-64b-1t1c-features-ndr"
-    layout: "plot-throughput"
+    title: "<b>Throughput:</b> eth-l2bd-{2XY}memif-{Y}chain-{XY}drc-vppip4-pdr"
+    layout: "plot-service-density"
 
--
-  type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-1t1c-features-pdr"
-  algorithm: "plot_performance_box"
+- 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]}/l2sw-3n-hsw-x520-64b-1t1c-features-pdr"
-  data: "plot-vpp-throughput-latency-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'"
+  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"
-  - "parent"
+  - "name"
   - "tags"
-  sort:
-  - "L2XCBASE"    # l2xcbase
-  - "L2BDBASE"    # l2bdbase
-  - "L2XCFWD"     # dot1q-l2xcbase
-  - "L2BDMACLRN"  # dot1q-l2bdbase
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  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: "l2sw-3n-hsw-x520-64b-1t1c-features-pdr"
-    layout: "plot-throughput"
+    title: "<b>Throughput:</b> eth-l2bd-{2XY}memif-{Y}chain-{XY}drc-vppip4-pdr"
+    layout: "plot-service-density"
 
--
-  type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-2t2c-features-ndr"
-  algorithm: "plot_performance_box"
+- 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]}/l2sw-3n-hsw-x520-64b-2t2c-features-ndr"
-  data: "plot-vpp-throughput-latency-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'"
+  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"
-  - "parent"
+  - "name"
   - "tags"
-  sort:
-  - "L2XCBASE"    # l2xcbase
-  - "L2BDBASE"    # l2bdbase
-  - "L2XCFWD"     # dot1q-l2xcbase
-  - "L2BDMACLRN"  # dot1q-l2bdbase
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  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: "l2sw-3n-hsw-x520-64b-2t2c-features-ndr"
-    layout: "plot-throughput"
+    title: "<b>Throughput:</b> eth-l2bd-{2XY}memif-{Y}chain-{XY}drc-vppip4-pdr"
+    layout: "plot-service-density"
 
--
-  type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-2t2c-features-pdr"
-  algorithm: "plot_performance_box"
+################################################################################
+# 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]}/l2sw-3n-hsw-x520-64b-2t2c-features-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  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
-           'NDRPDR' and
-           '2T2C' and
-           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
-           not 'ACL' and
-           not 'VHOST' and
-           not 'MEMIF'"
+           '2T1C' and
+           'MRR'"
   parameters:
-  - "throughput"
-  - "parent"
+  - "result"
+  - "name"
   - "tags"
-  sort:
-  - "L2XCBASE"    # l2xcbase
-  - "L2BDBASE"    # l2bdbase
-  - "L2XCFWD"     # dot1q-l2xcbase
-  - "L2BDMACLRN"  # dot1q-l2bdbase
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  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: "l2sw-3n-hsw-x520-64b-2t2c-features-pdr"
-    layout: "plot-throughput"
+    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-mrr"
+    layout: "plot-service-density"
 
-# 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"
+- 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]}/l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  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
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'ETH' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
+           '4T2C' and
+           'MRR'"
   parameters:
-  - "throughput"
-  - "parent"
+  - "result"
+  - "name"
   - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  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: "l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
-    layout: "plot-throughput"
+    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-mrr"
+    layout: "plot-service-density"
 
--
-  type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
+- 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]}/l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  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
-           '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'"
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           'IMIX' and
+           '2T1C' and
+           'MRR'"
   parameters:
-  - "throughput"
-  - "parent"
+  - "result"
+  - "name"
   - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  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: "l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
-    layout: "plot-throughput"
+    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-mrr"
+    layout: "plot-service-density"
 
--
-  type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
+- 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]}/l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  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
-           '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'"
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           'IMIX' and
+           '4T2C' and
+           'MRR'"
   parameters:
-  - "throughput"
-  - "parent"
+  - "result"
+  - "name"
   - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  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: "l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
-    layout: "plot-throughput"
+    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-mrr"
+    layout: "plot-service-density"
 
--
-  type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
+- 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]}/l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  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
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'ETH' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
+           '2T1C' and
+           'NDRPDR'"
   parameters:
   - "throughput"
-  - "parent"
+  - "name"
   - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  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: "l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
-    layout: "plot-throughput"
+    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-ndr"
+    layout: "plot-service-density"
 
-# 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"
+- 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]}/l2sw-3n-hsw-x710-64b-1t1c-features-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  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
-           'NDRPDR' and
-           '1T1C' and
-           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
-           not 'ACL' and
-           not 'VHOST' and
-           not 'MEMIF'"
+           '4T2C' and
+           'NDRPDR'"
   parameters:
   - "throughput"
-  - "parent"
+  - "name"
   - "tags"
-  sort:
-  - "L2XCBASE"    # l2xcbase
-  - "L2BDBASE"    # l2bdbase
-  - "L2XCFWD"     # dot1q-l2xcbase
-  - "L2BDMACLRN"  # dot1q-l2bdbase
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  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: "l2sw-3n-hsw-x710-64b-1t1c-features-ndr"
-    layout: "plot-throughput"
+    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-ndr"
+    layout: "plot-service-density"
 
--
-  type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x710-64b-1t1c-features-pdr"
-  algorithm: "plot_performance_box"
+- 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]}/l2sw-3n-hsw-x710-64b-1t1c-features-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  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
-           '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'"
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           'IMIX' and
+           '2T1C' and
+           'NDRPDR'"
   parameters:
   - "throughput"
-  - "parent"
+  - "name"
   - "tags"
-  sort:
-  - "L2XCBASE"    # l2xcbase
-  - "L2BDBASE"    # l2bdbase
-  - "L2XCFWD"     # dot1q-l2xcbase
-  - "L2BDMACLRN"  # dot1q-l2bdbase
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  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: "l2sw-3n-hsw-x710-64b-1t1c-features-pdr"
-    layout: "plot-throughput"
+    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-ndr"
+    layout: "plot-service-density"
 
--
-  type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x710-64b-2t2c-features-ndr"
-  algorithm: "plot_performance_box"
+- 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]}/l2sw-3n-hsw-x710-64b-2t2c-features-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  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
-           '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'"
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           'IMIX' and
+           '4T2C' and
+           'NDRPDR'"
   parameters:
   - "throughput"
-  - "parent"
+  - "name"
   - "tags"
-  sort:
-  - "L2XCBASE"    # l2xcbase
-  - "L2BDBASE"    # l2bdbase
-  - "L2XCFWD"     # dot1q-l2xcbase
-  - "L2BDMACLRN"  # dot1q-l2bdbase
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  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: "l2sw-3n-hsw-x710-64b-2t2c-features-ndr"
-    layout: "plot-throughput"
+    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-ndr"
+    layout: "plot-service-density"
 
--
-  type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x710-64b-2t2c-features-pdr"
-  algorithm: "plot_performance_box"
+- 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]}/l2sw-3n-hsw-x710-64b-2t2c-features-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  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
-           'NDRPDR' and
-           '2T2C' and
-           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
-           not 'ACL' and
-           not 'VHOST' and
-           not 'MEMIF'"
+           '2T1C' and
+           'NDRPDR'"
   parameters:
   - "throughput"
-  - "parent"
+  - "name"
   - "tags"
-  sort:
-  - "L2XCBASE"    # l2xcbase
-  - "L2BDBASE"    # l2bdbase
-  - "L2XCFWD"     # dot1q-l2xcbase
-  - "L2BDMACLRN"  # dot1q-l2bdbase
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  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: "l2sw-3n-hsw-x710-64b-2t2c-features-pdr"
-    layout: "plot-throughput"
+    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-pdr"
+    layout: "plot-service-density"
 
-# Packet Throughput - VPP L2 3n-hsw-xl710 base and scale
--
-  type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
+- 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]}/l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,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
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'ETH' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
+           '4T2C' and
+           'NDRPDR'"
   parameters:
   - "throughput"
-  - "parent"
+  - "name"
   - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  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: "l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
-    layout: "plot-throughput"
+    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-pdr"
+    layout: "plot-service-density"
 
--
-  type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
+- 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]}/l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' 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'"
+  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"
-  - "parent"
+  - "name"
   - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  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: "l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
-    layout: "plot-throughput"
+    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-pdr"
+    layout: "plot-service-density"
 
--
-  type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
+- 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]}/l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' 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'"
+  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"
-  - "parent"
+  - "name"
   - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Pipeline"
+  y-axis: "Y = Number of Service Pipelines"
+  z-axis: "IMIX Packet Throughput (mean PDR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-pdr"
+    layout: "plot-service-density"
+
+################################################################################
+# Plots VPP HTTP Server Performance
+- type: "plot"
+  title: "VPP HTTP Server Performance"
+  algorithm: "plot_http_server_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/http-server-performance-cps"
+  data:
+    "plot-vpp-http-server-performance"
+  # Keep this formatting, the filter is enclosed with " (quotation mark) and
+  # each tag is enclosed with ' (apostrophe).
+  filter: "'HTTP' and 'TCP_CPS'"
+  parameters:
+  - "result"
+  - "name"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
-    layout: "plot-throughput"
+    title: "VPP HTTP Server Performance"
+    layout:
+      "plot-cps"
 
--
-  type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
+- type: "plot"
+  title: "VPP HTTP Server Performance"
+  algorithm: "plot_http_server_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' 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'"
+  output-file: "{DIR[STATIC,VPP]}/http-server-performance-rps"
+  data:
+    "plot-vpp-http-server-performance"
+  filter: "'HTTP' and 'TCP_RPS'"
   parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+  - "result"
+  - "name"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
-    layout: "plot-throughput"
+    title: "VPP HTTP Server Performance"
+    layout:
+      "plot-rps"
 
-# Packet Throughput - VPP L2 3n-skx-x710 base and scale
--
-  type: "plot"
-  title: "VPP Throughput: l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+################################################################################
+
+# Packet Throughput - VPP L2 3n-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-skx-x710-64b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  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
-           '2T1C' and
+           '1T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
@@ -3881,22 +5411,21 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+    title: "l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: l2sw-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
+- type: "plot"
+  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-1t1c-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-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  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
-           '2T1C' and
+           '1T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
@@ -3916,22 +5445,21 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
+    title: "l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
+- type: "plot"
+  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-2t2c-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-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  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
-           '4T2C' and
+           '2T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
@@ -3951,22 +5479,21 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
+    title: "l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: l2sw-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
+- type: "plot"
+  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-2t2c-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-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  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
-           '4T2C' and
+           '2T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
@@ -3986,53 +5513,20 @@
     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-latency-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 '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"
+    title: "l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: l2sw-3n-skx-x710-64b-2t1c-features-pdr"
+# 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-skx-x710-64b-2t1c-features-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  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
-           '2T1C' and
+           '1T1C' and
            (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
            not 'ACL' and
            not 'VHOST' and
@@ -4051,20 +5545,19 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-3n-skx-x710-64b-2t1c-features-pdr"
+    title: "l2sw-3n-hsw-x520-64b-1t1c-features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: l2sw-3n-skx-x710-64b-4t2c-features-ndr"
+- 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-skx-x710-64b-4t2c-features-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  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
-           '4T2C' and
+           '1T1C' and
            (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
            not 'ACL' and
            not 'VHOST' and
@@ -4083,20 +5576,19 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-3n-skx-x710-64b-4t2c-features-ndr"
+    title: "l2sw-3n-hsw-x520-64b-1t1c-features-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: l2sw-3n-skx-x710-64b-4t2c-features-pdr"
+- 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-skx-x710-64b-4t2c-features-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  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
-           '4T2C' and
+           '2T2C' and
            (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
            not 'ACL' and
            not 'VHOST' and
@@ -4115,129 +5607,21 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-3n-skx-x710-64b-4t2c-features-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP L2 3n-skx-xxv710 base and scale
--
-  type: "plot"
-  title: "VPP Throughput: l2sw-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-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"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l2sw-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: l2sw-3n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-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"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l2sw-3n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: l2sw-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-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"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l2sw-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
+    title: "l2sw-3n-hsw-x520-64b-2t2c-features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: l2sw-3n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
+- 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-skx-xxv710-64b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-2t2c-features-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
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           '2T2C' and
+           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
+           not 'ACL' and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -4245,3176 +5629,3191 @@
   - "parent"
   - "tags"
   sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+  - "L2XCBASE"    # l2xcbase
+  - "L2BDBASE"    # l2bdbase
+  - "L2XCFWD"     # dot1q-l2xcbase
+  - "L2BDMACLRN"  # dot1q-l2bdbase
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-3n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
+    title: "l2sw-3n-hsw-x520-64b-2t2c-features-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"
+# 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-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/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
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           'ETH' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') 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"
-  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"
+    title: "l2sw-3n-hsw-x520-64b-1t1c-features-iacl-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: l2sw-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
+- 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-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/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
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           'ETH' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') 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"
-  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"
+    title: "l2sw-3n-hsw-x520-64b-1t1c-features-iacl-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
+- 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-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/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
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           'ETH' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') 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"
-  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"
+    title: "l2sw-3n-hsw-x520-64b-2t2c-features-iacl-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: l2sw-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
+- 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-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/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
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           'ETH' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') 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"
-  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"
+    title: "l2sw-3n-hsw-x520-64b-2t2c-features-iacl-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"
+# 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-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-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' or 'SCALE') and
            'NDRPDR' and
-           'ETH' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') 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"
-  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"
+    title: "l2sw-3n-hsw-x520-64b-1t1c-features-oacl-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
+- 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-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-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' or 'SCALE') and
            'NDRPDR' and
-           'ETH' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') 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"
-  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"
+    title: "l2sw-3n-hsw-x520-64b-1t1c-features-oacl-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
+- 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-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-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' or 'SCALE') and
            'NDRPDR' and
-           'ETH' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') 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"
-  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"
+    title: "l2sw-3n-hsw-x520-64b-2t2c-features-oacl-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
+- 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-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' 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' or 'SCALE') and
            'NDRPDR' and
-           'ETH' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') 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"
-  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"
+    title: "l2sw-3n-hsw-x520-64b-2t2c-features-oacl-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_scale-ndr"
+# 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]}/memif-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  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' or 'SCALE') and
            'NDRPDR' and
            '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'MACIP' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
            not 'VHOST' and
-           'MEMIF'"
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "memif-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
+    title: "l2sw-3n-hsw-x520-64b-1t1c-features-macip-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: memif-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
+- 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]}/memif-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  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' or 'SCALE') and
            'NDRPDR' and
            '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'MACIP' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
            not 'VHOST' and
-           'MEMIF'"
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "memif-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
+    title: "l2sw-3n-hsw-x520-64b-1t1c-features-macip-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: memif-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
+- 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]}/memif-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  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' or 'SCALE') and
            'NDRPDR' and
            '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'MACIP' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
            not 'VHOST' and
-           'MEMIF'"
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "memif-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
+    title: "l2sw-3n-hsw-x520-64b-2t2c-features-macip-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: memif-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
+- 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]}/memif-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  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' or 'SCALE') and
            'NDRPDR' and
            '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'MACIP' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
            not 'VHOST' and
-           'MEMIF'"
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "memif-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
+    title: "l2sw-3n-hsw-x520-64b-2t2c-features-macip-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_scale-ndr"
+# 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]}/memif-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  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
-           'MEMIF'"
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
+  - "L2PATCH"
   - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
   - "L2BDMACLRN"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "memif-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
+    title: "l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: memif-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
+- 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]}/memif-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  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
-           'MEMIF'"
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
+  - "L2PATCH"
   - "L2XCFWD"
   - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "memif-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
+    title: "l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: memif-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+- 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]}/memif-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  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
-           'MEMIF'"
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
+  - "L2PATCH"
   - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
   - "L2BDMACLRN"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "memif-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+    title: "l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: memif-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
+- 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]}/memif-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  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
-           'MEMIF'"
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
+  - "L2PATCH"
   - "L2XCFWD"
   - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "memif-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
+    title: "l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-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_scale-ndr"
+# 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]}/memif-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-1t1c-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') and
+           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
+           not 'ACL' and
            not 'VHOST' and
-           'MEMIF'"
+           not 'L2OVRLAY' and
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
+  - "L2XCBASE"    # l2xcbase
+  - "L2BDBASE"    # l2bdbase
+  - "L2XCFWD"     # dot1q-l2xcbase
+  - "L2BDMACLRN"  # dot1q-l2bdbase
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "memif-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
+    title: "l2sw-3n-hsw-x710-64b-1t1c-features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: memif-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
+- 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]}/memif-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-1t1c-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') and
+           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
+           not 'ACL' and
            not 'VHOST' and
-           'MEMIF'"
+           not 'L2OVRLAY' and
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
+  - "L2XCBASE"    # l2xcbase
+  - "L2BDBASE"    # l2bdbase
+  - "L2XCFWD"     # dot1q-l2xcbase
+  - "L2BDMACLRN"  # dot1q-l2bdbase
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "memif-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
+    title: "l2sw-3n-hsw-x710-64b-1t1c-features-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: memif-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
+- 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]}/memif-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-2t2c-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') and
+           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
+           not 'ACL' and
            not 'VHOST' and
-           'MEMIF'"
+           not 'L2OVRLAY' and
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
+  - "L2XCBASE"    # l2xcbase
+  - "L2BDBASE"    # l2bdbase
+  - "L2XCFWD"     # dot1q-l2xcbase
+  - "L2BDMACLRN"  # dot1q-l2bdbase
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "memif-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
+    title: "l2sw-3n-hsw-x710-64b-2t2c-features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: memif-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
+- 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]}/memif-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-2t2c-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') and
+           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
+           not 'ACL' and
            not 'VHOST' and
-           'MEMIF'"
+           not 'L2OVRLAY' and
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
+  - "L2XCBASE"    # l2xcbase
+  - "L2BDBASE"    # l2bdbase
+  - "L2XCFWD"     # dot1q-l2xcbase
+  - "L2BDMACLRN"  # dot1q-l2bdbase
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "memif-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
+    title: "l2sw-3n-hsw-x710-64b-2t2c-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_scale-ndr"
+# 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]}/memif-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  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
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') 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
-           'MEMIF'"
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "memif-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+    title: "l2sw-3n-hsw-x710-64b-1t1c-features-iacl-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: memif-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
+- 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]}/memif-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  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
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') 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
-           'MEMIF'"
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "memif-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
+    title: "l2sw-3n-hsw-x710-64b-1t1c-features-iacl-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: memif-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
+- 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]}/memif-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  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
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') 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
-           'MEMIF'"
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "memif-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
+    title: "l2sw-3n-hsw-x710-64b-2t2c-features-iacl-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: memif-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
+- 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]}/memif-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  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
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') 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
-           'MEMIF'"
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "memif-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
+    title: "l2sw-3n-hsw-x710-64b-2t2c-features-iacl-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_scale-ndr"
+# 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]}/memif-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-xl710-64b-1t1c-base-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '64B' and
-           ('BASE' or 'SCALE') and
+           'BASE' and
            'NDRPDR' and
-           '2T1C' and
+           'ETH' and
+           '1T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           'MEMIF'"
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
+  - "L2PATCH"
   - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
   - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "memif-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
+    title: "l2sw-3n-hsw-xl710-64b-1t1c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: memif-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
+- 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]}/memif-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-xl710-64b-1t1c-base-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '64B' and
-           ('BASE' or 'SCALE') and
+           'BASE' and
            'NDRPDR' and
-           '2T1C' and
+           'ETH' and
+           '1T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           'MEMIF'"
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
+  - "L2PATCH"
   - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
   - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "memif-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
+    title: "l2sw-3n-hsw-xl710-64b-1t1c-base-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: memif-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
+- 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]}/memif-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-xl710-64b-2t2c-base-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '64B' and
-           ('BASE' or 'SCALE') and
+           'BASE' and
            'NDRPDR' and
-           '4T2C' and
+           'ETH' and
+           '2T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           'MEMIF'"
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
+  - "L2PATCH"
   - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
   - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "memif-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
+    title: "l2sw-3n-hsw-xl710-64b-2t2c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: memif-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
+- 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]}/memif-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-xl710-64b-2t2c-base-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '64B' and
-           ('BASE' or 'SCALE') and
+           'BASE' and
            'NDRPDR' and
-           '4T2C' and
+           'ETH' and
+           '2T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           'MEMIF'"
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
+  - "L2PATCH"
   - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
   - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "memif-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
+    title: "l2sw-3n-hsw-xl710-64b-2t2c-base-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_scale-ndr"
+# 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]}/memif-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-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' or 'SCALE') and
            'NDRPDR' and
+           'ETH' and
            '2T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           'MEMIF'"
+           not 'MEMIF' and
+           not 'DRV_AVF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "memif-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
+    title: "l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: memif-2n-skx-xxv710-64b-2t1c-base_and_scale-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,VPP]}/memif-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
+           'ETH' and
            '2T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           'MEMIF'"
+           not 'MEMIF' and
+           not 'DRV_AVF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "memif-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
+    title: "l2sw-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: memif-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
+- 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]}/memif-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
+           'ETH' and
            '4T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           'MEMIF'"
+           not 'MEMIF' and
+           not 'DRV_AVF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "memif-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
+    title: "l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: memif-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
+- 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]}/memif-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
+           'ETH' and
            '4T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           'MEMIF'"
+           not 'MEMIF' and
+           not 'DRV_AVF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "memif-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
+    title: "l2sw-3n-skx-x710-64b-4t2c-base_and_scale-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"
+# 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]}/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
+  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' or 'SCALE') and
            'NDRPDR' and
-           '1T1C' and
-           'L2XCFWD' and
+           '2T1C' and
+           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
+           not 'ACL' and
            not 'VHOST' and
-           'MEMIF'"
+           not 'DRV_AVF' and
+           not 'L2OVRLAY' and
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
+  - "L2XCBASE"    # l2xcbase
+  - "L2BDBASE"    # l2bdbase
+  - "L2XCFWD"     # dot1q-l2xcbase
+  - "L2BDMACLRN"  # dot1q-l2bdbase
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-ndr"
+    title: "l2sw-3n-skx-x710-64b-2t1c-features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-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,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
+  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' or 'SCALE') and
            'NDRPDR' and
-           '1T1C' and
-           'L2XCFWD' and
+           '2T1C' and
+           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
+           not 'ACL' and
            not 'VHOST' and
-           'MEMIF'"
+           not 'DRV_AVF' and
+           not 'L2OVRLAY' and
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
+  - "L2XCBASE"    # l2xcbase
+  - "L2BDBASE"    # l2bdbase
+  - "L2XCFWD"     # dot1q-l2xcbase
+  - "L2BDMACLRN"  # dot1q-l2bdbase
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-pdr"
+    title: "l2sw-3n-skx-x710-64b-2t1c-features-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-ndr"
+- 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]}/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
+  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' or 'SCALE') and
            'NDRPDR' and
-           '2T2C' and
-           'L2XCFWD' and
+           '4T2C' and
+           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
+           not 'ACL' and
            not 'VHOST' and
-           'MEMIF'"
+           not 'DRV_AVF' and
+           not 'L2OVRLAY' and
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
+  - "L2XCBASE"    # l2xcbase
+  - "L2BDBASE"    # l2bdbase
+  - "L2XCFWD"     # dot1q-l2xcbase
+  - "L2BDMACLRN"  # dot1q-l2bdbase
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-ndr"
+    title: "l2sw-3n-skx-x710-64b-4t2c-features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-pdr"
+- 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]}/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
+  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' or 'SCALE') and
            'NDRPDR' and
-           '2T2C' and
-           'L2XCFWD' and
+           '4T2C' and
+           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
+           not 'ACL' and
            not 'VHOST' and
-           'MEMIF'"
+           not 'DRV_AVF' and
+           not 'L2OVRLAY' and
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
+  - "L2XCBASE"    # l2xcbase
+  - "L2BDBASE"    # l2bdbase
+  - "L2XCFWD"     # dot1q-l2xcbase
+  - "L2BDMACLRN"  # dot1q-l2bdbase
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-pdr"
+    title: "l2sw-3n-skx-x710-64b-4t2c-features-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"
+# 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]}/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
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-2t1c-features-iacl-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN') 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
-           'MEMIF'"
+           not '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"
+    title: "l2sw-3n-skx-x710-64b-2t1c-features-iacl-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-pdr"
+- type: "plot"
+  title: "VPP Throughput: l2sw-3n-skx-x710-64b-2t1c-features-iacl-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/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
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-2t1c-features-iacl-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN') 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
-           'MEMIF'"
+           not '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"
+    title: "l2sw-3n-skx-x710-64b-2t1c-features-iacl-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-ndr"
+- type: "plot"
+  title: "VPP Throughput: l2sw-3n-skx-x710-64b-4t2c-features-iacl-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/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
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-4t2c-features-iacl-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN') 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
-           'MEMIF'"
+           not '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"
+    title: "l2sw-3n-skx-x710-64b-4t2c-features-iacl-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-pdr"
+- type: "plot"
+  title: "VPP Throughput: l2sw-3n-skx-x710-64b-4t2c-features-iacl-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/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
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-4t2c-features-iacl-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN') 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
-           'MEMIF'"
+           not '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"
+    title: "l2sw-3n-skx-x710-64b-4t2c-features-iacl-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"
+# 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]}/k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-ndr"
-  data: "plot-ligato-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' 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' or 'SCALE') and
            'NDRPDR' and
-           '1T1C' and
-           'L2XCFWD' and
+           'ETH' and
+           '2T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           'MEMIF'"
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
+  - "L2PATCH"
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-ndr"
+    title: "l2sw-3n-skx-xxv710-64b-2t1c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-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,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
+  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
-           '1T1C' and
-           'L2XCFWD' and
+           'ETH' and
+           '2T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           'MEMIF'"
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
+  - "L2PATCH"
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-pdr"
+    title: "l2sw-3n-skx-xxv710-64b-2t1c-base-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-ndr"
+- 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]}/k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-ndr"
-  data: "plot-ligato-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' 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' or 'SCALE') and
            'NDRPDR' and
-           '2T2C' and
-           'L2XCFWD' and
+           'ETH' and
+           '4T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           'MEMIF'"
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
+  - "L2PATCH"
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-ndr"
+    title: "l2sw-3n-skx-xxv710-64b-4t2c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-pdr"
+- 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]}/k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-pdr"
-  data: "plot-ligato-throughput-latency-3n-hsw"
-  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' or 'SCALE') and
            'NDRPDR' and
-           '2T2C' and
-           'L2XCFWD' and
+           'ETH' and
+           '4T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           'MEMIF'"
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
+  - "L2PATCH"
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-pdr"
+    title: "l2sw-3n-skx-xxv710-64b-4t2c-base-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"
+# 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]}/k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-ndr"
-  data: "plot-ligato-throughput-latency-3n-hsw"
+  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
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+           'ETH' and
+           '2T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           'MEMIF'"
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-ndr"
+    title: "l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-pdr"
+- 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]}/k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-pdr"
-  data: "plot-ligato-throughput-latency-3n-hsw"
+  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
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+           'ETH' and
+           '2T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           'MEMIF'"
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-pdr"
+    title: "l2sw-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-ndr"
+- 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]}/k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-ndr"
-  data: "plot-ligato-throughput-latency-3n-hsw"
+  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
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+           'ETH' and
+           '4T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           'MEMIF'"
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-ndr"
+    title: "l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-pdr"
+- 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]}/k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-pdr"
-  data: "plot-ligato-throughput-latency-3n-hsw"
+  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
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+           'ETH' and
+           '4T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           'MEMIF'"
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-pdr"
+    title: "l2sw-2n-skx-x710-64b-4t2c-base_and_scale-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"
+# 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]}/ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  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
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '1T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           'ETH' and
+           '2T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
+    title: "l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
+- 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]}/ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  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
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '1T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           'ETH' and
+           '2T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
+    title: "l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
+- 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]}/ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  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
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '2T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           'ETH' and
+           '4T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
+    title: "l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
+- 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]}/ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  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
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '2T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           'ETH' and
+           '4T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
+    title: "l2sw-2n-skx-xxv710-64b-4t2c-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"
+# 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]}/ip4-3n-hsw-x520-64b-1t1c-features-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-dnv-x553-64b-1t1c-base-ndr"
+  data: "intel-dnv-vpp"
+  filter: "'NIC_Intel-X553' and
            '64B' and
-           ('IP4BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            ('NAT44' and 'BASE') or
-            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
+           'BASE' and
            'NDRPDR' and
+           'ETH' and
            '1T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP4BASE"
-  - "NAT44"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACL"
-  - "OACL"
+  - "L2XCBASE"
+  - "L2BDMACLRN"
+  - "L2PATCH"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x520-64b-1t1c-features-ndr"
+    title: "l2sw-2n-dnv-x553-64b-1t1c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-features-pdr"
+- 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]}/ip4-3n-hsw-x520-64b-1t1c-features-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-dnv-x553-64b-1t1c-base-pdr"
+  data: "intel-dnv-vpp"
+  filter: "'NIC_Intel-X553' and
            '64B' and
-           ('IP4BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            ('NAT44' and 'BASE') or
-            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
+           'ETH' and
            '1T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP4BASE"
-  - "NAT44"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACL"
-  - "OACL"
+  - "L2XCBASE"
+  - "L2BDMACLRN"
+  - "L2PATCH"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x520-64b-1t1c-features-pdr"
+    title: "l2sw-2n-dnv-x553-64b-1t1c-base-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-features-ndr"
+- 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]}/ip4-3n-hsw-x520-64b-2t2c-features-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-dnv-x553-64b-2t2c-base-ndr"
+  data: "intel-dnv-vpp"
+  filter: "'NIC_Intel-X553' and
            '64B' and
-           ('IP4BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            ('NAT44' and 'BASE') or
-            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
+           'ETH' and
            '2T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP4BASE"
-  - "NAT44"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACL"
-  - "OACL"
+  - "L2XCBASE"
+  - "L2BDMACLRN"
+  - "L2PATCH"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x520-64b-2t2c-features-ndr"
+    title: "l2sw-2n-dnv-x553-64b-2t2c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-features-pdr"
+- 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]}/ip4-3n-hsw-x520-64b-2t2c-features-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-dnv-x553-64b-2t2c-base-pdr"
+  data: "intel-dnv-vpp"
+  filter: "'NIC_Intel-X553' and
            '64B' and
-           ('IP4BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            ('NAT44' and 'BASE') or
-            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
+           'ETH' and
            '2T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP4BASE"
-  - "NAT44"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACL"
-  - "OACL"
+  - "L2XCBASE"
+  - "L2BDMACLRN"
+  - "L2PATCH"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x520-64b-2t2c-features-pdr"
+    title: "l2sw-2n-dnv-x553-64b-2t2c-base-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"
+################################################################################
+
+# 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]}/ip4-3n-hsw-x520-64b-1t1c-features-nat44-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  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
-           'IP4FWD' and
-           'NAT44' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
+           not 'VHOST' and
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "BASE"
-  - "BASE"
-  - "SRC_USER_10"
-  - "SRC_USER_100"
-  - "SRC_USER_1000"
-  - "SRC_USER_2000"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "IP4FWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x520-64b-1t1c-features-nat44-ndr"
+    title: "memif-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-features-nat44-pdr"
+- 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]}/ip4-3n-hsw-x520-64b-1t1c-features-nat44-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  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
-           'IP4FWD' and
-           'NAT44' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
+           not 'VHOST' and
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "BASE"
-  - "BASE"
-  - "SRC_USER_10"
-  - "SRC_USER_100"
-  - "SRC_USER_1000"
-  - "SRC_USER_2000"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "IP4FWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x520-64b-1t1c-features-nat44-pdr"
+    title: "memif-3n-hsw-x520-64b-1t1c-base_and_features-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-features-nat44-ndr"
+- 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]}/ip4-3n-hsw-x520-64b-2t2c-features-nat44-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  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
-           'IP4FWD' and
-           'NAT44' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
+           not 'VHOST' and
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "BASE"
-  - "BASE"
-  - "SRC_USER_10"
-  - "SRC_USER_100"
-  - "SRC_USER_1000"
-  - "SRC_USER_2000"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "IP4FWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x520-64b-2t2c-features-nat44-ndr"
+    title: "memif-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-features-nat44-pdr"
+- 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]}/ip4-3n-hsw-x520-64b-2t2c-features-nat44-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  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
-           'IP4FWD' and
-           'NAT44' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
+           not 'VHOST' and
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "BASE"
-  - "BASE"
-  - "SRC_USER_10"
-  - "SRC_USER_100"
-  - "SRC_USER_1000"
-  - "SRC_USER_2000"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "IP4FWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x520-64b-2t2c-features-nat44-pdr"
+    title: "memif-3n-hsw-x520-64b-2t2c-base_and_features-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"
+# 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]}/ip4-3n-hsw-x520-64b-1t1c-features-iacl-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  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
-           'IP4FWD' and
-           'IACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
+           not 'VHOST' and
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "IP4FWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x520-64b-1t1c-features-iacl-ndr"
+    title: "memif-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-features-iacl-pdr"
+- 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]}/ip4-3n-hsw-x520-64b-1t1c-features-iacl-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  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
-           'IP4FWD' and
-           'IACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
+           not 'VHOST' and
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
-  - "tags"
-  sort:
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
+  - "tags"
+  sort:
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "IP4FWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x520-64b-1t1c-features-iacl-pdr"
+    title: "memif-3n-hsw-x710-64b-1t1c-base_and_features-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-features-iacl-ndr"
+- 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]}/ip4-3n-hsw-x520-64b-2t2c-features-iacl-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  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
-           'IP4FWD' and
-           'IACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
+           not 'VHOST' and
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "IP4FWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x520-64b-2t2c-features-iacl-ndr"
+    title: "memif-3n-hsw-x710-64b-2t2c-base_and_features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-features-iacl-pdr"
+- 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]}/ip4-3n-hsw-x520-64b-2t2c-features-iacl-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  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
-           'IP4FWD' and
-           'IACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
+           not 'VHOST' and
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "IP4FWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x520-64b-2t2c-features-iacl-pdr"
+    title: "memif-3n-hsw-x710-64b-2t2c-base_and_features-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"
+# 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]}/ip4-3n-hsw-x520-64b-1t1c-features-oacl-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  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
-           'IP4FWD' and
-           'OACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
+           not 'VHOST' and
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "IP4FWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x520-64b-1t1c-features-oacl-ndr"
+    title: "memif-3n-hsw-xl710-64b-1t1c-base_and_features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-features-oacl-pdr"
+- 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]}/ip4-3n-hsw-x520-64b-1t1c-features-oacl-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  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
-           'IP4FWD' and
-           'OACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
+           not 'VHOST' and
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "IP4FWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x520-64b-1t1c-features-oacl-pdr"
+    title: "memif-3n-hsw-xl710-64b-1t1c-base_and_features-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-features-oacl-ndr"
+- 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]}/ip4-3n-hsw-x520-64b-2t2c-features-oacl-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  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
-           'IP4FWD' and
-           'OACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
+           not 'VHOST' and
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "IP4FWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x520-64b-2t2c-features-oacl-ndr"
+    title: "memif-3n-hsw-xl710-64b-2t2c-base_and_features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-features-oacl-pdr"
+- 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]}/ip4-3n-hsw-x520-64b-2t2c-features-oacl-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  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
-           'IP4FWD' and
-           'OACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
+           not 'VHOST' and
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "IP4FWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x520-64b-2t2c-features-oacl-pdr"
+    title: "memif-3n-hsw-xl710-64b-2t2c-base_and_features-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - VPP IPv4 3n-hsw-x710 base and scale
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
+# 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]}/ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  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
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '1T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '2T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
+           not 'VHOST' and
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "IP4FWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
+    title: "memif-3n-skx-x710-64b-2t1c-base_and_features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
+- type: "plot"
+  title: "VPP Throughput: memif-3n-skx-x710-64b-2t1c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  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
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '1T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '2T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
+           not 'VHOST' and
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "IP4FWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
+    title: "memif-3n-skx-x710-64b-2t1c-base_and_features-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+- type: "plot"
+  title: "VPP Throughput: memif-3n-skx-x710-64b-4t2c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  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
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '2T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '4T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
+           not 'VHOST' and
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "IP4FWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+    title: "memif-3n-skx-x710-64b-4t2c-base_and_features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
+- type: "plot"
+  title: "VPP Throughput: memif-3n-skx-x710-64b-4t2c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  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
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '2T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '4T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
+           not 'VHOST' and
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "IP4FWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
+    title: "memif-3n-skx-x710-64b-4t2c-base_and_features-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"
+# 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]}/ip4-3n-hsw-x710-64b-1t1c-features-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  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
-           ('IP4BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            ('NAT44' and 'BASE') or
-            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '1T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '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:
-  - "IP4BASE"
-  - "NAT44"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACL"
-  - "OACL"
+  sort:
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "IP4FWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x710-64b-1t1c-features-ndr"
+    title: "memif-2n-skx-x710-64b-2t1c-base_and_features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-features-pdr"
+- 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]}/ip4-3n-hsw-x710-64b-1t1c-features-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  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
-           ('IP4BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            ('NAT44' and 'BASE') or
-            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '1T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '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:
-  - "IP4BASE"
-  - "NAT44"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACL"
-  - "OACL"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "IP4FWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x710-64b-1t1c-features-pdr"
+    title: "memif-2n-skx-x710-64b-2t1c-base_and_features-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-features-ndr"
+- 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]}/ip4-3n-hsw-x710-64b-2t2c-features-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  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
-           ('IP4BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            ('NAT44' and 'BASE') or
-            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '2T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '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:
-  - "IP4BASE"
-  - "NAT44"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACL"
-  - "OACL"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "IP4FWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x710-64b-2t2c-features-ndr"
+    title: "memif-2n-skx-x710-64b-4t2c-base_and_features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-features-pdr"
+- 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]}/ip4-3n-hsw-x710-64b-2t2c-features-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  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
-           ('IP4BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            ('NAT44' and 'BASE') or
-            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '2T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '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:
-  - "IP4BASE"
-  - "NAT44"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACL"
-  - "OACL"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "IP4FWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x710-64b-2t2c-features-pdr"
+    title: "memif-2n-skx-x710-64b-4t2c-base_and_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"
+## 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]}/ip4-3n-skx-x710-64b-2t1c-features-nat44-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  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
-           '2T1C' and
-           'IP4FWD' and
-           'NAT44' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '1T1C' and
+           'L2XCFWD' and
+           not 'VHOST' and
+           not 'NF_DENSITY' and
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "BASE"
-  - "BASE"
-  - "SRC_USER_10"
-  - "SRC_USER_100"
-  - "SRC_USER_1000"
-  - "SRC_USER_2000"
+  - "1VNF"
+  - "2VNF"
+  - "4VNF"
+  - "2VNF"
+  - "4VNF"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-skx-x710-64b-2t1c-features-nat44-ndr"
+    title: "k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-nat44-pdr"
+- 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]}/ip4-3n-skx-x710-64b-2t1c-features-nat44-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  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
-           '2T1C' and
-           'IP4FWD' and
-           'NAT44' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '1T1C' and
+           'L2XCFWD' and
+           not 'VHOST' and
+           not 'NF_DENSITY' and
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "BASE"
-  - "BASE"
-  - "SRC_USER_10"
-  - "SRC_USER_100"
-  - "SRC_USER_1000"
-  - "SRC_USER_2000"
+  - "1VNF"
+  - "2VNF"
+  - "4VNF"
+  - "2VNF"
+  - "4VNF"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-skx-x710-64b-2t1c-features-nat44-pdr"
+    title: "k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-nat44-ndr"
+- 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]}/ip4-3n-skx-x710-64b-4t2c-features-nat44-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  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
-           '4T2C' and
-           'IP4FWD' and
-           'NAT44' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '2T2C' and
+           'L2XCFWD' and
+           not 'VHOST' and
+           not 'NF_DENSITY' and
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "BASE"
-  - "BASE"
-  - "SRC_USER_10"
-  - "SRC_USER_100"
-  - "SRC_USER_1000"
-  - "SRC_USER_2000"
+  - "1VNF"
+  - "2VNF"
+  - "4VNF"
+  - "2VNF"
+  - "4VNF"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-skx-x710-64b-4t2c-features-nat44-ndr"
+    title: "k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-nat44-pdr"
+- 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]}/ip4-3n-skx-x710-64b-4t2c-features-nat44-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  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
-           '4T2C' and
-           'IP4FWD' and
-           'NAT44' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '2T2C' and
+           'L2XCFWD' and
+           not 'VHOST' and
+           not 'NF_DENSITY' and
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "BASE"
-  - "BASE"
-  - "SRC_USER_10"
-  - "SRC_USER_100"
-  - "SRC_USER_1000"
-  - "SRC_USER_2000"
+  - "1VNF"
+  - "2VNF"
+  - "4VNF"
+  - "2VNF"
+  - "4VNF"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-skx-x710-64b-4t2c-features-nat44-pdr"
+    title: "k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-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"
+# 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]}/ip4-3n-skx-x710-64b-2t1c-features-iacl-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '2T1C' and
-           'IP4FWD' and
-           'IACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           not 'IPSEC' and
-           not 'VHOST'"
+  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:
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
+  - "1VNF"
+  - "2VNF"
+  - "4VNF"
+  - "2VNF"
+  - "4VNF"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-skx-x710-64b-2t1c-features-iacl-ndr"
+    title: "k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-iacl-pdr"
+- 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]}/ip4-3n-skx-x710-64b-2t1c-features-iacl-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  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
-           '2T1C' and
-           'IP4FWD' and
-           'IACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '1T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+           not 'VHOST' and
+           not 'NF_DENSITY' and
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
+  - "1VNF"
+  - "2VNF"
+  - "4VNF"
+  - "2VNF"
+  - "4VNF"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-skx-x710-64b-2t1c-features-iacl-pdr"
+    title: "k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-iacl-ndr"
+- 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]}/ip4-3n-skx-x710-64b-4t2c-features-iacl-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  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
-           '4T2C' and
-           'IP4FWD' and
-           'IACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '2T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+           not 'VHOST' and
+           not 'NF_DENSITY' and
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
+  - "1VNF"
+  - "2VNF"
+  - "4VNF"
+  - "2VNF"
+  - "4VNF"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-skx-x710-64b-4t2c-features-iacl-ndr"
+    title: "k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-iacl-pdr"
+- 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]}/ip4-3n-skx-x710-64b-4t2c-features-iacl-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  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
-           '4T2C' and
-           'IP4FWD' and
-           'IACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '2T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+           not 'VHOST' and
+           not 'NF_DENSITY' and
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
+  - "1VNF"
+  - "2VNF"
+  - "4VNF"
+  - "2VNF"
+  - "4VNF"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-skx-x710-64b-4t2c-features-iacl-pdr"
+    title: "k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - VPP IPv4 3n-hsw-x710 features oacl
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-oacl-ndr"
+# 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]}/ip4-3n-skx-x710-64b-2t1c-features-oacl-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  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
-           '2T1C' and
-           'IP4FWD' and
-           'OACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '1T1C' and
+           'L2XCFWD' and
+           not 'VHOST' and
+           not 'NF_DENSITY' and
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
+  - "1VNF"
+  - "2VNF"
+  - "4VNF"
+  - "2VNF"
+  - "4VNF"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-skx-x710-64b-2t1c-features-oacl-ndr"
+    title: "k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-oacl-pdr"
+- 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]}/ip4-3n-skx-x710-64b-2t1c-features-oacl-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  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
-           '2T1C' and
-           'IP4FWD' and
-           'OACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '1T1C' and
+           'L2XCFWD' and
+           not 'VHOST' and
+           not 'NF_DENSITY' and
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
+  - "1VNF"
+  - "2VNF"
+  - "4VNF"
+  - "2VNF"
+  - "4VNF"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-skx-x710-64b-2t1c-features-oacl-pdr"
+    title: "k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-oacl-ndr"
+- 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]}/ip4-3n-skx-x710-64b-4t2c-features-oacl-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  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
-           '4T2C' and
-           'IP4FWD' and
-           'OACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '2T2C' and
+           'L2XCFWD' and
+           not 'VHOST' and
+           not 'NF_DENSITY' and
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
+  - "1VNF"
+  - "2VNF"
+  - "4VNF"
+  - "2VNF"
+  - "4VNF"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-skx-x710-64b-4t2c-features-oacl-ndr"
+    title: "k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-oacl-pdr"
+- 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]}/ip4-3n-skx-x710-64b-4t2c-features-oacl-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  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
-           '4T2C' and
-           'IP4FWD' and
-           'OACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '2T2C' and
+           'L2XCFWD' and
+           not 'VHOST' and
+           not 'NF_DENSITY' and
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
+  - "1VNF"
+  - "2VNF"
+  - "4VNF"
+  - "2VNF"
+  - "4VNF"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-skx-x710-64b-4t2c-features-oacl-pdr"
+    title: "k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-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_and_scale-ndr"
+# 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]}/ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,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
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
            '1T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+           not 'VHOST' and
+           not 'NF_DENSITY' and
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  - "1VNF"
+  - "2VNF"
+  - "4VNF"
+  - "2VNF"
+  - "4VNF"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
+    title: "k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
+- 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]}/ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,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
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
            '1T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+           not 'VHOST' and
+           not 'NF_DENSITY' and
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  - "1VNF"
+  - "2VNF"
+  - "4VNF"
+  - "2VNF"
+  - "4VNF"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
+    title: "k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
+- 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]}/ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,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
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+           not 'VHOST' and
+           not 'NF_DENSITY' and
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  - "1VNF"
+  - "2VNF"
+  - "4VNF"
+  - "2VNF"
+  - "4VNF"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
+    title: "k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
+- 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]}/ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,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
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+           not 'VHOST' and
+           not 'NF_DENSITY' and
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  - "1VNF"
+  - "2VNF"
+  - "4VNF"
+  - "2VNF"
+  - "4VNF"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
+    title: "k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - VPP IPv4 3n-skx-x710 base and scale
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+################################################################################
+
+# Packet Throughput - VPP IPv4 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-skx-x710-64b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  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
-           '2T1C' and
+           '1T1C' and
            'IP4FWD' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -7430,23 +8829,23 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+    title: "ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
+- type: "plot"
+  title: "VPP Throughput: 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-skx-x710-64b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  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
-           '2T1C' and
+           '1T1C' and
            'IP4FWD' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -7462,23 +8861,23 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
+    title: "ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
+- type: "plot"
+  title: "VPP Throughput: 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-skx-x710-64b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  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
-           '4T2C' and
+           '2T2C' and
            'IP4FWD' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -7494,23 +8893,23 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
+    title: "ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
+- type: "plot"
+  title: "VPP Throughput: 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-skx-x710-64b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  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
-           '4T2C' and
+           '2T2C' and
            'IP4FWD' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -7526,26 +8925,25 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
+    title: "ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - VPP IPv4 3n-skx-x710 features
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-ndr"
+# Packet Throughput - VPP IPv4 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-skx-x710-64b-2t1c-features-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  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
+            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
            'NDRPDR' and
-           '2T1C' and
+           '1T1C' and
            'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
@@ -7554,6 +8952,7 @@
   - "parent"
   - "tags"
   sort:
+  - "DOT1Q"
   - "IP4BASE"
   - "NAT44"
   - "POLICE_MARK"
@@ -7565,25 +8964,24 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-skx-x710-64b-2t1c-features-ndr"
+    title: "ip4-3n-hsw-x520-64b-1t1c-features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-pdr"
+- 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-skx-x710-64b-2t1c-features-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  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
+            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
            'NDRPDR' and
-           '2T1C' and
+           '1T1C' and
            'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
@@ -7592,6 +8990,7 @@
   - "parent"
   - "tags"
   sort:
+  - "DOT1Q"
   - "IP4BASE"
   - "NAT44"
   - "POLICE_MARK"
@@ -7603,25 +9002,24 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-skx-x710-64b-2t1c-features-pdr"
+    title: "ip4-3n-hsw-x520-64b-1t1c-features-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-ndr"
+- 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-skx-x710-64b-4t2c-features-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  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
+            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
            'NDRPDR' and
-           '4T2C' and
+           '2T2C' and
            'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
@@ -7630,6 +9028,7 @@
   - "parent"
   - "tags"
   sort:
+  - "DOT1Q"
   - "IP4BASE"
   - "NAT44"
   - "POLICE_MARK"
@@ -7641,25 +9040,24 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-skx-x710-64b-4t2c-features-ndr"
+    title: "ip4-3n-hsw-x520-64b-2t2c-features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-pdr"
+- 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-skx-x710-64b-4t2c-features-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  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
+            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
            'NDRPDR' and
-           '4T2C' and
+           '2T2C' and
            'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
@@ -7668,6 +9066,7 @@
   - "parent"
   - "tags"
   sort:
+  - "DOT1Q"
   - "IP4BASE"
   - "NAT44"
   - "POLICE_MARK"
@@ -7679,23 +9078,23 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-skx-x710-64b-4t2c-features-pdr"
+    title: "ip4-3n-hsw-x520-64b-2t2c-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"
+# 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-x710-64b-1t1c-features-nat44-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  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' and
+           ('NAT44' or 'IP4BASE') and
+           not 'DOT1Q' and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -7703,7 +9102,7 @@
   - "parent"
   - "tags"
   sort:
-  - "BASE"
+  - "IP4BASE"
   - "BASE"
   - "SRC_USER_10"
   - "SRC_USER_100"
@@ -7714,22 +9113,22 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x710-64b-1t1c-features-nat44-ndr"
+    title: "ip4-3n-hsw-x520-64b-1t1c-features-nat44-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-features-nat44-pdr"
+- 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-x710-64b-1t1c-features-nat44-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  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' and
+           ('NAT44' or 'IP4BASE') and
+           not 'DOT1Q' and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -7737,7 +9136,7 @@
   - "parent"
   - "tags"
   sort:
-  - "BASE"
+  - "IP4BASE"
   - "BASE"
   - "SRC_USER_10"
   - "SRC_USER_100"
@@ -7748,22 +9147,22 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x710-64b-1t1c-features-nat44-pdr"
+    title: "ip4-3n-hsw-x520-64b-1t1c-features-nat44-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-features-nat44-ndr"
+- 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-x710-64b-2t2c-features-nat44-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  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' and
+           ('NAT44' or 'IP4BASE') and
+           not 'DOT1Q' and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -7771,7 +9170,7 @@
   - "parent"
   - "tags"
   sort:
-  - "BASE"
+  - "IP4BASE"
   - "BASE"
   - "SRC_USER_10"
   - "SRC_USER_100"
@@ -7782,22 +9181,22 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x710-64b-2t2c-features-nat44-ndr"
+    title: "ip4-3n-hsw-x520-64b-2t2c-features-nat44-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-features-nat44-pdr"
+- 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-x710-64b-2t2c-features-nat44-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  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' and
+           ('NAT44' or 'IP4BASE') and
+           not 'DOT1Q' and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -7805,7 +9204,7 @@
   - "parent"
   - "tags"
   sort:
-  - "BASE"
+  - "IP4BASE"
   - "BASE"
   - "SRC_USER_10"
   - "SRC_USER_100"
@@ -7816,31 +9215,31 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x710-64b-2t2c-features-nat44-pdr"
+    title: "ip4-3n-hsw-x520-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"
+# 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-x710-64b-1t1c-features-iacl-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  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' 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"
@@ -7850,30 +9249,30 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x710-64b-1t1c-features-iacl-ndr"
+    title: "ip4-3n-hsw-x520-64b-1t1c-features-iacl-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-features-iacl-pdr"
+- 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-x710-64b-1t1c-features-iacl-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  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' 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"
@@ -7883,30 +9282,30 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x710-64b-1t1c-features-iacl-pdr"
+    title: "ip4-3n-hsw-x520-64b-1t1c-features-iacl-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-features-iacl-ndr"
+- 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-x710-64b-2t2c-features-iacl-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  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' 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"
@@ -7916,30 +9315,30 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x710-64b-2t2c-features-iacl-ndr"
+    title: "ip4-3n-hsw-x520-64b-2t2c-features-iacl-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-features-iacl-pdr"
+- 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-x710-64b-2t2c-features-iacl-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  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' 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"
@@ -7949,31 +9348,31 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x710-64b-2t2c-features-iacl-pdr"
+    title: "ip4-3n-hsw-x520-64b-2t2c-features-iacl-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - VPP IPv4 3n-skx-x710 features oacl
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-features-oacl-ndr"
+# 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-x710-64b-1t1c-features-oacl-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' 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
            'NDRPDR' and
            '1T1C' and
            'IP4FWD' and
-           'OACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' 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"
@@ -7983,30 +9382,30 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x710-64b-1t1c-features-oacl-ndr"
+    title: "ip4-3n-hsw-x520-64b-1t1c-features-oacl-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-features-oacl-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,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-oacl-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-oacl-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
            '1T1C' and
            'IP4FWD' and
-           'OACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' 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"
@@ -8016,30 +9415,30 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x710-64b-1t1c-features-oacl-pdr"
+    title: "ip4-3n-hsw-x520-64b-1t1c-features-oacl-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-features-oacl-ndr"
+- 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-x710-64b-2t2c-features-oacl-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-oacl-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
            '2T2C' and
            'IP4FWD' and
-           'OACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' 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"
@@ -8049,30 +9448,30 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x710-64b-2t2c-features-oacl-ndr"
+    title: "ip4-3n-hsw-x520-64b-2t2c-features-oacl-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-features-oacl-pdr"
+- 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-x710-64b-2t2c-features-oacl-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-oacl-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
            '2T2C' and
            'IP4FWD' and
-           'OACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' 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"
@@ -8082,24 +9481,24 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x710-64b-2t2c-features-oacl-pdr"
+    title: "ip4-3n-hsw-x520-64b-2t2c-features-oacl-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"
+# 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-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  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
-           '2T1C' and
+           '1T1C' and
            'IP4FWD' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -8115,23 +9514,23 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
+    title: "ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
+- 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-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  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
-           '2T1C' and
+           '1T1C' and
            'IP4FWD' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -8147,23 +9546,23 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
+    title: "ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
+- 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-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  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
-           '4T2C' and
+           '2T2C' and
            'IP4FWD' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -8179,23 +9578,23 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
+    title: "ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
+- 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-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  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
-           '4T2C' and
+           '2T2C' and
            'IP4FWD' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -8211,22 +9610,25 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
+    title: "ip4-3n-hsw-x710-64b-2t2c-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"
+# 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-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  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 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           ('IP4BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            ('NAT44' and 'BASE') or
+            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
            'NDRPDR' and
-           '2T1C' and
+           '1T1C' and
            'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
@@ -8235,30 +9637,36 @@
   - "parent"
   - "tags"
   sort:
+  - "DOT1Q"
   - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  - "NAT44"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACL"
+  - "OACL"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
+    title: "ip4-3n-hsw-x710-64b-1t1c-features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
+- 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-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  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 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           ('IP4BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            ('NAT44' and 'BASE') or
+            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
            'NDRPDR' and
-           '2T1C' and
+           '1T1C' and
            'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
@@ -8267,30 +9675,36 @@
   - "parent"
   - "tags"
   sort:
+  - "DOT1Q"
   - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  - "NAT44"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACL"
+  - "OACL"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
+    title: "ip4-3n-hsw-x710-64b-1t1c-features-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
+- 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-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  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 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           ('IP4BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            ('NAT44' and 'BASE') or
+            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
            'NDRPDR' and
-           '4T2C' and
+           '2T2C' and
            'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
@@ -8299,30 +9713,36 @@
   - "parent"
   - "tags"
   sort:
+  - "DOT1Q"
   - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  - "NAT44"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACL"
+  - "OACL"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
+    title: "ip4-3n-hsw-x710-64b-2t2c-features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
+- 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-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  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 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           ('IP4BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            ('NAT44' and 'BASE') or
+            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
            'NDRPDR' and
-           '4T2C' and
+           '2T2C' and
            'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
@@ -8331,835 +9751,836 @@
   - "parent"
   - "tags"
   sort:
+  - "DOT1Q"
   - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  - "NAT44"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACL"
+  - "OACL"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
+    title: "ip4-3n-hsw-x710-64b-2t2c-features-pdr"
     layout: "plot-throughput"
 
-################################################################################
-
-# Packet Throughput - VPP IPv4 tunnels 3n-hsw-x520 base and scale
--
-  type: "plot"
-  title: "VPP Throughput: ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
+# 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]}/ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-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
-           'ENCAP' and
            'NDRPDR' and
-           '1T1C' and
-           'VXLAN' and
-           'L2BDMACLRN' and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           '2T1C' and
+           'IP4FWD' and
+           ('NAT44' or 'IP4BASE') and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "not DOT1Q"
-  - "VXLAN_1"
-  - "VXLAN_10"
-  - "VXLAN_100"
-  - "VXLAN_1000"
+  - "IP4BASE"
+  - "BASE"
+  - "SRC_USER_10"
+  - "SRC_USER_100"
+  - "SRC_USER_1000"
+  - "SRC_USER_2000"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
+    title: "ip4-3n-skx-x710-64b-2t1c-features-nat44-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
+- 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]}/ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  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
-           'ENCAP' and
            'NDRPDR' and
-           '1T1C' and
-           'VXLAN' and
-           'L2BDMACLRN' and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           '2T1C' and
+           'IP4FWD' and
+           ('NAT44' or 'IP4BASE') and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "not DOT1Q"
-  - "VXLAN_1"
-  - "VXLAN_10"
-  - "VXLAN_100"
-  - "VXLAN_1000"
+  - "IP4BASE"
+  - "BASE"
+  - "SRC_USER_10"
+  - "SRC_USER_100"
+  - "SRC_USER_1000"
+  - "SRC_USER_2000"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
+    title: "ip4-3n-skx-x710-64b-2t1c-features-nat44-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
+- 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]}/ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  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
-           'ENCAP' and
            'NDRPDR' and
-           '2T2C' and
-           'VXLAN' and
-           'L2BDMACLRN' and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           '4T2C' and
+           'IP4FWD' and
+           ('NAT44' or 'IP4BASE') and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "not DOT1Q"
-  - "VXLAN_1"
-  - "VXLAN_10"
-  - "VXLAN_100"
-  - "VXLAN_1000"
+  - "IP4BASE"
+  - "BASE"
+  - "SRC_USER_10"
+  - "SRC_USER_100"
+  - "SRC_USER_1000"
+  - "SRC_USER_2000"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
+    title: "ip4-3n-skx-x710-64b-4t2c-features-nat44-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
+- 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]}/ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  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
-           'ENCAP' and
            'NDRPDR' and
-           '2T2C' and
-           'VXLAN' and
-           'L2BDMACLRN' and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           '4T2C' and
+           'IP4FWD' and
+           ('NAT44' or 'IP4BASE') and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "not DOT1Q"
-  - "VXLAN_1"
-  - "VXLAN_10"
-  - "VXLAN_100"
-  - "VXLAN_1000"
+  - "IP4BASE"
+  - "BASE"
+  - "SRC_USER_10"
+  - "SRC_USER_100"
+  - "SRC_USER_1000"
+  - "SRC_USER_2000"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
+    title: "ip4-3n-skx-x710-64b-4t2c-features-nat44-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"
+# 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]}/ip4tun-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  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
-           'ENCAP' and
            'NDRPDR' and
-           '1T1C' and
-           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') and
-           not 'DOT1Q' and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           '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:
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "LISP"
+  - "IP4BASE"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4tun-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
+    title: "ip4-3n-skx-x710-64b-2t1c-features-iacl-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4tun-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
+- 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]}/ip4tun-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  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
-           'ENCAP' and
            'NDRPDR' and
-           '2T2C' and
-           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') and
-           not 'DOT1Q' and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           '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:
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "LISP"
+  - "IP4BASE"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4tun-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
+    title: "ip4-3n-skx-x710-64b-2t1c-features-iacl-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4tun-3n-hsw-x520-64b-1t1c-base_and_features-pdr"
+- 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]}/ip4tun-3n-hsw-x520-64b-1t1c-base_and_features-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  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
-           'ENCAP' and
            'NDRPDR' and
-           '1T1C' and
-           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') and
-           not 'DOT1Q' and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           '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:
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "LISP"
+  - "IP4BASE"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4tun-3n-hsw-x520-64b-1t1c-base_and_features-pdr"
+    title: "ip4-3n-skx-x710-64b-4t2c-features-iacl-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4tun-3n-hsw-x520-64b-2t2c-base_and_features-pdr"
+- 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]}/ip4tun-3n-hsw-x520-64b-2t2c-base_and_features-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' 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
-           'ENCAP' and
            'NDRPDR' and
-           '2T2C' and
-           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') and
-           not 'DOT1Q' and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           '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:
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "LISP"
+  - "IP4BASE"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4tun-3n-hsw-x520-64b-2t2c-base_and_features-pdr"
+    title: "ip4-3n-skx-x710-64b-4t2c-features-iacl-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"
+# 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]}/ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-1t1c-base-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '64B' and
-           'ENCAP' and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            '1T1C' and
-           'VXLAN' and
-           'L2BDMACLRN' and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "not DOT1Q"
-  - "VXLAN_1"
-  - "VXLAN_10"
-  - "VXLAN_100"
-  - "VXLAN_1000"
+  - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
+    title: "ip4-3n-hsw-xl710-64b-1t1c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
+- 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]}/ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-1t1c-base-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '64B' and
-           'ENCAP' and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            '1T1C' and
-           'VXLAN' and
-           'L2BDMACLRN' and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "not DOT1Q"
-  - "VXLAN_1"
-  - "VXLAN_10"
-  - "VXLAN_100"
-  - "VXLAN_1000"
+  - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
+    title: "ip4-3n-hsw-xl710-64b-1t1c-base-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+- 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]}/ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-2t2c-base-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '64B' and
-           'ENCAP' and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            '2T2C' and
-           'VXLAN' and
-           'L2BDMACLRN' and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "not DOT1Q"
-  - "VXLAN_1"
-  - "VXLAN_10"
-  - "VXLAN_100"
-  - "VXLAN_1000"
+  - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+    title: "ip4-3n-hsw-xl710-64b-2t2c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
+- 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]}/ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-2t2c-base-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '64B' and
-           'ENCAP' and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            '2T2C' and
-           'VXLAN' and
-           'L2BDMACLRN' and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "not DOT1Q"
-  - "VXLAN_1"
-  - "VXLAN_10"
-  - "VXLAN_100"
-  - "VXLAN_1000"
+  - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
+    title: "ip4-3n-hsw-xl710-64b-2t2c-base-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"
+# 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]}/ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  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
-           'ENCAP' and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
-           '1T1C' and
-           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') and
+           '2T1C' and
+           'IP4FWD' and
+           not 'IPSEC' and
            not 'DOT1Q' and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "LISP"
+  - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
+    title: "ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4tun-3n-hsw-x710-64b-2t2c-base_and_features-ndr"
+- 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]}/ip4tun-3n-hsw-x710-64b-2t2c-base_and_features-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  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
-           'ENCAP' and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
-           '2T2C' and
-           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') and
+           '2T1C' and
+           'IP4FWD' and
+           not 'IPSEC' and
            not 'DOT1Q' and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "LISP"
+  - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4tun-3n-hsw-x710-64b-2t2c-base_and_features-ndr"
+    title: "ip4-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-pdr"
+- 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]}/ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  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
-           'ENCAP' and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
-           '1T1C' and
-           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') and
+           '4T2C' and
+           'IP4FWD' and
+           not 'IPSEC' and
            not 'DOT1Q' and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "LISP"
+  - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-pdr"
+    title: "ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4tun-3n-hsw-x710-64b-2t2c-base_and_features-pdr"
+- type: "plot"
+  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-2t2c-base_and_features-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  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
-           'ENCAP' and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
-           '2T2C' and
-           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') and
+           '4T2C' and
+           'IP4FWD' and
+           not 'IPSEC' and
            not 'DOT1Q' and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "LISP"
+  - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4tun-3n-hsw-x710-64b-2t2c-base_and_features-pdr"
+    title: "ip4-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - VPP IPv4 tunnels 3n-skx-x710 base and scale
--
-  type: "plot"
-  title: "VPP Throughput: ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+# Packet Throughput - VPP 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]}/ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  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
-           'ENCAP' and
+           ('IP4BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            ('NAT44' and 'BASE') or
+            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
            'NDRPDR' and
            '2T1C' and
-           'VXLAN' and
-           'L2BDMACLRN' and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "not DOT1Q"
-  - "VXLAN_1"
-  - "VXLAN_10"
-  - "VXLAN_100"
-  - "VXLAN_1000"
+  - "DOT1Q"
+  - "IP4BASE"
+  - "NAT44"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACL"
+  - "OACL"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+    title: "ip4-3n-skx-x710-64b-2t1c-features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
+- type: "plot"
+  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  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
-           'ENCAP' and
+           ('IP4BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            ('NAT44' and 'BASE') or
+            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
            'NDRPDR' and
            '2T1C' and
-           'VXLAN' and
-           'L2BDMACLRN' and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "not DOT1Q"
-  - "VXLAN_1"
-  - "VXLAN_10"
-  - "VXLAN_100"
-  - "VXLAN_1000"
+  - "DOT1Q"
+  - "IP4BASE"
+  - "NAT44"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACL"
+  - "OACL"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
+    title: "ip4-3n-skx-x710-64b-2t1c-features-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
+- type: "plot"
+  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  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
-           'ENCAP' and
+           ('IP4BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            ('NAT44' and 'BASE') or
+            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
            'NDRPDR' and
            '4T2C' and
-           'VXLAN' and
-           'L2BDMACLRN' and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "not DOT1Q"
-  - "VXLAN_1"
-  - "VXLAN_10"
-  - "VXLAN_100"
-  - "VXLAN_1000"
+  - "DOT1Q"
+  - "IP4BASE"
+  - "NAT44"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACL"
+  - "OACL"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
+    title: "ip4-3n-skx-x710-64b-4t2c-features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
+- type: "plot"
+  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  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
-           'ENCAP' and
+           ('IP4BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            ('NAT44' and 'BASE') or
+            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
            'NDRPDR' and
            '4T2C' and
-           'VXLAN' and
-           'L2BDMACLRN' and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "not DOT1Q"
-  - "VXLAN_1"
-  - "VXLAN_10"
-  - "VXLAN_100"
-  - "VXLAN_1000"
+  - "DOT1Q"
+  - "IP4BASE"
+  - "NAT44"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACL"
+  - "OACL"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
+    title: "ip4-3n-skx-x710-64b-4t2c-features-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - VPP IPv4 tunnels 3n-skx-x710 - features
--
-  type: "plot"
-  title: "VPP Throughput: ip4tun-3n-skx-x710-64b-2t1c-base_and_features-ndr"
+# Packet Throughput - VPP 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]}/ip4tun-3n-skx-x710-64b-2t1c-base_and_features-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  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
-           'ENCAP' and
            'NDRPDR' and
-           '2T1C' and
-           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') and
-           not 'DOT1Q' and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           '1T1C' and
+           'IP4FWD' and
+           ('NAT44' or 'IP4BASE') and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "LISP"
+  - "IP4BASE"
+  - "BASE"
+  - "SRC_USER_10"
+  - "SRC_USER_100"
+  - "SRC_USER_1000"
+  - "SRC_USER_2000"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4tun-3n-skx-x710-64b-2t1c-base_and_features-ndr"
+    title: "ip4-3n-hsw-x710-64b-1t1c-features-nat44-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4tun-3n-skx-x710-64b-4t2c-base_and_features-ndr"
+- 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]}/ip4tun-3n-skx-x710-64b-4t2c-base_and_features-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  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
-           'ENCAP' and
            'NDRPDR' and
-           '4T2C' and
-           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') and
-           not 'DOT1Q' and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           '1T1C' and
+           'IP4FWD' and
+           ('NAT44' or 'IP4BASE') and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "LISP"
+  - "IP4BASE"
+  - "BASE"
+  - "SRC_USER_10"
+  - "SRC_USER_100"
+  - "SRC_USER_1000"
+  - "SRC_USER_2000"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4tun-3n-skx-x710-64b-4t2c-base_and_features-ndr"
+    title: "ip4-3n-hsw-x710-64b-1t1c-features-nat44-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4tun-3n-skx-x710-64b-2t1c-base_and_features-pdr"
+- 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]}/ip4tun-3n-skx-x710-64b-2t1c-base_and_features-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  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
-           'ENCAP' and
            'NDRPDR' and
-           '2T1C' and
-           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') and
-           not 'DOT1Q' and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           '2T2C' and
+           'IP4FWD' and
+           ('NAT44' or 'IP4BASE') and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "LISP"
+  - "IP4BASE"
+  - "BASE"
+  - "SRC_USER_10"
+  - "SRC_USER_100"
+  - "SRC_USER_1000"
+  - "SRC_USER_2000"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4tun-3n-skx-x710-64b-2t1c-base_and_features-pdr"
+    title: "ip4-3n-hsw-x710-64b-2t2c-features-nat44-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4tun-3n-skx-x710-64b-4t2c-base_and_features-pdr"
+- 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]}/ip4tun-3n-skx-x710-64b-4t2c-base_and_features-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  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
-           'ENCAP' and
            'NDRPDR' and
-           '4T2C' and
-           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') and
-           not 'DOT1Q' and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           '2T2C' and
+           'IP4FWD' and
+           ('NAT44' or 'IP4BASE') and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "LISP"
+  - "IP4BASE"
+  - "BASE"
+  - "SRC_USER_10"
+  - "SRC_USER_100"
+  - "SRC_USER_1000"
+  - "SRC_USER_2000"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4tun-3n-skx-x710-64b-4t2c-base_and_features-pdr"
+    title: "ip4-3n-hsw-x710-64b-2t2c-features-nat44-pdr"
     layout: "plot-throughput"
 
-################################################################################
-
-# Packet Throughput - VPP IPv6 3n-hsw-x520
--
-  type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-x520-78b-1t1c-base_and_scale-ndr"
+# 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]}/ip6-3n-hsw-x520-78b-1t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-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]}/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
-           'IP6FWD' and
-           not 'SRv6' and
+           'IP4FWD' and
+           ('IACL' and ('ACL10' or 'ACL50') and '10K_FLOWS' or 'IP4BASE') and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -9167,32 +10588,31 @@
   - "parent"
   - "tags"
   sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  - "IP4BASE"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-3n-hsw-x520-78b-1t1c-base_and_scale-ndr"
+    title: "ip4-3n-hsw-x710-64b-1t1c-features-iacl-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-x520-78b-1t1c-base_and_scale-pdr"
+- 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]}/ip6-3n-hsw-x520-78b-1t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-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]}/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
-           'IP6FWD' and
-           not 'SRv6' and
+           'IP4FWD' and
+           ('IACL' and ('ACL10' or 'ACL50') and '10K_FLOWS' or 'IP4BASE') and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -9200,32 +10620,31 @@
   - "parent"
   - "tags"
   sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  - "IP4BASE"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-3n-hsw-x520-78b-1t1c-base_and_scale-pdr"
+    title: "ip4-3n-hsw-x710-64b-1t1c-features-iacl-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-x520-78b-2t2c-base_and_scale-ndr"
+- 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]}/ip6-3n-hsw-x520-78b-2t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-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]}/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
-           'IP6FWD' and
-           not 'SRv6' and
+           'IP4FWD' and
+           ('IACL' and ('ACL10' or 'ACL50') and '10K_FLOWS' or 'IP4BASE') and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -9233,489 +10652,455 @@
   - "parent"
   - "tags"
   sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  - "IP4BASE"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-3n-hsw-x520-78b-2t2c-base_and_scale-ndr"
+    title: "ip4-3n-hsw-x710-64b-2t2c-features-iacl-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-x520-78b-2t2c-base_and_scale-pdr"
+- 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]}/ip6-3n-hsw-x520-78b-2t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-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]}/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
-           'IP6FWD' and
-           not 'SRv6' and
+           'IP4FWD' and
+           ('IACL' and ('ACL10' or 'ACL50') and '10K_FLOWS' or 'IP4BASE') and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-3n-hsw-x520-78b-2t2c-base_and_scale-pdr"
+    title: "ip4-3n-hsw-x710-64b-2t2c-features-iacl-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - VPP IPv6 3n-hsw-x520 - features
--
-  type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-x520-78b-1t1c-base_and_features-ndr"
+# 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]}/ip6-3n-hsw-x520-78b-1t1c-base_and_features-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           ('IP6BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            'IACLDST') and
+  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
-           '1T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
+           '2T1C' and
+           'IP4FWD' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP6BASE"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACLDST"
+  - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-3n-hsw-x520-78b-1t1c-base_and_features-ndr"
+    title: "ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-x520-78b-2t2c-base_and_features-ndr"
+- 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]}/ip6-3n-hsw-x520-78b-2t2c-base_and_features-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           ('IP6BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            'IACLDST') and
+  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
-           '2T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
+           '2T1C' and
+           'IP4FWD' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP6BASE"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACLDST"
+  - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-3n-hsw-x520-78b-2t2c-base_and_features-ndr"
+    title: "ip4-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-x520-78b-1t1c-base_and_features-pdr"
+- 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]}/ip6-3n-hsw-x520-78b-1t1c-base_and_features-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           ('IP6BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            'IACLDST') and
+  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
-           '1T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
+           '4T2C' and
+           'IP4FWD' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP6BASE"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACLDST"
+  - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-3n-hsw-x520-78b-1t1c-base_and_features-pdr"
+    title: "ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-x520-78b-2t2c-base_and_features-pdr"
+- 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]}/ip6-3n-hsw-x520-78b-2t2c-base_and_features-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           ('IP6BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            'IACLDST') and
+  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
-           '2T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
+           '4T2C' and
+           'IP4FWD' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP6BASE"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACLDST"
+  - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-3n-hsw-x520-78b-2t2c-base_and_features-pdr"
+    title: "ip4-2n-skx-x710-64b-4t2c-base_and_scale-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"
+# 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]}/ip6-3n-hsw-x710-78b-1t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  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
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           '64B' and
+           (('IACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
            'NDRPDR' and
-           '1T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
+           '2T1C' and
+           'IP4FWD' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  - "IP4BASE"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-3n-hsw-x710-78b-1t1c-base_and_scale-ndr"
+    title: "ip4-2n-skx-x710-64b-2t1c-features-iacl-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-x710-78b-1t1c-base_and_scale-pdr"
+- 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]}/ip6-3n-hsw-x710-78b-1t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  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
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           '64B' and
+           (('IACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
            'NDRPDR' and
-           '1T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
+           '2T1C' and
+           'IP4FWD' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  - "IP4BASE"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-3n-hsw-x710-78b-1t1c-base_and_scale-pdr"
+    title: "ip4-2n-skx-x710-64b-2t1c-features-iacl-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-x710-78b-2t2c-base_and_scale-ndr"
+- 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]}/ip6-3n-hsw-x710-78b-2t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  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
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           '64B' and
+           (('IACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
            'NDRPDR' and
-           '2T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
+           '4T2C' and
+           'IP4FWD' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  - "IP4BASE"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-3n-hsw-x710-78b-2t2c-base_and_scale-ndr"
+    title: "ip4-2n-skx-x710-64b-4t2c-features-iacl-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-x710-78b-2t2c-base_and_scale-pdr"
+- 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]}/ip6-3n-hsw-x710-78b-2t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  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
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           '64B' and
+           (('IACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
            'NDRPDR' and
-           '2T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
+           '4T2C' and
+           'IP4FWD' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  - "IP4BASE"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-3n-hsw-x710-78b-2t2c-base_and_scale-pdr"
+    title: "ip4-2n-skx-x710-64b-4t2c-features-iacl-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"
+# 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]}/ip6-3n-hsw-x710-78b-1t1c-base_and_features-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            'IACLDST') and
+  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
-           '1T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
+           '2T1C' and
+           'IP4FWD' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP6BASE"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACLDST"
+  - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-3n-hsw-x710-78b-1t1c-base_and_features-ndr"
+    title: "ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-x710-78b-2t2c-base_and_features-ndr"
+- 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]}/ip6-3n-hsw-x710-78b-2t2c-base_and_features-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            'IACLDST') and
+  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
-           '2T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
+           '2T1C' and
+           'IP4FWD' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP6BASE"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACLDST"
+  - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-3n-hsw-x710-78b-2t2c-base_and_features-ndr"
+    title: "ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-x710-78b-1t1c-base_and_features-pdr"
+- 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]}/ip6-3n-hsw-x710-78b-1t1c-base_and_features-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            'IACLDST') and
+  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
-           '1T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
+           '4T2C' and
+           'IP4FWD' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP6BASE"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACLDST"
+  - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-3n-hsw-x710-78b-1t1c-base_and_features-pdr"
+    title: "ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-x710-78b-2t2c-base_and_features-pdr"
+- 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]}/ip6-3n-hsw-x710-78b-2t2c-base_and_features-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            'IACLDST') and
+  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
-           '2T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
+           '4T2C' and
+           'IP4FWD' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP6BASE"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACLDST"
+  - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-3n-hsw-x710-78b-2t2c-base_and_features-pdr"
+    title: "ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - VPP IPv6 3n-hsw-xl710
--
-  type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-xl710-78b-1t1c-base_and_scale-ndr"
+# 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]}/ip6-3n-hsw-xl710-78b-1t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+  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
-           'IP6FWD' and
-           not 'SRv6' and
+           'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -9723,32 +11108,27 @@
   - "parent"
   - "tags"
   sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  - "IP4BASE"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-3n-hsw-xl710-78b-1t1c-base_and_scale-ndr"
+    title: "ip4-2n-dnv-x553-64b-1t1c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-xl710-78b-1t1c-base_and_scale-pdr"
+- 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]}/ip6-3n-hsw-xl710-78b-1t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+  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
-           'IP6FWD' and
-           not 'SRv6' and
+           'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -9756,32 +11136,27 @@
   - "parent"
   - "tags"
   sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  - "IP4BASE"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-3n-hsw-xl710-78b-1t1c-base_and_scale-pdr"
+    title: "ip4-2n-dnv-x553-64b-1t1c-base-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-xl710-78b-2t2c-base_and_scale-ndr"
+- 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]}/ip6-3n-hsw-xl710-78b-2t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+  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
-           'IP6FWD' and
-           not 'SRv6' and
+           'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -9789,32 +11164,27 @@
   - "parent"
   - "tags"
   sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  - "IP4BASE"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-3n-hsw-xl710-78b-2t2c-base_and_scale-ndr"
+    title: "ip4-2n-dnv-x553-64b-2t2c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-xl710-78b-2t2c-base_and_scale-pdr"
+- 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]}/ip6-3n-hsw-xl710-78b-2t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+  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
-           'IP6FWD' and
-           not 'SRv6' and
+           'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -9822,3613 +11192,3473 @@
   - "parent"
   - "tags"
   sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  - "IP4BASE"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-3n-hsw-xl710-78b-2t2c-base_and_scale-pdr"
+    title: "ip4-2n-dnv-x553-64b-2t2c-base-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - VPP IPv6 3n-skx-x710
--
-  type: "plot"
-  title: "VPP Throughput: ip6-3n-skx-x710-78b-2t1c-base_and_scale-ndr"
+################################################################################
+
+# Packet Throughput - VPP 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]}/ip6-3n-skx-x710-78b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+  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
-           '2T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '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:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  - "IP4BASE"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "LISP"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-3n-skx-x710-78b-2t1c-base_and_scale-ndr"
+    title: "ip4tun-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip6-3n-skx-x710-78b-2t1c-base_and_scale-pdr"
+- 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]}/ip6-3n-skx-x710-78b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+  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
-           '2T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '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:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  - "IP4BASE"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "LISP"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-3n-skx-x710-78b-2t1c-base_and_scale-pdr"
+    title: "ip4tun-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip6-3n-skx-x710-78b-4t2c-base_and_scale-ndr"
+- 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]}/ip6-3n-skx-x710-78b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+  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
-           '4T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '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:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  - "IP4BASE"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "LISP"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-3n-skx-x710-78b-4t2c-base_and_scale-ndr"
+    title: "ip4tun-3n-hsw-x520-64b-1t1c-base_and_features-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip6-3n-skx-x710-78b-4t2c-base_and_scale-pdr"
+- 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]}/ip6-3n-skx-x710-78b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+  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
-           '4T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '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:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  - "IP4BASE"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "LISP"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-3n-skx-x710-78b-4t2c-base_and_scale-pdr"
+    title: "ip4tun-3n-hsw-x520-64b-2t2c-base_and_features-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - VPP IPv6 3n-skx-x710 - features
--
-  type: "plot"
-  title: "VPP Throughput: ip6-3n-skx-x710-78b-2t1c-base_and_features-ndr"
+# Packet Throughput - VPP 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]}/ip6-3n-skx-x710-78b-2t1c-base_and_features-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  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
-           '78B' and
-           ('IP6BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            'IACLDST') and
+           '64B' and
+           'ENCAP' and
            'NDRPDR' and
-           '2T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '1T1C' and
+           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
+           not 'VHOST' and
+           not 'IPSECHW'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP6BASE"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACLDST"
+  - "IP4BASE"
+  - "LISP"
+  - "VXLAN_1"
+  - "VXLAN_10"
+  - "VXLAN_100"
+  - "VXLAN_1000"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-3n-skx-x710-78b-2t1c-base_and_features-ndr"
+    title: "ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip6-3n-skx-x710-78b-4t2c-base_and_features-ndr"
+- 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]}/ip6-3n-skx-x710-78b-4t2c-base_and_features-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  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
-           '78B' and
-           ('IP6BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            'IACLDST') and
+           '64B' and
+           'ENCAP' and
            'NDRPDR' and
-           '4T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '1T1C' and
+           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
+           not 'VHOST' and
+           not 'IPSECHW'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP6BASE"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACLDST"
+  - "IP4BASE"
+  - "LISP"
+  - "VXLAN_1"
+  - "VXLAN_10"
+  - "VXLAN_100"
+  - "VXLAN_1000"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-3n-skx-x710-78b-4t2c-base_and_features-ndr"
+    title: "ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip6-3n-skx-x710-78b-2t1c-base_and_features-pdr"
+- 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]}/ip6-3n-skx-x710-78b-2t1c-base_and_features-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  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
-           '78B' and
-           ('IP6BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            'IACLDST') and
+           '64B' and
+           'ENCAP' and
            'NDRPDR' and
-           '2T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '2T2C' and
+           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
+           not 'VHOST' and
+           not 'IPSECHW'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP6BASE"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACLDST"
+  - "IP4BASE"
+  - "LISP"
+  - "VXLAN_1"
+  - "VXLAN_10"
+  - "VXLAN_100"
+  - "VXLAN_1000"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-3n-skx-x710-78b-2t1c-base_and_features-pdr"
+    title: "ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip6-3n-skx-x710-78b-4t2c-base_and_features-pdr"
+- 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]}/ip6-3n-skx-x710-78b-4t2c-base_and_features-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  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
-           '78B' and
-           ('IP6BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            'IACLDST') and
+           '64B' and
+           'ENCAP' and
            'NDRPDR' and
-           '4T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '2T2C' and
+           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
+           not 'VHOST' and
+           not 'IPSECHW'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP6BASE"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACLDST"
+  - "IP4BASE"
+  - "LISP"
+  - "VXLAN_1"
+  - "VXLAN_10"
+  - "VXLAN_100"
+  - "VXLAN_1000"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-3n-skx-x710-78b-4t2c-base_and_features-pdr"
+    title: "ip4tun-3n-hsw-x710-64b-2t2c-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"
+# 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]}/ip6-2n-skx-x710-78b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  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
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           '64B' and
+           'ENCAP' and
            'NDRPDR' and
-           '2T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '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:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  - "IP4BASE"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "LISP"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-2n-skx-x710-78b-2t1c-base_and_scale-ndr"
+    title: "ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip6-2n-skx-x710-78b-2t1c-base_and_scale-pdr"
+- 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]}/ip6-2n-skx-x710-78b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  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
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           '64B' and
+           'ENCAP' and
            'NDRPDR' and
-           '2T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '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:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  - "IP4BASE"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "LISP"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-2n-skx-x710-78b-2t1c-base_and_scale-pdr"
+    title: "ip4tun-3n-hsw-x710-64b-2t2c-base_and_features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip6-2n-skx-x710-78b-4t2c-base_and_scale-ndr"
+- 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]}/ip6-2n-skx-x710-78b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  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
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           '64B' and
+           'ENCAP' and
            'NDRPDR' and
-           '4T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '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:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  - "IP4BASE"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "LISP"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-2n-skx-x710-78b-4t2c-base_and_scale-ndr"
+    title: "ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip6-2n-skx-x710-78b-4t2c-base_and_scale-pdr"
+- 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]}/ip6-2n-skx-x710-78b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  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
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           '64B' and
+           'ENCAP' and
            'NDRPDR' and
-           '4T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '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:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  - "IP4BASE"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "LISP"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-2n-skx-x710-78b-4t2c-base_and_scale-pdr"
+    title: "ip4tun-3n-hsw-x710-64b-2t2c-base_and_features-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"
+# 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]}/ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+  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
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
+           not 'VHOST' and
+           not 'IPSECHW'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  - "IP4BASE"
+  - "LISP"
+  - "VXLAN_1"
+  - "VXLAN_10"
+  - "VXLAN_100"
+  - "VXLAN_1000"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr"
+    title: "ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-pdr"
+- type: "plot"
+  title: "VPP Throughput: ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+  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
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
+           not 'VHOST' and
+           not 'IPSECHW'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  - "IP4BASE"
+  - "LISP"
+  - "VXLAN_1"
+  - "VXLAN_10"
+  - "VXLAN_100"
+  - "VXLAN_1000"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-pdr"
+    title: "ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr"
+- type: "plot"
+  title: "VPP Throughput: ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+  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
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
+           not 'VHOST' and
+           not 'IPSECHW'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  - "IP4BASE"
+  - "LISP"
+  - "VXLAN_1"
+  - "VXLAN_10"
+  - "VXLAN_100"
+  - "VXLAN_1000"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr"
+    title: "ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-pdr"
+- type: "plot"
+  title: "VPP Throughput: ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') 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
+           'ENCAP' and
            'NDRPDR' and
            '4T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
+           not 'VHOST' and
+           not 'IPSECHW'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  - "IP4BASE"
+  - "LISP"
+  - "VXLAN_1"
+  - "VXLAN_10"
+  - "VXLAN_100"
+  - "VXLAN_1000"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-pdr"
+    title: "ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
-################################################################################
-
-# Packet Throughput - VPP IPv6 tunnels 3n-hsw-x520
--
-  type: "plot"
-  title: "VPP Throughput: ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-ndr"
+# Packet Throughput - VPP IPv4 tunnels 3n-skx-x710 - features
+- type: "plot"
+  title: "VPP Throughput: ip4tun-3n-skx-x710-64b-2t1c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
+  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
-           '1T1C' and
-           'LISP' and
-           not 'VHOST'"
+           '2T1C' and
+           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
+           not 'DOT1Q' and
+           not 'VHOST' and
+           not 'IPSECHW'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP4UNRLAY"
-  - "IP6UNRLAY"
+  - "IP4BASE"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "LISP"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-ndr"
+    title: "ip4tun-3n-skx-x710-64b-2t1c-base_and_features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-pdr"
+- type: "plot"
+  title: "VPP Throughput: ip4tun-3n-skx-x710-64b-4t2c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
+  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
-           '1T1C' and
-           'LISP' and
-           not 'VHOST'"
+           '4T2C' and
+           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
+           not 'DOT1Q' and
+           not 'VHOST' and
+           not 'IPSECHW'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP4UNRLAY"
-  - "IP6UNRLAY"
+  - "IP4BASE"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "LISP"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-pdr"
+    title: "ip4tun-3n-skx-x710-64b-4t2c-base_and_features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip6tun-3n-hsw-x520-78b-2t2c-base_and_scale-ndr"
+- type: "plot"
+  title: "VPP Throughput: ip4tun-3n-skx-x710-64b-2t1c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-2t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
+  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
-           '2T2C' and
-           'LISP' and
-           not 'VHOST'"
+           '2T1C' and
+           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
+           not 'DOT1Q' and
+           not 'VHOST' and
+           not 'IPSECHW'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP4UNRLAY"
-  - "IP6UNRLAY"
+  - "IP4BASE"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "LISP"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6tun-3n-hsw-x520-78b-2t2c-base_and_scale-ndr"
+    title: "ip4tun-3n-skx-x710-64b-2t1c-base_and_features-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip6tun-3n-hsw-x520-78b-2t2c-base_and_scale-pdr"
+- type: "plot"
+  title: "VPP Throughput: ip4tun-3n-skx-x710-64b-4t2c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-2t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
+  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
-           '2T2C' and
-           'LISP' and
-           not 'VHOST'"
+           '4T2C' and
+           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
+           not 'DOT1Q' and
+           not 'VHOST' and
+           not 'IPSECHW'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP4UNRLAY"
-  - "IP6UNRLAY"
+  - "IP4BASE"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "LISP"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6tun-3n-hsw-x520-78b-2t2c-base_and_scale-pdr"
+    title: "ip4tun-3n-skx-x710-64b-4t2c-base_and_features-pdr"
     layout: "plot-throughput"
 
 ################################################################################
 
-# Packet Throughput - VPP IPSec 3n-hsw-xl710 base
--
-  type: "plot"
-  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-1t1c-base-ndr"
+# Packet Throughput - VPP 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]}/ipsec-3n-hsw-xl710-64b-1t1c-base-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'IP4FWD' and
+  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
-           'BASE' and
            '1T1C' and
-           'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') 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: "ipsec-3n-hsw-xl710-64b-1t1c-base-ndr"
+    title: "ip6-3n-hsw-x520-78b-1t1c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-1t1c-base-pdr"
+- 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]}/ipsec-3n-hsw-xl710-64b-1t1c-base-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'IP4FWD' and
+  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
-           'BASE' and
            '1T1C' and
-           'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') 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: "ipsec-3n-hsw-xl710-64b-1t1c-base-pdr"
+    title: "ip6-3n-hsw-x520-78b-1t1c-base-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-2t2c-base-ndr"
+- 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]}/ipsec-3n-hsw-xl710-64b-2t2c-base-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'IP4FWD' and
+  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
-           'BASE' and
            '2T2C' and
-           'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') 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: "ipsec-3n-hsw-xl710-64b-2t2c-base-ndr"
+    title: "ip6-3n-hsw-x520-78b-2t2c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-2t2c-base-pdr"
+- 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]}/ipsec-3n-hsw-xl710-64b-2t2c-base-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'IP4FWD' 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
-           'BASE' and
            '2T2C' and
-           'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') 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: "ipsec-3n-hsw-xl710-64b-2t2c-base-pdr"
+    title: "ip6-3n-hsw-x520-78b-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"
+# 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]}/ipsec-3n-hsw-xl710-64b-1t1c-scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'IP4FWD' 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
-           'SCALE' and
            '1T1C' and
-           'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') 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: "ipsec-3n-hsw-xl710-64b-1t1c-scale-ndr"
+    title: "ip6-3n-hsw-x710-78b-1t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-1t1c-scale-pdr"
+- 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]}/ipsec-3n-hsw-xl710-64b-1t1c-scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'IP4FWD' 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
-           'SCALE' and
            '1T1C' and
-           'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') 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: "ipsec-3n-hsw-xl710-64b-1t1c-scale-pdr"
+    title: "ip6-3n-hsw-x710-78b-1t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-2t2c-scale-ndr"
+- 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]}/ipsec-3n-hsw-xl710-64b-2t2c-scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'IP4FWD' 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
-           'SCALE' and
            '2T2C' and
-           'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') 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: "ipsec-3n-hsw-xl710-64b-2t2c-scale-ndr"
+    title: "ip6-3n-hsw-x710-78b-2t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-2t2c-scale-pdr"
+- 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]}/ipsec-3n-hsw-xl710-64b-2t2c-scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'IP4FWD' 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
-           'SCALE' and
            '2T2C' and
-           'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') 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: "ipsec-3n-hsw-xl710-64b-2t2c-scale-pdr"
+    title: "ip6-3n-hsw-x710-78b-2t2c-base_and_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"
+# 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]}/ipsec-3n-hsw-xl710-64b-1t1c-sw-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'IP4FWD' and
+  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
-           'IPSECSW' and
-           ('IPSECTRAN' or 'IPSECTUN') 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: "ipsec-3n-hsw-xl710-64b-1t1c-sw-ndr"
+    title: "ip6-3n-hsw-x710-78b-1t1c-base_and_features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-1t1c-sw-pdr"
+- 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]}/ipsec-3n-hsw-xl710-64b-1t1c-sw-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'IP4FWD' 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
-           '1T1C' and
-           'IPSECSW' and
-           ('IPSECTRAN' or 'IPSECTUN') 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: "ipsec-3n-hsw-xl710-64b-1t1c-sw-pdr"
+    title: "ip6-3n-hsw-x710-78b-2t2c-base_and_features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-2t2c-sw-ndr"
+- 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]}/ipsec-3n-hsw-xl710-64b-2t2c-sw-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'IP4FWD' and
+  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
-           '2T2C' and
-           'IPSECSW' and
-           ('IPSECTRAN' or 'IPSECTUN') 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: "ipsec-3n-hsw-xl710-64b-2t2c-sw-ndr"
+    title: "ip6-3n-hsw-x710-78b-1t1c-base_and_features-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-2t2c-sw-pdr"
+- 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]}/ipsec-3n-hsw-xl710-64b-2t2c-sw-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'IP4FWD' and
+  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
-           'IPSECSW' and
-           ('IPSECTRAN' or 'IPSECTUN') 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: "ipsec-3n-hsw-xl710-64b-2t2c-sw-pdr"
+    title: "ip6-3n-hsw-x710-78b-2t2c-base_and_features-pdr"
     layout: "plot-throughput"
 
-################################################################################
-
-# Packet Throughput - VPP SRv6 3n-hsw-x520
--
-  type: "plot"
-  title: "VPP Throughput: srv6-3n-hsw-x520-78b-1t1c-features-ndr"
+# Packet Throughput - 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]}/srv6-3n-hsw-x520-78b-1t1c-features-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' 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
-           'FEATURE' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            '1T1C' and
            'IP6FWD' and
-           'SRv6'"
+           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: "srv6-3n-hsw-x520-78b-1t1c-features-ndr"
+    title: "ip6-3n-hsw-xl710-78b-1t1c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: srv6-3n-hsw-x520-78b-1t1c-features-pdr"
+- 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]}/srv6-3n-hsw-x520-78b-1t1c-features-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' 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
-           'FEATURE' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            '1T1C' and
            'IP6FWD' and
-           'SRv6'"
+           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: "srv6-3n-hsw-x520-78b-1t1c-features-pdr"
+    title: "ip6-3n-hsw-xl710-78b-1t1c-base-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: srv6-3n-hsw-x520-78b-2t2c-features-ndr"
+- 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]}/srv6-3n-hsw-x520-78b-2t2c-features-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' 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
-           'FEATURE' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            '2T2C' and
            'IP6FWD' and
-           'SRv6'"
+           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: "srv6-3n-hsw-x520-78b-2t2c-features-ndr"
+    title: "ip6-3n-hsw-xl710-78b-2t2c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: srv6-3n-hsw-x520-78b-2t2c-features-pdr"
+- 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]}/srv6-3n-hsw-x520-78b-2t2c-features-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  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
-           'FEATURE' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            '2T2C' and
            'IP6FWD' and
-           'SRv6'"
+           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: "srv6-3n-hsw-x520-78b-2t2c-features-pdr"
+    title: "ip6-3n-hsw-xl710-78b-2t2c-base-pdr"
     layout: "plot-throughput"
 
-################################################################################
-
-# Packet Throughput - VPP vhost ip4 3n-hsw-x520
--
-  type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
+# 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]}/vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
+  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
-           'ETH' and
-           'IP4FWD' and
-           '1T1C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'DOT1Q'"
+           '2T1C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "not CFS_OPT"
-  - "1VM"
-  - "2VM"
+  - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
+    title: "ip6-3n-skx-x710-78b-2t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
+- 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]}/vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
+  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
-           'ETH' and
-           'IP4FWD' and
-           '2T2C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'DOT1Q'"
+           '2T1C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "not CFS_OPT"
-  - "1VM"
-  - "2VM"
+  - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
+    title: "ip6-3n-skx-x710-78b-2t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
+- 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]}/vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
+  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
-           'ETH' and
-           'IP4FWD' and
-           '1T1C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'DOT1Q'"
+           '4T2C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "not CFS_OPT"
-  - "1VM"
-  - "2VM"
+  - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
+    title: "ip6-3n-skx-x710-78b-4t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
+- type: "plot"
+  title: "VPP Throughput: ip6-3n-skx-x710-78b-4t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
+  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
-           'ETH' and
-           'IP4FWD' and
-           '2T2C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'DOT1Q'"
+           '4T2C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "not CFS_OPT"
-  - "1VM"
-  - "2VM"
+  - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
+    title: "ip6-3n-skx-x710-78b-4t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - VPP vhost l2sw 3n-hsw-x520
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
+# Packet Throughput - VPP IPv6 3n-skx-x710 - features
+- type: "plot"
+  title: "VPP Throughput: ip6-3n-skx-x710-78b-2t1c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
+  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
-           ('ETH' or 'DOT1Q') and
-           '1T1C' and
-           'L2BDMACLRN' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
+           '2T1C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
+  sort:
+  - "IP6BASE"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACLDST"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
+    title: "ip6-3n-skx-x710-78b-2t1c-base_and_features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
+- type: "plot"
+  title: "VPP Throughput: ip6-3n-skx-x710-78b-4t2c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
+  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
-           ('ETH' or 'DOT1Q') and
-           '2T2C' and
-           'L2BDMACLRN' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
+           '4T2C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
+  sort:
+  - "IP6BASE"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACLDST"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
+    title: "ip6-3n-skx-x710-78b-4t2c-base_and_features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
+- type: "plot"
+  title: "VPP Throughput: ip6-3n-skx-x710-78b-2t1c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
+  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
-           ('ETH' or 'DOT1Q') and
-           '1T1C' and
-           'L2BDMACLRN' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
+           '2T1C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
+  sort:
+  - "IP6BASE"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACLDST"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
+    title: "ip6-3n-skx-x710-78b-2t1c-base_and_features-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
+- type: "plot"
+  title: "VPP Throughput: ip6-3n-skx-x710-78b-4t2c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
+  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
-           ('ETH' or 'DOT1Q') and
-           '2T2C' and
-           'L2BDMACLRN' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
+           '4T2C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
+  sort:
+  - "IP6BASE"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACLDST"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
+    title: "ip6-3n-skx-x710-78b-4t2c-base_and_features-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-ndr"
+# 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]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
+  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
-           ('ETH' or 'DOT1Q') and
-           'BASE' and
-           '1T1C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
+           '2T1C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
+  - "throughput"
+  - "parent"
+  - "tags"
+  sort:
+  - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base-ndr"
+    title: "ip6-3n-skx-xxv710-78b-2t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-1t1c-base-pdr"
+- 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]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
+  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
-           ('ETH' or 'DOT1Q') and
-           'BASE' and
-           '1T1C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
+           '2T1C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
+  sort:
+  - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base-pdr"
+    title: "ip6-3n-skx-xxv710-78b-2t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-2t2c-base-ndr"
+- 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]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
+  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
-           ('ETH' or 'DOT1Q') and
-           'BASE' and
-           '2T2C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
+           '4T2C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
+  sort:
+  - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-hsw-x520-64b-2t2c-base-ndr"
+    title: "ip6-3n-skx-xxv710-78b-4t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-2t2c-base-pdr"
+- 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]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
+  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
-           ('ETH' or 'DOT1Q') and
-           'BASE' and
-           '2T2C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
+           '4T2C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
+  sort:
+  - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-hsw-x520-64b-2t2c-base-pdr"
+    title: "ip6-3n-skx-xxv710-78b-4t2c-base_and_scale-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"
+# 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]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
+  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
-           ('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'"
+           '2T1C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
+  sort:
+  - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-ndr"
+    title: "ip6-2n-skx-x710-78b-2t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-pdr"
+- 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]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
+  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
-           ('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'"
+           '2T1C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
+  sort:
+  - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-pdr"
+    title: "ip6-2n-skx-x710-78b-2t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-ndr"
+- 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]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
+  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
-           ('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'"
+           '4T2C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
+  sort:
+  - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-ndr"
+    title: "ip6-2n-skx-x710-78b-4t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-pdr"
+- 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]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
+  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
-           ('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'"
+           '4T2C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
+  sort:
+  - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-pdr"
+    title: "ip6-2n-skx-x710-78b-4t2c-base_and_scale-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"
+# 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]}/vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr"
+  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
-           'ETH' and
-           'IP4FWD' and
-           '1T1C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'DOT1Q'"
+           '2T1C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "1VM"
-  - "2VM"
+  sort:
+  - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
+    title: "ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+- 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]}/vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-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
-           'ETH' and
-           'IP4FWD' and
-           '2T2C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'DOT1Q'"
+           '2T1C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "not CFS_OPT"
-  - "1VM"
-  - "2VM"
+  - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+    title: "ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
+- 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]}/vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr"
+  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
-           'ETH' and
-           'IP4FWD' and
-           '1T1C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'DOT1Q'"
+           '4T2C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "not CFS_OPT"
-  - "1VM"
-  - "2VM"
+  - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
+    title: "ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
+- 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]}/vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-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
-           'ETH' and
-           'IP4FWD' and
-           '2T2C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'DOT1Q'"
+           '4T2C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "not CFS_OPT"
-  - "1VM"
-  - "2VM"
+  - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
+    title: "ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - VPP vhost l2sw 3n-hsw-x710
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
+# 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]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
+  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
-           ('ETH' or 'DOT1Q') and
            '1T1C' and
-           'L2BDMACLRN' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
+  sort:
+  - "IP6BASE"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
+    title: "ip6-2n-dnv-x553-78b-1t1c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+- 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]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
+  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
-           ('ETH' or 'DOT1Q') and
-           '2T2C' and
-           'L2BDMACLRN' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
+           '1T1C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
+  sort:
+  - "IP6BASE"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+    title: "ip6-2n-dnv-x553-78b-1t1c-base-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
+- 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]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
+  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
-           ('ETH' or 'DOT1Q') and
-           '1T1C' and
-           'L2BDMACLRN' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
+           '2T2C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
+  sort:
+  - "IP6BASE"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
+    title: "ip6-2n-dnv-x553-78b-2t2c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
+- 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]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
+  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
-           ('ETH' or 'DOT1Q') and
            '2T2C' and
-           'L2BDMACLRN' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
+  sort:
+  - "IP6BASE"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
+    title: "ip6-2n-dnv-x553-78b-2t2c-base-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-ndr"
+################################################################################
+
+# 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]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
+  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
-           ('ETH' or 'DOT1Q') and
-           'BASE' and
            '1T1C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
+           'LISP' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
+  sort:
+  - "IP4UNRLAY"
+  - "IP6UNRLAY"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base-ndr"
+    title: "ip6tun-3n-hsw-x520-78b-1t1c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-1t1c-base-pdr"
+- 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]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
+  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
-           ('ETH' or 'DOT1Q') and
-           'BASE' and
            '1T1C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
+           'LISP' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
+  sort:
+  - "IP4UNRLAY"
+  - "IP6UNRLAY"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base-pdr"
+    title: "ip6tun-3n-hsw-x520-78b-1t1c-base-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-2t2c-base-ndr"
+- 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]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
+  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
-           ('ETH' or 'DOT1Q') and
-           'BASE' and
            '2T2C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
+           'LISP' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
+  sort:
+  - "IP4UNRLAY"
+  - "IP6UNRLAY"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base-ndr"
+    title: "ip6tun-3n-hsw-x520-78b-2t2c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-2t2c-base-pdr"
+- 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]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
+  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
-           ('ETH' or 'DOT1Q') and
-           'BASE' and
            '2T2C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
+           'LISP' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
+  sort:
+  - "IP4UNRLAY"
+  - "IP6UNRLAY"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base-pdr"
+    title: "ip6tun-3n-hsw-x520-78b-2t2c-base-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-vm-ndr"
+################################################################################
+
+# 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]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base-vm-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  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
-           ('ETH' or 'DOT1Q') and
+           'BASE' and
            '1T1C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'CFS_OPT' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'LBOND'"
+           'IPSECHW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base-vm-ndr"
+    title: "ipsec-3n-hsw-xl710-64b-1t1c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-1t1c-base-vm-pdr"
+- 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]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base-vm-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  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
-           ('ETH' or 'DOT1Q') and
+           'BASE' and
            '1T1C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'CFS_OPT' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'LBOND'"
+           'IPSECHW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base-vm-pdr"
+    title: "ipsec-3n-hsw-xl710-64b-1t1c-base-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-2t2c-base-vm-ndr"
+- 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]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base-vm-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  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
-           ('ETH' or 'DOT1Q') and
+           'BASE' and
            '2T2C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'CFS_OPT' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'LBOND'"
+           'IPSECHW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base-vm-ndr"
+    title: "ipsec-3n-hsw-xl710-64b-2t2c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-2t2c-base-vm-pdr"
+- 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]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base-vm-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  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
-           ('ETH' or 'DOT1Q') and
+           'BASE' and
            '2T2C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'CFS_OPT' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'LBOND'"
+           'IPSECHW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base-vm-pdr"
+    title: "ipsec-3n-hsw-xl710-64b-2t2c-base-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - VPP vhost ip4 3n-hsw-xl710
--
-  type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
+# 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]}/vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  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
-           'NDRPDR' and
-           'ETH' and
            'IP4FWD' and
+           'NDRPDR' and
+           'SCALE' and
            '1T1C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'DOT1Q'"
+           'IPSECHW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "1VM"
-  - "2VM"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
+    title: "ipsec-3n-hsw-xl710-64b-1t1c-scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
+- 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]}/vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  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
-           'NDRPDR' and
-           'ETH' and
            'IP4FWD' and
-           '2T2C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'DOT1Q'"
+           'NDRPDR' and
+           'SCALE' and
+           '1T1C' and
+           'IPSECHW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "1VM"
-  - "2VM"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
+    title: "ipsec-3n-hsw-xl710-64b-1t1c-scale-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
+- 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]}/vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  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
-           'NDRPDR' and
-           'ETH' and
            'IP4FWD' and
-           '1T1C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'DOT1Q'"
+           'NDRPDR' and
+           'SCALE' and
+           '2T2C' and
+           'IPSECHW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "1VM"
-  - "2VM"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
+    title: "ipsec-3n-hsw-xl710-64b-2t2c-scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
+- 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]}/vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  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
-           'NDRPDR' and
-           'ETH' and
            'IP4FWD' and
+           'NDRPDR' and
+           'SCALE' and
            '2T2C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'DOT1Q'"
+           'IPSECHW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "1VM"
-  - "2VM"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
+    title: "ipsec-3n-hsw-xl710-64b-2t2c-scale-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - VPP vhost l2sw 3n-hsw-xl710
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
+# 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]}/vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  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
-           ('ETH' or 'DOT1Q') and
            '1T1C' and
-           'L2BDMACLRN' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
+           'IPSECSW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
+    title: "ipsec-3n-hsw-xl710-64b-1t1c-sw-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
+- 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]}/vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  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
-           ('ETH' or 'DOT1Q') and
-           '2T2C' and
-           'L2BDMACLRN' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
+           '1T1C' and
+           'IPSECSW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
+    title: "ipsec-3n-hsw-xl710-64b-1t1c-sw-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
+- 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]}/vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  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
-           ('ETH' or 'DOT1Q') and
-           '1T1C' and
-           'L2BDMACLRN' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
+           '2T2C' and
+           'IPSECSW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
+    title: "ipsec-3n-hsw-xl710-64b-2t2c-sw-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
+- 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]}/vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  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
-           ('ETH' or 'DOT1Q') and
            '2T2C' and
-           'L2BDMACLRN' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
+           'IPSECSW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
+    title: "ipsec-3n-hsw-xl710-64b-2t2c-sw-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - VPP vhost l2sw 3n-hsw-xl710 - base
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-ndr"
+################################################################################
+
+# 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]}/vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' 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
-           ('ETH' or 'DOT1Q') and
-           'BASE' and
            '1T1C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
+           'IP6FWD' and
+           'SRv6'"
   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-3n-hsw-xl710-64b-1t1c-base-ndr"
+    title: "srv6-3n-hsw-x520-78b-1t1c-features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-pdr"
+- 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]}/vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
+  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
-           ('ETH' or 'DOT1Q') and
-           'BASE' and
            '1T1C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
+           'IP6FWD' and
+           'SRv6'"
   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-3n-hsw-xl710-64b-1t1c-base-pdr"
+    title: "srv6-3n-hsw-x520-78b-1t1c-features-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-ndr"
+- 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]}/vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' 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
-           ('ETH' or 'DOT1Q') and
-           'BASE' and
            '2T2C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
+           'IP6FWD' and
+           'SRv6'"
   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-3n-hsw-xl710-64b-2t2c-base-ndr"
+    title: "srv6-3n-hsw-x520-78b-2t2c-features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-pdr"
+- 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]}/vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' 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
-           ('ETH' or 'DOT1Q') and
-           'BASE' and
            '2T2C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
+           'IP6FWD' and
+           'SRv6'"
   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-3n-hsw-xl710-64b-2t2c-base-pdr"
+    title: "srv6-3n-hsw-x520-78b-2t2c-features-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - VPP vhost l2sw 3n-hsw-xl710 - base vm
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-vm-ndr"
+################################################################################
+
+# 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-l2sw-3n-hsw-xl710-64b-1t1c-base-vm-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  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' or 'DOT1Q') and
+           'ETH' and
+           'IP4FWD' and
            '1T1C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
-           not 'CFS_OPT' and
            not 'VXLAN' and
-           not 'IP4FWD'"
+           not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
+  sort:
+  - "not CFS_OPT"
+  - "1VM"
+  - "2VM"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-vm-ndr"
+    title: "vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-vm-pdr"
+- 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-l2sw-3n-hsw-xl710-64b-1t1c-base-vm-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  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' or 'DOT1Q') and
-           '1T1C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
+           'ETH' and
+           'IP4FWD' and
+           '2T2C' and
            'VHOST_1024' and
-           not 'CFS_OPT' and
            not 'VXLAN' and
-           not 'IP4FWD'"
+           not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
+  sort:
+  - "not CFS_OPT"
+  - "1VM"
+  - "2VM"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-vm-pdr"
+    title: "vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-vm-ndr"
+- 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-l2sw-3n-hsw-xl710-64b-2t2c-base-vm-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  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' or 'DOT1Q') and
-           '2T2C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
+           'ETH' and
+           'IP4FWD' and
+           '1T1C' and
            'VHOST_1024' and
-           not 'CFS_OPT' and
            not 'VXLAN' and
-           not 'IP4FWD'"
+           not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
+  sort:
+  - "not CFS_OPT"
+  - "1VM"
+  - "2VM"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-vm-ndr"
+    title: "vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-vm-pdr"
+- 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-l2sw-3n-hsw-xl710-64b-2t2c-base-vm-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  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' or 'DOT1Q') and
+           'ETH' and
+           'IP4FWD' and
            '2T2C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
-           not 'CFS_OPT' and
            not 'VXLAN' and
-           not 'IP4FWD'"
+           not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
+  sort:
+  - "not CFS_OPT"
+  - "1VM"
+  - "2VM"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-vm-pdr"
+    title: "vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - VPP vhost ip4 3n-skx-x710
--
-  type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+# Packet Throughput - 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-ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  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' and
-           'IP4FWD' and
-           '2T1C' and
+           ('ETH' or 'DOT1Q') and
+           'BASE' and
+           '1T1C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
-           not 'DOT1Q'"
+           not 'IP4FWD' and
+           not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "not CFS_OPT"
-  - "1VM"
-  - "2VM"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+    title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
+- 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-ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  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' and
-           'IP4FWD' and
-           '4T2C' and
+           ('ETH' or 'DOT1Q') and
+           'BASE' and
+           '1T1C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
-           not 'DOT1Q'"
+           not 'IP4FWD' and
+           not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "not CFS_OPT"
-  - "1VM"
-  - "2VM"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
+    title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_features-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
+- 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-ip4-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  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' and
-           'IP4FWD' and
-           '2T1C' and
+           ('ETH' or 'DOT1Q') and
+           'BASE' and
+           '2T2C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
-           not 'DOT1Q'"
+           not 'IP4FWD' and
+           not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "not CFS_OPT"
-  - "1VM"
-  - "2VM"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
+    title: "vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
+- 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-ip4-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  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' and
-           'IP4FWD' and
-           '4T2C' and
+           ('ETH' or 'DOT1Q') and
+           'BASE' and
+           '2T2C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
-           not 'DOT1Q'"
+           not 'IP4FWD' and
+           not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "not CFS_OPT"
-  - "1VM"
-  - "2VM"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
+    title: "vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_features-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - VPP vhost l2sw 3n-skx-x710
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+# 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-skx-x710-64b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  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
-           '2T1C' and
-           'L2BDMACLRN' and
+           '1T1C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
+           not 'CFS_OPT' and
+           not 'DOT1Q' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not '2VM'"
+           not 'LBOND'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
 #  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+    title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
+- 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-skx-x710-64b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  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
-           '4T2C' and
-           'L2BDMACLRN' and
+           '1T1C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
+           not 'CFS_OPT' and
+           not 'DOT1Q' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not '2VM'"
+           not 'LBOND'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
 #  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
+    title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
+- 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-skx-x710-64b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  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
-           '2T1C' and
-           'L2BDMACLRN' and
+           '2T2C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
+           not 'CFS_OPT' and
+           not 'DOT1Q' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not '2VM'"
+           not 'LBOND'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
 #  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
+    title: "vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
+- 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-skx-x710-64b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  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
-           '4T2C' and
-           'L2BDMACLRN' and
+           '2T2C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
+           not 'CFS_OPT' and
+           not 'DOT1Q' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not '2VM'"
+           not 'LBOND'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
 #  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
+    title: "vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-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-ndr"
+# 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-l2sw-3n-skx-x710-64b-2t1c-base-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  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' or 'DOT1Q') and
-           'BASE' and
-           '2T1C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
+           'ETH' and
+           'IP4FWD' and
+           '1T1C' and
            'VHOST_1024' and
            not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM' and
-           not 'LBOND'"
+           not 'CFS_OPT' and
+           not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
+  sort:
+  - "1VM"
+  - "2VM"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-skx-x710-64b-2t1c-base-ndr"
+    title: "vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-2t1c-base-pdr"
+- 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-l2sw-3n-skx-x710-64b-2t1c-base-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  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' or 'DOT1Q') and
-           'BASE' and
-           '2T1C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
+           'ETH' and
+           'IP4FWD' and
+           '2T2C' and
            'VHOST_1024' and
            not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM' and
-           not 'LBOND'"
+           not 'CFS_OPT' and
+           not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
+  sort:
+  - "1VM"
+  - "2VM"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-skx-x710-64b-2t1c-base-pdr"
+    title: "vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-4t2c-base-ndr"
+- 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-l2sw-3n-skx-x710-64b-4t2c-base-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  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' or 'DOT1Q') and
-           'BASE' and
-           '4T2C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
+           'ETH' and
+           'IP4FWD' and
+           '1T1C' and
            'VHOST_1024' and
            not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM' and
-           not 'LBOND'"
+           not 'CFS_OPT' and
+           not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
+  sort:
+  - "1VM"
+  - "2VM"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-skx-x710-64b-4t2c-base-ndr"
+    title: "vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-4t2c-base-pdr"
+- 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-l2sw-3n-skx-x710-64b-4t2c-base-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  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' or 'DOT1Q') and
-           'BASE' and
-           '4T2C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
+           'ETH' and
+           'IP4FWD' and
+           '2T2C' and
            'VHOST_1024' and
            not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM' and
-           not 'LBOND'"
+           not 'CFS_OPT' and
+           not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
+  sort:
+  - "1VM"
+  - "2VM"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-skx-x710-64b-4t2c-base-pdr"
+    title: "vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-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-vm-ndr"
+# 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-skx-x710-64b-2t1c-base-vm-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  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
-           '2T1C' and
+           'BASE' and
+           '1T1C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
-           not 'CFS_OPT' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'LBOND'"
+           not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
+  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-vm-ndr"
+    title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-2t1c-base-vm-pdr"
+- 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-skx-x710-64b-2t1c-base-vm-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  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
-           '2T1C' and
+           'BASE' and
+           '1T1C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
-           not 'CFS_OPT' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'LBOND'"
+           not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
+  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-vm-pdr"
+    title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-4t2c-base-vm-ndr"
+- 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-skx-x710-64b-4t2c-base-vm-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  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
-           '4T2C' and
+           'BASE' and
+           '2T2C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
-           not 'CFS_OPT' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'LBOND'"
+           not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
+  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-vm-ndr"
+    title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-4t2c-base-vm-pdr"
+- 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-skx-x710-64b-4t2c-base-vm-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  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
-           '4T2C' and
+           'BASE' and
+           '2T2C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
-           not 'CFS_OPT' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'LBOND'"
+           not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
+  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-vm-pdr"
+    title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-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"
+# 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-ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  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' and
-           'IP4FWD' and
-           '2T1C' and
+           ('ETH' or 'DOT1Q') and
+           '1T1C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
+           not 'CFS_OPT' and
            not 'VXLAN' and
-           not 'DOT1Q'"
+           not 'IP4FWD' and
+           not 'LBOND'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "not CFS_OPT"
-  - "1VM"
-  - "2VM"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
+    title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-vm-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vhost-ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
+- 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-ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  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' and
-           'IP4FWD' and
-           '4T2C' and
+           ('ETH' or 'DOT1Q') and
+           '1T1C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
+           not 'CFS_OPT' and
            not 'VXLAN' and
-           not 'DOT1Q'"
+           not 'IP4FWD' and
+           not 'LBOND'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "not CFS_OPT"
-  - "1VM"
-  - "2VM"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
+    title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-vm-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vhost-ip4-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
+- 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-ip4-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  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' and
-           'IP4FWD' and
-           '2T1C' and
+           ('ETH' or 'DOT1Q') and
+           '2T2C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
+           not 'CFS_OPT' and
            not 'VXLAN' and
-           not 'DOT1Q'"
+           not 'IP4FWD' and
+           not 'LBOND'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "not CFS_OPT"
-  - "1VM"
-  - "2VM"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-ip4-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
+    title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-vm-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vhost-ip4-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
+- 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-ip4-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  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' and
-           'IP4FWD' and
-           '4T2C' and
+           ('ETH' or 'DOT1Q') and
+           '2T2C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
+           not 'CFS_OPT' and
            not 'VXLAN' and
-           not 'DOT1Q'"
+           not 'IP4FWD' and
+           not 'LBOND'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "not CFS_OPT"
-  - "1VM"
-  - "2VM"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-ip4-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
+    title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-vm-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - VPP vhost l2sw 2n-skx-x710
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
+# Packet Throughput - VPP vhost ip4 3n-skx-x710
+- type: "plot"
+  title: "VPP Throughput: vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-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
            'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
+           'ETH' and
+           'IP4FWD' and
            '2T1C' and
-           'L2BDMACLRN' and
            'VHOST_1024' and
            not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
+           not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
+  sort:
+  - "1VM"
+  - "2VM"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
+    title: "vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
+- 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-l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  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' or 'DOT1Q') and
+           'ETH' and
+           'IP4FWD' and
            '4T2C' and
-           'L2BDMACLRN' and
            'VHOST_1024' and
            not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
+           not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
+  sort:
+  - "1VM"
+  - "2VM"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
+    title: "vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
+- 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-l2sw-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  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' or 'DOT1Q') and
+           'ETH' and
+           'IP4FWD' and
            '2T1C' and
-           'L2BDMACLRN' and
            'VHOST_1024' and
            not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
+           not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
+  sort:
+  - "1VM"
+  - "2VM"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
+    title: "vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
+- type: "plot"
+  title: "VPP Throughput: vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  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' or 'DOT1Q') and
+           'ETH' and
+           'IP4FWD' and
            '4T2C' and
-           'L2BDMACLRN' and
            'VHOST_1024' and
            not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
+           not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
+  sort:
+  - "1VM"
+  - "2VM"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
+    title: "vhost-ip4-3n-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-ndr"
+# Packet Throughput - VPP vhost l2sw 3n-skx-x710 - base
+- type: "plot"
+  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-2t1c-base-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  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
@@ -13444,26 +14674,27 @@
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
+  sort:
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-2n-skx-x710-64b-2t1c-base-ndr"
+    title: "vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-2t1c-base-pdr"
+- 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-2n-skx-x710-64b-2t1c-base-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  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
@@ -13479,26 +14710,27 @@
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
+  sort:
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-2n-skx-x710-64b-2t1c-base-pdr"
+    title: "vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-4t2c-base-ndr"
+- 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-2n-skx-x710-64b-4t2c-base-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  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
@@ -13514,26 +14746,27 @@
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
+  sort:
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-2n-skx-x710-64b-4t2c-base-ndr"
+    title: "vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-4t2c-base-pdr"
+- type: "plot"
+  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-4t2c-base-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  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
@@ -13549,27 +14782,28 @@
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
+  sort:
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-2n-skx-x710-64b-4t2c-base-pdr"
+    title: "vhost-l2sw-3n-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"
+# 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-2n-skx-x710-64b-2t1c-base-vm-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  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
@@ -13579,31 +14813,33 @@
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
-           not 'IP4FWD'"
+           not 'IP4FWD' and
+           not 'LBOND'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
+  sort:
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-2n-skx-x710-64b-2t1c-base-vm-ndr"
+    title: "vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-vm-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-2t1c-base-vm-pdr"
+- type: "plot"
+  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-vm-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-2t1c-base-vm-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  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
@@ -13613,31 +14849,33 @@
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
-           not 'IP4FWD'"
+           not 'IP4FWD' and
+           not 'LBOND'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
+  sort:
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-2n-skx-x710-64b-2t1c-base-vm-pdr"
+    title: "vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-vm-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-4t2c-base-vm-ndr"
+- type: "plot"
+  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-vm-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-4t2c-base-vm-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  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
@@ -13647,31 +14885,33 @@
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
-           not 'IP4FWD'"
+           not 'IP4FWD' and
+           not 'LBOND'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
+  sort:
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-2n-skx-x710-64b-4t2c-base-vm-ndr"
+    title: "vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-vm-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-4t2c-base-vm-pdr"
+- type: "plot"
+  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-vm-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-4t2c-base-vm-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  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
@@ -13681,33 +14921,35 @@
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
-           not 'IP4FWD'"
+           not 'IP4FWD' and
+           not 'LBOND'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
+  sort:
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-2n-skx-x710-64b-4t2c-base-vm-pdr"
+    title: "vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-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"
+# 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-xxv710-64b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  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
@@ -13715,13 +14957,14 @@
            '2T1C' and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
+           not 'CFS_OPT' and
            not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "not CFS_OPT"
   - "1VM"
   - "2VM"
   traces:
@@ -13729,17 +14972,16 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
+    title: "vhost-ip4-2n-skx-x710-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"
+- 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-xxv710-64b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  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
@@ -13747,13 +14989,14 @@
            '4T2C' and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
+           not 'CFS_OPT' and
            not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "not CFS_OPT"
   - "1VM"
   - "2VM"
   traces:
@@ -13761,17 +15004,16 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
+    title: "vhost-ip4-2n-skx-x710-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"
+- 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-xxv710-64b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  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
@@ -13779,13 +15021,14 @@
            '2T1C' and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
+           not 'CFS_OPT' and
            not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "not CFS_OPT"
   - "1VM"
   - "2VM"
   traces:
@@ -13793,17 +15036,16 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
+    title: "vhost-ip4-2n-skx-x710-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"
+- 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-xxv710-64b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  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
@@ -13811,13 +15053,14 @@
            '4T2C' and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
+           not 'CFS_OPT' and
            not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "not CFS_OPT"
   - "1VM"
   - "2VM"
   traces:
@@ -13825,25 +15068,26 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
+    title: "vhost-ip4-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - VPP vhost l2sw 2n-skx-xxv710
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
+# 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-xxv710-64b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  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' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'IP4FWD' and
            not '2VM'"
   parameters:
@@ -13851,34 +15095,34 @@
   - "parent"
   - "tags"
 #  sort:
-#  - "VM"  # "not CFS_OPT"
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
 #  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
+    title: "vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
+- 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-xxv710-64b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  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
-           '4T2C' and
-           'L2BDMACLRN' 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:
@@ -13886,34 +15130,34 @@
   - "parent"
   - "tags"
 #  sort:
-#  - "VM"  # "not CFS_OPT"
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
 #  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
+    title: "vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_features-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
+- 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-xxv710-64b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  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
-           '2T1C' and
-           'L2BDMACLRN' 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:
@@ -13921,34 +15165,34 @@
   - "parent"
   - "tags"
 #  sort:
-#  - "VM"  # "not CFS_OPT"
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
 #  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
+    title: "vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
+- 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-xxv710-64b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  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' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'IP4FWD' and
            not '2VM'"
   parameters:
@@ -13956,307 +15200,567 @@
   - "parent"
   - "tags"
 #  sort:
-#  - "VM"  # "not CFS_OPT"
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
 #  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
+    title: "vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_features-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-ndr"
+# 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-xxv710-64b-2t1c-base-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  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
-           'BASE' and
            '2T1C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
+           not 'CFS_OPT' and
            not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
+           not 'NF_DENSITY' and
+           not 'DOT1Q' and
+           not 'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
 #  sort:
-#  - "not CFS_OPT"
+#  - "1VM"
 #  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
+#  - "1VM"
+#  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-ndr"
+    title: "vhost-l2sw-2n-skx-x710-64b-2t1c-base-vm-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-pdr"
+- 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-xxv710-64b-2t1c-base-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  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
-           'BASE' and
            '2T1C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
+           not 'CFS_OPT' and
            not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
+           not 'NF_DENSITY' and
+           not 'DOT1Q' and
+           not 'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
 #  sort:
-#  - "not CFS_OPT"
+#  - "1VM"
 #  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
+#  - "1VM"
+#  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-pdr"
+    title: "vhost-l2sw-2n-skx-x710-64b-2t1c-base-vm-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-ndr"
+- 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-xxv710-64b-4t2c-base-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  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
-           'BASE' and
            '4T2C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
+           not 'CFS_OPT' and
            not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
+           not 'NF_DENSITY' and
+           not 'DOT1Q' and
+           not 'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
 #  sort:
-#  - "not CFS_OPT"
+#  - "1VM"
 #  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
+#  - "1VM"
+#  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-ndr"
+    title: "vhost-l2sw-2n-skx-x710-64b-4t2c-base-vm-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-pdr"
+- 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-xxv710-64b-4t2c-base-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  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
-           'BASE' and
            '4T2C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
+           not 'CFS_OPT' and
            not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
+           not 'NF_DENSITY' and
+           not 'DOT1Q' and
+           not 'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
 #  sort:
-#  - "not CFS_OPT"
+#  - "1VM"
 #  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
+#  - "1VM"
+#  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-pdr"
+    title: "vhost-l2sw-2n-skx-x710-64b-4t2c-base-vm-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"
+# 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-l2sw-2n-skx-xxv710-64b-2t1c-base-vm-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  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' or 'DOT1Q') and
+           'ETH' and
+           'IP4FWD' and
            '2T1C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
-           not 'CFS_OPT' and
            not 'VXLAN' and
-           not 'IP4FWD'"
+           not 'CFS_OPT' and
+           not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
+  sort:
+  - "1VM"
+  - "2VM"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-vm-ndr"
+    title: "vhost-ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-vm-pdr"
+- 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-l2sw-2n-skx-xxv710-64b-2t1c-base-vm-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  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' or 'DOT1Q') and
-           '2T1C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
+           'ETH' and
+           'IP4FWD' and
+           '4T2C' and
            'VHOST_1024' and
-           not 'CFS_OPT' and
            not 'VXLAN' and
-           not 'IP4FWD'"
+           not 'CFS_OPT' and
+           not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
+  sort:
+  - "1VM"
+  - "2VM"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-vm-pdr"
+    title: "vhost-ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-ndr"
+- 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-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  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' or 'DOT1Q') and
-           '4T2C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
+           'ETH' and
+           'IP4FWD' and
+           '2T1C' and
            'VHOST_1024' and
-           not 'CFS_OPT' and
            not 'VXLAN' and
-           not 'IP4FWD'"
+           not 'CFS_OPT' and
+           not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
+  sort:
+  - "1VM"
+  - "2VM"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-ndr"
+    title: "vhost-ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-pdr"
+- 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-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  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' or 'DOT1Q') and
+           'ETH' and
+           'IP4FWD' and
            '4T2C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
-           not 'CFS_OPT' and
            not 'VXLAN' and
-           not 'IP4FWD'"
+           not 'CFS_OPT' and
+           not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
+  sort:
+  - "1VM"
+  - "2VM"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-pdr"
+    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"
+- 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-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '114B' and
            'NDRPDR' and
@@ -14274,13 +15778,12 @@
     title: "vts-3n-hsw-x520-114b-1t1c-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- 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-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '114B' and
            'NDRPDR' and
@@ -14298,13 +15801,12 @@
     title: "vts-3n-hsw-x520-114b-2t2c-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- 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-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '114B' and
            'NDRPDR' and
@@ -14322,13 +15824,12 @@
     title: "vts-3n-hsw-x520-114b-1t1c-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- 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-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '114B' and
            'NDRPDR' and
@@ -14349,8 +15850,7 @@
 ################################################################################
 
 # Packet Throughput - DPDK l3fwd 3n-hsw-x520
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: l3fwd-3n-hsw-x520-64b-1t1c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -14374,8 +15874,7 @@
     title: "l3fwd-3n-hsw-x520-64b-1t1c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: l3fwd-3n-hsw-x520-64b-2t2c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -14399,8 +15898,7 @@
     title: "l3fwd-3n-hsw-x520-64b-2t2c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: l3fwd-3n-hsw-x520-64b-1t1c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -14424,8 +15922,7 @@
     title: "l3fwd-3n-hsw-x520-64b-1t1c-base-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: l3fwd-3n-hsw-x520-64b-2t2c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -14450,8 +15947,7 @@
     layout: "plot-throughput"
 
 # Packet Throughput - DPDK l3fwd 3n-hsw-x710
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: l3fwd-3n-hsw-x710-64b-1t1c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -14475,8 +15971,7 @@
     title: "l3fwd-3n-hsw-x710-64b-1t1c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: l3fwd-3n-hsw-x710-64b-2t2c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -14500,8 +15995,7 @@
     title: "l3fwd-3n-hsw-x710-64b-2t2c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: l3fwd-3n-hsw-x710-64b-1t1c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -14525,8 +16019,7 @@
     title: "l3fwd-3n-hsw-x710-64b-1t1c-base-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: l3fwd-3n-hsw-x710-64b-2t2c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -14551,8 +16044,7 @@
     layout: "plot-throughput"
 
 # Packet Throughput - DPDK l3fwd 3n-hsw-xl710
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: l3fwd-3n-hsw-xl710-64b-1t1c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -14576,8 +16068,7 @@
     title: "l3fwd-3n-hsw-xl710-64b-1t1c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: l3fwd-3n-hsw-xl710-64b-2t2c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -14601,8 +16092,7 @@
     title: "l3fwd-3n-hsw-xl710-64b-2t2c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: l3fwd-3n-hsw-xl710-64b-1t1c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -14626,8 +16116,7 @@
     title: "l3fwd-3n-hsw-xl710-64b-1t1c-base-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: l3fwd-3n-hsw-xl710-64b-2t2c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -14652,8 +16141,7 @@
     layout: "plot-throughput"
 
 # Packet Throughput - DPDK l3fwd 3n-skx-x710
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: l3fwd-3n-skx-x710-64b-2t1c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -14677,8 +16165,7 @@
     title: "l3fwd-3n-skx-x710-64b-2t1c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: l3fwd-3n-skx-x710-64b-4t2c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -14702,8 +16189,7 @@
     title: "l3fwd-3n-skx-x710-64b-4t2c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: l3fwd-3n-skx-x710-64b-2t1c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -14727,8 +16213,7 @@
     title: "l3fwd-3n-skx-x710-64b-2t1c-base-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: l3fwd-3n-skx-x710-64b-4t2c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -14753,8 +16238,7 @@
     layout: "plot-throughput"
 
 # Packet Throughput - DPDK l3fwd 3n-skx-xxv710
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: l3fwd-3n-skx-xxv710-64b-2t1c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -14778,8 +16262,7 @@
     title: "l3fwd-3n-skx-xxv710-64b-2t1c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: l3fwd-3n-skx-xxv710-64b-4t2c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -14803,8 +16286,7 @@
     title: "l3fwd-3n-skx-xxv710-64b-4t2c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: l3fwd-3n-skx-xxv710-64b-2t1c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -14828,8 +16310,7 @@
     title: "l3fwd-3n-skx-xxv710-64b-2t1c-base-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: l3fwd-3n-skx-xxv710-64b-4t2c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -14854,8 +16335,7 @@
     layout: "plot-throughput"
 
 # Packet Throughput - DPDK l3fwd 2n-skx-x710
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: l3fwd-2n-skx-x710-64b-2t1c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -14879,8 +16359,7 @@
     title: "l3fwd-2n-skx-x710-64b-2t1c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: l3fwd-2n-skx-x710-64b-4t2c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -14904,8 +16383,7 @@
     title: "l3fwd-2n-skx-x710-64b-4t2c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: l3fwd-2n-skx-x710-64b-2t1c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -14929,8 +16407,7 @@
     title: "l3fwd-2n-skx-x710-64b-2t1c-base-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: l3fwd-2n-skx-x710-64b-4t2c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -14955,8 +16432,7 @@
     layout: "plot-throughput"
 
 # Packet Throughput - DPDK l3fwd 2n-skx-xxv710
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: l3fwd-2n-skx-xxv710-64b-2t1c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -14980,8 +16456,7 @@
     title: "l3fwd-2n-skx-xxv710-64b-2t1c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: l3fwd-2n-skx-xxv710-64b-4t2c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -15005,8 +16480,7 @@
     title: "l3fwd-2n-skx-xxv710-64b-4t2c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: l3fwd-2n-skx-xxv710-64b-2t1c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -15030,8 +16504,7 @@
     title: "l3fwd-2n-skx-xxv710-64b-2t1c-base-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: l3fwd-2n-skx-xxv710-64b-4t2c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -15058,8 +16531,7 @@
 ################################################################################
 
 # Packet Throughput - DPDK testpmd 3n-hsw-x520
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: testpmd-3n-hsw-x520-64b-1t1c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -15083,8 +16555,7 @@
     title: "testpmd-3n-hsw-x520-64b-1t1c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: testpmd-3n-hsw-x520-64b-2t2c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -15108,8 +16579,7 @@
     title: "testpmd-3n-hsw-x520-64b-2t2c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: testpmd-3n-hsw-x520-64b-1t1c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -15133,8 +16603,7 @@
     title: "testpmd-3n-hsw-x520-64b-1t1c-base-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: testpmd-3n-hsw-x520-64b-2t2c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -15159,8 +16628,7 @@
     layout: "plot-throughput"
 
 # Packet Throughput - DPDK testpmd 3n-hsw-x710
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: testpmd-3n-hsw-x710-64b-1t1c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -15184,8 +16652,7 @@
     title: "testpmd-3n-hsw-x710-64b-1t1c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: testpmd-3n-hsw-x710-64b-2t2c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -15209,8 +16676,7 @@
     title: "testpmd-3n-hsw-x710-64b-2t2c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: testpmd-3n-hsw-x710-64b-1t1c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -15234,8 +16700,7 @@
     title: "testpmd-3n-hsw-x710-64b-1t1c-base-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: testpmd-3n-hsw-x710-64b-2t2c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -15260,8 +16725,7 @@
     layout: "plot-throughput"
 
 # Packet Throughput - DPDK testpmd 3n-hsw-xl710
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: testpmd-3n-hsw-xl710-64b-1t1c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -15285,8 +16749,7 @@
     title: "testpmd-3n-hsw-xl710-64b-1t1c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: testpmd-3n-hsw-xl710-64b-2t2c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -15310,8 +16773,7 @@
     title: "testpmd-3n-hsw-xl710-64b-2t2c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: testpmd-3n-hsw-xl710-64b-1t1c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -15335,8 +16797,7 @@
     title: "testpmd-3n-hsw-xl710-64b-1t1c-base-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: testpmd-3n-hsw-xl710-64b-2t2c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -15361,8 +16822,7 @@
     layout: "plot-throughput"
 
 # Packet Throughput - DPDK testpmd 3n-skx-x710
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: testpmd-3n-skx-x710-64b-2t1c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -15386,8 +16846,7 @@
     title: "testpmd-3n-skx-x710-64b-2t1c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: testpmd-3n-skx-x710-64b-4t2c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -15411,8 +16870,7 @@
     title: "testpmd-3n-skx-x710-64b-4t2c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: testpmd-3n-skx-x710-64b-2t1c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -15436,8 +16894,7 @@
     title: "testpmd-3n-skx-x710-64b-2t1c-base-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: testpmd-3n-skx-x710-64b-4t2c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -15462,8 +16919,7 @@
     layout: "plot-throughput"
 
 # Packet Throughput - DPDK testpmd 3n-skx-xxv710
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: testpmd-3n-skx-xxv710-64b-2t1c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -15487,8 +16943,7 @@
     title: "testpmd-3n-skx-xxv710-64b-2t1c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: testpmd-3n-skx-xxv710-64b-4t2c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -15512,8 +16967,7 @@
     title: "testpmd-3n-skx-xxv710-64b-4t2c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: testpmd-3n-skx-xxv710-64b-2t1c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -15537,8 +16991,7 @@
     title: "testpmd-3n-skx-xxv710-64b-2t1c-base-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: testpmd-3n-skx-xxv710-64b-4t2c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -15563,8 +17016,7 @@
     layout: "plot-throughput"
 
 # Packet Throughput - DPDK testpmd 2n-skx-x710
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: testpmd-2n-skx-x710-64b-2t1c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -15588,8 +17040,7 @@
     title: "testpmd-2n-skx-x710-64b-2t1c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: testpmd-2n-skx-x710-64b-4t2c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -15613,8 +17064,7 @@
     title: "testpmd-2n-skx-x710-64b-4t2c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: testpmd-2n-skx-x710-64b-2t1c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -15638,8 +17088,7 @@
     title: "testpmd-2n-skx-x710-64b-2t1c-base-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: testpmd-2n-skx-x710-64b-4t2c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -15664,8 +17113,7 @@
     layout: "plot-throughput"
 
 # Packet Throughput - DPDK testpmd 2n-skx-xxv710
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: testpmd-2n-skx-xxv710-64b-2t1c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -15689,8 +17137,7 @@
     title: "testpmd-2n-skx-xxv710-64b-2t1c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: testpmd-2n-skx-xxv710-64b-4t2c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -15714,8 +17161,7 @@
     title: "testpmd-2n-skx-xxv710-64b-4t2c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: testpmd-2n-skx-xxv710-64b-2t1c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -15739,8 +17185,7 @@
     title: "testpmd-2n-skx-xxv710-64b-2t1c-base-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: testpmd-2n-skx-xxv710-64b-4t2c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -15767,13 +17212,12 @@
 ################################################################################
 
 # Packet Latency - VPP L2 3n-hsw-x520 base and scale
--
-  type: "plot"
+- 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-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -15788,9 +17232,9 @@
   - "parent"
   - "tags"
   sort:
+  - "L2XCFWD"
   - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
+  - "L2BDMACLRN"
   - "FIB_10K"
   - "FIB_100K"
   - "FIB_1M"
@@ -15798,13 +17242,12 @@
     title: "l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- 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-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -15819,9 +17262,9 @@
   - "parent"
   - "tags"
   sort:
+  - "L2XCFWD"
   - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
+  - "L2BDMACLRN"
   - "FIB_10K"
   - "FIB_100K"
   - "FIB_1M"
@@ -15830,13 +17273,12 @@
     layout: "plot-latency"
 
 # Packet Latency - VPP L2 3n-hsw-x520 features
--
-  type: "plot"
+- 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-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
@@ -15858,13 +17300,12 @@
     title: "l2sw-3n-hsw-x520-64b-1t1c-features-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- 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-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
@@ -15886,203 +17327,176 @@
     title: "l2sw-3n-hsw-x520-64b-2t2c-features-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"
+# 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-x710-64b-1t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  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
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           'ETH' and
            '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'IACL' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
+           not 'MACIP' and
            not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+           not 'MEMIF'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
   layout:
-    title: "l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
+    title: "l2sw-3n-hsw-x520-64b-1t1c-features-iacl-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
-  title: "VPP Latency: l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
+- 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-x710-64b-2t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  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
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           'ETH' and
            '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'IACL' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
+           not 'MACIP' and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
   layout:
-    title: "l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+    title: "l2sw-3n-hsw-x520-64b-2t2c-features-iacl-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"
+# 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-x710-64b-1t1c-features-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  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
            'NDRPDR' and
            '1T1C' and
-           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
-           not 'ACL' 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"
-  sort:
-  - "L2XCBASE"    # l2xcbase
-  - "L2BDBASE"    # l2bdbase
-  - "L2XCFWD"     # dot1q-l2xcbase
-  - "L2BDMACLRN"  # dot1q-l2bdbase
   layout:
-    title: "l2sw-3n-hsw-x710-64b-1t1c-features-ndr"
+    title: "l2sw-3n-hsw-x520-64b-1t1c-features-oacl-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
-  title: "VPP Latency: l2sw-3n-hsw-x710-64b-2t2c-features-ndr-lat"
+- type: "plot"
+  title: "VPP Latency: l2sw-3n-hsw-x520-64b-2t2c-features-oacl-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-2t2c-features-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  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
            'NDRPDR' and
            '2T2C' and
-           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
-           not 'ACL' 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"
-  sort:
-  - "L2XCBASE"    # l2xcbase
-  - "L2BDBASE"    # l2bdbase
-  - "L2XCFWD"     # dot1q-l2xcbase
-  - "L2BDMACLRN"  # dot1q-l2bdbase
   layout:
-    title: "l2sw-3n-hsw-x710-64b-2t2c-features-ndr"
+    title: "l2sw-3n-hsw-x520-64b-2t2c-features-oacl-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_and_scale-ndr-lat"
+# Packet Latency - VPP L2 3n-hsw-x520 features-macip
+- type: "plot"
+  title: "VPP Latency: l2sw-3n-hsw-x520-64b-1t1c-features-macip-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' 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' or 'SCALE') and
            'NDRPDR' and
-           'ETH' and
            '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') 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"
-  sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
   layout:
-    title: "l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
+    title: "l2sw-3n-hsw-x520-64b-1t1c-features-macip-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
-  title: "VPP Latency: l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat"
+- type: "plot"
+  title: "VPP Latency: l2sw-3n-hsw-x520-64b-2t2c-features-macip-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' 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' or 'SCALE') and
            'NDRPDR' and
-           'ETH' and
            '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') 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"
-  sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
   layout:
-    title: "l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
+    title: "l2sw-3n-hsw-x520-64b-2t2c-features-macip-ndr"
     layout: "plot-latency"
 
-# Packet Latency - VPP L2 3n-skx-x710 base and scale
--
-  type: "plot"
-  title: "VPP Latency: l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
+# 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-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  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
-           '2T1C' and
+           '1T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
@@ -16092,28 +17506,27 @@
   - "tags"
   sort:
   - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
   - "FIB_10K"
   - "FIB_100K"
   - "FIB_1M"
   layout:
-    title: "l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+    title: "l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
-  title: "VPP Latency: l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
+- 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-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  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
-           '4T2C' and
+           '2T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
@@ -16123,30 +17536,30 @@
   - "tags"
   sort:
   - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
   - "FIB_10K"
   - "FIB_100K"
   - "FIB_1M"
   layout:
-    title: "l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
+    title: "l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
     layout: "plot-latency"
 
-# Packet Latency - VPP L2 3n-skx-x710 features
--
-  type: "plot"
-  title: "VPP Latency: l2sw-3n-skx-x710-64b-2t1c-features-ndr-lat"
+# 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-skx-x710-64b-2t1c-features-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  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
-           '2T1C' 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"
@@ -16158,23 +17571,23 @@
   - "L2XCFWD"     # dot1q-l2xcbase
   - "L2BDMACLRN"  # dot1q-l2bdbase
   layout:
-    title: "l2sw-3n-skx-x710-64b-2t1c-features-ndr"
+    title: "l2sw-3n-hsw-x710-64b-1t1c-features-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
-  title: "VPP Latency: l2sw-3n-skx-x710-64b-4t2c-features-ndr-lat"
+- 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-skx-x710-64b-4t2c-features-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  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
-           '4T2C' 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"
@@ -16186,86 +17599,75 @@
   - "L2XCFWD"     # dot1q-l2xcbase
   - "L2BDMACLRN"  # dot1q-l2bdbase
   layout:
-    title: "l2sw-3n-skx-x710-64b-4t2c-features-ndr"
+    title: "l2sw-3n-hsw-x710-64b-2t2c-features-ndr"
     layout: "plot-latency"
 
-# Packet Latency - VPP L2 3n-skx-xxv710 base and scale
--
-  type: "plot"
-  title: "VPP Latency: l2sw-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
+# Packet Latency - VPP L2 3n-hsw-x710 features-iacl
+- type: "plot"
+  title: "VPP Latency: l2sw-3n-hsw-x710-64b-1t1c-features-iacl-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-1t1c-features-iacl-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           'ETH' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') 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"
-  sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
   layout:
-    title: "l2sw-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
+    title: "l2sw-3n-hsw-x710-64b-1t1c-features-iacl-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
-  title: "VPP Latency: l2sw-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
+- type: "plot"
+  title: "VPP Latency: l2sw-3n-hsw-x710-64b-2t2c-features-iacl-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-2t2c-features-iacl-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           'ETH' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') 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"
-  sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
   layout:
-    title: "l2sw-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
+    title: "l2sw-3n-hsw-x710-64b-2t2c-features-iacl-ndr"
     layout: "plot-latency"
 
-# Packet Latency - VPP L2 2n-skx-x710 base and scale
--
-  type: "plot"
-  title: "VPP Latency: l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
+# 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-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  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
-           'ETH' and
-           ('BASE' or 'SCALE') and
+           'BASE' and
            'NDRPDR' and
-           '2T1C' and
+           'ETH' and
+           '1T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
@@ -16275,28 +17677,24 @@
   - "tags"
   sort:
   - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
   layout:
-    title: "l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
+    title: "l2sw-3n-hsw-xl710-64b-1t1c-base-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
-  title: "VPP Latency: l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
+- 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-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  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' or 'SCALE') and
+           'BASE' and
            'NDRPDR' and
            'ETH' and
-           '4T2C' and
+           '2T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
@@ -16306,24 +17704,20 @@
   - "tags"
   sort:
   - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
   layout:
-    title: "l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
+    title: "l2sw-3n-hsw-xl710-64b-2t2c-base-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"
+# Packet Latency - VPP L2 3n-skx-x710 base and scale
+- type: "plot"
+  title: "VPP Latency: l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
@@ -16331,7 +17725,8 @@
            '2T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           not 'MEMIF'"
+           not 'MEMIF' and
+           not 'DRV_AVF'"
   parameters:
   - "latency"
   - "parent"
@@ -16344,17 +17739,16 @@
   - "FIB_100K"
   - "FIB_1M"
   layout:
-    title: "l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
+    title: "l2sw-3n-skx-x710-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"
+- type: "plot"
+  title: "VPP Latency: l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
@@ -16362,406 +17756,329 @@
            '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_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  layout:
-    title: "memif-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: memif-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           'MEMIF'"
+           not 'MEMIF' and
+           not 'DRV_AVF'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
   sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   layout:
-    title: "memif-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
+    title: "l2sw-3n-skx-x710-64b-4t2c-base_and_scale-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_scale-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,VPP]}/memif-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-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' or 'SCALE') and
            'NDRPDR' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           '2T1C' and
+           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
+           not 'ACL' and
            not 'VHOST' and
-           'MEMIF'"
+           not 'DRV_AVF' and
+           not 'L2OVRLAY' and
+           not 'MEMIF'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
   sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
+  - "L2XCBASE"    # l2xcbase
+  - "L2BDBASE"    # l2bdbase
+  - "L2XCFWD"     # dot1q-l2xcbase
+  - "L2BDMACLRN"  # dot1q-l2bdbase
   layout:
-    title: "memif-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
+    title: "l2sw-3n-skx-x710-64b-2t1c-features-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
-  title: "VPP Latency: memif-3n-hsw-x710-64b-2t2c-base_and_scale-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,VPP]}/memif-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-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' or 'SCALE') and
            'NDRPDR' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           '4T2C' and
+           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
+           not 'ACL' and
            not 'VHOST' and
-           'MEMIF'"
+           not 'DRV_AVF' and
+           not 'L2OVRLAY' and
+           not 'MEMIF'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
   sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
+  - "L2XCBASE"    # l2xcbase
+  - "L2BDBASE"    # l2bdbase
+  - "L2XCFWD"     # dot1q-l2xcbase
+  - "L2BDMACLRN"  # dot1q-l2bdbase
   layout:
-    title: "memif-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+    title: "l2sw-3n-skx-x710-64b-4t2c-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_scale-ndr-lat"
+# Packet Latency - VPP L2 3n-skx-x710 features-iacl
+- type: "plot"
+  title: "VPP Latency: l2sw-3n-skx-x710-64b-2t1c-features-iacl-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-2t1c-features-iacl-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') 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
-           'MEMIF'"
+           not 'MEMIF'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
   layout:
-    title: "memif-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
+    title: "l2sw-3n-skx-x710-64b-2t1c-features-iacl-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
-  title: "VPP Latency: memif-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat"
+- type: "plot"
+  title: "VPP Latency: l2sw-3n-skx-x710-64b-4t2c-features-iacl-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-4t2c-features-iacl-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') 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
-           'MEMIF'"
+           not 'MEMIF'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
   layout:
-    title: "memif-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
+    title: "l2sw-3n-skx-x710-64b-4t2c-features-iacl-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_scale-ndr-lat"
+# Packet Latency - VPP L2 3n-skx-xxv710 base
+- type: "plot"
+  title: "VPP Latency: l2sw-3n-skx-xxv710-64b-2t1c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' 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' or 'SCALE') and
            'NDRPDR' and
+           'ETH' and
            '2T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           'MEMIF'"
+           not 'MEMIF'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
   sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
+  - "L2PATCH"
+  - "L2PATCH"
+  - "L2XCBASE"
   - "L2BDMACLRN"
   layout:
-    title: "memif-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+    title: "l2sw-3n-skx-xxv710-64b-2t1c-base-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
-  title: "VPP Latency: memif-3n-skx-x710-64b-4t2c-base_and_scale-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,VPP]}/memif-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' 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' or 'SCALE') and
            'NDRPDR' and
+           'ETH' and
            '4T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           'MEMIF'"
+           not 'MEMIF'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
   sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
+  - "L2PATCH"
+  - "L2PATCH"
+  - "L2XCBASE"
   - "L2BDMACLRN"
   layout:
-    title: "memif-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
+    title: "l2sw-3n-skx-xxv710-64b-4t2c-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_scale-ndr-lat"
+# Packet Latency - VPP L2 2n-skx-x710 base and scale
+- type: "plot"
+  title: "VPP Latency: l2sw-2n-skx-x710-64b-2t1c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-x710-64b-2t1c-base-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
-           'MEMIF'"
+           not 'MEMIF'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
   sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   layout:
-    title: "memif-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
+    title: "l2sw-2n-skx-x710-64b-2t1c-base-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
-  title: "VPP Latency: memif-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
+- type: "plot"
+  title: "VPP Latency: l2sw-2n-skx-x710-64b-4t2c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-x710-64b-4t2c-base-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
-           'MEMIF'"
+           not 'MEMIF'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
   sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   layout:
-    title: "memif-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
+    title: "l2sw-2n-skx-x710-64b-4t2c-base-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_scale-ndr-lat"
+# 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]}/memif-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  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
-           'MEMIF'"
+           not 'MEMIF'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
   sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   layout:
-    title: "memif-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
+    title: "l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
-  title: "VPP Latency: memif-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
+- 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]}/memif-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  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
-           'MEMIF'"
+           not 'MEMIF'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
   sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   layout:
-    title: "memif-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
+    title: "l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-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"
+# 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]}/k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-ndr-lat"
-  data: "plot-ligato-throughput-latency-3n-hsw"
+  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
-           'L2XCFWD' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
@@ -16769,28 +18086,29 @@
   - "parent"
   - "tags"
   sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "IP4FWD"
   layout:
-    title: "k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-ndr"
+    title: "memif-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
-  title: "VPP Latency: k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-ndr-lat"
+- 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]}/k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-ndr-lat"
-  data: "plot-ligato-throughput-latency-3n-hsw"
+  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
-           'L2XCFWD' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
@@ -16798,29 +18116,30 @@
   - "parent"
   - "tags"
   sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "IP4FWD"
   layout:
-    title: "k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-ndr"
+    title: "memif-3n-hsw-x520-64b-2t2c-base_and_features-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"
+# 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]}/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
+  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') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
@@ -16828,28 +18147,29 @@
   - "parent"
   - "tags"
   sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "IP4FWD"
   layout:
-    title: "k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-ndr"
+    title: "memif-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
-  title: "VPP Latency: k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-ndr-lat"
+- 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]}/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
+  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') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
@@ -16857,29 +18177,30 @@
   - "parent"
   - "tags"
   sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "IP4FWD"
   layout:
-    title: "k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-ndr"
+    title: "memif-3n-hsw-x710-64b-2t2c-base_and_features-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"
+# 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]}/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
+  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
-           'L2XCFWD' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
@@ -16887,28 +18208,29 @@
   - "parent"
   - "tags"
   sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "IP4FWD"
   layout:
-    title: "k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-ndr"
+    title: "memif-3n-hsw-xl710-64b-1t1c-base_and_features-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
-  title: "VPP Latency: k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-ndr-lat"
+- 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]}/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
+  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
-           'L2XCFWD' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
@@ -16916,29 +18238,30 @@
   - "parent"
   - "tags"
   sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "IP4FWD"
   layout:
-    title: "k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-ndr"
+    title: "memif-3n-hsw-xl710-64b-2t2c-base_and_features-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"
+# Packet Latency - VPP Container Memif 3n-skx-x710
+- type: "plot"
+  title: "VPP Latency: memif-3n-skx-x710-64b-2t1c-base_and_features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-ndr-lat"
-  data: "plot-ligato-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-2t1c-base_and_features-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+           '2T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
@@ -16946,28 +18269,29 @@
   - "parent"
   - "tags"
   sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "IP4FWD"
   layout:
-    title: "k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-ndr"
+    title: "memif-3n-skx-x710-64b-2t1c-base_and_features-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
-  title: "VPP Latency: k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-ndr-lat"
+- type: "plot"
+  title: "VPP Latency: memif-3n-skx-x710-64b-4t2c-base_and_features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-ndr-lat"
-  data: "plot-ligato-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-4t2c-base_and_features-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+           '4T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
@@ -16975,394 +18299,454 @@
   - "parent"
   - "tags"
   sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "IP4FWD"
   layout:
-    title: "k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-ndr"
+    title: "memif-3n-skx-x710-64b-4t2c-base_and_features-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"
+# 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]}/ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  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
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '1T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '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:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "IP4FWD"
   layout:
-    title: "ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
+    title: "memif-2n-skx-x710-64b-2t1c-base_and_features-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
-  title: "VPP Latency: ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
+- 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]}/ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  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
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '2T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '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:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "IP4FWD"
   layout:
-    title: "ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
+    title: "memif-2n-skx-x710-64b-4t2c-base_and_features-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"
+## Packet Latency - VPP Container Memif 2n-skx-xxv710
+#- type: "plot"
+#  title: "VPP Latency: memif-2n-skx-xxv710-64b-2t1c-base_and_features-ndr-lat"
+#  algorithm: "plot_latency_error_bars"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-xxv710-64b-2t1c-base_and_features-ndr-lat"
+#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+#  filter: "'NIC_Intel-XXV710' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
+#           'NDRPDR' and
+#           '2T1C' and
+#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
+#           not 'VHOST' and
+#           'MEMIF'"
+#  parameters:
+#  - "latency"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "L2XCFWD"
+#  - "L2XCFWD"
+#  - "L2XCFWD"
+#  - "L2BDMACLRN"
+#  - "L2BDMACLRN"
+#  - "L2BDMACLRN"
+#  - "IP4FWD"
+#  layout:
+#    title: "memif-2n-skx-xxv710-64b-2t1c-base_and_features-ndr"
+#    layout: "plot-latency"
+#
+#- type: "plot"
+#  title: "VPP Latency: memif-2n-skx-xxv710-64b-4t2c-base_and_features-ndr-lat"
+#  algorithm: "plot_latency_error_bars"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-xxv710-64b-4t2c-base_and_features-ndr-lat"
+#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+#  filter: "'NIC_Intel-XXV710' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
+#           'NDRPDR' and
+#           '4T2C' and
+#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
+#           not 'VHOST' and
+#           'MEMIF'"
+#  parameters:
+#  - "latency"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "L2XCFWD"
+#  - "L2XCFWD"
+#  - "L2XCFWD"
+#  - "L2BDMACLRN"
+#  - "L2BDMACLRN"
+#  - "L2BDMACLRN"
+#  - "IP4FWD"
+#  layout:
+#    title: "memif-2n-skx-xxv710-64b-4t2c-base_and_features-ndr"
+#    layout: "plot-latency"
+
+################################################################################
+
+# Packet Latency - VPP Container Memif 3n-hsw-x520 - l2xc
+- type: "plot"
+  title: "VPP Latency: k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  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
-           ('IP4BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            ('NAT44' and 'BASE') or
-            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
            '1T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           'L2XCFWD' and
+           not 'VHOST' and
+           not 'NF_DENSITY' and
+           'MEMIF'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
   sort:
-  - "IP4BASE"
-  - "NAT44"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACL"
-  - "OACL"
+  - "1VNF"
+  - "2VNF"
+  - "4VNF"
+  - "2VNF"
+  - "4VNF"
   layout:
-    title: "ip4-3n-hsw-x520-64b-1t1c-features-ndr"
+    title: "k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
-  title: "VPP Latency: ip4-3n-hsw-x520-64b-2t2c-features-ndr-lat"
+- 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]}/ip4-3n-hsw-x520-64b-2t2c-features-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  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
-           ('IP4BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            ('NAT44' and 'BASE') or
-            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           'L2XCFWD' and
+           not 'VHOST' and
+           not 'NF_DENSITY' and
+           'MEMIF'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
   sort:
-  - "IP4BASE"
-  - "NAT44"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACL"
-  - "OACL"
+  - "1VNF"
+  - "2VNF"
+  - "4VNF"
+  - "2VNF"
+  - "4VNF"
   layout:
-    title: "ip4-3n-hsw-x520-64b-2t2c-features-ndr"
+    title: "k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-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"
+# 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]}/ip4-3n-hsw-x520-64b-1t1c-features-nat44-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-ndr-lat"
+  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
            '1T1C' and
-           'IP4FWD' and
-           'NAT44' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+           not 'VHOST' and
+           not 'NF_DENSITY' and
+           'MEMIF'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
   sort:
-  - "BASE"
-  - "BASE"
-  - "SRC_USER_10"
-  - "SRC_USER_100"
-  - "SRC_USER_1000"
-  - "SRC_USER_2000"
+  - "1VNF"
+  - "2VNF"
+  - "4VNF"
+  - "2VNF"
+  - "4VNF"
   layout:
-    title: "ip4-3n-hsw-x520-64b-1t1c-features-nat44-ndr"
+    title: "k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
-  title: "VPP Latency: ip4-3n-hsw-x520-64b-2t2c-features-nat44-ndr-lat"
+- 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]}/ip4-3n-hsw-x520-64b-2t2c-features-nat44-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-ndr-lat"
+  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T2C' and
-           'IP4FWD' and
-           'NAT44' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+           not 'VHOST' and
+           not 'NF_DENSITY' and
+           'MEMIF'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
   sort:
-  - "BASE"
-  - "BASE"
-  - "SRC_USER_10"
-  - "SRC_USER_100"
-  - "SRC_USER_1000"
-  - "SRC_USER_2000"
+  - "1VNF"
+  - "2VNF"
+  - "4VNF"
+  - "2VNF"
+  - "4VNF"
   layout:
-    title: "ip4-3n-hsw-x520-64b-2t2c-features-nat44-ndr"
+    title: "k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-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"
+# 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]}/ip4-3n-hsw-x520-64b-1t1c-features-iacl-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-ndr-lat"
+  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-X710' and
            '64B' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
            '1T1C' and
-           'IP4FWD' and
-           'IACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           'L2XCFWD' and
+           not 'VHOST' and
+           not 'NF_DENSITY' and
+           'MEMIF'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
   sort:
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
+  - "1VNF"
+  - "2VNF"
+  - "4VNF"
+  - "2VNF"
+  - "4VNF"
   layout:
-    title: "ip4-3n-hsw-x520-64b-1t1c-features-iacl-ndr"
+    title: "k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
-  title: "VPP Latency: ip4-3n-hsw-x520-64b-2t2c-features-iacl-ndr-lat"
+- 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]}/ip4-3n-hsw-x520-64b-2t2c-features-iacl-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-ndr-lat"
+  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-X710' and
            '64B' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T2C' and
-           'IP4FWD' and
-           'IACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           'L2XCFWD' and
+           not 'VHOST' and
+           not 'NF_DENSITY' and
+           'MEMIF'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
   sort:
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
+  - "1VNF"
+  - "2VNF"
+  - "4VNF"
+  - "2VNF"
+  - "4VNF"
   layout:
-    title: "ip4-3n-hsw-x520-64b-2t2c-features-iacl-ndr"
+    title: "k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-ndr"
     layout: "plot-latency"
 
-# Packet Latency - VPP IPv4 3n-hsw-x520 features oacl
--
-  type: "plot"
-  title: "VPP Latency: ip4-3n-hsw-x520-64b-1t1c-features-oacl-ndr-lat"
+# 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]}/ip4-3n-hsw-x520-64b-1t1c-features-oacl-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-ndr-lat"
+  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-X710' and
            '64B' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
            '1T1C' and
-           'IP4FWD' and
-           'OACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+           not 'VHOST' and
+           not 'NF_DENSITY' and
+           'MEMIF'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
   sort:
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
+  - "1VNF"
+  - "2VNF"
+  - "4VNF"
+  - "2VNF"
+  - "4VNF"
   layout:
-    title: "ip4-3n-hsw-x520-64b-1t1c-features-oacl-ndr"
+    title: "k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
-  title: "VPP Latency: ip4-3n-hsw-x520-64b-2t2c-features-oacl-ndr-lat"
+- 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]}/ip4-3n-hsw-x520-64b-2t2c-features-oacl-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-ndr-lat"
+  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-X710' and
            '64B' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T2C' and
-           'IP4FWD' and
-           'OACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+           not 'VHOST' and
+           not 'NF_DENSITY' and
+           'MEMIF'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
   sort:
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
+  - "1VNF"
+  - "2VNF"
+  - "4VNF"
+  - "2VNF"
+  - "4VNF"
   layout:
-    title: "ip4-3n-hsw-x520-64b-2t2c-features-oacl-ndr"
+    title: "k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-ndr"
     layout: "plot-latency"
 
-# Packet Latency - VPP IPv4 3n-hsw-x710 base and scale
--
-  type: "plot"
-  title: "VPP Latency: ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
+################################################################################
+
+# 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-x710-64b-1t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  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-x710-64b-1t1c-base_and_scale-ndr"
+    title: "ip4-3n-hsw-x520-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"
+- 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-x710-64b-2t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  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-x710-64b-2t2c-base_and_scale-ndr"
+    title: "ip4-3n-hsw-x520-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"
+# 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-x710-64b-1t1c-features-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  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
+            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
            'NDRPDR' and
            '1T1C' and
            'IP4FWD' and
@@ -17373,6 +18757,7 @@
   - "parent"
   - "tags"
   sort:
+  - "DOT1Q"
   - "IP4BASE"
   - "NAT44"
   - "POLICE_MARK"
@@ -17380,23 +18765,22 @@
   - "IACL"
   - "OACL"
   layout:
-    title: "ip4-3n-hsw-x710-64b-1t1c-features-ndr"
+    title: "ip4-3n-hsw-x520-64b-1t1c-features-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
-  title: "VPP Latency: ip4-3n-hsw-x710-64b-2t2c-features-ndr-lat"
+- 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-x710-64b-2t2c-features-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  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
+            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
            'NDRPDR' and
            '2T2C' and
            'IP4FWD' and
@@ -17407,6 +18791,7 @@
   - "parent"
   - "tags"
   sort:
+  - "DOT1Q"
   - "IP4BASE"
   - "NAT44"
   - "POLICE_MARK"
@@ -17414,23 +18799,23 @@
   - "IACL"
   - "OACL"
   layout:
-    title: "ip4-3n-hsw-x710-64b-2t2c-features-ndr"
+    title: "ip4-3n-hsw-x520-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"
+# 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-x710-64b-1t1c-features-nat44-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  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' and
+           ('NAT44' or 'IP4BASE') and
+           not 'DOT1Q' and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -17438,29 +18823,29 @@
   - "parent"
   - "tags"
   sort:
-  - "BASE"
+  - "IP4BASE"
   - "BASE"
   - "SRC_USER_10"
   - "SRC_USER_100"
   - "SRC_USER_1000"
   - "SRC_USER_2000"
   layout:
-    title: "ip4-3n-hsw-x710-64b-1t1c-features-nat44-ndr"
+    title: "ip4-3n-hsw-x520-64b-1t1c-features-nat44-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
-  title: "VPP Latency: ip4-3n-hsw-x710-64b-2t2c-features-nat44-ndr-lat"
+- 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-x710-64b-2t2c-features-nat44-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  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' and
+           ('NAT44' or 'IP4BASE') and
+           not 'DOT1Q' and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -17468,206 +18853,149 @@
   - "parent"
   - "tags"
   sort:
-  - "BASE"
+  - "IP4BASE"
   - "BASE"
   - "SRC_USER_10"
   - "SRC_USER_100"
   - "SRC_USER_1000"
   - "SRC_USER_2000"
   layout:
-    title: "ip4-3n-hsw-x710-64b-2t2c-features-nat44-ndr"
+    title: "ip4-3n-hsw-x520-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"
+# 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-x710-64b-1t1c-features-iacl-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  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' and
+           (('IACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
   sort:
+  - "IP4BASE"
   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   layout:
-    title: "ip4-3n-hsw-x710-64b-1t1c-features-iacl-ndr"
+    title: "ip4-3n-hsw-x520-64b-1t1c-features-iacl-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
-  title: "VPP Latency: ip4-3n-hsw-x710-64b-2t2c-features-iacl-ndr-lat"
+- 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-x710-64b-2t2c-features-iacl-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  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' and
+           (('IACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
   sort:
+  - "IP4BASE"
   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   layout:
-    title: "ip4-3n-hsw-x710-64b-2t2c-features-iacl-ndr"
+    title: "ip4-3n-hsw-x520-64b-2t2c-features-iacl-ndr"
     layout: "plot-latency"
 
-# Packet Latency - VPP IPv4 3n-hsw-x710 features oacl
--
-  type: "plot"
-  title: "VPP Latency: ip4-3n-hsw-x710-64b-1t1c-features-oacl-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,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-oacl-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' 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
            'NDRPDR' and
            '1T1C' and
            'IP4FWD' and
-           'OACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           (('OACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
   sort:
+  - "IP4BASE"
   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   layout:
-    title: "ip4-3n-hsw-x710-64b-1t1c-features-oacl-ndr"
+    title: "ip4-3n-hsw-x520-64b-1t1c-features-oacl-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
-  title: "VPP Latency: ip4-3n-hsw-x710-64b-2t2c-features-oacl-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,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-oacl-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-oacl-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
            '2T2C' and
            'IP4FWD' and
-           'OACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           (('OACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
   sort:
+  - "IP4BASE"
   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   layout:
-    title: "ip4-3n-hsw-x710-64b-2t2c-features-oacl-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_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           ('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_and_scale-ndr"
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           ('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_and_scale-ndr"
+    title: "ip4-3n-hsw-x520-64b-2t2c-features-oacl-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"
+# 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-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  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
-           '2T1C' and
+           '1T1C' and
            'IP4FWD' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "latency"
@@ -17679,23 +19007,23 @@
   - "FIB_200K"
   - "FIB_2M"
   layout:
-    title: "ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+    title: "ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
-  title: "VPP Latency: ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
+- 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-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  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
-           '4T2C' and
+           '2T2C' and
            'IP4FWD' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "latency"
@@ -17707,26 +19035,25 @@
   - "FIB_200K"
   - "FIB_2M"
   layout:
-    title: "ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
+    title: "ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
     layout: "plot-latency"
 
-# Packet Latency - VPP IPv4 3n-skx-x710 features oacl
--
-  type: "plot"
-  title: "VPP Latency: ip4-3n-skx-x710-64b-2t1c-features-ndr-lat"
+# 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-skx-x710-64b-2t1c-features-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-ndr-lat"
+  data: "plot-vpp-throughput-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
+            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
            'NDRPDR' and
-           '2T1C' and
+           '1T1C' and
            'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
@@ -17735,6 +19062,7 @@
   - "parent"
   - "tags"
   sort:
+  - "DOT1Q"
   - "IP4BASE"
   - "NAT44"
   - "POLICE_MARK"
@@ -17742,25 +19070,24 @@
   - "IACL"
   - "OACL"
   layout:
-    title: "ip4-3n-skx-x710-64b-2t1c-features-ndr"
+    title: "ip4-3n-hsw-x710-64b-1t1c-features-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
-  title: "VPP Latency: ip4-3n-skx-x710-64b-4t2c-features-ndr-lat"
+- 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-skx-x710-64b-4t2c-features-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-ndr-lat"
+  data: "plot-vpp-throughput-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
+            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
            'NDRPDR' and
-           '4T2C' and
+           '2T2C' and
            'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
@@ -17769,6 +19096,7 @@
   - "parent"
   - "tags"
   sort:
+  - "DOT1Q"
   - "IP4BASE"
   - "NAT44"
   - "POLICE_MARK"
@@ -17776,23 +19104,22 @@
   - "IACL"
   - "OACL"
   layout:
-    title: "ip4-3n-skx-x710-64b-4t2c-features-ndr"
+    title: "ip4-3n-hsw-x710-64b-2t2c-features-ndr"
     layout: "plot-latency"
 
-# Packet Latency - VPP IPv4 3n-skx-x710 features nat44
--
-  type: "plot"
-  title: "VPP Latency: ip4-3n-skx-x710-64b-2t1c-features-nat44-ndr-lat"
+# 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-skx-x710-64b-2t1c-features-nat44-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  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
-           '2T1C' and
+           '1T1C' and
            'IP4FWD' and
-           'NAT44' and
+           ('NAT44' or 'IP4BASE') and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -17800,29 +19127,28 @@
   - "parent"
   - "tags"
   sort:
-  - "BASE"
+  - "IP4BASE"
   - "BASE"
   - "SRC_USER_10"
   - "SRC_USER_100"
   - "SRC_USER_1000"
   - "SRC_USER_2000"
   layout:
-    title: "ip4-3n-skx-x710-64b-2t1c-features-nat44-ndr"
+    title: "ip4-3n-hsw-x710-64b-1t1c-features-nat44-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
-  title: "VPP Latency: ip4-3n-skx-x710-64b-4t2c-features-nat44-ndr-lat"
+- 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-skx-x710-64b-4t2c-features-nat44-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  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
-           '4T2C' and
+           '2T2C' and
            'IP4FWD' and
-           'NAT44' and
+           ('NAT44' or 'IP4BASE') and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -17830,90 +19156,29 @@
   - "parent"
   - "tags"
   sort:
-  - "BASE"
+  - "IP4BASE"
   - "BASE"
   - "SRC_USER_10"
   - "SRC_USER_100"
   - "SRC_USER_1000"
   - "SRC_USER_2000"
   layout:
-    title: "ip4-3n-skx-x710-64b-4t2c-features-nat44-ndr"
-    layout: "plot-latency"
-
-# Packet Latency - VPP IPv4 3n-skx-x710 features iacl
--
-  type: "plot"
-  title: "VPP Latency: ip4-3n-skx-x710-64b-2t1c-features-iacl-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-iacl-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '2T1C' and
-           'IP4FWD' and
-           'IACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  layout:
-    title: "ip4-3n-skx-x710-64b-2t1c-features-iacl-ndr"
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: ip4-3n-skx-x710-64b-4t2c-features-iacl-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-iacl-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '4T2C' and
-           'IP4FWD' and
-           'IACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  layout:
-    title: "ip4-3n-skx-x710-64b-4t2c-features-iacl-ndr"
+    title: "ip4-3n-hsw-x710-64b-2t2c-features-nat44-ndr"
     layout: "plot-latency"
 
-# Packet Latency - VPP IPv4 3n-skx-x710 features oacl
--
-  type: "plot"
-  title: "VPP Latency: ip4-3n-skx-x710-64b-2t1c-features-oacl-ndr-lat"
+# 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-skx-x710-64b-2t1c-features-oacl-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  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
-           '2T1C' and
+           '1T1C' and
            'IP4FWD' and
-           'OACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           ('IACL' and ('ACL10' or 'ACL50') and '10K_FLOWS' or 'IP4BASE') and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -17921,28 +19186,27 @@
   - "parent"
   - "tags"
   sort:
+  - "IP4BASE"
   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   layout:
-    title: "ip4-3n-skx-x710-64b-2t1c-features-oacl-ndr"
+    title: "ip4-3n-hsw-x710-64b-1t1c-features-iacl-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
-  title: "VPP Latency: ip4-3n-skx-x710-64b-4t2c-features-oacl-ndr-lat"
+- 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-skx-x710-64b-4t2c-features-ndr-oacl-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  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
-           '4T2C' and
+           '2T2C' and
            'IP4FWD' and
-           'OACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           ('IACL' and ('ACL10' or 'ACL50') and '10K_FLOWS' or 'IP4BASE') and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -17950,27 +19214,27 @@
   - "parent"
   - "tags"
   sort:
+  - "IP4BASE"
   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   layout:
-    title: "ip4-3n-skx-x710-64b-4t2c-features-oacl-ndr"
+    title: "ip4-3n-hsw-x710-64b-2t2c-features-iacl-ndr"
     layout: "plot-latency"
 
-# Packet Latency - VPP IPv4 2n-skx-x710 base and scale
--
-  type: "plot"
-  title: "VPP Latency: ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
+# 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-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  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
-           '2T1C' and
+           '1T1C' and
            'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
@@ -17984,21 +19248,20 @@
   - "FIB_200K"
   - "FIB_2M"
   layout:
-    title: "ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
+    title: "ip4-3n-hsw-xl710-64b-1t1c-base-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
-  title: "VPP Latency: ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
+- 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-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  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
-           '4T2C' and
+           '2T2C' and
            'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
@@ -18012,24 +19275,24 @@
   - "FIB_200K"
   - "FIB_2M"
   layout:
-    title: "ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
+    title: "ip4-3n-hsw-xl710-64b-2t2c-base-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"
+# 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-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            '2T1C' and
            'IP4FWD' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "latency"
@@ -18041,1499 +19304,1335 @@
   - "FIB_200K"
   - "FIB_2M"
   layout:
-    title: "ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
+    title: "ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
-  title: "VPP Latency: ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
+- type: "plot"
+  title: "VPP Latency: ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            '4T2C' and
            'IP4FWD' and
            not 'IPSEC' and
-           not '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
--
-  type: "plot"
-  title: "VPP Latency: ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'ENCAP' and
-           'NDRPDR' and
-           '1T1C' and
-           'VXLAN' and
-           'L2BDMACLRN' and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "not DOT1Q"
-  - "VXLAN_1"
-  - "VXLAN_10"
-  - "VXLAN_100"
-  - "VXLAN_1000"
-  layout:
-    title: "ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'ENCAP' and
-           'NDRPDR' and
-           '2T2C' and
-           'VXLAN' and
-           'L2BDMACLRN' and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "not DOT1Q"
-  - "VXLAN_1"
-  - "VXLAN_10"
-  - "VXLAN_100"
-  - "VXLAN_1000"
-  layout:
-    title: "ip4tun-3n-hsw-x520-64b-2t2c-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-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'ENCAP' and
-           'NDRPDR' and
-           '1T1C' and
-           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') and
            not 'DOT1Q' and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "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-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'ENCAP' and
-           'NDRPDR' and
-           '2T2C' and
-           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') and
-           not 'DOT1Q' and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           not 'VHOST'"
   parameters:
   - "latency"
   - "parent"
-  - "tags"
-  sort:
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "LISP"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   layout:
-    title: "ip4tun-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
+    title: "ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
     layout: "plot-latency"
 
-# Packet Latency - VPP Ipv4 tunnels 3n-hsw-x710
--
-  type: "plot"
-  title: "VPP Latency: ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
+# 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]}/ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  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
-           'ENCAP' and
+           ('IP4BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            ('NAT44' and 'BASE') or
+            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
            'NDRPDR' and
-           '1T1C' and
-           'VXLAN' and
-           'L2BDMACLRN' and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           '2T1C' and
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
   sort:
-  - "not DOT1Q"
-  - "VXLAN_1"
-  - "VXLAN_10"
-  - "VXLAN_100"
-  - "VXLAN_1000"
+  - "DOT1Q"
+  - "IP4BASE"
+  - "NAT44"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACL"
+  - "OACL"
   layout:
-    title: "ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
+    title: "ip4-3n-skx-x710-64b-2t1c-features-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
-  title: "VPP Latency: ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
+- type: "plot"
+  title: "VPP Latency: ip4-3n-skx-x710-64b-4t2c-features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  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
-           'ENCAP' and
+           ('IP4BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            ('NAT44' and 'BASE') or
+            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
            'NDRPDR' and
-           '2T2C' and
-           'VXLAN' and
-           'L2BDMACLRN' and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           '4T2C' and
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
   sort:
-  - "not DOT1Q"
-  - "VXLAN_1"
-  - "VXLAN_10"
-  - "VXLAN_100"
-  - "VXLAN_1000"
+  - "DOT1Q"
+  - "IP4BASE"
+  - "NAT44"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACL"
+  - "OACL"
   layout:
-    title: "ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+    title: "ip4-3n-skx-x710-64b-4t2c-features-ndr"
     layout: "plot-latency"
 
-# Packet Latency - VPP Ipv4 tunnels 3n-hsw-x710 - features
--
-  type: "plot"
-  title: "VPP Latency: ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-ndr-lat"
+# 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]}/ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  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
-           'ENCAP' and
            'NDRPDR' and
-           '1T1C' and
-           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') and
-           not 'DOT1Q' and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           '2T1C' and
+           'IP4FWD' and
+           ('NAT44' or 'IP4BASE') and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
   sort:
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "LISP"
+  - "IP4BASE"
+  - "BASE"
+  - "SRC_USER_10"
+  - "SRC_USER_100"
+  - "SRC_USER_1000"
+  - "SRC_USER_2000"
   layout:
-    title: "ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
+    title: "ip4-3n-skx-x710-64b-2t1c-features-nat44-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
-  title: "VPP Latency: ip4tun-3n-hsw-x710-64b-2t2c-base_and_features-ndr-lat"
+- type: "plot"
+  title: "VPP Latency: ip4-3n-skx-x710-64b-4t2c-features-nat44-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-2t2c-base_and_features-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  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
-           'ENCAP' and
            'NDRPDR' and
-           '2T2C' and
-           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') and
-           not 'DOT1Q' and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           '4T2C' and
+           'IP4FWD' and
+           ('NAT44' or 'IP4BASE') and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
   sort:
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "LISP"
+  - "IP4BASE"
+  - "BASE"
+  - "SRC_USER_10"
+  - "SRC_USER_100"
+  - "SRC_USER_1000"
+  - "SRC_USER_2000"
   layout:
-    title: "ip4tun-3n-hsw-x710-64b-2t2c-base_and_features-ndr"
+    title: "ip4-3n-skx-x710-64b-4t2c-features-nat44-ndr"
     layout: "plot-latency"
 
-# Packet Latency - VPP Ipv4 tunnels 3n-skx-x710
--
-  type: "plot"
-  title: "VPP Latency: ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
+# 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]}/ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-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
-           'ENCAP' and
            'NDRPDR' and
            '2T1C' and
-           'VXLAN' and
-           'L2BDMACLRN' and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           'IP4FWD' and
+           ('IACL' and ('ACL10' or 'ACL50') and '10K_FLOWS' or 'IP4BASE') and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
   sort:
-  - "not DOT1Q"
-  - "VXLAN_1"
-  - "VXLAN_10"
-  - "VXLAN_100"
-  - "VXLAN_1000"
+  - "IP4BASE"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
   layout:
-    title: "ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+    title: "ip4-3n-skx-x710-64b-2t1c-features-iacl-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
-  title: "VPP Latency: ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
+- type: "plot"
+  title: "VPP Latency: ip4-3n-skx-x710-64b-4t2c-features-iacl-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-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
-           'ENCAP' and
            'NDRPDR' and
            '4T2C' and
-           'VXLAN' and
-           'L2BDMACLRN' and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           'IP4FWD' and
+           'IACL' and
+           ('IACL' and ('ACL10' or 'ACL50') and '10K_FLOWS' or 'IP4BASE') and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
   sort:
-  - "not DOT1Q"
-  - "VXLAN_1"
-  - "VXLAN_10"
-  - "VXLAN_100"
-  - "VXLAN_1000"
+  - "IP4BASE"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
   layout:
-    title: "ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
+    title: "ip4-3n-skx-x710-64b-4t2c-features-iacl-ndr"
     layout: "plot-latency"
 
-# Packet Latency - VPP Ipv4 tunnels 3n-skx-x710 - features
--
-  type: "plot"
-  title: "VPP Latency: ip4tun-3n-skx-x710-64b-2t1c-base_and_features-ndr-lat"
+# 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]}/ip4tun-3n-skx-x710-64b-2t1c-base_and_features-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  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
-           'ENCAP' and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            '2T1C' and
-           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') and
+           'IP4FWD' and
+           not 'IPSEC' and
            not 'DOT1Q' and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           not 'VHOST'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
   sort:
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "LISP"
+  - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   layout:
-    title: "ip4tun-3n-skx-x710-64b-2t1c-base_and_features-ndr"
+    title: "ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
-  title: "VPP Latency: ip4tun-3n-skx-x710-64b-4t2c-base_and_features-ndr-lat"
+- 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]}/ip4tun-3n-skx-x710-64b-4t2c-base_and_features-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  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
-           'ENCAP' and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            '4T2C' and
-           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') and
+           'IP4FWD' and
+           not 'IPSEC' and
            not 'DOT1Q' and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           not 'VHOST'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
   sort:
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "LISP"
+  - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   layout:
-    title: "ip4tun-3n-skx-x710-64b-4t2c-base_and_features-ndr"
+    title: "ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
     layout: "plot-latency"
 
-################################################################################
-
-# Packet Latency - VPP IPv6 3n-hsw-x520
--
-  type: "plot"
-  title: "VPP Latency: ip6-3n-hsw-x520-78b-1t1c-base_and_scale-ndr-lat"
+# 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"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-1t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-2t1c-features-iacl-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           (('IACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
            'NDRPDR' and
-           '1T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
+           '2T1C' and
+           'IP4FWD' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
   sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  - "IP4BASE"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
   layout:
-    title: "ip6-3n-hsw-x520-78b-1t1c-base_and_scale-ndr"
+    title: "ip4-2n-skx-x710-64b-2t1c-features-iacl-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
-  title: "VPP Latency: ip6-3n-hsw-x520-78b-2t2c-base_and_scale-ndr-lat"
+- type: "plot"
+  title: "VPP Latency: ip4-2n-skx-x710-64b-4t2c-features-iacl-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-2t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-4t2c-features-iacl-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           (('IACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
            'NDRPDR' and
-           '2T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
+           '4T2C' and
+           'IP4FWD' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
   sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  - "IP4BASE"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
   layout:
-    title: "ip6-3n-hsw-x520-78b-2t2c-base_and_scale-ndr"
+    title: "ip4-2n-skx-x710-64b-4t2c-features-iacl-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-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+# 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
-           '1T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
+           '2T1C' and
+           'IP4FWD' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
   sort:
-  - "IP6BASE"
+  - "IP4BASE"
   - "FIB_20K"
   - "FIB_200K"
   - "FIB_2M"
   layout:
-    title: "ip6-3n-hsw-x710-78b-1t1c-base_and_scale-ndr"
+    title: "ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
-  title: "VPP Latency: ip6-3n-hsw-x710-78b-2t2c-base_and_scale-ndr-lat"
+- 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]}/ip6-3n-hsw-x710-78b-2t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') 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
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
-           '2T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
+           '4T2C' and
+           'IP4FWD' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
   sort:
-  - "IP6BASE"
+  - "IP4BASE"
   - "FIB_20K"
   - "FIB_200K"
   - "FIB_2M"
   layout:
-    title: "ip6-3n-hsw-x710-78b-2t2c-base_and_scale-ndr"
+    title: "ip4-2n-skx-xxv710-64b-4t2c-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_and_scale-ndr-lat"
+################################################################################
+
+# 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]}/ip6-3n-hsw-xl710-78b-1t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+  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
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
+           not 'DOT1Q' and
+           not 'VHOST' and
+           not 'IPSECHW'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
   sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  - "IP4BASE"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "LISP"
   layout:
-    title: "ip6-3n-hsw-xl710-78b-1t1c-base_and_scale-ndr"
+    title: "ip4tun-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
-  title: "VPP Latency: ip6-3n-hsw-xl710-78b-2t2c-base_and_scale-ndr-lat"
+- 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]}/ip6-3n-hsw-xl710-78b-2t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+  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
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
+           not 'DOT1Q' and
+           not 'VHOST' and
+           not 'IPSECHW'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
   sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  - "IP4BASE"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "LISP"
   layout:
-    title: "ip6-3n-hsw-xl710-78b-2t2c-base_and_scale-ndr"
+    title: "ip4tun-3n-hsw-x520-64b-2t2c-base_and_features-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"
+# 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]}/ip6-3n-skx-x710-78b-2t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  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
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           '64B' and
+           'ENCAP' and
            'NDRPDR' and
-           '2T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '1T1C' and
+           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
+           not 'VHOST' and
+           not 'IPSECHW'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
   sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  - "IP4BASE"
+  - "LISP"
+  - "VXLAN_1"
+  - "VXLAN_10"
+  - "VXLAN_100"
+  - "VXLAN_1000"
   layout:
-    title: "ip6-3n-skx-x710-78b-2t1c-base_and_scale-ndr"
+    title: "ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
-  title: "VPP Latency: ip6-3n-skx-x710-78b-4t2c-base_and_scale-ndr-lat"
+- 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]}/ip6-3n-skx-x710-78b-4t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  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
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           '64B' and
+           'ENCAP' and
            'NDRPDR' and
-           '4T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '2T2C' and
+           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
+           not 'VHOST' and
+           not 'IPSECHW'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
   sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  - "IP4BASE"
+  - "LISP"
+  - "VXLAN_1"
+  - "VXLAN_10"
+  - "VXLAN_100"
+  - "VXLAN_1000"
   layout:
-    title: "ip6-3n-skx-x710-78b-4t2c-base_and_scale-ndr"
+    title: "ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
     layout: "plot-latency"
 
-# Packet Latency - VPP IPv6 2n-skx-x710
--
-  type: "plot"
-  title: "VPP Latency: ip6-2n-skx-x710-78b-2t1c-base_and_scale-ndr-lat"
+# 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]}/ip6-2n-skx-x710-78b-2t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  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
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           '64B' and
+           'ENCAP' and
            'NDRPDR' and
-           '2T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '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:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  - "IP4BASE"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "LISP"
   layout:
-    title: "ip6-2n-skx-x710-78b-2t1c-base_and_scale-ndr"
+    title: "ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
-  title: "VPP Latency: ip6-2n-skx-x710-78b-4t2c-base_and_scale-ndr-lat"
+- 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]}/ip6-2n-skx-x710-78b-4t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  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
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           '64B' and
+           'ENCAP' and
            'NDRPDR' and
-           '4T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '2T2C' and
+           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP' or 'IP4BASE') and
+           not 'DOT1Q' and
+           not 'VHOST' and
+           not 'IPSECHW'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
   sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  - "IP4BASE"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "LISP"
   layout:
-    title: "ip6-2n-skx-x710-78b-4t2c-base_and_scale-ndr"
+    title: "ip4tun-3n-hsw-x710-64b-2t2c-base_and_features-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"
+# 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]}/ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') 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
            '2T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
+           not 'VHOST' and
+           not 'IPSECHW'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
   sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  - "IP4BASE"
+  - "LISP"
+  - "VXLAN_1"
+  - "VXLAN_10"
+  - "VXLAN_100"
+  - "VXLAN_1000"
   layout:
-    title: "ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr"
+    title: "ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
-  title: "VPP Latency: ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr-lat"
+- type: "plot"
+  title: "VPP Latency: ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') 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
            '4T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
+           not 'VHOST' and
+           not 'IPSECHW'"
   parameters:
   - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "LISP"
+  - "VXLAN_1"
+  - "VXLAN_10"
+  - "VXLAN_100"
+  - "VXLAN_1000"
   layout:
-    title: "ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr"
+    title: "ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
     layout: "plot-latency"
 
-################################################################################
-
-# Packet Latency - VPP IPv6 tunnels 3n-hsw-x520
--
-  type: "plot"
-  title: "VPP Latency: ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-ndr-lat"
+# Packet Latency - VPP Ipv4 tunnels 3n-skx-x710 - features
+- type: "plot"
+  title: "VPP Latency: ip4tun-3n-skx-x710-64b-2t1c-base_and_features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
+  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
-           '1T1C' and
-           'LISP' and
-           not 'VHOST'"
+           '2T1C' and
+           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
+           not 'DOT1Q' and
+           not 'VHOST' and
+           not 'IPSECHW'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
   sort:
-  - "IP4UNRLAY"
-  - "IP6UNRLAY"
+  - "IP4BASE"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "LISP"
   layout:
-    title: "ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-ndr"
+    title: "ip4tun-3n-skx-x710-64b-2t1c-base_and_features-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
-  title: "VPP Latency: ip6tun-3n-hsw-x520-78b-2t2c-base_and_scale-ndr-lat"
+- type: "plot"
+  title: "VPP Latency: ip4tun-3n-skx-x710-64b-4t2c-base_and_features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-2t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
+  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
-           '2T2C' and
-           'LISP' and
-           not 'VHOST'"
+           '4T2C' and
+           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
+           not 'DOT1Q' and
+           not 'VHOST' and
+           not 'IPSECHW'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
   sort:
-  - "IP4UNRLAY"
-  - "IP6UNRLAY"
+  - "IP4BASE"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "LISP"
   layout:
-    title: "ip6tun-3n-hsw-x520-78b-2t2c-base_and_scale-ndr"
+    title: "ip4tun-3n-skx-x710-64b-4t2c-base_and_features-ndr"
     layout: "plot-latency"
 
 ################################################################################
 
-# Packet Latency - VPP IPSec 3n-hsw-xl710 base
--
-  type: "plot"
-  title: "VPP Latency: ipsec-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
+# 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]}/ipsec-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'IP4FWD' and
+  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
-           'BASE' and
            '1T1C' and
-           'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') 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: "ipsec-3n-hsw-xl710-64b-1t1c-base-ndr"
+    title: "ip6-3n-hsw-x520-78b-1t1c-base-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
-  title: "VPP Latency: ipsec-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
+- 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]}/ipsec-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'IP4FWD' and
+  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
-           'BASE' and
            '2T2C' and
-           'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') 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: "ipsec-3n-hsw-xl710-64b-2t2c-base-ndr"
+    title: "ip6-3n-hsw-x520-78b-2t2c-base-ndr"
     layout: "plot-latency"
 
-# Packet Latency - VPP IPSec 3n-hsw-xl710 scale
--
-  type: "plot"
-  title: "VPP Latency: ipsec-3n-hsw-xl710-64b-1t1c-scale-ndr-lat"
+# 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]}/ipsec-3n-hsw-xl710-64b-1t1c-scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'IP4FWD' and
+  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
-           'SCALE' and
            '1T1C' and
-           'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') 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: "ipsec-3n-hsw-xl710-64b-1t1c-scale-ndr"
+    title: "ip6-3n-hsw-x710-78b-1t1c-base_and_scale-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
-  title: "VPP Latency: ipsec-3n-hsw-xl710-64b-2t2c-scale-ndr-lat"
+- 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]}/ipsec-3n-hsw-xl710-64b-2t2c-scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'IP4FWD' and
+  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
-           'SCALE' and
            '2T2C' and
-           'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') 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: "ipsec-3n-hsw-xl710-64b-2t2c-scale-ndr"
+    title: "ip6-3n-hsw-x710-78b-2t2c-base_and_scale-ndr"
     layout: "plot-latency"
 
-# Packet Latency - VPP IPSec 3n-hsw-xl710 sw
--
-  type: "plot"
-  title: "VPP Latency: ipsec-3n-hsw-xl710-64b-1t1c-sw-ndr-lat"
+# Packet Latency - VPP 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]}/ipsec-3n-hsw-xl710-64b-1t1c-sw-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  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
-           '64B' and
-           'IP4FWD' and
+           '78B' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            '1T1C' and
-           'IPSECSW' and
-           ('IPSECTRAN' or 'IPSECTUN') 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: "ipsec-3n-hsw-xl710-64b-1t1c-sw-ndr"
+    title: "ip6-3n-hsw-xl710-78b-1t1c-base-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
-  title: "VPP Latency: ipsec-3n-hsw-xl710-64b-2t2c-sw-ndr-lat"
+- 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]}/ipsec-3n-hsw-xl710-64b-2t2c-sw-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  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
-           '64B' and
-           'IP4FWD' and
+           '78B' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            '2T2C' and
-           'IPSECSW' and
-           ('IPSECTRAN' or 'IPSECTUN') 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: "ipsec-3n-hsw-xl710-64b-2t2c-sw-ndr"
+    title: "ip6-3n-hsw-xl710-78b-2t2c-base-ndr"
     layout: "plot-latency"
 
-################################################################################
-
-# Packet Latency - VPP SRv6 3n-hsw-x520
--
-  type: "plot"
-  title: "VPP Latency: srv6-3n-hsw-x520-78b-1t1c-features-ndr-lat"
+# 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]}/srv6-3n-hsw-x520-78b-1t1c-features-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-2t1c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '78B' and
-           'FEATURE' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
-           '1T1C' and
+           '2T1C' and
            'IP6FWD' and
-           'SRv6'"
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
+  sort:
+  - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   layout:
-    title: "srv6-3n-hsw-x520-78b-1t1c-features-ndr"
+    title: "ip6-3n-skx-x710-78b-2t1c-base_and_scale-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
-  title: "VPP Latency: srv6-3n-hsw-x520-78b-2t2c-features-ndr-lat"
+- type: "plot"
+  title: "VPP Latency: ip6-3n-skx-x710-78b-4t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-2t2c-features-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-4t2c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '78B' and
-           'FEATURE' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
-           '2T2C' and
+           '4T2C' and
            'IP6FWD' and
-           'SRv6'"
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
+  sort:
+  - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   layout:
-    title: "srv6-3n-hsw-x520-78b-2t2c-features-ndr"
+    title: "ip6-3n-skx-x710-78b-4t2c-base_and_scale-ndr"
     layout: "plot-latency"
 
-################################################################################
-
-# Packet Latency - VPP vhost ip4 3n-hsw-x520
--
-  type: "plot"
-  title: "VPP Latency: vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
+# Packet Latency - VPP IPv6 3n-skx-xxv710
+- type: "plot"
+  title: "VPP Latency: ip6-3n-skx-xxv710-78b-2t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-xxv710-78b-2t1c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-XXV710' and
+           '78B' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           '1T1C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'DOT1Q'"
+           '2T1C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
   sort:
-  - "not CFS_OPT"
-  - "1VM"
-  - "2VM"
+  - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   layout:
-    title: "vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
+    title: "ip6-3n-skx-xxv710-78b-2t1c-base_and_scale-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
-  title: "VPP Latency: vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
+- type: "plot"
+  title: "VPP Latency: ip6-3n-skx-xxv710-78b-4t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
+  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
            'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           '2T2C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'DOT1Q'"
+           '4T2C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
   sort:
-  - "not CFS_OPT"
-  - "1VM"
-  - "2VM"
+  - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   layout:
-    title: "vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
+    title: "ip6-3n-skx-xxv710-78b-4t2c-base_and_scale-ndr"
     layout: "plot-latency"
 
-# Packet Latency - VPP vhost l2sw 3n-hsw-x520
--
-  type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
+# 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]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-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
-           ('ETH' or 'DOT1Q') and
-           '1T1C' and
-           'L2BDMACLRN' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
+           '2T1C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
+  sort:
+  - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   layout:
-    title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
+    title: "ip6-2n-skx-x710-78b-2t1c-base_and_scale-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
+- 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]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-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
-           ('ETH' or 'DOT1Q') and
-           '2T2C' and
-           'L2BDMACLRN' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
+           '4T2C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
+  sort:
+  - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   layout:
-    title: "vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
+    title: "ip6-2n-skx-x710-78b-4t2c-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-ndr-lat"
+# 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]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
+  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
-           ('ETH' or 'DOT1Q') and
-           'BASE' and
-           '1T1C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
+           '2T1C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
+  sort:
+  - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   layout:
-    title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base-ndr"
+    title: "ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-hsw-x520-64b-2t2c-base-ndr-lat"
+- 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]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
+  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
-           ('ETH' or 'DOT1Q') and
-           'BASE' and
-           '2T2C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
+           '4T2C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
+  sort:
+  - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   layout:
-    title: "vhost-l2sw-3n-hsw-x520-64b-2t2c-base-ndr"
+    title: "ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-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"
+################################################################################
+
+# 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]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  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
-           '64B' and
+           '78B' and
+           'ENCAP' 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'"
+           'LISP' and
+           not 'VHOST'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
+  sort:
+  - "IP4UNRLAY"
+  - "IP6UNRLAY"
   layout:
-    title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-ndr"
+    title: "ip6tun-3n-hsw-x520-78b-1t1c-base-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-ndr-lat"
+- 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]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  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
-           '64B' and
+           '78B' and
+           'ENCAP' 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'"
+           'LISP' and
+           not 'VHOST'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
+  sort:
+  - "IP4UNRLAY"
+  - "IP6UNRLAY"
   layout:
-    title: "vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-ndr"
+    title: "ip6tun-3n-hsw-x520-78b-2t2c-base-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"
+################################################################################
+
+# 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]}/vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '64B' and
-           'NDRPDR' and
-           'ETH' and
            'IP4FWD' and
+           'NDRPDR' and
+           'BASE' and
            '1T1C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'DOT1Q'"
+           'IPSECHW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
+           not 'VHOST'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "1VM"
-  - "2VM"
   layout:
-    title: "vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
+    title: "ipsec-3n-hsw-xl710-64b-1t1c-base-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
-  title: "VPP Latency: vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
+- 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]}/vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  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
-           'NDRPDR' and
-           'ETH' and
            'IP4FWD' and
+           'NDRPDR' and
+           'BASE' and
            '2T2C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'DOT1Q'"
+           'IPSECHW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
+           not 'VHOST'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "1VM"
-  - "2VM"
   layout:
-    title: "vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+    title: "ipsec-3n-hsw-xl710-64b-2t2c-base-ndr"
     layout: "plot-latency"
 
-# Packet Latency - VPP vhost l2sw 3n-hsw-x710
--
-  type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
+# 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]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-scale-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '64B' and
+           'IP4FWD' and
            'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
+           'SCALE' and
            '1T1C' and
-           'L2BDMACLRN' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
+           'IPSECHW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
+           not 'VHOST'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
   layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
+    title: "ipsec-3n-hsw-xl710-64b-1t1c-scale-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
+- 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]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  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
+           'IP4FWD' and
            'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
+           'SCALE' and
            '2T2C' and
-           'L2BDMACLRN' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
+           'IPSECHW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
+           not 'VHOST'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
   layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+    title: "ipsec-3n-hsw-xl710-64b-2t2c-scale-ndr"
     layout: "plot-latency"
 
-# Packet Latency - VPP vhost l2sw 3n-hsw-x710 - base
--
-  type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-hsw-x710-64b-1t1c-base-ndr-lat"
+# 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]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  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
+           'IP4FWD' 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'"
+           'IPSECSW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
+           not 'VHOST'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
   layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base-ndr"
+    title: "ipsec-3n-hsw-xl710-64b-1t1c-sw-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-hsw-x710-64b-2t2c-base-ndr-lat"
+- 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]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  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
+           'IP4FWD' 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'"
+           'IPSECSW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
+           not 'VHOST'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
   layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base-ndr"
+    title: "ipsec-3n-hsw-xl710-64b-2t2c-sw-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-vm-ndr-lat"
+################################################################################
+
+# 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]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base-vm-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  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
-           ('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'"
+           'IP6FWD' and
+           'SRv6'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
   layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base-vm-ndr"
+    title: "srv6-3n-hsw-x520-78b-1t1c-features-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-hsw-x710-64b-2t2c-base-vm-ndr-lat"
+- 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]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base-vm-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  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
-           ('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'"
+           'IP6FWD' and
+           'SRv6'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
   layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base-vm-ndr"
+    title: "srv6-3n-hsw-x520-78b-2t2c-features-ndr"
     layout: "plot-latency"
 
-# Packet Latency - VPP vhost ip4 3n-hsw-xl710
--
-  type: "plot"
-  title: "VPP Latency: vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat"
+################################################################################
+
+# 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-xl710-64b-1t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  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
@@ -19551,17 +20650,16 @@
   - "1VM"
   - "2VM"
   layout:
-    title: "vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
+    title: "vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
-  title: "VPP Latency: vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat"
+- 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-xl710-64b-2t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  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
@@ -19579,81 +20677,17 @@
   - "1VM"
   - "2VM"
   layout:
-    title: "vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
-    layout: "plot-latency"
-
-# Packet Latency - VPP vhost l2sw 3n-hsw-xl710
--
-  type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '1T1C' and
-           'L2BDMACLRN' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-  layout:
-    title: "vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '2T2C' and
-           'L2BDMACLRN' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-  layout:
-    title: "vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
+    title: "vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
     layout: "plot-latency"
 
-# Packet Latency - VPP vhost l2sw 3n-hsw-xl710 - base
--
-  type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
+# 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-xl710-64b-1t1c-base-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  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
@@ -19668,23 +20702,24 @@
   - "latency"
   - "parent"
   - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
+  sort:
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
   layout:
-    title: "vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-ndr"
+    title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
+- 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-xl710-64b-2t2c-base-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  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
@@ -19699,24 +20734,25 @@
   - "latency"
   - "parent"
   - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
+  sort:
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
   layout:
-    title: "vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-ndr"
+    title: "vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
     layout: "plot-latency"
 
-# Packet Latency - VPP vhost l2sw 3n-hsw-xl710 - base vm
--
-  type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-vm-ndr-lat"
+# 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-xl710-64b-1t1c-base-vm-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  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
@@ -19724,38 +20760,10 @@
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'CFS_OPT' and
+           not 'DOT1Q' and
            not 'VXLAN' and
-           not 'IP4FWD'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
-  layout:
-    title: "vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-vm-ndr"
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-vm-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-vm-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' 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'"
+           not 'IP4FWD' and
+           not 'LBOND'"
   parameters:
   - "latency"
   - "parent"
@@ -19766,207 +20774,172 @@
 #  - "1VM"
 #  - "L2BDMACLRN"
   layout:
-    title: "vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-vm-ndr"
-    layout: "plot-latency"
-
-# Packet Latency - VPP vhost ip4 3n-skx-x710
--
-  type: "plot"
-  title: "VPP Latency: vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           '2T1C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'DOT1Q'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "1VM"
-  - "2VM"
-  layout:
-    title: "vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+    title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
-  title: "VPP Latency: vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
+- type: "plot"
+  title: "VPP Latency: 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-ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  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' and
-           'IP4FWD' and
-           '4T2C' 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 'DOT1Q'"
+           not 'IP4FWD' and
+           not 'LBOND'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "1VM"
-  - "2VM"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   layout:
-    title: "vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
+    title: "vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-ndr"
     layout: "plot-latency"
 
-# Packet Latency - VPP vhost l2sw 3n-skx-x710
--
-  type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
+# 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-l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  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' or 'DOT1Q') and
-           '2T1C' and
-           'L2BDMACLRN' and
+           'ETH' and
+           'IP4FWD' and
+           '1T1C' and
            'VHOST_1024' and
            not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
+           not 'CFS_OPT' and
+           not 'DOT1Q'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
+  sort:
+  - "1VM"
+  - "2VM"
   layout:
-    title: "vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+    title: "vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
+- type: "plot"
+  title: "VPP Latency: vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-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' or 'DOT1Q') and
-           '4T2C' and
-           'L2BDMACLRN' and
+           'ETH' and
+           'IP4FWD' and
+           '2T2C' and
            'VHOST_1024' and
            not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
+           not 'CFS_OPT' and
+           not 'DOT1Q'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
+  sort:
+  - "1VM"
+  - "2VM"
   layout:
-    title: "vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
+    title: "vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
     layout: "plot-latency"
 
-# Packet Latency - VPP vhost l2sw 3n-skx-x710 - base
--
-  type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-skx-x710-64b-2t1c-base-ndr-lat"
+# Packet Latency - VPP vhost l2sw 3n-hsw-x710 - base
+- type: "plot"
+  title: "VPP Latency: vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-2t1c-base-ndr-lat"
-  data: "plot-vpp-throughput-latency-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
            ('ETH' or 'DOT1Q') and
            'BASE' and
-           '2T1C' and
+           '1T1C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not '2VM' and
-           not 'LBOND'"
+           not '2VM'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
+  sort:
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
   layout:
-    title: "vhost-l2sw-3n-skx-x710-64b-2t1c-base-ndr"
+    title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-skx-x710-64b-4t2c-base-ndr-lat"
+- type: "plot"
+  title: "VPP Latency: vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-4t2c-base-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
            ('ETH' or 'DOT1Q') and
            'BASE' and
-           '4T2C' and
+           '2T2C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not '2VM' and
-           not 'LBOND'"
+           not '2VM'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
+  sort:
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
   layout:
-    title: "vhost-l2sw-3n-skx-x710-64b-4t2c-base-ndr"
+    title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-ndr"
     layout: "plot-latency"
 
-# Packet Latency - VPP vhost l2sw 3n-skx-x710 - base vm
--
-  type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-skx-x710-64b-2t1c-base-vm-ndr-lat"
+# 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-skx-x710-64b-2t1c-base-vm-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  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
-           '2T1C' and
+           '1T1C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'CFS_OPT' and
@@ -19977,27 +20950,28 @@
   - "latency"
   - "parent"
   - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
+  sort:
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
   layout:
-    title: "vhost-l2sw-3n-skx-x710-64b-2t1c-base-vm-ndr"
+    title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-vm-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-skx-x710-64b-4t2c-base-vm-ndr-lat"
+- type: "plot"
+  title: "VPP Latency: vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-vm-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-4t2c-base-vm-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-vm-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
            ('ETH' or 'DOT1Q') and
-           '4T2C' and
+           '2T2C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'CFS_OPT' and
@@ -20008,23 +20982,24 @@
   - "latency"
   - "parent"
   - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
+  sort:
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
   layout:
-    title: "vhost-l2sw-3n-skx-x710-64b-4t2c-base-vm-ndr"
+    title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-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"
+# Packet Latency - VPP vhost ip4 3n-skx-x710
+- type: "plot"
+  title: "VPP Latency: vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -20039,20 +21014,18 @@
   - "parent"
   - "tags"
   sort:
-  - "not CFS_OPT"
   - "1VM"
   - "2VM"
   layout:
-    title: "vhost-ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
+    title: "vhost-ip4-3n-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"
+- type: "plot"
+  title: "VPP Latency: vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -20067,84 +21040,19 @@
   - "parent"
   - "tags"
   sort:
-  - "not CFS_OPT"
   - "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
--
-  type: "plot"
-  title: "VPP Latency: vhost-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]}/vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '2T1C' and
-           'L2BDMACLRN' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-  layout:
-    title: "vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: vhost-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]}/vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '4T2C' and
-           'L2BDMACLRN' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-  layout:
-    title: "vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
+    title: "vhost-ip4-3n-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-ndr-lat"
+# Packet Latency - VPP vhost l2sw 3n-skx-x710 - base
+- type: "plot"
+  title: "VPP Latency: vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-2t1c-base-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -20160,22 +21068,23 @@
   - "latency"
   - "parent"
   - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
+  sort:
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
   layout:
-    title: "vhost-l2sw-2n-skx-x710-64b-2t1c-base-ndr"
+    title: "vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
-  title: "VPP Latency: vhost-l2sw-2n-skx-x710-64b-4t2c-base-ndr-lat"
+- type: "plot"
+  title: "VPP Latency: vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-4t2c-base-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -20191,23 +21100,24 @@
   - "latency"
   - "parent"
   - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
+  sort:
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
   layout:
-    title: "vhost-l2sw-2n-skx-x710-64b-4t2c-base-ndr"
+    title: "vhost-l2sw-3n-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"
+# Packet Latency - VPP vhost l2sw 3n-skx-x710 - base vm
+- type: "plot"
+  title: "VPP Latency: vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-vm-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-2t1c-base-vm-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  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
@@ -20217,27 +21127,29 @@
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
-           not 'IP4FWD'"
+           not 'IP4FWD' and
+           not 'LBOND'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
+  sort:
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
   layout:
-    title: "vhost-l2sw-2n-skx-x710-64b-2t1c-base-vm-ndr"
+    title: "vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-vm-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
-  title: "VPP Latency: vhost-l2sw-2n-skx-x710-64b-4t2c-base-vm-ndr-lat"
+- type: "plot"
+  title: "VPP Latency: vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-vm-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-4t2c-base-vm-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-vm-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -20247,29 +21159,31 @@
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
-           not 'IP4FWD'"
+           not 'IP4FWD' and
+           not 'LBOND'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
+  sort:
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
   layout:
-    title: "vhost-l2sw-2n-skx-x710-64b-4t2c-base-vm-ndr"
+    title: "vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-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"
+# 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-xxv710-64b-2t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/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
@@ -20277,27 +21191,27 @@
            '2T1C' and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'NF_DENSITY' 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"
+    title: "vhost-ip4-2n-skx-x710-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"
+- 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-xxv710-64b-4t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/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
@@ -20305,35 +21219,37 @@
            '4T2C' and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'NF_DENSITY' 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"
+    title: "vhost-ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
     layout: "plot-latency"
 
-# Packet Latency - VPP vhost l2sw 2n-skx-xxv710
--
-  type: "plot"
-  title: "VPP Latency: vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
+# 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-xxv710-64b-2t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/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' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'IP4FWD' and
            not '2VM'"
   parameters:
@@ -20341,30 +21257,30 @@
   - "parent"
   - "tags"
 #  sort:
-#  - "VM"  # "not CFS_OPT"
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
 #  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
   layout:
-    title: "vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
+    title: "vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_features-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
-  title: "VPP Latency: vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
+- 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-xxv710-64b-4t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/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' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'IP4FWD' and
            not '2VM'"
   parameters:
@@ -20372,149 +21288,265 @@
   - "parent"
   - "tags"
 #  sort:
-#  - "VM"  # "not CFS_OPT"
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
 #  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
   layout:
-    title: "vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
+    title: "vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_features-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-ndr-lat"
+# 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-xxv710-64b-2t1c-base-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  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
-           'BASE' and
            '2T1C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
+           not 'CFS_OPT' and
            not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
+           not 'NF_DENSITY' and
+           not 'DOT1Q' and
+           not 'IP4FWD'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
 #  sort:
-#  - "not CFS_OPT"
+#  - "1VM"
 #  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
+#  - "1VM"
+#  - "L2BDMACLRN"
   layout:
-    title: "vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-ndr"
+    title: "vhost-l2sw-2n-skx-x710-64b-2t1c-base-vm-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
-  title: "VPP Latency: vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-ndr-lat"
+- 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-xxv710-64b-4t2c-base-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  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
-           'BASE' and
            '4T2C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
+           not 'CFS_OPT' and
            not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
+           not 'NF_DENSITY' and
+           not 'DOT1Q' and
+           not 'IP4FWD'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
 #  sort:
-#  - "not CFS_OPT"
+#  - "1VM"
 #  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
+#  - "1VM"
+#  - "L2BDMACLRN"
   layout:
-    title: "vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-ndr"
+    title: "vhost-l2sw-2n-skx-x710-64b-4t2c-base-vm-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"
+# 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-l2sw-2n-skx-xxv710-64b-2t1c-base-vm-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  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' or 'DOT1Q') and
+           'ETH' and
+           'IP4FWD' and
            '2T1C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
-           not 'CFS_OPT' and
            not 'VXLAN' and
-           not 'IP4FWD'"
+           not 'CFS_OPT' and
+           not 'DOT1Q'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
+  sort:
+  - "not CFS_OPT"
+  - "1VM"
+  - "2VM"
   layout:
-    title: "vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-vm-ndr"
+    title: "vhost-ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
-  title: "VPP Latency: vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-ndr-lat"
+- 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-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  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' or 'DOT1Q') and
+           'ETH' and
+           'IP4FWD' and
            '4T2C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
-           not 'CFS_OPT' and
            not 'VXLAN' and
-           not 'IP4FWD'"
+           not 'CFS_OPT' and
+           not 'DOT1Q'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
+  sort:
+  - "not CFS_OPT"
+  - "1VM"
+  - "2VM"
   layout:
-    title: "vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-ndr"
+    title: "vhost-ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
     layout: "plot-latency"
 
+## Packet Latency - VPP vhost l2sw 2n-skx-xxv710 - base
+#- type: "plot"
+#  title: "VPP Latency: vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_features-ndr-lat"
+#  algorithm: "plot_latency_error_bars"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_features-ndr-lat"
+#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+#  filter: "'NIC_Intel-XXV710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           'BASE' and
+#           '2T1C' and
+#           ('L2BDMACLRN' or 'L2XCFWD') and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "latency"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "not CFS_OPT"
+##  - "L2XCFWD"
+##  - "not CFS_OPT"
+##  - "CFS_OPT"
+#  layout:
+#    title: "vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_features-ndr"
+#    layout: "plot-latency"
+#
+#- type: "plot"
+#  title: "VPP Latency: vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_features-ndr-lat"
+#  algorithm: "plot_latency_error_bars"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_features-ndr-lat"
+#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+#  filter: "'NIC_Intel-XXV710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           'BASE' and
+#           '4T2C' and
+#           ('L2BDMACLRN' or 'L2XCFWD') and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "latency"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "not CFS_OPT"
+##  - "L2XCFWD"
+##  - "not CFS_OPT"
+##  - "CFS_OPT"
+#  layout:
+#    title: "vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_features-ndr"
+#    layout: "plot-latency"
+#
+## Packet Latency - VPP vhost l2sw 2n-skx-xxv710 - base vm
+#- type: "plot"
+#  title: "VPP Latency: vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-vm-ndr-lat"
+#  algorithm: "plot_latency_error_bars"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-vm-ndr-lat"
+#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+#  filter: "'NIC_Intel-XXV710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           '2T1C' and
+#           ('L2BDMACLRN' or 'L2XCFWD') and
+#           'VHOST_1024' and
+#           not 'CFS_OPT' and
+#           not 'VXLAN' and
+#           not 'DOT1Q' and
+#           not 'IP4FWD'"
+#  parameters:
+#  - "latency"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "1VM"
+##  - "L2XCFWD"
+##  - "1VM"
+##  - "L2BDMACLRN"
+#  layout:
+#    title: "vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-vm-ndr"
+#    layout: "plot-latency"
+#
+#- type: "plot"
+#  title: "VPP Latency: vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-ndr-lat"
+#  algorithm: "plot_latency_error_bars"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-ndr-lat"
+#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+#  filter: "'NIC_Intel-XXV710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           '4T2C' and
+#           ('L2BDMACLRN' or 'L2XCFWD') and
+#           'VHOST_1024' and
+#           not 'CFS_OPT' and
+#           not 'VXLAN' and
+#           not 'DOT1Q' and
+#           not 'IP4FWD'"
+#  parameters:
+#  - "latency"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "1VM"
+##  - "L2XCFWD"
+##  - "1VM"
+##  - "L2BDMACLRN"
+#  layout:
+#    title: "vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-ndr"
+#    layout: "plot-latency"
+
 ################################################################################
 
 # Packet Latency - VPP VTS 3n-hsw-x520
--
-  type: "plot"
+- 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-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '114B' and
            'NDRPDR' and
@@ -20528,13 +21560,12 @@
     title: "vts-3n-hsw-x520-114b-1t1c-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- 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-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '114B' and
            'NDRPDR' and
@@ -20551,8 +21582,7 @@
 ################################################################################
 
 # Packet Latency - DPDK l3fwd 3n-hsw-x520
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Latency: l3fwd-3n-hsw-x520-64b-1t1c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
@@ -20572,8 +21602,7 @@
     title: "l3fwd-3n-hsw-x520-64b-1t1c-base-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Latency: l3fwd-3n-hsw-x520-64b-2t2c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
@@ -20594,8 +21623,7 @@
     layout: "plot-latency"
 
 # Packet Latency - DPDK l3fwd 3n-hsw-x710
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Latency: l3fwd-3n-hsw-x710-64b-1t1c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
@@ -20615,8 +21643,7 @@
     title: "l3fwd-3n-hsw-x710-64b-1t1c-base-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Latency: l3fwd-3n-hsw-x710-64b-2t2c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
@@ -20637,8 +21664,7 @@
     layout: "plot-latency"
 
 # Packet Latency - DPDK l3fwd 3n-hsw-xl710
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Latency: l3fwd-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
@@ -20658,8 +21684,7 @@
     title: "l3fwd-3n-hsw-xl710-64b-1t1c-base-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Latency: l3fwd-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
@@ -20680,8 +21705,7 @@
     layout: "plot-latency"
 
 # Packet Latency - DPDK l3fwd 3n-skx-x710
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Latency: l3fwd-3n-skx-x710-64b-2t1c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
@@ -20701,8 +21725,7 @@
     title: "l3fwd-3n-skx-x710-64b-2t1c-base-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Latency: l3fwd-3n-skx-x710-64b-4t2c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
@@ -20723,8 +21746,7 @@
     layout: "plot-latency"
 
 # Packet Latency - DPDK l3fwd 3n-skx-xxv710
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Latency: l3fwd-3n-skx-xxv710-64b-2t1c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
@@ -20744,8 +21766,7 @@
     title: "l3fwd-3n-skx-xxv710-64b-2t1c-base-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Latency: l3fwd-3n-skx-xxv710-64b-4t2c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
@@ -20766,8 +21787,7 @@
     layout: "plot-latency"
 
 # Packet Latency - DPDK l3fwd 2n-skx-x710
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Latency: l3fwd-2n-skx-x710-64b-2t1c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
@@ -20787,8 +21807,7 @@
     title: "l3fwd-2n-skx-x710-64b-2t1c-base-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Latency: l3fwd-2n-skx-x710-64b-4t2c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
@@ -20809,8 +21828,7 @@
     layout: "plot-latency"
 
 # Packet Latency - DPDK l3fwd 2n-skx-xxv710
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Latency: l3fwd-2n-skx-xxv710-64b-2t1c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
@@ -20830,8 +21848,7 @@
     title: "l3fwd-2n-skx-xxv710-64b-2t1c-base-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Latency: l3fwd-2n-skx-xxv710-64b-4t2c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
@@ -20854,8 +21871,7 @@
 ################################################################################
 
 # Packet Latency - DPDK testpmd 3n-hsw-x520
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Latency: testpmd-3n-hsw-x520-64b-1t1c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
@@ -20875,8 +21891,7 @@
     title: "testpmd-3n-hsw-x520-64b-1t1c-base-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Latency: testpmd-3n-hsw-x520-64b-2t2c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
@@ -20897,8 +21912,7 @@
     layout: "plot-latency"
 
 # Packet Latency - DPDK testpmd 3n-hsw-x710
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Latency: testpmd-3n-hsw-x710-64b-1t1c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
@@ -20918,8 +21932,7 @@
     title: "testpmd-3n-hsw-x710-64b-1t1c-base-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Latency: testpmd-3n-hsw-x710-64b-2t2c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
@@ -20940,8 +21953,7 @@
     layout: "plot-latency"
 
 # Packet Latency - DPDK testpmd 3n-hsw-xl710
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Latency: testpmd-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
@@ -20961,8 +21973,7 @@
     title: "testpmd-3n-hsw-xl710-64b-1t1c-base-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Latency: testpmd-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
@@ -20983,8 +21994,7 @@
     layout: "plot-latency"
 
 # Packet Latency - DPDK testpmd 3n-skx-x710
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Latency: testpmd-3n-skx-x710-64b-2t1c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
@@ -21004,8 +22014,7 @@
     title: "testpmd-3n-skx-x710-64b-2t1c-base-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Latency: testpmd-3n-skx-x710-64b-4t2c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
@@ -21026,8 +22035,7 @@
     layout: "plot-latency"
 
 # Packet Latency - DPDK testpmd 3n-skx-xxv710
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Latency: testpmd-3n-skx-xxv710-64b-2t1c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
@@ -21047,8 +22055,7 @@
     title: "testpmd-3n-skx-xxv710-64b-2t1c-base-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Latency: testpmd-3n-skx-xxv710-64b-4t2c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
@@ -21069,8 +22076,7 @@
     layout: "plot-latency"
 
 # Packet Latency - DPDK testpmd 2n-skx-x710
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Latency: testpmd-2n-skx-x710-64b-2t1c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
@@ -21090,8 +22096,7 @@
     title: "testpmd-2n-skx-x710-64b-2t1c-base-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Latency: testpmd-2n-skx-x710-64b-4t2c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
@@ -21112,8 +22117,7 @@
     layout: "plot-latency"
 
 # Packet Latency - DPDK testpmd 2n-skx-xxv710
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Latency: testpmd-2n-skx-xxv710-64b-2t1c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
@@ -21133,8 +22137,7 @@
     title: "testpmd-2n-skx-xxv710-64b-2t1c-base-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Latency: testpmd-2n-skx-xxv710-64b-4t2c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
@@ -21157,18 +22160,17 @@
 ################################################################################
 
 # Speedup - VPP Container Memif 3n-hsw-x520
--
-  type: "plot"
-  title: "Speedup: memif-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
+- 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_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  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') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
@@ -21182,22 +22184,22 @@
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
+  - "IP4FWD"
   layout:
-    title: "memif-3n-hsw-x520-64b-base_and_scale-ndr"
+    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_scale-pdr-tsa"
+- 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_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  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') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
@@ -21211,23 +22213,23 @@
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
+  - "IP4FWD"
   layout:
-    title: "memif-3n-hsw-x520-64b-base_and_scale-pdr"
+    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_scale-ndr-tsa"
+- 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_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  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') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
@@ -21241,22 +22243,22 @@
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
+  - "IP4FWD"
   layout:
-    title: "memif-3n-hsw-x710-64b-base_and_scale-ndr"
+    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_scale-pdr-tsa"
+- 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_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  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') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
@@ -21270,23 +22272,23 @@
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
+  - "IP4FWD"
   layout:
-    title: "memif-3n-hsw-x710-64b-base_and_scale-pdr"
+    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_scale-ndr-tsa"
+- 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_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  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') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
@@ -21300,22 +22302,22 @@
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
+  - "IP4FWD"
   layout:
-    title: "memif-3n-hsw-xl710-64b-base_and_scale-ndr"
+    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_scale-pdr-tsa"
+- 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_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  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') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
@@ -21329,23 +22331,23 @@
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
+  - "IP4FWD"
   layout:
-    title: "memif-3n-hsw-xl710-64b-base_and_scale-pdr"
+    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_scale-ndr-tsa"
+- type: "plot"
+  title: "Speedup: memif-3n-skx-x710-64b-base_and_features-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
+  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
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
@@ -21359,24 +22361,24 @@
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
+  - "IP4FWD"
   layout:
-    title: "memif-3n-skx-x710-64b-base_and_scale-ndr"
+    title: "memif-3n-skx-x710-64b-base_and_features-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
-  title: "Speedup: memif-3n-skx-x710-64b-base_and_scale-pdr-tsa"
+- type: "plot"
+  title: "Speedup: memif-3n-skx-x710-64b-base_and_features-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
+  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
            ('BASE' or 'SCALE') and
            'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
-            'MEMIF'"
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
@@ -21388,24 +22390,25 @@
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
+  - "IP4FWD"
   layout:
-    title: "memif-3n-skx-x710-64b-base_and_scale-pdr"
+    title: "memif-3n-skx-x710-64b-base_and_features-pdr"
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP Container Memif 2n-skx-x710
--
-  type: "plot"
-  title: "Speedup: memif-2n-skx-x710-64b-base_and_scale-ndr-tsa"
+- 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_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
+  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') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
+           not 'NF_DENSITY' and
            'MEMIF'"
   parameters:
   - "throughput"
@@ -21418,53 +22421,24 @@
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
+  - "IP4FWD"
   layout:
-    title: "memif-2n-skx-x710-64b-base_and_scale-ndr"
+    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_scale-pdr-tsa"
+- 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_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
+  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') and
-           not 'VHOST' and
-            'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  layout:
-    title: "memif-2n-skx-x710-64b-base_and_scale-pdr"
-    layout: "plot-throughput-speedup-analysis"
-
-# Speedup - VPP Container Memif 2n-skx-xxv710
--
-  type: "plot"
-  title: "Speedup: memif-2n-skx-xxv710-64b-base_and_scale-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-xxv710-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
+           not 'NF_DENSITY' and
            'MEMIF'"
   parameters:
   - "throughput"
@@ -21477,55 +22451,86 @@
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
+  - "IP4FWD"
   layout:
-    title: "memif-2n-skx-xxv710-64b-base_and_scale-ndr"
+    title: "memif-2n-skx-x710-64b-base_and_features-pdr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
-  title: "Speedup: memif-2n-skx-xxv710-64b-base_and_scale-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-xxv710-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-            'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  layout:
-    title: "memif-2n-skx-xxv710-64b-base_and_scale-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"
+- 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"
+  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            'L2XCFWD' and
            not 'VHOST' and
+           not 'NF_DENSITY' and
            'MEMIF'"
   parameters:
   - "throughput"
@@ -21541,19 +22546,19 @@
     title: "k8s-memif-3n-hsw-x520-64b-base_and_scale-ndr-l2xc"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- 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"
+  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            'L2XCFWD' and
            not 'VHOST' and
+           not 'NF_DENSITY' and
            'MEMIF'"
   parameters:
   - "throughput"
@@ -21570,19 +22575,19 @@
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP Container k8s memif 3n-hsw-x520 - l2bd
--
-  type: "plot"
+- 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"
+  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            ('L2BDMACSTAT' or 'L2BDMACLRN') and
            not 'VHOST' and
+           not 'NF_DENSITY' and
            'MEMIF'"
   parameters:
   - "throughput"
@@ -21598,19 +22603,19 @@
     title: "k8s-memif-3n-hsw-x520-64b-base_and_scale-ndr-l2bd"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- 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"
+  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            ('L2BDMACSTAT' or 'L2BDMACLRN') and
            not 'VHOST' and
+           not 'NF_DENSITY' and
            'MEMIF'"
   parameters:
   - "throughput"
@@ -21627,19 +22632,19 @@
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP Container Memif 3n-hsw-x710 - l2xc
--
-  type: "plot"
+- 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"
+  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            'L2XCFWD' and
            not 'VHOST' and
+           not 'NF_DENSITY' and
            'MEMIF'"
   parameters:
   - "throughput"
@@ -21655,19 +22660,19 @@
     title: "k8s-memif-3n-hsw-x710-64b-base_and_scale-l2xc-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- 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"
+  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            'L2XCFWD' and
            not 'VHOST' and
+           not 'NF_DENSITY' and
            'MEMIF'"
   parameters:
   - "throughput"
@@ -21684,19 +22689,19 @@
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP Container Memif 3n-hsw-x710 - l2bd
--
-  type: "plot"
+- 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"
+  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            ('L2BDMACSTAT' or 'L2BDMACLRN') and
            not 'VHOST' and
+           not 'NF_DENSITY' and
            'MEMIF'"
   parameters:
   - "throughput"
@@ -21712,19 +22717,19 @@
     title: "k8s-memif-3n-hsw-x710-64b-base_and_scale-l2bd-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- 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"
+  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            ('L2BDMACSTAT' or 'L2BDMACLRN') and
            not 'VHOST' and
+           not 'NF_DENSITY' and
            'MEMIF'"
   parameters:
   - "throughput"
@@ -21743,25 +22748,26 @@
 ################################################################################
 
 # Speedup - VPP IPv4 3n-hsw-x520 base and scale
--
-  type: "plot"
+- 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-throughput-speedup-analysis-3n-hsw"
+  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"
@@ -21770,25 +22776,26 @@
     title: "ip4-3n-hsw-x520-64b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- 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-throughput-speedup-analysis-3n-hsw"
+  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"
@@ -21798,20 +22805,19 @@
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP IPv4 3n-hsw-x520 features
--
-  type: "plot"
+- 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-throughput-speedup-analysis-3n-hsw"
+  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
+            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
            'NDRPDR' and
            'IP4FWD' and
            not 'IPSEC' and
@@ -21821,6 +22827,7 @@
   - "parent"
   - "tags"
   sort:
+  - "DOT1Q"
   - "IP4BASE"
   - "NAT44"
   - "POLICE_MARK"
@@ -21831,20 +22838,19 @@
     title: "ip4-3n-hsw-x520-64b-features-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- 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-throughput-speedup-analysis-3n-hsw"
+  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
+            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
            'NDRPDR' and
            'IP4FWD' and
            not 'IPSEC' and
@@ -21854,6 +22860,7 @@
   - "parent"
   - "tags"
   sort:
+  - "DOT1Q"
   - "IP4BASE"
   - "NAT44"
   - "POLICE_MARK"
@@ -21865,18 +22872,18 @@
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP IPv4 3n-hsw-x520 features nat44
--
-  type: "plot"
+- 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-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
            'IP4FWD' and
-           'NAT44' and
+           ('NAT44' or 'IP4BASE') and
+           not 'DOT1Q' and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -21884,7 +22891,7 @@
   - "parent"
   - "tags"
   sort:
-  - "BASE"
+  - "IP4BASE"
   - "BASE"
   - "SRC_USER_10"
   - "SRC_USER_100"
@@ -21894,18 +22901,18 @@
     title: "ip4-3n-hsw-x520-64b-features-nat44-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- 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-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
            'IP4FWD' and
-           'NAT44' and
+           ('NAT44' or 'IP4BASE') and
+           not 'DOT1Q' and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -21913,7 +22920,7 @@
   - "parent"
   - "tags"
   sort:
-  - "BASE"
+  - "IP4BASE"
   - "BASE"
   - "SRC_USER_10"
   - "SRC_USER_100"
@@ -21924,26 +22931,26 @@
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP IPv4 3n-hsw-x520 features iacl
--
-  type: "plot"
+- 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-throughput-speedup-analysis-3n-hsw"
+  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' 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"
@@ -21952,26 +22959,26 @@
     title: "ip4-3n-hsw-x520-64b-features-iacl-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- 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-throughput-speedup-analysis-3n-hsw"
+  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' 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"
@@ -21981,26 +22988,26 @@
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP IPv4 3n-hsw-x520 features oacl
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: ip4-3n-hsw-x520-64b-features-oacl-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-features-oacl-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
            'IP4FWD' and
-           'OACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' 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"
@@ -22009,26 +23016,26 @@
     title: "ip4-3n-hsw-x520-64b-features-oacl-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: ip4-3n-hsw-x520-64b-features-oacl-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-features-oacl-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
            'IP4FWD' and
-           'OACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' 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"
@@ -22038,19 +23045,19 @@
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP IPv4 3n-hsw-x710 base and scale
--
-  type: "plot"
+- 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-throughput-speedup-analysis-3n-hsw"
+  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"
@@ -22065,19 +23072,19 @@
     title: "ip4-3n-hsw-x710-64b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- 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-throughput-speedup-analysis-3n-hsw"
+  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"
@@ -22093,20 +23100,19 @@
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP IPv4 3n-hsw-x710 features
--
-  type: "plot"
+- 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-throughput-speedup-analysis-3n-hsw"
+  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
+            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
            'NDRPDR' and
            'IP4FWD' and
            not 'IPSEC' and
@@ -22116,6 +23122,7 @@
   - "parent"
   - "tags"
   sort:
+  - "DOT1Q"
   - "IP4BASE"
   - "NAT44"
   - "POLICE_MARK"
@@ -22126,20 +23133,19 @@
     title: "ip4-3n-hsw-x710-64b-features-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- 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-throughput-speedup-analysis-3n-hsw"
+  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
+            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
            'NDRPDR' and
            'IP4FWD' and
            not 'IPSEC' and
@@ -22149,6 +23155,7 @@
   - "parent"
   - "tags"
   sort:
+  - "DOT1Q"
   - "IP4BASE"
   - "NAT44"
   - "POLICE_MARK"
@@ -22160,78 +23167,17 @@
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP IPv4 3n-hsw-x710 features nat44
--
-  type: "plot"
+- 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-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           'IP4FWD' and
-           'NAT44' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "BASE"
-  - "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-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           'IP4FWD' and
-           'NAT44' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "BASE"
-  - "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-throughput-speedup-analysis-3n-hsw"
+  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
-           'IACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           ('NAT44' or 'IP4BASE') and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -22239,27 +23185,27 @@
   - "parent"
   - "tags"
   sort:
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
+  - "IP4BASE"
+  - "BASE"
+  - "SRC_USER_10"
+  - "SRC_USER_100"
+  - "SRC_USER_1000"
+  - "SRC_USER_2000"
   layout:
-    title: "ip4-3n-hsw-x710-64b-features-iacl-ndr"
+    title: "ip4-3n-hsw-x710-64b-features-nat44-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
-  title: "Speedup: ip4-3n-hsw-x710-64b-features-iacl-pdr-tsa"
+- 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-iacl-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  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
-           'IACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           ('NAT44' or 'IP4BASE') and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -22267,28 +23213,28 @@
   - "parent"
   - "tags"
   sort:
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
+  - "IP4BASE"
+  - "BASE"
+  - "SRC_USER_10"
+  - "SRC_USER_100"
+  - "SRC_USER_1000"
+  - "SRC_USER_2000"
   layout:
-    title: "ip4-3n-hsw-x710-64b-features-iacl-pdr"
+    title: "ip4-3n-hsw-x710-64b-features-nat44-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP IPv4 3n-hsw-x710 features oacl
--
-  type: "plot"
-  title: "Speedup: ip4-3n-hsw-x710-64b-features-oacl-ndr-tsa"
+# 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-oacl-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  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
-           'OACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           (('IACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -22296,27 +23242,26 @@
   - "parent"
   - "tags"
   sort:
+  - "IP4BASE"
   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   layout:
-    title: "ip4-3n-hsw-x710-64b-features-oacl-ndr"
+    title: "ip4-3n-hsw-x710-64b-features-iacl-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
-  title: "Speedup: ip4-3n-hsw-x710-64b-features-oacl-pdr-tsa"
+- 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-oacl-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  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
-           'OACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           (('IACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -22324,22 +23269,22 @@
   - "parent"
   - "tags"
   sort:
+  - "IP4BASE"
   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   layout:
-    title: "ip4-3n-hsw-x710-64b-features-oacl-pdr"
+    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_and_scale-ndr-tsa"
+- 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_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  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
@@ -22357,16 +23302,15 @@
   - "FIB_200K"
   - "FIB_2M"
   layout:
-    title: "ip4-3n-hsw-xl710-64b-base_and_scale-ndr"
+    title: "ip4-3n-hsw-xl710-64b-base-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
-  title: "Speedup: ip4-3n-hsw-xl710-64b-base_and_scale-pdr-tsa"
+- 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_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  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
@@ -22384,23 +23328,23 @@
   - "FIB_200K"
   - "FIB_2M"
   layout:
-    title: "ip4-3n-hsw-xl710-64b-base_and_scale-pdr"
+    title: "ip4-3n-hsw-xl710-64b-base-pdr"
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP IPv4 3n-skx-x710 base and scale
--
-  type: "plot"
+- 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-throughput-speedup-analysis-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            'IP4FWD' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -22415,19 +23359,19 @@
     title: "ip4-3n-skx-x710-64b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: ip4-3n-skx-x710-64b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            'IP4FWD' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -22443,20 +23387,19 @@
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP IPv4 3n-skx-x710 features
--
-  type: "plot"
+- 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-throughput-speedup-analysis-3n-skx"
+  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
+            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
            'NDRPDR' and
            'IP4FWD' and
            not 'IPSEC' and
@@ -22466,6 +23409,7 @@
   - "parent"
   - "tags"
   sort:
+  - "DOT1Q"
   - "IP4BASE"
   - "NAT44"
   - "POLICE_MARK"
@@ -22476,20 +23420,19 @@
     title: "ip4-3n-skx-x710-64b-features-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: ip4-3n-skx-x710-64b-features-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-features-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
+  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
+            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
            'NDRPDR' and
            'IP4FWD' and
            not 'IPSEC' and
@@ -22499,6 +23442,7 @@
   - "parent"
   - "tags"
   sort:
+  - "DOT1Q"
   - "IP4BASE"
   - "NAT44"
   - "POLICE_MARK"
@@ -22510,18 +23454,17 @@
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP IPv4 3n-skx-x710 features nat44
--
-  type: "plot"
+- 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-throughput-speedup-analysis-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
            'IP4FWD' and
-           'NAT44' and
+           ('NAT44' or 'IP4BASE') and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -22529,7 +23472,7 @@
   - "parent"
   - "tags"
   sort:
-  - "BASE"
+  - "IP4BASE"
   - "BASE"
   - "SRC_USER_10"
   - "SRC_USER_100"
@@ -22539,18 +23482,17 @@
     title: "ip4-3n-skx-x710-64b-features-nat44-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: ip4-3n-skx-x710-64b-features-nat44-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-features-nat44-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
            'IP4FWD' and
-           'NAT44' and
+           ('NAT44' or 'IP4BASE') and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -22558,7 +23500,7 @@
   - "parent"
   - "tags"
   sort:
-  - "BASE"
+  - "IP4BASE"
   - "BASE"
   - "SRC_USER_10"
   - "SRC_USER_100"
@@ -22569,19 +23511,17 @@
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP IPv4 3n-skx-x710 features iacl
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: ip4-3n-skx-x710-64b-features-iacl-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-features-iacl-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
            'IP4FWD' and
-           'IACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           (('IACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -22589,6 +23529,7 @@
   - "parent"
   - "tags"
   sort:
+  - "IP4BASE"
   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   - "ACL_STATELESS"
@@ -22597,19 +23538,17 @@
     title: "ip4-3n-skx-x710-64b-features-iacl-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: ip4-3n-skx-x710-64b-features-iacl-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-features-iacl-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
            'IP4FWD' and
-           'IACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           (('IACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -22617,6 +23556,7 @@
   - "parent"
   - "tags"
   sort:
+  - "IP4BASE"
   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   - "ACL_STATELESS"
@@ -22625,76 +23565,128 @@
     title: "ip4-3n-skx-x710-64b-features-iacl-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP IPv4 3n-skx-x710 features oacl
--
-  type: "plot"
-  title: "Speedup: ip4-3n-skx-x710-64b-features-oacl-ndr-tsa"
+## Speedup - VPP IPv4 3n-skx-x710 features oacl
+#- type: "plot"
+#  title: "Speedup: ip4-3n-skx-x710-64b-features-oacl-ndr-tsa"
+#  algorithm: "plot_throughput_speedup_analysis"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-features-oacl-ndr-tsa"
+#  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           'IP4FWD' and
+#           'OACL' and
+#           ('ACL10' or 'ACL50') and '10K_FLOWS' and
+#           not 'IPSEC' and
+#           not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "ACL_STATELESS"
+#  - "ACL_STATEFUL"
+#  - "ACL_STATELESS"
+#  - "ACL_STATEFUL"
+#  layout:
+#    title: "ip4-3n-skx-x710-64b-features-oacl-ndr"
+#    layout: "plot-throughput-speedup-analysis"
+#
+#- type: "plot"
+#  title: "Speedup: ip4-3n-skx-x710-64b-features-oacl-pdr-tsa"
+#  algorithm: "plot_throughput_speedup_analysis"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-features-oacl-pdr-tsa"
+#  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           'IP4FWD' and
+#           'OACL' and
+#           ('ACL10' or 'ACL50') and '10K_FLOWS' and
+#           not 'IPSEC' and
+#           not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "ACL_STATELESS"
+#  - "ACL_STATEFUL"
+#  - "ACL_STATELESS"
+#  - "ACL_STATEFUL"
+#  layout:
+#    title: "ip4-3n-skx-x710-64b-features-oacl-pdr"
+#    layout: "plot-throughput-speedup-analysis"
+
+# 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-3n-skx-x710-64b-features-oacl-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-base_and_scale-ndr-tsa"
+  data: "plot-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
-           'OACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
+  - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   layout:
-    title: "ip4-3n-skx-x710-64b-features-oacl-ndr"
+    title: "ip4-2n-skx-x710-64b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
-  title: "Speedup: ip4-3n-skx-x710-64b-features-oacl-pdr-tsa"
+- 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-3n-skx-x710-64b-features-oacl-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-base_and_scale-pdr-tsa"
+  data: "plot-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
-           'OACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
+  - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   layout:
-    title: "ip4-3n-skx-x710-64b-features-oacl-pdr"
+    title: "ip4-2n-skx-x710-64b-base_and_scale-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"
+# 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-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
+  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
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') 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:
@@ -22703,25 +23695,25 @@
   - "tags"
   sort:
   - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
   layout:
-    title: "ip4-2n-skx-x710-64b-base_and_scale-ndr"
+    title: "ip4-2n-skx-x710-64b-features-iacl-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
-  title: "Speedup: ip4-2n-skx-x710-64b-base_and_scale-pdr-tsa"
+- 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-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
+  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
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') 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:
@@ -22730,27 +23722,28 @@
   - "tags"
   sort:
   - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
   layout:
-    title: "ip4-2n-skx-x710-64b-base_and_scale-pdr"
+    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"
+- 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-throughput-speedup-analysis-2n-skx"
+  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"
@@ -22765,19 +23758,19 @@
     title: "ip4-2n-skx-xxv710-64b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- 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-throughput-speedup-analysis-2n-skx"
+  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"
@@ -22792,80 +23785,67 @@
     title: "ip4-2n-skx-xxv710-64b-base_and_scale-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-################################################################################
-
-# Speedup - VPP IPv4 Tunnels 3n-hsw-x520
--
-  type: "plot"
-  title: "Speedup: ip4tun-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
+# 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]}/ip4tun-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X520_DA2' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-dnv-x553-64b-base-ndr-tsa"
+  data: "intel-dnv-vpp"
+  filter: "'NIC_Intel-X553' and
            '64B' and
-           'ENCAP' and
+           'IP4BASE' and
            'NDRPDR' and
-           'VXLAN' and
-           'L2BDMACLRN' and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "not DOT1Q"
-  - "VXLAN_1"
-  - "VXLAN_10"
-  - "VXLAN_100"
-  - "VXLAN_1000"
+  - "IP4BASE"
   layout:
-    title: "ip4tun-3n-hsw-x520-64b-base_and_scale-ndr"
+    title: "ip4-2n-dnv-x553-64b-base-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
-  title: "Speedup: ip4tun-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
+- 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]}/ip4tun-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X520_DA2' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-dnv-x553-64b-base-pdr-tsa"
+  data: "intel-dnv-vpp"
+  filter: "'NIC_Intel-X553' and
            '64B' and
-           'ENCAP' and
+           'IP4BASE' and
            'NDRPDR' and
-           'VXLAN' and
-           'L2BDMACLRN' and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "not DOT1Q"
-  - "VXLAN_1"
-  - "VXLAN_10"
-  - "VXLAN_100"
-  - "VXLAN_1000"
+  - "IP4BASE"
   layout:
-    title: "ip4tun-3n-hsw-x520-64b-base_and_scale-pdr"
+    title: "ip4-2n-dnv-x553-64b-base-pdr"
     layout: "plot-throughput-speedup-analysis"
 
+################################################################################
+
 # Speedup - VPP IPv4 Tunnels 3n-hsw-x520 - features
--
-  type: "plot"
+- 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-throughput-speedup-analysis-3n-hsw"
+  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') and
+           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
            not 'DOT1Q' and
            not 'VHOST' and
            not 'IPSECHW'"
@@ -22874,6 +23854,7 @@
   - "parent"
   - "tags"
   sort:
+  - "IP4BASE"
   - "L2BDMACLRN"
   - "L2XCFWD"
   - "LISP"
@@ -22881,18 +23862,17 @@
     title: "ip4tun-3n-hsw-x520-64b-base_and_features-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- 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-throughput-speedup-analysis-3n-hsw"
+  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') and
+           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
            not 'DOT1Q' and
            not 'VHOST' and
            not 'IPSECHW'"
@@ -22901,6 +23881,7 @@
   - "parent"
   - "tags"
   sort:
+  - "IP4BASE"
   - "L2BDMACLRN"
   - "L2XCFWD"
   - "LISP"
@@ -22909,19 +23890,17 @@
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP IPv4 Tunnels 3n-hsw-x710
--
-  type: "plot"
+- 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-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
            'NDRPDR' and
-           'VXLAN' and
-           'L2BDMACLRN' and
+           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
            not 'VHOST' and
            not 'IPSECHW'"
   parameters:
@@ -22929,7 +23908,8 @@
   - "parent"
   - "tags"
   sort:
-  - "not DOT1Q"
+  - "IP4BASE"
+  - "LISP"
   - "VXLAN_1"
   - "VXLAN_10"
   - "VXLAN_100"
@@ -22938,19 +23918,17 @@
     title: "ip4tun-3n-hsw-x710-64b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- 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-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
            'NDRPDR' and
-           'VXLAN' and
-           'L2BDMACLRN' and
+           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
            not 'VHOST' and
            not 'IPSECHW'"
   parameters:
@@ -22958,7 +23936,8 @@
   - "parent"
   - "tags"
   sort:
-  - "not DOT1Q"
+  - "IP4BASE"
+  - "LISP"
   - "VXLAN_1"
   - "VXLAN_10"
   - "VXLAN_100"
@@ -22968,18 +23947,17 @@
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP IPv4 Tunnels 3n-hsw-x710 - features
--
-  type: "plot"
+- 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-throughput-speedup-analysis-3n-hsw"
+  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') and
+           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP' or 'IP4BASE') and
            not 'DOT1Q' and
            not 'VHOST' and
            not 'IPSECHW'"
@@ -22988,6 +23966,7 @@
   - "parent"
   - "tags"
   sort:
+  - "IP4BASE"
   - "L2BDMACLRN"
   - "L2XCFWD"
   - "LISP"
@@ -22995,18 +23974,17 @@
     title: "ip4tun-3n-hsw-x710-64b-base_and_features-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- 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-throughput-speedup-analysis-3n-hsw"
+  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') and
+           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP' or 'IP4BASE') and
            not 'DOT1Q' and
            not 'VHOST' and
            not 'IPSECHW'"
@@ -23015,6 +23993,7 @@
   - "parent"
   - "tags"
   sort:
+  - "IP4BASE"
   - "L2BDMACLRN"
   - "L2XCFWD"
   - "LISP"
@@ -23023,19 +24002,17 @@
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP IPv4 Tunnels 3n-skx-x710
--
-  type: "plot"
+- 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-throughput-speedup-analysis-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
            'NDRPDR' and
-           'VXLAN' and
-           'L2BDMACLRN' and
+           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
            not 'VHOST' and
            not 'IPSECHW'"
   parameters:
@@ -23043,7 +24020,8 @@
   - "parent"
   - "tags"
   sort:
-  - "not DOT1Q"
+  - "IP4BASE"
+  - "LISP"
   - "VXLAN_1"
   - "VXLAN_10"
   - "VXLAN_100"
@@ -23052,19 +24030,17 @@
     title: "ip4tun-3n-skx-x710-64b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: ip4tun-3n-skx-x710-64b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
            'NDRPDR' and
-           'VXLAN' and
-           'L2BDMACLRN' and
+           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
            not 'VHOST' and
            not 'IPSECHW'"
   parameters:
@@ -23072,7 +24048,8 @@
   - "parent"
   - "tags"
   sort:
-  - "not DOT1Q"
+  - "IP4BASE"
+  - "LISP"
   - "VXLAN_1"
   - "VXLAN_10"
   - "VXLAN_100"
@@ -23082,18 +24059,17 @@
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP IPv4 Tunnels 3n-skx-x710 - features
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: ip4tun-3n-skx-x710-64b-base_and_features-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-base_and_features-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
+  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') and
+           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
            not 'DOT1Q' and
            not 'VHOST' and
            not 'IPSECHW'"
@@ -23102,6 +24078,7 @@
   - "parent"
   - "tags"
   sort:
+  - "IP4BASE"
   - "L2BDMACLRN"
   - "L2XCFWD"
   - "LISP"
@@ -23109,18 +24086,17 @@
     title: "ip4tun-3n-skx-x710-64b-base_and_features-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- 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]}/ip4tun-3n-skx-x710-64b-base_and_features-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
+  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') and
+           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
            not 'DOT1Q' and
            not 'VHOST' and
            not 'IPSECHW'"
@@ -23129,6 +24105,7 @@
   - "parent"
   - "tags"
   sort:
+  - "IP4BASE"
   - "L2BDMACLRN"
   - "L2XCFWD"
   - "LISP"
@@ -23139,13 +24116,12 @@
 ################################################################################
 
 # Speedup - VPP IPv6 3n-hsw-x520
--
-  type: "plot"
-  title: "Speedup: ip6-3n-hsw-x520-78b-base_and_scale-ndr-tsa"
+- 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_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  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
@@ -23164,16 +24140,15 @@
   - "FIB_200K"
   - "FIB_2M"
   layout:
-    title: "ip6-3n-hsw-x520-78b-base_and_scale-ndr"
+    title: "ip6-3n-hsw-x520-78b-base-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
-  title: "Speedup: ip6-3n-hsw-x520-78b-base_and_scale-pdr-tsa"
+- 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_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  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
@@ -23192,80 +24167,16 @@
   - "FIB_200K"
   - "FIB_2M"
   layout:
-    title: "ip6-3n-hsw-x520-78b-base_and_scale-pdr"
-    layout: "plot-throughput-speedup-analysis"
-
-# Speedup - VPP IPv6 3n-hsw-x520 features
--
-  type: "plot"
-  title: "Speedup: ip6-3n-hsw-x520-78b-base_and_features-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-base_and_features-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' 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-x520-78b-base_and_features-ndr"
-    layout: "plot-throughput-speedup-analysis"
-
--
-  type: "plot"
-  title: "Speedup: ip6-3n-hsw-x520-78b-base_and_features-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-base_and_features-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' 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-x520-78b-base_and_features-pdr"
+    title: "ip6-3n-hsw-x520-78b-base-pdr"
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP IPv6 3n-hsw-x710
--
-  type: "plot"
+- 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-throughput-speedup-analysis-3n-hsw"
+  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
@@ -23287,13 +24198,12 @@
     title: "ip6-3n-hsw-x710-78b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- 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-throughput-speedup-analysis-3n-hsw"
+  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
@@ -23316,13 +24226,12 @@
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP IPv6 3n-hsw-x710 features
--
-  type: "plot"
+- 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-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('IP6BASE' or
@@ -23347,13 +24256,12 @@
     title: "ip6-3n-hsw-x710-78b-base_and_features-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- 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-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('IP6BASE' or
@@ -23379,13 +24287,12 @@
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP IPv6 3n-hsw-xl710
--
-  type: "plot"
-  title: "Speedup: ip6-3n-hsw-xl710-78b-base_and_scale-ndr-tsa"
+- 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_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  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
@@ -23404,16 +24311,15 @@
   - "FIB_200K"
   - "FIB_2M"
   layout:
-    title: "ip6-3n-hsw-xl710-78b-base_and_scale-ndr"
+    title: "ip6-3n-hsw-xl710-78b-base-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
-  title: "Speedup: ip6-3n-hsw-xl710-78b-base_and_scale-pdr-tsa"
+- 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_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  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
@@ -23432,17 +24338,16 @@
   - "FIB_200K"
   - "FIB_2M"
   layout:
-    title: "ip6-3n-hsw-xl710-78b-base_and_scale-pdr"
+    title: "ip6-3n-hsw-xl710-78b-base-pdr"
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP IPv6 3n-skx-x710
--
-  type: "plot"
+- 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]}/ip6-3n-skx-x710-78b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
+  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
@@ -23464,13 +24369,12 @@
     title: "ip6-3n-skx-x710-78b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- 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]}/ip6-3n-skx-x710-78b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
+  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
@@ -23493,13 +24397,12 @@
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP IPv6 3n-skx-x710 features
--
-  type: "plot"
-  title: "Speedup: ip6-3n-skx-x710-78b-base_and_scale-ndr-tsa"
+- 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]}/ip6-3n-skx-x710-78b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
+  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
@@ -23521,22 +24424,76 @@
   - "COPWHLIST"
   - "IACLDST"
   layout:
-    title: "ip6-3n-skx-x710-78b-base_and_scale-ndr"
+    title: "ip6-3n-skx-x710-78b-base_and_features-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
-  title: "Speedup: ip6-3n-skx-x710-78b-base_and_scale-pdr-tsa"
+- type: "plot"
+  title: "Speedup: ip6-3n-skx-x710-78b-base_and_features-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
+  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
+           ('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-skx-x710-78b-base_and_features-pdr"
+    layout: "plot-throughput-speedup-analysis"
+
+# 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"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-xxv710-78b-base_and_scale-ndr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-XXV710' and
+           '78B' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           '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-skx-xxv710-78b-base_and_scale-ndr"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: ip6-3n-skx-xxv710-78b-base_and_scale-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-xxv710-78b-base_and_scale-pdr-tsa"
+  data: "plot-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
            'IP6FWD' and
            not 'SRv6' and
@@ -23548,21 +24505,20 @@
   - "tags"
   sort:
   - "IP6BASE"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACLDST"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   layout:
-    title: "ip6-3n-skx-x710-78b-base_and_scale-pdr"
+    title: "ip6-3n-skx-xxv710-78b-base_and_scale-pdr"
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP IPv6 2n-skx-x710
--
-  type: "plot"
+- 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-throughput-speedup-analysis-2n-skx"
+  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
@@ -23584,13 +24540,12 @@
     title: "ip6-2n-skx-x710-78b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- 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-throughput-speedup-analysis-2n-skx"
+  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
@@ -23613,13 +24568,12 @@
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP IPv6 2n-skx-xxv710
--
-  type: "plot"
+- 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-throughput-speedup-analysis-2n-skx"
+  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
@@ -23641,13 +24595,12 @@
     title: "ip6-2n-skx-xxv710-78b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- 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-throughput-speedup-analysis-2n-skx"
+  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
@@ -23669,142 +24622,118 @@
     title: "ip6-2n-skx-xxv710-78b-base_and_scale-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-################################################################################
-
-# Speedup - VPP IPv6 tunnels 3n-hsw-x520
--
-  type: "plot"
-  title: "Speedup: ip6tun-3n-hsw-x520-78b-base_and_scale-ndr-tsa"
+# 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]}/ip6tun-3n-hsw-x520-78b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-2n-dnv-x553-78b-base-ndr-tsa"
+  data: "intel-dnv-vpp"
+  filter: "'NIC_Intel-X553' and
            '78B' and
-           'ENCAP' and
+           'IP6BASE' and
            'NDRPDR' and
-           'LISP' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP4UNRLAY"
-  - "IP6UNRLAY"
+  - "IP6BASE"
   layout:
-    title: "ip6tun-3n-hsw-x520-78b-base_and_scale-ndr"
+    title: "ip6-2n-dnv-x553-78b-base-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
-  title: "Speedup: ip6tun-3n-hsw-x520-78b-base_and_scale-pdr-tsa"
+- 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]}/ip6tun-3n-hsw-x520-78b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-2n-dnv-x553-78b-base-pdr-tsa"
+  data: "intel-dnv-vpp"
+  filter: "'NIC_Intel-X553' and
            '78B' and
-           'ENCAP' and
+           'IP6BASE' and
            'NDRPDR' and
-           'LISP' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP4UNRLAY"
-  - "IP6UNRLAY"
+  - "IP6BASE"
   layout:
-    title: "ip6tun-3n-hsw-x520-78b-base_and_scale-pdr"
+    title: "ip6-2n-dnv-x553-78b-base-pdr"
     layout: "plot-throughput-speedup-analysis"
 
 ################################################################################
 
-# Speedup - VPP IPSec 3n-hsw-xl710 base
--
-  type: "plot"
-  title: "Speedup: ipsec-3n-hsw-xl710-64b-base-ndr-tsa"
+# Speedup - VPP 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]}/ipsec-3n-hsw-xl710-64b-base-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'IP4FWD' and
+  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
-           'BASE' and
-           'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
+           'LISP' and
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "IP4UNRLAY"
+  - "IP6UNRLAY"
   layout:
-    title: "ipsec-3n-hsw-xl710-64b-base-ndr"
+    title: "ip6tun-3n-hsw-x520-78b-base-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
-  title: "Speedup: ipsec-3n-hsw-xl710-64b-base-pdr-tsa"
+- 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]}/ipsec-3n-hsw-xl710-64b-base-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'IP4FWD' and
+  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
-           'BASE' and
-           'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
+           'LISP' and
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "IP4UNRLAY"
+  - "IP6UNRLAY"
   layout:
-    title: "ipsec-3n-hsw-xl710-64b-base-pdr"
+    title: "ip6tun-3n-hsw-x520-78b-base-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP IPSec 3n-hsw-xl710 scale
--
-  type: "plot"
-  title: "Speedup: ipsec-3n-hsw-xl710-64b-scale-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'IP4FWD' and
-           'NDRPDR' and
-           'SCALE' and
-           'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  layout:
-    title: "ipsec-3n-hsw-xl710-64b-scale-ndr"
-    layout: "plot-throughput-speedup-analysis"
+################################################################################
 
--
-  type: "plot"
-  title: "Speedup: ipsec-3n-hsw-xl710-64b-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]}/ipsec-3n-hsw-xl710-64b-scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  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
            'IP4FWD' and
            'NDRPDR' and
-           'SCALE' and
+           'BASE' and
            'IPSECHW' and
            ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
@@ -23813,403 +24742,172 @@
   - "parent"
   - "tags"
   layout:
-    title: "ipsec-3n-hsw-xl710-64b-scale-pdr"
-    layout: "plot-throughput-speedup-analysis"
-
-# Speedup - VPP IPSec 3n-hsw-xl710 sw
--
-  type: "plot"
-  title: "Speedup: ipsec-3n-hsw-xl710-64b-sw-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-sw-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'IP4FWD' and
-           'NDRPDR' and
-           'IPSECSW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  layout:
-    title: "ipsec-3n-hsw-xl710-64b-sw-ndr"
-    layout: "plot-throughput-speedup-analysis"
-
--
-  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]}/ipsec-3n-hsw-xl710-64b-sw-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'IP4FWD' and
-           'NDRPDR' and
-           'IPSECSW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  layout:
-    title: "ipsec-3n-hsw-xl710-64b-sw-pdr"
-    layout: "plot-throughput-speedup-analysis"
-
-################################################################################
-
-# 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]}/srv6-3n-hsw-x520-78b-features-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           'FEATURE' and
-           'NDRPDR' and
-           'IP6FWD' and
-           'SRv6'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  layout:
-    title: "srv6-3n-hsw-x520-78b-features-ndr"
-    layout: "plot-throughput-speedup-analysis"
-
--
-  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]}/srv6-3n-hsw-x520-78b-features-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           'FEATURE' and
-           'NDRPDR' and
-           '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-throughput-speedup-analysis-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:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "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-throughput-speedup-analysis-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:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "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-throughput-speedup-analysis-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"
+    title: "ipsec-3n-hsw-xl710-64b-base-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
-  title: "Speedup: l2sw-3n-hsw-x520-64b-features-pdr-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-3n-hsw-x520-64b-features-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' 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
+           'IP4FWD' and
            'NDRPDR' and
-           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
-           not 'ACL' and
-           not 'VHOST' and
-           not 'MEMIF'"
+           'BASE' and
+           'IPSECHW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "L2XCBASE"    # l2xcbase
-  - "L2BDBASE"    # l2bdbase
-  - "L2XCFWD"     # dot1q-l2xcbase
-  - "L2BDMACLRN"  # dot1q-l2bdbase
   layout:
-    title: "l2sw-3n-hsw-x520-64b-features-pdr"
+    title: "ipsec-3n-hsw-xl710-64b-base-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 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-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X710' 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
+           ('IPSECTRAN' or 'IPSECTUN') and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
   layout:
-    title: "l2sw-3n-hsw-x710-64b-base_and_scale-ndr"
+    title: "ipsec-3n-hsw-xl710-64b-scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
-  title: "Speedup: l2sw-3n-hsw-x710-64b-base_and_scale-pdr-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]}/l2sw-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  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
            '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
+           ('IPSECTRAN' or 'IPSECTUN') and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
   layout:
-    title: "l2sw-3n-hsw-x710-64b-base_and_scale-pdr"
+    title: "ipsec-3n-hsw-xl710-64b-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"
+# 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]}/l2sw-3n-hsw-x710-64b-features-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  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
            '64B' and
+           'IP4FWD' and
            'NDRPDR' and
-           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
-           not 'ACL' and
-           not 'VHOST' and
-           not 'MEMIF'"
+           'IPSECSW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "L2XCBASE"    # l2xcbase
-  - "L2BDBASE"    # l2bdbase
-  - "L2XCFWD"     # dot1q-l2xcbase
-  - "L2BDMACLRN"  # dot1q-l2bdbase
   layout:
-    title: "l2sw-3n-hsw-x710-64b-features-ndr"
+    title: "ipsec-3n-hsw-xl710-64b-sw-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
-  title: "Speedup: l2sw-3n-hsw-x710-64b-features-pdr-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]}/l2sw-3n-hsw-x710-64b-features-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  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
            '64B' and
+           'IP4FWD' and
            'NDRPDR' and
-           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
-           not 'ACL' and
-           not 'VHOST' and
-           not 'MEMIF'"
+           'IPSECSW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "L2XCBASE"    # l2xcbase
-  - "L2BDBASE"    # l2bdbase
-  - "L2XCFWD"     # dot1q-l2xcbase
-  - "L2BDMACLRN"  # dot1q-l2bdbase
   layout:
-    title: "l2sw-3n-hsw-x710-64b-features-pdr"
+    title: "ipsec-3n-hsw-xl710-64b-sw-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_and_scale-ndr-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]}/l2sw-3n-hsw-xl710-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
+  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
            'NDRPDR' and
-           'ETH' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
+           'IP6FWD' and
+           'SRv6'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
   layout:
-    title: "l2sw-3n-hsw-xl710-64b-base_and_scale-ndr"
+    title: "srv6-3n-hsw-x520-78b-features-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
-  title: "Speedup: l2sw-3n-hsw-xl710-64b-base_and_scale-pdr-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]}/l2sw-3n-hsw-xl710-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
+  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
            'NDRPDR' and
-           'ETH' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
+           'IP6FWD' and
+           'SRv6'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
   layout:
-    title: "l2sw-3n-hsw-xl710-64b-base_and_scale-pdr"
+    title: "srv6-3n-hsw-x520-78b-features-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 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-skx-x710-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/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
@@ -24222,24 +24920,23 @@
   - "parent"
   - "tags"
   sort:
+  - "L2XCFWD"
   - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
+  - "L2BDMACLRN"
   - "FIB_10K"
   - "FIB_100K"
   - "FIB_1M"
   layout:
-    title: "l2sw-3n-skx-x710-64b-base_and_scale-ndr"
+    title: "l2sw-3n-hsw-x520-64b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
-  title: "Speedup: l2sw-3n-skx-x710-64b-base_and_scale-pdr-tsa"
+- 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-skx-x710-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/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
@@ -24252,85 +24949,28 @@
   - "parent"
   - "tags"
   sort:
+  - "L2XCFWD"
   - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
+  - "L2BDMACLRN"
   - "FIB_10K"
   - "FIB_100K"
   - "FIB_1M"
   layout:
-    title: "l2sw-3n-skx-x710-64b-base_and_scale-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"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-features-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-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 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCBASE"    # l2xcbase
-  - "L2BDBASE"    # l2bdbase
-  - "L2XCFWD"     # dot1q-l2xcbase
-  - "L2BDMACLRN"  # dot1q-l2bdbase
-  layout:
-    title: "l2sw-3n-skx-x710-64b-features-ndr"
-    layout: "plot-throughput-speedup-analysis"
-
--
-  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]}/l2sw-3n-skx-x710-64b-features-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-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 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCBASE"    # l2xcbase
-  - "L2BDBASE"    # l2bdbase
-  - "L2XCFWD"     # dot1q-l2xcbase
-  - "L2BDMACLRN"  # dot1q-l2bdbase
-  layout:
-    title: "l2sw-3n-skx-x710-64b-features-pdr"
+    title: "l2sw-3n-hsw-x520-64b-base_and_scale-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"
+# 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-skx-xxv710-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-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
-           'ETH' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           'NDRPDR' and
+           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
+           not 'ACL' and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -24338,29 +24978,25 @@
   - "parent"
   - "tags"
   sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+  - "L2XCBASE"    # l2xcbase
+  - "L2BDBASE"    # l2bdbase
+  - "L2XCFWD"     # dot1q-l2xcbase
+  - "L2BDMACLRN"  # dot1q-l2bdbase
   layout:
-    title: "l2sw-3n-skx-xxv710-64b-base_and_scale-ndr"
+    title: "l2sw-3n-hsw-x520-64b-features-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
-  title: "Speedup: l2sw-3n-skx-xxv710-64b-base_and_scale-pdr-tsa"
+- 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-skx-xxv710-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-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
-           'ETH' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
+           not 'ACL' and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -24368,976 +25004,896 @@
   - "parent"
   - "tags"
   sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+  - "L2XCBASE"    # l2xcbase
+  - "L2BDBASE"    # l2bdbase
+  - "L2XCFWD"     # dot1q-l2xcbase
+  - "L2BDMACLRN"  # dot1q-l2bdbase
   layout:
-    title: "l2sw-3n-skx-xxv710-64b-base_and_scale-pdr"
+    title: "l2sw-3n-hsw-x520-64b-features-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"
+# Speedup - VPP L2 3n-hsw-x520 features-iacl
+- type: "plot"
+  title: "Speedup: l2sw-3n-hsw-x520-64b-features-iacl-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-x710-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
+  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
-           'ETH' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           '64B' and
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'IACL' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
+           not 'MACIP' and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
   layout:
-    title: "l2sw-2n-skx-x710-64b-base_and_scale-ndr"
+    title: "l2sw-3n-hsw-x520-64b-features-iacl-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
-  title: "Speedup: l2sw-2n-skx-x710-64b-base_and_scale-pdr-tsa"
+- 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-2n-skx-x710-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
+  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
-           'ETH' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           '64B' and
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'IACL' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
+           not 'MACIP' and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
   layout:
-    title: "l2sw-2n-skx-x710-64b-base_and_scale-pdr"
+    title: "l2sw-3n-hsw-x520-64b-features-iacl-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"
+# Speedup - VPP L2 3n-hsw-x520 features-oacl
+- type: "plot"
+  title: "Speedup: l2sw-3n-hsw-x520-64b-features-oacl-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-xxv710-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
+  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
-           'ETH' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') 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'"
   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: "l2sw-3n-hsw-x520-64b-features-oacl-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
-  title: "Speedup: l2sw-2n-skx-xxv710-64b-base_and_scale-pdr-tsa"
+- type: "plot"
+  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]}/l2sw-2n-skx-xxv710-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
+  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
-           'ETH' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') 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'"
   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: "l2sw-3n-hsw-x520-64b-features-oacl-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"
+# Speedup - VPP L2 3n-hsw-x520 features-oacl
+- type: "plot"
+  title: "Speedup: l2sw-3n-hsw-x520-64b-features-oacl-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  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' and
-           'IP4FWD' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'DOT1Q'"
+           '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'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "1VM"
-  - "2VM"
   layout:
-    title: "vhost-ip4-3n-hsw-x520-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-x520-64b-base_and_scale-pdr-tsa"
+- type: "plot"
+  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-x520-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  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
-           '64B' and
            'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'DOT1Q'"
+           '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'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "1VM"
-  - "2VM"
   layout:
-    title: "vhost-ip4-3n-hsw-x520-64b-base_and_scale-pdr"
+    title: "l2sw-3n-hsw-x520-64b-features-oacl-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-# Packet Speedup - VPP vhost l2sw 3n-hsw-x520
--
-  type: "plot"
-  title: "VPP Speedup: vhost-l2sw-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
+# Speedup - VPP L2 3n-hsw-x520 features-macip
+- type: "plot"
+  title: "Speedup: l2sw-3n-hsw-x520-64b-features-macip-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  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
-           '64B' and
            'NDRPDR' and
-           ('ETH' or 'DOT1Q') 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:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
   layout:
-    title: "vhost-l2sw-3n-hsw-x520-64b-base_and_scale-ndr"
+    title: "l2sw-3n-hsw-x520-64b-features-macip-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
-  title: "VPP Speedup: vhost-l2sw-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
+- type: "plot"
+  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-x520-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  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
-           '64B' and
            'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           'L2BDMACLRN' 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:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
   layout:
-    title: "vhost-l2sw-3n-hsw-x520-64b-base_and_scale-pdr"
+    title: "l2sw-3n-hsw-x520-64b-features-macip-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-ndr-tsa"
+# 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]}/vhost-l2sw-3n-hsw-x520-64b-base-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  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' or 'DOT1Q') and
-           'BASE' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
+           'ETH' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           not 'MEMIF' and
+           not 'DRV_AVF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
+  sort:
+  - "L2PATCH"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   layout:
-    title: "vhost-l2sw-3n-hsw-x520-64b-base-ndr"
+    title: "l2sw-3n-hsw-x710-64b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
-  title: "VPP Speedup: vhost-l2sw-3n-hsw-x520-64b-base-pdr-tsa"
+- 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]}/vhost-l2sw-3n-hsw-x520-64b-base-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  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' or 'DOT1Q') and
-           'BASE' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
+           'ETH' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           not 'MEMIF' and
+           not 'DRV_AVF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
+  sort:
+  - "L2PATCH"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   layout:
-    title: "vhost-l2sw-3n-hsw-x520-64b-base-pdr"
+    title: "l2sw-3n-hsw-x710-64b-base_and_scale-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"
+# 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]}/vhost-l2sw-3n-hsw-x520-64b-base-vm-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  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
-           ('ETH' or 'DOT1Q') and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'CFS_OPT' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'LBOND'"
+           (('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:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
+  sort:
+  - "L2XCBASE"    # l2xcbase
+  - "L2BDBASE"    # l2bdbase
+  - "L2XCFWD"     # dot1q-l2xcbase
+  - "L2BDMACLRN"  # dot1q-l2bdbase
   layout:
-    title: "vhost-l2sw-3n-hsw-x520-64b-base-vm-ndr"
+    title: "l2sw-3n-hsw-x710-64b-features-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
-  title: "VPP Speedup: vhost-l2sw-3n-hsw-x520-64b-base-vm-pdr-tsa"
+- 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]}/vhost-l2sw-3n-hsw-x520-64b-base-vm-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  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
-           ('ETH' or 'DOT1Q') and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'CFS_OPT' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'LBOND'"
+           (('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:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
+  sort:
+  - "L2XCBASE"    # l2xcbase
+  - "L2BDBASE"    # l2bdbase
+  - "L2XCFWD"     # dot1q-l2xcbase
+  - "L2BDMACLRN"  # dot1q-l2bdbase
   layout:
-    title: "vhost-l2sw-3n-hsw-x520-64b-base-vm-pdr"
+    title: "l2sw-3n-hsw-x710-64b-features-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"
+# Speedup - VPP L2 3n-hsw-x710 features-iacl
+- type: "plot"
+  title: "Speedup: l2sw-3n-hsw-x710-64b-features-iacl-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-features-iacl-ndr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
-           '64B' and
            'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'DOT1Q'"
+           '64B' and
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'IACL' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
+           not 'MACIP' and
+           not 'VHOST' and
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "1VM"
-  - "2VM"
   layout:
-    title: "vhost-ip4-3n-hsw-x710-64b-base_and_scale-ndr"
+    title: "l2sw-3n-hsw-x710-64b-features-iacl-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
-  title: "VPP Speedup: vhost-ip4-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
+- type: "plot"
+  title: "Speedup: l2sw-3n-hsw-x710-64b-features-iacl-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-throughput-speedup-analysis-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-features-iacl-pdr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
-           '64B' and
            'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'DOT1Q'"
+           '64B' and
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'IACL' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
+           not 'MACIP' and
+           not 'VHOST' and
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "1VM"
-  - "2VM"
   layout:
-    title: "vhost-ip4-3n-hsw-x710-64b-base_and_scale-pdr"
+    title: "l2sw-3n-hsw-x710-64b-features-iacl-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-# Packet Speedup - VPP vhost l2sw 3n-hsw-x710
--
-  type: "plot"
-  title: "VPP Speedup: vhost-l2sw-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
+# 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]}/vhost-l2sw-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  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' or 'DOT1Q') and
-           'L2BDMACLRN' and
-           'VHOST_1024' and
-           not 'VXLAN' 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:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
+  sort:
+  - "L2PATCH"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
   layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-base_and_scale-ndr"
+    title: "l2sw-3n-hsw-xl710-64b-base-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
-  title: "VPP Speedup: vhost-l2sw-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
+- 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]}/vhost-l2sw-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  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' or 'DOT1Q') and
-           'L2BDMACLRN' and
-           'VHOST_1024' and
-           not 'VXLAN' 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:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
+  sort:
+  - "L2PATCH"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
   layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-base_and_scale-pdr"
+    title: "l2sw-3n-hsw-xl710-64b-base-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-ndr-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-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-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
-           'BASE' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
+           'ETH' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           not 'DRV_AVF' and
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
+  sort:
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-base-ndr"
+    title: "l2sw-3n-skx-x710-64b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
-  title: "VPP Speedup: vhost-l2sw-3n-hsw-x710-64b-base-pdr-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-l2sw-3n-hsw-x710-64b-base-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  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' or 'DOT1Q') and
-           'BASE' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
+           'ETH' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           not 'DRV_AVF' and
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
+  sort:
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-base-pdr"
+    title: "l2sw-3n-skx-x710-64b-base_and_scale-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-vm-ndr-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-l2sw-3n-hsw-x710-64b-base-vm-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  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' or 'DOT1Q') and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'CFS_OPT' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'LBOND'"
+           (('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"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
+  sort:
+  - "L2XCBASE"    # l2xcbase
+  - "L2BDBASE"    # l2bdbase
+  - "L2XCFWD"     # dot1q-l2xcbase
+  - "L2BDMACLRN"  # dot1q-l2bdbase
   layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-base-vm-ndr"
+    title: "l2sw-3n-skx-x710-64b-features-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
-  title: "VPP Speedup: vhost-l2sw-3n-hsw-x710-64b-base-vm-pdr-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-l2sw-3n-hsw-x710-64b-base-vm-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  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
-           ('ETH' or 'DOT1Q') and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'CFS_OPT' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'LBOND'"
+           (('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"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
+  sort:
+  - "L2XCBASE"    # l2xcbase
+  - "L2BDBASE"    # l2bdbase
+  - "L2XCFWD"     # dot1q-l2xcbase
+  - "L2BDMACLRN"  # dot1q-l2bdbase
   layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-base-vm-pdr"
+    title: "l2sw-3n-skx-x710-64b-features-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-# Packet Speedup - VPP vhost ip4 3n-hsw-xl710
--
-  type: "plot"
-  title: "VPP Speedup: vhost-ip4-3n-hsw-xl710-64b-base_and_scale-ndr-tsa"
+# Speedup - VPP L2 3n-skx-x710 features-iacl
+- type: "plot"
+  title: "Speedup: l2sw-3n-skx-x710-64b-features-iacl-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-xl710-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-features-iacl-ndr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
            'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'DOT1Q'"
+           '64B' and
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'IACL' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
+           not 'MACIP' and
+           not 'VHOST' and
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "1VM"
-  - "2VM"
   layout:
-    title: "vhost-ip4-3n-hsw-xl710-64b-base_and_scale-ndr"
+    title: "l2sw-3n-skx-x710-64b-features-iacl-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
-  title: "VPP Speedup: vhost-ip4-3n-hsw-xl710-64b-base_and_scale-pdr-tsa"
+- type: "plot"
+  title: "Speedup: l2sw-3n-skx-x710-64b-features-iacl-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-xl710-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-features-iacl-pdr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
            'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'DOT1Q'"
+           '64B' and
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'IACL' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
+           not 'MACIP' and
+           not 'VHOST' and
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "1VM"
-  - "2VM"
   layout:
-    title: "vhost-ip4-3n-hsw-xl710-64b-base_and_scale-pdr"
+    title: "l2sw-3n-skx-x710-64b-features-iacl-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-# Packet Speedup - VPP vhost l2sw 3n-hsw-xl710
--
-  type: "plot"
-  title: "VPP Speedup: vhost-l2sw-3n-hsw-xl710-64b-base_and_scale-ndr-tsa"
+# 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]}/vhost-l2sw-3n-hsw-xl710-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,VPP]}/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' or 'DOT1Q') and
-           'L2BDMACLRN' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
+           'ETH' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'DRV_AVF' and
+           not 'VHOST' and
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
 #  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
+#  - "L2PATCH"
+#  - "L2PATCH"
+#  - "L2XCBASE"
+#  - "L2BDMACLRN"
   layout:
-    title: "vhost-l2sw-3n-hsw-xl710-64b-base_and_scale-ndr"
+    title: "l2sw-3n-skx-xxv710-64b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
-  title: "VPP Speedup: vhost-l2sw-3n-hsw-xl710-64b-base_and_scale-pdr-tsa"
+- 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]}/vhost-l2sw-3n-hsw-xl710-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,VPP]}/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' or 'DOT1Q') and
-           'L2BDMACLRN' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
+           'ETH' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'DRV_AVF' and
+           not 'VHOST' and
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
 #  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
+#  - "L2PATCH"
+#  - "L2PATCH"
+#  - "L2XCBASE"
+#  - "L2BDMACLRN"
   layout:
-    title: "vhost-l2sw-3n-hsw-xl710-64b-base_and_scale-pdr"
+    title: "l2sw-3n-skx-xxv710-64b-base_and_scale-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-# Packet Speedup - VPP vhost l2sw 3n-hsw-xl710 - base
--
-  type: "plot"
-  title: "VPP Speedup: vhost-l2sw-3n-hsw-xl710-64b-base-ndr-tsa"
+# 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]}/vhost-l2sw-3n-hsw-xl710-64b-base-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  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' or 'DOT1Q') and
-           'BASE' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' 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:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
+  sort:
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   layout:
-    title: "vhost-l2sw-3n-hsw-xl710-64b-base-ndr"
+    title: "l2sw-2n-skx-x710-64b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
-  title: "VPP Speedup: vhost-l2sw-3n-hsw-xl710-64b-base-pdr-tsa"
+- 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]}/vhost-l2sw-3n-hsw-xl710-64b-base-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  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' or 'DOT1Q') and
-           'BASE' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' 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:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
+  sort:
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   layout:
-    title: "vhost-l2sw-3n-hsw-xl710-64b-base-pdr"
+    title: "l2sw-2n-skx-x710-64b-base_and_scale-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-# Packet Speedup - VPP vhost l2sw 3n-hsw-xl710 - base vm
--
-  type: "plot"
-  title: "VPP Speedup: vhost-l2sw-3n-hsw-xl710-64b-base-vm-ndr-tsa"
+# 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]}/vhost-l2sw-3n-hsw-xl710-64b-base-vm-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  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' or 'DOT1Q') and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'CFS_OPT' and
-           not 'VXLAN' and
-           not 'IP4FWD'"
+           'ETH' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
+  sort:
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   layout:
-    title: "vhost-l2sw-3n-hsw-xl710-64b-base-vm-ndr"
+    title: "l2sw-2n-skx-xxv710-64b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
-  title: "VPP Speedup: vhost-l2sw-3n-hsw-xl710-64b-base-vm-pdr-tsa"
+- 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]}/vhost-l2sw-3n-hsw-xl710-64b-base-vm-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  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' or 'DOT1Q') and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'CFS_OPT' and
-           not 'VXLAN' and
-           not 'IP4FWD'"
+           'ETH' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
+  sort:
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   layout:
-    title: "vhost-l2sw-3n-hsw-xl710-64b-base-vm-pdr"
+    title: "l2sw-2n-skx-xxv710-64b-base_and_scale-pdr"
     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"
+# 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]}/vhost-ip4-3n-skx-x710-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/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
-           'IP4FWD' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'DOT1Q'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "not CFS_OPT"
-  - "1VM"
-  - "2VM"
+  - "L2XCBASE"
+  - "L2BDMACLRN"
+  - "L2PATCH"
   layout:
-    title: "vhost-ip4-3n-skx-x710-64b-base_and_scale-ndr"
+    title: "l2sw-2n-dnv-x553-64b-base-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
-  title: "VPP Speedup: vhost-ip4-3n-skx-x710-64b-base_and_scale-pdr-tsa"
+- 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]}/vhost-ip4-3n-skx-x710-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/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
-           'IP4FWD' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'DOT1Q'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "not CFS_OPT"
-  - "1VM"
-  - "2VM"
+  - "L2XCBASE"
+  - "L2BDMACLRN"
+  - "L2PATCH"
   layout:
-    title: "vhost-ip4-3n-skx-x710-64b-base_and_scale-pdr"
+    title: "l2sw-2n-dnv-x553-64b-base-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-# Packet Speedup - VPP vhost l2sw 3n-skx-x710
--
-  type: "plot"
-  title: "VPP Speedup: vhost-l2sw-3n-skx-x710-64b-base_and_scale-ndr-tsa"
+################################################################################
+
+# 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-l2sw-3n-skx-x710-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/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' or 'DOT1Q') and
-           'L2BDMACLRN' and
+           'ETH' and
+           'IP4FWD' and
            'VHOST_1024' and
            not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
+           not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
+  sort:
+  - "not CFS_OPT"
+  - "1VM"
+  - "2VM"
   layout:
-    title: "vhost-l2sw-3n-skx-x710-64b-base_and_scale-ndr"
+    title: "vhost-ip4-3n-hsw-x520-64b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
-  title: "VPP Speedup: vhost-l2sw-3n-skx-x710-64b-base_and_scale-pdr-tsa"
+- 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-l2sw-3n-skx-x710-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/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' or 'DOT1Q') and
-           'L2BDMACLRN' and
+           'ETH' and
+           'IP4FWD' and
            'VHOST_1024' and
            not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
+           not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
+  sort:
+  - "not CFS_OPT"
+  - "1VM"
+  - "2VM"
   layout:
-    title: "vhost-l2sw-3n-skx-x710-64b-base_and_scale-pdr"
+    title: "vhost-ip4-3n-hsw-x520-64b-base_and_scale-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-# Packet Speedup - VPP vhost l2sw 3n-skx-x710 - base
--
-  type: "plot"
-  title: "VPP Speedup: vhost-l2sw-3n-skx-x710-64b-base-ndr-tsa"
+# 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-skx-x710-64b-base-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  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
@@ -25346,29 +25902,29 @@
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not '2VM' and
-           not 'LBOND'"
+           not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
+  sort:
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
   layout:
-    title: "vhost-l2sw-3n-skx-x710-64b-base-ndr"
+    title: "vhost-l2sw-3n-hsw-x520-64b-base_and_features-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
-  title: "VPP Speedup: vhost-l2sw-3n-skx-x710-64b-base-pdr-tsa"
+- 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-skx-x710-64b-base-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  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
@@ -25377,36 +25933,37 @@
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not '2VM' and
-           not 'LBOND'"
+           not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
+  sort:
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
   layout:
-    title: "vhost-l2sw-3n-skx-x710-64b-base-pdr"
+    title: "vhost-l2sw-3n-hsw-x520-64b-base_and_features-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-# Packet Speedup - VPP vhost l2sw 3n-skx-x710 - base vm
--
-  type: "plot"
-  title: "VPP Speedup: vhost-l2sw-3n-skx-x710-64b-base-vm-ndr-tsa"
+# 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-skx-x710-64b-base-vm-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  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'"
@@ -25420,23 +25977,23 @@
 #  - "1VM"
 #  - "L2BDMACLRN"
   layout:
-    title: "vhost-l2sw-3n-skx-x710-64b-base-vm-ndr"
+    title: "vhost-l2sw-3n-hsw-x520-64b-base-vm-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
-  title: "VPP Speedup: vhost-l2sw-3n-skx-x710-64b-base-vm-pdr-tsa"
+- 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-skx-x710-64b-base-vm-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  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'"
@@ -25450,17 +26007,16 @@
 #  - "1VM"
 #  - "L2BDMACLRN"
   layout:
-    title: "vhost-l2sw-3n-skx-x710-64b-base-vm-pdr"
+    title: "vhost-l2sw-3n-hsw-x520-64b-base-vm-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"
+# 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-2n-skx-x710-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
+  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
@@ -25468,26 +26024,25 @@
            '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-x710-64b-base_and_scale-ndr"
+    title: "vhost-ip4-3n-hsw-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"
+- 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-2n-skx-x710-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
+  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
@@ -25495,32 +26050,32 @@
            '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-x710-64b-base_and_scale-pdr"
+    title: "vhost-ip4-3n-hsw-x710-64b-base_and_scale-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-# Packet Speedup - VPP vhost l2sw 2n-skx-x710
--
-  type: "plot"
-  title: "VPP Speedup: vhost-l2sw-2n-skx-x710-64b-base_and_scale-ndr-tsa"
+# 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-2n-skx-x710-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
+  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
-           'L2BDMACLRN' and
+           'BASE' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
@@ -25529,28 +26084,29 @@
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
+  sort:
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
   layout:
-    title: "vhost-l2sw-2n-skx-x710-64b-base_and_scale-ndr"
+    title: "vhost-l2sw-3n-hsw-x710-64b-base_and_features-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
-  title: "VPP Speedup: vhost-l2sw-2n-skx-x710-64b-base_and_scale-pdr-tsa"
+- 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-2n-skx-x710-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
+  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
-           'L2BDMACLRN' and
+           'BASE' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
@@ -25559,206 +26115,202 @@
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
+  sort:
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
   layout:
-    title: "vhost-l2sw-2n-skx-x710-64b-base_and_scale-pdr"
+    title: "vhost-l2sw-3n-hsw-x710-64b-base_and_features-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-ndr-tsa"
+# 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-2n-skx-x710-64b-base-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
+  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
-           'BASE' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
+           not 'CFS_OPT' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not '2VM'"
+           not 'LBOND'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
+  sort:
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
   layout:
-    title: "vhost-l2sw-2n-skx-x710-64b-base-ndr"
+    title: "vhost-l2sw-3n-hsw-x710-64b-base_and_features-vm-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
-  title: "VPP Speedup: vhost-l2sw-2n-skx-x710-64b-base-pdr-tsa"
+- 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-2n-skx-x710-64b-base-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
+  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
-           'BASE' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
+           not 'CFS_OPT' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not '2VM'"
+           not 'LBOND'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
+  sort:
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
   layout:
-    title: "vhost-l2sw-2n-skx-x710-64b-base-pdr"
+    title: "vhost-l2sw-3n-hsw-x710-64b-base_and_features-vm-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"
+# 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-l2sw-2n-skx-x710-64b-base-vm-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
+  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' or 'DOT1Q') and
-           ('L2BDMACLRN' or 'L2XCFWD') and
+           'ETH' and
+           'IP4FWD' and
            'VHOST_1024' and
-           not 'CFS_OPT' and
            not 'VXLAN' and
-           not 'IP4FWD'"
+           not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
+  sort:
+  - "1VM"
+  - "2VM"
   layout:
-    title: "vhost-l2sw-2n-skx-x710-64b-base-vm-ndr"
+    title: "vhost-ip4-3n-skx-x710-64b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
-  title: "VPP Speedup: vhost-l2sw-2n-skx-x710-64b-base-vm-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-l2sw-2n-skx-x710-64b-base-vm-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
+  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' or 'DOT1Q') and
-           ('L2BDMACLRN' or 'L2XCFWD') and
+           'ETH' and
+           'IP4FWD' and
            'VHOST_1024' and
-           not 'CFS_OPT' and
            not 'VXLAN' and
-           not 'IP4FWD'"
+           not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
+  sort:
+  - "1VM"
+  - "2VM"
   layout:
-    title: "vhost-l2sw-2n-skx-x710-64b-base-vm-pdr"
+    title: "vhost-ip4-3n-skx-x710-64b-base_and_scale-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 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-xxv710-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  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:
-  - "not CFS_OPT"
   - "1VM"
   - "2VM"
   layout:
-    title: "vhost-ip4-2n-skx-xxv710-64b-base_and_scale-ndr"
+    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-xxv710-64b-base_and_scale-pdr-tsa"
+- 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-xxv710-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  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:
-  - "not CFS_OPT"
   - "1VM"
   - "2VM"
   layout:
-    title: "vhost-ip4-2n-skx-xxv710-64b-base_and_scale-pdr"
+    title: "vhost-ip4-2n-skx-x710-64b-base_and_scale-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-# Packet Speedup - VPP vhost l2sw 2n-skx-xxv710
--
-  type: "plot"
-  title: "VPP Speedup: vhost-l2sw-2n-skx-xxv710-64b-base_and_scale-ndr-tsa"
+# 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-xxv710-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  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
-           'L2BDMACLRN' and
+           'BASE' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'IP4FWD' and
            not '2VM'"
   parameters:
@@ -25766,29 +26318,29 @@
   - "parent"
   - "tags"
 #  sort:
-#  - "VM"  # "not CFS_OPT"
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
 #  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
   layout:
-    title: "vhost-l2sw-2n-skx-xxv710-64b-base_and_scale-ndr"
+    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-xxv710-64b-base_and_scale-pdr-tsa"
+- 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-xxv710-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  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
-           'L2BDMACLRN' and
+           'BASE' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'IP4FWD' and
            not '2VM'"
   parameters:
@@ -25796,145 +26348,257 @@
   - "parent"
   - "tags"
 #  sort:
-#  - "VM"  # "not CFS_OPT"
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
 #  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
   layout:
-    title: "vhost-l2sw-2n-skx-xxv710-64b-base_and_scale-pdr"
+    title: "vhost-l2sw-2n-skx-x710-64b-base_and_features-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-# Packet Speedup - VPP vhost l2sw 2n-skx-xxv710 - base
--
-  type: "plot"
-  title: "VPP Speedup: vhost-l2sw-2n-skx-xxv710-64b-base-ndr-tsa"
+# 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-xxv710-64b-base-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  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
-           'BASE' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
+           not 'CFS_OPT' and
            not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
+           not 'NF_DENSITY' and
+           not 'DOT1Q' and
+           not 'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
 #  sort:
-#  - "not CFS_OPT"
+#  - "1VM"
 #  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
+#  - "1VM"
+#  - "L2BDMACLRN"
   layout:
-    title: "vhost-l2sw-2n-skx-xxv710-64b-base-ndr"
+    title: "vhost-l2sw-2n-skx-x710-64b-base-vm-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
-  title: "VPP Speedup: vhost-l2sw-2n-skx-xxv710-64b-base-pdr-tsa"
+- 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-xxv710-64b-base-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  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
-           'BASE' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
+           not 'CFS_OPT' and
            not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
+           not 'NF_DENSITY' and
+           not 'DOT1Q' and
+           not 'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
 #  sort:
-#  - "not CFS_OPT"
+#  - "1VM"
 #  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
+#  - "1VM"
+#  - "L2BDMACLRN"
   layout:
-    title: "vhost-l2sw-2n-skx-xxv710-64b-base-pdr"
+    title: "vhost-l2sw-2n-skx-x710-64b-base-vm-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-# Packet Speedup - VPP vhost l2sw 2n-skx-xxv710 - base vm
--
-  type: "plot"
-  title: "VPP Speedup: vhost-l2sw-2n-skx-xxv710-64b-base-vm-ndr-tsa"
+# 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-l2sw-2n-skx-xxv710-64b-base-vm-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
+  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' or 'DOT1Q') and
-           ('L2BDMACLRN' or 'L2XCFWD') and
+           'ETH' and
+           'IP4FWD' and
            'VHOST_1024' and
-           not 'CFS_OPT' and
            not 'VXLAN' and
-           not 'IP4FWD'"
+           not 'CFS_OPT' and
+           not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
+  sort:
+  - "not CFS_OPT"
+  - "1VM"
+  - "2VM"
   layout:
-    title: "vhost-l2sw-2n-skx-xxv710-64b-base-vm-ndr"
+    title: "vhost-ip4-2n-skx-xxv710-64b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
-  title: "VPP Speedup: vhost-l2sw-2n-skx-xxv710-64b-base-vm-pdr-tsa"
+- 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-l2sw-2n-skx-xxv710-64b-base-vm-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
+  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' or 'DOT1Q') and
-           ('L2BDMACLRN' or 'L2XCFWD') and
+           'ETH' and
+           'IP4FWD' and
            'VHOST_1024' and
-           not 'CFS_OPT' and
            not 'VXLAN' and
-           not 'IP4FWD'"
+           not 'CFS_OPT' and
+           not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
+  sort:
+  - "not CFS_OPT"
+  - "1VM"
+  - "2VM"
   layout:
-    title: "vhost-l2sw-2n-skx-xxv710-64b-base-vm-pdr"
+    title: "vhost-ip4-2n-skx-xxv710-64b-base_and_scale-pdr"
     layout: "plot-throughput-speedup-analysis"
 
+## Packet Speedup - VPP vhost l2sw 2n-skx-xxv710 - base
+#- type: "plot"
+#  title: "VPP Speedup: vhost-l2sw-2n-skx-xxv710-64b-base_and_features-ndr-tsa"
+#  algorithm: "plot_throughput_speedup_analysis"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-base_and_features-ndr-tsa"
+#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+#  filter: "'NIC_Intel-XXV710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           'BASE' and
+#           ('L2BDMACLRN' or 'L2XCFWD') and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "not CFS_OPT"
+##  - "L2XCFWD"
+##  - "not CFS_OPT"
+##  - "CFS_OPT"
+#  layout:
+#    title: "vhost-l2sw-2n-skx-xxv710-64b-base_and_features-ndr"
+#    layout: "plot-throughput-speedup-analysis"
+#
+#- type: "plot"
+#  title: "VPP Speedup: vhost-l2sw-2n-skx-xxv710-64b-base_and_features-pdr-tsa"
+#  algorithm: "plot_throughput_speedup_analysis"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-base_and_features-pdr-tsa"
+#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+#  filter: "'NIC_Intel-XXV710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           'BASE' and
+#           ('L2BDMACLRN' or 'L2XCFWD') and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "not CFS_OPT"
+##  - "L2XCFWD"
+##  - "not CFS_OPT"
+##  - "CFS_OPT"
+#  layout:
+#    title: "vhost-l2sw-2n-skx-xxv710-64b-base_and_features-pdr"
+#    layout: "plot-throughput-speedup-analysis"
+#
+## Packet Speedup - VPP vhost l2sw 2n-skx-xxv710 - base vm
+#- type: "plot"
+#  title: "VPP Speedup: vhost-l2sw-2n-skx-xxv710-64b-base-vm-ndr-tsa"
+#  algorithm: "plot_throughput_speedup_analysis"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-base-vm-ndr-tsa"
+#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+#  filter: "'NIC_Intel-XXV710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           ('L2BDMACLRN' or 'L2XCFWD') and
+#           'VHOST_1024' and
+#           not 'CFS_OPT' and
+#           not 'VXLAN' and
+#           not 'DOT1Q' and
+#           not 'IP4FWD'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "1VM"
+##  - "L2XCFWD"
+##  - "1VM"
+##  - "L2BDMACLRN"
+#  layout:
+#    title: "vhost-l2sw-2n-skx-xxv710-64b-base-vm-ndr"
+#    layout: "plot-throughput-speedup-analysis"
+#
+#- type: "plot"
+#  title: "VPP Speedup: vhost-l2sw-2n-skx-xxv710-64b-base-vm-pdr-tsa"
+#  algorithm: "plot_throughput_speedup_analysis"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-base-vm-pdr-tsa"
+#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+#  filter: "'NIC_Intel-XXV710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           ('L2BDMACLRN' or 'L2XCFWD') and
+#           'VHOST_1024' and
+#           not 'CFS_OPT' and
+#           not 'VXLAN' and
+#           not 'DOT1Q' and
+#           not 'IP4FWD'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "1VM"
+##  - "L2XCFWD"
+##  - "1VM"
+##  - "L2BDMACLRN"
+#  layout:
+#    title: "vhost-l2sw-2n-skx-xxv710-64b-base-vm-pdr"
+#    layout: "plot-throughput-speedup-analysis"
+
 ################################################################################
 
 # Speedup - VPP vts 3n-hsw-x520
--
-  type: "plot"
+- type: "plot"
   title: "VPP Speedup: vts-3n-hsw-x520-114b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-114b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '114B' and
            'NDRPDR' and
@@ -25947,13 +26611,12 @@
     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"
   output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-114b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '114B' and
            'NDRPDR' and
@@ -25964,4 +26627,4 @@
   - "tags"
   layout:
     title: "vts-3n-hsw-x520-114b-base_and_scale-pdr-tsa"
-    layout: "plot-throughput-speedup-analysis"
\ No newline at end of file
+    layout: "plot-throughput-speedup-analysis"