Code Review / csit.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Report: Add data
[csit.git] / resources / tools / presentation / specification.yaml
diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml
index 11e7eb9..661f666 100644 (file)
--- a/resources/tools/presentation/specification.yaml
+++ b/resources/tools/presentation/specification.yaml
@@ -143,6 +143,16 @@
         - 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
 
     plot-throughput-speedup-analysis-3n-hsw:
       csit-vpp-perf-verify-1901-3n-hsw:
@@ -156,6 +166,16 @@
         - 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
 
     plot-vpp-http-server-performance:
       # TODO: Replace with new data
@@ -225,6 +245,11 @@
         - 38  # NDRPDR sel
         - 47  # NDRPDR sel
         - 48  # NDRPDR sel
+        - 54  # NDRPDR LB
+        - 57  # NDRPDR LB
+        - 58  # NDRPDR LB
+        - 59  # NDRPDR LB
+        - 60  # NDRPDR LB
 
     plot-throughput-speedup-analysis-3n-skx:
       csit-vpp-perf-verify-1901-3n-skx:
@@ -238,6 +263,11 @@
         - 38  # NDRPDR sel
         - 47  # NDRPDR sel
         - 48  # NDRPDR sel
+        - 54  # NDRPDR LB
+        - 57  # NDRPDR LB
+        - 58  # NDRPDR LB
+        - 59  # NDRPDR LB
+        - 60  # NDRPDR LB
 
     plot-dpdk-throughput-latency-3n-skx:
       csit-dpdk-perf-verify-1901-3n-skx:
@@ -340,6 +370,16 @@
         - 46  # NDRPDR sel
         - 47  # NDRPDR sel
         - 48  # NDRPDR sel
+        - 61  # NDRPDR LB
+        - 62  # NDRPDR LB
+        - 63  # NDRPDR LB
+        - 64  # NDRPDR LB
+        - 65  # NDRPDR LB
+        - 66  # NDRPDR LB
+        - 67  # NDRPDR LB
+        - 69  # NDRPDR LB
+        - 70  # NDRPDR LB
+        - 71  # NDRPDR LB
 
     vpp-nic-comparison-3n-skx:
       csit-vpp-perf-verify-1901-3n-skx:
@@ -353,6 +393,11 @@
         - 38  # NDRPDR sel
         - 47  # NDRPDR sel
         - 48  # NDRPDR sel
+        - 54  # NDRPDR LB
+        - 57  # NDRPDR LB
+        - 58  # NDRPDR LB
+        - 59  # NDRPDR LB
+        - 60  # NDRPDR LB
 
     vpp-nic-comparison-2n-skx:
       csit-vpp-perf-verify-1901-2n-skx:
@@ -493,16 +538,26 @@
         - 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
     vpp-performance-changes-3n-hsw:
       - "vpp-performance-changes-3n-hsw-h1"
       - "vpp-performance-changes-3n-hsw-ref"
@@ -544,6 +599,11 @@
         - 38  # NDRPDR sel
         - 47  # NDRPDR sel
         - 48  # NDRPDR sel
+        - 54  # NDRPDR LB
+        - 57  # NDRPDR LB
+        - 58  # NDRPDR LB
+        - 59  # NDRPDR LB
+        - 60  # NDRPDR LB
     vpp-performance-changes-3n-skx:
       - "vpp-performance-changes-3n-skx-h1"
       - "vpp-performance-changes-3n-skx-ref"
@@ -788,6 +848,16 @@
         - 46  # NDRPDR sel
         - 47  # NDRPDR sel
         - 48  # NDRPDR sel
+        - 61  # NDRPDR LB
+        - 62  # NDRPDR LB
+        - 63  # NDRPDR LB
+        - 64  # NDRPDR LB
+        - 65  # NDRPDR LB
+        - 66  # NDRPDR LB
+        - 67  # NDRPDR LB
+        - 69  # NDRPDR LB
+        - 70  # NDRPDR LB
+        - 71  # NDRPDR LB
     vpp-compare-testbeds-cmp:
       csit-vpp-perf-verify-1901-3n-skx:
         - 18  # NDRPDR sel
@@ -800,6 +870,11 @@
         - 38  # NDRPDR sel
         - 47  # NDRPDR sel
         - 48  # NDRPDR sel
+        - 54  # NDRPDR LB
+        - 57  # NDRPDR LB
+        - 58  # NDRPDR LB
+        - 59  # NDRPDR LB
+        - 60  # NDRPDR LB
     vpp-compare-testbeds:
       - "vpp-compare-testbeds-ref"
       - "vpp-compare-testbeds-cmp"
@@ -1383,6 +1458,16 @@
       - 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
     csit-vpp-perf-verify-1807-3n-skx:
       - 31  # MRR full
       - 28  # MRR sel
@@ -1440,6 +1525,11 @@
       - 38  # NDRPDR sel
       - 47  # NDRPDR sel
       - 48  # NDRPDR sel
+      - 54  # NDRPDR LB
+      - 57  # NDRPDR LB
+      - 58  # NDRPDR LB
+      - 59  # NDRPDR LB
+      - 60  # NDRPDR LB
     csit-vpp-perf-verify-1807-2n-skx:
       - 27  # MRR full
       - 31  # MRR sel
@@ -1628,8 +1718,8 @@
   format:
     html:
     - full
-#    pdf:
-#    - minimal
+    pdf:
+    - minimal
 
 ################################################################################
 ###                               T A B L E S                                ###
@@ -7687,10 +7777,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 +7808,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 +7844,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 +7880,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 +7916,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 +7960,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
@@ -9923,10 +10013,10 @@
 # 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 +10040,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 +10072,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 +10104,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 +10136,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
@@ -11938,10 +12028,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 +12056,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 +12089,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 +12122,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,7 +12155,7 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-3n-hsw-x520-78b-2t2c-base_and_scale-pdr"
+    title: "ip6-3n-hsw-x520-78b-2t2c-base-pdr"
     layout: "plot-throughput"
 
 ## Packet Throughput - VPP IPv6 3n-hsw-x520 - features
@@ -12494,10 +12584,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 +12612,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 +12645,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 +12678,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 +12711,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 +13384,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 +13408,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 +13437,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 +13466,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 +13495,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"
 
 ################################################################################
@@ -14127,10 +14217,10 @@
 # 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 +14249,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 +14286,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 +14323,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 +14360,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
@@ -14691,10 +14781,10 @@
 # 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 +14813,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 +14850,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 +14887,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 +14924,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 +14962,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 +14999,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 +15036,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,7 +15073,7 @@
     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
@@ -15803,10 +15893,10 @@
 # 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
@@ -15834,15 +15924,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
@@ -15870,15 +15960,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
@@ -15906,15 +15996,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
@@ -15942,16 +16032,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 +16070,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 +16107,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 +16144,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 +16181,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
@@ -16375,10 +16465,10 @@
 # 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 +16496,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 +16532,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 +16568,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 +16604,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
