Code Review / csit.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
CSIT-1359: Add 3n-skx and 2n-skx comparisons to Report
[csit.git] / resources / tools / presentation / specification.yaml
diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml
index a71b035..816f211 100644 (file)
--- a/resources/tools/presentation/specification.yaml
+++ b/resources/tools/presentation/specification.yaml
@@ -119,7 +119,7 @@
   data-sets:
 
     # VPP Performance
-    vpp-performance-changes:
+    vpp-performance-changes-3n-hsw:
       csit-vpp-perf-1804-all:
       - 21  # sel
       - 22  # sel
@@ -146,19 +146,77 @@
       - 44  # NDRPDR sel
       - 47  # NDRPDR sel
       csit-vpp-perf-verify-1810-3n-hsw:
-      # TODO: Add data
       - 8   # NDRPDR sel
       - 12  # NDRPDR sel
       - 14  # NDRPDR sel
       - 18  # NDRPDR sel
+      - 23  # NDRPDR sel
+      - 25  # NDRPDR sel
+      - 38  # NDRPDR sel
+      - 39  # NDRPDR sel
+      - 41  # NDRPDR sel
+      - 42  # NDRPDR sel
+
+    vpp-performance-changes-3n-skx:
+      csit-vpp-perf-verify-1807-3n-skx:
+      - 33  # NDRPDR sel
+      - 35  # NDRPDR sel
+      - 37  # NDRPDR sel
+      - 38  # NDRPDR sel
+      - 39  # NDRPDR sel
+      - 43  # NDRPDR sel
+      - 44  # NDRPDR sel
+      - 49  # NDRPDR sel
+      - 50  # NDRPDR sel
+      - 56  # NDRPDR sel
+      csit-vpp-perf-verify-1810-3n-skx:
+      - 10  # NDRPDR sel
+      - 14  # NDRPDR sel
+      - 15  # NDRPDR sel
+      - 16  # NDRPDR sel
+      - 17  # NDRPDR sel
+      - 19  # NDRPDR sel
+      - 20  # NDRPDR sel
+      - 21  # NDRPDR sel
+      - 22  # NDRPDR sel
+      - 25  # NDRPDR sel
+
+    vpp-performance-changes-2n-skx:
+      csit-vpp-perf-verify-1807-2n-skx:
+      - 26  # NDRPDR sel
+      - 28  # NDRPDR sel
+      - 29  # NDRPDR sel
+      - 30  # NDRPDR sel
+      - 34  # NDRPDR sel
+      - 35  # NDRPDR sel
+      - 36  # NDRPDR sel
+      - 39  # NDRPDR sel
+      - 40  # NDRPDR sel
+      - 42  # NDRPDR sel
+      csit-vpp-perf-verify-1810-2n-skx:
+      - 9   # NDRPDR sel
+      - 13  # NDRPDR sel
+      - 14  # NDRPDR sel
+      - 19  # NDRPDR sel
+      - 20  # NDRPDR sel
+      - 21  # NDRPDR sel
+      - 22  # NDRPDR sel
+      - 23  # NDRPDR sel
+      - 24  # NDRPDR sel
+      - 27  # NDRPDR sel
 
     vpp-compare-testbeds:
       csit-vpp-perf-verify-1810-3n-hsw:
-      # TODO: Add data
       - 8   # NDRPDR sel
       - 12  # NDRPDR sel
       - 14  # NDRPDR sel
       - 18  # NDRPDR sel
+      - 23  # NDRPDR sel
+      - 25  # NDRPDR sel
+      - 38  # NDRPDR sel
+      - 39  # NDRPDR sel
+      - 41  # NDRPDR sel
+      - 42  # NDRPDR sel
       csit-vpp-perf-verify-1810-3n-skx:
       - 24  # NDRPDR full
       - 10  # NDRPDR sel
@@ -174,16 +232,14 @@
 
     vpp-compare-testbeds-mrr:
       csit-vpp-perf-verify-1810-3n-hsw:
-      # TODO: Add data
       - 9   # MRR sel
       csit-vpp-perf-verify-1810-3n-skx:
-      # TODO: Add data
       - 9   # MRR sel
       - 11  # MRR sel
       - 12  # MRR sel
       - 13  # MRR sel
 
-    vpp-performance-changes-mrr:
+    vpp-performance-changes-3n-hsw-mrr:
       csit-vpp-perf-check-1804:
       - 6   # mrr - sel
       - 13  # mrr - sel
@@ -206,15 +262,50 @@
       - 42  # MRR sel
       - 48  # MRR sel
       csit-vpp-perf-verify-1810-3n-hsw:
-      # TODO: Add data
       - 9   # MRR sel
 
+    vpp-performance-changes-3n-skx-mrr:
+      csit-vpp-perf-verify-1807-3n-skx:
+      - 28  # MRR sel
+      - 32  # MRR sel
+      - 36  # MRR sel
+      - 42  # MRR sel
+      - 47  # MRR sel
+      - 48  # MRR sel
+      - 51  # MRR sel
+      - 52  # MRR sel
+      - 53  # MRR sel
+      - 54  # MRR sel
+      csit-vpp-perf-verify-1810-3n-skx:
+      - 9   # MRR sel
+      - 11  # MRR sel
+      - 12  # MRR sel
+      - 13  # MRR sel
+
+    vpp-performance-changes-2n-skx-mrr:
+      csit-vpp-perf-verify-1807-2n-skx:
+      - 31  # MRR sel
+      - 33  # MRR sel
+      - 37  # MRR sel
+      - 38  # MRR sel
+      - 41  # MRR sel
+      - 43  # MRR sel
+      - 44  # MRR sel
+      - 45  # MRR sel
+      - 46  # MRR sel
+      - 47  # MRR sel
+      csit-vpp-perf-verify-1810-2n-skx:
+      - 8   # MRR sel
+      - 10  # MRR sel
+      - 11  # MRR sel
+      - 12  # MRR sel
+
     vpp-perf-results-3n-hsw:
       csit-vpp-perf-verify-1810-3n-hsw:
-      # TODO: Add data
       - 20  # NDRPDR full
       - 21  # NDRPDR full
       - 22  # NDRPDR full
+      - 27  # NDRPDR full
 
     vpp-perf-results-3n-skx:
       csit-vpp-perf-verify-1810-3n-skx:
@@ -228,26 +319,28 @@
 
     vpp-mrr-results-3n-hsw:
       csit-vpp-perf-verify-1810-3n-hsw:
-      # TODO: Replace with full
       - 9   # MRR sel
 
     vpp-mrr-results-3n-skx:
       csit-vpp-perf-verify-1810-3n-skx:
-      # TODO: Replace with full
       - 9   # MRR sel
 
     vpp-mrr-results-2n-skx:
       csit-vpp-perf-verify-1810-2n-skx:
-      # TODO: Replace with full
       - 8   # MRR sel
 
     plot-throughput-speedup-analysis-3n-hsw:
       csit-vpp-perf-verify-1810-3n-hsw:
-      # TODO: Add data
       - 8   # NDRPDR sel
       - 12  # NDRPDR sel
       - 14  # NDRPDR sel
       - 18  # NDRPDR sel
+      - 23  # NDRPDR sel
+      - 25  # NDRPDR sel
+      - 38  # NDRPDR sel
+      - 39  # NDRPDR sel
+      - 41  # NDRPDR sel
+      - 42  # NDRPDR sel
 
     plot-throughput-speedup-analysis-3n-skx:
       csit-vpp-perf-verify-1810-3n-skx:
@@ -278,11 +371,16 @@
 
     plot-vpp-throughput-latency-3n-hsw:
       csit-vpp-perf-verify-1810-3n-hsw:
-      # TODO: Add data
       - 8   # NDRPDR sel
       - 12  # NDRPDR sel
       - 14  # NDRPDR sel
       - 18  # NDRPDR sel
+      - 23  # NDRPDR sel
+      - 25  # NDRPDR sel
+      - 38  # NDRPDR sel
+      - 39  # NDRPDR sel
+      - 41  # NDRPDR sel
+      - 42  # NDRPDR sel
 
     plot-vpp-throughput-latency-3n-skx:
       csit-vpp-perf-verify-1810-3n-skx:
@@ -312,18 +410,17 @@
       - 27  # NDRPDR sel
 
     plot-vpp-http-server-performance:
-      # TODO: Replace with 1810 data:
-      csit-vpp-perf-verify-1807-3n-hsw:
-      - 24  # WRK
-      - 25  # WRK
-      - 23  # WRK
-      - 26  # WRK
-      - 27  # WRK
+      csit-vpp-perf-verify-1810-3n-hsw:
       - 28  # WRK
       - 29  # WRK
       - 30  # WRK
+      - 31  # WRK
       - 32  # WRK
+      - 33  # WRK
+      - 34  # WRK
       - 35  # WRK
+      - 36  # WRK
+      - 37  # WRK
 
     # VPP Functional
     vpp-func-results-ubuntu:
@@ -331,7 +428,6 @@
       - 44
 
     vpp-func-results-centos:
-      # TODO: Replace with 1810 data:
       csit-vpp-functional-1810-centos7-virl:
       - 44
 
@@ -341,25 +437,39 @@
 
     # VPP Ligato
     ligato-perf-results-3n-hsw:
-      # TODO: Replace with 1810 data:
-      csit-ligato-perf-1807-all:
-      - 3   # full ?
+      csit-ligato-perf-verify-1810-3n-hsw:
+      - 5   # full
 
     plot-ligato-throughput-speedup-analysis-3n-hsw:
-      # TODO: Replace with 1810 data:
-      csit-ligato-perf-1807-all:
-      - 3   # full ?
-      - 4   # sel
+      csit-ligato-perf-verify-1810-3n-hsw:
+      - 5   # full
+      - 6   # sel
+      - 8   # sel
+      - 9   # sel
+      - 11  # sel
+      - 12  # sel
+      - 13  # sel
+      - 14  # sel
+      - 16  # sel
+      - 17  # sel
+      - 18  # sel
 
     plot-ligato-throughput-latency-3n-hsw:
-      # TODO: Replace with 1810 data:
-      csit-ligato-perf-1807-all:
-      - 3   # full ?
-      - 4   # sel
+      csit-ligato-perf-verify-1810-3n-hsw:
+      - 5   # full
+      - 6   # sel
+      - 8   # sel
+      - 9   # sel
+      - 11  # sel
+      - 12  # sel
+      - 13  # sel
+      - 14  # sel
+      - 16  # sel
+      - 17  # sel
+      - 18  # sel
 
     # DPDK Performance
-    dpdk-performance-changes:
-      # TODO: Replace with 1810 data:
+    dpdk-performance-changes-3n-hsw:
       csit-dpdk-perf-1804-all:
       - 4
       - 5
@@ -382,85 +492,121 @@
       - 21
       - 22
       - 23
+      csit-dpdk-perf-verify-1810-3n-hsw:
+      - 1   # NDRPDR sel
+      - 2   # NDRPDR sel
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 5   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
 
-    dpdk-compare-testbeds:
-      # TODO: Replace with 1810 data:
+    dpdk-performance-changes-3n-skx:
       csit-dpdk-perf-verify-1807-3n-skx:
-      - 1
-      - 2
-      - 3
-      - 6
-      - 7
-      - 8
-      - 9
-      - 10
-      - 11
-      - 12
-      csit-dpdk-perf-verify-1807-3n-hsw:
-      - 11
-      - 12  # full
-      - 14
-      - 15
-      - 16
-      - 17
-      - 20
-      - 21
-      - 22
-      - 23
+      - 1   # NDRPDR sel
+      - 2   # NDRPDR sel
+      - 3   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
+      - 11  # NDRPDR sel
+      - 12  # NDRPDR sel
+      csit-dpdk-perf-verify-1810-3n-skx:
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
+      - 11  # NDRPDR sel
+      - 12  # NDRPDR sel
+      - 13  # NDRPDR sel
+
+    dpdk-compare-testbeds:
+      csit-dpdk-perf-verify-1810-3n-skx:
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
+      - 11  # NDRPDR sel
+      - 12  # NDRPDR sel
+      - 13  # NDRPDR sel
+      csit-dpdk-perf-verify-1810-3n-hsw:
+      - 1   # NDRPDR sel
+      - 2   # NDRPDR sel
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 5   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
 
     dpdk-perf-results-3n-hsw:
-      # TODO: Replace with 1810 data:
-      csit-dpdk-perf-verify-1807-3n-hsw:
-      - 12
+      csit-dpdk-perf-verify-1810-3n-hsw:
+      - 1
 
     dpdk-perf-results-3n-skx:
-      # TODO: Replace with 1810 data:
-      csit-dpdk-perf-verify-1807-3n-skx:
-      - 12
+      csit-dpdk-perf-verify-1810-3n-skx:
+      - 3   # NDRPDR sel
 
     dpdk-perf-results-2n-skx:
