X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fspecification.yaml;h=eca0f43845b8ca650ce2d0f409fc71f9c2a52290;hp=b0f65a3af19ac3369ca2ea816d222e65ed8eb77c;hb=77175cdd458e9c9fa9020d73d2f0f0c9b6e7eeb6;hpb=312e541e0cc53a10429c40b41ad7f22ae4b8adc2

diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml
index b0f65a3af1..eca0f43845 100644
--- a/resources/tools/presentation/specification.yaml
+++ b/resources/tools/presentation/specification.yaml
@@ -33,9 +33,11 @@
     DIR[DTR,PERF,VPP,3N,HSW]: "{DIR[DTR]}/vpp_performance_results_3n_hsw"
     DIR[DTR,PERF,VPP,3N,SKX]: "{DIR[DTR]}/vpp_performance_results_3n_skx"
     DIR[DTR,PERF,VPP,2N,SKX]: "{DIR[DTR]}/vpp_performance_results_2n_skx"
+    DIR[DTR,PERF,VPP,2N,DNV]: "{DIR[DTR]}/vpp_performance_results_2n_dnv"
     DIR[DTR,MRR,VPP,3N,HSW]: "{DIR[DTR]}/vpp_mrr_results_3n_hsw"
     DIR[DTR,MRR,VPP,3N,SKX]: "{DIR[DTR]}/vpp_mrr_results_3n_skx"
     DIR[DTR,MRR,VPP,2N,SKX]: "{DIR[DTR]}/vpp_mrr_results_2n_skx"
+    DIR[DTR,MRR,VPP,2N,DNV]: "{DIR[DTR]}/vpp_mrr_results_2n_dnv"
     DIR[DTR,PERF,COT,3N,HSW]: "{DIR[DTR]}/cot_performance_results_3n_hsw"
     DIR[DTR,FUNC,VPP,UBUNTU]: "{DIR[DTR]}/vpp_functional_results_ubuntu"
     DIR[DTR,FUNC,VPP,CENTOS]: "{DIR[DTR]}/vpp_functional_results_centos"
@@ -70,6 +72,7 @@
   urls:
     URL[JENKINS,CSIT]: "https://jenkins.fd.io/view/csit/job"
     URL[JENKINS,HC]: "https://jenkins.fd.io/view/hc2vpp/job"
+    URL[VIRL,DNV]: "http://10.30.51.28/download/denverton/intel_denverton_vpp_release_1810.tar.gz"
     URL[NEXUS]: "https://docs.fd.io/csit"
     DIR[NEXUS]: "report/_static/archive"
 
@@ -118,8 +121,13 @@
 
   data-sets:
 
+    # Denverton:
+    intel-dnv-vpp:
+      intel-dnv-vpp-release-1810:
+      - 1
+
     # VPP Performance
-    vpp-performance-changes:
+    vpp-performance-changes-3n-hsw:
       csit-vpp-perf-1804-all:
       - 21  # sel
       - 22  # sel
@@ -146,23 +154,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
@@ -178,16 +240,50 @@
 
     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-compare-topologies:
+      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
+      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-topologies-mrr:
+      csit-vpp-perf-verify-1810-3n-skx:
+      - 9   # MRR sel
+      - 11  # MRR sel
+      - 12  # MRR sel
+      - 13  # MRR sel
+      csit-vpp-perf-verify-1810-2n-skx:
+      - 8   # MRR sel
+      - 10  # MRR sel
+      - 11  # MRR sel
+      - 12  # MRR sel
+
+    vpp-performance-changes-3n-hsw-mrr:
       csit-vpp-perf-check-1804:
       - 6   # mrr - sel
       - 13  # mrr - sel
@@ -210,15 +306,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:
@@ -232,28 +363,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:
@@ -284,13 +415,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:
@@ -320,18 +454,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:
@@ -339,7 +472,6 @@
       - 44
 
     vpp-func-results-centos:
-      # TODO: Replace with 1810 data:
       csit-vpp-functional-1810-centos7-virl:
       - 44
 
@@ -349,25 +481,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
@@ -390,67 +536,145 @@
       - 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-performance-changes-3n-skx:
+      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
+      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:
-      # TODO: Add data
       csit-dpdk-perf-verify-1810-3n-skx:
       - 3   # NDRPDR sel
-      # TODO: Replace with 1810 data:
-      csit-dpdk-perf-verify-1807-3n-hsw:
-      - 11
-      - 12  # full
-      - 14
-      - 15
-      - 16
-      - 17
-      - 20
-      - 21
-      - 22
-      - 23
+      - 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-compare-topologies:
+      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
 
     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:
       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: Add 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
 
     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:
@@ -621,7 +845,7 @@
         font:
           size: 16
       width: 700
-      height: 800
+      height: 900
 
     plot-throughput-speedup-analysis:
       titlefont:
@@ -694,14 +918,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",
@@ -709,7 +933,7 @@
           xanchor: "left",
           yanchor: "top",
           x: 0,
-          y: -0.14,
+          y: -0.15,
           font: {
             family: "Consolas, Courier New",
             size: 15
@@ -787,6 +1011,9 @@
 
   builds:
 
+    intel-dnv-vpp-release-1810:
+    - 1
+
     csit-vpp-perf-1804-all:
     - 21  # sel
     - 22  # sel
@@ -831,18 +1058,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
@@ -867,7 +1108,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
@@ -908,7 +1148,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
@@ -938,21 +1177,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
@@ -975,27 +1211,51 @@
     - 21
     - 22
     - 23
-    # TODO: Add data:
-#    csit-dpdk-perf-verify-1810-3n-hsw:
-#    -
+    csit-dpdk-perf-verify-1810-3n-hsw:
+    - 1   # NDRPDR sel
+    - 2   # NDRPDR sel
+    - 3   # NDRPDR sel
+    - 4   # NDRPDR sel
+    - 5   # NDRPDR sel
+    - 6   # NDRPDR sel
+    - 7   # NDRPDR sel
+    - 8   # NDRPDR sel
+    - 9   # NDRPDR sel
+    - 10  # NDRPDR sel
     csit-dpdk-perf-verify-1807-3n-skx:
-    - 1
-    - 2
-    - 3
-    - 6
-    - 7
-    - 8
-    - 9
-    - 10
-    - 11
-    - 12
-    # TODO: Add data:
+    - 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
-    # TODO: Add data:
+    - 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:
@@ -1007,7 +1267,7 @@
     csit-dmm-functional-1810-ubuntu1604-virl:
     - 1
     csit-hc2vpp-verify-func-1810-ubuntu1604:
-    - 1
+    - 3
 
 -
   type: "output"
@@ -1015,8 +1275,8 @@
   format:
     html:
     - full
-    pdf:
-    - minimal
+#    pdf:
+#    - minimal
 
 ################################################################################
 ###                               T A B L E S                                ###
@@ -1025,12 +1285,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"
@@ -1073,7 +1333,11 @@
       - 18  # NDRPDR sel
       - 23  # NDRPDR sel
       - 25  # NDRPDR sel
-  data: "vpp-performance-changes"
+      - 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:
@@ -1081,12 +1345,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"
@@ -1129,7 +1393,11 @@
       - 18  # NDRPDR sel
       - 23  # NDRPDR sel
       - 25  # NDRPDR sel
-  data: "vpp-performance-changes"
+      - 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:
@@ -1137,12 +1405,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"
@@ -1185,7 +1453,11 @@
       - 18  # NDRPDR sel
       - 23  # NDRPDR sel
       - 25  # NDRPDR sel
-  data: "vpp-performance-changes"
+      - 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:
@@ -1193,12 +1465,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"
@@ -1241,7 +1513,11 @@
       - 18  # NDRPDR sel
       - 23  # NDRPDR sel
       - 25  # NDRPDR sel
-  data: "vpp-performance-changes"
+      - 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:
@@ -1249,24 +1525,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
-      - 23  # NDRPDR sel
-      - 25  # 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
@@ -1279,30 +1559,370 @@
       - 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
-      - 23  # NDRPDR sel
-      - 25  # 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: "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: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+
+# VPP Performance Changes 3n-skx 2t1c ndr
+-
+  type: "table"
+  title: "VPP Performance Changes 3n-skx 2t1c ndr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-2t1c-ndr"
+  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:
@@ -1325,12 +1945,96 @@
   - "parent"
   - "throughput"
 
-# VPP Performance Changes - 1t1c MRR
+# VPP Comparison Across Topologies 3n-skx to 2n-skx ndr
+-
+  type: "table"
+  title: "VPP Comparison Across Topologies 3n-skx to 2n-skx ndr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-topologies-3n-skx-2n-skx-ndr"
+  reference:
+    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
+  compare:
+    title: "2-Node Skx"
+    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-compare-topologies"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'NDRPDR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+
+# VPP Comparison Across Topologies 3n-skx to 2n-skx pdr
 -
   type: "table"
-  title: "VPP Performance Changes - 1t1c MRR"
+  title: "VPP Comparison Across Topologies 3n-skx to 2n-skx pdr"
   algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-1t1c-mrr"
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-topologies-3n-skx-2n-skx-pdr"
+  reference:
+    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
+  compare:
+    title: "2-Node Skx"
+    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-compare-topologies"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'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"
@@ -1364,7 +2068,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:
@@ -1372,12 +2076,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"
@@ -1411,7 +2115,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:
@@ -1419,12 +2123,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"
@@ -1443,24 +2147,237 @@
   reference:
     title: "rls1807"
     data:
-      csit-vpp-perf-verify-1807-3n-hsw:
-      - 8   # MRR full
-      - 9   # MRR sel
-      - 21  # MRR sel
+      csit-vpp-perf-verify-1807-3n-hsw:
+      - 8   # MRR full
+      - 9   # MRR sel
+      - 21  # MRR sel
+      - 31  # MRR sel
+      - 33  # MRR sel
+      - 36  # MRR sel
+      - 41  # MRR sel
+      - 42  # MRR sel
+      - 48  # MRR sel
+  compare:
+    title: "rls1810"
+    data:
+      csit-vpp-perf-verify-1810-3n-hsw:
+      - 9   # MRR sel
+  data: "vpp-performance-changes-3n-hsw-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T4C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "result"
+
+# VPP Performance Changes 3n-skx 2t1c MRR
+-
+  type: "table"
+  title: "VPP Performance Changes 3n-skx 2t1c MRR"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-2t1c-mrr"
+  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: "'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
-      - 36  # MRR sel
+      - 37  # MRR sel
+      - 38  # MRR sel
       - 41  # MRR sel
-      - 42  # MRR sel
-      - 48  # 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-3n-hsw:
-      - 9   # MRR sel
-  data: "vpp-performance-changes-mrr"
+      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: "'4T4C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  filter: "'8T4C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
   - "name"
   - "parent"
@@ -1493,6 +2410,36 @@
   - "parent"
   - "result"
 
+# VPP Comparison Across Topologies 3n-skx to 2n-skx mrr
+-
+  type: "table"
+  title: "VPP Comparison Across Topologies 3n-skx to 2n-skx mrr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-topologies-3n-skx-2n-skx-mrr"
+  reference:
+    title: "3-Node Skx"
+    data:
+      csit-vpp-perf-verify-1810-3n-skx:
+      - 9   # MRR sel
+      - 11  # MRR sel
+      - 12  # MRR sel
+      - 13  # MRR sel
+  compare:
+    title: "2-Node Skx"
+    data:
+      csit-vpp-perf-verify-1810-2n-skx:
+      - 8   # MRR sel
+      - 10  # MRR sel
+      - 11  # MRR sel
+      - 12  # MRR sel
+  data: "vpp-compare-topologies-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "result"
+
 # Detailed Test Results - VPP Performance Results 3n-hsw
 -
   type: "table"
@@ -1559,6 +2506,28 @@
   - "parent"
   - "msg"
 
+# Detailed Test Results - VPP Performance Results 2n-dnv
+-
+  type: "table"
+  title: "Detailed Test Results - VPP Performance Results 2n-dnv"
+  algorithm: "table_merged_details"
+  output-file-ext: ".csv"
+  output-file: "{DIR[DTR,PERF,VPP,2N,DNV]}/vpp_performance_results_2n_dnv"
+  columns:
+  -
+    title: "Name"
+    data: "data name"
+  -
+    title: "Status"
+    data: "data msg"
+  rows: "generated"
+  data: "intel-dnv-vpp"
+  filter: "'NDRPDR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "msg"
+
 # Test configuration - VPP Performance Test Configs 3n-hsw
 -
   type: "table"
@@ -1757,6 +2726,28 @@
   - "parent"
   - "msg"
 
+# Detailed Test Results - VPP MRR Results 2n-dnv
+-
+  type: "table"
+  title: "Detailed Test Results - VPP MRR Results 2n-dnv"
+  algorithm: "table_details"
+  output-file-ext: ".csv"
+  output-file: "{DIR[DTR,MRR,VPP,2N,DNV]}/vpp_mrr_results_2n_dnv"
+  columns:
+  -
+    title: "Name"
+    data: "data name"
+  -
+    title: "Status"
+    data: "data msg"
+  rows: "generated"
+  data: "intel-dnv-vpp"
+  filter: "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "msg"
+
 # Test configuration - VPP MRR Test Configs 3n-hsw
 -
   type: "table"
@@ -1992,30 +2983,87 @@
 
 ################################################################################
 
-# 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"
+    title: "rls1807"
     data:
-      csit-dpdk-perf-1804-all:
-      - 4
-      - 5
-      - 6
-      - 7
-      - 8
-      - 9
-      - 10
+      csit-dpdk-perf-verify-1807-3n-hsw:
       - 11
-      - 12
-      - 13
+      - 12  # full
+      - 14
+      - 15
+      - 16
+      - 17
+      - 20
+      - 21
+      - 22
+      - 23
   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:
+  - "name"
+  - "parent"
+  - "throughput"
+
+# DPDK Performance Changes 3n-hsw 2t2c pdr
+-
+  type: "table"
+  title: "DPDK Performance Changes 3n-hsw 2t2c pdr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-hsw-2t2c-pdr"
+  history:
+    -
+      title: "rls1804"
+      data:
+        csit-dpdk-perf-1804-all:
+        - 4
+        - 5
+        - 6
+        - 7
+        - 8
+        - 9
+        - 10
+        - 11
+        - 12
+        - 13
+  reference:
     title: "rls1807"
     data:
-      # TODO: Replace with 1810 data
       csit-dpdk-perf-verify-1807-3n-hsw:
       - 11
       - 12  # full
@@ -2027,138 +3075,305 @@
       - 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:
+  - "name"
+  - "parent"
+  - "throughput"
+
+# DPDK Performance Changes 3n-hsw 1t1c ndr
+-
+  type: "table"
+  title: "DPDK Performance Changes 3n-hsw 1t1c ndr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-hsw-1t1c-ndr"
+  history:
+    -
+      title: "rls1804"
+      data:
+        csit-dpdk-perf-1804-all:
+        - 4
+        - 5
+        - 6
+        - 7
+        - 8
+        - 9
+        - 10
+        - 11
+        - 12
+        - 13
+  reference:
+    title: "rls1807"
+    data:
+      csit-dpdk-perf-verify-1807-3n-hsw:
+      - 11
+      - 12  # full
+      - 14
+      - 15
+      - 16
+      - 17
+      - 20
+      - 21
+      - 22
+      - 23
+  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:
   - "name"
   - "parent"
   - "throughput"
 
-# DPDK Performance Changes 2t2c pdr
+# DPDK Performance Changes 3n-hsw 2t2c ndr
 -
   type: "table"
-  title: "DPDK Performance Changes 2t2c pdr"
+  title: "DPDK Performance Changes 3n-hsw 2t2c ndr"
   algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-changes-2t2c-pdr"
+  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"
+    title: "rls1807"
     data:
-      csit-dpdk-perf-1804-all:
-      - 4
-      - 5
-      - 6
-      - 7
-      - 8
-      - 9
-      - 10
+      csit-dpdk-perf-verify-1807-3n-hsw:
       - 11
-      - 12
-      - 13
+      - 12  # full
+      - 14
+      - 15
+      - 16
+      - 17
+      - 20
+      - 21
+      - 22
+      - 23
+  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:
+  - "name"
+  - "parent"
+  - "throughput"
+
+# DPDK Performance Changes 3n-skx 2t1c pdr
+-
+  type: "table"
+  title: "DPDK Performance Changes 3n-skx 2t1c pdr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-skx-2t1c-pdr"
+  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: "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:
-      # TODO: Replace with 1810 data
-      csit-dpdk-perf-verify-1807-3n-hsw:
-      - 11
-      - 12  # full
-      - 14
-      - 15
-      - 16
-      - 17
-      - 20
-      - 21
-      - 22
-      - 23
-  data: "dpdk-performance-changes"
+      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: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  filter: "'4T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
   - "name"
   - "parent"
   - "throughput"
 
-# DPDK Performance Changes 1t1c ndr
+# DPDK Performance Changes 3n-skx 2t1c ndr
 -
   type: "table"
-  title: "DPDK Performance Changes 1t1c ndr"
+  title: "DPDK Performance Changes 3n-skx 2t1c ndr"
   algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-changes-1t1c-ndr"
+  output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-skx-2t1c-ndr"
   reference:
-    title: "rls1804"
+    title: "rls1807"
     data:
-      csit-dpdk-perf-1804-all:
-      - 4
-      - 5
-      - 6
-      - 7
-      - 8
-      - 9
-      - 10
-      - 11
-      - 12
-      - 13
+      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: "rls1807"
+    title: "rls1810"
     data:
-      # TODO: Replace with 1810 data
-      csit-dpdk-perf-verify-1807-3n-hsw:
-      - 11
-      - 12  # full
-      - 14
-      - 15
-      - 16
-      - 17
-      - 20
-      - 21
-      - 22
-      - 23
-  data: "dpdk-performance-changes"
+      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: "'1T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  filter: "'2T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
   - "name"
   - "parent"
   - "throughput"
 
-# DPDK Performance Changes 2t2c ndr
+# DPDK Performance Changes 3n-skx 4t2c ndr
 -
   type: "table"
-  title: "DPDK Performance Changes 2t2c ndr"
+  title: "DPDK Performance Changes 3n-skx 4t2c ndr"
   algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-changes-2t2c-ndr"
+  output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-skx-4t2c-ndr"
   reference:
-    title: "rls1804"
+    title: "rls1807"
     data:
-      csit-dpdk-perf-1804-all:
-      - 4
-      - 5
-      - 6
-      - 7
-      - 8
-      - 9
-      - 10
-      - 11
-      - 12
-      - 13
+      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: "rls1807"
+    title: "rls1810"
     data:
-      # TODO: Replace with 1810 data
-      csit-dpdk-perf-verify-1807-3n-hsw:
-      - 11
-      - 12  # full
-      - 14
-      - 15
-      - 16
-      - 17
-      - 20
-      - 21
-      - 22
-      - 23
-  data: "dpdk-performance-changes"
+      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: "'2T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  filter: "'4T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
   - "name"
   - "parent"
@@ -2173,24 +3388,31 @@
   reference:
     title: "3-Node Hsw"
     data:
-      # 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
   compare:
     title: "3-Node Skx"
     data:
-      # TODO: Add data
       csit-dpdk-perf-verify-1810-3n-skx:
       - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
+      - 11  # NDRPDR sel
+      - 12  # NDRPDR sel
+      - 13  # NDRPDR sel
   data: "dpdk-compare-testbeds"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'NIC_Intel-X710' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -2199,84 +3421,174 @@
   - "parent"
   - "throughput"
 
-# DPDK Comparison Across Testbeds 3n-hsw to 3n-skx pdr
+# DPDK Comparison Across Topologies 3n-skx to 2n-skx ndr
 -
   type: "table"
-  title: "DPDK Comparison Across Testbeds 3n-hsw to 3n-skx pdr"
+  title: "DPDK Comparison Across Topologies 3n-skx to 2n-skx ndr"
   algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-compare-testbeds-3n-hsw-3n-skx-pdr"
+  output-file: "{DIR[STATIC,DPDK]}/performance-compare-topologies-3n-skx-2n-skx-ndr"
   reference:
-    title: "3-Node Hsw"
+    title: "3-Node Skx"
     data:
-      # 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-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
   compare:
+    title: "2-Node Skx"
+    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
+  data: "dpdk-compare-topologies"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'NDRPDR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+
+# DPDK Comparison Across Topologies 3n-skx to 2n-skx pdr
+-
+  type: "table"
+  title: "DPDK Comparison Across Topologies 3n-skx to 2n-skx pdr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-compare-topologies-3n-skx-2n-skx-pdr"
+  reference:
     title: "3-Node Skx"
     data:
-      # TODO: Add data
       csit-dpdk-perf-verify-1810-3n-skx:
       - 3   # NDRPDR sel
-  data: "dpdk-compare-testbeds"
+      - 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
+  compare:
+    title: "2-Node Skx"
+    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
+  data: "dpdk-compare-topologies"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'NIC_Intel-X710' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  filter: "'NDRPDR'" # "('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:
-      # 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
   compare:
     title: "3-Node Skx"
     data:
-      # 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
   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
 -
@@ -2486,6 +3798,24 @@
   - "parent"
   data-start-level: 3
 
+# VPP Performance Results 2n-dnv
+-
+  type: "file"
+  title: "VPP Performance Results 2n-dnv"
+  algorithm: "file_test_results"
+  output-file-ext: ".rst"
+  output-file: "{DIR[DTR,PERF,VPP,2N,DNV]}/vpp_performance_results_2n_dnv"
+  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
+  dir-tables: "{DIR[DTR,PERF,VPP,2N,DNV]}"
+  data: "intel-dnv-vpp"
+  filter: "'NDRPDR'"
+  parameters:
+  - "name"
+  - "doc"
+  - "level"
+  - "parent"
+  data-start-level: 3
+
 # VPP Performance Configuration 3n-hsw
 -
   type: "file"
@@ -2638,8 +3968,26 @@
   output-file-ext: ".rst"
   output-file: "{DIR[DTR,MRR,VPP,2N,SKX]}/vpp_mrr_results_2n_skx"
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
-  dir-tables: "{DIR[DTR,MRR,VPP,2N,SKX]}"
-  data: "vpp-mrr-results-2n-skx"
+  dir-tables: "{DIR[DTR,MRR,VPP,2N,SKX]}"
+  data: "vpp-mrr-results-2n-skx"
+  filter: "all"
+  parameters:
+  - "name"
+  - "doc"
+  - "level"
+  - "parent"
+  data-start-level: 3
+
+# VPP MRR Results 2n-dnv
+-
+  type: "file"
+  title: "VPP MRR Results 2n-dnv"
+  algorithm: "file_test_results"
+  output-file-ext: ".rst"
+  output-file: "{DIR[DTR,MRR,VPP,2N,DNV]}/vpp_mrr_results_2n_dnv"
+  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
+  dir-tables: "{DIR[DTR,MRR,VPP,2N,DNV]}"
+  data: "intel-dnv-vpp"
   filter: "all"
   parameters:
   - "name"
@@ -4372,10 +5720,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
@@ -4401,7 +5749,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"
 
 -
@@ -9738,7 +11086,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
@@ -10909,24 +12257,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"
@@ -10945,24 +12292,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"
@@ -10981,24 +12327,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"
@@ -11017,24 +12362,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"
@@ -11054,24 +12398,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"
@@ -11090,24 +12433,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"
@@ -11126,24 +12468,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"
@@ -11162,24 +12503,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"
@@ -11199,23 +12539,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"
@@ -11234,23 +12574,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"
@@ -11269,23 +12609,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"
@@ -11304,23 +12644,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"
@@ -11469,24 +12809,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"
@@ -11505,24 +12844,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"
@@ -11541,24 +12879,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"
@@ -11577,24 +12914,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"
@@ -11614,24 +12950,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"
@@ -11650,24 +12985,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"
@@ -11686,24 +13020,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"
@@ -11722,24 +13055,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"
@@ -11759,23 +13091,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"
@@ -11794,23 +13126,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"
@@ -11829,23 +13161,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"
@@ -11864,23 +13196,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"
@@ -12029,24 +13361,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"
@@ -12065,24 +13396,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"
@@ -12101,24 +13431,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"
@@ -12137,24 +13466,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"
@@ -12174,24 +13502,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"
@@ -12210,24 +13537,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"
@@ -12246,24 +13572,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"
@@ -12282,24 +13607,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"
@@ -12319,23 +13643,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"
@@ -12354,23 +13677,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"
@@ -12389,23 +13711,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"
@@ -12424,23 +13745,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"
@@ -12589,24 +13909,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"
@@ -12625,24 +13944,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"
@@ -12661,24 +13979,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"
@@ -12697,24 +14014,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"
@@ -12734,24 +14050,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"
@@ -12770,24 +14086,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"
@@ -12806,24 +14122,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"
@@ -12842,24 +14158,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"
@@ -12879,23 +14195,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"
@@ -12914,23 +14230,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"
@@ -12949,23 +14265,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"
@@ -12984,23 +14300,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"
@@ -13149,24 +14465,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"
@@ -13185,24 +14500,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"
@@ -13221,24 +14535,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"
@@ -13257,24 +14570,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"
@@ -13294,24 +14606,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"
@@ -13330,24 +14641,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"
@@ -13366,24 +14676,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"
@@ -13402,24 +14711,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"
@@ -13439,23 +14747,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"
@@ -13474,23 +14781,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"
@@ -13509,23 +14815,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"
@@ -13544,23 +14849,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"
@@ -13709,24 +15013,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"
@@ -13745,24 +15048,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"
@@ -13781,24 +15083,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"
@@ -13817,24 +15118,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"
@@ -13854,24 +15154,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"
@@ -13890,24 +15189,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"
@@ -13926,24 +15224,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"
@@ -13962,24 +15259,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"
@@ -13999,23 +15295,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"
@@ -14034,23 +15329,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"
@@ -14069,23 +15363,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"
@@ -14104,23 +15397,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"
@@ -16946,7 +18238,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -16980,7 +18272,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -17011,7 +18303,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -17030,7 +18322,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
@@ -17041,7 +18333,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -17073,7 +18365,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -17090,7 +18382,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
@@ -17102,7 +18394,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -17132,7 +18424,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -17149,7 +18441,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
@@ -17161,7 +18453,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -17251,7 +18543,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -17285,7 +18577,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -17316,7 +18608,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -17335,7 +18627,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
@@ -17346,7 +18638,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -17378,7 +18670,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -17395,7 +18687,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
@@ -17407,7 +18699,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -17437,7 +18729,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -17454,7 +18746,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
@@ -17466,7 +18758,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -17613,7 +18905,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -17647,7 +18939,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -17678,7 +18970,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -17697,7 +18989,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
@@ -17708,7 +19000,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -17740,7 +19032,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -17757,7 +19049,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
@@ -17769,7 +19061,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -17799,7 +19091,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -17828,7 +19120,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -18035,7 +19327,7 @@
            not 'VHOST' and
            not 'IPSECHW'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -18063,7 +19355,7 @@
            not 'VHOST' and
            not 'IPSECHW'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -18153,7 +19445,7 @@
            not 'VHOST' and
            not 'IPSECHW'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -18181,7 +19473,7 @@
            not 'VHOST' and
            not 'IPSECHW'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -18234,7 +19526,7 @@
            '64B' and
            'ENCAP' and
            'NDRPDR' and
-           '4t2c' and
+           '4T2C' and
            'VXLAN' and
            'L2BDMACLRN' and
            not 'VHOST' and
@@ -18271,7 +19563,7 @@
            not 'VHOST' and
            not 'IPSECHW'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -18299,7 +19591,7 @@
            not 'VHOST' and
            not 'IPSECHW'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -18684,7 +19976,7 @@
            'LISP' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -18709,7 +20001,7 @@
            'LISP' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -18983,24 +20275,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"
@@ -19015,24 +20306,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"
@@ -19048,24 +20338,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"
@@ -19080,24 +20369,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"
@@ -19113,23 +20401,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"
@@ -19144,23 +20432,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"
@@ -19233,24 +20521,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"
@@ -19265,24 +20552,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"
@@ -19298,24 +20584,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"
@@ -19330,24 +20615,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"
@@ -19363,23 +20647,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"
@@ -19394,23 +20678,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"
@@ -19483,24 +20767,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"
@@ -19515,24 +20798,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"
@@ -19548,24 +20830,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"
@@ -19580,24 +20861,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"
@@ -19613,23 +20893,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"
@@ -19644,23 +20923,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"
@@ -19733,24 +21011,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"
@@ -19765,24 +21042,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"
@@ -19798,24 +21074,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"
@@ -19830,24 +21106,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"
@@ -19863,23 +21139,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"
@@ -19894,23 +21170,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"
@@ -19983,24 +21259,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"
@@ -20015,24 +21290,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"
@@ -20048,24 +21322,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"
@@ -20080,24 +21353,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"
@@ -20113,23 +21385,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"
@@ -20144,23 +21415,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"
@@ -20233,24 +21503,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"
@@ -20265,24 +21534,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"
@@ -20298,24 +21566,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"
@@ -20330,24 +21597,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"
@@ -20363,23 +21629,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"
@@ -20394,23 +21659,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"
@@ -24478,23 +25742,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"
@@ -24509,23 +25771,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"
@@ -24541,23 +25802,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"
@@ -24572,23 +25832,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"
@@ -24604,22 +25863,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"
@@ -24634,22 +25893,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"
@@ -24720,23 +25979,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"
@@ -24751,23 +26009,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"
@@ -24783,23 +26040,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"
@@ -24814,23 +26070,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"
@@ -24846,22 +26101,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"
@@ -24876,22 +26131,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"
@@ -24962,23 +26217,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"
@@ -24993,23 +26247,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"
@@ -25025,23 +26278,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"
@@ -25056,23 +26308,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"
@@ -25088,22 +26339,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"
@@ -25118,22 +26368,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"
@@ -25204,23 +26453,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"
@@ -25235,23 +26483,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"
@@ -25267,23 +26514,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"
@@ -25298,23 +26545,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"
@@ -25330,22 +26577,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"
@@ -25360,22 +26607,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"
@@ -25446,23 +26693,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"
@@ -25477,23 +26723,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"
@@ -25509,23 +26754,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"
@@ -25540,23 +26784,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"
@@ -25572,22 +26815,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"
@@ -25602,22 +26844,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"
@@ -25688,23 +26929,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"
@@ -25719,23 +26959,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"
@@ -25751,23 +26990,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"
@@ -25782,23 +27020,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"
@@ -25814,22 +27051,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"
@@ -25844,22 +27080,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"