@@ -16935,10 +17025,10 @@
 # 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 +17055,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 +17090,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 +17125,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 +17160,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 +18966,8 @@
   - "tags"
   sort:
   - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
   - "FIB_10K"
   - "FIB_100K"
   - "FIB_1M"
@@ -18907,8 +18997,8 @@
   - "tags"
   sort:
   - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
   - "FIB_10K"
   - "FIB_100K"
   - "FIB_1M"
@@ -18931,6 +19021,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 +19050,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 +19068,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 +19088,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 +19116,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 +19202,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 +19232,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 +19251,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 +19264,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 +19293,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 +19438,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 +19462,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 +19493,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 +19525,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 +19556,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 +19588,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 +19619,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 +19651,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 +19682,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 +19715,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 +19747,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 +19779,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 +19810,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 +20078,7 @@
            '1T1C' and
            'IP4FWD' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "latency"
@@ -20009,6 +20108,7 @@
            '2T2C' and
            'IP4FWD' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "latency"
@@ -20108,7 +20208,8 @@
            'NDRPDR' and
            '1T1C' and
            'IP4FWD' and
-           'NAT44' and
+           ('NAT44' or 'IP4BASE') and
+           not 'DOT1Q' and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -20116,7 +20217,7 @@
   - "parent"
   - "tags"
   sort:
-  - "BASE"
+  - "IP4BASE"
   - "BASE"
   - "SRC_USER_10"
   - "SRC_USER_100"
@@ -20138,7 +20239,8 @@
            'NDRPDR' and
            '2T2C' and
            'IP4FWD' and
-           'NAT44' and
+           ('NAT44' or 'IP4BASE') and
+           not 'DOT1Q' and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -20146,7 +20248,7 @@
   - "parent"
   - "tags"
   sort:
-  - "BASE"
+  - "IP4BASE"
   - "BASE"
   - "SRC_USER_10"
   - "SRC_USER_100"
@@ -20169,15 +20271,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 +20301,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 +20332,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 +20362,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 +20395,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 +20424,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 +20464,7 @@
   - "parent"
   - "tags"
   sort:
+  - "DOT1Q"
   - "IP4BASE"
   - "NAT44"
   - "POLICE_MARK"
@@ -20392,6 +20499,7 @@
   - "parent"
   - "tags"
   sort:
+  - "DOT1Q"
   - "IP4BASE"
   - "NAT44"
   - "POLICE_MARK"
@@ -20415,7 +20523,7 @@
            'NDRPDR' and
            '1T1C' and
            'IP4FWD' and
-           'NAT44' and
+           ('NAT44' or 'IP4BASE') and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -20423,7 +20531,7 @@
   - "parent"
   - "tags"
   sort:
-  - "BASE"
+  - "IP4BASE"
   - "BASE"
   - "SRC_USER_10"
   - "SRC_USER_100"
@@ -20445,7 +20553,7 @@
            'NDRPDR' and
            '2T2C' and
            'IP4FWD' and
-           'NAT44' and
+           ('NAT44' or 'IP4BASE') and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -20453,7 +20561,7 @@
   - "parent"
   - "tags"
   sort:
-  - "BASE"
+  - "IP4BASE"
   - "BASE"
   - "SRC_USER_10"
   - "SRC_USER_100"
@@ -20476,8 +20584,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 +20592,7 @@
   - "parent"
   - "tags"
   sort:
+  - "IP4BASE"
   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   - "ACL_STATELESS"
@@ -20505,8 +20613,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 +20621,7 @@
   - "parent"
   - "tags"
   sort:
+  - "IP4BASE"
   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   - "ACL_STATELESS"
@@ -20584,10 +20692,10 @@
 # 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 +20715,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 +20743,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 +20761,7 @@
            '2T1C' and
            'IP4FWD' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "latency"
@@ -20681,6 +20790,7 @@
            '4T2C' and
            'IP4FWD' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "latency"
@@ -20720,6 +20830,7 @@
   - "parent"
   - "tags"
   sort:
+  - "DOT1Q"
   - "IP4BASE"
   - "NAT44"
   - "POLICE_MARK"
@@ -20754,6 +20865,7 @@
   - "parent"
   - "tags"
   sort:
+  - "DOT1Q"
   - "IP4BASE"
   - "NAT44"
   - "POLICE_MARK"
@@ -20777,7 +20889,7 @@
            'NDRPDR' and
            '2T1C' and
            'IP4FWD' and
-           'NAT44' and
+           ('NAT44' or 'IP4BASE') and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -20785,7 +20897,7 @@
   - "parent"
   - "tags"
   sort:
-  - "BASE"
+  - "IP4BASE"
   - "BASE"
   - "SRC_USER_10"
   - "SRC_USER_100"
@@ -20807,7 +20919,7 @@
            'NDRPDR' and
            '4T2C' and
            'IP4FWD' and
-           'NAT44' and
+           ('NAT44' or 'IP4BASE') and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -20815,7 +20927,7 @@
   - "parent"
   - "tags"
   sort:
-  - "BASE"
+  - "IP4BASE"
   - "BASE"
   - "SRC_USER_10"
   - "SRC_USER_100"
@@ -20838,8 +20950,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 +20958,7 @@
   - "parent"
   - "tags"
   sort:
+  - "IP4BASE"
   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   - "ACL_STATELESS"
@@ -20868,7 +20980,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 +20988,7 @@
   - "parent"
   - "tags"
   sort:
+  - "IP4BASE"
   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   - "ACL_STATELESS"
@@ -20958,13 +21071,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 +21100,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 +21130,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 +21159,13 @@
            '4T2C' and
            'IP4FWD' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
   sort:
-  - "DOT1Q"
   - "IP4BASE"
   - "FIB_20k"
   - "FIB_200k"
@@ -21135,7 +21248,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 +21256,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 +21277,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 +21286,7 @@
   - "parent"
   - "tags"
   sort:
+  - "IP4BASE"
   - "L2BDMACLRN"
   - "L2XCFWD"
   - "LISP"
@@ -21192,7 +21307,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 +21315,7 @@
   - "parent"
   - "tags"
   sort:
+  - "IP4BASE"
   - "LISP"
   - "VXLAN_1"
   - "VXLAN_10"
@@ -21221,7 +21337,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 +21345,7 @@
   - "parent"
   - "tags"
   sort:
+  - "IP4BASE"
   - "LISP"
   - "VXLAN_1"
   - "VXLAN_10"
@@ -21251,7 +21368,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 +21377,7 @@
   - "parent"
   - "tags"
   sort:
+  - "IP4BASE"
   - "L2BDMACLRN"
   - "L2XCFWD"
   - "LISP"
@@ -21279,7 +21397,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 +21406,7 @@
   - "parent"
   - "tags"
   sort:
+  - "IP4BASE"
   - "L2BDMACLRN"
   - "L2XCFWD"
   - "LISP"