-      # TODO: Replace with full data:
       csit-dpdk-perf-verify-1810-2n-skx:
       - 3
 
     plot-dpdk-throughput-latency-3n-hsw:
-      # TODO: Replace with 1810 data:
-      csit-dpdk-perf-verify-1807-3n-hsw:
-      - 11
-      - 12  # full
-      - 14
-      - 15
-      - 16
-      - 17
-      - 20
-      - 21
-      - 22
-      - 23
+      csit-dpdk-perf-verify-1810-3n-hsw:
+      - 1   # NDRPDR sel
+      - 2   # NDRPDR sel
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 5   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
 
     plot-dpdk-throughput-latency-3n-skx:
-      # TODO: Replace with 1810 data:
-      csit-dpdk-perf-verify-1807-3n-skx:
-      - 1
-      - 2
-      - 3
-      - 6
-      - 7
-      - 8
-      - 9
-      - 10
-      - 11
-      - 12
+      csit-dpdk-perf-verify-1810-3n-skx:
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
+      - 11  # NDRPDR sel
+      - 12  # NDRPDR sel
+      - 13  # NDRPDR sel
 
     plot-dpdk-throughput-latency-2n-skx:
-      # TODO: Add data:
       csit-dpdk-perf-verify-1810-2n-skx:
       - 3   # NDRPDR sel
       - 4   # NDRPDR sel
+      - 5   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
+      - 11  # NDRPDR sel
+      - 12  # NDRPDR sel
+      - 13  # NDRPDR sel
 
     # HoneyComb Functional
     hc-func-results:
       csit-hc2vpp-verify-func-1810-ubuntu1604:
-      - 1
+      - 3
 
     # NSH SFC Functional
     nsh-func-results:
@@ -631,7 +777,7 @@
         font:
           size: 16
       width: 700
-      height: 800
+      height: 900
 
     plot-throughput-speedup-analysis:
       titlefont:
@@ -704,14 +850,14 @@
           xanchor: "left",
           yanchor: "top",
           x: 0,
