Report: Add Denverton data

[csit.git] / resources / tools / presentation / specification.yaml

diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml
index 11e7eb9..f26d0c8 100644 (file)
--- a/resources/tools/presentation/specification.yaml
+++ b/resources/tools/presentation/specification.yaml
@@ -75,7 +75,7 @@
   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/1810/robot-plugin.zip"
+    URL[VIRL,DNV]: "http://10.30.51.28/download/denverton/1901/robot-plugin.zip"
     # URL[VIRL,DNV]: "http://download.it/from/nexus"
     URL[NEXUS]: "https://docs.fd.io/csit"
     DIR[NEXUS]: "report/_static/archive"
@@ -133,29 +133,53 @@
 
     plot-vpp-throughput-latency-3n-hsw:
       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
+#        - 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
+        - 72  # 1901.1 NDRPDR sel
+        - 78  # 1901.1 NDRPDR sel
 
     plot-throughput-speedup-analysis-3n-hsw:
       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
+#        - 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
+        - 72  # 1901.1 NDRPDR sel
+        - 78  # 1901.1 NDRPDR sel
 
     plot-vpp-http-server-performance:
       # TODO: Replace with new data
@@ -215,29 +239,51 @@
 
     plot-vpp-throughput-latency-3n-skx:
       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
+#        - 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
+        - 68  # 1901.1 NDRPDR sel
 
     plot-throughput-speedup-analysis-3n-skx:
       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
+#        - 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
+        - 68  # 1901.1 NDRPDR sel
 
     plot-dpdk-throughput-latency-3n-skx:
       csit-dpdk-perf-verify-1901-3n-skx:
@@ -256,36 +302,37 @@
 
     plot-vpp-throughput-latency-2n-skx:
       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
+#        - 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
+        - 64  # 1901.1 NDRPDR sel
 
     plot-throughput-speedup-analysis-2n-skx:
       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
+#        - 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
+        - 64  # 1901.1 NDRPDR sel
 
     plot-vpp-soak-2n-skx:
       csit-vpp-perf-verify-1901-2n-skx:
         - 45  # SOAK sel
 
     plot-vpp-nfv-2n-skx:
-      # TODO: Add new data
       csit-vpp-perf-verify-1901-2n-skx:
         - 28  # NFV NDRPDR
         - 29  # NFV NDRPDR
@@ -294,7 +341,6 @@
         - 46  # NFV NDRPDR
 
     plot-vpp-nfv-2n-skx-mrr:
-      # TODO: Add new data
       csit-vpp-perf-verify-1901-2n-skx:
         - 24  # NFV MRR
         - 26  # NFV MRR
@@ -330,101 +376,137 @@
 
     vpp-nic-comparison-3n-hsw:
       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
+#        - 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
+        - 72  # 1901.1 NDRPDR sel
+        - 78  # 1901.1 NDRPDR sel
 
     vpp-nic-comparison-3n-skx:
       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
+#        - 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
+        - 68  # 1901.1 NDRPDR sel
 
     vpp-nic-comparison-2n-skx:
       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
+#        - 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
+        - 64  # 1901.1 NDRPDR sel
 
     vpp-nic-comparison-3n-hsw-mrr:
       csit-vpp-perf-verify-1901-3n-hsw:
-        - 35  # MRR sel
+#        - 35  # MRR sel
+        - 73  # 1901.1 MRR sel
+        - 77  # 1901.1 MRR sel
 
     vpp-nic-comparison-3n-skx-mrr:
       csit-vpp-perf-verify-1901-3n-skx:
-        - 32  # MRR sel
+#        - 32  # MRR sel
+        - 69  # 1901.1 MRR sel
 
     vpp-nic-comparison-2n-skx-mrr:
       csit-vpp-perf-verify-1901-2n-skx:
-        - 22  # MRR sel
+#        - 22  # MRR sel
+        - 65  # 1901.1 MRR sel
 
     # Results
 
     vpp-perf-results-3n-hsw:
       csit-vpp-perf-verify-1901-3n-hsw:
-        - 38  # NDRPDR full
-        - 43  # NDRPDR full
-        - 45  # NDRPDR full
-        - 49  # NDRPDR full
+#        - 38  # NDRPDR full
+#        - 43  # NDRPDR full
+#        - 45  # NDRPDR full
+#        - 49  # NDRPDR full
+        - 72  # 1901.1 NDRPDR sel
+        - 78  # 1901.1 NDRPDR sel
 
     vpp-perf-results-3n-skx:
       csit-vpp-perf-verify-1901-3n-skx:
-        - 37  # NDRPDR full
-        - 39  # NDRPDR full
-        - 40  # NDRPDR full
-        - 49  # NDRPDR full
+#        - 37  # NDRPDR full
+#        - 39  # NDRPDR full
+#        - 40  # NDRPDR full
+#        - 49  # NDRPDR full
+        - 68  # 1901.1 NDRPDR sel
 
     vpp-perf-results-2n-skx:
       csit-vpp-perf-verify-1901-2n-skx:
-        - 25  # NDRPDR full
-        - 30  # NDRPDR full
-        - 33  # NDRPDR full
-        - 44  # NDRPDR full
+#        - 25  # NDRPDR full
+#        - 30  # NDRPDR full
+#        - 33  # NDRPDR full
+#        - 44  # NDRPDR full
+        - 64  # 1901.1 NDRPDR sel
 
     vpp-mrr-results-3n-hsw:
       csit-vpp-perf-verify-1901-3n-hsw:
-        - 35  # MRR sel
+#        - 35  # MRR sel
+        - 73  # 1901.1 MRR sel
+        - 77  # 1901.1 MRR sel
 
     vpp-mrr-results-3n-skx:
       csit-vpp-perf-verify-1901-3n-skx:
-        - 32  # MRR sel
+#        - 32  # MRR sel
+        - 69  # 1901.1 MRR sel
 
     vpp-mrr-results-2n-skx:
       csit-vpp-perf-verify-1901-2n-skx:
-        - 22  # MRR sel
+#        - 22  # MRR sel
+        - 65  # 1901.1 MRR sel
 
     vpp-func-results-ubuntu:
       csit-vpp-functional-1901-ubuntu1604-virl:
-        - 48
+        - 173
 
     vpp-func-results-centos:
       csit-vpp-functional-1901-centos7-virl:
-        - 50
+        - 175
 
     vpp-device-results-ubuntu:
       csit-vpp-device-1901-ubuntu1804-1n-skx:
-        - 49
+        - 175
 
     # VPP Ligato
     ligato-perf-results-3n-hsw:
@@ -493,16 +575,28 @@
         - 42  # NDRPDR sel
     vpp-performance-changes-3n-hsw-cmp:
       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
+#        - 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
+        - 72  # 1901.1 NDRPDR sel
+        - 78  # 1901.1 NDRPDR sel
     vpp-performance-changes-3n-hsw:
       - "vpp-performance-changes-3n-hsw-h1"
       - "vpp-performance-changes-3n-hsw-ref"
@@ -534,16 +628,27 @@
         - 25  # NDRPDR sel
     vpp-performance-changes-3n-skx-cmp:
       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
+#        - 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
+        - 68  # 1901.1 NDRPDR sel
     vpp-performance-changes-3n-skx:
       - "vpp-performance-changes-3n-skx-h1"
       - "vpp-performance-changes-3n-skx-ref"
@@ -575,16 +680,17 @@
         - 27  # NDRPDR sel
     vpp-performance-changes-2n-skx-cmp:
       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
+#        - 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
+        - 64  # 1901.1 NDRPDR sel
     vpp-performance-changes-2n-skx:
       - "vpp-performance-changes-2n-skx-h1"
       - "vpp-performance-changes-2n-skx-ref"
@@ -606,7 +712,9 @@
         - 9   # MRR sel
     vpp-performance-changes-3n-hsw-mrr-cmp:
       csit-vpp-perf-verify-1901-3n-hsw:
-        - 35  # MRR sel
+#        - 35  # MRR sel
+        - 73  # 1901.1 MRR sel
+        - 77  # 1901.1 MRR sel
     vpp-performance-changes-3n-hsw-mrr:
       - "vpp-performance-changes-3n-hsw-mrr-h1"
       - "vpp-performance-changes-3n-hsw-mrr-ref"
@@ -632,7 +740,8 @@
         - 13  # MRR sel
     vpp-performance-changes-3n-skx-mrr-cmp:
       csit-vpp-perf-verify-1901-3n-skx:
-        - 32  # MRR sel
+#        - 32  # MRR sel
+        - 69  # 1901.1 MRR sel
     vpp-performance-changes-3n-skx-mrr:
       - "vpp-performance-changes-3n-skx-mrr-h1"
       - "vpp-performance-changes-3n-skx-mrr-ref"
@@ -658,7 +767,8 @@
         - 12  # MRR sel
     vpp-performance-changes-2n-skx-mrr-cmp:
       csit-vpp-perf-verify-1901-2n-skx:
-        - 22  # MRR sel
+#        - 22  # MRR sel
+        - 65  # 1901.1 MRR sel
     vpp-performance-changes-2n-skx-mrr:
       - "vpp-performance-changes-2n-skx-mrr-h1"
       - "vpp-performance-changes-2n-skx-mrr-ref"
@@ -778,38 +888,64 @@
 
     vpp-compare-testbeds-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
+#        - 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
+        - 72  # 1901.1 NDRPDR sel
+        - 78  # 1901.1 NDRPDR sel
     vpp-compare-testbeds-cmp:
       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
+#        - 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
+        - 68  # 1901.1 NDRPDR sel
     vpp-compare-testbeds:
       - "vpp-compare-testbeds-ref"
       - "vpp-compare-testbeds-cmp"
 
     vpp-compare-testbeds-mrr-ref:
       csit-vpp-perf-verify-1901-3n-hsw:
-        - 35  # MRR sel
+#        - 35  # MRR sel
+        - 73  # 1901.1 MRR sel
+        - 77  # 1901.1 MRR sel
     vpp-compare-testbeds-mrr-cmp:
       csit-vpp-perf-verify-1901-3n-skx:
-        - 32  # MRR sel
+#        - 32  # MRR sel
+        - 69  # 1901.1 MRR sel
     vpp-compare-testbeds-mrr:
       - "vpp-compare-testbeds-mrr-ref"
       - "vpp-compare-testbeds-mrr-cmp"
@@ -846,38 +982,52 @@
 
     vpp-compare-topologies-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
+#        - 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
+        - 68  # 1901.1 NDRPDR sel
     vpp-compare-topologies-cmp:
       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
+#        - 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
+        - 64  # 1901.1 NDRPDR sel
     vpp-compare-topologies:
       - "vpp-compare-topologies-ref"
       - "vpp-compare-topologies-cmp"
 
     vpp-compare-topologies-mrr-ref:
       csit-vpp-perf-verify-1901-3n-skx:
-        - 32  # MRR sel
+#        - 32  # MRR sel
+        - 69  # 1901.1 MRR sel
     vpp-compare-topologies-mrr-cmp:
       csit-vpp-perf-verify-1901-2n-skx:
-        - 22  # MRR sel
+#        - 22  # MRR sel
+        - 65  # 1901.1 MRR sel
     vpp-compare-topologies-mrr:
       - "vpp-compare-topologies-mrr-ref"
       - "vpp-compare-topologies-mrr-cmp"
@@ -1368,21 +1518,35 @@
       - 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
-      - 31  # NDRPDR sel
-      - 36  # NDRPDR sel
-      - 40  # NDRPDR sel
-      - 42  # NDRPDR sel
-      - 44  # NDRPDR sel
-      - 46  # NDRPDR sel
-      - 47  # NDRPDR sel
-      - 48  # NDRPDR sel
+#      - 35  # MRR sel
+#      - 38  # NDRPDR full
+#      - 43  # NDRPDR full
+#      - 45  # NDRPDR full
+#      - 49  # NDRPDR full
+#      - 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
+      - 72  # 1901.1 NDRPDR sel
+      - 78  # 1901.1 NDRPDR sel
+      - 73  # 1901.1 MRR sel
+      - 77  # 1901.1 MRR sel
     csit-vpp-perf-verify-1807-3n-skx:
       - 31  # MRR full
       - 28  # MRR sel
@@ -1425,21 +1589,33 @@
       - 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
-      - 47  # NDRPDR sel
-      - 48  # NDRPDR sel
+#      - 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
+#      - 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
+      - 68  # 1901.1 NDRPDR sel
+      - 69  # 1901.1 MRR sel
     csit-vpp-perf-verify-1807-2n-skx:
       - 27  # MRR full
       - 31  # MRR sel
@@ -1481,21 +1657,21 @@
       - 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
-      - 43  # NDRPDR sel
+#      - 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
+#      - 43  # NDRPDR sel
       - 24  # NFV MRR
       - 26  # NFV MRR
       - 27  # NFV MRR
@@ -1507,7 +1683,8 @@
       - 39  # NFV NDRPDR
       - 46  # NFV NDRPDR
       - 45  # SOAK
-    # TODO: Add new data
+      - 64  # 1901.1 NDRPDR sel
+      - 65  # 1901.1 MRR sel
     csit-ligato-perf-verify-1901-3n-hsw:
       - 10  # NDRPDR full
       - 8   # NDRPDR sel
@@ -1609,11 +1786,11 @@
       - 20  # NDRPDR sel
       - 21  # NDRPDR sel
     csit-vpp-functional-1901-ubuntu1604-virl:
-      - 48
+      - 173
     csit-vpp-functional-1901-centos7-virl:
-      - 50
+      - 175
     csit-vpp-device-1901-ubuntu1804-1n-skx:
-      - 49
+      - 175
     # Not used
     csit-nsh_sfc-verify-func-1810-ubuntu1604-virl:
       - 1
@@ -1628,8 +1805,8 @@
   format:
     html:
     - full
-#    pdf:
-#    - minimal
+    pdf:
+    - minimal
 
 ################################################################################
 ###                               T A B L E S                                ###
@@ -2093,7 +2270,7 @@
     title: "rls1810"
     data: "vpp-performance-changes-3n-hsw-ref"
   compare:
-    title: "rls1901"
+    title: "rls1901.1"
     data: "vpp-performance-changes-3n-hsw-cmp"
   data: "vpp-performance-changes-3n-hsw"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
@@ -2117,7 +2294,7 @@
     title: "rls1810"
     data: "vpp-performance-changes-3n-hsw-ref"
   compare:
-    title: "rls1901"
+    title: "rls1901.1"
     data: "vpp-performance-changes-3n-hsw-cmp"
   data: "vpp-performance-changes-3n-hsw"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
@@ -2141,7 +2318,7 @@
     title: "rls1810"
     data: "vpp-performance-changes-3n-hsw-ref"
   compare:
-    title: "rls1901"
+    title: "rls1901.1"
     data: "vpp-performance-changes-3n-hsw-cmp"
   data: "vpp-performance-changes-3n-hsw"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
@@ -2165,7 +2342,7 @@
     title: "rls1810"
     data: "vpp-performance-changes-3n-hsw-ref"
   compare:
-    title: "rls1901"
+    title: "rls1901.1"
     data: "vpp-performance-changes-3n-hsw-cmp"
   data: "vpp-performance-changes-3n-hsw"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
@@ -2189,7 +2366,7 @@
     title: "rls1810"
     data: "vpp-performance-changes-3n-skx-ref"
   compare:
-    title: "rls1901"
+    title: "rls1901.1"
     data: "vpp-performance-changes-3n-skx-cmp"
   data: "vpp-performance-changes-3n-skx"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
@@ -2213,7 +2390,7 @@
     title: "rls1810"
     data: "vpp-performance-changes-3n-skx-ref"
   compare:
-    title: "rls1901"
+    title: "rls1901.1"
     data: "vpp-performance-changes-3n-skx-cmp"
   data: "vpp-performance-changes-3n-skx"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
@@ -2237,7 +2414,7 @@
     title: "rls1810"
     data: "vpp-performance-changes-3n-skx-ref"
   compare:
-    title: "rls1901"
+    title: "rls1901.1"
     data: "vpp-performance-changes-3n-skx-cmp"
   data: "vpp-performance-changes-3n-skx"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
@@ -2261,7 +2438,7 @@
     title: "rls1810"
     data: "vpp-performance-changes-3n-skx-ref"
   compare:
-    title: "rls1901"
+    title: "rls1901.1"
     data: "vpp-performance-changes-3n-skx-cmp"
   data: "vpp-performance-changes-3n-skx"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
@@ -2285,7 +2462,7 @@
     title: "rls1810"
     data: "vpp-performance-changes-2n-skx-ref"
   compare:
-    title: "rls1901"
+    title: "rls1901.1"
     data: "vpp-performance-changes-2n-skx-cmp"
   data: "vpp-performance-changes-2n-skx"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
@@ -2308,7 +2485,7 @@
     title: "rls1810"
     data: "vpp-performance-changes-2n-skx-ref"
   compare:
-    title: "rls1901"
+    title: "rls1901.1"
     data: "vpp-performance-changes-2n-skx-cmp"
   data: "vpp-performance-changes-2n-skx"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
@@ -2331,7 +2508,7 @@
     title: "rls1810"
     data: "vpp-performance-changes-2n-skx-ref"
   compare:
-    title: "rls1901"
+    title: "rls1901.1"
     data: "vpp-performance-changes-2n-skx-cmp"
   data: "vpp-performance-changes-2n-skx"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
@@ -2354,7 +2531,7 @@
     title: "rls1810"
     data: "vpp-performance-changes-2n-skx-ref"
   compare:
-    title: "rls1901"
+    title: "rls1901.1"
     data: "vpp-performance-changes-2n-skx-cmp"
   data: "vpp-performance-changes-2n-skx"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
@@ -2538,7 +2715,7 @@
     title: "rls1810"
     data: "vpp-performance-changes-3n-hsw-mrr-ref"
   compare:
-    title: "rls1901"
+    title: "rls1901.1"
     data: "vpp-performance-changes-3n-hsw-mrr-cmp"
   data: "vpp-performance-changes-3n-hsw-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
@@ -2562,7 +2739,7 @@
     title: "rls1810"
     data: "vpp-performance-changes-3n-hsw-mrr-ref"
   compare:
-    title: "rls1901"
+    title: "rls1901.1"
     data: "vpp-performance-changes-3n-hsw-mrr-cmp"
   data: "vpp-performance-changes-3n-hsw-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
@@ -2586,7 +2763,7 @@
     title: "rls1810"
     data: "vpp-performance-changes-3n-hsw-mrr-ref"
   compare:
-    title: "rls1901"
+    title: "rls1901.1"
     data: "vpp-performance-changes-3n-hsw-mrr-cmp"
   data: "vpp-performance-changes-3n-hsw-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
@@ -2610,7 +2787,7 @@
     title: "rls1810"
     data: "vpp-performance-changes-3n-skx-mrr-ref"
   compare:
-    title: "rls1901"
+    title: "rls1901.1"
     data: "vpp-performance-changes-3n-skx-mrr-cmp"
   data: "vpp-performance-changes-3n-skx-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
@@ -2634,7 +2811,7 @@
     title: "rls1810"
     data: "vpp-performance-changes-3n-skx-mrr-ref"
   compare:
-    title: "rls1901"
+    title: "rls1901.1"
     data: "vpp-performance-changes-3n-skx-mrr-cmp"
   data: "vpp-performance-changes-3n-skx-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
@@ -2658,7 +2835,7 @@
     title: "rls1810"
     data: "vpp-performance-changes-3n-skx-mrr-ref"
   compare:
-    title: "rls1901"
+    title: "rls1901.1"
     data: "vpp-performance-changes-3n-skx-mrr-cmp"
   data: "vpp-performance-changes-3n-skx-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
@@ -2682,7 +2859,7 @@
     title: "rls1810"
     data: "vpp-performance-changes-2n-skx-mrr-ref"
   compare:
-    title: "rls1901"
+    title: "rls1901.1"
     data: "vpp-performance-changes-2n-skx-mrr-cmp"
   data: "vpp-performance-changes-2n-skx-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
@@ -2706,7 +2883,7 @@
     title: "rls1810"
     data: "vpp-performance-changes-2n-skx-mrr-ref"
   compare:
-    title: "rls1901"
+    title: "rls1901.1"
     data: "vpp-performance-changes-2n-skx-mrr-cmp"
   data: "vpp-performance-changes-2n-skx-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
@@ -2730,7 +2907,7 @@
     title: "rls1810"
     data: "vpp-performance-changes-2n-skx-mrr-ref"
   compare:
-    title: "rls1901"
+    title: "rls1901.1"
     data: "vpp-performance-changes-2n-skx-mrr-cmp"
   data: "vpp-performance-changes-2n-skx-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
@@ -2960,15 +3137,15 @@
     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
 -
@@ -2982,15 +3159,15 @@
     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
 -
@@ -3004,15 +3181,15 @@
     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
 -
@@ -3026,15 +3203,15 @@
     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: "intel-dnv-vpp"
   filter: "'NDRPDR'"
   parameters:
   - "parent"
   - "name"
-  - "vat-history"
+  - "conf-history"
 
 # Test Operational Data - VPP Performance Operational Data 3n-hsw
 -
@@ -3224,15 +3401,15 @@
     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
 -
@@ -3246,15 +3423,15 @@
     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
 -
@@ -3268,15 +3445,15 @@
     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
 -
@@ -3290,15 +3467,15 @@
     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: "intel-dnv-vpp"
   filter: "'MRR'"
   parameters:
   - "parent"
   - "name"
-  - "vat-history"
+  - "conf-history"
 
 # Detailed Test Results - VPP Functional Results - Ubuntu
 -
@@ -3365,15 +3542,15 @@
     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
 -
@@ -3387,15 +3564,15 @@
     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
 -
@@ -3457,15 +3634,15 @@
     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-device-results-ubuntu"
   filter: "all"
   parameters:
   - "parent"
   - "name"
-  - "vat-history"
+  - "conf-history"
 
 ################################################################################
 
@@ -7687,10 +7864,10 @@
 # Packet Throughput - VPP Container Memif 2n-skx-x710
 -
   type: "plot"
-  title: "VPP Throughput: memif-2n-skx-x710-64b-2t1c-base-ndr"
+  title: "VPP Throughput: memif-2n-skx-x710-64b-2t1c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-2t1c-base-ndr"
+  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-2t1c-base_and_features-ndr"
   data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
@@ -7718,15 +7895,15 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "memif-2n-skx-x710-64b-2t1c-base-ndr"
+    title: "memif-2n-skx-x710-64b-2t1c-base_and_features-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: memif-2n-skx-x710-64b-2t1c-base-pdr"
+  title: "VPP Throughput: memif-2n-skx-x710-64b-2t1c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-2t1c-base-pdr"
+  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-2t1c-base_and_features-pdr"
   data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
@@ -7754,15 +7931,15 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "memif-2n-skx-x710-64b-2t1c-base-pdr"
+    title: "memif-2n-skx-x710-64b-2t1c-base_and_features-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: memif-2n-skx-x710-64b-4t2c-base-ndr"
+  title: "VPP Throughput: memif-2n-skx-x710-64b-4t2c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-4t2c-base-ndr"
+  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-4t2c-base_and_features-ndr"
   data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
@@ -7790,15 +7967,15 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "memif-2n-skx-x710-64b-4t2c-base-ndr"
+    title: "memif-2n-skx-x710-64b-4t2c-base_and_features-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: memif-2n-skx-x710-64b-4t2c-base-pdr"
+  title: "VPP Throughput: memif-2n-skx-x710-64b-4t2c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-4t2c-base-pdr"
+  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-4t2c-base_and_features-pdr"
   data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
@@ -7826,7 +8003,7 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "memif-2n-skx-x710-64b-4t2c-base-pdr"
+    title: "memif-2n-skx-x710-64b-4t2c-base_and_features-pdr"
     layout: "plot-throughput"
 
 # Packet Throughput - VPP Container Memif 2n-skx-xxv710
@@ -7870,7 +8047,7 @@
   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_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-xxv710-64b-2t1c-base_and_features-pdr"
   data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
@@ -9787,146 +9964,13 @@
     title: "ip4-3n-skx-x710-64b-4t2c-features-iacl-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"
-#  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"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           '2T1C' 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"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4-3n-skx-x710-64b-2t1c-features-oacl-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-oacl-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"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           '2T1C' 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"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4-3n-skx-x710-64b-2t1c-features-oacl-pdr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-oacl-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"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           '4T2C' 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"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4-3n-skx-x710-64b-4t2c-features-oacl-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-oacl-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"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           '4T2C' 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"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4-3n-skx-x710-64b-4t2c-features-oacl-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"
+  title: "VPP Throughput: ip4-3n-hsw-xl710-64b-1t1c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-1t1c-base-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
@@ -9950,15 +9994,15 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
+    title: "ip4-3n-hsw-xl710-64b-1t1c-base-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
+  title: "VPP Throughput: ip4-3n-hsw-xl710-64b-1t1c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-1t1c-base-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
@@ -9982,15 +10026,15 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
+    title: "ip4-3n-hsw-xl710-64b-1t1c-base-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
+  title: "VPP Throughput: ip4-3n-hsw-xl710-64b-2t2c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-2t2c-base-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
@@ -10014,15 +10058,15 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
+    title: "ip4-3n-hsw-xl710-64b-2t2c-base-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
+  title: "VPP Throughput: ip4-3n-hsw-xl710-64b-2t2c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-2t2c-base-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
@@ -10046,7 +10090,7 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
+    title: "ip4-3n-hsw-xl710-64b-2t2c-base-pdr"
     layout: "plot-throughput"
 
 # Packet Throughput - VPP IPv4 3n-skx-x710 base and scale
@@ -10609,139 +10653,6 @@
     title: "ip4-3n-hsw-x710-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"
-#  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
-#           '64B' and
-#           'NDRPDR' and
-#           '1T1C' 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"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4-3n-hsw-x710-64b-1t1c-features-oacl-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4-3n-hsw-x710-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
-#           '64B' and
-#           'NDRPDR' and
-#           '1T1C' 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"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4-3n-hsw-x710-64b-1t1c-features-oacl-pdr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4-3n-hsw-x710-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
-#           '64B' and
-#           'NDRPDR' and
-#           '2T2C' 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"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4-3n-hsw-x710-64b-2t2c-features-oacl-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4-3n-hsw-x710-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
-#           '64B' and
-#           'NDRPDR' and
-#           '2T2C' 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"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4-3n-hsw-x710-64b-2t2c-features-oacl-pdr"
-#    layout: "plot-throughput"
-
 # Packet Throughput - VPP IPv4 2n-skx-x710 base and scale
 -
   type: "plot"
@@ -11127,139 +11038,6 @@
 
 ################################################################################
 
-## 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"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'ENCAP' and
-#           'NDRPDR' and
-#           '1T1C' and
-#           ('VXLAN' or 'LISP') and
-#           not 'VHOST' and
-#           not 'IPSECHW'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "not DOT1Q"
-#  - "VXLAN_1"
-#  - "VXLAN_10"
-#  - "VXLAN_100"
-#  - "VXLAN_1000"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'ENCAP' and
-#           'NDRPDR' and
-#           '1T1C' and
-#           ('VXLAN' or 'LISP') and
-#           not 'VHOST' and
-#           not 'IPSECHW'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "not DOT1Q"
-#  - "VXLAN_1"
-#  - "VXLAN_10"
-#  - "VXLAN_100"
-#  - "VXLAN_1000"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'ENCAP' and
-#           'NDRPDR' and
-#           '2T2C' and
-#           ('VXLAN' or 'LISP') and
-#           not 'VHOST' and
-#           not 'IPSECHW'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "not DOT1Q"
-#  - "VXLAN_1"
-#  - "VXLAN_10"
-#  - "VXLAN_100"
-#  - "VXLAN_1000"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'ENCAP' and
-#           'NDRPDR' and
-#           '2T2C' and
-#           ('VXLAN' or 'LISP') and
-#           not 'VHOST' and
-#           not 'IPSECHW'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "not DOT1Q"
-#  - "VXLAN_1"
-#  - "VXLAN_10"
-#  - "VXLAN_100"
-#  - "VXLAN_1000"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
-#    layout: "plot-throughput"
-
 # Packet Throughput - VPP IPv4 tunnels 3n-hsw-x520 - features
 -
   type: "plot"
@@ -11938,10 +11716,10 @@
 # Packet Throughput - VPP IPv6 3n-hsw-x520
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-x520-78b-1t1c-base_and_scale-ndr"
+  title: "VPP Throughput: ip6-3n-hsw-x520-78b-1t1c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-1t1c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-1t1c-base-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
@@ -11966,15 +11744,15 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-3n-hsw-x520-78b-1t1c-base_and_scale-ndr"
+    title: "ip6-3n-hsw-x520-78b-1t1c-base-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-x520-78b-1t1c-base_and_scale-pdr"
+  title: "VPP Throughput: ip6-3n-hsw-x520-78b-1t1c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-1t1c-base_and_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-1t1c-base-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
@@ -11999,15 +11777,15 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-3n-hsw-x520-78b-1t1c-base_and_scale-pdr"
+    title: "ip6-3n-hsw-x520-78b-1t1c-base-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-x520-78b-2t2c-base_and_scale-ndr"
+  title: "VPP Throughput: ip6-3n-hsw-x520-78b-2t2c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-2t2c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-2t2c-base-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
@@ -12032,15 +11810,15 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-3n-hsw-x520-78b-2t2c-base_and_scale-ndr"
+    title: "ip6-3n-hsw-x520-78b-2t2c-base-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-x520-78b-2t2c-base_and_scale-pdr"
+  title: "VPP Throughput: ip6-3n-hsw-x520-78b-2t2c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-2t2c-base_and_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-2t2c-base-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
@@ -12065,153 +11843,8 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-3n-hsw-x520-78b-2t2c-base_and_scale-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"
-#  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
-#           'NDRPDR' and
-#           '1T1C' and
-#           'IP6FWD' and
-#           not 'SRv6' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP6BASE"
-#  - "POLICE_MARK"
-#  - "COPWHLIST"
-#  - "IACLDST"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip6-3n-hsw-x520-78b-1t1c-base_and_features-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip6-3n-hsw-x520-78b-2t2c-base_and_features-ndr"
-#  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
-#           'NDRPDR' and
-#           '2T2C' and
-#           'IP6FWD' and
-#           not 'SRv6' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP6BASE"
-#  - "POLICE_MARK"
-#  - "COPWHLIST"
-#  - "IACLDST"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip6-3n-hsw-x520-78b-2t2c-base_and_features-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip6-3n-hsw-x520-78b-1t1c-base_and_features-pdr"
-#  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
-#           'NDRPDR' and
-#           '1T1C' and
-#           'IP6FWD' and
-#           not 'SRv6' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP6BASE"
-#  - "POLICE_MARK"
-#  - "COPWHLIST"
-#  - "IACLDST"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip6-3n-hsw-x520-78b-1t1c-base_and_features-pdr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip6-3n-hsw-x520-78b-2t2c-base_and_features-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
-#           'NDRPDR' and
-#           '2T2C' and
-#           'IP6FWD' and
-#           not 'SRv6' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP6BASE"
-#  - "POLICE_MARK"
-#  - "COPWHLIST"
-#  - "IACLDST"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip6-3n-hsw-x520-78b-2t2c-base_and_features-pdr"
-#    layout: "plot-throughput"
+    title: "ip6-3n-hsw-x520-78b-2t2c-base-pdr"
+    layout: "plot-throughput"
 
 # Packet Throughput - VPP IPv6 3n-hsw-x710
 -