@@ -21308,7 +21427,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 +21435,7 @@
   - "parent"
   - "tags"
   sort:
+  - "IP4BASE"
   - "LISP"
   - "VXLAN_1"
   - "VXLAN_10"
@@ -21337,7 +21457,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 +21465,7 @@
   - "parent"
   - "tags"
   sort:
+  - "IP4BASE"
   - "LISP"
   - "VXLAN_1"
   - "VXLAN_10"
@@ -21367,7 +21488,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 +21497,7 @@
   - "parent"
   - "tags"
   sort:
+  - "IP4BASE"
   - "L2BDMACLRN"
   - "L2XCFWD"
   - "LISP"
@@ -21395,7 +21517,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 +21526,7 @@
   - "parent"
   - "tags"
   sort:
+  - "IP4BASE"
   - "L2BDMACLRN"
   - "L2XCFWD"
   - "LISP"
@@ -21416,10 +21539,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 +21563,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 +21592,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 +21657,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 +21681,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 +21710,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 +21895,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 +21915,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 +21940,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,76 +22196,76 @@
     title: "vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
     layout: "plot-latency"
 
-# Packet Latency - VPP vhost l2sw 3n-hsw-x520
--
-  type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           '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-x520-64b-1t1c-base_and_scale-ndr"
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           '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-x520-64b-2t2c-base_and_scale-ndr"
-    layout: "plot-latency"
+## Packet Latency - VPP vhost l2sw 3n-hsw-x520
+#-
+#  type: "plot"
+#  title: "VPP Latency: vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
+#  algorithm: "plot_latency_error_bars"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-X520-DA2' and
+#           '64B' and
+#           '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-x520-64b-1t1c-base_and_scale-ndr"
+#    layout: "plot-latency"
+#
+#-
+#  type: "plot"
+#  title: "VPP Latency: vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
+#  algorithm: "plot_latency_error_bars"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-X520-DA2' and
+#           '64B' and
+#           '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-x520-64b-2t2c-base_and_scale-ndr"
+#    layout: "plot-latency"
 
 # Packet Latency - VPP vhost l2sw 3n-hsw-x520 - base
 -
   type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-hsw-x520-64b-1t1c-base-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-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
@@ -22159,21 +22282,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-x520-64b-1t1c-base-ndr"
+    title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
     layout: "plot-latency"
 
 -
   type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-hsw-x520-64b-2t2c-base-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-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
@@ -22190,13 +22315,15 @@
   - "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-x520-64b-2t2c-base-ndr"
+    title: "vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
     layout: "plot-latency"
 
 # Packet Latency - VPP vhost l2sw 3n-hsw-x520 - base vm
@@ -22215,6 +22342,7 @@
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'CFS_OPT' and
+           not 'DOT1Q' and
            not 'VXLAN' and
            not 'IP4FWD' and
            not 'LBOND'"
@@ -22246,6 +22374,7 @@
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'CFS_OPT' and
+           not 'DOT1Q' and
            not 'VXLAN' and
            not 'IP4FWD' and
            not 'LBOND'"
@@ -22278,13 +22407,13 @@
            '1T1C' and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'CFS_OPT' and
            not 'DOT1Q'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
   sort:
-  - "not CFS_OPT"
   - "1VM"
   - "2VM"
   layout:
@@ -22306,89 +22435,89 @@
            '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
+#-
+#  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 +22534,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 +22567,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 +22601,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,258 +22634,260 @@
   - "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
--
-  type: "plot"
-  title: "VPP Latency: vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           '1T1C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'DOT1Q'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "1VM"
-  - "2VM"
-  layout:
-    title: "vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat"
-  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
-           '64B' and
-           'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           '2T2C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'DOT1Q'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "1VM"
-  - "2VM"
-  layout:
-    title: "vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
-    layout: "plot-latency"
-
-# Packet Latency - VPP vhost l2sw 3n-hsw-xl710
--
-  type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '1T1C' and
-           'L2BDMACLRN' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-  layout:
-    title: "vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '2T2C' and
-           'L2BDMACLRN' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-  layout:
-    title: "vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
-    layout: "plot-latency"
-
-# Packet Latency - VPP vhost l2sw 3n-hsw-xl710 - base
--
-  type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
-  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
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           'BASE' and
-           '1T1C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
-  layout:
-    title: "vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-ndr"
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-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
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           'BASE' and
-           '2T2C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
+## Packet Latency - VPP vhost ip4 3n-hsw-xl710
+#-
+#  type: "plot"
+#  title: "VPP Latency: vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat"
+#  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
+#           '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"
-#  - "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"
+#  - "2VM"
+#  layout:
+#    title: "vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
+#    layout: "plot-latency"
+#
+#-
+#  type: "plot"
+#  title: "VPP Latency: vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat"
+#  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
+#           '64B' and
+#           'NDRPDR' and
+#           'ETH' and
+#           'IP4FWD' and
+#           '2T2C' and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'DOT1Q'"
+#  parameters:
+#  - "latency"
+#  - "parent"
+#  - "tags"
 #  sort:
+#  - "not CFS_OPT"
 #  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
-  layout:
-    title: "vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-vm-ndr"
-    layout: "plot-latency"
+#  - "2VM"
+#  layout:
+#    title: "vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
+#    layout: "plot-latency"
+#
+## Packet Latency - VPP vhost l2sw 3n-hsw-xl710
+#-
+#  type: "plot"
+#  title: "VPP Latency: vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat"
+#  algorithm: "plot_latency_error_bars"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-XL710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           '1T1C' and
+#           'L2BDMACLRN' and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "latency"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "VM"  # "not CFS_OPT"
+##  - "CFS_OPT"
+##  - "FIB_10K"
+##  - "FIB_100K"
+##  - "FIB_1M"
+#  layout:
+#    title: "vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
+#    layout: "plot-latency"
+#
+#-
+#  type: "plot"
+#  title: "VPP Latency: vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat"
+#  algorithm: "plot_latency_error_bars"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-XL710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           '2T2C' and
+#           'L2BDMACLRN' and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "latency"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "VM"  # "not CFS_OPT"
+##  - "CFS_OPT"
+##  - "FIB_10K"
+##  - "FIB_100K"
+##  - "FIB_1M"
+#  layout:
+#    title: "vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
+#    layout: "plot-latency"
+#
+## Packet Latency - VPP vhost l2sw 3n-hsw-xl710 - base
+#-
+#  type: "plot"
+#  title: "VPP Latency: vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
+#  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
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           'BASE' and
+#           '1T1C' and
+#           ('L2BDMACLRN' or 'L2XCFWD') and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "latency"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "not CFS_OPT"
+##  - "L2XCFWD"
+##  - "not CFS_OPT"
+##  - "CFS_OPT"
+#  layout:
+#    title: "vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-ndr"
+#    layout: "plot-latency"
+#
+#-
+#  type: "plot"
+#  title: "VPP Latency: vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-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
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           'BASE' and
+#           '2T2C' and
+#           ('L2BDMACLRN' or 'L2XCFWD') and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "latency"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "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"
+#  layout:
+#    title: "vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-vm-ndr"
+#    layout: "plot-latency"
 
 # Packet Latency - VPP vhost ip4 3n-skx-x710
 -