-          y: -0.125,
+          y: -0.13,
           font: {
             family: "Consolas, Courier New",
             size: 15
           },
         },
         {
-          text: "    perfect     measured     limit",
+          text: "    Perfect     Measured     Limit",
           align: "left",
           showarrow: False,
           xref: "paper",
@@ -719,7 +865,7 @@
           xanchor: "left",
           yanchor: "top",
           x: 0,
-          y: -0.14,
+          y: -0.15,
           font: {
             family: "Consolas, Courier New",
             size: 15
@@ -841,16 +987,32 @@
     - 30  # WRK
     - 32  # WRK
     - 35  # WRK
-    # TODO: Add data:
     csit-vpp-perf-verify-1810-3n-hsw:
     - 9   # MRR sel
     - 20  # NDRPDR full
     - 21  # NDRPDR full
     - 22  # NDRPDR full
+    - 27  # NDRPDR full
     - 8   # NDRPDR sel
     - 12  # NDRPDR sel
     - 14  # NDRPDR sel
     - 18  # NDRPDR sel
+    - 23  # NDRPDR sel
+    - 25  # NDRPDR sel
+    - 38  # NDRPDR sel
+    - 39  # NDRPDR sel
+    - 41  # NDRPDR sel
+    - 42  # NDRPDR sel
+    - 28  # WRK
+    - 29  # WRK
+    - 30  # WRK
+    - 31  # WRK
+    - 32  # WRK
+    - 33  # WRK
+    - 34  # WRK
+    - 35  # WRK
+    - 36  # WRK
+    - 37  # WRK
     csit-vpp-perf-verify-1807-3n-skx:
     - 31  # MRR full
     - 28  # MRR sel
@@ -875,7 +1037,6 @@
     - 49  # NDRPDR sel
     - 50  # NDRPDR sel
     - 56  # NDRPDR sel
-    # TODO: Add data:
     csit-vpp-perf-verify-1810-3n-skx:
     - 9   # MRR sel
     - 11  # MRR sel
@@ -916,7 +1077,6 @@
     - 39  # NDRPDR sel
     - 40  # NDRPDR sel
     - 42  # NDRPDR sel
-    # TODO: Add data:
     csit-vpp-perf-verify-1810-2n-skx:
     - 8   # MRR sel
     - 10  # MRR sel
@@ -946,21 +1106,18 @@
     - 20  # mrr - sel
     - 21  # mrr - sel
     - 22  # mrr - sel
-    csit-ligato-perf-1804-all:
-    - 4   # full
-    - 5   # sel
+    csit-ligato-perf-verify-1810-3n-hsw:
+    - 5   # full
     - 6   # sel
-    - 7   # sel
     - 8   # sel
     - 9   # sel
-    - 10  # sel
     - 11  # sel
     - 12  # sel
     - 13  # sel
     - 14  # sel
-    csit-ligato-perf-1807-all:
-    - 3   # full ?
-    - 4   # sel
+    - 16  # sel
+    - 17  # sel
+    - 18  # sel
     csit-dpdk-perf-1804-all:
     - 4
     - 5
@@ -983,20 +1140,51 @@
     - 21
     - 22
     - 23
+    csit-dpdk-perf-verify-1810-3n-hsw:
+    - 1   # NDRPDR sel
+    - 2   # NDRPDR sel
+    - 3   # NDRPDR sel
+    - 4   # NDRPDR sel
+    - 5   # NDRPDR sel
+    - 6   # NDRPDR sel
+    - 7   # NDRPDR sel
+    - 8   # NDRPDR sel
+    - 9   # NDRPDR sel
+    - 10  # NDRPDR sel
     csit-dpdk-perf-verify-1807-3n-skx:
-    - 1
-    - 2
-    - 3
-    - 6
-    - 7
-    - 8
-    - 9
-    - 10
-    - 11
-    - 12
+    - 1   # NDRPDR sel
+    - 2   # NDRPDR sel
+    - 3   # NDRPDR sel
+    - 6   # NDRPDR sel
+    - 7   # NDRPDR sel
+    - 8   # NDRPDR sel
+    - 9   # NDRPDR sel
+    - 10  # NDRPDR sel
+    - 11  # NDRPDR sel
+    - 12  # NDRPDR sel
+    csit-dpdk-perf-verify-1810-3n-skx:
+    - 3   # NDRPDR sel
+    - 4   # NDRPDR sel
+    - 6   # NDRPDR sel
+    - 7   # NDRPDR sel
+    - 8   # NDRPDR sel
+    - 9   # NDRPDR sel
+    - 10  # NDRPDR sel
+    - 11  # NDRPDR sel
+    - 12  # NDRPDR sel
+    - 13  # NDRPDR sel
     csit-dpdk-perf-verify-1810-2n-skx:
     - 3   # NDRPDR sel
     - 4   # NDRPDR sel
+    - 5   # NDRPDR sel
+    - 7   # NDRPDR sel
+    - 8   # NDRPDR sel
+    - 9   # NDRPDR sel
+    - 10  # NDRPDR sel
+    - 11  # NDRPDR sel
+    - 12  # NDRPDR sel
+    - 13  # NDRPDR sel
+
     csit-vpp-functional-1810-ubuntu1604-virl:
     - 44
     csit-vpp-functional-1810-centos7-virl:
@@ -1008,7 +1196,7 @@
     csit-dmm-functional-1810-ubuntu1604-virl:
     - 1
     csit-hc2vpp-verify-func-1810-ubuntu1604:
-    - 1
+    - 3
 
 -
   type: "output"
@@ -1026,12 +1214,12 @@
 ################################################################################
 # VPP
 
-# VPP Performance Changes 1t1c pdr
+# VPP Performance Changes 3n-hsw 1t1c pdr 
 -
   type: "table"
-  title: "VPP Performance Changes 1t1c pdr"
+  title: "VPP Performance Changes 3n-hsw 1t1c pdr"
   algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-1t1c-pdr"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-1t1c-pdr"
   history:
     -
       title: "rls1804"
@@ -1072,7 +1260,13 @@
       - 12  # NDRPDR sel
       - 14  # NDRPDR sel
       - 18  # NDRPDR sel
-  data: "vpp-performance-changes"
+      - 23  # NDRPDR sel
+      - 25  # NDRPDR sel
+      - 38  # NDRPDR sel
+      - 39  # NDRPDR sel
+      - 41  # NDRPDR sel
+      - 42  # NDRPDR sel
+  data: "vpp-performance-changes-3n-hsw"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
@@ -1080,12 +1274,12 @@
   - "parent"
   - "throughput"
 
-# VPP Performance Changes 2t2c pdr
+# VPP Performance Changes 3n-hsw 2t2c pdr
 -
   type: "table"
-  title: "VPP Performance Changes 2t2c pdr"
+  title: "VPP Performance Changes 3n-hsw 2t2c pdr"
   algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2t2c-pdr"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-2t2c-pdr"
   history:
     -
       title: "rls1804"
@@ -1126,7 +1320,13 @@
       - 12  # NDRPDR sel
       - 14  # NDRPDR sel
       - 18  # NDRPDR sel
-  data: "vpp-performance-changes"
+      - 23  # NDRPDR sel
+      - 25  # NDRPDR sel
+      - 38  # NDRPDR sel
+      - 39  # NDRPDR sel
+      - 41  # NDRPDR sel
+      - 42  # NDRPDR sel
+  data: "vpp-performance-changes-3n-hsw"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
@@ -1134,12 +1334,12 @@
   - "parent"
   - "throughput"
 
-# VPP Performance Changes 1t1c ndr
+# VPP Performance Changes 3n-hsw 1t1c ndr
 -
   type: "table"
-  title: "VPP Performance Changes 1t1c ndr"
+  title: "VPP Performance Changes 3n-hsw 1t1c ndr"
   algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-1t1c-ndr"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-1t1c-ndr"
   history:
     -
       title: "rls1804"
@@ -1180,7 +1380,13 @@
       - 12  # NDRPDR sel
       - 14  # NDRPDR sel
       - 18  # NDRPDR sel
-  data: "vpp-performance-changes"
+      - 23  # NDRPDR sel
+      - 25  # NDRPDR sel
+      - 38  # NDRPDR sel
+      - 39  # NDRPDR sel
+      - 41  # NDRPDR sel
+      - 42  # NDRPDR sel
+  data: "vpp-performance-changes-3n-hsw"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
@@ -1188,12 +1394,12 @@
   - "parent"
   - "throughput"
 
-# VPP Performance Changes 2t2c ndr
+# VPP Performance Changes 3n-hsw 2t2c ndr
 -
   type: "table"
-  title: "VPP Performance Changes 2t2c ndr"
+  title: "VPP Performance Changes 3n-hsw 2t2c ndr"
   algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2t2c-ndr"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-2t2c-ndr"
   history:
     -
       title: "rls1804"
@@ -1234,7 +1440,13 @@
       - 12  # NDRPDR sel
       - 14  # NDRPDR sel
       - 18  # NDRPDR sel
-  data: "vpp-performance-changes"
+      - 23  # NDRPDR sel
+      - 25  # NDRPDR sel
+      - 38  # NDRPDR sel
+      - 39  # NDRPDR sel
+      - 41  # NDRPDR sel
+      - 42  # NDRPDR sel
+  data: "vpp-performance-changes-3n-hsw"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
@@ -1242,22 +1454,28 @@
   - "parent"
   - "throughput"
 
-# VPP Comparison Across Testbeds 3n-hsw to 3n-skx ndr
+# VPP Performance Changes 3n-skx 2t1c pdr 
 -
   type: "table"
-  title: "VPP Comparison Across Testbeds 3n-hsw to 3n-skx ndr"
+  title: "VPP Performance Changes 3n-skx 2t1c pdr"
   algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-hsw-3n-skx-ndr"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-2t1c-pdr"
   reference:
-    title: "3-Node Hsw"
+    title: "rls1807"
     data:
-      csit-vpp-perf-verify-1810-3n-hsw:
-      - 8   # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 14  # NDRPDR sel
-      - 18  # NDRPDR sel
+      csit-vpp-perf-verify-1807-3n-skx:
+      - 33  # NDRPDR sel
+      - 35  # NDRPDR sel
+      - 37  # NDRPDR sel
+      - 38  # NDRPDR sel
+      - 39  # NDRPDR sel
+      - 43  # NDRPDR sel
+      - 44  # NDRPDR sel
+      - 49  # NDRPDR sel
+      - 50  # NDRPDR sel
+      - 56  # NDRPDR sel
   compare:
-    title: "3-Node Skx"
+    title: "rls1810"
     data:
       csit-vpp-perf-verify-1810-3n-skx:
       - 10  # NDRPDR sel
@@ -1270,30 +1488,36 @@
       - 21  # NDRPDR sel
       - 22  # NDRPDR sel
       - 25  # NDRPDR sel
-  data: "vpp-compare-testbeds"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'NIC_Intel-X710' and 'NDRPDR'"
+  data: "vpp-performance-changes-3n-skx"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
   - "name"
   - "parent"
   - "throughput"
 
-# VPP Comparison Across Testbeds 3n-hsw to 3n-skx pdr
+# VPP Performance Changes 3n-skx 4t2c pdr
 -
   type: "table"
-  title: "VPP Comparison Across Testbeds 3n-hsw to 3n-skx pdr"
+  title: "VPP Performance Changes 3n-skx 4t2c pdr"
   algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-hsw-3n-skx-pdr"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-4t2c-pdr"
   reference:
-    title: "3-Node Hsw"
+    title: "rls1807"
     data:
-      csit-vpp-perf-verify-1810-3n-hsw:
-      - 8   # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 14  # NDRPDR sel
-      - 18  # NDRPDR sel
+      csit-vpp-perf-verify-1807-3n-skx:
+      - 33  # NDRPDR sel
+      - 35  # NDRPDR sel
+      - 37  # NDRPDR sel
+      - 38  # NDRPDR sel
+      - 39  # NDRPDR sel
+      - 43  # NDRPDR sel
+      - 44  # NDRPDR sel
+      - 49  # NDRPDR sel
+      - 50  # NDRPDR sel
+      - 56  # NDRPDR sel
   compare:
-    title: "3-Node Skx"
+    title: "rls1810"
     data:
       csit-vpp-perf-verify-1810-3n-skx:
       - 10  # NDRPDR sel
@@ -1306,27 +1530,363 @@
       - 21  # NDRPDR sel
       - 22  # NDRPDR sel
       - 25  # NDRPDR sel
-  data: "vpp-compare-testbeds"
+  data: "vpp-performance-changes-3n-skx"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'NIC_Intel-X710' and 'NDRPDR'"
+  filter: "'4T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
   - "name"
   - "parent"
   - "throughput"
 
-# VPP Performance Changes - 1t1c MRR
+# VPP Performance Changes 3n-skx 2t1c ndr
 -
   type: "table"
-  title: "VPP Performance Changes - 1t1c MRR"
+  title: "VPP Performance Changes 3n-skx 2t1c ndr"
   algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-1t1c-mrr"
-  history:
-    -
-      title: "rls1804"
-      data:
-        csit-vpp-perf-check-1804:
-        - 6   # mrr - sel
-        - 13  # mrr - sel
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-2t1c-ndr"
+  reference:
+    title: "rls1807"
+    data:
+      csit-vpp-perf-verify-1807-3n-skx:
+      - 33  # NDRPDR sel
+      - 35  # NDRPDR sel
+      - 37  # NDRPDR sel
+      - 38  # NDRPDR sel
+      - 39  # NDRPDR sel
+      - 43  # NDRPDR sel
+      - 44  # NDRPDR sel
+      - 49  # NDRPDR sel
+      - 50  # NDRPDR sel
+      - 56  # NDRPDR sel
+  compare:
+    title: "rls1810"
+    data:
+      csit-vpp-perf-verify-1810-3n-skx:
+      - 10  # NDRPDR sel
+      - 14  # NDRPDR sel
+      - 15  # NDRPDR sel
+      - 16  # NDRPDR sel
+      - 17  # NDRPDR sel
+      - 19  # NDRPDR sel
+      - 20  # NDRPDR sel
+      - 21  # NDRPDR sel
+      - 22  # NDRPDR sel
+      - 25  # NDRPDR sel
+  data: "vpp-performance-changes-3n-skx"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+
+# VPP Performance Changes 3n-skx 4t2c ndr
+-
+  type: "table"
+  title: "VPP Performance Changes 3n-skx 4t2c ndr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-4t2c-ndr"
+  reference:
+    title: "rls1807"
+    data:
+      csit-vpp-perf-verify-1807-3n-skx:
+      - 33  # NDRPDR sel
+      - 35  # NDRPDR sel
+      - 37  # NDRPDR sel
+      - 38  # NDRPDR sel
+      - 39  # NDRPDR sel
+      - 43  # NDRPDR sel
+      - 44  # NDRPDR sel
+      - 49  # NDRPDR sel
+      - 50  # NDRPDR sel
+      - 56  # NDRPDR sel
+  compare:
+    title: "rls1810"
+    data:
+      csit-vpp-perf-verify-1810-3n-skx:
+      - 10  # NDRPDR sel
+      - 14  # NDRPDR sel
+      - 15  # NDRPDR sel
+      - 16  # NDRPDR sel
+      - 17  # NDRPDR sel
+      - 19  # NDRPDR sel
+      - 20  # NDRPDR sel
+      - 21  # NDRPDR sel
+      - 22  # NDRPDR sel
+      - 25  # NDRPDR sel
+  data: "vpp-performance-changes-3n-skx"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+
+# VPP Performance Changes 2n-skx 2t1c pdr 
+-
+  type: "table"
+  title: "VPP Performance Changes 2n-skx 2t1c pdr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-2t1c-pdr"
+  reference:
+    title: "rls1807"
+    data:
+      csit-vpp-perf-verify-1807-2n-skx:
+      - 26  # NDRPDR sel
+      - 28  # NDRPDR sel
+      - 29  # NDRPDR sel
+      - 30  # NDRPDR sel
+      - 34  # NDRPDR sel
+      - 35  # NDRPDR sel
+      - 36  # NDRPDR sel
+      - 39  # NDRPDR sel
+      - 40  # NDRPDR sel
+      - 42  # NDRPDR sel
+  compare:
+    title: "rls1810"
+    data:
+      csit-vpp-perf-verify-1810-2n-skx:
+      - 9   # NDRPDR sel
+      - 13  # NDRPDR sel
+      - 14  # NDRPDR sel
+      - 19  # NDRPDR sel
+      - 20  # NDRPDR sel
+      - 21  # NDRPDR sel
+      - 22  # NDRPDR sel
+      - 23  # NDRPDR sel
+      - 24  # NDRPDR sel
+      - 27  # NDRPDR sel
+  data: "vpp-performance-changes-2n-skx"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+
+# VPP Performance Changes 2n-skx 4t2c pdr
+-
+  type: "table"
+  title: "VPP Performance Changes 2n-skx 4t2c pdr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-4t2c-pdr"
+  reference:
+    title: "rls1807"
+    data:
+      csit-vpp-perf-verify-1807-2n-skx:
+      - 26  # NDRPDR sel
+      - 28  # NDRPDR sel
+      - 29  # NDRPDR sel
+      - 30  # NDRPDR sel
+      - 34  # NDRPDR sel
+      - 35  # NDRPDR sel
+      - 36  # NDRPDR sel
+      - 39  # NDRPDR sel
+      - 40  # NDRPDR sel
+      - 42  # NDRPDR sel
+  compare:
+    title: "rls1810"
+    data:
+      csit-vpp-perf-verify-1810-2n-skx:
+      - 9   # NDRPDR sel
+      - 13  # NDRPDR sel
+      - 14  # NDRPDR sel
+      - 19  # NDRPDR sel
+      - 20  # NDRPDR sel
+      - 21  # NDRPDR sel
+      - 22  # NDRPDR sel
+      - 23  # NDRPDR sel
+      - 24  # NDRPDR sel
+      - 27  # NDRPDR sel
+  data: "vpp-performance-changes-2n-skx"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+
+# VPP Performance Changes 2n-skx 2t1c ndr
+-
+  type: "table"
+  title: "VPP Performance Changes 2n-skx 2t1c ndr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-2t1c-ndr"
+  reference:
+    title: "rls1807"
+    data:
+      csit-vpp-perf-verify-1807-2n-skx:
+      - 26  # NDRPDR sel
+      - 28  # NDRPDR sel
+      - 29  # NDRPDR sel
+      - 30  # NDRPDR sel
+      - 34  # NDRPDR sel
+      - 35  # NDRPDR sel
+      - 36  # NDRPDR sel
+      - 39  # NDRPDR sel
+      - 40  # NDRPDR sel
+      - 42  # NDRPDR sel
+  compare:
+    title: "rls1810"
+    data:
+      csit-vpp-perf-verify-1810-2n-skx:
+      - 9   # NDRPDR sel
+      - 13  # NDRPDR sel
+      - 14  # NDRPDR sel
+      - 19  # NDRPDR sel
+      - 20  # NDRPDR sel
+      - 21  # NDRPDR sel
+      - 22  # NDRPDR sel
+      - 23  # NDRPDR sel
+      - 24  # NDRPDR sel
+      - 27  # NDRPDR sel
+  data: "vpp-performance-changes-2n-skx"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+
+# VPP Performance Changes 2n-skx 4t2c ndr
+-
+  type: "table"
+  title: "VPP Performance Changes 2n-skx 4t2c ndr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-4t2c-ndr"
+  reference:
+    title: "rls1807"
+    data:
+      csit-vpp-perf-verify-1807-2n-skx:
+      - 26  # NDRPDR sel
+      - 28  # NDRPDR sel
+      - 29  # NDRPDR sel
+      - 30  # NDRPDR sel
+      - 34  # NDRPDR sel
+      - 35  # NDRPDR sel
+      - 36  # NDRPDR sel
+      - 39  # NDRPDR sel
+      - 40  # NDRPDR sel
+      - 42  # NDRPDR sel
+  compare:
+    title: "rls1810"
+    data:
+      csit-vpp-perf-verify-1810-2n-skx:
+      - 9   # NDRPDR sel
+      - 13  # NDRPDR sel
+      - 14  # NDRPDR sel
+      - 19  # NDRPDR sel
+      - 20  # NDRPDR sel
+      - 21  # NDRPDR sel
+      - 22  # NDRPDR sel
+      - 23  # NDRPDR sel
+      - 24  # NDRPDR sel
+      - 27  # NDRPDR sel
+  data: "vpp-performance-changes-2n-skx"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+
+# VPP Comparison Across Testbeds 3n-hsw to 3n-skx ndr
+-
+  type: "table"
+  title: "VPP Comparison Across Testbeds 3n-hsw to 3n-skx ndr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-hsw-3n-skx-ndr"
+  reference:
+    title: "3-Node Hsw"
+    data:
+      csit-vpp-perf-verify-1810-3n-hsw:
+      - 8   # NDRPDR sel
+      - 12  # NDRPDR sel
+      - 14  # NDRPDR sel
+      - 18  # NDRPDR sel
+      - 23  # NDRPDR sel
+      - 25  # NDRPDR sel
+      - 38  # NDRPDR sel
+      - 39  # NDRPDR sel
+      - 41  # NDRPDR sel
+      - 42  # NDRPDR sel
+  compare:
+    title: "3-Node Skx"
+    data:
+      csit-vpp-perf-verify-1810-3n-skx:
+      - 10  # NDRPDR sel
+      - 14  # NDRPDR sel
+      - 15  # NDRPDR sel
+      - 16  # NDRPDR sel
+      - 17  # NDRPDR sel
+      - 19  # NDRPDR sel
+      - 20  # NDRPDR sel
+      - 21  # NDRPDR sel
+      - 22  # NDRPDR sel
+      - 25  # NDRPDR sel
+  data: "vpp-compare-testbeds"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'NIC_Intel-X710' and 'NDRPDR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+
+# VPP Comparison Across Testbeds 3n-hsw to 3n-skx pdr
+-
+  type: "table"
+  title: "VPP Comparison Across Testbeds 3n-hsw to 3n-skx pdr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-hsw-3n-skx-pdr"
+  reference:
+    title: "3-Node Hsw"
+    data:
+      csit-vpp-perf-verify-1810-3n-hsw:
+      - 8   # NDRPDR sel
+      - 12  # NDRPDR sel
+      - 14  # NDRPDR sel
+      - 18  # NDRPDR sel
+      - 23  # NDRPDR sel
+      - 25  # NDRPDR sel
+      - 38  # NDRPDR sel
+      - 39  # NDRPDR sel
+      - 41  # NDRPDR sel
+      - 42  # NDRPDR sel
+  compare:
+    title: "3-Node Skx"
+    data:
+      csit-vpp-perf-verify-1810-3n-skx:
+      - 10  # NDRPDR sel
+      - 14  # NDRPDR sel
+      - 15  # NDRPDR sel
+      - 16  # NDRPDR sel
+      - 17  # NDRPDR sel
+      - 19  # NDRPDR sel
+      - 20  # NDRPDR sel
+      - 21  # NDRPDR sel
+      - 22  # NDRPDR sel
+      - 25  # NDRPDR sel
+  data: "vpp-compare-testbeds"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'NIC_Intel-X710' and 'NDRPDR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+
+# VPP Performance Changes 3n-hsw 1t1c MRR
+-
+  type: "table"
+  title: "VPP Performance Changes 3n-hsw 1t1c MRR"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-1t1c-mrr"
+  history:
+    -
+      title: "rls1804"
+      data:
+        csit-vpp-perf-check-1804:
+        - 6   # mrr - sel
+        - 13  # mrr - sel
         - 14  # mrr - sel
         - 15  # mrr - sel
         - 16  # mrr - sel
@@ -1353,7 +1913,7 @@
     data:
       csit-vpp-perf-verify-1810-3n-hsw:
       - 9   # MRR sel
-  data: "vpp-performance-changes-mrr"
+  data: "vpp-performance-changes-3n-hsw-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
@@ -1361,12 +1921,12 @@
   - "parent"
   - "result"
 
-# VPP Performance Changes - 2t2c MRR
+# VPP Performance Changes 3n-hsw 2t2c MRR
 -
   type: "table"
-  title: "VPP Performance Changes - 2t2c MRR"
+  title: "VPP Performance Changes 3n-hsw 2t2c MRR"
   algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2t2c-mrr"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-2t2c-mrr"
   history:
     -
       title: "rls1804"
@@ -1400,7 +1960,7 @@
     data:
       csit-vpp-perf-verify-1810-3n-hsw:
       - 9   # MRR sel
-  data: "vpp-performance-changes-mrr"
+  data: "vpp-performance-changes-3n-hsw-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
@@ -1408,12 +1968,12 @@
   - "parent"
   - "result"
 
-# VPP Performance Changes - 4t4c MRR
+# VPP Performance Changes 3n-hsw 4t4c MRR
 -
   type: "table"
-  title: "VPP Performance Changes - 4t4c MRR"
+  title: "VPP Performance Changes 3n-hsw 4t4c MRR"
   algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-4t4c-mrr"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-4t4c-mrr"
   history:
     -
       title: "rls1804"
@@ -1447,7 +2007,7 @@
     data:
       csit-vpp-perf-verify-1810-3n-hsw:
       - 9   # MRR sel
-  data: "vpp-performance-changes-mrr"
+  data: "vpp-performance-changes-3n-hsw-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'4T4C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
@@ -1455,17 +2015,230 @@
   - "parent"
   - "result"
 
-# VPP Comparison Across Testbeds 3n-hsw to 3n-skx mrr
+# VPP Performance Changes 3n-skx 2t1c MRR
 -
   type: "table"
-  title: "VPP Comparison Across Testbeds 3n-hsw to 3n-skx mrr"
+  title: "VPP Performance Changes 3n-skx 2t1c MRR"
   algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-hsw-3n-skx-mrr"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-2t1c-mrr"
   reference:
-    title: "3-Node Hsw"
+    title: "rls1807"
     data:
-      csit-vpp-perf-verify-1810-3n-hsw:
-      - 9   # MRR sel
+      csit-vpp-perf-verify-1807-3n-skx:
+      - 28  # MRR sel
+      - 32  # MRR sel
+      - 36  # MRR sel
+      - 42  # MRR sel
+      - 47  # MRR sel
+      - 48  # MRR sel
+      - 51  # MRR sel
+      - 52  # MRR sel
+      - 53  # MRR sel
+  compare:
+    title: "rls1810"
+    data:
+      csit-vpp-perf-verify-1810-3n-skx:
+      - 9   # MRR sel
+      - 11  # MRR sel
+      - 12  # MRR sel
+      - 13  # MRR sel
+  data: "vpp-performance-changes-3n-skx-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T1C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "result"
+
+# VPP Performance Changes 3n-skx 4t2c MRR
+-
+  type: "table"
+  title: "VPP Performance Changes 3n-skx 4t2c MRR"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-4t2c-mrr"
+  reference:
+    title: "rls1807"
+    data:
+      csit-vpp-perf-verify-1807-3n-skx:
+      - 28  # MRR sel
+      - 32  # MRR sel
+      - 36  # MRR sel
+      - 42  # MRR sel
+      - 47  # MRR sel
+      - 48  # MRR sel
+      - 51  # MRR sel
+      - 52  # MRR sel
+      - 53  # MRR sel
+  compare:
+    title: "rls1810"
+    data:
+      csit-vpp-perf-verify-1810-3n-skx:
+      - 9   # MRR sel
+      - 11  # MRR sel
+      - 12  # MRR sel
+      - 13  # MRR sel
+  data: "vpp-performance-changes-3n-skx-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T2C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "result"
+
+# VPP Performance Changes 3n-skx 8t4c MRR
+-
+  type: "table"
+  title: "VPP Performance Changes 3n-skx 8t4c MRR"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-8t4c-mrr"
+  reference:
+    title: "rls1807"
+    data:
+      csit-vpp-perf-verify-1807-3n-skx:
+      - 28  # MRR sel
+      - 32  # MRR sel
+      - 36  # MRR sel
+      - 42  # MRR sel
+      - 47  # MRR sel
+      - 48  # MRR sel
+      - 51  # MRR sel
+      - 52  # MRR sel
+      - 53  # MRR sel
+  compare:
+    title: "rls1810"
+    data:
+      csit-vpp-perf-verify-1810-3n-skx:
+      - 9   # MRR sel
+      - 11  # MRR sel
+      - 12  # MRR sel
+      - 13  # MRR sel
+  data: "vpp-performance-changes-3n-skx-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'8T4C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "result"
+
+# VPP Performance Changes 2n-skx 2t1c MRR
+-
+  type: "table"
+  title: "VPP Performance Changes 2n-skx 2t1c MRR"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-2t1c-mrr"
+  reference:
+    title: "rls1807"
+    data:
+      csit-vpp-perf-verify-1807-2n-skx:
+      - 31  # MRR sel
+      - 33  # MRR sel
+      - 37  # MRR sel
+      - 38  # MRR sel
+      - 41  # MRR sel
+      - 43  # MRR sel
+      - 44  # MRR sel
+      - 45  # MRR sel
+      - 46  # MRR sel
+      - 47  # MRR sel
+  compare:
+    title: "rls1810"
+    data:
+      csit-vpp-perf-verify-1810-2n-skx:
+      - 8   # MRR sel
+      - 10  # MRR sel
+      - 11  # MRR sel
+      - 12  # MRR sel
+  data: "vpp-performance-changes-2n-skx-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T1C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "result"
+
+# VPP Performance Changes 2n-skx 4t2c MRR
+-
+  type: "table"
+  title: "VPP Performance Changes 2n-skx 4t2c MRR"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-4t2c-mrr"
+  reference:
+    title: "rls1807"
+    data:
+      csit-vpp-perf-verify-1807-2n-skx:
+      - 31  # MRR sel
+      - 33  # MRR sel
+      - 37  # MRR sel
+      - 38  # MRR sel
+      - 41  # MRR sel
+      - 43  # MRR sel
+      - 44  # MRR sel
+      - 45  # MRR sel
+      - 46  # MRR sel
+      - 47  # MRR sel
+  compare:
+    title: "rls1810"
+    data:
+      csit-vpp-perf-verify-1810-2n-skx:
+      - 8   # MRR sel
+      - 10  # MRR sel
+      - 11  # MRR sel
+      - 12  # MRR sel
+  data: "vpp-performance-changes-2n-skx-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T2C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "result"
+
+# VPP Performance Changes 2n-skx 8t4c MRR
+-
+  type: "table"
+  title: "VPP Performance Changes 2n-skx 8t4c MRR"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-8t4c-mrr"
+  reference:
+    title: "rls1807"
+    data:
+      csit-vpp-perf-verify-1807-2n-skx:
+      - 31  # MRR sel
+      - 33  # MRR sel
+      - 37  # MRR sel
+      - 38  # MRR sel
+      - 41  # MRR sel
+      - 43  # MRR sel
+      - 44  # MRR sel
+      - 45  # MRR sel
+      - 46  # MRR sel
+      - 47  # MRR sel
+  compare:
+    title: "rls1810"
+    data:
+      csit-vpp-perf-verify-1810-2n-skx:
+      - 8   # MRR sel
+      - 10  # MRR sel
+      - 11  # MRR sel
+      - 12  # MRR sel
+  data: "vpp-performance-changes-2n-skx-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'8T4C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "result"
+
+# VPP Comparison Across Testbeds 3n-hsw to 3n-skx mrr
+-
+  type: "table"
+  title: "VPP Comparison Across Testbeds 3n-hsw to 3n-skx mrr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-hsw-3n-skx-mrr"
+  reference:
+    title: "3-Node Hsw"
+    data:
+      csit-vpp-perf-verify-1810-3n-hsw:
+      - 9   # MRR sel
   compare:
     title: "3-Node Skx"
     data:
@@ -1981,27 +2754,28 @@
 
 ################################################################################
 
-# DPDK Performance Changes 1t1c pdr
+# DPDK Performance Changes 3n-hsw 1t1c pdr
 -
   type: "table"
-  title: "DPDK Performance Changes 1t1c pdr"
+  title: "DPDK Performance Changes 3n-hsw 1t1c pdr"
   algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-changes-1t1c-pdr"
+  output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-hsw-1t1c-pdr"
+  history:
+    -
+      title: "rls1804"
+      data:
+        csit-dpdk-perf-1804-all:
+        - 4
+        - 5
+        - 6
+        - 7
+        - 8
+        - 9
+        - 10
+        - 11
+        - 12
+        - 13
   reference:
-    title: "rls1804"
-    data:
-      csit-dpdk-perf-1804-all:
-      - 4
-      - 5
-      - 6
-      - 7
-      - 8
-      - 9
-      - 10
-      - 11
-      - 12
-      - 13
-  compare:
     title: "rls1807"
     data:
       csit-dpdk-perf-verify-1807-3n-hsw:
@@ -2015,7 +2789,21 @@
       - 21
       - 22
       - 23
-  data: "dpdk-performance-changes"
+  compare:
+    title: "rls1810"
+    data:
+      csit-dpdk-perf-verify-1810-3n-hsw:
+      - 1   # NDRPDR sel
+      - 2   # NDRPDR sel
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 5   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
+  data: "dpdk-performance-changes-3n-hsw"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
@@ -2023,27 +2811,28 @@
   - "parent"
   - "throughput"
 
-# DPDK Performance Changes 2t2c pdr
+# DPDK Performance Changes 3n-hsw 2t2c pdr
 -
   type: "table"
-  title: "DPDK Performance Changes 2t2c pdr"
+  title: "DPDK Performance Changes 3n-hsw 2t2c pdr"
   algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-changes-2t2c-pdr"
+  output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-hsw-2t2c-pdr"
+  history:
+    -
+      title: "rls1804"
+      data:
+        csit-dpdk-perf-1804-all:
+        - 4
+        - 5
+        - 6
+        - 7
+        - 8
+        - 9
+        - 10
+        - 11
+        - 12
+        - 13
   reference:
-    title: "rls1804"
-    data:
-      csit-dpdk-perf-1804-all:
-      - 4
-      - 5
-      - 6
-      - 7
-      - 8
-      - 9
-      - 10
-      - 11
-      - 12
-      - 13
-  compare:
     title: "rls1807"
     data:
       csit-dpdk-perf-verify-1807-3n-hsw:
@@ -2057,7 +2846,21 @@
       - 21
       - 22
       - 23
-  data: "dpdk-performance-changes"
+  compare:
+    title: "rls1810"
+    data:
+      csit-dpdk-perf-verify-1810-3n-hsw:
+      - 1   # NDRPDR sel
+      - 2   # NDRPDR sel
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 5   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
+  data: "dpdk-performance-changes-3n-hsw"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
@@ -2065,27 +2868,28 @@
   - "parent"
   - "throughput"
 
-# DPDK Performance Changes 1t1c ndr
+# DPDK Performance Changes 3n-hsw 1t1c ndr
 -
   type: "table"
-  title: "DPDK Performance Changes 1t1c ndr"
+  title: "DPDK Performance Changes 3n-hsw 1t1c ndr"
   algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-changes-1t1c-ndr"
+  output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-hsw-1t1c-ndr"
+  history:
+    -
+      title: "rls1804"
+      data:
+        csit-dpdk-perf-1804-all:
+        - 4
+        - 5
+        - 6
+        - 7
+        - 8
+        - 9
+        - 10
+        - 11
+        - 12
+        - 13
   reference:
-    title: "rls1804"
-    data:
-      csit-dpdk-perf-1804-all:
-      - 4
-      - 5
-      - 6
-      - 7
-      - 8
-      - 9
-      - 10
-      - 11
-      - 12
-      - 13
-  compare:
     title: "rls1807"
     data:
       csit-dpdk-perf-verify-1807-3n-hsw:
@@ -2099,7 +2903,21 @@
       - 21
       - 22
       - 23
-  data: "dpdk-performance-changes"
+  compare:
+    title: "rls1810"
+    data:
+      csit-dpdk-perf-verify-1810-3n-hsw:
+      - 1   # NDRPDR sel
+      - 2   # NDRPDR sel
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 5   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
+  data: "dpdk-performance-changes-3n-hsw"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
@@ -2107,27 +2925,28 @@
   - "parent"
   - "throughput"
 
-# DPDK Performance Changes 2t2c ndr
+# DPDK Performance Changes 3n-hsw 2t2c ndr
 -
   type: "table"
-  title: "DPDK Performance Changes 2t2c ndr"
+  title: "DPDK Performance Changes 3n-hsw 2t2c ndr"
   algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-changes-2t2c-ndr"
+  output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-hsw-2t2c-ndr"
+  history:
+    -
+      title: "rls1804"
+      data:
+        csit-dpdk-perf-1804-all:
+        - 4
+        - 5
+        - 6
+        - 7
+        - 8
+        - 9
+        - 10
+        - 11
+        - 12
+        - 13
   reference:
-    title: "rls1804"
-    data:
-      csit-dpdk-perf-1804-all:
-      - 4
-      - 5
-      - 6
-      - 7
-      - 8
-      - 9
-      - 10
-      - 11
-      - 12
-      - 13
-  compare:
     title: "rls1807"
     data:
       csit-dpdk-perf-verify-1807-3n-hsw:
@@ -2141,7 +2960,21 @@
       - 21
       - 22
       - 23
-  data: "dpdk-performance-changes"
+  compare:
+    title: "rls1810"
+    data:
+      csit-dpdk-perf-verify-1810-3n-hsw:
+      - 1   # NDRPDR sel
+      - 2   # NDRPDR sel
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 5   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
+  data: "dpdk-performance-changes-3n-hsw"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
@@ -2149,131 +2982,300 @@
   - "parent"
   - "throughput"
 
-# DPDK Comparison Across Testbeds 3n-hsw to 3n-skx ndr
+# DPDK Performance Changes 3n-skx 2t1c pdr
 -
   type: "table"
-  title: "DPDK Comparison Across Testbeds 3n-hsw to 3n-skx ndr"
+  title: "DPDK Performance Changes 3n-skx 2t1c pdr"
   algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-compare-testbeds-3n-hsw-3n-skx-ndr"
+  output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-skx-2t1c-pdr"
   reference:
-    title: "3-Node Hsw"
+    title: "rls1807"
     data:
-      csit-dpdk-perf-verify-1807-3n-hsw:
-      - 11
-      - 12  # full
-      - 14
-      - 15
-      - 16
-      - 17
-      - 20
-      - 21
-      - 22
-      - 23
+      csit-dpdk-perf-verify-1807-3n-skx:
+      - 1   # NDRPDR sel
+      - 2   # NDRPDR sel
+      - 3   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
+      - 11  # NDRPDR sel
+      - 12  # NDRPDR sel
   compare:
-    title: "3-Node Skx"
+    title: "rls1810"
+    data:
+      csit-dpdk-perf-verify-1810-3n-skx:
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
+      - 11  # NDRPDR sel
+      - 12  # NDRPDR sel
+      - 13  # NDRPDR sel
+  data: "dpdk-performance-changes-3n-skx"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+
+# DPDK Performance Changes 3n-skx 4t2c pdr
+-
+  type: "table"
+  title: "DPDK Performance Changes 3n-skx 4t2c pdr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-skx-4t2c-pdr"
+  reference:
+    title: "rls1807"
     data:
       csit-dpdk-perf-verify-1807-3n-skx:
-      - 1
-      - 2
-      - 3
-      - 6
-      - 7
-      - 8
-      - 9
-      - 10
-      - 11
-      - 12
-  data: "dpdk-compare-testbeds"
+      - 1   # NDRPDR sel
+      - 2   # NDRPDR sel
+      - 3   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
+      - 11  # NDRPDR sel
+      - 12  # NDRPDR sel
+  compare:
+    title: "rls1810"
+    data:
+      csit-dpdk-perf-verify-1810-3n-skx:
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
+      - 11  # NDRPDR sel
+      - 12  # NDRPDR sel
+      - 13  # NDRPDR sel
+  data: "dpdk-performance-changes-3n-skx"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+
+# DPDK Performance Changes 3n-skx 2t1c ndr
+-
+  type: "table"
+  title: "DPDK Performance Changes 3n-skx 2t1c ndr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-skx-2t1c-ndr"
+  reference:
+    title: "rls1807"
+    data:
+      csit-dpdk-perf-verify-1807-3n-skx:
+      - 1   # NDRPDR sel
+      - 2   # NDRPDR sel
+      - 3   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
+      - 11  # NDRPDR sel
+      - 12  # NDRPDR sel
+  compare:
+    title: "rls1810"
+    data:
+      csit-dpdk-perf-verify-1810-3n-skx:
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
+      - 11  # NDRPDR sel
+      - 12  # NDRPDR sel
+      - 13  # NDRPDR sel
+  data: "dpdk-performance-changes-3n-skx"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'NIC_Intel-X710' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  filter: "'2T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
   - "name"
   - "parent"
   - "throughput"
 
-# DPDK Comparison Across Testbeds 3n-hsw to 3n-skx pdr
+# DPDK Performance Changes 3n-skx 4t2c ndr
 -
   type: "table"
-  title: "DPDK Comparison Across Testbeds 3n-hsw to 3n-skx pdr"
+  title: "DPDK Performance Changes 3n-skx 4t2c ndr"
   algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-compare-testbeds-3n-hsw-3n-skx-pdr"
+  output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-skx-4t2c-ndr"
+  reference:
+    title: "rls1807"
+    data:
+      csit-dpdk-perf-verify-1807-3n-skx:
+      - 1   # NDRPDR sel
+      - 2   # NDRPDR sel
+      - 3   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
+      - 11  # NDRPDR sel
+      - 12  # NDRPDR sel
+  compare:
+    title: "rls1810"
+    data:
+      csit-dpdk-perf-verify-1810-3n-skx:
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
+      - 11  # NDRPDR sel
+      - 12  # NDRPDR sel
+      - 13  # NDRPDR sel
+  data: "dpdk-performance-changes-3n-skx"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+
+# DPDK Comparison Across Testbeds 3n-hsw to 3n-skx ndr
+-
+  type: "table"
+  title: "DPDK Comparison Across Testbeds 3n-hsw to 3n-skx ndr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-compare-testbeds-3n-hsw-3n-skx-ndr"
   reference:
     title: "3-Node Hsw"
     data:
-      csit-dpdk-perf-verify-1807-3n-hsw:
-      - 11
-      - 12  # full
-      - 14
-      - 15
-      - 16
-      - 17
-      - 20
-      - 21
-      - 22
-      - 23
+      csit-dpdk-perf-verify-1810-3n-hsw:
+      - 1   # NDRPDR sel
+      - 2   # NDRPDR sel
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 5   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
   compare:
     title: "3-Node Skx"
     data:
-      csit-dpdk-perf-verify-1807-3n-skx:
-      - 1
-      - 2
-      - 3
-      - 6
-      - 7
-      - 8
-      - 9
-      - 10
-      - 11
-      - 12
+      csit-dpdk-perf-verify-1810-3n-skx:
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
+      - 11  # NDRPDR sel
+      - 12  # NDRPDR sel
+      - 13  # NDRPDR sel
   data: "dpdk-compare-testbeds"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'NIC_Intel-X710' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
   - "name"
   - "parent"
   - "throughput"
 
-# DPDK Comparison Across Testbeds 3n-hsw to 3n-skx mrr
+# DPDK Comparison Across Testbeds 3n-hsw to 3n-skx pdr
 -
   type: "table"
-  title: "DPDK Comparison Across Testbeds 3n-hsw to 3n-skx mrr"
+  title: "DPDK Comparison Across Testbeds 3n-hsw to 3n-skx pdr"
   algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-compare-testbeds-3n-hsw-3n-skx-mrr"
+  output-file: "{DIR[STATIC,DPDK]}/performance-compare-testbeds-3n-hsw-3n-skx-pdr"
   reference:
     title: "3-Node Hsw"
     data:
-      csit-dpdk-perf-verify-1807-3n-hsw:
-      - 11
-      - 12  # full
-      - 14
-      - 15
-      - 16
-      - 17
-      - 20
-      - 21
-      - 22
-      - 23
+      csit-dpdk-perf-verify-1810-3n-hsw:
+      - 1   # NDRPDR sel
+      - 2   # NDRPDR sel
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 5   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
   compare:
     title: "3-Node Skx"
     data:
-      csit-dpdk-perf-verify-1807-3n-skx:
-      - 1
-      - 2
-      - 3
-      - 6
-      - 7
-      - 8
-      - 9
-      - 10
-      - 11
-      - 12
+      csit-dpdk-perf-verify-1810-3n-skx:
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
+      - 11  # NDRPDR sel
+      - 12  # NDRPDR sel
+      - 13  # NDRPDR sel
   data: "dpdk-compare-testbeds"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'NIC_Intel-X710' and MRR" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'NIC_Intel-X710' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
   - "name"
   - "parent"
-  - "result"
+  - "throughput"
+
+# DPDK Comparison Across Testbeds 3n-hsw to 3n-skx mrr
+# NOTE: Not used in 18.10
+#-
+#  type: "table"
+#  title: "DPDK Comparison Across Testbeds 3n-hsw to 3n-skx mrr"
+#  algorithm: "table_performance_comparison"
+#  output-file: "{DIR[STATIC,DPDK]}/performance-compare-testbeds-3n-hsw-3n-skx-mrr"
+#  reference:
+#    title: "3-Node Hsw"
+#    data:
+#      csit-dpdk-perf-verify-1807-3n-hsw:
+#      - 11
+#      - 12  # full
+#      - 14
+#      - 15
+#      - 16
+#      - 17
+#      - 20
+#      - 21
+#      - 22
+#      - 23
+#  compare:
+#    title: "3-Node Skx"
+#    data:
+#      csit-dpdk-perf-verify-1807-3n-skx:
+#      - 1
+#      - 2
+#      - 3
+#      - 6
+#      - 7
+#      - 8
+#      - 9
+#      - 10
+#      - 11
+#      - 12
+#  data: "dpdk-compare-testbeds"
+#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+#  filter: "'NIC_Intel-X710' and MRR" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+#  parameters:
+#  - "name"
+#  - "parent"
+#  - "result"
 
 # Detailed Test Results - DPDK Performance Results 3n-hsw
 -
@@ -4369,10 +5371,10 @@
 # Packet Throughput - VPP Container Memif 3n-hsw-x520
 -
   type: "plot"
-  title: "VPP Throughput: memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-ndr"
+  title: "VPP Throughput: memif-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-ndr"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
@@ -4398,7 +5400,7 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-ndr"
+    title: "memif-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
@@ -9735,7 +10737,7 @@
            '78B' and
            ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
-           '4T12' and
+           '4T2C' and
            'IP6FWD' and
            not 'SRv6' and
            not 'IPSEC' and
@@ -10906,24 +11908,23 @@
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            '1T1C' and
            'L2BDMACLRN' and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "VM"  # "not CFS_OPT"
-  - "CFS_OPT"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+#  sort:
+#  - "VM"  # "not CFS_OPT"
+#  - "CFS_OPT"
+#  - "FIB_10K"
+#  - "FIB_100K"
+#  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
@@ -10942,24 +11943,23 @@
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            '2T2C' and
            'L2BDMACLRN' and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "VM"  # "not CFS_OPT"
-  - "CFS_OPT"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+#  sort:
+#  - "VM"  # "not CFS_OPT"
+#  - "CFS_OPT"
+#  - "FIB_10K"
+#  - "FIB_100K"
+#  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
@@ -10978,24 +11978,23 @@
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            '1T1C' and
            'L2BDMACLRN' and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "VM"  # "not CFS_OPT"
-  - "CFS_OPT"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+#  sort:
+#  - "VM"  # "not CFS_OPT"
+#  - "CFS_OPT"
+#  - "FIB_10K"
+#  - "FIB_100K"
+#  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
@@ -11014,24 +12013,23 @@
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            '2T2C' and
            'L2BDMACLRN' and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "VM"  # "not CFS_OPT"
-  - "CFS_OPT"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+#  sort:
+#  - "VM"  # "not CFS_OPT"
+#  - "CFS_OPT"
+#  - "FIB_10K"
+#  - "FIB_100K"
+#  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
@@ -11051,24 +12049,23 @@
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            'BASE' and
            '1T1C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "L2XCFWD"
-  - "not CFS_OPT"
-  - "CFS_OPT"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
@@ -11087,24 +12084,23 @@
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            'BASE' and
            '1T1C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "L2XCFWD"
-  - "not CFS_OPT"
-  - "CFS_OPT"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
@@ -11123,24 +12119,23 @@
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            'BASE' and
            '2T2C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "L2XCFWD"
-  - "not CFS_OPT"
-  - "CFS_OPT"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
@@ -11159,24 +12154,23 @@
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            'BASE' and
            '2T2C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "L2XCFWD"
-  - "not CFS_OPT"
-  - "CFS_OPT"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
@@ -11196,23 +12190,23 @@
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            '1T1C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q'"
+           not 'LBOND'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "1VM"
-  - "L2XCFWD"
-  - "1VM"
-  - "L2BDMACLRN"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
@@ -11231,23 +12225,23 @@
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            '1T1C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q'"
+           not 'LBOND'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "1VM"
-  - "L2XCFWD"
-  - "1VM"
-  - "L2BDMACLRN"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
@@ -11266,23 +12260,23 @@
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            '2T2C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q'"
+           not 'LBOND'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "1VM"
-  - "L2XCFWD"
-  - "1VM"
-  - "L2BDMACLRN"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
@@ -11301,23 +12295,23 @@
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            '2T2C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q'"
+           not 'LBOND'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "1VM"
-  - "L2XCFWD"
-  - "1VM"
-  - "L2BDMACLRN"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
@@ -11466,24 +12460,23 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            '1T1C' and
            'L2BDMACLRN' and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "VM"  # "not CFS_OPT"
-  - "CFS_OPT"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+#  sort:
+#  - "VM"  # "not CFS_OPT"
+#  - "CFS_OPT"
+#  - "FIB_10K"
+#  - "FIB_100K"
+#  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
@@ -11502,24 +12495,23 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            '2T2C' and
            'L2BDMACLRN' and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "VM"  # "not CFS_OPT"
-  - "CFS_OPT"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+#  sort:
+#  - "VM"  # "not CFS_OPT"
+#  - "CFS_OPT"
+#  - "FIB_10K"
+#  - "FIB_100K"
+#  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
@@ -11538,24 +12530,23 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            '1T1C' and
            'L2BDMACLRN' and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "VM"  # "not CFS_OPT"
-  - "CFS_OPT"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+#  sort:
+#  - "VM"  # "not CFS_OPT"
+#  - "CFS_OPT"
+#  - "FIB_10K"
+#  - "FIB_100K"
+#  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
@@ -11574,24 +12565,23 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            '2T2C' and
            'L2BDMACLRN' and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "VM"  # "not CFS_OPT"
-  - "CFS_OPT"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+#  sort:
+#  - "VM"  # "not CFS_OPT"
+#  - "CFS_OPT"
+#  - "FIB_10K"
+#  - "FIB_100K"
+#  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
@@ -11611,24 +12601,23 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            'BASE' and
            '1T1C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "L2XCFWD"
-  - "not CFS_OPT"
-  - "CFS_OPT"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
@@ -11647,24 +12636,23 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            'BASE' and
            '1T1C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "L2XCFWD"
-  - "not CFS_OPT"
-  - "CFS_OPT"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
@@ -11683,24 +12671,23 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            'BASE' and
            '2T2C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "L2XCFWD"
-  - "not CFS_OPT"
-  - "CFS_OPT"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
@@ -11719,24 +12706,23 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            'BASE' and
            '2T2C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "L2XCFWD"
-  - "not CFS_OPT"
-  - "CFS_OPT"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
@@ -11756,23 +12742,23 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            '1T1C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q'"
+           not 'LBOND'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "1VM"
-  - "L2XCFWD"
-  - "1VM"
-  - "L2BDMACLRN"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
@@ -11791,23 +12777,23 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            '1T1C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q'"
+           not 'LBOND'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "1VM"
-  - "L2XCFWD"
-  - "1VM"
-  - "L2BDMACLRN"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
@@ -11826,23 +12812,23 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            '2T2C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q'"
+           not 'LBOND'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "1VM"
-  - "L2XCFWD"
-  - "1VM"
-  - "L2BDMACLRN"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
@@ -11861,23 +12847,23 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            '2T2C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q'"
+           not 'LBOND'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "1VM"
-  - "L2XCFWD"
-  - "1VM"
-  - "L2BDMACLRN"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
@@ -12026,24 +13012,23 @@
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            '1T1C' and
            'L2BDMACLRN' and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "VM"  # "not CFS_OPT"
-  - "CFS_OPT"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+#  sort:
+#  - "VM"  # "not CFS_OPT"
+#  - "CFS_OPT"
+#  - "FIB_10K"
+#  - "FIB_100K"
+#  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
@@ -12062,24 +13047,23 @@
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            '2T2C' and
            'L2BDMACLRN' and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "VM"  # "not CFS_OPT"
-  - "CFS_OPT"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+#  sort:
+#  - "VM"  # "not CFS_OPT"
+#  - "CFS_OPT"
+#  - "FIB_10K"
+#  - "FIB_100K"
+#  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
@@ -12098,24 +13082,23 @@
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            '1T1C' and
            'L2BDMACLRN' and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "VM"  # "not CFS_OPT"
-  - "CFS_OPT"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+#  sort:
+#  - "VM"  # "not CFS_OPT"
+#  - "CFS_OPT"
+#  - "FIB_10K"
+#  - "FIB_100K"
+#  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
@@ -12134,24 +13117,23 @@
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            '2T2C' and
            'L2BDMACLRN' and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "VM"  # "not CFS_OPT"
-  - "CFS_OPT"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+#  sort:
+#  - "VM"  # "not CFS_OPT"
+#  - "CFS_OPT"
+#  - "FIB_10K"
+#  - "FIB_100K"
+#  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
@@ -12171,24 +13153,23 @@
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            'BASE' and
            '1T1C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "L2XCFWD"
-  - "not CFS_OPT"
-  - "CFS_OPT"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
@@ -12207,24 +13188,23 @@
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            'BASE' and
            '1T1C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "L2XCFWD"
-  - "not CFS_OPT"
-  - "CFS_OPT"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
@@ -12243,24 +13223,23 @@
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            'BASE' and
            '2T2C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "L2XCFWD"
-  - "not CFS_OPT"
-  - "CFS_OPT"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
@@ -12279,24 +13258,23 @@
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            'BASE' and
            '2T2C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "L2XCFWD"
-  - "not CFS_OPT"
-  - "CFS_OPT"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
@@ -12316,23 +13294,22 @@
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            '1T1C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'DOT1Q'"
+           not 'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "1VM"
-  - "L2XCFWD"
-  - "1VM"
-  - "L2BDMACLRN"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
@@ -12351,23 +13328,22 @@
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            '1T1C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'DOT1Q'"
+           not 'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "1VM"
-  - "L2XCFWD"
-  - "1VM"
-  - "L2BDMACLRN"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
@@ -12386,23 +13362,22 @@
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            '2T2C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'DOT1Q'"
+           not 'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "1VM"
-  - "L2XCFWD"
-  - "1VM"
-  - "L2BDMACLRN"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
@@ -12421,23 +13396,22 @@
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            '2T2C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'DOT1Q'"
+           not 'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "1VM"
-  - "L2XCFWD"
-  - "1VM"
-  - "L2BDMACLRN"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
@@ -12586,24 +13560,23 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            '2T1C' and
            'L2BDMACLRN' and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "VM"  # "not CFS_OPT"
-  - "CFS_OPT"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+#  sort:
+#  - "VM"  # "not CFS_OPT"
+#  - "CFS_OPT"
+#  - "FIB_10K"
+#  - "FIB_100K"
+#  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
@@ -12622,24 +13595,23 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            '4T2C' and
            'L2BDMACLRN' and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "VM"  # "not CFS_OPT"
-  - "CFS_OPT"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+#  sort:
+#  - "VM"  # "not CFS_OPT"
+#  - "CFS_OPT"
+#  - "FIB_10K"
+#  - "FIB_100K"
+#  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
@@ -12658,24 +13630,23 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            '2T1C' and
            'L2BDMACLRN' and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "VM"  # "not CFS_OPT"
-  - "CFS_OPT"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+  - "parent"
+  - "tags"
+#  sort:
+#  - "VM"  # "not CFS_OPT"
+#  - "CFS_OPT"
+#  - "FIB_10K"
+#  - "FIB_100K"
+#  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
@@ -12694,24 +13665,23 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            '4T2C' and
            'L2BDMACLRN' and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "VM"  # "not CFS_OPT"
-  - "CFS_OPT"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+#  sort:
+#  - "VM"  # "not CFS_OPT"
+#  - "CFS_OPT"
+#  - "FIB_10K"
+#  - "FIB_100K"
+#  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
@@ -12731,24 +13701,24 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            'BASE' and
            '2T1C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
-           not '2VM'"
+           not '2VM' and
+           not 'LBOND'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "L2XCFWD"
-  - "not CFS_OPT"
-  - "CFS_OPT"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
@@ -12767,24 +13737,24 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            'BASE' and
            '2T1C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
-           not '2VM'"
+           not '2VM' and
+           not 'LBOND'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "L2XCFWD"
-  - "not CFS_OPT"
-  - "CFS_OPT"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
@@ -12803,24 +13773,24 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            'BASE' and
            '4T2C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
-           not '2VM'"
+           not '2VM' and
+           not 'LBOND'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "L2XCFWD"
-  - "not CFS_OPT"
-  - "CFS_OPT"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
@@ -12839,24 +13809,24 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            'BASE' and
            '4T2C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
-           not '2VM'"
+           not '2VM' and
+           not 'LBOND'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "L2XCFWD"
-  - "not CFS_OPT"
-  - "CFS_OPT"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
@@ -12876,23 +13846,23 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            '2T1C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q'"
+           not 'LBOND'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "1VM"
-  - "L2XCFWD"
-  - "1VM"
-  - "L2BDMACLRN"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
@@ -12911,23 +13881,23 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            '2T1C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q'"
+           not 'LBOND'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "1VM"
-  - "L2XCFWD"
-  - "1VM"
-  - "L2BDMACLRN"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
@@ -12946,23 +13916,23 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            '4T2C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q'"
+           not 'LBOND'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "1VM"
-  - "L2XCFWD"
-  - "1VM"
-  - "L2BDMACLRN"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
@@ -12981,23 +13951,23 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            '4T2C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q'"
+           not 'LBOND'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "1VM"
-  - "L2XCFWD"
-  - "1VM"
-  - "L2BDMACLRN"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
@@ -13146,24 +14116,23 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            '2T1C' and
            'L2BDMACLRN' and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "VM"  # "not CFS_OPT"
-  - "CFS_OPT"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+#  sort:
+#  - "VM"  # "not CFS_OPT"
+#  - "CFS_OPT"
+#  - "FIB_10K"
+#  - "FIB_100K"
+#  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
@@ -13182,24 +14151,23 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            '4T2C' and
            'L2BDMACLRN' and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "VM"  # "not CFS_OPT"
-  - "CFS_OPT"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+#  sort:
+#  - "VM"  # "not CFS_OPT"
+#  - "CFS_OPT"
+#  - "FIB_10K"
+#  - "FIB_100K"
+#  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
@@ -13218,24 +14186,23 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            '2T1C' and
            'L2BDMACLRN' and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "VM"  # "not CFS_OPT"
-  - "CFS_OPT"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+#  sort:
+#  - "VM"  # "not CFS_OPT"
+#  - "CFS_OPT"
+#  - "FIB_10K"
+#  - "FIB_100K"
+#  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
@@ -13254,24 +14221,23 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            '4T2C' and
            'L2BDMACLRN' and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "VM"  # "not CFS_OPT"
-  - "CFS_OPT"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+#  sort:
+#  - "VM"  # "not CFS_OPT"
+#  - "CFS_OPT"
+#  - "FIB_10K"
+#  - "FIB_100K"
+#  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
@@ -13291,24 +14257,23 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            'BASE' and
            '2T1C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "L2XCFWD"
-  - "not CFS_OPT"
-  - "CFS_OPT"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
@@ -13327,24 +14292,23 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            'BASE' and
            '2T1C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "L2XCFWD"
-  - "not CFS_OPT"
-  - "CFS_OPT"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
@@ -13363,24 +14327,23 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            'BASE' and
            '4T2C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "L2XCFWD"
-  - "not CFS_OPT"
-  - "CFS_OPT"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
@@ -13399,24 +14362,23 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            'BASE' and
            '4T2C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "L2XCFWD"
-  - "not CFS_OPT"
-  - "CFS_OPT"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
@@ -13436,23 +14398,22 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            '2T1C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'DOT1Q'"
+           not 'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "1VM"
-  - "L2XCFWD"
-  - "1VM"
-  - "L2BDMACLRN"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
@@ -13471,23 +14432,22 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            '2T1C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'DOT1Q'"
+           not 'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "1VM"
-  - "L2XCFWD"
-  - "1VM"
-  - "L2BDMACLRN"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
@@ -13506,23 +14466,22 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            '4T2C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'DOT1Q'"
+           not 'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "1VM"
-  - "L2XCFWD"
-  - "1VM"
-  - "L2BDMACLRN"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
@@ -13541,23 +14500,22 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            '4T2C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'DOT1Q'"
+           not 'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "1VM"
-  - "L2XCFWD"
-  - "1VM"
-  - "L2BDMACLRN"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
@@ -13706,24 +14664,23 @@
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            '2T1C' and
            'L2BDMACLRN' and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "VM"  # "not CFS_OPT"
-  - "CFS_OPT"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+#  sort:
+#  - "VM"  # "not CFS_OPT"
+#  - "CFS_OPT"
+#  - "FIB_10K"
+#  - "FIB_100K"
+#  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
@@ -13742,24 +14699,23 @@
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            '4T2C' and
            'L2BDMACLRN' and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "VM"  # "not CFS_OPT"
-  - "CFS_OPT"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+#  sort:
+#  - "VM"  # "not CFS_OPT"
+#  - "CFS_OPT"
+#  - "FIB_10K"
+#  - "FIB_100K"
+#  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
@@ -13778,24 +14734,23 @@
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            '2T1C' and
            'L2BDMACLRN' and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "VM"  # "not CFS_OPT"
-  - "CFS_OPT"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+#  sort:
+#  - "VM"  # "not CFS_OPT"
+#  - "CFS_OPT"
+#  - "FIB_10K"
+#  - "FIB_100K"
+#  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
@@ -13814,24 +14769,23 @@
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            '4T2C' and
            'L2BDMACLRN' and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "VM"  # "not CFS_OPT"
-  - "CFS_OPT"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+#  sort:
+#  - "VM"  # "not CFS_OPT"
+#  - "CFS_OPT"
+#  - "FIB_10K"
+#  - "FIB_100K"
+#  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
@@ -13851,24 +14805,23 @@
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            'BASE' and
            '2T1C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "L2XCFWD"
-  - "not CFS_OPT"
-  - "CFS_OPT"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
@@ -13887,24 +14840,23 @@
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            'BASE' and
            '2T1C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "L2XCFWD"
-  - "not CFS_OPT"
-  - "CFS_OPT"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
@@ -13923,24 +14875,23 @@
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            'BASE' and
            '4T2C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "L2XCFWD"
-  - "not CFS_OPT"
-  - "CFS_OPT"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
@@ -13959,24 +14910,23 @@
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            'BASE' and
            '4T2C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "L2XCFWD"
-  - "not CFS_OPT"
-  - "CFS_OPT"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
@@ -13996,23 +14946,22 @@
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            '2T1C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'DOT1Q'"
+           not 'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "1VM"
-  - "L2XCFWD"
-  - "1VM"
-  - "L2BDMACLRN"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
@@ -14031,23 +14980,22 @@
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            '2T1C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'DOT1Q'"
+           not 'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "1VM"
-  - "L2XCFWD"
-  - "1VM"
-  - "L2BDMACLRN"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
@@ -14066,23 +15014,22 @@
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            '4T2C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'DOT1Q'"
+           not 'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "1VM"
-  - "L2XCFWD"
-  - "1VM"
-  - "L2BDMACLRN"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
@@ -14101,23 +15048,22 @@
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            '4T2C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'DOT1Q'"
+           not 'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "1VM"
-  - "L2XCFWD"
-  - "1VM"
-  - "L2BDMACLRN"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
@@ -16943,7 +17889,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -16977,7 +17923,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -17008,7 +17954,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -17027,7 +17973,7 @@
   title: "VPP Latency: ip4-3n-hsw-x520-64b-2t2c-features-nat44-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-ndr-nat44-lat"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-nat44-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
@@ -17038,7 +17984,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -17070,7 +18016,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -17087,7 +18033,7 @@
   title: "VPP Latency: ip4-3n-hsw-x520-64b-2t2c-features-iacl-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-ndr-iacl-lat"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-iacl-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
@@ -17099,7 +18045,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -17129,7 +18075,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -17146,7 +18092,7 @@
   title: "VPP Latency: ip4-3n-hsw-x520-64b-2t2c-features-oacl-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-ndr-oacl-lat"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-oacl-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
@@ -17158,7 +18104,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -17248,7 +18194,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -17282,7 +18228,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -17313,7 +18259,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -17332,7 +18278,7 @@
   title: "VPP Latency: ip4-3n-hsw-x710-64b-2t2c-features-nat44-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-ndr-nat44-lat"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-nat44-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
@@ -17343,7 +18289,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -17375,7 +18321,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -17392,7 +18338,7 @@
   title: "VPP Latency: ip4-3n-hsw-x710-64b-2t2c-features-iacl-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-ndr-iacl-lat"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-iacl-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
@@ -17404,7 +18350,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -17434,7 +18380,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -17451,7 +18397,7 @@
   title: "VPP Latency: ip4-3n-hsw-x710-64b-2t2c-features-oacl-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-ndr-oacl-lat"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-oacl-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
@@ -17463,7 +18409,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -17610,7 +18556,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -17644,7 +18590,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -17675,7 +18621,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -17694,7 +18640,7 @@
   title: "VPP Latency: ip4-3n-skx-x710-64b-4t2c-features-nat44-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-ndr-nat44-lat"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-nat44-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
@@ -17705,7 +18651,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -17737,7 +18683,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -17754,7 +18700,7 @@
   title: "VPP Latency: ip4-3n-skx-x710-64b-4t2c-features-iacl-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-ndr-iacl-lat"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-iacl-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
@@ -17766,7 +18712,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -17796,7 +18742,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -17825,7 +18771,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -18032,7 +18978,7 @@
            not 'VHOST' and
            not 'IPSECHW'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -18060,7 +19006,7 @@
            not 'VHOST' and
            not 'IPSECHW'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -18150,7 +19096,7 @@
            not 'VHOST' and
            not 'IPSECHW'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -18178,7 +19124,7 @@
            not 'VHOST' and
            not 'IPSECHW'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -18231,7 +19177,7 @@
            '64B' and
            'ENCAP' and
            'NDRPDR' and
-           '4t2c' and
+           '4T2C' and
            'VXLAN' and
            'L2BDMACLRN' and
            not 'VHOST' and
@@ -18268,7 +19214,7 @@
            not 'VHOST' and
            not 'IPSECHW'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -18296,7 +19242,7 @@
            not 'VHOST' and
            not 'IPSECHW'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -18681,7 +19627,7 @@
            'LISP' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -18706,7 +19652,7 @@
            'LISP' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -18980,24 +19926,23 @@
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            '1T1C' and
            'L2BDMACLRN' and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "VM"  # "not CFS_OPT"
-  - "CFS_OPT"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+#  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"
@@ -19012,24 +19957,23 @@
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            '2T2C' and
            'L2BDMACLRN' and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "VM"  # "not CFS_OPT"
-  - "CFS_OPT"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+#  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"
@@ -19045,24 +19989,23 @@
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            'BASE' and
            '1T1C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "L2XCFWD"
-  - "not CFS_OPT"
-  - "CFS_OPT"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
   layout:
     title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base-ndr"
     layout: "plot-latency"
@@ -19077,24 +20020,23 @@
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            'BASE' and
            '2T2C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "L2XCFWD"
-  - "not CFS_OPT"
-  - "CFS_OPT"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
   layout:
     title: "vhost-l2sw-3n-hsw-x520-64b-2t2c-base-ndr"
     layout: "plot-latency"
@@ -19110,23 +20052,23 @@
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            '1T1C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q'"
+           not 'LBOND'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "1VM"
-  - "L2XCFWD"
-  - "1VM"
-  - "L2BDMACLRN"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   layout:
     title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-ndr"
     layout: "plot-latency"
@@ -19141,23 +20083,23 @@
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            '2T2C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q'"
+           not 'LBOND'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "1VM"
-  - "L2XCFWD"
-  - "1VM"
-  - "L2BDMACLRN"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   layout:
     title: "vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-ndr"
     layout: "plot-latency"
@@ -19230,24 +20172,23 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            '1T1C' and
            'L2BDMACLRN' and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "VM"  # "not CFS_OPT"
-  - "CFS_OPT"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+#  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"
@@ -19262,24 +20203,23 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            '2T2C' and
            'L2BDMACLRN' and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "VM"  # "not CFS_OPT"
-  - "CFS_OPT"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+#  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"
@@ -19295,24 +20235,23 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            'BASE' and
            '1T1C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "L2XCFWD"
-  - "not CFS_OPT"
-  - "CFS_OPT"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
   layout:
     title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base-ndr"
     layout: "plot-latency"
@@ -19327,24 +20266,23 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            'BASE' and
            '2T2C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "L2XCFWD"
-  - "not CFS_OPT"
-  - "CFS_OPT"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
   layout:
     title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base-ndr"
     layout: "plot-latency"
@@ -19360,23 +20298,23 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            '1T1C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q'"
+           not 'LBOND'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "1VM"
-  - "L2XCFWD"
-  - "1VM"
-  - "L2BDMACLRN"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   layout:
     title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base-vm-ndr"
     layout: "plot-latency"
@@ -19391,23 +20329,23 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            '2T2C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q'"
+           not 'LBOND'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "1VM"
-  - "L2XCFWD"
-  - "1VM"
-  - "L2BDMACLRN"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   layout:
     title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base-vm-ndr"
     layout: "plot-latency"
@@ -19480,24 +20418,23 @@
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            '1T1C' and
            'L2BDMACLRN' and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "VM"  # "not CFS_OPT"
-  - "CFS_OPT"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+#  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"
@@ -19512,24 +20449,23 @@
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            '2T2C' and
            'L2BDMACLRN' and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "VM"  # "not CFS_OPT"
-  - "CFS_OPT"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+#  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"
@@ -19545,24 +20481,23 @@
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            'BASE' and
            '1T1C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "L2XCFWD"
-  - "not CFS_OPT"
-  - "CFS_OPT"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
   layout:
     title: "vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-ndr"
     layout: "plot-latency"
@@ -19577,24 +20512,23 @@
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            'BASE' and
            '2T2C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "L2XCFWD"
-  - "not CFS_OPT"
-  - "CFS_OPT"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
   layout:
     title: "vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-ndr"
     layout: "plot-latency"
@@ -19610,23 +20544,22 @@
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            '1T1C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'DOT1Q'"
+           not 'IP4FWD'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "1VM"
-  - "L2XCFWD"
-  - "1VM"
-  - "L2BDMACLRN"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   layout:
     title: "vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-vm-ndr"
     layout: "plot-latency"
@@ -19641,23 +20574,22 @@
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            '2T2C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'DOT1Q'"
+           not 'IP4FWD'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "1VM"
-  - "L2XCFWD"
-  - "1VM"
-  - "L2BDMACLRN"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   layout:
     title: "vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-vm-ndr"
     layout: "plot-latency"
@@ -19730,24 +20662,23 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            '2T1C' and
            'L2BDMACLRN' and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "VM"  # "not CFS_OPT"
-  - "CFS_OPT"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+#  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"
@@ -19762,24 +20693,23 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            '4T2C' and
            'L2BDMACLRN' and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "VM"  # "not CFS_OPT"
-  - "CFS_OPT"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+#  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"
@@ -19795,24 +20725,24 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            'BASE' and
            '2T1C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
-           not '2VM'"
+           not '2VM' and
+           not 'LBOND'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "L2XCFWD"
-  - "not CFS_OPT"
-  - "CFS_OPT"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
   layout:
     title: "vhost-l2sw-3n-skx-x710-64b-2t1c-base-ndr"
     layout: "plot-latency"
@@ -19827,24 +20757,24 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            'BASE' and
            '4T2C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
-           not '2VM'"
+           not '2VM' and
+           not 'LBOND'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "L2XCFWD"
-  - "not CFS_OPT"
-  - "CFS_OPT"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
   layout:
     title: "vhost-l2sw-3n-skx-x710-64b-4t2c-base-ndr"
     layout: "plot-latency"
@@ -19860,23 +20790,23 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            '2T1C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q'"
+           not 'LBOND'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "1VM"
-  - "L2XCFWD"
-  - "1VM"
-  - "L2BDMACLRN"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   layout:
     title: "vhost-l2sw-3n-skx-x710-64b-2t1c-base-vm-ndr"
     layout: "plot-latency"
@@ -19891,23 +20821,23 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            '4T2C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q'"
+           not 'LBOND'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "1VM"
-  - "L2XCFWD"
-  - "1VM"
-  - "L2BDMACLRN"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   layout:
     title: "vhost-l2sw-3n-skx-x710-64b-4t2c-base-vm-ndr"
     layout: "plot-latency"
@@ -19980,24 +20910,23 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            '2T1C' and
            'L2BDMACLRN' and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "VM"  # "not CFS_OPT"
-  - "CFS_OPT"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+#  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"
@@ -20012,24 +20941,23 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            '4T2C' and
            'L2BDMACLRN' and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "VM"  # "not CFS_OPT"
-  - "CFS_OPT"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+#  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"
@@ -20045,24 +20973,23 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            'BASE' and
            '2T1C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "L2XCFWD"
-  - "not CFS_OPT"
-  - "CFS_OPT"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
   layout:
     title: "vhost-l2sw-2n-skx-x710-64b-2t1c-base-ndr"
     layout: "plot-latency"
@@ -20077,24 +21004,23 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            'BASE' and
            '4T2C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "L2XCFWD"
-  - "not CFS_OPT"
-  - "CFS_OPT"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
   layout:
     title: "vhost-l2sw-2n-skx-x710-64b-4t2c-base-ndr"
     layout: "plot-latency"
@@ -20110,23 +21036,22 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            '2T1C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'DOT1Q'"
+           not 'IP4FWD'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "1VM"
-  - "L2XCFWD"
-  - "1VM"
-  - "L2BDMACLRN"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   layout:
     title: "vhost-l2sw-2n-skx-x710-64b-2t1c-base-vm-ndr"
     layout: "plot-latency"
@@ -20141,23 +21066,22 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            '4T2C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'DOT1Q'"
+           not 'IP4FWD'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "1VM"
-  - "L2XCFWD"
-  - "1VM"
-  - "L2BDMACLRN"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   layout:
     title: "vhost-l2sw-2n-skx-x710-64b-4t2c-base-vm-ndr"
     layout: "plot-latency"
@@ -20230,24 +21154,23 @@
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            '2T1C' and
            'L2BDMACLRN' and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "VM"  # "not CFS_OPT"
-  - "CFS_OPT"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+#  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"
@@ -20262,24 +21185,23 @@
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            '4T2C' and
            'L2BDMACLRN' and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "VM"  # "not CFS_OPT"
-  - "CFS_OPT"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+#  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"
@@ -20295,24 +21217,23 @@
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            'BASE' and
            '2T1C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "L2XCFWD"
-  - "not CFS_OPT"
-  - "CFS_OPT"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
   layout:
     title: "vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-ndr"
     layout: "plot-latency"
@@ -20327,24 +21248,23 @@
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            'BASE' and
            '4T2C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "L2XCFWD"
-  - "not CFS_OPT"
-  - "CFS_OPT"
+  - "latency"
+  - "parent"
+  - "tags"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
   layout:
     title: "vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-ndr"
     layout: "plot-latency"
@@ -20360,23 +21280,22 @@
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            '2T1C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'DOT1Q'"
+           not 'IP4FWD'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "1VM"
-  - "L2XCFWD"
-  - "1VM"
-  - "L2BDMACLRN"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   layout:
     title: "vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-vm-ndr"
     layout: "plot-latency"
@@ -20391,23 +21310,22 @@
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            '4T2C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'DOT1Q'"
+           not 'IP4FWD'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "1VM"
-  - "L2XCFWD"
-  - "1VM"
-  - "L2BDMACLRN"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   layout:
     title: "vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-ndr"
     layout: "plot-latency"
@@ -24475,23 +25393,21 @@
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
-           'L2BDMACLRN' and
+           ('ETH' or 'DOT1Q') and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "VM"  # "not CFS_OPT"
-  - "CFS_OPT"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+#  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"
@@ -24506,23 +25422,22 @@
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            'L2BDMACLRN' and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "VM"  # "not CFS_OPT"
-  - "CFS_OPT"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+#  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"
@@ -24538,23 +25453,22 @@
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            'BASE' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "L2XCFWD"
-  - "not CFS_OPT"
-  - "CFS_OPT"
+#  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"
@@ -24569,23 +25483,22 @@
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            'BASE' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "L2XCFWD"
-  - "not CFS_OPT"
-  - "CFS_OPT"
+#  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"
@@ -24601,22 +25514,22 @@
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q'"
+           not 'LBOND'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "1VM"
-  - "L2XCFWD"
-  - "1VM"
-  - "L2BDMACLRN"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   layout:
     title: "vhost-l2sw-3n-hsw-x520-64b-base-vm-ndr"
     layout: "plot-throughput-speedup-analysis"
@@ -24631,22 +25544,22 @@
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q'"
+           not 'LBOND'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "1VM"
-  - "L2XCFWD"
-  - "1VM"
-  - "L2BDMACLRN"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   layout:
     title: "vhost-l2sw-3n-hsw-x520-64b-base-vm-pdr"
     layout: "plot-throughput-speedup-analysis"
@@ -24717,23 +25630,22 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            'L2BDMACLRN' and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "VM"  # "not CFS_OPT"
-  - "CFS_OPT"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+#  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"
@@ -24748,23 +25660,22 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            'L2BDMACLRN' and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "VM"  # "not CFS_OPT"
-  - "CFS_OPT"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+#  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"
@@ -24780,23 +25691,22 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            'BASE' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "L2XCFWD"
-  - "not CFS_OPT"
-  - "CFS_OPT"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
   layout:
     title: "vhost-l2sw-3n-hsw-x710-64b-base-ndr"
     layout: "plot-throughput-speedup-analysis"
@@ -24811,23 +25721,22 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            'BASE' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "L2XCFWD"
-  - "not CFS_OPT"
-  - "CFS_OPT"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
   layout:
     title: "vhost-l2sw-3n-hsw-x710-64b-base-pdr"
     layout: "plot-throughput-speedup-analysis"
@@ -24843,22 +25752,22 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q'"
+           not 'LBOND'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "1VM"
-  - "L2XCFWD"
-  - "1VM"
-  - "L2BDMACLRN"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   layout:
     title: "vhost-l2sw-3n-hsw-x710-64b-base-vm-ndr"
     layout: "plot-throughput-speedup-analysis"
@@ -24873,22 +25782,22 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q'"
+           not 'LBOND'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "1VM"
-  - "L2XCFWD"
-  - "1VM"
-  - "L2BDMACLRN"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   layout:
     title: "vhost-l2sw-3n-hsw-x710-64b-base-vm-pdr"
     layout: "plot-throughput-speedup-analysis"
@@ -24959,23 +25868,22 @@
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            'L2BDMACLRN' and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "VM"  # "not CFS_OPT"
-  - "CFS_OPT"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+#  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"
@@ -24990,23 +25898,22 @@
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            'L2BDMACLRN' and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "VM"  # "not CFS_OPT"
-  - "CFS_OPT"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+#  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"
@@ -25022,23 +25929,22 @@
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            'BASE' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "L2XCFWD"
-  - "not CFS_OPT"
-  - "CFS_OPT"
+#  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"
@@ -25053,23 +25959,22 @@
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            'BASE' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "L2XCFWD"
-  - "not CFS_OPT"
-  - "CFS_OPT"
+#  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"
@@ -25085,22 +25990,21 @@
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'DOT1Q'"
+           not 'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "1VM"
-  - "L2XCFWD"
-  - "1VM"
-  - "L2BDMACLRN"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   layout:
     title: "vhost-l2sw-3n-hsw-xl710-64b-base-vm-ndr"
     layout: "plot-throughput-speedup-analysis"
@@ -25115,22 +26019,21 @@
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'DOT1Q'"
+           not 'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "1VM"
-  - "L2XCFWD"
-  - "1VM"
-  - "L2BDMACLRN"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   layout:
     title: "vhost-l2sw-3n-hsw-xl710-64b-base-vm-pdr"
     layout: "plot-throughput-speedup-analysis"
@@ -25201,23 +26104,22 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            'L2BDMACLRN' and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "VM"  # "not CFS_OPT"
-  - "CFS_OPT"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+#  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"
@@ -25232,23 +26134,22 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            'L2BDMACLRN' and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "VM"  # "not CFS_OPT"
-  - "CFS_OPT"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+#  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"
@@ -25264,23 +26165,23 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            'BASE' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
-           not '2VM'"
+           not '2VM' and
+           not 'LBOND'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "L2XCFWD"
-  - "not CFS_OPT"
-  - "CFS_OPT"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
   layout:
     title: "vhost-l2sw-3n-skx-x710-64b-base-ndr"
     layout: "plot-throughput-speedup-analysis"
@@ -25295,23 +26196,23 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            'BASE' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
-           not '2VM'"
+           not '2VM' and
+           not 'LBOND'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "L2XCFWD"
-  - "not CFS_OPT"
-  - "CFS_OPT"
+#  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"
@@ -25327,22 +26228,22 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q'"
+           not 'LBOND'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "1VM"
-  - "L2XCFWD"
-  - "1VM"
-  - "L2BDMACLRN"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   layout:
     title: "vhost-l2sw-3n-skx-x710-64b-base-vm-ndr"
     layout: "plot-throughput-speedup-analysis"
@@ -25357,22 +26258,22 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q'"
+           not 'LBOND'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "1VM"
-  - "L2XCFWD"
-  - "1VM"
-  - "L2BDMACLRN"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   layout:
     title: "vhost-l2sw-3n-skx-x710-64b-base-vm-pdr"
     layout: "plot-throughput-speedup-analysis"
@@ -25443,23 +26344,22 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            'L2BDMACLRN' and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "VM"  # "not CFS_OPT"
-  - "CFS_OPT"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+#  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"
@@ -25474,23 +26374,22 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            'L2BDMACLRN' and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "VM"  # "not CFS_OPT"
-  - "CFS_OPT"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+#  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"
@@ -25506,23 +26405,22 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            'BASE' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "L2XCFWD"
-  - "not CFS_OPT"
-  - "CFS_OPT"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
   layout:
     title: "vhost-l2sw-2n-skx-x710-64b-base-ndr"
     layout: "plot-throughput-speedup-analysis"
@@ -25537,23 +26435,22 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            'BASE' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "L2XCFWD"
-  - "not CFS_OPT"
-  - "CFS_OPT"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
   layout:
     title: "vhost-l2sw-2n-skx-x710-64b-base-pdr"
     layout: "plot-throughput-speedup-analysis"
@@ -25569,22 +26466,21 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'DOT1Q'"
+           not 'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "1VM"
-  - "L2XCFWD"
-  - "1VM"
-  - "L2BDMACLRN"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   layout:
     title: "vhost-l2sw-2n-skx-x710-64b-base-vm-ndr"
     layout: "plot-throughput-speedup-analysis"
@@ -25599,22 +26495,21 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'DOT1Q'"
+           not 'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "1VM"
-  - "L2XCFWD"
-  - "1VM"
-  - "L2BDMACLRN"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   layout:
     title: "vhost-l2sw-2n-skx-x710-64b-base-vm-pdr"
     layout: "plot-throughput-speedup-analysis"
@@ -25685,23 +26580,22 @@
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            'L2BDMACLRN' and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "VM"  # "not CFS_OPT"
-  - "CFS_OPT"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+#  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"
@@ -25716,23 +26610,22 @@
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            'L2BDMACLRN' and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "VM"  # "not CFS_OPT"
-  - "CFS_OPT"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+#  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"
@@ -25748,23 +26641,22 @@
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            'BASE' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "L2XCFWD"
-  - "not CFS_OPT"
-  - "CFS_OPT"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
   layout:
     title: "vhost-l2sw-2n-skx-xxv710-64b-base-ndr"
     layout: "plot-throughput-speedup-analysis"
@@ -25779,23 +26671,22 @@
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            'BASE' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "L2XCFWD"
-  - "not CFS_OPT"
-  - "CFS_OPT"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
   layout:
     title: "vhost-l2sw-2n-skx-xxv710-64b-base-pdr"
     layout: "plot-throughput-speedup-analysis"
@@ -25811,22 +26702,21 @@
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'DOT1Q'"
+           not 'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "1VM"
-  - "L2XCFWD"
-  - "1VM"
-  - "L2BDMACLRN"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   layout:
     title: "vhost-l2sw-2n-skx-xxv710-64b-base-vm-ndr"
     layout: "plot-throughput-speedup-analysis"
@@ -25841,22 +26731,21 @@
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'NDRPDR' and
-           'ETH' and
+           ('ETH' or 'DOT1Q') and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'DOT1Q'"
+           not 'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "1VM"
-  - "L2XCFWD"
-  - "1VM"
-  - "L2BDMACLRN"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   layout:
     title: "vhost-l2sw-2n-skx-xxv710-64b-base-vm-pdr"
     layout: "plot-throughput-speedup-analysis"
Integration tests