@@ -12494,10 +12127,10 @@
 # Packet Throughput - VPP IPv6 3n-hsw-xl710
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-xl710-78b-1t1c-base_and_scale-ndr"
+  title: "VPP Throughput: ip6-3n-hsw-xl710-78b-1t1c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-1t1c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-1t1c-base-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '78B' and
@@ -12522,15 +12155,15 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-3n-hsw-xl710-78b-1t1c-base_and_scale-ndr"
+    title: "ip6-3n-hsw-xl710-78b-1t1c-base-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-xl710-78b-1t1c-base_and_scale-pdr"
+  title: "VPP Throughput: ip6-3n-hsw-xl710-78b-1t1c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-1t1c-base_and_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-1t1c-base-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '78B' and
@@ -12555,15 +12188,15 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-3n-hsw-xl710-78b-1t1c-base_and_scale-pdr"
+    title: "ip6-3n-hsw-xl710-78b-1t1c-base-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-xl710-78b-2t2c-base_and_scale-ndr"
+  title: "VPP Throughput: ip6-3n-hsw-xl710-78b-2t2c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-2t2c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-2t2c-base-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '78B' and
@@ -12588,15 +12221,15 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-3n-hsw-xl710-78b-2t2c-base_and_scale-ndr"
+    title: "ip6-3n-hsw-xl710-78b-2t2c-base-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-xl710-78b-2t2c-base_and_scale-pdr"
+  title: "VPP Throughput: ip6-3n-hsw-xl710-78b-2t2c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-2t2c-base_and_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-2t2c-base-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '78B' and
@@ -12621,7 +12254,7 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-3n-hsw-xl710-78b-2t2c-base_and_scale-pdr"
+    title: "ip6-3n-hsw-xl710-78b-2t2c-base-pdr"
     layout: "plot-throughput"
 
 # Packet Throughput - VPP IPv6 3n-skx-x710
@@ -13294,10 +12927,10 @@
 # Packet Throughput - VPP IPv6 tunnels 3n-hsw-x520
 -
   type: "plot"
-  title: "VPP Throughput: ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-ndr"
+  title: "VPP Throughput: ip6tun-3n-hsw-x520-78b-1t1c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-1t1c-base-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
@@ -13318,15 +12951,15 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-ndr"
+    title: "ip6tun-3n-hsw-x520-78b-1t1c-base-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-pdr"
+  title: "VPP Throughput: ip6tun-3n-hsw-x520-78b-1t1c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-1t1c-base-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
@@ -13347,15 +12980,15 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-pdr"
+    title: "ip6tun-3n-hsw-x520-78b-1t1c-base-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6tun-3n-hsw-x520-78b-2t2c-base_and_scale-ndr"
+  title: "VPP Throughput: ip6tun-3n-hsw-x520-78b-2t2c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-2t2c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-2t2c-base-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
@@ -13376,15 +13009,15 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6tun-3n-hsw-x520-78b-2t2c-base_and_scale-ndr"
+    title: "ip6tun-3n-hsw-x520-78b-2t2c-base-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6tun-3n-hsw-x520-78b-2t2c-base_and_scale-pdr"
+  title: "VPP Throughput: ip6tun-3n-hsw-x520-78b-2t2c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-2t2c-base_and_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-2t2c-base-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
@@ -13405,7 +13038,7 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6tun-3n-hsw-x520-78b-2t2c-base_and_scale-pdr"
+    title: "ip6tun-3n-hsw-x520-78b-2t2c-base-pdr"
     layout: "plot-throughput"
 
 ################################################################################
@@ -13983,154 +13616,13 @@
     title: "vhost-ip4-3n-hsw-x520-64b-2t2c-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"
-#  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
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '1T1C' and
-#           'L2BDMACLRN' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  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-x520-64b-1t1c-base_and_scale-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '2T2C' and
-#           'L2BDMACLRN' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  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-x520-64b-2t2c-base_and_scale-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '1T1C' and
-#           'L2BDMACLRN' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  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-x520-64b-1t1c-base_and_scale-pdr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '2T2C' and
-#           'L2BDMACLRN' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  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-x520-64b-2t2c-base_and_scale-pdr"
-#    layout: "plot-throughput"
-
 # Packet Throughput - VPP vhost l2sw 3n-hsw-x520 - base
 -
   type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-1t1c-base-ndr"
+  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base-ndr"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
@@ -14159,15 +13651,15 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base-ndr"
+    title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-1t1c-base-pdr"
+  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base-pdr"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_features-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
@@ -14196,15 +13688,15 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base-pdr"
+    title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_features-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-2t2c-base-ndr"
+  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base-ndr"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
@@ -14233,15 +13725,15 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-hsw-x520-64b-2t2c-base-ndr"
+    title: "vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-2t2c-base-pdr"
+  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base-pdr"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_features-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
@@ -14270,7 +13762,7 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-hsw-x520-64b-2t2c-base-pdr"
+    title: "vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_features-pdr"
     layout: "plot-throughput"
 
 # Packet Throughput - VPP vhost l2sw 3n-hsw-x520 - base vm
@@ -14547,154 +14039,13 @@
     title: "vhost-ip4-3n-hsw-x710-64b-2t2c-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"
-#  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
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '1T1C' and
-#           'L2BDMACLRN' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  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-x710-64b-1t1c-base_and_scale-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/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
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '2T2C' and
-#           'L2BDMACLRN' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  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-x710-64b-2t2c-base_and_scale-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/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
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '1T1C' and
-#           'L2BDMACLRN' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  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-x710-64b-1t1c-base_and_scale-pdr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/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
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '2T2C' and
-#           'L2BDMACLRN' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  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-x710-64b-2t2c-base_and_scale-pdr"
-#    layout: "plot-throughput"
-
 # Packet Throughput - VPP vhost l2sw 3n-hsw-x710 - base
 -
   type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-1t1c-base-ndr"
+  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base-ndr"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
@@ -14723,15 +14074,15 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base-ndr"
+    title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-1t1c-base-pdr"
+  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base-pdr"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
@@ -14760,15 +14111,15 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base-pdr"
+    title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-2t2c-base-ndr"
+  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base-ndr"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
@@ -14797,15 +14148,15 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base-ndr"
+    title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-2t2c-base-pdr"
+  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base-pdr"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
@@ -14834,16 +14185,16 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base-pdr"
+    title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-pdr"
     layout: "plot-throughput"
 
 # Packet Throughput - VPP vhost l2sw 3n-hsw-x710 - base vm
 -
   type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-1t1c-base-vm-ndr"
+  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-vm-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base-vm-ndr"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-vm-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
@@ -14872,15 +14223,15 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base-vm-ndr"
+    title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-vm-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-1t1c-base-vm-pdr"
+  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-vm-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base-vm-pdr"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-vm-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
@@ -14909,15 +14260,15 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base-vm-pdr"
+    title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-vm-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-2t2c-base-vm-ndr"
+  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-vm-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base-vm-ndr"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-vm-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
@@ -14946,15 +14297,15 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base-vm-ndr"
+    title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-vm-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-2t2c-base-vm-pdr"
+  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-vm-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base-vm-pdr"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-vm-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
@@ -14983,557 +14334,9 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base-vm-pdr"
+    title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-vm-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"
-#  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"
-#  filter: "'NIC_Intel-XL710' and
-#           '64B' and
-#           'NDRPDR' and
-#           'ETH' and
-#           'IP4FWD' and
-#           '1T1C' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'DOT1Q'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "1VM"
-#  - "2VM"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
-#  data: "plot-vpp-throughput-latency-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'"
-#  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"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
-#  data: "plot-vpp-throughput-latency-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'"
-#  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"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
-#  data: "plot-vpp-throughput-latency-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'"
-#  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"
-#    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"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '1T1C' and
-#           'L2BDMACLRN' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  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"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
-#  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:
-#  - "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"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
-#  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:
-#  - "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"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
-#  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:
-#  - "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"
-#    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"
-#  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
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           'BASE' and
-#           '1T1C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "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"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-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
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           'BASE' and
-#           '1T1C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "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"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-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
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           'BASE' and
-#           '2T2C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "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"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-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
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           'BASE' and
-#           '2T2C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "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"
-#    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"
-#  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
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '1T1C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'CFS_OPT' and
-#           not 'VXLAN' and
-#           not 'IP4FWD'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "1VM"
-##  - "L2XCFWD"
-##  - "1VM"
-##  - "L2BDMACLRN"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-vm-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-vm-pdr"
-#  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
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '1T1C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'CFS_OPT' and
-#           not 'VXLAN' and
-#           not 'IP4FWD'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "1VM"
-##  - "L2XCFWD"
-##  - "1VM"
-##  - "L2BDMACLRN"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-vm-pdr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-vm-ndr"
-#  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
-#           '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'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "1VM"
-##  - "L2XCFWD"
-##  - "1VM"
-##  - "L2BDMACLRN"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-vm-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-vm-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
-#           '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'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "1VM"
-##  - "L2XCFWD"
-##  - "1VM"
-##  - "L2BDMACLRN"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-vm-pdr"
-#    layout: "plot-throughput"
-
 # Packet Throughput - VPP vhost ip4 3n-skx-x710
 -
   type: "plot"
@@ -15659,154 +14462,13 @@
     title: "vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-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"
-#  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
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '2T1C' and
-#           'L2BDMACLRN' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  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-skx-x710-64b-2t1c-base_and_scale-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
-#  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
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '4T2C' and
-#           'L2BDMACLRN' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  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-skx-x710-64b-4t2c-base_and_scale-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
-#  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
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '2T1C' and
-#           'L2BDMACLRN' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  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-skx-x710-64b-2t1c-base_and_scale-pdr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-4t2c-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_and_scale-pdr"
-#  data: "plot-vpp-throughput-latency-3n-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:
-#  - "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-skx-x710-64b-4t2c-base_and_scale-pdr"
-#    layout: "plot-throughput"
-
 # Packet Throughput - VPP vhost l2sw 3n-skx-x710 - base
 -
   type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-2t1c-base-ndr"
+  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-2t1c-base-ndr"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-ndr"
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
@@ -15818,8 +14480,7 @@
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not '2VM' and
-           not 'LBOND'"
+           not '2VM'"
   parameters:
   - "throughput"
   - "parent"
@@ -15827,6 +14488,8 @@
   sort:
   - "L2BDMACLRN"
   - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
   - "L2XCFWD"
   - "L2XCFWD"
   traces:
@@ -15834,15 +14497,15 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-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-3n-skx-x710-64b-2t1c-base-pdr"
+  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-2t1c-base-pdr"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-pdr"
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
@@ -15854,8 +14517,7 @@
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not '2VM' and
-           not 'LBOND'"
+           not '2VM'"
   parameters:
   - "throughput"
   - "parent"
@@ -15863,6 +14525,8 @@
   sort:
   - "L2BDMACLRN"
   - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
   - "L2XCFWD"
   - "L2XCFWD"
   traces:
@@ -15870,15 +14534,15 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-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-3n-skx-x710-64b-4t2c-base-ndr"
+  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-4t2c-base-ndr"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-ndr"
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
@@ -15890,8 +14554,7 @@
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not '2VM' and
-           not 'LBOND'"
+           not '2VM'"
   parameters:
   - "throughput"
   - "parent"
@@ -15899,6 +14562,8 @@
   sort:
   - "L2BDMACLRN"
   - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
   - "L2XCFWD"
   - "L2XCFWD"
   traces:
@@ -15906,15 +14571,15 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-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-3n-skx-x710-64b-4t2c-base-pdr"
+  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-4t2c-base-pdr"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-pdr"
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
@@ -15926,8 +14591,7 @@
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not '2VM' and
-           not 'LBOND'"
+           not '2VM'"
   parameters:
   - "throughput"
   - "parent"
@@ -15935,6 +14599,8 @@
   sort:
   - "L2BDMACLRN"
   - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
   - "L2XCFWD"
   - "L2XCFWD"
   traces:
@@ -15942,16 +14608,16 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-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 3n-skx-x710 - base vm
 -
   type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-2t1c-base-vm-ndr"
+  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-vm-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-2t1c-base-vm-ndr"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-vm-ndr"
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
@@ -15980,15 +14646,15 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-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-3n-skx-x710-64b-2t1c-base-vm-pdr"
+  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-vm-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-2t1c-base-vm-pdr"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-vm-pdr"
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
@@ -16017,15 +14683,15 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-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-3n-skx-x710-64b-4t2c-base-vm-ndr"
+  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-vm-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-4t2c-base-vm-ndr"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-vm-ndr"
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
@@ -16054,15 +14720,15 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-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-3n-skx-x710-64b-4t2c-base-vm-pdr"
+  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-vm-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-4t2c-base-vm-pdr"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-vm-pdr"
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
@@ -16091,7 +14757,7 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-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-x710
@@ -16227,158 +14893,13 @@
     title: "vhost-ip4-2n-skx-x710-64b-4t2c-base_and_scale-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"
-#  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"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '2T1C' and
-#           'L2BDMACLRN' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'NF_DENSITY' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  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-2n-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"
-#  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"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '4T2C' and
-#           'L2BDMACLRN' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'NF_DENSITY' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  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-2n-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"
-#  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"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '2T1C' and
-#           'L2BDMACLRN' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'NF_DENSITY' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  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-2n-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"
-#  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"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '4T2C' and
-#           'L2BDMACLRN' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'NF_DENSITY' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  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-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
-#    layout: "plot-throughput"
-
 # Packet Throughput - VPP vhost l2sw 2n-skx-x710 - base
 -
   type: "plot"
-  title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-2t1c-base-ndr"
+  title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-2t1c-base-ndr"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_features-ndr"
   data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
@@ -16406,15 +14927,15 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-2n-skx-x710-64b-2t1c-base-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-x710-64b-2t1c-base-pdr"
+  title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-2t1c-base-pdr"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_features-pdr"
   data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
@@ -16442,15 +14963,15 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-2n-skx-x710-64b-2t1c-base-pdr"
+    title: "vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_features-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-4t2c-base-ndr"
+  title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-4t2c-base-ndr"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_features-ndr"
   data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
@@ -16478,15 +14999,15 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-2n-skx-x710-64b-4t2c-base-ndr"
+    title: "vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_features-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-4t2c-base-pdr"
+  title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-4t2c-base-pdr"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_features-pdr"
   data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
@@ -16514,7 +15035,7 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-2n-skx-x710-64b-4t2c-base-pdr"
+    title: "vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_features-pdr"
     layout: "plot-throughput"
 
 # Packet Throughput - VPP vhost l2sw 2n-skx-x710 - base vm
@@ -16791,154 +15312,13 @@
     title: "vhost-ip4-2n-skx-xxv710-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"
-#  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
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '2T1C' and
-#           'L2BDMACLRN' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  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-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-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-4t2c-base_and_scale-ndr"
-#  data: "plot-vpp-throughput-latency-2n-skx"
-#  filter: "'NIC_Intel-XXV710' 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:
-#  - "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-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-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-2t1c-base_and_scale-pdr"
-#  data: "plot-vpp-throughput-latency-2n-skx"
-#  filter: "'NIC_Intel-XXV710' 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:
-#  - "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-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_and_scale-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
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '4T2C' and
-#           'L2BDMACLRN' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  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-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-ndr"
+  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-ndr"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_features-ndr"
   data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
@@ -16965,15 +15345,15 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-ndr"
+    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-pdr"
+  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-pdr"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_features-pdr"
   data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
@@ -17000,15 +15380,15 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-pdr"
+    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-ndr"
+  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-ndr"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_features-ndr"
   data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
@@ -17035,15 +15415,15 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-ndr"
+    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-pdr"
+  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-pdr"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_features-pdr"
   data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
@@ -17070,7 +15450,7 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-pdr"
+    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
@@ -18876,8 +17256,8 @@
   - "tags"
   sort:
   - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
   - "FIB_10K"
   - "FIB_100K"
   - "FIB_1M"