@@ -22774,7 +22911,6 @@
   - "parent"
   - "tags"
   sort:
-  - "not CFS_OPT"
   - "1VM"
   - "2VM"
   layout:
@@ -22802,83 +22938,82 @@
   - "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"
-    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"
+#    layout: "plot-latency"
 
 # Packet Latency - VPP vhost l2sw 3n-skx-x710 - base
 -
   type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-skx-x710-64b-2t1c-base-ndr-lat"
+  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-skx-x710-64b-2t1c-base-ndr-lat"
+  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
@@ -22896,21 +23031,21 @@
   - "latency"
   - "parent"
   - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
+  sort:
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
   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-latency"
 
 -
   type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-skx-x710-64b-4t2c-base-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-skx-x710-64b-4t2c-base-ndr-lat"
+  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
@@ -22928,22 +23063,22 @@
   - "latency"
   - "parent"
   - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
+  sort:
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
   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-latency"
 
 # Packet Latency - VPP vhost l2sw 3n-skx-x710 - base vm
 -
   type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-skx-x710-64b-2t1c-base-vm-ndr-lat"
+  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-skx-x710-64b-2t1c-base-vm-ndr-lat"
+  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
@@ -22960,21 +23095,23 @@
   - "latency"
   - "parent"
   - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
+  sort:
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
   layout:
-    title: "vhost-l2sw-3n-skx-x710-64b-2t1c-base-vm-ndr"
+    title: "vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-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-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-skx-x710-64b-4t2c-base-vm-ndr-lat"
+  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
@@ -22991,13 +23128,15 @@
   - "latency"
   - "parent"
   - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
+  sort:
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
   layout:
-    title: "vhost-l2sw-3n-skx-x710-64b-4t2c-base-vm-ndr"
+    title: "vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-vm-ndr"
     layout: "plot-latency"
 
 # Packet Latency - VPP vhost ip4 2n-skx-x710
@@ -23017,13 +23156,13 @@
            '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:
@@ -23046,91 +23185,91 @@
            'VHOST_1024' and
            not 'VXLAN' and
            not 'NF_DENSITY' and
+           not 'CFS_OPT' and
            not 'DOT1Q'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
   sort:
-  - "not CFS_OPT"
   - "1VM"
   - "2VM"
   layout:
     title: "vhost-ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
     layout: "plot-latency"
 
-# Packet Latency - VPP vhost l2sw 2n-skx-x710
--
-  type: "plot"
-  title: "VPP Latency: vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '2T1C' and
-           'L2BDMACLRN' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '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
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'NF_DENSITY' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-  layout:
-    title: "vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
-    layout: "plot-latency"
+## Packet Latency - VPP vhost l2sw 2n-skx-x710
+#-
+#  type: "plot"
+#  title: "VPP Latency: vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
+#  algorithm: "plot_latency_error_bars"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
+#  data: "plot-vpp-throughput-latency-2n-skx"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           '2T1C' and
+#           'L2BDMACLRN' and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not '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
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'NF_DENSITY' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "latency"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "VM"  # "not CFS_OPT"
+##  - "CFS_OPT"
+##  - "FIB_10K"
+##  - "FIB_100K"
+##  - "FIB_1M"
+#  layout:
+#    title: "vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
+#    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-x710-64b-2t1c-base_and_features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-2t1c-base-ndr-lat"
+  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
@@ -23154,15 +23293,15 @@
 #  - "not CFS_OPT"
 #  - "CFS_OPT"
   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-latency"
 
 -
   type: "plot"
-  title: "VPP Latency: vhost-l2sw-2n-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-2n-skx-x710-64b-4t2c-base-ndr-lat"
+  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
@@ -23186,7 +23325,7 @@
 #  - "not CFS_OPT"
 #  - "CFS_OPT"
   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-latency"
 
 # Packet Latency - VPP vhost l2sw 2n-skx-x710 - base vm
@@ -23207,6 +23346,7 @@
            not 'CFS_OPT' and
            not 'VXLAN' and
            not 'NF_DENSITY' and
+           not 'DOT1Q' and
            not 'IP4FWD'"
   parameters:
   - "latency"
@@ -23238,6 +23378,7 @@
            not 'CFS_OPT' and
            not 'VXLAN' and
            not 'NF_DENSITY' and
+           not 'DOT1Q' and
            not 'IP4FWD'"
   parameters:
   - "latency"
@@ -23268,6 +23409,7 @@
            '2T1C' and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'CFS_OPT' and
            not 'DOT1Q'"
   parameters:
   - "latency"
@@ -23296,6 +23438,7 @@
            '4T2C' and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'CFS_OPT' and
            not 'DOT1Q'"
   parameters:
   - "latency"
@@ -23309,76 +23452,76 @@
     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
+#-
+#  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"
+  title: "VPP Latency: vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-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-XXV710' and
            '64B' and
@@ -23401,15 +23544,15 @@
 #  - "not CFS_OPT"
 #  - "CFS_OPT"
   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-latency"
 
 -
   type: "plot"
-  title: "VPP Latency: vhost-l2sw-2n-skx-xxv710-64b-4t2c-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-xxv710-64b-4t2c-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-XXV710' and
            '64B' and
@@ -23432,7 +23575,7 @@
 #  - "not CFS_OPT"
 #  - "CFS_OPT"
   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-latency"
 
 # Packet Latency - VPP vhost l2sw 2n-skx-xxv710 - base vm
@@ -23452,6 +23595,7 @@
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
+           not 'DOT1Q' and
            not 'IP4FWD'"
   parameters:
   - "latency"
@@ -23482,6 +23626,7 @@
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
+           not 'DOT1Q' and
            not 'IP4FWD'"
   parameters:
   - "latency"
@@ -24150,16 +24295,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 +24318,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 +24348,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 +24379,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 +24409,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 +24440,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 +24470,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 +24501,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 +24531,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 +24563,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 +24594,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 +24625,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 +24655,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 +24676,7 @@
            'NDRPDR' and
            'L2XCFWD' and
            not 'VHOST' and
+           not 'NF_DENSITY' and
            'MEMIF'"
   parameters:
   - "throughput"
@@ -24547,6 +24705,7 @@
            'NDRPDR' and
            'L2XCFWD' and
            not 'VHOST' and
+           not 'NF_DENSITY' and
            'MEMIF'"
   parameters:
   - "throughput"
@@ -24576,6 +24735,7 @@
            'NDRPDR' and
            ('L2BDMACSTAT' or 'L2BDMACLRN') and
            not 'VHOST' and
+           not 'NF_DENSITY' and
            'MEMIF'"
   parameters:
   - "throughput"
@@ -24604,6 +24764,7 @@
            'NDRPDR' and
            ('L2BDMACSTAT' or 'L2BDMACLRN') and
            not 'VHOST' and
+           not 'NF_DENSITY' and
            'MEMIF'"
   parameters:
   - "throughput"
@@ -24633,6 +24794,7 @@
            'NDRPDR' and
            'L2XCFWD' and
            not 'VHOST' and
+           not 'NF_DENSITY' and
            'MEMIF'"
   parameters:
   - "throughput"
@@ -24661,6 +24823,7 @@
            'NDRPDR' and
            'L2XCFWD' and
            not 'VHOST' and
+           not 'NF_DENSITY' and
            'MEMIF'"
   parameters:
   - "throughput"
@@ -24690,6 +24853,7 @@
            'NDRPDR' and
            ('L2BDMACSTAT' or 'L2BDMACLRN') and
            not 'VHOST' and
+           not 'NF_DENSITY' and
            'MEMIF'"
   parameters:
   - "throughput"
@@ -24718,6 +24882,7 @@
            'NDRPDR' and
            ('L2BDMACSTAT' or 'L2BDMACLRN') and
            not 'VHOST' and
+           not 'NF_DENSITY' and
            'MEMIF'"
   parameters:
   - "throughput"
@@ -24749,6 +24914,7 @@
            'NDRPDR' and
            'IP4FWD' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -24777,6 +24943,7 @@
            'NDRPDR' and
            'IP4FWD' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -24873,7 +25040,8 @@
            '64B' and
            'NDRPDR' and
            'IP4FWD' and
-           'NAT44' and
+           ('NAT44' or 'IP4BASE') and
+           not 'DOT1Q' and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -24881,7 +25049,7 @@
   - "parent"
   - "tags"
   sort:
-  - "BASE"
+  - "IP4BASE"
   - "BASE"
   - "SRC_USER_10"
   - "SRC_USER_100"
@@ -24902,7 +25070,8 @@
            '64B' and
            'NDRPDR' and
            'IP4FWD' and
-           'NAT44' and
+           ('NAT44' or 'IP4BASE') and
+           not 'DOT1Q' and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -24910,7 +25079,7 @@
   - "parent"
   - "tags"
   sort:
-  - "BASE"
+  - "IP4BASE"
   - "BASE"
   - "SRC_USER_10"
   - "SRC_USER_100"
@@ -24932,15 +25101,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 +25130,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 +25160,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 +25189,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 +25221,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 +25249,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 +25288,7 @@
   - "parent"
   - "tags"
   sort:
+  - "DOT1Q"
   - "IP4BASE"
   - "NAT44"
   - "POLICE_MARK"
@@ -25148,6 +25322,7 @@
   - "parent"
   - "tags"
   sort:
+  - "DOT1Q"
   - "IP4BASE"
   - "NAT44"
   - "POLICE_MARK"
@@ -25170,7 +25345,7 @@
            '64B' and
            'NDRPDR' and
            'IP4FWD' and
-           'NAT44' and
+           ('NAT44' or 'IP4BASE') and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -25178,7 +25353,7 @@
   - "parent"
   - "tags"
   sort:
-  - "BASE"
+  - "IP4BASE"
   - "BASE"
   - "SRC_USER_10"
   - "SRC_USER_100"
@@ -25199,7 +25374,7 @@
            '64B' and
            'NDRPDR' and
            'IP4FWD' and
-           'NAT44' and
+           ('NAT44' or 'IP4BASE') and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -25207,7 +25382,7 @@
   - "parent"
   - "tags"
   sort:
-  - "BASE"
+  - "IP4BASE"
   - "BASE"
   - "SRC_USER_10"
   - "SRC_USER_100"
@@ -25229,8 +25404,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 +25412,7 @@
   - "parent"
   - "tags"
   sort:
+  - "IP4BASE"
   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   - "ACL_STATELESS"
@@ -25257,8 +25432,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 +25440,7 @@
   - "parent"
   - "tags"
   sort:
+  - "IP4BASE"
   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   - "ACL_STATELESS"
@@ -25334,10 +25509,10 @@
 # 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 +25531,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 +25558,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 +25575,7 @@
            'NDRPDR' and
            'IP4FWD' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -25427,6 +25603,7 @@
            'NDRPDR' and
            'IP4FWD' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -25465,6 +25642,7 @@
   - "parent"
   - "tags"
   sort:
+  - "DOT1Q"
   - "IP4BASE"
   - "NAT44"
   - "POLICE_MARK"
@@ -25498,6 +25676,7 @@
   - "parent"
   - "tags"
   sort:
+  - "DOT1Q"
   - "IP4BASE"
   - "NAT44"
   - "POLICE_MARK"
@@ -25520,7 +25699,7 @@
            '64B' and
            'NDRPDR' and
            'IP4FWD' and
-           'NAT44' and
+           ('NAT44' or 'IP4BASE') and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -25528,7 +25707,7 @@
   - "parent"
   - "tags"
   sort:
-  - "BASE"
+  - "IP4BASE"
   - "BASE"
   - "SRC_USER_10"
   - "SRC_USER_100"
@@ -25549,7 +25728,7 @@
            '64B' and
            'NDRPDR' and
            'IP4FWD' and
-           'NAT44' and
+           ('NAT44' or 'IP4BASE') and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -25557,7 +25736,7 @@
   - "parent"
   - "tags"
   sort:
-  - "BASE"
+  - "IP4BASE"
   - "BASE"
   - "SRC_USER_10"
   - "SRC_USER_100"
@@ -25579,8 +25758,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 +25766,7 @@
   - "parent"
   - "tags"
   sort:
+  - "IP4BASE"
   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   - "ACL_STATELESS"
@@ -25607,8 +25786,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 +25794,7 @@
   - "parent"
   - "tags"
   sort:
+  - "IP4BASE"
   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   - "ACL_STATELESS"
@@ -25695,13 +25874,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 +25902,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 +25931,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 +25959,13 @@
            'NDRPDR' and
            'IP4FWD' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "DOT1Q"
   - "IP4BASE"
   - "FIB_20k"
   - "FIB_200k"
@@ -25915,7 +26094,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 +26103,7 @@
   - "parent"
   - "tags"
   sort:
+  - "IP4BASE"
   - "L2BDMACLRN"
   - "L2XCFWD"
   - "LISP"
@@ -25942,7 +26122,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 +26131,7 @@
   - "parent"
   - "tags"
   sort:
+  - "IP4BASE"
   - "L2BDMACLRN"
   - "L2XCFWD"
   - "LISP"
@@ -25970,7 +26151,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 +26159,7 @@
   - "parent"
   - "tags"
   sort:
+  - "IP4BASE"
   - "LISP"
   - "VXLAN_1"
   - "VXLAN_10"