@@ -18907,8 +17287,8 @@
   - "tags"
   sort:
   - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
   - "FIB_10K"
   - "FIB_100K"
   - "FIB_1M"
@@ -18931,6 +17311,7 @@
            (('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"
@@ -18959,6 +17340,7 @@
            (('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"
@@ -18976,14 +17358,14 @@
 # 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"
+  title: "VPP Latency: l2sw-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
-           ('BASE' or 'SCALE') and
+           'BASE' and
            'NDRPDR' and
            'ETH' and
            '1T1C' and
@@ -18996,25 +17378,22 @@
   - "tags"
   sort:
   - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
   layout:
-    title: "l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
+    title: "l2sw-3n-hsw-xl710-64b-1t1c-base-ndr"
     layout: "plot-latency"
 
 -
   type: "plot"
-  title: "VPP Latency: l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat"
+  title: "VPP Latency: l2sw-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
-           ('BASE' or 'SCALE') and
+           'BASE' and
            'NDRPDR' and
            'ETH' and
            '2T2C' and
@@ -19027,13 +17406,10 @@
   - "tags"
   sort:
   - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
   layout:
-    title: "l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
+    title: "l2sw-3n-hsw-xl710-64b-2t2c-base-ndr"
     layout: "plot-latency"
 
 # Packet Latency - VPP L2 3n-skx-x710 base and scale
@@ -19116,6 +17492,8 @@
            (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
            not 'ACL' and
            not 'VHOST' and
+           not 'DRV_AVF' and
+           not 'L2OVRLAY' and
            not 'MEMIF'"
   parameters:
   - "latency"
@@ -19144,6 +17522,8 @@
            (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
            not 'ACL' and
            not 'VHOST' and
+           not 'DRV_AVF' and
+           not 'L2OVRLAY' and
            not 'MEMIF'"
   parameters:
   - "latency"
@@ -19161,10 +17541,10 @@
 # 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"
+  title: "VPP Latency: l2sw-3n-skx-xxv710-64b-2t1c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-2t1c-base-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
@@ -19174,29 +17554,26 @@
            '2T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           not 'MEMIF' and
-           not 'DRV_AVF'"
+           not 'MEMIF'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
   sort:
   - "L2PATCH"
+  - "L2PATCH"
   - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+  - "L2BDMACLRN"
   layout:
-    title: "l2sw-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
+    title: "l2sw-3n-skx-xxv710-64b-2t1c-base-ndr"
     layout: "plot-latency"
 
 -
   type: "plot"
-  title: "VPP Latency: l2sw-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
+  title: "VPP Latency: l2sw-3n-skx-xxv710-64b-4t2c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-4t2c-base-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
@@ -19206,21 +17583,18 @@
            '4T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           not 'MEMIF' and
-           not 'DRV_AVF'"
+           not 'MEMIF'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
   sort:
   - "L2PATCH"
+  - "L2PATCH"
   - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+  - "L2BDMACLRN"
   layout:
-    title: "l2sw-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
+    title: "l2sw-3n-skx-xxv710-64b-4t2c-base-ndr"
     layout: "plot-latency"
 
 # Packet Latency - VPP L2 2n-skx-x710 base and scale
@@ -19354,17 +17728,17 @@
 # Packet Latency - VPP Container Memif 3n-hsw-x520
 -
   type: "plot"
-  title: "VPP Latency: memif-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
+  title: "VPP Latency: memif-3n-hsw-x520-64b-1t1c-base_and_features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/memif-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
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
@@ -19378,23 +17752,24 @@
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
+  - "IP4FWD"
   layout:
-    title: "memif-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
+    title: "memif-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
     layout: "plot-latency"
 
 -
   type: "plot"
-  title: "VPP Latency: memif-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
+  title: "VPP Latency: memif-3n-hsw-x520-64b-2t2c-base_and_features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/memif-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
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
@@ -19408,24 +17783,25 @@
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
+  - "IP4FWD"
   layout:
-    title: "memif-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
+    title: "memif-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
     layout: "plot-latency"
 
 # Packet Latency - VPP Container Memif 3n-hsw-x710
 -
   type: "plot"
-  title: "VPP Latency: memif-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
+  title: "VPP Latency: memif-3n-hsw-x710-64b-1t1c-base_and_features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-1t1c-base_and_features-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
@@ -19439,23 +17815,24 @@
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
+  - "IP4FWD"
   layout:
-    title: "memif-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
+    title: "memif-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
     layout: "plot-latency"
 
 -
   type: "plot"
-  title: "VPP Latency: memif-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
+  title: "VPP Latency: memif-3n-hsw-x710-64b-2t2c-base_and_features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-2t2c-base_and_features-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
@@ -19469,24 +17846,25 @@
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
+  - "IP4FWD"
   layout:
-    title: "memif-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+    title: "memif-3n-hsw-x710-64b-2t2c-base_and_features-ndr"
     layout: "plot-latency"
 
 # Packet Latency - VPP Container Memif 3n-hsw-xl710
 -
   type: "plot"
-  title: "VPP Latency: memif-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat"
+  title: "VPP Latency: memif-3n-hsw-xl710-64b-1t1c-base_and_features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-1t1c-base_and_features-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
@@ -19500,23 +17878,24 @@
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
+  - "IP4FWD"
   layout:
-    title: "memif-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
+    title: "memif-3n-hsw-xl710-64b-1t1c-base_and_features-ndr"
     layout: "plot-latency"
 
 -
   type: "plot"
-  title: "VPP Latency: memif-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat"
+  title: "VPP Latency: memif-3n-hsw-xl710-64b-2t2c-base_and_features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-2t2c-base_and_features-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
@@ -19530,24 +17909,25 @@
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
+  - "IP4FWD"
   layout:
-    title: "memif-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
+    title: "memif-3n-hsw-xl710-64b-2t2c-base_and_features-ndr"
     layout: "plot-latency"
 
 # Packet Latency - VPP Container Memif 3n-skx-x710
 -
   type: "plot"
-  title: "VPP Latency: memif-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
+  title: "VPP Latency: memif-3n-skx-x710-64b-2t1c-base_and_features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-2t1c-base_and_features-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
@@ -19561,23 +17941,24 @@
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
+  - "IP4FWD"
   layout:
-    title: "memif-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+    title: "memif-3n-skx-x710-64b-2t1c-base_and_features-ndr"
     layout: "plot-latency"
 
 -
   type: "plot"
-  title: "VPP Latency: memif-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
+  title: "VPP Latency: memif-3n-skx-x710-64b-4t2c-base_and_features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-4t2c-base_and_features-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
@@ -19591,25 +17972,27 @@
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
+  - "IP4FWD"
   layout:
-    title: "memif-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
+    title: "memif-3n-skx-x710-64b-4t2c-base_and_features-ndr"
     layout: "plot-latency"
 
 # Packet Latency - VPP Container Memif 2n-skx-x710
 -
   type: "plot"
-  title: "VPP Latency: memif-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
+  title: "VPP Latency: memif-2n-skx-x710-64b-2t1c-base_and_features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-2t1c-base_and_features-ndr-lat"
   data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
+           not 'NF_DENSITY' and
            'MEMIF'"
   parameters:
   - "latency"
@@ -19622,24 +18005,26 @@
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
+  - "IP4FWD"
   layout:
-    title: "memif-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
+    title: "memif-2n-skx-x710-64b-2t1c-base_and_features-ndr"
     layout: "plot-latency"
 
 -
   type: "plot"
-  title: "VPP Latency: memif-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
+  title: "VPP Latency: memif-2n-skx-x710-64b-4t2c-base_and_features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-4t2c-base_and_features-ndr-lat"
   data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
+           not 'NF_DENSITY' and
            'MEMIF'"
   parameters:
   - "latency"
@@ -19652,24 +18037,25 @@
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
+  - "IP4FWD"
   layout:
-    title: "memif-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
+    title: "memif-2n-skx-x710-64b-4t2c-base_and_features-ndr"
     layout: "plot-latency"
 
 # Packet Latency - VPP Container Memif 2n-skx-xxv710
 -
   type: "plot"
-  title: "VPP Latency: memif-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
+  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_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-xxv710-64b-2t1c-base_and_features-ndr-lat"
   data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
@@ -19683,23 +18069,24 @@
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
+  - "IP4FWD"
   layout:
-    title: "memif-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
+    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_scale-ndr-lat"
+  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_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-xxv710-64b-4t2c-base_and_features-ndr-lat"
   data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
@@ -19713,8 +18100,9 @@
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
+  - "IP4FWD"
   layout:
-    title: "memif-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
+    title: "memif-2n-skx-xxv710-64b-4t2c-base_and_features-ndr"
     layout: "plot-latency"
 
 ################################################################################
@@ -19980,6 +18368,7 @@
            '1T1C' and
            'IP4FWD' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "latency"
@@ -20009,6 +18398,7 @@
            '2T2C' and
            'IP4FWD' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "latency"
@@ -20108,7 +18498,8 @@
            'NDRPDR' and
            '1T1C' and
            'IP4FWD' and
-           'NAT44' and
+           ('NAT44' or 'IP4BASE') and
+           not 'DOT1Q' and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -20116,7 +18507,7 @@
   - "parent"
   - "tags"
   sort:
-  - "BASE"
+  - "IP4BASE"
   - "BASE"
   - "SRC_USER_10"
   - "SRC_USER_100"
@@ -20138,7 +18529,8 @@
            'NDRPDR' and
            '2T2C' and
            'IP4FWD' and
-           'NAT44' and
+           ('NAT44' or 'IP4BASE') and
+           not 'DOT1Q' and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -20146,7 +18538,7 @@
   - "parent"
   - "tags"
   sort:
-  - "BASE"
+  - "IP4BASE"
   - "BASE"
   - "SRC_USER_10"
   - "SRC_USER_100"
@@ -20169,15 +18561,16 @@
            'NDRPDR' and
            '1T1C' and
            'IP4FWD' and
-           'IACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
   sort:
+  - "IP4BASE"
   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   - "ACL_STATELESS"
@@ -20198,15 +18591,16 @@
            'NDRPDR' and
            '2T2C' and
            'IP4FWD' and
-           'IACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
   sort:
+  - "IP4BASE"
   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   - "ACL_STATELESS"
@@ -20228,15 +18622,16 @@
            'NDRPDR' and
            '1T1C' and
            'IP4FWD' and
-           'OACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           ('OACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
   sort:
+  - "IP4BASE"
   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   - "ACL_STATELESS"
@@ -20257,15 +18652,16 @@
            'NDRPDR' and
            '2T2C' and
            'IP4FWD' and
-           'OACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           ('OACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
   sort:
+  - "IP4BASE"
   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   - "ACL_STATELESS"
@@ -20289,13 +18685,13 @@
            '1T1C' and
            'IP4FWD' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
   sort:
-  - "DOT1Q"
   - "IP4BASE"
   - "FIB_20K"
   - "FIB_200K"
@@ -20318,13 +18714,13 @@
            '2T2C' and
            'IP4FWD' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
   sort:
-  - "DOT1Q"
   - "IP4BASE"
   - "FIB_20K"
   - "FIB_200K"
@@ -20358,6 +18754,7 @@
   - "parent"
   - "tags"
   sort:
+  - "DOT1Q"
   - "IP4BASE"
   - "NAT44"
   - "POLICE_MARK"
@@ -20392,6 +18789,7 @@
   - "parent"
   - "tags"
   sort:
+  - "DOT1Q"
   - "IP4BASE"
   - "NAT44"
   - "POLICE_MARK"
@@ -20415,7 +18813,7 @@
            'NDRPDR' and
            '1T1C' and
            'IP4FWD' and
-           'NAT44' and
+           ('NAT44' or 'IP4BASE') and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -20423,7 +18821,7 @@
   - "parent"
   - "tags"
   sort:
-  - "BASE"
+  - "IP4BASE"
   - "BASE"
   - "SRC_USER_10"
   - "SRC_USER_100"
@@ -20445,7 +18843,7 @@
            'NDRPDR' and
            '2T2C' and
            'IP4FWD' and
-           'NAT44' and
+           ('NAT44' or 'IP4BASE') and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -20453,7 +18851,7 @@
   - "parent"
   - "tags"
   sort:
-  - "BASE"
+  - "IP4BASE"
   - "BASE"
   - "SRC_USER_10"
   - "SRC_USER_100"
@@ -20476,8 +18874,7 @@
            'NDRPDR' and
            '1T1C' and
            'IP4FWD' and
-           'IACL' 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:
@@ -20485,6 +18882,7 @@
   - "parent"
   - "tags"
   sort:
+  - "IP4BASE"
   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   - "ACL_STATELESS"
@@ -20505,8 +18903,7 @@
            'NDRPDR' and
            '2T2C' and
            'IP4FWD' and
-           'IACL' 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:
@@ -20514,6 +18911,7 @@
   - "parent"
   - "tags"
   sort:
+  - "IP4BASE"
   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   - "ACL_STATELESS"
@@ -20522,72 +18920,13 @@
     title: "ip4-3n-hsw-x710-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"
-#  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
-#           '64B' and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'IP4FWD' and
-#           'OACL' 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-hsw-x710-64b-1t1c-features-oacl-ndr"
-#    layout: "plot-latency"
-#
-#-
-#  type: "plot"
-#  title: "VPP Latency: ip4-3n-hsw-x710-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
-#           '64B' and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'IP4FWD' and
-#           'OACL' 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-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"
+  title: "VPP Latency: ip4-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
@@ -20607,15 +18946,15 @@
   - "FIB_200K"
   - "FIB_2M"
   layout:
-    title: "ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
+    title: "ip4-3n-hsw-xl710-64b-1t1c-base-ndr"
     layout: "plot-latency"
 
 -
   type: "plot"
-  title: "VPP Latency: ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat"
+  title: "VPP Latency: ip4-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
@@ -20635,7 +18974,7 @@
   - "FIB_200K"
   - "FIB_2M"
   layout:
-    title: "ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
+    title: "ip4-3n-hsw-xl710-64b-2t2c-base-ndr"
     layout: "plot-latency"
 
 # Packet Latency - VPP IPv4 3n-skx-x710 base and scale
@@ -20653,6 +18992,7 @@
            '2T1C' and
            'IP4FWD' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "latency"
@@ -20681,6 +19021,7 @@
            '4T2C' and
            'IP4FWD' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "latency"
@@ -20720,6 +19061,7 @@
   - "parent"
   - "tags"
   sort:
+  - "DOT1Q"
   - "IP4BASE"
   - "NAT44"
   - "POLICE_MARK"
@@ -20754,6 +19096,7 @@
   - "parent"
   - "tags"
   sort:
+  - "DOT1Q"
   - "IP4BASE"
   - "NAT44"
   - "POLICE_MARK"
@@ -20777,7 +19120,7 @@
            'NDRPDR' and
            '2T1C' and
            'IP4FWD' and
-           'NAT44' and
+           ('NAT44' or 'IP4BASE') and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -20785,7 +19128,7 @@
   - "parent"
   - "tags"
   sort:
-  - "BASE"
+  - "IP4BASE"
   - "BASE"
   - "SRC_USER_10"
   - "SRC_USER_100"
@@ -20807,7 +19150,7 @@
            'NDRPDR' and
            '4T2C' and
            'IP4FWD' and
-           'NAT44' and
+           ('NAT44' or 'IP4BASE') and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -20815,7 +19158,7 @@
   - "parent"
   - "tags"
   sort:
-  - "BASE"
+  - "IP4BASE"
   - "BASE"
   - "SRC_USER_10"
   - "SRC_USER_100"
@@ -20838,8 +19181,7 @@
            'NDRPDR' and
            '2T1C' and
            'IP4FWD' and
-           'IACL' 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:
@@ -20847,6 +19189,7 @@
   - "parent"
   - "tags"
   sort:
+  - "IP4BASE"
   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   - "ACL_STATELESS"
@@ -20868,7 +19211,7 @@
            '4T2C' and
            'IP4FWD' and
            'IACL' 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:
@@ -20876,6 +19219,7 @@
   - "parent"
   - "tags"
   sort:
+  - "IP4BASE"
   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   - "ACL_STATELESS"
@@ -20884,65 +19228,6 @@
     title: "ip4-3n-skx-x710-64b-4t2c-features-iacl-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"
-#  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"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           '2T1C' and
-#           'IP4FWD' and
-#           'OACL' 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-oacl-ndr"
-#    layout: "plot-latency"
-#
-#-
-#  type: "plot"
-#  title: "VPP Latency: ip4-3n-skx-x710-64b-4t2c-features-oacl-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"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           '4T2C' and
-#           'IP4FWD' and
-#           'OACL' 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-oacl-ndr"
-#    layout: "plot-latency"
-
 # Packet Latency - VPP IPv4 2n-skx-x710 base and scale
 -
   type: "plot"
@@ -20958,13 +19243,13 @@
            '2T1C' and
            'IP4FWD' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
   sort:
-  - "DOT1Q"
   - "IP4BASE"
   - "FIB_20k"
   - "FIB_200k"
@@ -20987,13 +19272,13 @@
            '4T2C' and
            'IP4FWD' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
   sort:
-  - "DOT1Q"
   - "IP4BASE"
   - "FIB_20k"
   - "FIB_200k"
@@ -21017,13 +19302,13 @@
            '2T1C' and
            'IP4FWD' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
   sort:
-  - "DOT1Q"
   - "IP4BASE"
   - "FIB_20k"
   - "FIB_200k"
@@ -21046,13 +19331,13 @@
            '4T2C' and
            'IP4FWD' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
   sort:
-  - "DOT1Q"
   - "IP4BASE"
   - "FIB_20k"
   - "FIB_200k"
@@ -21063,65 +19348,6 @@
 
 ################################################################################
 
-## 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' or 'LISP') 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' or 'LISP') 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"
@@ -21135,7 +19361,7 @@
            'ENCAP' and
            'NDRPDR' and
            '1T1C' 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'"
@@ -21143,10 +19369,11 @@
   - "latency"
   - "parent"
   - "tags"
-#  sort:
-#  - "L2BDMACLRN"
-#  - "L2XCFWD"
-#  - "LISP"
+  sort:
+  - "IP4BASE"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "LISP"
   layout:
     title: "ip4tun-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
     layout: "plot-latency"
@@ -21163,7 +19390,7 @@
            'ENCAP' and
            'NDRPDR' and
            '2T2C' 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'"
@@ -21172,6 +19399,7 @@
   - "parent"
   - "tags"
   sort:
+  - "IP4BASE"
   - "L2BDMACLRN"
   - "L2XCFWD"
   - "LISP"
@@ -21192,7 +19420,7 @@
            'ENCAP' and
            'NDRPDR' and
            '1T1C' and
-           ('VXLAN' or 'LISP') and
+           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
            not 'VHOST' and
            not 'IPSECHW'"
   parameters:
@@ -21200,6 +19428,7 @@
   - "parent"
   - "tags"
   sort:
+  - "IP4BASE"
   - "LISP"
   - "VXLAN_1"
   - "VXLAN_10"
@@ -21221,7 +19450,7 @@
            'ENCAP' and
            'NDRPDR' and
            '2T2C' and
-           ('VXLAN' or 'LISP') and
+           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
            not 'VHOST' and
            not 'IPSECHW'"
   parameters:
@@ -21229,6 +19458,7 @@
   - "parent"
   - "tags"
   sort:
+  - "IP4BASE"
   - "LISP"
   - "VXLAN_1"
   - "VXLAN_10"
@@ -21251,7 +19481,7 @@
            'ENCAP' and
            'NDRPDR' and
            '1T1C' 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'"
@@ -21260,6 +19490,7 @@
   - "parent"
   - "tags"
   sort:
+  - "IP4BASE"
   - "L2BDMACLRN"
   - "L2XCFWD"
   - "LISP"
@@ -21279,7 +19510,7 @@
            'ENCAP' and
            'NDRPDR' and
            '2T2C' 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'"
@@ -21288,6 +19519,7 @@
   - "parent"
   - "tags"
   sort:
+  - "IP4BASE"
   - "L2BDMACLRN"
   - "L2XCFWD"
   - "LISP"
@@ -21308,7 +19540,7 @@
            'ENCAP' and
            'NDRPDR' and
            '2T1C' and
-           ('VXLAN' or 'LISP') and
+           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
            not 'VHOST' and
            not 'IPSECHW'"
   parameters:
@@ -21316,6 +19548,7 @@
   - "parent"
   - "tags"
   sort:
+  - "IP4BASE"
   - "LISP"
   - "VXLAN_1"
   - "VXLAN_10"
@@ -21337,7 +19570,7 @@
            'ENCAP' and
            'NDRPDR' and
            '4T2C' and
-           ('VXLAN' or 'LISP') and
+           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
            not 'VHOST' and
            not 'IPSECHW'"
   parameters:
@@ -21345,6 +19578,7 @@
   - "parent"
   - "tags"
   sort:
+  - "IP4BASE"
   - "LISP"
   - "VXLAN_1"
   - "VXLAN_10"
@@ -21367,7 +19601,7 @@
            'ENCAP' and
            'NDRPDR' and
            '2T1C' 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'"
@@ -21376,6 +19610,7 @@
   - "parent"
   - "tags"
   sort:
+  - "IP4BASE"
   - "L2BDMACLRN"
   - "L2XCFWD"
   - "LISP"
@@ -21395,7 +19630,7 @@
            'ENCAP' and
            'NDRPDR' and
            '4T2C' 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'"
@@ -21404,6 +19639,7 @@
   - "parent"
   - "tags"
   sort:
+  - "IP4BASE"
   - "L2BDMACLRN"
   - "L2XCFWD"
   - "LISP"
@@ -21416,10 +19652,10 @@
 # Packet Latency - VPP IPv6 3n-hsw-x520
 -
   type: "plot"
-  title: "VPP Latency: ip6-3n-hsw-x520-78b-1t1c-base_and_scale-ndr-lat"
+  title: "VPP Latency: ip6-3n-hsw-x520-78b-1t1c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-1t1c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-1t1c-base-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
@@ -21440,15 +19676,15 @@
   - "FIB_200K"
   - "FIB_2M"
   layout:
-    title: "ip6-3n-hsw-x520-78b-1t1c-base_and_scale-ndr"
+    title: "ip6-3n-hsw-x520-78b-1t1c-base-ndr"
     layout: "plot-latency"
 
 -
   type: "plot"
-  title: "VPP Latency: ip6-3n-hsw-x520-78b-2t2c-base_and_scale-ndr-lat"
+  title: "VPP Latency: ip6-3n-hsw-x520-78b-2t2c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-2t2c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-2t2c-base-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
@@ -21469,7 +19705,7 @@
   - "FIB_200K"
   - "FIB_2M"
   layout:
-    title: "ip6-3n-hsw-x520-78b-2t2c-base_and_scale-ndr"
+    title: "ip6-3n-hsw-x520-78b-2t2c-base-ndr"
     layout: "plot-latency"
 
 # Packet Latency - VPP IPv6 3n-hsw-x710
@@ -21534,10 +19770,10 @@
 # Packet Latency - VPP IPv6 3n-hsw-xl710
 -
   type: "plot"
-  title: "VPP Latency: ip6-3n-hsw-xl710-78b-1t1c-base_and_scale-ndr-lat"
+  title: "VPP Latency: ip6-3n-hsw-xl710-78b-1t1c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-1t1c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-1t1c-base-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '78B' and
@@ -21558,15 +19794,15 @@
   - "FIB_200K"
   - "FIB_2M"
   layout:
-    title: "ip6-3n-hsw-xl710-78b-1t1c-base_and_scale-ndr"
+    title: "ip6-3n-hsw-xl710-78b-1t1c-base-ndr"
     layout: "plot-latency"
 
 -
   type: "plot"
-  title: "VPP Latency: ip6-3n-hsw-xl710-78b-2t2c-base_and_scale-ndr-lat"
+  title: "VPP Latency: ip6-3n-hsw-xl710-78b-2t2c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-2t2c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-2t2c-base-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '78B' and
@@ -21587,7 +19823,7 @@
   - "FIB_200K"
   - "FIB_2M"
   layout:
-    title: "ip6-3n-hsw-xl710-78b-2t2c-base_and_scale-ndr"
+    title: "ip6-3n-hsw-xl710-78b-2t2c-base-ndr"
     layout: "plot-latency"
 
 # Packet Latency - VPP IPv6 3n-skx-x710
@@ -21772,10 +20008,10 @@
 # Packet Latency - VPP IPv6 tunnels 3n-hsw-x520
 -
   type: "plot"
-  title: "VPP Latency: ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-ndr-lat"
+  title: "VPP Latency: ip6tun-3n-hsw-x520-78b-1t1c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-1t1c-base-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
@@ -21792,15 +20028,15 @@
   - "IP4UNRLAY"
   - "IP6UNRLAY"
   layout:
-    title: "ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-ndr"
+    title: "ip6tun-3n-hsw-x520-78b-1t1c-base-ndr"
     layout: "plot-latency"
 
 -
   type: "plot"
-  title: "VPP Latency: ip6tun-3n-hsw-x520-78b-2t2c-base_and_scale-ndr-lat"
+  title: "VPP Latency: ip6tun-3n-hsw-x520-78b-2t2c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-2t2c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-2t2c-base-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
@@ -21817,7 +20053,7 @@
   - "IP4UNRLAY"
   - "IP6UNRLAY"
   layout:
-    title: "ip6tun-3n-hsw-x520-78b-2t2c-base_and_scale-ndr"
+    title: "ip6tun-3n-hsw-x520-78b-2t2c-base-ndr"
     layout: "plot-latency"
 
 ################################################################################
@@ -22073,20 +20309,21 @@
     title: "vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
     layout: "plot-latency"
 
-# Packet Latency - VPP vhost l2sw 3n-hsw-x520
+# Packet Latency - VPP vhost l2sw 3n-hsw-x520 - base
 -
   type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
+  title: "VPP Latency: vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-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
            'NDRPDR' and
            ('ETH' or 'DOT1Q') and
+           'BASE' and
            '1T1C' and
-           'L2BDMACLRN' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
@@ -22095,29 +20332,31 @@
   - "latency"
   - "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-3n-hsw-x520-64b-1t1c-base_and_scale-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-x520-64b-2t2c-base_and_scale-ndr-lat"
+  title: "VPP Latency: vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-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
            'NDRPDR' and
            ('ETH' or 'DOT1Q') and
+           'BASE' and
            '2T2C' and
-           'L2BDMACLRN' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
@@ -22126,165 +20365,105 @@
   - "latency"
   - "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-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
+    title: "vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
     layout: "plot-latency"
 
-# Packet Latency - VPP vhost l2sw 3n-hsw-x520 - base
+# Packet Latency - VPP vhost l2sw 3n-hsw-x520 - base vm
 -
   type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-hsw-x520-64b-1t1c-base-ndr-lat"
+  title: "VPP Latency: vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
            ('ETH' or 'DOT1Q') and
-           'BASE' and
            '1T1C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
+           not 'CFS_OPT' and
+           not 'DOT1Q' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not '2VM'"
+           not 'LBOND'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
 #  sort:
-#  - "not CFS_OPT"
+#  - "1VM"
 #  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
+#  - "1VM"
+#  - "L2BDMACLRN"
   layout:
-    title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base-ndr"
+    title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-ndr"
     layout: "plot-latency"
 
 -
   type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-hsw-x520-64b-2t2c-base-ndr-lat"
+  title: "VPP Latency: vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
            ('ETH' or 'DOT1Q') and
-           'BASE' and
            '2T2C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
+           not 'CFS_OPT' and
+           not 'DOT1Q' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not '2VM'"
+           not 'LBOND'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
 #  sort:
-#  - "not CFS_OPT"
+#  - "1VM"
 #  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
+#  - "1VM"
+#  - "L2BDMACLRN"
   layout:
-    title: "vhost-l2sw-3n-hsw-x520-64b-2t2c-base-ndr"
+    title: "vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-ndr"
     layout: "plot-latency"
 
-# Packet Latency - VPP vhost l2sw 3n-hsw-x520 - base vm
+# Packet Latency - VPP vhost ip4 3n-hsw-x710
 -
   type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-ndr-lat"
+  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-hsw-x520-64b-1t1c-base-vm-ndr-lat"
+  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-X520-DA2' and
+  filter: "'NIC_Intel-X710' 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' and
-           not 'LBOND'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
-  layout:
-    title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-ndr"
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '2T2C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
            not 'CFS_OPT' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'LBOND'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
-  layout:
-    title: "vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-ndr"
-    layout: "plot-latency"
-
-# Packet Latency - VPP vhost ip4 3n-hsw-x710
--
-  type: "plot"
-  title: "VPP Latency: vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           '1T1C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
            not 'DOT1Q'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
   sort:
-  - "not CFS_OPT"
   - "1VM"
   - "2VM"
   layout:
@@ -22306,89 +20485,26 @@
            '2T2C' and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'CFS_OPT' and
            not 'DOT1Q'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
   sort:
-  - "not CFS_OPT"
   - "1VM"
   - "2VM"
   layout:
     title: "vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-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"
-  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
-           '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-x710-64b-1t1c-base_and_scale-ndr"
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: vhost-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]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           '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-x710-64b-2t2c-base_and_scale-ndr"
-    layout: "plot-latency"
-
 # Packet Latency - VPP vhost l2sw 3n-hsw-x710 - base
 -
   type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-hsw-x710-64b-1t1c-base-ndr-lat"
+  title: "VPP Latency: vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
@@ -22405,21 +20521,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-3n-hsw-x710-64b-1t1c-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-hsw-x710-64b-2t2c-base-ndr-lat"
+  title: "VPP Latency: vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
@@ -22436,22 +20554,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-x710-64b-2t2c-base-ndr"
+    title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-ndr"
     layout: "plot-latency"
 
 # Packet Latency - VPP vhost l2sw 3n-hsw-x710 - base vm
 -
   type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-hsw-x710-64b-1t1c-base-vm-ndr-lat"
+  title: "VPP Latency: vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-vm-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base-vm-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-vm-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
@@ -22468,21 +20588,23 @@
   - "latency"
   - "parent"
   - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
+  sort:
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
   layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-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-hsw-x710-64b-2t2c-base-vm-ndr-lat"
+  title: "VPP Latency: vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-vm-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base-vm-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-vm-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
@@ -22499,29 +20621,31 @@
   - "latency"
   - "parent"
   - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
+  sort:
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
   layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base-vm-ndr"
+    title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-vm-ndr"
     layout: "plot-latency"
 
-# Packet Latency - VPP vhost ip4 3n-hsw-xl710
+# Packet Latency - VPP vhost ip4 3n-skx-x710
 -
   type: "plot"
-  title: "VPP Latency: vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat"
+  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-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-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
-           '1T1C' and
+           '2T1C' and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'DOT1Q'"
@@ -22530,26 +20654,25 @@
   - "parent"
   - "tags"
   sort:
-  - "not CFS_OPT"
   - "1VM"
   - "2VM"
   layout:
-    title: "vhost-ip4-3n-hsw-xl710-64b-1t1c-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-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat"
+  title: "VPP Latency: vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-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-skx-x710-64b-4t2c-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
-           '2T2C' and
+           '4T2C' and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'DOT1Q'"
@@ -22558,27 +20681,27 @@
   - "parent"
   - "tags"
   sort:
-  - "not CFS_OPT"
   - "1VM"
   - "2VM"
   layout:
-    title: "vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
+    title: "vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
     layout: "plot-latency"
 
-# Packet Latency - VPP vhost l2sw 3n-hsw-xl710
+# Packet Latency - VPP vhost l2sw 3n-skx-x710 - base
 -
   type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat"
+  title: "VPP Latency: vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-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-l2sw-3n-skx-x710-64b-2t1c-base_and_features-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
            ('ETH' or 'DOT1Q') and
-           '1T1C' and
-           'L2BDMACLRN' and
+           'BASE' and
+           '2T1C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
@@ -22587,29 +20710,31 @@
   - "latency"
   - "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-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
+    title: "vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-ndr"
     layout: "plot-latency"
 
 -
   type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat"
+  title: "VPP Latency: vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-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-l2sw-3n-skx-x710-64b-4t2c-base_and_features-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
            ('ETH' or 'DOT1Q') and
-           '2T2C' and
-           'L2BDMACLRN' and
+           'BASE' and
+           '4T2C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
@@ -22618,148 +20743,92 @@
   - "latency"
   - "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-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
+    title: "vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-ndr"
     layout: "plot-latency"
 
-# Packet Latency - VPP vhost l2sw 3n-hsw-xl710 - base
+# Packet Latency - VPP vhost l2sw 3n-skx-x710 - base vm
 -
   type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
+  title: "VPP Latency: vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-vm-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-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-skx-x710-64b-2t1c-base_and_features-vm-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
            ('ETH' or 'DOT1Q') and
-           'BASE' and
-           '1T1C' and
+           '2T1C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
+           not 'CFS_OPT' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not '2VM'"
+           not 'LBOND'"
   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-hsw-xl710-64b-1t1c-base-ndr"
+    title: "vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-vm-ndr"
     layout: "plot-latency"
 
 -
   type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
+  title: "VPP Latency: vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-vm-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-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-skx-x710-64b-4t2c-base_and_features-vm-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
            ('ETH' or 'DOT1Q') and
-           'BASE' and
-           '2T2C' and
+           '4T2C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
+           not 'CFS_OPT' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not '2VM'"
+           not 'LBOND'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
-  layout:
-    title: "vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-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"
-  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
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '1T1C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'CFS_OPT' and
-           not 'VXLAN' and
-           not 'IP4FWD'"
-  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'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
+  sort:
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
   layout:
-    title: "vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-vm-ndr"
+    title: "vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-vm-ndr"
     layout: "plot-latency"
 
-# Packet Latency - VPP vhost ip4 3n-skx-x710
+# Packet Latency - VPP vhost ip4 2n-skx-x710
 -
   type: "plot"
-  title: "VPP Latency: vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
+  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-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-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
@@ -22768,26 +20837,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-3n-skx-x710-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-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
+  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-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-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
@@ -22796,90 +20866,28 @@
            '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-3n-skx-x710-64b-4t2c-base_and_scale-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"
-  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"
-  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-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_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"
-  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-3n-skx-x710-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 3n-skx-x710 - base
+# Packet Latency - VPP vhost l2sw 2n-skx-x710 - base
 -
   type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-skx-x710-64b-2t1c-base-ndr-lat"
+  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-3n-skx-x710-64b-2t1c-base-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_features-ndr-lat"
+  data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -22889,9 +20897,9 @@
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'IP4FWD' and
-           not '2VM' and
-           not 'LBOND'"
+           not '2VM'"
   parameters:
   - "latency"
   - "parent"
@@ -22902,16 +20910,16 @@
 #  - "not CFS_OPT"
 #  - "CFS_OPT"
   layout:
-    title: "vhost-l2sw-3n-skx-x710-64b-2t1c-base-ndr"
+    title: "vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_features-ndr"
     layout: "plot-latency"
 
 -
   type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-skx-x710-64b-4t2c-base-ndr-lat"
+  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-3n-skx-x710-64b-4t2c-base-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_features-ndr-lat"
+  data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -22921,9 +20929,9 @@
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'IP4FWD' and
-           not '2VM' and
-           not 'LBOND'"
+           not '2VM'"
   parameters:
   - "latency"
   - "parent"
@@ -22934,17 +20942,17 @@
 #  - "not CFS_OPT"
 #  - "CFS_OPT"
   layout:
-    title: "vhost-l2sw-3n-skx-x710-64b-4t2c-base-ndr"
+    title: "vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_features-ndr"
     layout: "plot-latency"
 
-# Packet Latency - VPP vhost l2sw 3n-skx-x710 - base vm
+# Packet Latency - VPP vhost l2sw 2n-skx-x710 - base vm
 -
   type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-skx-x710-64b-2t1c-base-vm-ndr-lat"
+  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-3n-skx-x710-64b-2t1c-base-vm-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-2t1c-base-vm-ndr-lat"
+  data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -22954,8 +20962,9 @@
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'LBOND'"
+           not 'NF_DENSITY' and
+           not 'DOT1Q' and
+           not 'IP4FWD'"
   parameters:
   - "latency"
   - "parent"
@@ -22966,16 +20975,16 @@
 #  - "1VM"
 #  - "L2BDMACLRN"
   layout:
-    title: "vhost-l2sw-3n-skx-x710-64b-2t1c-base-vm-ndr"
+    title: "vhost-l2sw-2n-skx-x710-64b-2t1c-base-vm-ndr"
     layout: "plot-latency"
 
 -
   type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-skx-x710-64b-4t2c-base-vm-ndr-lat"
+  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-3n-skx-x710-64b-4t2c-base-vm-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-4t2c-base-vm-ndr-lat"
+  data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -22985,8 +20994,9 @@
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'LBOND'"
+           not 'NF_DENSITY' and
+           not 'DOT1Q' and
+           not 'IP4FWD'"
   parameters:
   - "latency"
   - "parent"
@@ -22997,18 +21007,18 @@
 #  - "1VM"
 #  - "L2BDMACLRN"
   layout:
-    title: "vhost-l2sw-3n-skx-x710-64b-4t2c-base-vm-ndr"
+    title: "vhost-l2sw-2n-skx-x710-64b-4t2c-base-vm-ndr"
     layout: "plot-latency"
 
-# Packet Latency - VPP vhost ip4 2n-skx-x710
+# Packet Latency - VPP vhost ip4 2n-skx-xxv710
 -
   type: "plot"
-  title: "VPP Latency: vhost-ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
+  title: "VPP Latency: vhost-ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
+  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-X710' and
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
            'NDRPDR' and
            'ETH' and
@@ -23016,7 +21026,7 @@
            '2T1C' and
            'VHOST_1024' and
            not 'VXLAN' and
-           not 'NF_DENSITY' and
+           not 'CFS_OPT' and
            not 'DOT1Q'"
   parameters:
   - "latency"
@@ -23027,17 +21037,17 @@
   - "1VM"
   - "2VM"
   layout:
-    title: "vhost-ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
+    title: "vhost-ip4-2n-skx-xxv710-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"
+  title: "VPP Latency: vhost-ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
+  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-X710' and
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
            'NDRPDR' and
            'ETH' and
@@ -23045,7 +21055,7 @@
            '4T2C' and
            'VHOST_1024' and
            not 'VXLAN' and
-           not 'NF_DENSITY' and
+           not 'CFS_OPT' and
            not 'DOT1Q'"
   parameters:
   - "latency"
@@ -23056,58 +21066,26 @@
   - "1VM"
   - "2VM"
   layout:
-    title: "vhost-ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
+    title: "vhost-ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
     layout: "plot-latency"
 
-# Packet Latency - VPP vhost l2sw 2n-skx-x710
+# Packet Latency - VPP vhost l2sw 2n-skx-xxv710 - base
 -
   type: "plot"
-  title: "VPP Latency: vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
+  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-x710-64b-2t1c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_features-ndr-lat"
   data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
            'NDRPDR' and
            ('ETH' or 'DOT1Q') and
+           'BASE' and
            '2T1C' and
-           'L2BDMACLRN' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'NF_DENSITY' 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
+           ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
-           not 'NF_DENSITY' and
            not 'IP4FWD' and
            not '2VM'"
   parameters:
@@ -23115,33 +21093,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-x710-64b-4t2c-base_and_scale-ndr"
+    title: "vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_features-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"
+  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-x710-64b-2t1c-base-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_features-ndr-lat"
   data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
            'NDRPDR' and
            ('ETH' or 'DOT1Q') and
            'BASE' and
-           '2T1C' and
+           '4T2C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
-           not 'NF_DENSITY' and
            not 'IP4FWD' and
            not '2VM'"
   parameters:
@@ -23154,334 +21129,58 @@
 #  - "not CFS_OPT"
 #  - "CFS_OPT"
   layout:
-    title: "vhost-l2sw-2n-skx-x710-64b-2t1c-base-ndr"
+    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-x710-64b-4t2c-base-ndr-lat"
+  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-x710-64b-4t2c-base-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-vm-ndr-lat"
   data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
            'NDRPDR' and
            ('ETH' or 'DOT1Q') and
-           'BASE' and
-           '4T2C' and
+           '2T1C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
+           not 'CFS_OPT' and
            not 'VXLAN' and
-           not 'NF_DENSITY' and
-           not 'IP4FWD' and
-           not '2VM'"
+           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-x710-64b-4t2c-base-ndr"
+    title: "vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-vm-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"
+  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-x710-64b-2t1c-base-vm-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-ndr-lat"
   data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  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 'NF_DENSITY' and
-           not 'IP4FWD'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
-  layout:
-    title: "vhost-l2sw-2n-skx-x710-64b-2t1c-base-vm-ndr"
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: vhost-l2sw-2n-skx-x710-64b-4t2c-base-vm-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-4t2c-base-vm-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '4T2C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'CFS_OPT' and
-           not 'VXLAN' and
-           not 'NF_DENSITY' and
-           not 'IP4FWD'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
-  layout:
-    title: "vhost-l2sw-2n-skx-x710-64b-4t2c-base-vm-ndr"
-    layout: "plot-latency"
-
-# Packet Latency - VPP vhost ip4 2n-skx-xxv710
--
-  type: "plot"
-  title: "VPP Latency: vhost-ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' 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-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: vhost-ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           '4T2C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'DOT1Q'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "1VM"
-  - "2VM"
-  layout:
-    title: "vhost-ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
-    layout: "plot-latency"
-
-# Packet Latency - VPP vhost l2sw 2n-skx-xxv710
--
-  type: "plot"
-  title: "VPP Latency: vhost-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]}/vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           '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-xxv710-64b-2t1c-base_and_scale-ndr"
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: vhost-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]}/vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           '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-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-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
-           '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-ndr"
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-ndr-lat"
-  data: "plot-vpp-throughput-latency-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-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-latency-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 '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-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '4T2C' and
+           '4T2C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
+           not 'DOT1Q' and
            not 'IP4FWD'"
   parameters:
   - "latency"
@@ -24150,16 +21849,16 @@
 # Speedup - VPP Container Memif 3n-hsw-x520
 -
   type: "plot"
-  title: "Speedup: memif-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
+  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"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-base_and_features-ndr-tsa"
   data: "plot-throughput-speedup-analysis-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:
@@ -24173,22 +21872,23 @@
   - "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"
+  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"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-base_and_features-pdr-tsa"
   data: "plot-throughput-speedup-analysis-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:
@@ -24202,23 +21902,24 @@
   - "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"
+  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"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-base_and_features-ndr-tsa"
   data: "plot-throughput-speedup-analysis-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:
@@ -24232,22 +21933,23 @@
   - "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"
+  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"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-base_and_features-pdr-tsa"
   data: "plot-throughput-speedup-analysis-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:
@@ -24261,23 +21963,24 @@
   - "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"
+  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"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-base_and_features-ndr-tsa"
   data: "plot-throughput-speedup-analysis-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:
@@ -24291,22 +21994,23 @@
   - "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"
+  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"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-base_and_features-pdr-tsa"
   data: "plot-throughput-speedup-analysis-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:
@@ -24320,23 +22024,24 @@
   - "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"
+  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"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-base_and_features-ndr-tsa"
   data: "plot-throughput-speedup-analysis-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:
@@ -24350,22 +22055,23 @@
   - "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"
+  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"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-base_and_features-pdr-tsa"
   data: "plot-throughput-speedup-analysis-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:
@@ -24379,23 +22085,24 @@
   - "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"
+  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"
+  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-base_and_features-ndr-tsa"
   data: "plot-throughput-speedup-analysis-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'"
@@ -24410,22 +22117,23 @@
   - "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"
+  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"
+  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-base_and_features-pdr-tsa"
   data: "plot-throughput-speedup-analysis-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'"
@@ -24440,23 +22148,24 @@
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
+  - "IP4FWD"
   layout:
-    title: "memif-2n-skx-x710-64b-base_and_scale-pdr"
+    title: "memif-2n-skx-x710-64b-base_and_features-pdr"
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP Container Memif 2n-skx-xxv710
 -
   type: "plot"
-  title: "Speedup: memif-2n-skx-xxv710-64b-base_and_scale-ndr-tsa"
+  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_scale-ndr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-xxv710-64b-base_and_features-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
            'MEMIF'"
   parameters:
@@ -24470,22 +22179,23 @@
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
+  - "IP4FWD"
   layout:
-    title: "memif-2n-skx-xxv710-64b-base_and_scale-ndr"
+    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_scale-pdr-tsa"
+  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_scale-pdr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-xxv710-64b-base_and_features-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
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
@@ -24499,8 +22209,9 @@
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
+  - "IP4FWD"
   layout:
-    title: "memif-2n-skx-xxv710-64b-base_and_scale-pdr"
+    title: "memif-2n-skx-xxv710-64b-base_and_features-pdr"
     layout: "plot-throughput-speedup-analysis"
 
 ################################################################################
@@ -24519,6 +22230,7 @@
            'NDRPDR' and
            'L2XCFWD' and
            not 'VHOST' and
+           not 'NF_DENSITY' and
            'MEMIF'"
   parameters:
   - "throughput"
@@ -24547,6 +22259,7 @@
            'NDRPDR' and
            'L2XCFWD' and
            not 'VHOST' and
+           not 'NF_DENSITY' and
            'MEMIF'"
   parameters:
   - "throughput"
@@ -24576,6 +22289,7 @@
            'NDRPDR' and
            ('L2BDMACSTAT' or 'L2BDMACLRN') and
            not 'VHOST' and
+           not 'NF_DENSITY' and
            'MEMIF'"
   parameters:
   - "throughput"
@@ -24604,6 +22318,7 @@
            'NDRPDR' and
            ('L2BDMACSTAT' or 'L2BDMACLRN') and
            not 'VHOST' and
+           not 'NF_DENSITY' and
            'MEMIF'"
   parameters:
   - "throughput"
@@ -24633,6 +22348,7 @@
            'NDRPDR' and
            'L2XCFWD' and
            not 'VHOST' and
+           not 'NF_DENSITY' and
            'MEMIF'"
   parameters:
   - "throughput"
@@ -24661,6 +22377,7 @@
            'NDRPDR' and
            'L2XCFWD' and
            not 'VHOST' and
+           not 'NF_DENSITY' and
            'MEMIF'"
   parameters:
   - "throughput"
@@ -24690,6 +22407,7 @@
            'NDRPDR' and
            ('L2BDMACSTAT' or 'L2BDMACLRN') and
            not 'VHOST' and
+           not 'NF_DENSITY' and
            'MEMIF'"
   parameters:
   - "throughput"
@@ -24718,6 +22436,7 @@
            'NDRPDR' and
            ('L2BDMACSTAT' or 'L2BDMACLRN') and
            not 'VHOST' and
+           not 'NF_DENSITY' and
            'MEMIF'"
   parameters:
   - "throughput"
@@ -24749,6 +22468,7 @@
            'NDRPDR' and
            'IP4FWD' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -24777,6 +22497,7 @@
            'NDRPDR' and
            'IP4FWD' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -24873,7 +22594,8 @@
            '64B' and
            'NDRPDR' and
            'IP4FWD' and
-           'NAT44' and
+           ('NAT44' or 'IP4BASE') and
+           not 'DOT1Q' and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -24881,7 +22603,7 @@
   - "parent"
   - "tags"
   sort:
-  - "BASE"
+  - "IP4BASE"
   - "BASE"
   - "SRC_USER_10"
   - "SRC_USER_100"
@@ -24902,7 +22624,8 @@
            '64B' and
            'NDRPDR' and
            'IP4FWD' and
-           'NAT44' and
+           ('NAT44' or 'IP4BASE') and
+           not 'DOT1Q' and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -24910,7 +22633,7 @@
   - "parent"
   - "tags"
   sort:
-  - "BASE"
+  - "IP4BASE"
   - "BASE"
   - "SRC_USER_10"
   - "SRC_USER_100"
@@ -24932,15 +22655,16 @@
            '64B' and
            'NDRPDR' and
            'IP4FWD' and
-           'IACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
+  - "IP4BASE"
   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   - "ACL_STATELESS"
@@ -24960,15 +22684,16 @@
            '64B' and
            'NDRPDR' and
            'IP4FWD' and
-           'IACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
+  - "IP4BASE"
   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   - "ACL_STATELESS"
@@ -24989,15 +22714,16 @@
            '64B' and
            'NDRPDR' and
            'IP4FWD' and
-           'OACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           ('OACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
+  - "IP4BASE"
   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   - "ACL_STATELESS"
@@ -25017,15 +22743,16 @@
            '64B' and
            'NDRPDR' and
            'IP4FWD' and
-           'OACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           ('OACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
+  - "IP4BASE"
   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   - "ACL_STATELESS"
@@ -25048,13 +22775,13 @@
            'NDRPDR' and
            'IP4FWD' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "DOT1Q"
   - "IP4BASE"
   - "FIB_20K"
   - "FIB_200K"
@@ -25076,13 +22803,13 @@
            'NDRPDR' and
            'IP4FWD' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "DOT1Q"
   - "IP4BASE"
   - "FIB_20K"
   - "FIB_200K"
@@ -25115,6 +22842,7 @@
   - "parent"
   - "tags"
   sort:
+  - "DOT1Q"
   - "IP4BASE"
   - "NAT44"
   - "POLICE_MARK"
@@ -25148,6 +22876,7 @@
   - "parent"
   - "tags"
   sort:
+  - "DOT1Q"
   - "IP4BASE"
   - "NAT44"
   - "POLICE_MARK"
@@ -25170,7 +22899,7 @@
            '64B' and
            'NDRPDR' and
            'IP4FWD' and
-           'NAT44' and
+           ('NAT44' or 'IP4BASE') and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -25178,7 +22907,7 @@
   - "parent"
   - "tags"
   sort:
-  - "BASE"
+  - "IP4BASE"
   - "BASE"
   - "SRC_USER_10"
   - "SRC_USER_100"
@@ -25199,7 +22928,7 @@
            '64B' and
            'NDRPDR' and
            'IP4FWD' and
-           'NAT44' and
+           ('NAT44' or 'IP4BASE') and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -25207,7 +22936,7 @@
   - "parent"
   - "tags"
   sort:
-  - "BASE"
+  - "IP4BASE"
   - "BASE"
   - "SRC_USER_10"
   - "SRC_USER_100"
@@ -25229,8 +22958,7 @@
            '64B' and
            'NDRPDR' and
            'IP4FWD' and
-           'IACL' 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:
@@ -25238,6 +22966,7 @@
   - "parent"
   - "tags"
   sort:
+  - "IP4BASE"
   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   - "ACL_STATELESS"
@@ -25257,8 +22986,7 @@
            '64B' and
            'NDRPDR' and
            'IP4FWD' and
-           'IACL' 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:
@@ -25266,6 +22994,7 @@
   - "parent"
   - "tags"
   sort:
+  - "IP4BASE"
   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   - "ACL_STATELESS"
@@ -25274,70 +23003,13 @@
     title: "ip4-3n-hsw-x710-64b-features-iacl-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"
-#  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"
-#  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-hsw-x710-64b-features-oacl-ndr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#-
-#  type: "plot"
-#  title: "Speedup: ip4-3n-hsw-x710-64b-features-oacl-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"
-#  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-hsw-x710-64b-features-oacl-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"
+  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"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-base-ndr-tsa"
   data: "plot-throughput-speedup-analysis-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
@@ -25356,15 +23028,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"
+  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"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-base-pdr-tsa"
   data: "plot-throughput-speedup-analysis-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
@@ -25383,7 +23055,7 @@
   - "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
@@ -25400,6 +23072,7 @@
            'NDRPDR' and
            'IP4FWD' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -25427,6 +23100,7 @@
            'NDRPDR' and
            'IP4FWD' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -25465,6 +23139,7 @@
   - "parent"
   - "tags"
   sort:
+  - "DOT1Q"
   - "IP4BASE"
   - "NAT44"
   - "POLICE_MARK"
@@ -25498,6 +23173,7 @@
   - "parent"
   - "tags"
   sort:
+  - "DOT1Q"
   - "IP4BASE"
   - "NAT44"
   - "POLICE_MARK"
@@ -25520,7 +23196,7 @@
            '64B' and
            'NDRPDR' and
            'IP4FWD' and
-           'NAT44' and
+           ('NAT44' or 'IP4BASE') and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -25528,7 +23204,7 @@
   - "parent"
   - "tags"
   sort:
-  - "BASE"
+  - "IP4BASE"
   - "BASE"
   - "SRC_USER_10"
   - "SRC_USER_100"
@@ -25549,7 +23225,7 @@
            '64B' and
            'NDRPDR' and
            'IP4FWD' and
-           'NAT44' and
+           ('NAT44' or 'IP4BASE') and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -25557,7 +23233,7 @@
   - "parent"
   - "tags"
   sort:
-  - "BASE"
+  - "IP4BASE"
   - "BASE"
   - "SRC_USER_10"
   - "SRC_USER_100"
@@ -25579,8 +23255,7 @@
            '64B' and
            'NDRPDR' and
            'IP4FWD' and
-           'IACL' 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:
@@ -25588,6 +23263,7 @@
   - "parent"
   - "tags"
   sort:
+  - "IP4BASE"
   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   - "ACL_STATELESS"
@@ -25607,8 +23283,7 @@
            '64B' and
            'NDRPDR' and
            'IP4FWD' and
-           'IACL' 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:
@@ -25616,6 +23291,7 @@
   - "parent"
   - "tags"
   sort:
+  - "IP4BASE"
   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   - "ACL_STATELESS"
@@ -25695,13 +23371,13 @@
            'NDRPDR' and
            'IP4FWD' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "DOT1Q"
   - "IP4BASE"
   - "FIB_20k"
   - "FIB_200k"
@@ -25723,13 +23399,13 @@
            'NDRPDR' and
            'IP4FWD' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "DOT1Q"
   - "IP4BASE"
   - "FIB_20k"
   - "FIB_200k"
@@ -25752,13 +23428,13 @@
            'NDRPDR' and
            'IP4FWD' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "DOT1Q"
   - "IP4BASE"
   - "FIB_20k"
   - "FIB_200k"
@@ -25780,13 +23456,13 @@
            'NDRPDR' and
            'IP4FWD' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "DOT1Q"
   - "IP4BASE"
   - "FIB_20k"
   - "FIB_200k"
@@ -25846,63 +23522,6 @@
 
 ################################################################################
 
-## Speedup - VPP IPv4 Tunnels 3n-hsw-x520
-#-
-#  type: "plot"
-#  title: "Speedup: ip4tun-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
-#  data: "plot-throughput-speedup-analysis-3n-hsw"
-#  filter: "'NIC_Intel-X520_DA2' and
-#           '64B' and
-#           'ENCAP' and
-#           'NDRPDR' and
-#           ('VXLAN' or 'LISP') and
-#           not 'VHOST' and
-#           not 'IPSECHW'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "not DOT1Q"
-#  - "VXLAN_1"
-#  - "VXLAN_10"
-#  - "VXLAN_100"
-#  - "VXLAN_1000"
-#  layout:
-#    title: "ip4tun-3n-hsw-x520-64b-base_and_scale-ndr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#-
-#  type: "plot"
-#  title: "Speedup: ip4tun-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
-#  data: "plot-throughput-speedup-analysis-3n-hsw"
-#  filter: "'NIC_Intel-X520_DA2' and
-#           '64B' and
-#           'ENCAP' and
-#           'NDRPDR' and
-#           ('VXLAN' or 'LISP') and
-#           not 'VHOST' and
-#           not 'IPSECHW'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "not DOT1Q"
-#  - "VXLAN_1"
-#  - "VXLAN_10"
-#  - "VXLAN_100"
-#  - "VXLAN_1000"
-#  layout:
-#    title: "ip4tun-3n-hsw-x520-64b-base_and_scale-pdr"
-#    layout: "plot-throughput-speedup-analysis"
-
 # Speedup - VPP IPv4 Tunnels 3n-hsw-x520 - features
 -
   type: "plot"
@@ -25915,7 +23534,7 @@
            '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'"
@@ -25924,6 +23543,7 @@
   - "parent"
   - "tags"
   sort:
+  - "IP4BASE"
   - "L2BDMACLRN"
   - "L2XCFWD"
   - "LISP"
@@ -25942,7 +23562,7 @@
            '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'"
@@ -25951,6 +23571,7 @@
   - "parent"
   - "tags"
   sort:
+  - "IP4BASE"
   - "L2BDMACLRN"
   - "L2XCFWD"
   - "LISP"
@@ -25970,7 +23591,7 @@
            '64B' and
            'ENCAP' and
            'NDRPDR' and
-           ('VXLAN' or 'LISP') and
+           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
            not 'VHOST' and
            not 'IPSECHW'"
   parameters:
@@ -25978,6 +23599,7 @@
   - "parent"
   - "tags"
   sort:
+  - "IP4BASE"
   - "LISP"
   - "VXLAN_1"
   - "VXLAN_10"
@@ -25998,7 +23620,7 @@
            '64B' and
            'ENCAP' and
            'NDRPDR' and
-           ('VXLAN' or 'LISP') and
+           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
            not 'VHOST' and
            not 'IPSECHW'"
   parameters:
@@ -26006,6 +23628,7 @@
   - "parent"
   - "tags"
   sort:
+  - "IP4BASE"
   - "LISP"
   - "VXLAN_1"
   - "VXLAN_10"
@@ -26027,7 +23650,7 @@
            '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'"
@@ -26036,6 +23659,7 @@
   - "parent"
   - "tags"
   sort:
+  - "IP4BASE"
   - "L2BDMACLRN"
   - "L2XCFWD"
   - "LISP"
@@ -26054,7 +23678,7 @@
            '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'"
@@ -26063,6 +23687,7 @@
   - "parent"
   - "tags"
   sort:
+  - "IP4BASE"
   - "L2BDMACLRN"
   - "L2XCFWD"
   - "LISP"
@@ -26082,8 +23707,7 @@
            '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:
@@ -26091,6 +23715,7 @@
   - "parent"
   - "tags"
   sort:
+  - "IP4BASE"
   - "LISP"
   - "VXLAN_1"
   - "VXLAN_10"
@@ -26111,8 +23736,7 @@
            '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:
@@ -26120,6 +23744,7 @@
   - "parent"
   - "tags"
   sort:
+  - "IP4BASE"
   - "LISP"
   - "VXLAN_1"
   - "VXLAN_10"
@@ -26141,7 +23766,7 @@
            '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'"
@@ -26150,6 +23775,7 @@
   - "parent"
   - "tags"
   sort:
+  - "IP4BASE"
   - "L2BDMACLRN"
   - "L2XCFWD"
   - "LISP"
@@ -26168,7 +23794,7 @@
            '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'"
@@ -26177,6 +23803,7 @@
   - "parent"
   - "tags"
   sort:
+  - "IP4BASE"
   - "L2BDMACLRN"
   - "L2XCFWD"
   - "LISP"
@@ -26189,10 +23816,10 @@
 # Speedup - VPP IPv6 3n-hsw-x520
 -
   type: "plot"
-  title: "Speedup: ip6-3n-hsw-x520-78b-base_and_scale-ndr-tsa"
+  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"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-base-ndr-tsa"
   data: "plot-throughput-speedup-analysis-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
@@ -26212,15 +23839,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"
+  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"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-base-pdr-tsa"
   data: "plot-throughput-speedup-analysis-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
@@ -26240,70 +23867,7 @@
   - "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
@@ -26429,10 +23993,10 @@
 # Speedup - VPP IPv6 3n-hsw-xl710
 -
   type: "plot"
-  title: "Speedup: ip6-3n-hsw-xl710-78b-base_and_scale-ndr-tsa"
+  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"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-base-ndr-tsa"
   data: "plot-throughput-speedup-analysis-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '78B' and
@@ -26452,15 +24016,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"
+  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"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-base-pdr-tsa"
   data: "plot-throughput-speedup-analysis-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '78B' and
@@ -26480,7 +24044,7 @@
   - "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
@@ -26773,10 +24337,10 @@
 # Speedup - VPP IPv6 tunnels 3n-hsw-x520
 -
   type: "plot"
-  title: "Speedup: ip6tun-3n-hsw-x520-78b-base_and_scale-ndr-tsa"
+  title: "Speedup: ip6tun-3n-hsw-x520-78b-base-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-base_and_scale-ndr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-base-ndr-tsa"
   data: "plot-throughput-speedup-analysis-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
@@ -26792,15 +24356,15 @@
   - "IP4UNRLAY"
   - "IP6UNRLAY"
   layout:
-    title: "ip6tun-3n-hsw-x520-78b-base_and_scale-ndr"
+    title: "ip6tun-3n-hsw-x520-78b-base-ndr"
     layout: "plot-throughput-speedup-analysis"
 
 -
   type: "plot"
-  title: "Speedup: ip6tun-3n-hsw-x520-78b-base_and_scale-pdr-tsa"
+  title: "Speedup: ip6tun-3n-hsw-x520-78b-base-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-base_and_scale-pdr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-base-pdr-tsa"
   data: "plot-throughput-speedup-analysis-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
@@ -26816,7 +24380,7 @@
   - "IP4UNRLAY"
   - "IP6UNRLAY"
   layout:
-    title: "ip6tun-3n-hsw-x520-78b-base_and_scale-pdr"
+    title: "ip6tun-3n-hsw-x520-78b-base-pdr"
     layout: "plot-throughput-speedup-analysis"
 
 ################################################################################
@@ -27146,8 +24710,8 @@
   - "tags"
   sort:
   - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
   - "FIB_10K"
   - "FIB_100K"
   - "FIB_1M"
@@ -27177,8 +24741,8 @@
   - "tags"
   sort:
   - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
   - "FIB_10K"
   - "FIB_100K"
   - "FIB_1M"
@@ -27200,6 +24764,7 @@
            (('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"
@@ -27227,6 +24792,7 @@
            (('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"
@@ -27244,14 +24810,14 @@
 # Speedup - VPP L2 3n-hsw-xl710 base and scale
 -
   type: "plot"
-  title: "Speedup: l2sw-3n-hsw-xl710-64b-base_and_scale-ndr-tsa"
+  title: "Speedup: l2sw-3n-hsw-xl710-64b-base-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-xl710-64b-base_and_scale-ndr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-xl710-64b-base-ndr-tsa"
   data: "plot-throughput-speedup-analysis-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
-           ('BASE' or 'SCALE') and
+           'BASE' and
            'NDRPDR' and
            'ETH' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
@@ -27263,25 +24829,22 @@
   - "tags"
   sort:
   - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
   layout:
-    title: "l2sw-3n-hsw-xl710-64b-base_and_scale-ndr"
+    title: "l2sw-3n-hsw-xl710-64b-base-ndr"
     layout: "plot-throughput-speedup-analysis"
 
 -
   type: "plot"
-  title: "Speedup: l2sw-3n-hsw-xl710-64b-base_and_scale-pdr-tsa"
+  title: "Speedup: l2sw-3n-hsw-xl710-64b-base-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-xl710-64b-base_and_scale-pdr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-xl710-64b-base-pdr-tsa"
   data: "plot-throughput-speedup-analysis-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
-           ('BASE' or 'SCALE') and
+           'BASE' and
            'NDRPDR' and
            'ETH' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
@@ -27293,13 +24856,10 @@
   - "tags"
   sort:
   - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
   layout:
-    title: "l2sw-3n-hsw-xl710-64b-base_and_scale-pdr"
+    title: "l2sw-3n-hsw-xl710-64b-base-pdr"
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP L2 3n-skx-x710 base and scale
@@ -27379,6 +24939,8 @@
            (('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"
@@ -27406,6 +24968,8 @@
            (('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"
@@ -27423,10 +24987,10 @@
 # Speedup - VPP L2 3n-skx-xxv710 base and scale
 -
   type: "plot"
-  title: "Speedup: l2sw-3n-skx-xxv710-64b-base_and_scale-ndr-tsa"
+  title: "Speedup: l2sw-3n-skx-xxv710-64b-base-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"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-base-ndr-tsa"
   data: "plot-throughput-speedup-analysis-3n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
@@ -27435,29 +24999,26 @@
            'ETH' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           not 'MEMIF' and
-           not 'DRV_AVF'"
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   - "L2PATCH"
+  - "L2PATCH"
   - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+  - "L2BDMACLRN"
   layout:
-    title: "l2sw-3n-skx-xxv710-64b-base_and_scale-ndr"
+    title: "l2sw-3n-skx-xxv710-64b-base-ndr"
     layout: "plot-throughput-speedup-analysis"
 
 -
   type: "plot"
-  title: "Speedup: l2sw-3n-skx-xxv710-64b-base_and_scale-pdr-tsa"
+  title: "Speedup: l2sw-3n-skx-xxv710-64b-base-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"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-base-pdr-tsa"
   data: "plot-throughput-speedup-analysis-3n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
@@ -27466,21 +25027,18 @@
            'ETH' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           not 'MEMIF' and
-           not 'DRV_AVF'"
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   - "L2PATCH"
+  - "L2PATCH"
   - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+  - "L2BDMACLRN"
   layout:
-    title: "l2sw-3n-skx-xxv710-64b-base_and_scale-pdr"
+    title: "l2sw-3n-skx-xxv710-64b-base-pdr"
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP L2 2n-skx-x710 base and scale
@@ -27717,18 +25275,20 @@
     title: "vhost-ip4-3n-hsw-x520-64b-base_and_scale-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-# Packet Speedup - VPP vhost l2sw 3n-hsw-x520
+# Packet Speedup - VPP vhost l2sw 3n-hsw-x520 - base
 -
   type: "plot"
-  title: "VPP Speedup: vhost-l2sw-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
+  title: "VPP Speedup: vhost-l2sw-3n-hsw-x520-64b-base_and_features-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-base_and_features-ndr-tsa"
   data: "plot-throughput-speedup-analysis-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
            ('ETH' or 'DOT1Q') and
+           'BASE' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
@@ -27737,561 +25297,25 @@
   - "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"
-    layout: "plot-throughput-speedup-analysis"
-
--
-  type: "plot"
-  title: "VPP Speedup: vhost-l2sw-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-hsw-x520-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-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'"
-  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"
-    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"
-  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
-           '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-3n-hsw-x520-64b-base-ndr"
-    layout: "plot-throughput-speedup-analysis"
-
--
-  type: "plot"
-  title: "VPP Speedup: vhost-l2sw-3n-hsw-x520-64b-base-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
-           '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-3n-hsw-x520-64b-base-pdr"
-    layout: "plot-throughput-speedup-analysis"
-
-# Packet Speedup - VPP vhost l2sw 3n-hsw-x520 - base vm
--
-  type: "plot"
-  title: "VPP Speedup: vhost-l2sw-3n-hsw-x520-64b-base-vm-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-base-vm-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-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 'VXLAN' and
-           not 'IP4FWD' and
-           not 'LBOND'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
-  layout:
-    title: "vhost-l2sw-3n-hsw-x520-64b-base-vm-ndr"
-    layout: "plot-throughput-speedup-analysis"
-
--
-  type: "plot"
-  title: "VPP Speedup: vhost-l2sw-3n-hsw-x520-64b-base-vm-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-base-vm-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-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 'VXLAN' and
-           not 'IP4FWD' and
-           not 'LBOND'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
-  layout:
-    title: "vhost-l2sw-3n-hsw-x520-64b-base-vm-pdr"
-    layout: "plot-throughput-speedup-analysis"
-
-# Packet Speedup - VPP vhost ip4 3n-hsw-x710
--
-  type: "plot"
-  title: "VPP Speedup: vhost-ip4-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'DOT1Q'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "1VM"
-  - "2VM"
-  layout:
-    title: "vhost-ip4-3n-hsw-x710-64b-base_and_scale-ndr"
-    layout: "plot-throughput-speedup-analysis"
-
--
-  type: "plot"
-  title: "VPP Speedup: vhost-ip4-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'DOT1Q'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
   sort:
-  - "not CFS_OPT"
-  - "1VM"
-  - "2VM"
-  layout:
-    title: "vhost-ip4-3n-hsw-x710-64b-base_and_scale-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"
-  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
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           'L2BDMACLRN' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-  layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-base_and_scale-ndr"
-    layout: "plot-throughput-speedup-analysis"
-
--
-  type: "plot"
-  title: "VPP Speedup: vhost-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-x710-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           'L2BDMACLRN' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-  layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-base_and_scale-pdr"
-    layout: "plot-throughput-speedup-analysis"
-
-# Packet Speedup - VPP vhost l2sw 3n-hsw-x710 - base
--
-  type: "plot"
-  title: "VPP Speedup: vhost-l2sw-3n-hsw-x710-64b-base-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"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           'BASE' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
-  layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-base-ndr"
-    layout: "plot-throughput-speedup-analysis"
-
--
-  type: "plot"
-  title: "VPP Speedup: vhost-l2sw-3n-hsw-x710-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-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           'BASE' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
-  layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-base-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"
-  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"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'CFS_OPT' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'LBOND'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
-  layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-base-vm-ndr"
-    layout: "plot-throughput-speedup-analysis"
-
--
-  type: "plot"
-  title: "VPP Speedup: vhost-l2sw-3n-hsw-x710-64b-base-vm-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"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'CFS_OPT' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'LBOND'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
-  layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-base-vm-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"
-  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
-           'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'DOT1Q'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "1VM"
-  - "2VM"
-  layout:
-    title: "vhost-ip4-3n-hsw-xl710-64b-base_and_scale-ndr"
-    layout: "plot-throughput-speedup-analysis"
-
--
-  type: "plot"
-  title: "VPP Speedup: vhost-ip4-3n-hsw-xl710-64b-base_and_scale-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
-           'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'DOT1Q'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "1VM"
-  - "2VM"
-  layout:
-    title: "vhost-ip4-3n-hsw-xl710-64b-base_and_scale-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"
-  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
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           'L2BDMACLRN' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-  layout:
-    title: "vhost-l2sw-3n-hsw-xl710-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"
-  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
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           'L2BDMACLRN' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-  layout:
-    title: "vhost-l2sw-3n-hsw-xl710-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"
-  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
-           '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"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
   layout:
-    title: "vhost-l2sw-3n-hsw-xl710-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-hsw-xl710-64b-base-pdr-tsa"
+  title: "VPP Speedup: vhost-l2sw-3n-hsw-x520-64b-base_and_features-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-base-pdr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-base_and_features-pdr-tsa"
   data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
            ('ETH' or 'DOT1Q') and
@@ -28305,32 +25329,36 @@
   - "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-hsw-xl710-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-hsw-xl710 - base vm
+# Packet Speedup - VPP vhost l2sw 3n-hsw-x520 - base vm
 -
   type: "plot"
-  title: "VPP Speedup: vhost-l2sw-3n-hsw-xl710-64b-base-vm-ndr-tsa"
+  title: "VPP Speedup: vhost-l2sw-3n-hsw-x520-64b-base-vm-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-base-vm-ndr-tsa"
+  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-XL710' and
+  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'"
+           not 'IP4FWD' and
+           not 'LBOND'"
   parameters:
   - "throughput"
   - "parent"
@@ -28341,25 +25369,27 @@
 #  - "1VM"
 #  - "L2BDMACLRN"
   layout:
-    title: "vhost-l2sw-3n-hsw-xl710-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-hsw-xl710-64b-base-vm-pdr-tsa"
+  title: "VPP Speedup: vhost-l2sw-3n-hsw-x520-64b-base-vm-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-base-vm-pdr-tsa"
+  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-XL710' and
+  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'"
+           not 'IP4FWD' and
+           not 'LBOND'"
   parameters:
   - "throughput"
   - "parent"
@@ -28370,17 +25400,17 @@
 #  - "1VM"
 #  - "L2BDMACLRN"
   layout:
-    title: "vhost-l2sw-3n-hsw-xl710-64b-base-vm-pdr"
+    title: "vhost-l2sw-3n-hsw-x520-64b-base-vm-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-# Packet Speedup - VPP vhost ip4 3n-skx-x710
+# Packet Speedup - VPP vhost ip4 3n-hsw-x710
 -
   type: "plot"
-  title: "VPP Speedup: vhost-ip4-3n-skx-x710-64b-base_and_scale-ndr-tsa"
+  title: "VPP Speedup: vhost-ip4-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-skx-x710-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -28388,26 +25418,26 @@
            '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-3n-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-3n-skx-x710-64b-base_and_scale-pdr-tsa"
+  title: "VPP Speedup: vhost-ip4-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-skx-x710-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -28415,32 +25445,33 @@
            '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-3n-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 3n-skx-x710
+# Packet Speedup - VPP vhost l2sw 3n-hsw-x710 - base
 -
   type: "plot"
-  title: "VPP Speedup: vhost-l2sw-3n-skx-x710-64b-base_and_scale-ndr-tsa"
+  title: "VPP Speedup: vhost-l2sw-3n-hsw-x710-64b-base_and_features-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-base_and_features-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-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
@@ -28449,28 +25480,30 @@
   - "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-3n-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-3n-skx-x710-64b-base_and_scale-pdr-tsa"
+  title: "VPP Speedup: vhost-l2sw-3n-hsw-x710-64b-base_and_features-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-base_and_features-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-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
@@ -28479,138 +25512,133 @@
   - "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-3n-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 3n-skx-x710 - base
+# Packet Speedup - VPP vhost l2sw 3n-hsw-x710 - base vm
 -
   type: "plot"
-  title: "VPP Speedup: vhost-l2sw-3n-skx-x710-64b-base-ndr-tsa"
+  title: "VPP Speedup: vhost-l2sw-3n-hsw-x710-64b-base_and_features-vm-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-base-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-base_and_features-vm-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-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' and
            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-3n-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-3n-skx-x710-64b-base-pdr-tsa"
+  title: "VPP Speedup: vhost-l2sw-3n-hsw-x710-64b-base_and_features-vm-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-base-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-base_and_features-vm-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-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' and
            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-3n-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 3n-skx-x710 - base vm
+# Packet Speedup - VPP vhost ip4 3n-skx-x710
 -
   type: "plot"
-  title: "VPP Speedup: vhost-l2sw-3n-skx-x710-64b-base-vm-ndr-tsa"
+  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-3n-skx-x710-64b-base-vm-ndr-tsa"
+  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
            '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' and
-           not 'LBOND'"
+           not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
+  sort:
+  - "1VM"
+  - "2VM"
   layout:
-    title: "vhost-l2sw-3n-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-3n-skx-x710-64b-base-vm-pdr-tsa"
+  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-3n-skx-x710-64b-base-vm-pdr-tsa"
+  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
            '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' and
-           not 'LBOND'"
+           not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
+  sort:
+  - "1VM"
+  - "2VM"
   layout:
-    title: "vhost-l2sw-3n-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-x710
@@ -28629,13 +25657,13 @@
            '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:
@@ -28657,89 +25685,26 @@
            '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-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"
-  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"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           'L2BDMACLRN' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'NF_DENSITY' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-  layout:
-    title: "vhost-l2sw-2n-skx-x710-64b-base_and_scale-ndr"
-    layout: "plot-throughput-speedup-analysis"
-
--
-  type: "plot"
-  title: "VPP Speedup: vhost-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-2n-skx-x710-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           'L2BDMACLRN' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'NF_DENSITY' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-  layout:
-    title: "vhost-l2sw-2n-skx-x710-64b-base_and_scale-pdr"
-    layout: "plot-throughput-speedup-analysis"
-
 # Packet Speedup - VPP vhost l2sw 2n-skx-x710 - base
 -
   type: "plot"
-  title: "VPP Speedup: vhost-l2sw-2n-skx-x710-64b-base-ndr-tsa"
+  title: "VPP Speedup: vhost-l2sw-2n-skx-x710-64b-base_and_features-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-base-ndr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-base_and_features-ndr-tsa"
   data: "plot-throughput-speedup-analysis-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
@@ -28762,15 +25727,15 @@
 #  - "not CFS_OPT"
 #  - "CFS_OPT"
   layout:
-    title: "vhost-l2sw-2n-skx-x710-64b-base-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-x710-64b-base-pdr-tsa"
+  title: "VPP Speedup: vhost-l2sw-2n-skx-x710-64b-base_and_features-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-base-pdr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-base_and_features-pdr-tsa"
   data: "plot-throughput-speedup-analysis-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
@@ -28793,7 +25758,7 @@
 #  - "not CFS_OPT"
 #  - "CFS_OPT"
   layout:
-    title: "vhost-l2sw-2n-skx-x710-64b-base-pdr"
+    title: "vhost-l2sw-2n-skx-x710-64b-base_and_features-pdr"
     layout: "plot-throughput-speedup-analysis"
 
 # Packet Speedup - VPP vhost l2sw 2n-skx-x710 - base vm
@@ -28813,6 +25778,7 @@
            not 'CFS_OPT' and
            not 'VXLAN' and
            not 'NF_DENSITY' and
+           not 'DOT1Q' and
            not 'IP4FWD'"
   parameters:
   - "throughput"
@@ -28843,6 +25809,7 @@
            not 'CFS_OPT' and
            not 'VXLAN' and
            not 'NF_DENSITY' and
+           not 'DOT1Q' and
            not 'IP4FWD'"
   parameters:
   - "throughput"
@@ -28872,6 +25839,7 @@
            'IP4FWD' and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'CFS_OPT' and
            not 'DOT1Q'"
   parameters:
   - "throughput"
@@ -28899,6 +25867,7 @@
            'IP4FWD' and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'CFS_OPT' and
            not 'DOT1Q'"
   parameters:
   - "throughput"
@@ -28912,74 +25881,13 @@
     title: "vhost-ip4-2n-skx-xxv710-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"
-  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
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           'L2BDMACLRN' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-  layout:
-    title: "vhost-l2sw-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_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_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           'L2BDMACLRN' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-  layout:
-    title: "vhost-l2sw-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-ndr-tsa"
+  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-ndr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-base_and_features-ndr-tsa"
   data: "plot-throughput-speedup-analysis-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
@@ -29001,15 +25909,15 @@
 #  - "not CFS_OPT"
 #  - "CFS_OPT"
   layout:
-    title: "vhost-l2sw-2n-skx-xxv710-64b-base-ndr"
+    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-pdr-tsa"
+  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-pdr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-base_and_features-pdr-tsa"
   data: "plot-throughput-speedup-analysis-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
@@ -29031,7 +25939,7 @@
 #  - "not CFS_OPT"
 #  - "CFS_OPT"
   layout:
-    title: "vhost-l2sw-2n-skx-xxv710-64b-base-pdr"
+    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
@@ -29050,6 +25958,7 @@
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
+           not 'DOT1Q' and
            not 'IP4FWD'"
   parameters:
   - "throughput"
@@ -29079,6 +25988,7 @@
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
+           not 'DOT1Q' and
            not 'IP4FWD'"
   parameters:
   - "throughput"