@@ -25998,7 +26180,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 +26188,7 @@
   - "parent"
   - "tags"
   sort:
+  - "IP4BASE"
   - "LISP"
   - "VXLAN_1"
   - "VXLAN_10"
@@ -26027,7 +26210,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 +26219,7 @@
   - "parent"
   - "tags"
   sort:
+  - "IP4BASE"
   - "L2BDMACLRN"
   - "L2XCFWD"
   - "LISP"
@@ -26054,7 +26238,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 +26247,7 @@
   - "parent"
   - "tags"
   sort:
+  - "IP4BASE"
   - "L2BDMACLRN"
   - "L2XCFWD"
   - "LISP"
@@ -26082,8 +26267,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 +26275,7 @@
   - "parent"
   - "tags"
   sort:
+  - "IP4BASE"
   - "LISP"
   - "VXLAN_1"
   - "VXLAN_10"
@@ -26111,8 +26296,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 +26304,7 @@
   - "parent"
   - "tags"
   sort:
+  - "IP4BASE"
   - "LISP"
   - "VXLAN_1"
   - "VXLAN_10"
@@ -26141,7 +26326,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 +26335,7 @@
   - "parent"
   - "tags"
   sort:
+  - "IP4BASE"
   - "L2BDMACLRN"
   - "L2XCFWD"
   - "LISP"
@@ -26168,7 +26354,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 +26363,7 @@
   - "parent"
   - "tags"
   sort:
+  - "IP4BASE"
   - "L2BDMACLRN"
   - "L2XCFWD"
   - "LISP"
@@ -26189,10 +26376,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 +26399,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,71 +26427,71 @@
   - "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"
+    title: "ip6-3n-hsw-x520-78b-base-pdr"
     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"
-    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"
+#    layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP IPv6 3n-hsw-x710
 -
@@ -26429,10 +26616,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 +26639,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 +26667,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 +26960,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 +26979,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 +27003,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 +27333,8 @@
   - "tags"
   sort:
   - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
   - "FIB_10K"
   - "FIB_100K"
   - "FIB_1M"
@@ -27177,8 +27364,8 @@
   - "tags"
   sort:
   - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
   - "FIB_10K"
   - "FIB_100K"
   - "FIB_1M"
@@ -27200,6 +27387,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 +27415,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 +27433,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 +27452,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 +27479,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 +27562,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 +27591,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 +27610,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 +27622,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 +27650,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
@@ -27654,287 +27835,23 @@
   - "tags"
   sort:
   - "L2XCBASE"
-  - "L2BDMACLRN"
-  - "L2PATCH"
-  layout:
-    title: "l2sw-2n-dnv-x553-64b-base-pdr"
-    layout: "plot-throughput-speedup-analysis"
-
-################################################################################
-
-# Packet Speedup - VPP vhost ip4 3n-hsw-x520
--
-  type: "plot"
-  title: "VPP Speedup: vhost-ip4-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'DOT1Q'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "1VM"
-  - "2VM"
-  layout:
-    title: "vhost-ip4-3n-hsw-x520-64b-base_and_scale-ndr"
-    layout: "plot-throughput-speedup-analysis"
-
--
-  type: "plot"
-  title: "VPP Speedup: vhost-ip4-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'DOT1Q'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "1VM"
-  - "2VM"
-  layout:
-    title: "vhost-ip4-3n-hsw-x520-64b-base_and_scale-pdr"
-    layout: "plot-throughput-speedup-analysis"
-
-# Packet Speedup - VPP vhost l2sw 3n-hsw-x520
--
-  type: "plot"
-  title: "VPP Speedup: vhost-l2sw-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-  layout:
-    title: "vhost-l2sw-3n-hsw-x520-64b-base_and_scale-ndr"
-    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"
+  - "L2BDMACLRN"
+  - "L2PATCH"
   layout:
-    title: "vhost-ip4-3n-hsw-x710-64b-base_and_scale-ndr"
+    title: "l2sw-2n-dnv-x553-64b-base-pdr"
     layout: "plot-throughput-speedup-analysis"
 
+################################################################################
+
+# Packet Speedup - VPP vhost ip4 3n-hsw-x520
 -
   type: "plot"
-  title: "VPP Speedup: vhost-ip4-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
+  title: "VPP Speedup: vhost-ip4-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
   data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
            'ETH' and
@@ -27951,79 +27868,105 @@
   - "1VM"
   - "2VM"
   layout:
-    title: "vhost-ip4-3n-hsw-x710-64b-base_and_scale-pdr"
+    title: "vhost-ip4-3n-hsw-x520-64b-base_and_scale-ndr"
     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"
+  title: "VPP Speedup: vhost-ip4-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
   data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           'L2BDMACLRN' and
+           'ETH' and
+           'IP4FWD' and
            'VHOST_1024' and
            not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
+           not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
+  sort:
+  - "not CFS_OPT"
+  - "1VM"
+  - "2VM"
   layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-base_and_scale-ndr"
+    title: "vhost-ip4-3n-hsw-x520-64b-base_and_scale-pdr"
     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-x520
+#-
+#  type: "plot"
+#  title: "VPP Speedup: vhost-l2sw-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
+#  algorithm: "plot_throughput_speedup_analysis"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
+#  data: "plot-throughput-speedup-analysis-3n-hsw"
+#  filter: "'NIC_Intel-X520-DA2' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "VM"  # "not CFS_OPT"
+##  - "CFS_OPT"
+##  - "FIB_10K"
+##  - "FIB_100K"
+##  - "FIB_1M"
+#  layout:
+#    title: "vhost-l2sw-3n-hsw-x520-64b-base_and_scale-ndr"
+#    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-x710 - base
+# Packet Speedup - VPP vhost l2sw 3n-hsw-x520 - base
 -
   type: "plot"
-  title: "VPP Speedup: vhost-l2sw-3n-hsw-x710-64b-base-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-x710-64b-base-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-X710' and
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
            ('ETH' or 'DOT1Q') and
@@ -28037,23 +27980,25 @@
   - "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-x710-64b-base-ndr"
+    title: "vhost-l2sw-3n-hsw-x520-64b-base_and_features-ndr"
     layout: "plot-throughput-speedup-analysis"
 
 -
   type: "plot"
-  title: "VPP Speedup: vhost-l2sw-3n-hsw-x710-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-x710-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-X710' and
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
            ('ETH' or 'DOT1Q') and
@@ -28067,30 +28012,33 @@
   - "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-x710-64b-base-pdr"
+    title: "vhost-l2sw-3n-hsw-x520-64b-base_and_features-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-# Packet Speedup - VPP vhost l2sw 3n-hsw-x710 - base vm
+# Packet Speedup - VPP vhost l2sw 3n-hsw-x520 - base vm
 -
   type: "plot"
-  title: "VPP Speedup: vhost-l2sw-3n-hsw-x710-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-x710-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-X710' 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' and
            not 'LBOND'"
@@ -28104,23 +28052,24 @@
 #  - "1VM"
 #  - "L2BDMACLRN"
   layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-base-vm-ndr"
+    title: "vhost-l2sw-3n-hsw-x520-64b-base-vm-ndr"
     layout: "plot-throughput-speedup-analysis"
 
 -
   type: "plot"
-  title: "VPP Speedup: vhost-l2sw-3n-hsw-x710-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-x710-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-X710' 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' and
            not 'LBOND'"
@@ -28134,134 +28083,134 @@
 #  - "1VM"
 #  - "L2BDMACLRN"
   layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-base-vm-pdr"
+    title: "vhost-l2sw-3n-hsw-x520-64b-base-vm-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-# Packet Speedup - VPP vhost ip4 3n-hsw-xl710
+# Packet Speedup - VPP vhost ip4 3n-hsw-x710
 -
   type: "plot"
-  title: "VPP Speedup: vhost-ip4-3n-hsw-xl710-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-hsw-xl710-64b-base_and_scale-ndr-tsa"
+  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-XL710' and
+  filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
            'ETH' and
            'IP4FWD' and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'CFS_OPT' and
            not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "not CFS_OPT"
   - "1VM"
   - "2VM"
   layout:
-    title: "vhost-ip4-3n-hsw-xl710-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-hsw-xl710-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-hsw-xl710-64b-base_and_scale-pdr-tsa"
+  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-XL710' and
+  filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
            'ETH' and
            'IP4FWD' and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'CFS_OPT' and
            not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "not CFS_OPT"
   - "1VM"
   - "2VM"
   layout:
-    title: "vhost-ip4-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"
+    title: "vhost-ip4-3n-hsw-x710-64b-base_and_scale-pdr"
     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-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-xl710 - base
+# Packet Speedup - VPP vhost l2sw 3n-hsw-x710 - base
 -
   type: "plot"
-  title: "VPP Speedup: vhost-l2sw-3n-hsw-xl710-64b-base-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-hsw-xl710-64b-base-ndr-tsa"
+  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-XL710' and
+  filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
            ('ETH' or 'DOT1Q') and
@@ -28275,23 +28224,25 @@
   - "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-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-hsw-xl710-64b-base-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-hsw-xl710-64b-base-pdr-tsa"
+  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-XL710' and
+  filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
            ('ETH' or 'DOT1Q') and
@@ -28305,24 +28256,26 @@
   - "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-x710-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-x710 - base vm
 -
   type: "plot"
-  title: "VPP Speedup: vhost-l2sw-3n-hsw-xl710-64b-base-vm-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-hsw-xl710-64b-base-vm-ndr-tsa"
+  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-XL710' and
+  filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
            ('ETH' or 'DOT1Q') and
@@ -28330,28 +28283,31 @@
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
-           not 'IP4FWD'"
+           not 'IP4FWD' and
+           not 'LBOND'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
+  sort:
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
   layout:
-    title: "vhost-l2sw-3n-hsw-xl710-64b-base-vm-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-hsw-xl710-64b-base-vm-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-hsw-xl710-64b-base-vm-pdr-tsa"
+  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-XL710' and
+  filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
            ('ETH' or 'DOT1Q') and
@@ -28359,19 +28315,258 @@
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
-           not 'IP4FWD'"
+           not 'IP4FWD' and
+           not 'LBOND'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  layout:
+    title: "vhost-l2sw-3n-hsw-x710-64b-base_and_features-vm-pdr"
+    layout: "plot-throughput-speedup-analysis"
+
+## Packet Speedup - VPP vhost ip4 3n-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"
-#  - "L2XCFWD"
+#  - "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"
-#  - "L2BDMACLRN"
-  layout:
-    title: "vhost-l2sw-3n-hsw-xl710-64b-base-vm-pdr"
-    layout: "plot-throughput-speedup-analysis"
+#  - "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"
+#  layout:
+#    title: "vhost-l2sw-3n-hsw-xl710-64b-base-ndr"
+#    layout: "plot-throughput-speedup-analysis"
+#
+#-
+#  type: "plot"
+#  title: "VPP Speedup: vhost-l2sw-3n-hsw-xl710-64b-base-pdr-tsa"
+#  algorithm: "plot_throughput_speedup_analysis"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-base-pdr-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"
+#  layout:
+#    title: "vhost-l2sw-3n-hsw-xl710-64b-base-pdr"
+#    layout: "plot-throughput-speedup-analysis"
+#
+## Packet Speedup - VPP vhost l2sw 3n-hsw-xl710 - base vm
+#-
+#  type: "plot"
+#  title: "VPP Speedup: vhost-l2sw-3n-hsw-xl710-64b-base-vm-ndr-tsa"
+#  algorithm: "plot_throughput_speedup_analysis"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-base-vm-ndr-tsa"
+#  data: "plot-throughput-speedup-analysis-3n-hsw"
+#  filter: "'NIC_Intel-XL710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') 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"
+#  layout:
+#    title: "vhost-l2sw-3n-hsw-xl710-64b-base-vm-ndr"
+#    layout: "plot-throughput-speedup-analysis"
+#
+#-
+#  type: "plot"
+#  title: "VPP Speedup: vhost-l2sw-3n-hsw-xl710-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"
+#  data: "plot-throughput-speedup-analysis-3n-hsw"
+#  filter: "'NIC_Intel-XL710' 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'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "1VM"
+##  - "L2XCFWD"
+##  - "1VM"
+##  - "L2BDMACLRN"
+#  layout:
+#    title: "vhost-l2sw-3n-hsw-xl710-64b-base-vm-pdr"
+#    layout: "plot-throughput-speedup-analysis"
 
 # Packet Speedup - VPP vhost ip4 3n-skx-x710
 -
@@ -28394,7 +28589,6 @@
   - "parent"
   - "tags"
   sort:
-  - "not CFS_OPT"
   - "1VM"
   - "2VM"
   layout:
@@ -28421,197 +28615,200 @@
   - "parent"
   - "tags"
   sort:
-  - "not CFS_OPT"
   - "1VM"
   - "2VM"
   layout:
     title: "vhost-ip4-3n-skx-x710-64b-base_and_scale-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-# Packet Speedup - VPP vhost l2sw 3n-skx-x710
--
-  type: "plot"
-  title: "VPP Speedup: vhost-l2sw-3n-skx-x710-64b-base_and_scale-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '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-skx-x710-64b-base_and_scale-ndr"
-    layout: "plot-throughput-speedup-analysis"
-
--
-  type: "plot"
-  title: "VPP Speedup: vhost-l2sw-3n-skx-x710-64b-base_and_scale-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '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-skx-x710-64b-base_and_scale-pdr"
-    layout: "plot-throughput-speedup-analysis"
+## Packet Speedup - VPP vhost l2sw 3n-skx-x710
+#-
+#  type: "plot"
+#  title: "VPP Speedup: vhost-l2sw-3n-skx-x710-64b-base_and_scale-ndr-tsa"
+#  algorithm: "plot_throughput_speedup_analysis"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-base_and_scale-ndr-tsa"
+#  data: "plot-throughput-speedup-analysis-3n-skx"
+#  filter: "'NIC_Intel-X710' and
+#           '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-skx-x710-64b-base_and_scale-ndr"
+#    layout: "plot-throughput-speedup-analysis"
+#
+#-
+#  type: "plot"
+#  title: "VPP Speedup: vhost-l2sw-3n-skx-x710-64b-base_and_scale-pdr-tsa"
+#  algorithm: "plot_throughput_speedup_analysis"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-base_and_scale-pdr-tsa"
+#  data: "plot-throughput-speedup-analysis-3n-skx"
+#  filter: "'NIC_Intel-X710' and
+#           '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-skx-x710-64b-base_and_scale-pdr"
+#    layout: "plot-throughput-speedup-analysis"
 
-# Packet Speedup - VPP vhost l2sw 3n-skx-x710 - base
--
-  type: "plot"
-  title: "VPP Speedup: vhost-l2sw-3n-skx-x710-64b-base-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-base-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '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' and
-           not 'LBOND'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
+## Packet Speedup - VPP vhost l2sw 3n-skx-x710 - base
+#-
+#  type: "plot"
+#  title: "VPP Speedup: vhost-l2sw-3n-skx-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_features-ndr-tsa"
+#  data: "plot-throughput-speedup-analysis-3n-skx"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           'BASE' and
+#           ('L2BDMACLRN' or 'L2XCFWD') and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not '2VM' and
+#           not 'LBOND'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
 #  sort:
-#  - "not CFS_OPT"
+#  - "L2BDMACLRN"
+#  - "L2BDMACLRN"
 #  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
-  layout:
-    title: "vhost-l2sw-3n-skx-x710-64b-base-ndr"
-    layout: "plot-throughput-speedup-analysis"
-
--
-  type: "plot"
-  title: "VPP Speedup: vhost-l2sw-3n-skx-x710-64b-base-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-base-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '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' and
-           not 'LBOND'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "not CFS_OPT"
 #  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
-  layout:
-    title: "vhost-l2sw-3n-skx-x710-64b-base-pdr"
-    layout: "plot-throughput-speedup-analysis"
-
-# Packet Speedup - VPP vhost l2sw 3n-skx-x710 - base vm
--
-  type: "plot"
-  title: "VPP Speedup: vhost-l2sw-3n-skx-x710-64b-base-vm-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-base-vm-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '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"
+#  layout:
+#    title: "vhost-l2sw-3n-skx-x710-64b-base_and_features-ndr"
+#    layout: "plot-throughput-speedup-analysis"
+#
+#-
+#  type: "plot"
+#  title: "VPP Speedup: vhost-l2sw-3n-skx-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_features-pdr-tsa"
+#  data: "plot-throughput-speedup-analysis-3n-skx"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           'BASE' and
+#           ('L2BDMACLRN' or 'L2XCFWD') and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not '2VM' and
+#           not 'LBOND'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
 #  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
 #  - "L2BDMACLRN"
-  layout:
-    title: "vhost-l2sw-3n-skx-x710-64b-base-vm-ndr"
-    layout: "plot-throughput-speedup-analysis"
-
--
-  type: "plot"
-  title: "VPP Speedup: vhost-l2sw-3n-skx-x710-64b-base-vm-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-base-vm-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '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"
+#  - "L2BDMACLRN"
+#  - "L2XCFWD"
+#  - "L2XCFWD"
+#  layout:
+#    title: "vhost-l2sw-3n-skx-x710-64b-base_and_features-pdr"
+#    layout: "plot-throughput-speedup-analysis"
+#
+## Packet Speedup - VPP vhost l2sw 3n-skx-x710 - base vm
+#-
+#  type: "plot"
+#  title: "VPP Speedup: vhost-l2sw-3n-skx-x710-64b-base_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_and_features-vm-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
+#           'VHOST_1024' and
+#           not 'CFS_OPT' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not 'LBOND'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
 #  sort:
-#  - "1VM"
+#  - "L2BDMACLRN"
+#  - "L2BDMACLRN"
+#  - "L2BDMACLRN"
 #  - "L2XCFWD"
-#  - "1VM"
+#  - "L2XCFWD"
+#  - "L2XCFWD"
+#  layout:
+#    title: "vhost-l2sw-3n-skx-x710-64b-base_and_features-vm-ndr"
+#    layout: "plot-throughput-speedup-analysis"
+#
+#-
+#  type: "plot"
+#  title: "VPP Speedup: vhost-l2sw-3n-skx-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_and_features-vm-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
+#           'VHOST_1024' and
+#           not 'CFS_OPT' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not 'LBOND'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
 #  - "L2BDMACLRN"
-  layout:
-    title: "vhost-l2sw-3n-skx-x710-64b-base-vm-pdr"
-    layout: "plot-throughput-speedup-analysis"
+#  - "L2BDMACLRN"
+#  - "L2BDMACLRN"
+#  - "L2XCFWD"
+#  - "L2XCFWD"
+#  - "L2XCFWD"
+#  layout:
+#    title: "vhost-l2sw-3n-skx-x710-64b-base_and_features-vm-pdr"
+#    layout: "plot-throughput-speedup-analysis"
 
 # Packet Speedup - VPP vhost ip4 2n-skx-x710
 -
@@ -28629,13 +28826,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 +28854,89 @@
            '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
+#-
+#  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 +28959,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 +28990,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 +29010,7 @@
            not 'CFS_OPT' and
            not 'VXLAN' and
            not 'NF_DENSITY' and
+           not 'DOT1Q' and
            not 'IP4FWD'"
   parameters:
   - "throughput"
@@ -28843,6 +29041,7 @@
            not 'CFS_OPT' and
            not 'VXLAN' and
            not 'NF_DENSITY' and
+           not 'DOT1Q' and
            not 'IP4FWD'"
   parameters:
   - "throughput"
@@ -28872,6 +29071,7 @@
            'IP4FWD' and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'CFS_OPT' and
            not 'DOT1Q'"
   parameters:
   - "throughput"
@@ -28899,6 +29099,7 @@
            'IP4FWD' and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'CFS_OPT' and
            not 'DOT1Q'"
   parameters:
   - "throughput"
@@ -28912,74 +29113,74 @@
     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
+#-
+#  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 +29202,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 +29232,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 +29251,7 @@
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
+           not 'DOT1Q' and
            not 'IP4FWD'"
   parameters:
   - "throughput"
@@ -29079,6 +29281,7 @@
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
+           not 'DOT1Q' and
            not 'IP4FWD'"
   parameters:
   - "throughput"
Integration tests