CSIT-1440: Re-organize graphs in report

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

diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml
index d0c991b..11e7eb9 100644 (file)
--- a/resources/tools/presentation/specification.yaml
+++ b/resources/tools/presentation/specification.yaml
@@ -132,195 +132,194 @@
     # 3n-hsw
 
     plot-vpp-throughput-latency-3n-hsw:
     # 3n-hsw
 
     plot-vpp-throughput-latency-3n-hsw:

-      # TODO: Add new data

       csit-vpp-perf-verify-1901-3n-hsw:
       csit-vpp-perf-verify-1901-3n-hsw:

-      - 10  # NDRPDR sel
-      - 18  # NDRPDR sel F
-      - 19  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 36  # NDRPDR sel
-      - 40  # NDRPDR sel
-      - 42  # NDRPDR sel
+        - 10  # NDRPDR sel
+        - 19  # NDRPDR sel
+        - 31  # NDRPDR sel
+        - 36  # NDRPDR sel
+        - 40  # NDRPDR sel
+        - 42  # NDRPDR sel
+        - 44  # NDRPDR sel
+        - 46  # NDRPDR sel
+        - 47  # NDRPDR sel
+        - 48  # NDRPDR sel

 
     plot-throughput-speedup-analysis-3n-hsw:
 
     plot-throughput-speedup-analysis-3n-hsw:

-      # TODO: Add new data

       csit-vpp-perf-verify-1901-3n-hsw:
       csit-vpp-perf-verify-1901-3n-hsw:

-      - 10  # NDRPDR sel
-      - 18  # NDRPDR sel F
-      - 19  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 36  # NDRPDR sel
-      - 40  # NDRPDR sel
-      - 42  # NDRPDR sel
+        - 10  # NDRPDR sel
+        - 19  # NDRPDR sel
+        - 31  # NDRPDR sel
+        - 36  # NDRPDR sel
+        - 40  # NDRPDR sel
+        - 42  # NDRPDR sel
+        - 44  # NDRPDR sel
+        - 46  # NDRPDR sel
+        - 47  # NDRPDR sel
+        - 48  # NDRPDR sel

 
     plot-vpp-http-server-performance:
       # TODO: Replace with new data
       # csit-vpp-perf-verify-1901-3n-hsw:
       csit-vpp-perf-verify-1810-3n-hsw:
 
     plot-vpp-http-server-performance:
       # TODO: Replace with new data
       # csit-vpp-perf-verify-1901-3n-hsw:
       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
+        - 28  # WRK
+        - 29  # WRK
+        - 30  # WRK
+        - 31  # WRK
+        - 32  # WRK
+        - 33  # WRK
+        - 34  # WRK
+        - 35  # WRK
+        - 36  # WRK
+        - 37  # WRK

 
     plot-ligato-throughput-latency-3n-hsw:
 
     plot-ligato-throughput-latency-3n-hsw:

-      # TODO: Replace with new data
-      # csit-ligato-perf-verify-1901-3n-hsw:
-      csit-ligato-perf-verify-1810-3n-hsw:
-      - 5   # full
-      - 6   # sel
-      - 8   # sel
-      - 9   # sel
-      - 11  # sel
-      - 12  # sel
-      - 13  # sel
-      - 14  # sel
-      - 16  # sel
-      - 17  # sel
-      - 18  # sel
+      csit-ligato-perf-verify-1901-3n-hsw:
+        - 8   # NDRPDR sel
+        - 9   # NDRPDR sel
+        - 11  # NDRPDR sel
+        - 12  # NDRPDR sel
+        - 13  # NDRPDR sel
+        - 14  # NDRPDR sel
+        - 15  # NDRPDR sel
+        - 16  # NDRPDR sel
+        - 17  # NDRPDR sel
+        - 18  # NDRPDR sel

 
     plot-ligato-throughput-speedup-analysis-3n-hsw:
 
     plot-ligato-throughput-speedup-analysis-3n-hsw:

-      # TODO: Replace with new data
-      # csit-ligato-perf-verify-1901-3n-hsw:
-      csit-ligato-perf-verify-1810-3n-hsw:
-      - 5   # full
-      - 6   # sel
-      - 8   # sel
-      - 9   # sel
-      - 11  # sel
-      - 12  # sel
-      - 13  # sel
-      - 14  # sel
-      - 16  # sel
-      - 17  # sel
-      - 18  # sel
+      csit-ligato-perf-verify-1901-3n-hsw:
+        - 8   # NDRPDR sel
+        - 9   # NDRPDR sel
+        - 11  # NDRPDR sel
+        - 12  # NDRPDR sel
+        - 13  # NDRPDR sel
+        - 14  # NDRPDR sel
+        - 15  # NDRPDR sel
+        - 16  # NDRPDR sel
+        - 17  # NDRPDR sel
+        - 18  # NDRPDR sel

 
     plot-dpdk-throughput-latency-3n-hsw:
       csit-dpdk-perf-verify-1901-3n-hsw:
 
     plot-dpdk-throughput-latency-3n-hsw:
       csit-dpdk-perf-verify-1901-3n-hsw:

-      - 13  # NDRPDR sel
-      - 14  # NDRPDR sel
-      - 16  # NDRPDR sel
-      - 17  # NDRPDR sel
-      - 18  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 21  # NDRPDR sel
-      - 22  # NDRPDR sel
+        - 13  # NDRPDR sel
+        - 14  # NDRPDR sel
+        - 16  # NDRPDR sel
+        - 17  # NDRPDR sel
+        - 18  # NDRPDR sel
+        - 19  # NDRPDR sel
+        - 20  # NDRPDR sel
+        - 21  # NDRPDR sel
+        - 22  # NDRPDR sel
+        - 23  # NDRPDR sel

 
     # 3n-skx
 
     plot-vpp-throughput-latency-3n-skx:
       csit-vpp-perf-verify-1901-3n-skx:
 
     # 3n-skx
 
     plot-vpp-throughput-latency-3n-skx:
       csit-vpp-perf-verify-1901-3n-skx:

-      - 18  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 28  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 33  # NDRPDR sel
-      - 36  # NDRPDR sel
-      - 38  # NDRPDR sel
-      - 47  # NDRPDR sel
-      - 48  # NDRPDR sel
+        - 18  # NDRPDR sel
+        - 19  # NDRPDR sel
+        - 20  # NDRPDR sel
+        - 28  # NDRPDR sel
+        - 31  # NDRPDR sel
+        - 33  # NDRPDR sel
+        - 36  # NDRPDR sel
+        - 38  # NDRPDR sel
+        - 47  # NDRPDR sel
+        - 48  # NDRPDR sel

 
     plot-throughput-speedup-analysis-3n-skx:
       csit-vpp-perf-verify-1901-3n-skx:
 
     plot-throughput-speedup-analysis-3n-skx:
       csit-vpp-perf-verify-1901-3n-skx:

-      - 18  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 28  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 33  # NDRPDR sel
-      - 36  # NDRPDR sel
-      - 38  # NDRPDR sel
-      - 47  # NDRPDR sel
-      - 48  # NDRPDR sel
+        - 18  # NDRPDR sel
+        - 19  # NDRPDR sel
+        - 20  # NDRPDR sel
+        - 28  # NDRPDR sel
+        - 31  # NDRPDR sel
+        - 33  # NDRPDR sel
+        - 36  # NDRPDR sel
+        - 38  # NDRPDR sel
+        - 47  # NDRPDR sel
+        - 48  # NDRPDR sel

 
     plot-dpdk-throughput-latency-3n-skx:
       csit-dpdk-perf-verify-1901-3n-skx:
 
     plot-dpdk-throughput-latency-3n-skx:
       csit-dpdk-perf-verify-1901-3n-skx:

-      - 3   # NDRPDR sel
-      - 5   # NDRPDR sel
-      - 6   # NDRPDR sel
-      - 7   # NDRPDR sel
-      - 8   # NDRPDR sel
-      - 9   # NDRPDR sel
-      - 10  # NDRPDR sel
-      - 11  # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
+        - 3   # NDRPDR sel
+        - 5   # NDRPDR sel
+        - 6   # NDRPDR sel
+        - 7   # NDRPDR sel
+        - 8   # NDRPDR sel
+        - 9   # NDRPDR sel
+        - 10  # NDRPDR sel
+        - 11  # NDRPDR sel
+        - 12  # NDRPDR sel
+        - 13  # NDRPDR sel

 
     # 2n-skx
 
     plot-vpp-throughput-latency-2n-skx:
       csit-vpp-perf-verify-1901-2n-skx:
 
     # 2n-skx
 
     plot-vpp-throughput-latency-2n-skx:
       csit-vpp-perf-verify-1901-2n-skx:

-      - 5   # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
-      - 21  # NDRPDR sel
-      - 23  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 34  # NDRPDR sel
-      - 40  # NDRPDR sel
-      - 42  # NDRPDR sel
-      - 43  # NDRPDR sel
+        - 5   # NDRPDR sel
+        - 12  # NDRPDR sel
+        - 13  # NDRPDR sel
+        - 21  # NDRPDR sel
+        - 23  # NDRPDR sel
+        - 31  # NDRPDR sel
+        - 34  # NDRPDR sel
+        - 40  # NDRPDR sel
+        - 42  # NDRPDR sel
+        - 43  # NDRPDR sel

 
     plot-throughput-speedup-analysis-2n-skx:
       csit-vpp-perf-verify-1901-2n-skx:
 
     plot-throughput-speedup-analysis-2n-skx:
       csit-vpp-perf-verify-1901-2n-skx:

-      - 5   # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
-      - 21  # NDRPDR sel
-      - 23  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 34  # NDRPDR sel
-      - 40  # NDRPDR sel
-      - 42  # NDRPDR sel
-      - 43  # NDRPDR sel
+        - 5   # NDRPDR sel
+        - 12  # NDRPDR sel
+        - 13  # NDRPDR sel
+        - 21  # NDRPDR sel
+        - 23  # NDRPDR sel
+        - 31  # NDRPDR sel
+        - 34  # NDRPDR sel
+        - 40  # NDRPDR sel
+        - 42  # NDRPDR sel
+        - 43  # NDRPDR sel

 
     plot-vpp-soak-2n-skx:
       csit-vpp-perf-verify-1901-2n-skx:
 
     plot-vpp-soak-2n-skx:
       csit-vpp-perf-verify-1901-2n-skx:

-      - 45  # SOAK sel
+        - 45  # SOAK sel

 
     plot-vpp-nfv-2n-skx:
       # TODO: Add new data
       csit-vpp-perf-verify-1901-2n-skx:
 
     plot-vpp-nfv-2n-skx:
       # TODO: Add new data
       csit-vpp-perf-verify-1901-2n-skx:

-      - 28  # NFV NDRPDR
-      - 29  # NFV NDRPDR
-      - 32  # NFV NDRPDR
-      - 39  # NFV NDRPDR
-      - 46  # NFV NDRPDR
+        - 28  # NFV NDRPDR
+        - 29  # NFV NDRPDR
+        - 32  # NFV NDRPDR
+        - 39  # NFV NDRPDR
+        - 46  # NFV NDRPDR

 
     plot-vpp-nfv-2n-skx-mrr:
       # TODO: Add new data
       csit-vpp-perf-verify-1901-2n-skx:
 
     plot-vpp-nfv-2n-skx-mrr:
       # TODO: Add new data
       csit-vpp-perf-verify-1901-2n-skx:

-      - 24  # NFV MRR
-      - 26  # NFV MRR
-      - 27  # NFV MRR
-      - 35  # NFV MRR
-      - 37  # NFV MRR
+        - 24  # NFV MRR
+        - 26  # NFV MRR
+        - 27  # NFV MRR
+        - 35  # NFV MRR
+        - 37  # NFV MRR

 
     plot-dpdk-throughput-latency-2n-skx:
       csit-dpdk-perf-verify-1901-2n-skx:
 
     plot-dpdk-throughput-latency-2n-skx:
       csit-dpdk-perf-verify-1901-2n-skx:

-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
-      - 14  # NDRPDR sel
-      - 15  # NDRPDR sel
-      - 16  # NDRPDR sel
-      - 17  # NDRPDR sel
-      - 18  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 21  # NDRPDR sel
+        - 12  # NDRPDR sel
+        - 13  # NDRPDR sel
+        - 14  # NDRPDR sel
+        - 15  # NDRPDR sel
+        - 16  # NDRPDR sel
+        - 17  # NDRPDR sel
+        - 18  # NDRPDR sel
+        - 19  # NDRPDR sel
+        - 20  # NDRPDR sel
+        - 21  # NDRPDR sel

 
     # 3rd party
 
     # Denverton:
     intel-dnv-vpp:
 
     # 3rd party
 
     # Denverton:
     intel-dnv-vpp:

-      # TODO: Replace with new data
+      # Not used

       intel-dnv-vpp-release-1810:
         - 1
 
       intel-dnv-vpp-release-1810:
         - 1
 


@@ -330,135 +329,135 @@
     # NIC Comparisons
 
     vpp-nic-comparison-3n-hsw:
     # NIC Comparisons
 
     vpp-nic-comparison-3n-hsw:

-      # TODO: Add new data

       csit-vpp-perf-verify-1901-3n-hsw:
       csit-vpp-perf-verify-1901-3n-hsw:

-      - 10  # NDRPDR sel
-      - 18  # NDRPDR sel F
-      - 19  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 36  # NDRPDR sel
-      - 40  # NDRPDR sel
-      - 42  # NDRPDR sel
+        - 10  # NDRPDR sel
+        - 19  # NDRPDR sel
+        - 31  # NDRPDR sel
+        - 36  # NDRPDR sel
+        - 40  # NDRPDR sel
+        - 42  # NDRPDR sel
+        - 44  # NDRPDR sel
+        - 46  # NDRPDR sel
+        - 47  # NDRPDR sel
+        - 48  # NDRPDR sel

 
     vpp-nic-comparison-3n-skx:
       csit-vpp-perf-verify-1901-3n-skx:
 
     vpp-nic-comparison-3n-skx:
       csit-vpp-perf-verify-1901-3n-skx:

-      - 18  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 28  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 33  # NDRPDR sel
-      - 36  # NDRPDR sel
-      - 38  # NDRPDR sel
-      - 47  # NDRPDR sel
-      - 48  # NDRPDR sel
+        - 18  # NDRPDR sel
+        - 19  # NDRPDR sel
+        - 20  # NDRPDR sel
+        - 28  # NDRPDR sel
+        - 31  # NDRPDR sel
+        - 33  # NDRPDR sel
+        - 36  # NDRPDR sel
+        - 38  # NDRPDR sel
+        - 47  # NDRPDR sel
+        - 48  # NDRPDR sel

 
     vpp-nic-comparison-2n-skx:
       csit-vpp-perf-verify-1901-2n-skx:
 
     vpp-nic-comparison-2n-skx:
       csit-vpp-perf-verify-1901-2n-skx:

-      - 5   # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
-      - 21  # NDRPDR sel
-      - 23  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 34  # NDRPDR sel
-      - 40  # NDRPDR sel
-      - 42  # NDRPDR sel
-      - 43  # NDRPDR sel
+        - 5   # NDRPDR sel
+        - 12  # NDRPDR sel
+        - 13  # NDRPDR sel
+        - 21  # NDRPDR sel
+        - 23  # NDRPDR sel
+        - 31  # NDRPDR sel
+        - 34  # NDRPDR sel
+        - 40  # NDRPDR sel
+        - 42  # NDRPDR sel
+        - 43  # NDRPDR sel

 
     vpp-nic-comparison-3n-hsw-mrr:
       csit-vpp-perf-verify-1901-3n-hsw:
 
     vpp-nic-comparison-3n-hsw-mrr:
       csit-vpp-perf-verify-1901-3n-hsw:

-      - 35  # MRR sel
+        - 35  # MRR sel

 
     vpp-nic-comparison-3n-skx-mrr:
       csit-vpp-perf-verify-1901-3n-skx:
 
     vpp-nic-comparison-3n-skx-mrr:
       csit-vpp-perf-verify-1901-3n-skx:

-      - 32  # MRR sel
+        - 32  # MRR sel

 
     vpp-nic-comparison-2n-skx-mrr:
       csit-vpp-perf-verify-1901-2n-skx:
 
     vpp-nic-comparison-2n-skx-mrr:
       csit-vpp-perf-verify-1901-2n-skx:

-      - 22  # MRR sel
+        - 22  # MRR sel

 
     # Results
 
     vpp-perf-results-3n-hsw:
 
     # Results
 
     vpp-perf-results-3n-hsw:

-      # TODO: Add FULL data

       csit-vpp-perf-verify-1901-3n-hsw:
       csit-vpp-perf-verify-1901-3n-hsw:

-      - 38  # NDRPDR full
-      - 43  # NDRPDR full
+        - 38  # NDRPDR full
+        - 43  # NDRPDR full
+        - 45  # NDRPDR full
+        - 49  # NDRPDR full

 
     vpp-perf-results-3n-skx:
       csit-vpp-perf-verify-1901-3n-skx:
 
     vpp-perf-results-3n-skx:
       csit-vpp-perf-verify-1901-3n-skx:

-      - 37  # NDRPDR full
-      - 39  # NDRPDR full
-      - 40  # NDRPDR full
-      - 49  # NDRPDR full
+        - 37  # NDRPDR full
+        - 39  # NDRPDR full
+        - 40  # NDRPDR full
+        - 49  # NDRPDR full

 
     vpp-perf-results-2n-skx:
       csit-vpp-perf-verify-1901-2n-skx:
 
     vpp-perf-results-2n-skx:
       csit-vpp-perf-verify-1901-2n-skx:

-      - 25  # NDRPDR full
-      - 30  # NDRPDR full
-      - 33  # NDRPDR full
-      - 44  # NDRPDR full
+        - 25  # NDRPDR full
+        - 30  # NDRPDR full
+        - 33  # NDRPDR full
+        - 44  # NDRPDR full

 
     vpp-mrr-results-3n-hsw:
       csit-vpp-perf-verify-1901-3n-hsw:
 
     vpp-mrr-results-3n-hsw:
       csit-vpp-perf-verify-1901-3n-hsw:

-      - 35  # MRR sel
+        - 35  # MRR sel

 
     vpp-mrr-results-3n-skx:
       csit-vpp-perf-verify-1901-3n-skx:
 
     vpp-mrr-results-3n-skx:
       csit-vpp-perf-verify-1901-3n-skx:

-      - 32  # MRR sel
+        - 32  # MRR sel

 
     vpp-mrr-results-2n-skx:
       csit-vpp-perf-verify-1901-2n-skx:
 
     vpp-mrr-results-2n-skx:
       csit-vpp-perf-verify-1901-2n-skx:

-      - 22  # MRR sel
+        - 22  # MRR sel

 
     vpp-func-results-ubuntu:
       csit-vpp-functional-1901-ubuntu1604-virl:
 
     vpp-func-results-ubuntu:
       csit-vpp-functional-1901-ubuntu1604-virl:

-      - 48
+        - 48

 
     vpp-func-results-centos:
       csit-vpp-functional-1901-centos7-virl:
 
     vpp-func-results-centos:
       csit-vpp-functional-1901-centos7-virl:

-      - 50
+        - 50

 
     vpp-device-results-ubuntu:
       csit-vpp-device-1901-ubuntu1804-1n-skx:
 
     vpp-device-results-ubuntu:
       csit-vpp-device-1901-ubuntu1804-1n-skx:

-      - 49
+        - 49

 
     # VPP Ligato
     ligato-perf-results-3n-hsw:
 
     # VPP Ligato
     ligato-perf-results-3n-hsw:

-      # TODO: Replace with new data
-      # csit-ligato-perf-verify-1901-3n-hsw:
-      csit-ligato-perf-verify-1810-3n-hsw:
-      - 5   # full
+      csit-ligato-perf-verify-1901-3n-hsw:
+        - 10  # NDRPDR full

 
     dpdk-perf-results-3n-hsw:
       csit-dpdk-perf-verify-1901-3n-hsw:
 
     dpdk-perf-results-3n-hsw:
       csit-dpdk-perf-verify-1901-3n-hsw:

-      - 20  # NDRPDR sel
+        - 20  # NDRPDR sel

 
     dpdk-perf-results-3n-skx:
       csit-dpdk-perf-verify-1901-3n-skx:
 
     dpdk-perf-results-3n-skx:
       csit-dpdk-perf-verify-1901-3n-skx:

-      - 13  # NDRPDR sel
+        - 13  # NDRPDR sel

 
     dpdk-perf-results-2n-skx:
       csit-dpdk-perf-verify-1901-2n-skx:
 
     dpdk-perf-results-2n-skx:
       csit-dpdk-perf-verify-1901-2n-skx:

-      - 21  # NDRPDR sel
+        - 21  # NDRPDR sel

 
     # HoneyComb Functional
     hc-func-results:
       csit-hc2vpp-verify-func-1901-ubuntu1604:
 
     # HoneyComb Functional
     hc-func-results:
       csit-hc2vpp-verify-func-1901-ubuntu1604:

-      - 3
+        - 3

 
     # NSH SFC Functional
     nsh-func-results:
 
     # NSH SFC Functional
     nsh-func-results:

-      # TODO: Replace with new data
-      # csit-nsh_sfc-verify-func-1901-ubuntu1604-virl:
+      # Not used

       csit-nsh_sfc-verify-func-1810-ubuntu1604-virl:
       csit-nsh_sfc-verify-func-1810-ubuntu1604-virl:

-      - 1
+        - 1

 
     # DMM Functional
     dmm-func-results:
       csit-dmm-functional-1901-ubuntu1604-virl:
 
     # DMM Functional
     dmm-func-results:
       csit-dmm-functional-1901-ubuntu1604-virl:

-      - 2
+        - 2

 
     ###########################################################################
     # Tables (more than one data set)
 
     ###########################################################################
     # Tables (more than one data set)


@@ -493,15 +492,17 @@
         - 41  # NDRPDR sel
         - 42  # NDRPDR sel
     vpp-performance-changes-3n-hsw-cmp:
         - 41  # NDRPDR sel
         - 42  # NDRPDR sel
     vpp-performance-changes-3n-hsw-cmp:

-      # TODO Add new data

       csit-vpp-perf-verify-1901-3n-hsw:
       csit-vpp-perf-verify-1901-3n-hsw:

-        - 10  # NDRPDR sel
-        - 18  # NDRPDR sel F
-        - 19  # NDRPDR sel
-        - 31  # NDRPDR sel
-        - 36  # NDRPDR sel
-        - 40  # NDRPDR sel
-        - 42  # NDRPDR sel
+      - 10  # NDRPDR sel
+      - 19  # NDRPDR sel
+      - 31  # NDRPDR sel
+      - 36  # NDRPDR sel
+      - 40  # NDRPDR sel
+      - 42  # NDRPDR sel
+      - 44  # NDRPDR sel
+      - 46  # NDRPDR sel
+      - 47  # NDRPDR sel
+      - 48  # NDRPDR sel

     vpp-performance-changes-3n-hsw:
       - "vpp-performance-changes-3n-hsw-h1"
       - "vpp-performance-changes-3n-hsw-ref"
     vpp-performance-changes-3n-hsw:
       - "vpp-performance-changes-3n-hsw-h1"
       - "vpp-performance-changes-3n-hsw-ref"


@@ -698,6 +699,7 @@
         - 20  # NDRPDR sel
         - 21  # NDRPDR sel
         - 22  # NDRPDR sel
         - 20  # NDRPDR sel
         - 21  # NDRPDR sel
         - 22  # NDRPDR sel

+        - 23  # NDRPDR sel

     dpdk-performance-changes-3n-hsw:
       - "dpdk-performance-changes-3n-hsw-h1"
       - "dpdk-performance-changes-3n-hsw-ref"
     dpdk-performance-changes-3n-hsw:
       - "dpdk-performance-changes-3n-hsw-h1"
       - "dpdk-performance-changes-3n-hsw-ref"


@@ -775,15 +777,17 @@
     # Compare testbeds
 
     vpp-compare-testbeds-ref:
     # Compare testbeds
 
     vpp-compare-testbeds-ref:

-      # TODO: Add new data

       csit-vpp-perf-verify-1901-3n-hsw:
         - 10  # NDRPDR sel
       csit-vpp-perf-verify-1901-3n-hsw:
         - 10  # NDRPDR sel

-        - 18  # NDRPDR sel F

         - 19  # NDRPDR sel
         - 31  # NDRPDR sel
         - 36  # NDRPDR sel
         - 40  # NDRPDR sel
         - 42  # NDRPDR sel
         - 19  # NDRPDR sel
         - 31  # NDRPDR sel
         - 36  # NDRPDR sel
         - 40  # NDRPDR sel
         - 42  # NDRPDR sel

+        - 44  # NDRPDR sel
+        - 46  # NDRPDR sel
+        - 47  # NDRPDR sel
+        - 48  # NDRPDR sel

     vpp-compare-testbeds-cmp:
       csit-vpp-perf-verify-1901-3n-skx:
         - 18  # NDRPDR sel
     vpp-compare-testbeds-cmp:
       csit-vpp-perf-verify-1901-3n-skx:
         - 18  # NDRPDR sel


@@ -821,6 +825,7 @@
         - 20  # NDRPDR sel
         - 21  # NDRPDR sel
         - 22  # NDRPDR sel
         - 20  # NDRPDR sel
         - 21  # NDRPDR sel
         - 22  # NDRPDR sel

+        - 23  # NDRPDR sel

     dpdk-compare-testbeds-cmp:
       csit-dpdk-perf-verify-1901-3n-skx:
         - 3   # NDRPDR sel
     dpdk-compare-testbeds-cmp:
       csit-dpdk-perf-verify-1901-3n-skx:
         - 3   # NDRPDR sel


@@ -1309,308 +1314,313 @@
 
   builds:
 
 
   builds:
 

-    # TODO: Replace with 1901 data
+    # Not used

     intel-dnv-vpp-release-1810:
     intel-dnv-vpp-release-1810:

-    - 1
+      - 1

 
     csit-vpp-perf-verify-1807-3n-hsw:
 
     csit-vpp-perf-verify-1807-3n-hsw:

-    - 8   # MRR full
-    - 9   # MRR sel
-    - 21  # MRR sel
-    - 31  # MRR sel
-    - 33  # MRR sel
-    - 36  # MRR sel
-    - 41  # MRR sel
-    - 42  # MRR sel
-    - 48  # MRR sel
-    - 11  # NDRPDR full 1
-    - 22  # NDRPDR full 2
-    - 45  # NDRPDR full 3
-    - 46  # NDRPDR full 4
-    - 15  # NDRPDR sel
-    - 16  # NDRPDR sel
-    - 19  # NDRPDR sel
-    - 18  # NDRPDR sel
-    - 20  # NDRPDR sel
-    - 38  # NDRPDR sel
-    - 40  # NDRPDR sel
-    - 44  # NDRPDR sel
-    - 47  # NDRPDR sel
+      - 8   # MRR full
+      - 9   # MRR sel
+      - 21  # MRR sel
+      - 31  # MRR sel
+      - 33  # MRR sel
+      - 36  # MRR sel
+      - 41  # MRR sel
+      - 42  # MRR sel
+      - 48  # MRR sel
+      - 11  # NDRPDR full 1
+      - 22  # NDRPDR full 2
+      - 45  # NDRPDR full 3
+      - 46  # NDRPDR full 4
+      - 15  # NDRPDR sel
+      - 16  # NDRPDR sel
+      - 19  # NDRPDR sel
+      - 18  # NDRPDR sel
+      - 20  # NDRPDR sel
+      - 38  # NDRPDR sel
+      - 40  # NDRPDR sel
+      - 44  # NDRPDR sel
+      - 47  # NDRPDR sel

     csit-vpp-perf-verify-1810-3n-hsw:
     csit-vpp-perf-verify-1810-3n-hsw:

-    - 9   # MRR sel
-    - 20  # NDRPDR full
-    - 21  # NDRPDR full
-    - 22  # NDRPDR full
-    - 27  # NDRPDR full
-    - 8   # NDRPDR sel
-    - 12  # NDRPDR sel
-    - 14  # NDRPDR sel
-    - 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
+      - 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-1901-3n-hsw:
     csit-vpp-perf-verify-1901-3n-hsw:

-    - 35  # MRR sel
-    - 38  # NDRPDR full
-    - 43  # NDRPDR full
-    - 10  # NDRPDR sel
-    - 18  # NDRPDR sel F
-    - 19  # NDRPDR sel
-    - 31  # NDRPDR sel
-    - 36  # NDRPDR sel
-    - 40  # NDRPDR sel
-    - 42  # NDRPDR sel
+      - 35  # MRR sel
+      - 38  # NDRPDR full
+      - 43  # NDRPDR full
+      - 45  # NDRPDR full
+      - 49  # NDRPDR full
+      - 10  # NDRPDR sel
+      - 19  # NDRPDR sel
+      - 31  # NDRPDR sel
+      - 36  # NDRPDR sel
+      - 40  # NDRPDR sel
+      - 42  # NDRPDR sel
+      - 44  # NDRPDR sel
+      - 46  # NDRPDR sel
+      - 47  # NDRPDR sel
+      - 48  # NDRPDR sel

     csit-vpp-perf-verify-1807-3n-skx:
     csit-vpp-perf-verify-1807-3n-skx:

-    - 31  # MRR full
-    - 28  # MRR sel
-    - 32  # MRR sel
-    - 36  # MRR sel
-    - 42  # MRR sel
-    - 47  # MRR sel
-    - 48  # MRR sel
-    - 51  # MRR sel
-    - 52  # MRR sel
-    - 53  # MRR sel
-    - 54  # MRR sel
-    - 40  # NDRPDR full 1
-    - 41  # NDRPDR full 2
-    - 33  # NDRPDR sel
-    - 35  # NDRPDR sel
-    - 37  # NDRPDR sel
-    - 38  # NDRPDR sel
-    - 39  # NDRPDR sel
-    - 43  # NDRPDR sel
-    - 44  # NDRPDR sel
-    - 49  # NDRPDR sel
-    - 50  # NDRPDR sel
-    - 56  # NDRPDR sel
+      - 31  # MRR full
+      - 28  # MRR sel
+      - 32  # MRR sel
+      - 36  # MRR sel
+      - 42  # MRR sel
+      - 47  # MRR sel
+      - 48  # MRR sel
+      - 51  # MRR sel
+      - 52  # MRR sel
+      - 53  # MRR sel
+      - 54  # MRR sel
+      - 40  # NDRPDR full 1
+      - 41  # NDRPDR full 2
+      - 33  # NDRPDR sel
+      - 35  # NDRPDR sel
+      - 37  # NDRPDR sel
+      - 38  # NDRPDR sel
+      - 39  # NDRPDR sel
+      - 43  # NDRPDR sel
+      - 44  # NDRPDR sel
+      - 49  # NDRPDR sel
+      - 50  # NDRPDR sel
+      - 56  # NDRPDR sel

     csit-vpp-perf-verify-1810-3n-skx:
     csit-vpp-perf-verify-1810-3n-skx:

-    - 9   # MRR sel
-    - 11  # MRR sel
-    - 12  # MRR sel
-    - 13  # MRR sel
-    - 23  # NDRPDR full
-    - 24  # NDRPDR full
-    - 10  # NDRPDR sel
-    - 14  # NDRPDR sel
-    - 15  # NDRPDR sel
-    - 16  # NDRPDR sel
-    - 17  # NDRPDR sel
-    - 19  # NDRPDR sel
-    - 20  # NDRPDR sel
-    - 21  # NDRPDR sel
-    - 22  # NDRPDR sel
-    - 25  # NDRPDR sel
+      - 9   # MRR sel
+      - 11  # MRR sel
+      - 12  # MRR sel
+      - 13  # MRR sel
+      - 23  # NDRPDR full
+      - 24  # NDRPDR full
+      - 10  # NDRPDR sel
+      - 14  # NDRPDR sel
+      - 15  # NDRPDR sel
+      - 16  # NDRPDR sel
+      - 17  # NDRPDR sel
+      - 19  # NDRPDR sel
+      - 20  # NDRPDR sel
+      - 21  # NDRPDR sel
+      - 22  # NDRPDR sel
+      - 25  # NDRPDR sel

     csit-vpp-perf-verify-1901-3n-skx:
     csit-vpp-perf-verify-1901-3n-skx:

-    - 32  # MRR sel
-    - 37  # NDRPDR full
-    - 39  # NDRPDR full
-    - 40  # NDRPDR full
-    - 49  # NDRPDR full
-    - 18  # NDRPDR sel
-    - 19  # NDRPDR sel
-    - 20  # NDRPDR sel
-    - 28  # NDRPDR sel
-    - 31  # NDRPDR sel
-    - 33  # NDRPDR sel
-    - 36  # NDRPDR sel
-    - 38  # NDRPDR sel
-    - 47  # NDRPDR sel
-    - 48  # NDRPDR sel
+      - 32  # MRR sel
+      - 37  # NDRPDR full
+      - 39  # NDRPDR full
+      - 40  # NDRPDR full
+      - 49  # NDRPDR full
+      - 18  # NDRPDR sel
+      - 19  # NDRPDR sel
+      - 20  # NDRPDR sel
+      - 28  # NDRPDR sel
+      - 31  # NDRPDR sel
+      - 33  # NDRPDR sel
+      - 36  # NDRPDR sel
+      - 38  # NDRPDR sel
+      - 47  # NDRPDR sel
+      - 48  # NDRPDR sel

     csit-vpp-perf-verify-1807-2n-skx:
     csit-vpp-perf-verify-1807-2n-skx:

-    - 27  # MRR full
-    - 31  # MRR sel
-    - 33  # MRR sel
-    - 37  # MRR sel
-    - 38  # MRR sel
-    - 41  # MRR sel
-    - 43  # MRR sel
-    - 44  # MRR sel
-    - 45  # MRR sel
-    - 46  # MRR sel
-    - 47  # MRR sel
-    - 32  # NDRPDR full
-    - 26  # NDRPDR sel
-    - 28  # NDRPDR sel
-    - 29  # NDRPDR sel
-    - 30  # NDRPDR sel
-    - 34  # NDRPDR sel
-    - 35  # NDRPDR sel
-    - 36  # NDRPDR sel
-    - 39  # NDRPDR sel
-    - 40  # NDRPDR sel
-    - 42  # NDRPDR sel
+      - 27  # MRR full
+      - 31  # MRR sel
+      - 33  # MRR sel
+      - 37  # MRR sel
+      - 38  # MRR sel
+      - 41  # MRR sel
+      - 43  # MRR sel
+      - 44  # MRR sel
+      - 45  # MRR sel
+      - 46  # MRR sel
+      - 47  # MRR sel
+      - 32  # NDRPDR full
+      - 26  # NDRPDR sel
+      - 28  # NDRPDR sel
+      - 29  # NDRPDR sel
+      - 30  # NDRPDR sel
+      - 34  # NDRPDR sel
+      - 35  # NDRPDR sel
+      - 36  # NDRPDR sel
+      - 39  # NDRPDR sel
+      - 40  # NDRPDR sel
+      - 42  # NDRPDR sel

     csit-vpp-perf-verify-1810-2n-skx:
     csit-vpp-perf-verify-1810-2n-skx:

-    - 8   # MRR sel
-    - 10  # MRR sel
-    - 11  # MRR sel
-    - 12  # MRR sel
-    - 25  # NDRPDR full
-    - 26  # NDRPDR full
-    - 9   # NDRPDR sel
-    - 13  # NDRPDR sel
-    - 14  # NDRPDR sel
-    - 19  # NDRPDR sel
-    - 20  # NDRPDR sel
-    - 21  # NDRPDR sel
-    - 22  # NDRPDR sel
-    - 23  # NDRPDR sel
-    - 24  # NDRPDR sel
-    - 27  # NDRPDR sel
+      - 8   # MRR sel
+      - 10  # MRR sel
+      - 11  # MRR sel
+      - 12  # MRR sel
+      - 25  # NDRPDR full
+      - 26  # NDRPDR full
+      - 9   # NDRPDR sel
+      - 13  # NDRPDR sel
+      - 14  # NDRPDR sel
+      - 19  # NDRPDR sel
+      - 20  # NDRPDR sel
+      - 21  # NDRPDR sel
+      - 22  # NDRPDR sel
+      - 23  # NDRPDR sel
+      - 24  # NDRPDR sel
+      - 27  # NDRPDR sel

     csit-vpp-perf-verify-1901-2n-skx:
     csit-vpp-perf-verify-1901-2n-skx:

-    - 22  # MRR sel
-    - 25  # NDRPDR full
-    - 30  # NDRPDR full
-    - 33  # NDRPDR full
-    - 44  # NDRPDR full
-    - 5   # NDRPDR sel
-    - 12  # NDRPDR sel
-    - 13  # NDRPDR sel
-    - 21  # NDRPDR sel
-    - 23  # NDRPDR sel
-    - 31  # NDRPDR sel
-    - 34  # NDRPDR sel
-    - 40  # NDRPDR sel
-    - 42  # NDRPDR sel
-    - 43  # NDRPDR sel
-    - 24  # NFV MRR
-    - 26  # NFV MRR
-    - 27  # NFV MRR
-    - 35  # NFV MRR
-    - 37  # NFV MRR
-    - 28  # NFV NDRPDR
-    - 29  # NFV NDRPDR
-    - 32  # NFV NDRPDR
-    - 39  # NFV NDRPDR
-    - 46  # NFV NDRPDR
-    - 45  # SOAK
-    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
+      - 22  # MRR sel
+      - 25  # NDRPDR full
+      - 30  # NDRPDR full
+      - 33  # NDRPDR full
+      - 44  # NDRPDR full
+      - 5   # NDRPDR sel
+      - 12  # NDRPDR sel
+      - 13  # NDRPDR sel
+      - 21  # NDRPDR sel
+      - 23  # NDRPDR sel
+      - 31  # NDRPDR sel
+      - 34  # NDRPDR sel
+      - 40  # NDRPDR sel
+      - 42  # NDRPDR sel
+      - 43  # NDRPDR sel
+      - 24  # NFV MRR
+      - 26  # NFV MRR
+      - 27  # NFV MRR
+      - 35  # NFV MRR
+      - 37  # NFV MRR
+      - 28  # NFV NDRPDR
+      - 29  # NFV NDRPDR
+      - 32  # NFV NDRPDR
+      - 39  # NFV NDRPDR
+      - 46  # NFV NDRPDR
+      - 45  # SOAK

     # TODO: Add new data
     # TODO: Add new data

-    # csit-ligato-perf-verify-1901-3n-hsw:
+    csit-ligato-perf-verify-1901-3n-hsw:
+      - 10  # NDRPDR full
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 11  # NDRPDR sel
+      - 12  # NDRPDR sel
+      - 13  # NDRPDR sel
+      - 14  # NDRPDR sel
+      - 15  # NDRPDR sel
+      - 16  # NDRPDR sel
+      - 17  # NDRPDR sel
+      - 18  # NDRPDR sel

     csit-dpdk-perf-verify-1807-3n-hsw:
     csit-dpdk-perf-verify-1807-3n-hsw:

-    - 11
-    - 12  # full
-    - 14
-    - 15
-    - 16
-    - 17
-    - 20
-    - 21
-    - 22
-    - 23
+      - 11
+      - 12  # full
+      - 14
+      - 15
+      - 16
+      - 17
+      - 20
+      - 21
+      - 22
+      - 23

     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
+      - 1   # NDRPDR sel
+      - 2   # NDRPDR sel
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 5   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel

     csit-dpdk-perf-verify-1901-3n-hsw:
     csit-dpdk-perf-verify-1901-3n-hsw:

-    - 13  # NDRPDR sel
-    - 14  # NDRPDR sel
-    - 16  # NDRPDR sel
-    - 17  # NDRPDR sel
-    - 18  # NDRPDR sel
-    - 19  # NDRPDR sel
-    - 20  # NDRPDR sel
-    - 21  # NDRPDR sel
-    - 22  # NDRPDR sel
+      - 13  # NDRPDR sel
+      - 14  # NDRPDR sel
+      - 16  # NDRPDR sel
+      - 17  # NDRPDR sel
+      - 18  # NDRPDR sel
+      - 19  # NDRPDR sel
+      - 20  # NDRPDR sel
+      - 21  # NDRPDR sel
+      - 22  # NDRPDR sel
+      - 23  # NDRPDR sel

     csit-dpdk-perf-verify-1807-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
+      - 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:
     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
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
+      - 11  # NDRPDR sel
+      - 12  # NDRPDR sel
+      - 13  # NDRPDR sel

     csit-dpdk-perf-verify-1901-3n-skx:
     csit-dpdk-perf-verify-1901-3n-skx:

-    - 3   # NDRPDR sel
-    - 5   # NDRPDR sel
-    - 6   # NDRPDR sel
-    - 7   # NDRPDR sel
-    - 8   # NDRPDR sel
-    - 9   # NDRPDR sel
-    - 10  # NDRPDR sel
-    - 11  # NDRPDR sel
-    - 12  # NDRPDR sel
-    - 13  # NDRPDR sel
+      - 3   # NDRPDR sel
+      - 5   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
+      - 11  # NDRPDR sel
+      - 12  # NDRPDR sel
+      - 13  # NDRPDR sel

     csit-dpdk-perf-verify-1810-2n-skx:
     csit-dpdk-perf-verify-1810-2n-skx:

-    - 3   # NDRPDR sel
-    - 4   # NDRPDR sel
-    - 5   # NDRPDR sel
-    - 7   # NDRPDR sel
-    - 8   # NDRPDR sel
-    - 9   # NDRPDR sel
-    - 10  # NDRPDR sel
-    - 11  # NDRPDR sel
-    - 12  # NDRPDR sel
-    - 13  # NDRPDR sel
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 5   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
+      - 11  # NDRPDR sel
+      - 12  # NDRPDR sel
+      - 13  # NDRPDR sel

     csit-dpdk-perf-verify-1901-2n-skx:
     csit-dpdk-perf-verify-1901-2n-skx:

-    - 12  # NDRPDR sel
-    - 13  # NDRPDR sel
-    - 14  # NDRPDR sel
-    - 15  # NDRPDR sel
-    - 16  # NDRPDR sel
-    - 17  # NDRPDR sel
-    - 18  # NDRPDR sel
-    - 19  # NDRPDR sel
-    - 20  # NDRPDR sel
-    - 21  # NDRPDR sel
+      - 12  # NDRPDR sel
+      - 13  # NDRPDR sel
+      - 14  # NDRPDR sel
+      - 15  # NDRPDR sel
+      - 16  # NDRPDR sel
+      - 17  # NDRPDR sel
+      - 18  # NDRPDR sel
+      - 19  # NDRPDR sel
+      - 20  # NDRPDR sel
+      - 21  # NDRPDR sel

     csit-vpp-functional-1901-ubuntu1604-virl:
     csit-vpp-functional-1901-ubuntu1604-virl:

-    - 48
+      - 48

     csit-vpp-functional-1901-centos7-virl:
     csit-vpp-functional-1901-centos7-virl:

-    - 50
+      - 50

     csit-vpp-device-1901-ubuntu1804-1n-skx:
     csit-vpp-device-1901-ubuntu1804-1n-skx:

-    - 49
-    # TODO: Replace with 1901 data
+      - 49
+    # Not used

     csit-nsh_sfc-verify-func-1810-ubuntu1604-virl:
     csit-nsh_sfc-verify-func-1810-ubuntu1604-virl:

-    - 1
+      - 1

     csit-dmm-functional-1901-ubuntu1604-virl:
     csit-dmm-functional-1901-ubuntu1604-virl:

-    - 2
+      - 2

     csit-hc2vpp-verify-func-1901-ubuntu1604:
     csit-hc2vpp-verify-func-1901-ubuntu1604:

-    - 3
+      - 3

 
 -
   type: "output"
 
 -
   type: "output"


@@ -1618,14 +1628,13 @@
   format:
     html:
     - full
   format:
     html:
     - full

-    pdf:
-    - minimal
+#    pdf:
+#    - minimal

 
 ################################################################################
 ###                               T A B L E S                                ###
 ################################################################################
 
 
 ################################################################################
 ###                               T A B L E S                                ###
 ################################################################################
 

-

 # VPP Compare NICs 3n-hsw 1t1c ndr
 -
   type: "table"
 # VPP Compare NICs 3n-hsw 1t1c ndr
 -
   type: "table"


@@ -5902,8 +5911,8 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:

-  - "L2XCFWD"

   - "L2PATCH"
   - "L2PATCH"

+  - "L2XCFWD"

   - "L2BDMACLRN"
   - "FIB_10K"
   - "FIB_100K"
   - "L2BDMACLRN"
   - "FIB_10K"
   - "FIB_100K"


@@ -5937,8 +5946,8 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:

-  - "L2XCFWD"

   - "L2PATCH"
   - "L2PATCH"

+  - "L2XCFWD"

   - "L2BDMACLRN"
   - "FIB_10K"
   - "FIB_100K"
   - "L2BDMACLRN"
   - "FIB_10K"
   - "FIB_100K"


@@ -5972,8 +5981,8 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:

-  - "L2XCFWD"

   - "L2PATCH"
   - "L2PATCH"

+  - "L2XCFWD"

   - "L2BDMACLRN"
   - "FIB_10K"
   - "FIB_100K"
   - "L2BDMACLRN"
   - "FIB_10K"
   - "FIB_100K"


@@ -6007,8 +6016,8 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:

-  - "L2XCFWD"

   - "L2PATCH"
   - "L2PATCH"

+  - "L2XCFWD"

   - "L2BDMACLRN"
   - "FIB_10K"
   - "FIB_100K"
   - "L2BDMACLRN"
   - "FIB_10K"
   - "FIB_100K"


@@ -6036,6 +6045,7 @@
            (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
            not 'ACL' and
            not 'VHOST' and
            (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
            not 'ACL' and
            not 'VHOST' and

+           not 'L2OVRLAY' and

            not 'MEMIF'"
   parameters:
   - "throughput"
            not 'MEMIF'"
   parameters:
   - "throughput"


@@ -6068,6 +6078,7 @@
            (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
            not 'ACL' and
            not 'VHOST' and
            (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
            not 'ACL' and
            not 'VHOST' and

+           not 'L2OVRLAY' and

            not 'MEMIF'"
   parameters:
   - "throughput"
            not 'MEMIF'"
   parameters:
   - "throughput"


@@ -6100,6 +6111,7 @@
            (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
            not 'ACL' and
            not 'VHOST' and
            (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
            not 'ACL' and
            not 'VHOST' and

+           not 'L2OVRLAY' and

            not 'MEMIF'"
   parameters:
   - "throughput"
            not 'MEMIF'"
   parameters:
   - "throughput"


@@ -6132,6 +6144,7 @@
            (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
            not 'ACL' and
            not 'VHOST' and
            (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
            not 'ACL' and
            not 'VHOST' and

+           not 'L2OVRLAY' and

            not 'MEMIF'"
   parameters:
   - "throughput"
            not 'MEMIF'"
   parameters:
   - "throughput"


@@ -6153,14 +6166,14 @@
 # Packet Throughput - VPP L2 3n-hsw-xl710 base and scale
 -
   type: "plot"
 # Packet Throughput - VPP L2 3n-hsw-xl710 base and scale
 -
   type: "plot"

-  title: "VPP Throughput: l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
+  title: "VPP Throughput: l2sw-3n-hsw-xl710-64b-1t1c-base-ndr"

   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"

-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-xl710-64b-1t1c-base-ndr"

   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and

-           ('BASE' or 'SCALE') and
+           'BASE' and

            'NDRPDR' and
            'ETH' and
            '1T1C' and
            'NDRPDR' and
            'ETH' and
            '1T1C' and


@@ -6173,29 +6186,26 @@
   - "tags"
   sort:
   - "L2PATCH"
   - "tags"
   sort:
   - "L2PATCH"

-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+  - "L2XCFWD"
+  - "L2BDMACLRN"

   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:

-    title: "l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
+    title: "l2sw-3n-hsw-xl710-64b-1t1c-base-ndr"

     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"

-  title: "VPP Throughput: l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
+  title: "VPP Throughput: l2sw-3n-hsw-xl710-64b-1t1c-base-pdr"

   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"

-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-xl710-64b-1t1c-base-pdr"

   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and

-           ('BASE' or 'SCALE') and
+           'BASE' and

            'NDRPDR' and
            'ETH' and
            '1T1C' and
            'NDRPDR' and
            'ETH' and
            '1T1C' and


@@ -6208,29 +6218,26 @@
   - "tags"
   sort:
   - "L2PATCH"
   - "tags"
   sort:
   - "L2PATCH"

-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+  - "L2XCFWD"
+  - "L2BDMACLRN"

   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:

-    title: "l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
+    title: "l2sw-3n-hsw-xl710-64b-1t1c-base-pdr"

     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"

-  title: "VPP Throughput: l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
+  title: "VPP Throughput: l2sw-3n-hsw-xl710-64b-2t2c-base-ndr"

   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"

-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-xl710-64b-2t2c-base-ndr"

   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and

-           ('BASE' or 'SCALE') and
+           'BASE' and

            'NDRPDR' and
            'ETH' and
            '2T2C' and
            'NDRPDR' and
            'ETH' and
            '2T2C' and


@@ -6243,29 +6250,26 @@
   - "tags"
   sort:
   - "L2PATCH"
   - "tags"
   sort:
   - "L2PATCH"

-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+  - "L2XCFWD"
+  - "L2BDMACLRN"

   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:

-    title: "l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
+    title: "l2sw-3n-hsw-xl710-64b-2t2c-base-ndr"

     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"

-  title: "VPP Throughput: l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
+  title: "VPP Throughput: l2sw-3n-hsw-xl710-64b-2t2c-base-pdr"

   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"

-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-xl710-64b-2t2c-base-pdr"

   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and

-           ('BASE' or 'SCALE') and
+           'BASE' and

            'NDRPDR' and
            'ETH' and
            '2T2C' and
            'NDRPDR' and
            'ETH' and
            '2T2C' and


@@ -6278,17 +6282,14 @@
   - "tags"
   sort:
   - "L2PATCH"
   - "tags"
   sort:
   - "L2PATCH"

-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+  - "L2XCFWD"
+  - "L2BDMACLRN"

   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:

-    title: "l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
+    title: "l2sw-3n-hsw-xl710-64b-2t2c-base-pdr"

     layout: "plot-throughput"
 
 # Packet Throughput - VPP L2 3n-skx-x710 base and scale
     layout: "plot-throughput"
 
 # Packet Throughput - VPP L2 3n-skx-x710 base and scale


@@ -6451,6 +6452,8 @@
            (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
            not 'ACL' and
            not 'VHOST' and
            (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
            not 'ACL' and
            not 'VHOST' and

+           not 'DRV_AVF' and
+           not 'L2OVRLAY' and

            not 'MEMIF'"
   parameters:
   - "throughput"
            not 'MEMIF'"
   parameters:
   - "throughput"


@@ -6483,6 +6486,8 @@
            (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
            not 'ACL' and
            not 'VHOST' and
            (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
            not 'ACL' and
            not 'VHOST' and

+           not 'DRV_AVF' and
+           not 'L2OVRLAY' and

            not 'MEMIF'"
   parameters:
   - "throughput"
            not 'MEMIF'"
   parameters:
   - "throughput"


@@ -6515,6 +6520,8 @@
            (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
            not 'ACL' and
            not 'VHOST' and
            (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
            not 'ACL' and
            not 'VHOST' and

+           not 'DRV_AVF' and
+           not 'L2OVRLAY' and

            not 'MEMIF'"
   parameters:
   - "throughput"
            not 'MEMIF'"
   parameters:
   - "throughput"


@@ -6547,6 +6554,8 @@
            (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
            not 'ACL' and
            not 'VHOST' and
            (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
            not 'ACL' and
            not 'VHOST' and

+           not 'DRV_AVF' and
+           not 'L2OVRLAY' and

            not 'MEMIF'"
   parameters:
   - "throughput"
            not 'MEMIF'"
   parameters:
   - "throughput"


@@ -6568,10 +6577,10 @@
 # Packet Throughput - VPP L2 3n-skx-xxv710 base and scale
 -
   type: "plot"
 # Packet Throughput - VPP L2 3n-skx-xxv710 base and scale
 -
   type: "plot"

-  title: "VPP Throughput: l2sw-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
+  title: "VPP Throughput: l2sw-3n-skx-xxv710-64b-2t1c-base-ndr"

   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"

-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-2t1c-base-ndr"

   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and


@@ -6581,33 +6590,30 @@
            '2T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            '2T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and

-           not 'MEMIF' and
-           not 'DRV_AVF'"
+           not 'MEMIF'"

   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   - "L2PATCH"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   - "L2PATCH"

+  - "L2PATCH"

   - "L2XCBASE"
   - "L2XCBASE"

-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+  - "L2BDMACLRN"

   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:

-    title: "l2sw-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
+    title: "l2sw-3n-skx-xxv710-64b-2t1c-base-ndr"

     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"

-  title: "VPP Throughput: l2sw-3n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
+  title: "VPP Throughput: l2sw-3n-skx-xxv710-64b-2t1c-base-pdr"

   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"

-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-2t1c-base-pdr"

   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and


@@ -6617,33 +6623,30 @@
            '2T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            '2T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and

-           not 'MEMIF' and
-           not 'DRV_AVF'"
+           not 'MEMIF'"

   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   - "L2PATCH"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   - "L2PATCH"

+  - "L2PATCH"

   - "L2XCBASE"
   - "L2XCBASE"

-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+  - "L2BDMACLRN"

   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:

-    title: "l2sw-3n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
+    title: "l2sw-3n-skx-xxv710-64b-2t1c-base-pdr"

     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"

-  title: "VPP Throughput: l2sw-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
+  title: "VPP Throughput: l2sw-3n-skx-xxv710-64b-4t2c-base-ndr"

   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"

-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-4t2c-base-ndr"

   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and


@@ -6653,33 +6656,30 @@
            '4T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            '4T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and

-           not 'MEMIF' and
-           not 'DRV_AVF'"
+           not 'MEMIF'"

   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   - "L2PATCH"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   - "L2PATCH"

+  - "L2PATCH"

   - "L2XCBASE"
   - "L2XCBASE"

-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+  - "L2BDMACLRN"

   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:

-    title: "l2sw-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
+    title: "l2sw-3n-skx-xxv710-64b-4t2c-base-ndr"

     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"

-  title: "VPP Throughput: l2sw-3n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
+  title: "VPP Throughput: l2sw-3n-skx-xxv710-64b-4t2c-base-pdr"

   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"

-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-4t2c-base-pdr"

   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and


@@ -6689,25 +6689,22 @@
            '4T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            '4T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and

-           not 'MEMIF' and
-           not 'DRV_AVF'"
+           not 'MEMIF'"

   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   - "L2PATCH"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   - "L2PATCH"

+  - "L2PATCH"

   - "L2XCBASE"
   - "L2XCBASE"

-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+  - "L2BDMACLRN"

   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:

-    title: "l2sw-3n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
+    title: "l2sw-3n-skx-xxv710-64b-4t2c-base-pdr"

     layout: "plot-throughput"
 
 # Packet Throughput - VPP L2 2n-skx-x710 base and scale
     layout: "plot-throughput"
 
 # Packet Throughput - VPP L2 2n-skx-x710 base and scale


@@ -7126,17 +7123,17 @@
 # Packet Throughput - VPP Container Memif 3n-hsw-x520
 -
   type: "plot"
 # Packet Throughput - VPP Container Memif 3n-hsw-x520
 -
   type: "plot"

-  title: "VPP Throughput: memif-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
+  title: "VPP Throughput: memif-3n-hsw-x520-64b-1t1c-base_and_features-ndr"

   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"

-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-1t1c-base_and_features-ndr"

   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '1T1C' and
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '1T1C' and

-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and

            not 'VHOST' and
            'MEMIF'"
   parameters:
            not 'VHOST' and
            'MEMIF'"
   parameters:


@@ -7150,27 +7147,28 @@
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"

+  - "IP4FWD"

   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:

-    title: "memif-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
+    title: "memif-3n-hsw-x520-64b-1t1c-base_and_features-ndr"

     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"

-  title: "VPP Throughput: memif-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
+  title: "VPP Throughput: memif-3n-hsw-x520-64b-1t1c-base_and_features-pdr"

   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"

-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-1t1c-base_and_features-pdr"

   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '1T1C' and
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '1T1C' and

-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and

            not 'VHOST' and
            'MEMIF'"
   parameters:
            not 'VHOST' and
            'MEMIF'"
   parameters:


@@ -7184,27 +7182,28 @@
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"

+  - "IP4FWD"

   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:

-    title: "memif-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
+    title: "memif-3n-hsw-x520-64b-1t1c-base_and_features-pdr"

     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"

-  title: "VPP Throughput: memif-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
+  title: "VPP Throughput: memif-3n-hsw-x520-64b-2t2c-base_and_features-ndr"

   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"

-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-2t2c-base_and_features-ndr"

   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T2C' and
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T2C' and

-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and

            not 'VHOST' and
            'MEMIF'"
   parameters:
            not 'VHOST' and
            'MEMIF'"
   parameters:


@@ -7218,27 +7217,28 @@
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"

+  - "IP4FWD"

   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:

-    title: "memif-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
+    title: "memif-3n-hsw-x520-64b-2t2c-base_and_features-ndr"

     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"

-  title: "VPP Throughput: memif-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
+  title: "VPP Throughput: memif-3n-hsw-x520-64b-2t2c-base_and_features-pdr"

   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"

-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-2t2c-base_and_features-pdr"

   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T2C' and
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T2C' and

-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and

            not 'VHOST' and
            'MEMIF'"
   parameters:
            not 'VHOST' and
            'MEMIF'"
   parameters:


@@ -7252,28 +7252,29 @@
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"

+  - "IP4FWD"

   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:

-    title: "memif-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
+    title: "memif-3n-hsw-x520-64b-2t2c-base_and_features-pdr"

     layout: "plot-throughput"
 
 # Packet Throughput - VPP Container Memif 3n-hsw-x710
 -
   type: "plot"
     layout: "plot-throughput"
 
 # Packet Throughput - VPP Container Memif 3n-hsw-x710
 -
   type: "plot"

-  title: "VPP Throughput: memif-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
+  title: "VPP Throughput: memif-3n-hsw-x710-64b-1t1c-base_and_features-ndr"

   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"

-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-1t1c-base_and_features-ndr"

   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '1T1C' and
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '1T1C' and

-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and

            not 'VHOST' and
            'MEMIF'"
   parameters:
            not 'VHOST' and
            'MEMIF'"
   parameters:


@@ -7287,27 +7288,28 @@
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"

+  - "IP4FWD"

   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:

-    title: "memif-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
+    title: "memif-3n-hsw-x710-64b-1t1c-base_and_features-ndr"

     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"

-  title: "VPP Throughput: memif-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
+  title: "VPP Throughput: memif-3n-hsw-x710-64b-1t1c-base_and_features-pdr"

   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"

-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-1t1c-base_and_features-pdr"

   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '1T1C' and
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '1T1C' and

-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and

            not 'VHOST' and
            'MEMIF'"
   parameters:
            not 'VHOST' and
            'MEMIF'"
   parameters:


@@ -7321,27 +7323,28 @@
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"

+  - "IP4FWD"

   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:

-    title: "memif-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
+    title: "memif-3n-hsw-x710-64b-1t1c-base_and_features-pdr"

     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"

-  title: "VPP Throughput: memif-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+  title: "VPP Throughput: memif-3n-hsw-x710-64b-2t2c-base_and_features-ndr"

   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"

-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-2t2c-base_and_features-ndr"

   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T2C' and
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T2C' and

-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and

            not 'VHOST' and
            'MEMIF'"
   parameters:
            not 'VHOST' and
            'MEMIF'"
   parameters:


@@ -7355,27 +7358,28 @@
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"

+  - "IP4FWD"

   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:

-    title: "memif-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+    title: "memif-3n-hsw-x710-64b-2t2c-base_and_features-ndr"

     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"

-  title: "VPP Throughput: memif-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
+  title: "VPP Throughput: memif-3n-hsw-x710-64b-2t2c-base_and_features-pdr"

   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"

-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-2t2c-base_and_features-pdr"

   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T2C' and
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T2C' and

-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and

            not 'VHOST' and
            'MEMIF'"
   parameters:
            not 'VHOST' and
            'MEMIF'"
   parameters:


@@ -7389,28 +7393,29 @@
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"

+  - "IP4FWD"

   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:

-    title: "memif-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
+    title: "memif-3n-hsw-x710-64b-2t2c-base_and_features-pdr"

     layout: "plot-throughput"
 
 # Packet Throughput - VPP Container Memif 3n-hsw-xl710
 -
   type: "plot"
     layout: "plot-throughput"
 
 # Packet Throughput - VPP Container Memif 3n-hsw-xl710
 -
   type: "plot"

-  title: "VPP Throughput: memif-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
+  title: "VPP Throughput: memif-3n-hsw-xl710-64b-1t1c-base_and_features-ndr"

   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"

-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-1t1c-base_and_features-ndr"

   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '1T1C' and
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '1T1C' and

-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and

            not 'VHOST' and
            'MEMIF'"
   parameters:
            not 'VHOST' and
            'MEMIF'"
   parameters:


@@ -7424,27 +7429,28 @@
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"

+  - "IP4FWD"

   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:

-    title: "memif-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
+    title: "memif-3n-hsw-xl710-64b-1t1c-base_and_features-ndr"

     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"

-  title: "VPP Throughput: memif-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
+  title: "VPP Throughput: memif-3n-hsw-xl710-64b-1t1c-base_and_features-pdr"

   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"

-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-1t1c-base_and_features-pdr"

   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '1T1C' and
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '1T1C' and

-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and

            not 'VHOST' and
            'MEMIF'"
   parameters:
            not 'VHOST' and
            'MEMIF'"
   parameters:


@@ -7458,27 +7464,28 @@
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"

+  - "IP4FWD"

   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:

-    title: "memif-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
+    title: "memif-3n-hsw-xl710-64b-1t1c-base_and_features-pdr"

     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"

-  title: "VPP Throughput: memif-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
+  title: "VPP Throughput: memif-3n-hsw-xl710-64b-2t2c-base_and_features-ndr"

   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"

-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-2t2c-base_and_features-ndr"

   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T2C' and
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T2C' and

-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and

            not 'VHOST' and
            'MEMIF'"
   parameters:
            not 'VHOST' and
            'MEMIF'"
   parameters:


@@ -7492,27 +7499,28 @@
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"

+  - "IP4FWD"

   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:

-    title: "memif-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
+    title: "memif-3n-hsw-xl710-64b-2t2c-base_and_features-ndr"

     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"

-  title: "VPP Throughput: memif-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
+  title: "VPP Throughput: memif-3n-hsw-xl710-64b-2t2c-base_and_features-pdr"

   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"

-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-2t2c-base_and_features-pdr"

   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T2C' and
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T2C' and

-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and

            not 'VHOST' and
            'MEMIF'"
   parameters:
            not 'VHOST' and
            'MEMIF'"
   parameters:


@@ -7526,28 +7534,29 @@
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"

+  - "IP4FWD"

   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:

-    title: "memif-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
+    title: "memif-3n-hsw-xl710-64b-2t2c-base_and_features-pdr"

     layout: "plot-throughput"
 
 # Packet Throughput - VPP Container Memif 3n-skx-x710
 -
   type: "plot"
     layout: "plot-throughput"
 
 # Packet Throughput - VPP Container Memif 3n-skx-x710
 -
   type: "plot"

-  title: "VPP Throughput: memif-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+  title: "VPP Throughput: memif-3n-skx-x710-64b-2t1c-base_and_features-ndr"

   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"

-  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-2t1c-base_and_features-ndr"

   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T1C' and
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T1C' and

-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and

            not 'VHOST' and
            'MEMIF'"
   parameters:
            not 'VHOST' and
            'MEMIF'"
   parameters:


@@ -7561,27 +7570,28 @@
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"

+  - "IP4FWD"

   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:

-    title: "memif-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+    title: "memif-3n-skx-x710-64b-2t1c-base_and_features-ndr"

     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"

-  title: "VPP Throughput: memif-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
+  title: "VPP Throughput: memif-3n-skx-x710-64b-2t1c-base_and_features-pdr"

   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"

-  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-2t1c-base_and_features-pdr"

   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T1C' and
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T1C' and

-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and

            not 'VHOST' and
            'MEMIF'"
   parameters:
            not 'VHOST' and
            'MEMIF'"
   parameters:


@@ -7595,27 +7605,28 @@
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"

+  - "IP4FWD"

   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:

-    title: "memif-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
+    title: "memif-3n-skx-x710-64b-2t1c-base_and_features-pdr"

     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"

-  title: "VPP Throughput: memif-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
+  title: "VPP Throughput: memif-3n-skx-x710-64b-4t2c-base_and_features-ndr"

   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"

-  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-4t2c-base_and_features-ndr"

   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '4T2C' and
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '4T2C' and

-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and

            not 'VHOST' and
            'MEMIF'"
   parameters:
            not 'VHOST' and
            'MEMIF'"
   parameters:


@@ -7629,27 +7640,28 @@
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"

+  - "IP4FWD"

   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:

-    title: "memif-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
+    title: "memif-3n-skx-x710-64b-4t2c-base_and_features-ndr"

     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"

-  title: "VPP Throughput: memif-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
+  title: "VPP Throughput: memif-3n-skx-x710-64b-4t2c-base_and_features-pdr"

   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"

-  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-4t2c-base_and_features-pdr"

   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '4T2C' and
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '4T2C' and

-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and

            not 'VHOST' and
            'MEMIF'"
   parameters:
            not 'VHOST' and
            'MEMIF'"
   parameters:


@@ -7663,29 +7675,31 @@
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"

+  - "IP4FWD"

   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:

-    title: "memif-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
+    title: "memif-3n-skx-x710-64b-4t2c-base_and_features-pdr"

     layout: "plot-throughput"
 
 # Packet Throughput - VPP Container Memif 2n-skx-x710
 -
   type: "plot"
     layout: "plot-throughput"
 
 # Packet Throughput - VPP Container Memif 2n-skx-x710
 -
   type: "plot"

-  title: "VPP Throughput: memif-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
+  title: "VPP Throughput: memif-2n-skx-x710-64b-2t1c-base-ndr"

   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"

-  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-2t1c-base-ndr"

   data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T1C' and
   data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T1C' and

-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and

            not 'VHOST' and
            not 'VHOST' and

+           not 'NF_DENSITY' and

            'MEMIF'"
   parameters:
   - "throughput"
            'MEMIF'"
   parameters:
   - "throughput"


@@ -7698,28 +7712,30 @@
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"

+  - "IP4FWD"

   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:

-    title: "memif-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
+    title: "memif-2n-skx-x710-64b-2t1c-base-ndr"

     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"

-  title: "VPP Throughput: memif-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
+  title: "VPP Throughput: memif-2n-skx-x710-64b-2t1c-base-pdr"

   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"

-  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-2t1c-base-pdr"

   data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T1C' and
   data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T1C' and

-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and

            not 'VHOST' and
            not 'VHOST' and

+           not 'NF_DENSITY' and

            'MEMIF'"
   parameters:
   - "throughput"
            'MEMIF'"
   parameters:
   - "throughput"


@@ -7732,28 +7748,30 @@
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"

+  - "IP4FWD"

   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:

-    title: "memif-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
+    title: "memif-2n-skx-x710-64b-2t1c-base-pdr"

     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"

-  title: "VPP Throughput: memif-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
+  title: "VPP Throughput: memif-2n-skx-x710-64b-4t2c-base-ndr"

   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"

-  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-4t2c-base-ndr"

   data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '4T2C' and
   data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '4T2C' and

-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and

            not 'VHOST' and
            not 'VHOST' and

+           not 'NF_DENSITY' and

            'MEMIF'"
   parameters:
   - "throughput"
            'MEMIF'"
   parameters:
   - "throughput"


@@ -7766,28 +7784,30 @@
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"

+  - "IP4FWD"

   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:

-    title: "memif-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
+    title: "memif-2n-skx-x710-64b-4t2c-base-ndr"

     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"

-  title: "VPP Throughput: memif-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
+  title: "VPP Throughput: memif-2n-skx-x710-64b-4t2c-base-pdr"

   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"

-  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-4t2c-base-pdr"

   data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '4T2C' and
   data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '4T2C' and

-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and

            not 'VHOST' and
            not 'VHOST' and

+           not 'NF_DENSITY' and

            'MEMIF'"
   parameters:
   - "throughput"
            'MEMIF'"
   parameters:
   - "throughput"


@@ -7800,28 +7820,29 @@
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"

+  - "IP4FWD"

   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:

-    title: "memif-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
+    title: "memif-2n-skx-x710-64b-4t2c-base-pdr"

     layout: "plot-throughput"
 
 # Packet Throughput - VPP Container Memif 2n-skx-xxv710
 -
   type: "plot"
     layout: "plot-throughput"
 
 # Packet Throughput - VPP Container Memif 2n-skx-xxv710
 -
   type: "plot"

-  title: "VPP Throughput: memif-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
+  title: "VPP Throughput: memif-2n-skx-xxv710-64b-2t1c-base_and_features-ndr"

   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"

-  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-xxv710-64b-2t1c-base_and_features-ndr"

   data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T1C' and
   data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T1C' and

-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and

            not 'VHOST' and
            'MEMIF'"
   parameters:
            not 'VHOST' and
            'MEMIF'"
   parameters:


@@ -7835,17 +7856,18 @@
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"

+  - "IP4FWD"

   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:

-    title: "memif-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
+    title: "memif-2n-skx-xxv710-64b-2t1c-base_and_features-ndr"

     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"

-  title: "VPP Throughput: memif-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
+  title: "VPP Throughput: memif-2n-skx-xxv710-64b-2t1c-base_and_features-pdr"

   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"


@@ -7855,7 +7877,7 @@
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T1C' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T1C' and

-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and

            not 'VHOST' and
            'MEMIF'"
   parameters:
            not 'VHOST' and
            'MEMIF'"
   parameters:


@@ -7869,27 +7891,28 @@
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"

+  - "IP4FWD"

   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:

-    title: "memif-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
+    title: "memif-2n-skx-xxv710-64b-2t1c-base_and_features-pdr"

     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"

-  title: "VPP Throughput: memif-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
+  title: "VPP Throughput: memif-2n-skx-xxv710-64b-4t2c-base_and_features-ndr"

   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"

-  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-xxv710-64b-4t2c-base_and_features-ndr"

   data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '4T2C' and
   data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '4T2C' and

-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and

            not 'VHOST' and
            'MEMIF'"
   parameters:
            not 'VHOST' and
            'MEMIF'"
   parameters:


@@ -7903,27 +7926,28 @@
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"

+  - "IP4FWD"

   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:

-    title: "memif-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
+    title: "memif-2n-skx-xxv710-64b-4t2c-base_and_features-ndr"

     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"

-  title: "VPP Throughput: memif-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
+  title: "VPP Throughput: memif-2n-skx-xxv710-64b-4t2c-base_and_features-pdr"

   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"

-  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-xxv710-64b-4t2c-base_and_features-pdr"

   data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '4T2C' and
   data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '4T2C' and

-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and

            not 'VHOST' and
            'MEMIF'"
   parameters:
            not 'VHOST' and
            'MEMIF'"
   parameters:


@@ -7937,12 +7961,13 @@
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"

+  - "IP4FWD"

   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:

-    title: "memif-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
+    title: "memif-2n-skx-xxv710-64b-4t2c-base_and_features-pdr"

     layout: "plot-throughput"
 
 ################################################################################
     layout: "plot-throughput"
 
 ################################################################################


@@ -7962,6 +7987,7 @@
            '1T1C' and
            'L2XCFWD' and
            not 'VHOST' and
            '1T1C' and
            'L2XCFWD' and
            not 'VHOST' and

+           not 'NF_DENSITY' and

            'MEMIF'"
   parameters:
   - "throughput"
            'MEMIF'"
   parameters:
   - "throughput"


@@ -7995,6 +8021,7 @@
            '1T1C' and
            'L2XCFWD' and
            not 'VHOST' and
            '1T1C' and
            'L2XCFWD' and
            not 'VHOST' and

+           not 'NF_DENSITY' and

            'MEMIF'"
   parameters:
   - "throughput"
            'MEMIF'"
   parameters:
   - "throughput"


@@ -8028,6 +8055,7 @@
            '2T2C' and
            'L2XCFWD' and
            not 'VHOST' and
            '2T2C' and
            'L2XCFWD' and
            not 'VHOST' and

+           not 'NF_DENSITY' and

            'MEMIF'"
   parameters:
   - "throughput"
            'MEMIF'"
   parameters:
   - "throughput"


@@ -8061,6 +8089,7 @@
            '2T2C' and
            'L2XCFWD' and
            not 'VHOST' and
            '2T2C' and
            'L2XCFWD' and
            not 'VHOST' and

+           not 'NF_DENSITY' and

            'MEMIF'"
   parameters:
   - "throughput"
            'MEMIF'"
   parameters:
   - "throughput"


@@ -8095,6 +8124,7 @@
            '1T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN') and
            not 'VHOST' and
            '1T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN') and
            not 'VHOST' and

+           not 'NF_DENSITY' and

            'MEMIF'"
   parameters:
   - "throughput"
            'MEMIF'"
   parameters:
   - "throughput"


@@ -8128,6 +8158,7 @@
            '1T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN') and
            not 'VHOST' and
            '1T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN') and
            not 'VHOST' and

+           not 'NF_DENSITY' and

            'MEMIF'"
   parameters:
   - "throughput"
            'MEMIF'"
   parameters:
   - "throughput"


@@ -8161,6 +8192,7 @@
            '2T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN') and
            not 'VHOST' and
            '2T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN') and
            not 'VHOST' and

+           not 'NF_DENSITY' and

            'MEMIF'"
   parameters:
   - "throughput"
            'MEMIF'"
   parameters:
   - "throughput"


@@ -8194,6 +8226,7 @@
            '2T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN') and
            not 'VHOST' and
            '2T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN') and
            not 'VHOST' and

+           not 'NF_DENSITY' and

            'MEMIF'"
   parameters:
   - "throughput"
            'MEMIF'"
   parameters:
   - "throughput"


@@ -8228,6 +8261,7 @@
            '1T1C' and
            'L2XCFWD' and
            not 'VHOST' and
            '1T1C' and
            'L2XCFWD' and
            not 'VHOST' and

+           not 'NF_DENSITY' and

            'MEMIF'"
   parameters:
   - "throughput"
            'MEMIF'"
   parameters:
   - "throughput"


@@ -8261,6 +8295,7 @@
            '1T1C' and
            'L2XCFWD' and
            not 'VHOST' and
            '1T1C' and
            'L2XCFWD' and
            not 'VHOST' and

+           not 'NF_DENSITY' and

            'MEMIF'"
   parameters:
   - "throughput"
            'MEMIF'"
   parameters:
   - "throughput"


@@ -8294,6 +8329,7 @@
            '2T2C' and
            'L2XCFWD' and
            not 'VHOST' and
            '2T2C' and
            'L2XCFWD' and
            not 'VHOST' and

+           not 'NF_DENSITY' and

            'MEMIF'"
   parameters:
   - "throughput"
            'MEMIF'"
   parameters:
   - "throughput"


@@ -8327,6 +8363,7 @@
            '2T2C' and
            'L2XCFWD' and
            not 'VHOST' and
            '2T2C' and
            'L2XCFWD' and
            not 'VHOST' and

+           not 'NF_DENSITY' and

            'MEMIF'"
   parameters:
   - "throughput"
            'MEMIF'"
   parameters:
   - "throughput"


@@ -8361,6 +8398,7 @@
            '1T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN') and
            not 'VHOST' and
            '1T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN') and
            not 'VHOST' and

+           not 'NF_DENSITY' and

            'MEMIF'"
   parameters:
   - "throughput"
            'MEMIF'"
   parameters:
   - "throughput"


@@ -8394,6 +8432,7 @@
            '1T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN') and
            not 'VHOST' and
            '1T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN') and
            not 'VHOST' and

+           not 'NF_DENSITY' and

            'MEMIF'"
   parameters:
   - "throughput"
            'MEMIF'"
   parameters:
   - "throughput"


@@ -8427,6 +8466,7 @@
            '2T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN') and
            not 'VHOST' and
            '2T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN') and
            not 'VHOST' and

+           not 'NF_DENSITY' and

            'MEMIF'"
   parameters:
   - "throughput"
            'MEMIF'"
   parameters:
   - "throughput"


@@ -8460,6 +8500,7 @@
            '2T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN') and
            not 'VHOST' and
            '2T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN') and
            not 'VHOST' and

+           not 'NF_DENSITY' and

            'MEMIF'"
   parameters:
   - "throughput"
            'MEMIF'"
   parameters:
   - "throughput"


@@ -8496,13 +8537,13 @@
            '1T1C' and
            'IP4FWD' and
            not 'IPSEC' and
            '1T1C' and
            'IP4FWD' and
            not 'IPSEC' and

+           not 'DOT1Q' and

            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:

-  - "DOT1Q"

   - "IP4BASE"
   - "FIB_20k"
   - "FIB_200k"
   - "IP4BASE"
   - "FIB_20k"
   - "FIB_200k"


@@ -8529,13 +8570,13 @@
            '1T1C' and
            'IP4FWD' and
            not 'IPSEC' and
            '1T1C' and
            'IP4FWD' and
            not 'IPSEC' and

+           not 'DOT1Q' and

            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:

-  - "DOT1Q"

   - "IP4BASE"
   - "FIB_20k"
   - "FIB_200k"
   - "IP4BASE"
   - "FIB_20k"
   - "FIB_200k"


@@ -8562,13 +8603,13 @@
            '2T2C' and
            'IP4FWD' and
            not 'IPSEC' and
            '2T2C' and
            'IP4FWD' and
            not 'IPSEC' and

+           not 'DOT1Q' and

            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:

-  - "DOT1Q"

   - "IP4BASE"
   - "FIB_20k"
   - "FIB_200k"
   - "IP4BASE"
   - "FIB_20k"
   - "FIB_200k"


@@ -8595,13 +8636,13 @@
            '2T2C' and
            'IP4FWD' and
            not 'IPSEC' and
            '2T2C' and
            'IP4FWD' and
            not 'IPSEC' and

+           not 'DOT1Q' and

            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:

-  - "DOT1Q"

   - "IP4BASE"
   - "FIB_20k"
   - "FIB_200k"
   - "IP4BASE"
   - "FIB_20k"
   - "FIB_200k"


@@ -8784,7 +8825,8 @@
            'NDRPDR' and
            '1T1C' and
            'IP4FWD' and
            'NDRPDR' and
            '1T1C' and
            'IP4FWD' and

-           'NAT44' and
+           ('NAT44' or 'IP4BASE') and
+           not 'DOT1Q' and

            not 'IPSEC' and
            not 'VHOST'"
   parameters:
            not 'IPSEC' and
            not 'VHOST'"
   parameters:


@@ -8792,7 +8834,7 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:

-  - "BASE"
+  - "IP4BASE"

   - "BASE"
   - "SRC_USER_10"
   - "SRC_USER_100"
   - "BASE"
   - "SRC_USER_10"
   - "SRC_USER_100"


@@ -8818,7 +8860,8 @@
            'NDRPDR' and
            '1T1C' and
            'IP4FWD' and
            'NDRPDR' and
            '1T1C' and
            'IP4FWD' and

-           'NAT44' and
+           ('NAT44' or 'IP4BASE') and
+           not 'DOT1Q' and

            not 'IPSEC' and
            not 'VHOST'"
   parameters:
            not 'IPSEC' and
            not 'VHOST'"
   parameters:


@@ -8826,7 +8869,7 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:

-  - "BASE"
+  - "IP4BASE"

   - "BASE"
   - "SRC_USER_10"
   - "SRC_USER_100"
   - "BASE"
   - "SRC_USER_10"
   - "SRC_USER_100"


@@ -8852,7 +8895,8 @@
            'NDRPDR' and
            '2T2C' and
            'IP4FWD' and
            'NDRPDR' and
            '2T2C' and
            'IP4FWD' and

-           'NAT44' and
+           ('NAT44' or 'IP4BASE') and
+           not 'DOT1Q' and

            not 'IPSEC' and
            not 'VHOST'"
   parameters:
            not 'IPSEC' and
            not 'VHOST'"
   parameters:


@@ -8860,7 +8904,7 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:

-  - "BASE"
+  - "IP4BASE"

   - "BASE"
   - "SRC_USER_10"
   - "SRC_USER_100"
   - "BASE"
   - "SRC_USER_10"
   - "SRC_USER_100"


@@ -8886,7 +8930,8 @@
            'NDRPDR' and
            '2T2C' and
            'IP4FWD' and
            'NDRPDR' and
            '2T2C' and
            'IP4FWD' and

-           'NAT44' and
+           ('NAT44' or 'IP4BASE') and
+           not 'DOT1Q' and

            not 'IPSEC' and
            not 'VHOST'"
   parameters:
            not 'IPSEC' and
            not 'VHOST'"
   parameters:


@@ -8894,7 +8939,7 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:

-  - "BASE"
+  - "IP4BASE"

   - "BASE"
   - "SRC_USER_10"
   - "SRC_USER_100"
   - "BASE"
   - "SRC_USER_10"
   - "SRC_USER_100"


@@ -8921,15 +8966,16 @@
            'NDRPDR' and
            '1T1C' and
            'IP4FWD' and
            'NDRPDR' and
            '1T1C' and
            'IP4FWD' and

-           'IACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and

            not 'IPSEC' and
            not 'IPSEC' and

+           not 'DOT1Q' and

            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:

+  - "IP4BASE"

   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   - "ACL_STATELESS"
   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   - "ACL_STATELESS"


@@ -8954,15 +9000,16 @@
            'NDRPDR' and
            '1T1C' and
            'IP4FWD' and
            'NDRPDR' and
            '1T1C' and
            'IP4FWD' and

-           'IACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and

            not 'IPSEC' and
            not 'IPSEC' and

+           not 'DOT1Q' and

            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:

+  - "IP4BASE"

   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   - "ACL_STATELESS"
   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   - "ACL_STATELESS"


@@ -8987,15 +9034,16 @@
            'NDRPDR' and
            '2T2C' and
            'IP4FWD' and
            'NDRPDR' and
            '2T2C' and
            'IP4FWD' and

-           'IACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and

            not 'IPSEC' and
            not 'IPSEC' and

+           not 'DOT1Q' and

            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:

+  - "IP4BASE"

   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   - "ACL_STATELESS"
   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   - "ACL_STATELESS"


@@ -9020,15 +9068,16 @@
            'NDRPDR' and
            '2T2C' and
            'IP4FWD' and
            'NDRPDR' and
            '2T2C' and
            'IP4FWD' and

-           'IACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and

            not 'IPSEC' and
            not 'IPSEC' and

+           not 'DOT1Q' and

            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:

+  - "IP4BASE"

   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   - "ACL_STATELESS"
   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   - "ACL_STATELESS"


@@ -9054,15 +9103,16 @@
            'NDRPDR' and
            '1T1C' and
            'IP4FWD' and
            'NDRPDR' and
            '1T1C' and
            'IP4FWD' and

-           'OACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           ('OACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and

            not 'IPSEC' and
            not 'IPSEC' and

+           not 'DOT1Q' and

            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:

+  - "IP4BASE"

   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   - "ACL_STATELESS"
   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   - "ACL_STATELESS"


@@ -9087,15 +9137,16 @@
            'NDRPDR' and
            '1T1C' and
            'IP4FWD' and
            'NDRPDR' and
            '1T1C' and
            'IP4FWD' and

-           'OACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           ('OACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and

            not 'IPSEC' and
            not 'IPSEC' and

+           not 'DOT1Q' and

            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:

+  - "IP4BASE"

   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   - "ACL_STATELESS"
   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   - "ACL_STATELESS"


@@ -9120,15 +9171,16 @@
            'NDRPDR' and
            '2T2C' and
            'IP4FWD' and
            'NDRPDR' and
            '2T2C' and
            'IP4FWD' and

-           'OACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           ('OACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and

            not 'IPSEC' and
            not 'IPSEC' and

+           not 'DOT1Q' and

            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:

+  - "IP4BASE"

   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   - "ACL_STATELESS"
   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   - "ACL_STATELESS"


@@ -9153,15 +9205,16 @@
            'NDRPDR' and
            '2T2C' and
            'IP4FWD' and
            'NDRPDR' and
            '2T2C' and
            'IP4FWD' and

-           'OACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           ('OACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and

            not 'IPSEC' and
            not 'IPSEC' and

+           not 'DOT1Q' and

            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:

+  - "IP4BASE"

   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   - "ACL_STATELESS"
   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   - "ACL_STATELESS"


@@ -9189,13 +9242,13 @@
            '1T1C' and
            'IP4FWD' and
            not 'IPSEC' and
            '1T1C' and
            'IP4FWD' and
            not 'IPSEC' and

+           not 'DOT1Q' and

            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:

-  - "DOT1Q"

   - "IP4BASE"
   - "FIB_20K"
   - "FIB_200K"
   - "IP4BASE"
   - "FIB_20K"
   - "FIB_200K"


@@ -9222,13 +9275,13 @@
            '1T1C' and
            'IP4FWD' and
            not 'IPSEC' and
            '1T1C' and
            'IP4FWD' and
            not 'IPSEC' and

+           not 'DOT1Q' and

            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:

-  - "DOT1Q"

   - "IP4BASE"
   - "FIB_20K"
   - "FIB_200K"
   - "IP4BASE"
   - "FIB_20K"
   - "FIB_200K"


@@ -9255,13 +9308,13 @@
            '2T2C' and
            'IP4FWD' and
            not 'IPSEC' and
            '2T2C' and
            'IP4FWD' and
            not 'IPSEC' and

+           not 'DOT1Q' and

            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:

-  - "DOT1Q"

   - "IP4BASE"
   - "FIB_20K"
   - "FIB_200K"
   - "IP4BASE"
   - "FIB_20K"
   - "FIB_200K"


@@ -9288,13 +9341,13 @@
            '2T2C' and
            'IP4FWD' and
            not 'IPSEC' and
            '2T2C' and
            'IP4FWD' and
            not 'IPSEC' and

+           not 'DOT1Q' and

            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:

-  - "DOT1Q"

   - "IP4BASE"
   - "FIB_20K"
   - "FIB_200K"
   - "IP4BASE"
   - "FIB_20K"
   - "FIB_200K"


@@ -9332,6 +9385,7 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:

+  - "DOT1Q"

   - "IP4BASE"
   - "NAT44"
   - "POLICE_MARK"
   - "IP4BASE"
   - "NAT44"
   - "POLICE_MARK"


@@ -9370,6 +9424,7 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:

+  - "DOT1Q"

   - "IP4BASE"
   - "NAT44"
   - "POLICE_MARK"
   - "IP4BASE"
   - "NAT44"
   - "POLICE_MARK"


@@ -9408,6 +9463,7 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:

+  - "DOT1Q"

   - "IP4BASE"
   - "NAT44"
   - "POLICE_MARK"
   - "IP4BASE"
   - "NAT44"
   - "POLICE_MARK"


@@ -9446,6 +9502,7 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:

+  - "DOT1Q"

   - "IP4BASE"
   - "NAT44"
   - "POLICE_MARK"
   - "IP4BASE"
   - "NAT44"
   - "POLICE_MARK"


@@ -9473,7 +9530,7 @@
            'NDRPDR' and
            '2T1C' and
            'IP4FWD' and
            'NDRPDR' and
            '2T1C' and
            'IP4FWD' and

-           'NAT44' and
+           ('NAT44' or 'IP4BASE') and

            not 'IPSEC' and
            not 'VHOST'"
   parameters:
            not 'IPSEC' and
            not 'VHOST'"
   parameters:


@@ -9481,7 +9538,7 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:

-  - "BASE"
+  - "IP4BASE"

   - "BASE"
   - "SRC_USER_10"
   - "SRC_USER_100"
   - "BASE"
   - "SRC_USER_10"
   - "SRC_USER_100"


@@ -9507,7 +9564,7 @@
            'NDRPDR' and
            '2T1C' and
            'IP4FWD' and
            'NDRPDR' and
            '2T1C' and
            'IP4FWD' and

-           'NAT44' and
+           ('NAT44' or 'IP4BASE') and

            not 'IPSEC' and
            not 'VHOST'"
   parameters:
            not 'IPSEC' and
            not 'VHOST'"
   parameters:


@@ -9515,7 +9572,7 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:

-  - "BASE"
+  - "IP4BASE"

   - "BASE"
   - "SRC_USER_10"
   - "SRC_USER_100"
   - "BASE"
   - "SRC_USER_10"
   - "SRC_USER_100"


@@ -9541,7 +9598,7 @@
            'NDRPDR' and
            '4T2C' and
            'IP4FWD' and
            'NDRPDR' and
            '4T2C' and
            'IP4FWD' and

-           'NAT44' and
+           ('NAT44' or 'IP4BASE') and

            not 'IPSEC' and
            not 'VHOST'"
   parameters:
            not 'IPSEC' and
            not 'VHOST'"
   parameters:


@@ -9549,7 +9606,7 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:

-  - "BASE"
+  - "IP4BASE"

   - "BASE"
   - "SRC_USER_10"
   - "SRC_USER_100"
   - "BASE"
   - "SRC_USER_10"
   - "SRC_USER_100"


@@ -9575,7 +9632,7 @@
            'NDRPDR' and
            '4T2C' and
            'IP4FWD' and
            'NDRPDR' and
            '4T2C' and
            'IP4FWD' and

-           'NAT44' and
+           ('NAT44' or 'IP4BASE') and

            not 'IPSEC' and
            not 'VHOST'"
   parameters:
            not 'IPSEC' and
            not 'VHOST'"
   parameters:


@@ -9583,7 +9640,7 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:

-  - "BASE"
+  - "IP4BASE"

   - "BASE"
   - "SRC_USER_10"
   - "SRC_USER_100"
   - "BASE"
   - "SRC_USER_10"
   - "SRC_USER_100"


@@ -9610,8 +9667,7 @@
            'NDRPDR' and
            '2T1C' and
            'IP4FWD' and
            'NDRPDR' and
            '2T1C' and
            'IP4FWD' and

-           'IACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and

            not 'IPSEC' and
            not 'VHOST'"
   parameters:
            not 'IPSEC' and
            not 'VHOST'"
   parameters:


@@ -9619,6 +9675,7 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:

+  - "IP4BASE"

   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   - "ACL_STATELESS"
   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   - "ACL_STATELESS"


@@ -9643,8 +9700,7 @@
            'NDRPDR' and
            '2T1C' and
            'IP4FWD' and
            'NDRPDR' and
            '2T1C' and
            'IP4FWD' and

-           'IACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and

            not 'IPSEC' and
            not 'VHOST'"
   parameters:
            not 'IPSEC' and
            not 'VHOST'"
   parameters:


@@ -9652,6 +9708,7 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:

+  - "IP4BASE"

   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   - "ACL_STATELESS"
   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   - "ACL_STATELESS"


@@ -9676,8 +9733,7 @@
            'NDRPDR' and
            '4T2C' and
            'IP4FWD' and
            'NDRPDR' and
            '4T2C' and
            'IP4FWD' and

-           'IACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and

            not 'IPSEC' and
            not 'VHOST'"
   parameters:
            not 'IPSEC' and
            not 'VHOST'"
   parameters:


@@ -9685,6 +9741,7 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:

+  - "IP4BASE"

   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   - "ACL_STATELESS"
   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   - "ACL_STATELESS"


@@ -9709,8 +9766,7 @@
            'NDRPDR' and
            '4T2C' and
            'IP4FWD' and
            'NDRPDR' and
            '4T2C' and
            'IP4FWD' and

-           'IACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and

            not 'IPSEC' and
            not 'VHOST'"
   parameters:
            not 'IPSEC' and
            not 'VHOST'"
   parameters:


@@ -9718,6 +9774,7 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:

+  - "IP4BASE"

   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   - "ACL_STATELESS"
   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   - "ACL_STATELESS"


@@ -10007,6 +10064,7 @@
            '2T1C' and
            'IP4FWD' and
            not 'IPSEC' and
            '2T1C' and
            'IP4FWD' and
            not 'IPSEC' and

+           not 'DOT1Q' and

            not 'VHOST'"
   parameters:
   - "throughput"
            not 'VHOST'"
   parameters:
   - "throughput"


@@ -10039,6 +10097,7 @@
            '2T1C' and
            'IP4FWD' and
            not 'IPSEC' and
            '2T1C' and
            'IP4FWD' and
            not 'IPSEC' and

+           not 'DOT1Q' and

            not 'VHOST'"
   parameters:
   - "throughput"
            not 'VHOST'"
   parameters:
   - "throughput"


@@ -10071,6 +10130,7 @@
            '4T2C' and
            'IP4FWD' and
            not 'IPSEC' and
            '4T2C' and
            'IP4FWD' and
            not 'IPSEC' and

+           not 'DOT1Q' and

            not 'VHOST'"
   parameters:
   - "throughput"
            not 'VHOST'"
   parameters:
   - "throughput"


@@ -10103,6 +10163,7 @@
            '4T2C' and
            'IP4FWD' and
            not 'IPSEC' and
            '4T2C' and
            'IP4FWD' and
            not 'IPSEC' and

+           not 'DOT1Q' and

            not 'VHOST'"
   parameters:
   - "throughput"
            not 'VHOST'"
   parameters:
   - "throughput"


@@ -10146,6 +10207,7 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:

+  - "DOT1Q"

   - "IP4BASE"
   - "NAT44"
   - "POLICE_MARK"
   - "IP4BASE"
   - "NAT44"
   - "POLICE_MARK"


@@ -10184,6 +10246,7 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:

+  - "DOT1Q"

   - "IP4BASE"
   - "NAT44"
   - "POLICE_MARK"
   - "IP4BASE"
   - "NAT44"
   - "POLICE_MARK"


@@ -10222,6 +10285,7 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:

+  - "DOT1Q"

   - "IP4BASE"
   - "NAT44"
   - "POLICE_MARK"
   - "IP4BASE"
   - "NAT44"
   - "POLICE_MARK"


@@ -10260,6 +10324,7 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:

+  - "DOT1Q"

   - "IP4BASE"
   - "NAT44"
   - "POLICE_MARK"
   - "IP4BASE"
   - "NAT44"
   - "POLICE_MARK"


@@ -10287,7 +10352,7 @@
            'NDRPDR' and
            '1T1C' and
            'IP4FWD' and
            'NDRPDR' and
            '1T1C' and
            'IP4FWD' and

-           'NAT44' and
+           ('NAT44' or 'IP4BASE') and

            not 'IPSEC' and
            not 'VHOST'"
   parameters:
            not 'IPSEC' and
            not 'VHOST'"
   parameters:


@@ -10295,7 +10360,7 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:

-  - "BASE"
+  - "IP4BASE"

   - "BASE"
   - "SRC_USER_10"
   - "SRC_USER_100"
   - "BASE"
   - "SRC_USER_10"
   - "SRC_USER_100"


@@ -10321,7 +10386,7 @@
            'NDRPDR' and
            '1T1C' and
            'IP4FWD' and
            'NDRPDR' and
            '1T1C' and
            'IP4FWD' and

-           'NAT44' and
+           ('NAT44' or 'IP4BASE') and

            not 'IPSEC' and
            not 'VHOST'"
   parameters:
            not 'IPSEC' and
            not 'VHOST'"
   parameters:


@@ -10329,7 +10394,7 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:

-  - "BASE"
+  - "IP4BASE"

   - "BASE"
   - "SRC_USER_10"
   - "SRC_USER_100"
   - "BASE"
   - "SRC_USER_10"
   - "SRC_USER_100"


@@ -10355,7 +10420,7 @@
            'NDRPDR' and
            '2T2C' and
            'IP4FWD' and
            'NDRPDR' and
            '2T2C' and
            'IP4FWD' and

-           'NAT44' and
+           ('NAT44' or 'IP4BASE') and

            not 'IPSEC' and
            not 'VHOST'"
   parameters:
            not 'IPSEC' and
            not 'VHOST'"
   parameters:


@@ -10363,7 +10428,7 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:

-  - "BASE"
+  - "IP4BASE"

   - "BASE"
   - "SRC_USER_10"
   - "SRC_USER_100"
   - "BASE"
   - "SRC_USER_10"
   - "SRC_USER_100"


@@ -10389,7 +10454,7 @@
            'NDRPDR' and
            '2T2C' and
            'IP4FWD' and
            'NDRPDR' and
            '2T2C' and
            'IP4FWD' and

-           'NAT44' and
+           ('NAT44' or 'IP4BASE') and

            not 'IPSEC' and
            not 'VHOST'"
   parameters:
            not 'IPSEC' and
            not 'VHOST'"
   parameters:


@@ -10397,7 +10462,7 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:

-  - "BASE"
+  - "IP4BASE"

   - "BASE"
   - "SRC_USER_10"
   - "SRC_USER_100"
   - "BASE"
   - "SRC_USER_10"
   - "SRC_USER_100"


@@ -10424,8 +10489,7 @@
            'NDRPDR' and
            '1T1C' and
            'IP4FWD' and
            'NDRPDR' and
            '1T1C' and
            'IP4FWD' and

-           'IACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and

            not 'IPSEC' and
            not 'VHOST'"
   parameters:
            not 'IPSEC' and
            not 'VHOST'"
   parameters:


@@ -10433,6 +10497,7 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:

+  - "IP4BASE"

   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   - "ACL_STATELESS"
   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   - "ACL_STATELESS"


@@ -10457,8 +10522,7 @@
            'NDRPDR' and
            '1T1C' and
            'IP4FWD' and
            'NDRPDR' and
            '1T1C' and
            'IP4FWD' and

-           'IACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and

            not 'IPSEC' and
            not 'VHOST'"
   parameters:
            not 'IPSEC' and
            not 'VHOST'"
   parameters:


@@ -10466,6 +10530,7 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:

+  - "IP4BASE"

   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   - "ACL_STATELESS"
   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   - "ACL_STATELESS"


@@ -10490,8 +10555,7 @@
            'NDRPDR' and
            '2T2C' and
            'IP4FWD' and
            'NDRPDR' and
            '2T2C' and
            'IP4FWD' and

-           'IACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and

            not 'IPSEC' and
            not 'VHOST'"
   parameters:
            not 'IPSEC' and
            not 'VHOST'"
   parameters:


@@ -10499,6 +10563,7 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:

+  - "IP4BASE"

   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   - "ACL_STATELESS"
   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   - "ACL_STATELESS"


@@ -10523,8 +10588,7 @@
            'NDRPDR' and
            '2T2C' and
            'IP4FWD' and
            'NDRPDR' and
            '2T2C' and
            'IP4FWD' and

-           'IACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and

            not 'IPSEC' and
            not 'VHOST'"
   parameters:
            not 'IPSEC' and
            not 'VHOST'"
   parameters:


@@ -10532,6 +10596,7 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:

+  - "IP4BASE"

   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   - "ACL_STATELESS"
   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   - "ACL_STATELESS"


@@ -10692,13 +10757,13 @@
            '2T1C' and
            'IP4FWD' and
            not 'IPSEC' and
            '2T1C' and
            'IP4FWD' and
            not 'IPSEC' and

+           not 'DOT1Q' and

            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:

-  - "DOT1Q"

   - "IP4BASE"
   - "FIB_20k"
   - "FIB_200k"
   - "IP4BASE"
   - "FIB_20k"
   - "FIB_200k"


@@ -10725,13 +10790,13 @@
            '2T1C' and
            'IP4FWD' and
            not 'IPSEC' and
            '2T1C' and
            'IP4FWD' and
            not 'IPSEC' and

+           not 'DOT1Q' and

            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:

-  - "DOT1Q"

   - "IP4BASE"
   - "FIB_20k"
   - "FIB_200k"
   - "IP4BASE"
   - "FIB_20k"
   - "FIB_200k"


@@ -10758,13 +10823,13 @@
            '4T2C' and
            'IP4FWD' and
            not 'IPSEC' and
            '4T2C' and
            'IP4FWD' and
            not 'IPSEC' and

+           not 'DOT1Q' and

            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:

-  - "DOT1Q"

   - "IP4BASE"
   - "FIB_20k"
   - "FIB_200k"
   - "IP4BASE"
   - "FIB_20k"
   - "FIB_200k"


@@ -10791,13 +10856,13 @@
            '4T2C' and
            'IP4FWD' and
            not 'IPSEC' and
            '4T2C' and
            'IP4FWD' and
            not 'IPSEC' and

+           not 'DOT1Q' and

            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:

-  - "DOT1Q"

   - "IP4BASE"
   - "FIB_20k"
   - "FIB_200k"
   - "IP4BASE"
   - "FIB_20k"
   - "FIB_200k"


@@ -10825,13 +10890,13 @@
            '2T1C' and
            'IP4FWD' and
            not 'IPSEC' and
            '2T1C' and
            'IP4FWD' and
            not 'IPSEC' and

+           not 'DOT1Q' and

            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:

-  - "DOT1Q"

   - "IP4BASE"
   - "FIB_20k"
   - "FIB_200k"
   - "IP4BASE"
   - "FIB_20k"
   - "FIB_200k"


@@ -10858,13 +10923,13 @@
            '2T1C' and
            'IP4FWD' and
            not 'IPSEC' and
            '2T1C' and
            'IP4FWD' and
            not 'IPSEC' and

+           not 'DOT1Q' and

            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:

-  - "DOT1Q"

   - "IP4BASE"
   - "FIB_20k"
   - "FIB_200k"
   - "IP4BASE"
   - "FIB_20k"
   - "FIB_200k"


@@ -10891,13 +10956,13 @@
            '4T2C' and
            'IP4FWD' and
            not 'IPSEC' and
            '4T2C' and
            'IP4FWD' and
            not 'IPSEC' and

+           not 'DOT1Q' and

            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:

-  - "DOT1Q"

   - "IP4BASE"
   - "FIB_20k"
   - "FIB_200k"
   - "IP4BASE"
   - "FIB_20k"
   - "FIB_200k"


@@ -10924,13 +10989,13 @@
            '4T2C' and
            'IP4FWD' and
            not 'IPSEC' and
            '4T2C' and
            'IP4FWD' and
            not 'IPSEC' and

+           not 'DOT1Q' and

            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:

-  - "DOT1Q"

   - "IP4BASE"
   - "FIB_20k"
   - "FIB_200k"
   - "IP4BASE"
   - "FIB_20k"
   - "FIB_200k"


@@ -11208,7 +11273,7 @@
            'ENCAP' and
            'NDRPDR' and
            '1T1C' and
            'ENCAP' and
            'NDRPDR' and
            '1T1C' and

-           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') and
+           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and

            not 'DOT1Q' and
            not 'VHOST' and
            not 'IPSECHW'"
            not 'DOT1Q' and
            not 'VHOST' and
            not 'IPSECHW'"


@@ -11217,6 +11282,7 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:

+  - "IP4BASE"

   - "L2BDMACLRN"
   - "L2XCFWD"
   - "LISP"
   - "L2BDMACLRN"
   - "L2XCFWD"
   - "LISP"


@@ -11240,7 +11306,7 @@
            'ENCAP' and
            'NDRPDR' and
            '2T2C' and
            'ENCAP' and
            'NDRPDR' and
            '2T2C' and

-           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') and
+           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and

            not 'DOT1Q' and
            not 'VHOST' and
            not 'IPSECHW'"
            not 'DOT1Q' and
            not 'VHOST' and
            not 'IPSECHW'"


@@ -11249,6 +11315,7 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:

+  - "IP4BASE"

   - "L2BDMACLRN"
   - "L2XCFWD"
   - "LISP"
   - "L2BDMACLRN"
   - "L2XCFWD"
   - "LISP"


@@ -11272,7 +11339,7 @@
            'ENCAP' and
            'NDRPDR' and
            '1T1C' and
            'ENCAP' and
            'NDRPDR' and
            '1T1C' and

-           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') and
+           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and

            not 'DOT1Q' and
            not 'VHOST' and
            not 'IPSECHW'"
            not 'DOT1Q' and
            not 'VHOST' and
            not 'IPSECHW'"


@@ -11281,6 +11348,7 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:

+  - "IP4BASE"

   - "L2BDMACLRN"
   - "L2XCFWD"
   - "LISP"
   - "L2BDMACLRN"
   - "L2XCFWD"
   - "LISP"


@@ -11304,7 +11372,7 @@
            'ENCAP' and
            'NDRPDR' and
            '2T2C' and
            'ENCAP' and
            'NDRPDR' and
            '2T2C' and

-           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') and
+           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and

            not 'DOT1Q' and
            not 'VHOST' and
            not 'IPSECHW'"
            not 'DOT1Q' and
            not 'VHOST' and
            not 'IPSECHW'"


@@ -11313,6 +11381,7 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:

+  - "IP4BASE"

   - "L2BDMACLRN"
   - "L2XCFWD"
   - "LISP"
   - "L2BDMACLRN"
   - "L2XCFWD"
   - "LISP"


@@ -11337,7 +11406,7 @@
            'ENCAP' and
            'NDRPDR' and
            '1T1C' and
            'ENCAP' and
            'NDRPDR' and
            '1T1C' and

-           ('VXLAN' or 'LISP') and
+           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and

            not 'VHOST' and
            not 'IPSECHW'"
   parameters:
            not 'VHOST' and
            not 'IPSECHW'"
   parameters:


@@ -11345,6 +11414,7 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:

+  - "IP4BASE"

   - "LISP"
   - "VXLAN_1"
   - "VXLAN_10"
   - "LISP"
   - "VXLAN_1"
   - "VXLAN_10"


@@ -11370,7 +11440,7 @@
            'ENCAP' and
            'NDRPDR' and
            '1T1C' and
            'ENCAP' and
            'NDRPDR' and
            '1T1C' and

-           ('VXLAN' or 'LISP') and
+           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and

            not 'VHOST' and
            not 'IPSECHW'"
   parameters:
            not 'VHOST' and
            not 'IPSECHW'"
   parameters:


@@ -11378,6 +11448,7 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:

+  - "IP4BASE"

   - "LISP"
   - "VXLAN_1"
   - "VXLAN_10"
   - "LISP"
   - "VXLAN_1"
   - "VXLAN_10"


@@ -11403,7 +11474,7 @@
            'ENCAP' and
            'NDRPDR' and
            '2T2C' and
            'ENCAP' and
            'NDRPDR' and
            '2T2C' and

-           ('VXLAN' or 'LISP') and
+           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and

            not 'VHOST' and
            not 'IPSECHW'"
   parameters:
            not 'VHOST' and
            not 'IPSECHW'"
   parameters:


@@ -11411,6 +11482,7 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:

+  - "IP4BASE"

   - "LISP"
   - "VXLAN_1"
   - "VXLAN_10"
   - "LISP"
   - "VXLAN_1"
   - "VXLAN_10"


@@ -11436,7 +11508,7 @@
            'ENCAP' and
            'NDRPDR' and
            '2T2C' and
            'ENCAP' and
            'NDRPDR' and
            '2T2C' and

-           ('VXLAN' or 'LISP') and
+           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and

            not 'VHOST' and
            not 'IPSECHW'"
   parameters:
            not 'VHOST' and
            not 'IPSECHW'"
   parameters:


@@ -11444,6 +11516,7 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:

+  - "IP4BASE"

   - "LISP"
   - "VXLAN_1"
   - "VXLAN_10"
   - "LISP"
   - "VXLAN_1"
   - "VXLAN_10"


@@ -11470,7 +11543,7 @@
            'ENCAP' and
            'NDRPDR' and
            '1T1C' and
            'ENCAP' and
            'NDRPDR' and
            '1T1C' and

-           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') and
+           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP' or 'IP4BASE') and

            not 'DOT1Q' and
            not 'VHOST' and
            not 'IPSECHW'"
            not 'DOT1Q' and
            not 'VHOST' and
            not 'IPSECHW'"


@@ -11479,6 +11552,7 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:

+  - "IP4BASE"

   - "L2BDMACLRN"
   - "L2XCFWD"
   - "LISP"
   - "L2BDMACLRN"
   - "L2XCFWD"
   - "LISP"


@@ -11502,7 +11576,7 @@
            'ENCAP' and
            'NDRPDR' and
            '2T2C' and
            'ENCAP' and
            'NDRPDR' and
            '2T2C' and

-           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') and
+           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and

            not 'DOT1Q' and
            not 'VHOST' and
            not 'IPSECHW'"
            not 'DOT1Q' and
            not 'VHOST' and
            not 'IPSECHW'"


@@ -11511,6 +11585,7 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:

+  - "IP4BASE"

   - "L2BDMACLRN"
   - "L2XCFWD"
   - "LISP"
   - "L2BDMACLRN"
   - "L2XCFWD"
   - "LISP"


@@ -11534,7 +11609,7 @@
            'ENCAP' and
            'NDRPDR' and
            '1T1C' and
            'ENCAP' and
            'NDRPDR' and
            '1T1C' and

-           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') and
+           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and

            not 'DOT1Q' and
            not 'VHOST' and
            not 'IPSECHW'"
            not 'DOT1Q' and
            not 'VHOST' and
            not 'IPSECHW'"


@@ -11543,6 +11618,7 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:

+  - "IP4BASE"

   - "L2BDMACLRN"
   - "L2XCFWD"
   - "LISP"
   - "L2BDMACLRN"
   - "L2XCFWD"
   - "LISP"


@@ -11566,7 +11642,7 @@
            'ENCAP' and
            'NDRPDR' and
            '2T2C' and
            'ENCAP' and
            'NDRPDR' and
            '2T2C' and

-           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') and
+           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and

            not 'DOT1Q' and
            not 'VHOST' and
            not 'IPSECHW'"
            not 'DOT1Q' and
            not 'VHOST' and
            not 'IPSECHW'"


@@ -11575,6 +11651,7 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:

+  - "IP4BASE"

   - "L2BDMACLRN"
   - "L2XCFWD"
   - "LISP"
   - "L2BDMACLRN"
   - "L2XCFWD"
   - "LISP"


@@ -11599,7 +11676,7 @@
            'ENCAP' and
            'NDRPDR' and
            '2T1C' and
            'ENCAP' and
            'NDRPDR' and
            '2T1C' and

-           ('VXLAN' or 'LISP') and
+           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and

            not 'VHOST' and
            not 'IPSECHW'"
   parameters:
            not 'VHOST' and
            not 'IPSECHW'"
   parameters:


@@ -11607,6 +11684,7 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:

+  - "IP4BASE"

   - "LISP"
   - "VXLAN_1"
   - "VXLAN_10"
   - "LISP"
   - "VXLAN_1"
   - "VXLAN_10"


@@ -11632,7 +11710,7 @@
            'ENCAP' and
            'NDRPDR' and
            '2T1C' and
            'ENCAP' and
            'NDRPDR' and
            '2T1C' and

-           ('VXLAN' or 'LISP') and
+           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and

            not 'VHOST' and
            not 'IPSECHW'"
   parameters:
            not 'VHOST' and
            not 'IPSECHW'"
   parameters:


@@ -11640,6 +11718,7 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:

+  - "IP4BASE"

   - "LISP"
   - "VXLAN_1"
   - "VXLAN_10"
   - "LISP"
   - "VXLAN_1"
   - "VXLAN_10"


@@ -11665,7 +11744,7 @@
            'ENCAP' and
            'NDRPDR' and
            '4T2C' and
            'ENCAP' and
            'NDRPDR' and
            '4T2C' and

-           ('VXLAN' or 'LISP') and
+           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and

            not 'VHOST' and
            not 'IPSECHW'"
   parameters:
            not 'VHOST' and
            not 'IPSECHW'"
   parameters:


@@ -11673,6 +11752,7 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:

+  - "IP4BASE"

   - "LISP"
   - "VXLAN_1"
   - "VXLAN_10"
   - "LISP"
   - "VXLAN_1"
   - "VXLAN_10"


@@ -11698,7 +11778,7 @@
            'ENCAP' and
            'NDRPDR' and
            '4T2C' and
            'ENCAP' and
            'NDRPDR' and
            '4T2C' and

-           ('VXLAN' or 'LISP') and
+           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and

            not 'VHOST' and
            not 'IPSECHW'"
   parameters:
            not 'VHOST' and
            not 'IPSECHW'"
   parameters:


@@ -11706,6 +11786,7 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:

+  - "IP4BASE"

   - "LISP"
   - "VXLAN_1"
   - "VXLAN_10"
   - "LISP"
   - "VXLAN_1"
   - "VXLAN_10"


@@ -11732,7 +11813,7 @@
            'ENCAP' and
            'NDRPDR' and
            '2T1C' and
            'ENCAP' and
            'NDRPDR' and
            '2T1C' and

-           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') and
+           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and

            not 'DOT1Q' and
            not 'VHOST' and
            not 'IPSECHW'"
            not 'DOT1Q' and
            not 'VHOST' and
            not 'IPSECHW'"


@@ -11741,6 +11822,7 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:

+  - "IP4BASE"

   - "L2BDMACLRN"
   - "L2XCFWD"
   - "LISP"
   - "L2BDMACLRN"
   - "L2XCFWD"
   - "LISP"


@@ -11764,7 +11846,7 @@
            'ENCAP' and
            'NDRPDR' and
            '4T2C' and
            'ENCAP' and
            'NDRPDR' and
            '4T2C' and

-           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') and
+           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and

            not 'DOT1Q' and
            not 'VHOST' and
            not 'IPSECHW'"
            not 'DOT1Q' and
            not 'VHOST' and
            not 'IPSECHW'"


@@ -11773,6 +11855,7 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:

+  - "IP4BASE"

   - "L2BDMACLRN"
   - "L2XCFWD"
   - "LISP"
   - "L2BDMACLRN"
   - "L2XCFWD"
   - "LISP"


@@ -11796,7 +11879,7 @@
            'ENCAP' and
            'NDRPDR' and
            '2T1C' and
            'ENCAP' and
            'NDRPDR' and
            '2T1C' and

-           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') and
+           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and

            not 'DOT1Q' and
            not 'VHOST' and
            not 'IPSECHW'"
            not 'DOT1Q' and
            not 'VHOST' and
            not 'IPSECHW'"


@@ -11805,6 +11888,7 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:

+  - "IP4BASE"

   - "L2BDMACLRN"
   - "L2XCFWD"
   - "LISP"
   - "L2BDMACLRN"
   - "L2XCFWD"
   - "LISP"


@@ -11828,7 +11912,7 @@
            'ENCAP' and
            'NDRPDR' and
            '4T2C' and
            'ENCAP' and
            'NDRPDR' and
            '4T2C' and

-           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') and
+           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and

            not 'DOT1Q' and
            not 'VHOST' and
            not 'IPSECHW'"
            not 'DOT1Q' and
            not 'VHOST' and
            not 'IPSECHW'"


@@ -11837,6 +11921,7 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:

+  - "IP4BASE"

   - "L2BDMACLRN"
   - "L2XCFWD"
   - "LISP"
   - "L2BDMACLRN"
   - "L2XCFWD"
   - "LISP"


@@ -11983,20 +12068,162 @@
     title: "ip6-3n-hsw-x520-78b-2t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
     title: "ip6-3n-hsw-x520-78b-2t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 

-# Packet Throughput - VPP IPv6 3n-hsw-x520 - features
+## Packet Throughput - VPP IPv6 3n-hsw-x520 - features
+#-
+#  type: "plot"
+#  title: "VPP Throughput: ip6-3n-hsw-x520-78b-1t1c-base_and_features-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-1t1c-base_and_features-ndr"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-X520-DA2' and
+#           '78B' and
+#           ('IP6BASE' or
+#            'POLICE_MARK' or
+#            'COPWHLIST' or
+#            'IACLDST') and
+#           'NDRPDR' and
+#           '1T1C' and
+#           'IP6FWD' and
+#           not 'SRv6' and
+#           not 'IPSEC' and
+#           not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "IP6BASE"
+#  - "POLICE_MARK"
+#  - "COPWHLIST"
+#  - "IACLDST"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "ip6-3n-hsw-x520-78b-1t1c-base_and_features-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: ip6-3n-hsw-x520-78b-2t2c-base_and_features-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-2t2c-base_and_features-ndr"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-X520-DA2' and
+#           '78B' and
+#           ('IP6BASE' or
+#            'POLICE_MARK' or
+#            'COPWHLIST' or
+#            'IACLDST') and
+#           'NDRPDR' and
+#           '2T2C' and
+#           'IP6FWD' and
+#           not 'SRv6' and
+#           not 'IPSEC' and
+#           not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "IP6BASE"
+#  - "POLICE_MARK"
+#  - "COPWHLIST"
+#  - "IACLDST"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "ip6-3n-hsw-x520-78b-2t2c-base_and_features-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: ip6-3n-hsw-x520-78b-1t1c-base_and_features-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-1t1c-base_and_features-pdr"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-X520-DA2' and
+#           '78B' and
+#           ('IP6BASE' or
+#            'POLICE_MARK' or
+#            'COPWHLIST' or
+#            'IACLDST') and
+#           'NDRPDR' and
+#           '1T1C' and
+#           'IP6FWD' and
+#           not 'SRv6' and
+#           not 'IPSEC' and
+#           not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "IP6BASE"
+#  - "POLICE_MARK"
+#  - "COPWHLIST"
+#  - "IACLDST"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "ip6-3n-hsw-x520-78b-1t1c-base_and_features-pdr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: ip6-3n-hsw-x520-78b-2t2c-base_and_features-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-2t2c-base_and_features-pdr"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-X520-DA2' and
+#           '78B' and
+#           ('IP6BASE' or
+#            'POLICE_MARK' or
+#            'COPWHLIST' or
+#            'IACLDST') and
+#           'NDRPDR' and
+#           '2T2C' and
+#           'IP6FWD' and
+#           not 'SRv6' and
+#           not 'IPSEC' and
+#           not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "IP6BASE"
+#  - "POLICE_MARK"
+#  - "COPWHLIST"
+#  - "IACLDST"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "ip6-3n-hsw-x520-78b-2t2c-base_and_features-pdr"
+#    layout: "plot-throughput"
+
+# Packet Throughput - VPP IPv6 3n-hsw-x710

 -
   type: "plot"
 -
   type: "plot"

-  title: "VPP Throughput: ip6-3n-hsw-x520-78b-1t1c-base_and_features-ndr"
+  title: "VPP Throughput: ip6-3n-hsw-x710-78b-1t1c-base_and_scale-ndr"

   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"

-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-1t1c-base_and_features-ndr"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-1t1c-base_and_scale-ndr"

   data: "plot-vpp-throughput-latency-3n-hsw"
   data: "plot-vpp-throughput-latency-3n-hsw"

-  filter: "'NIC_Intel-X520-DA2' and
+  filter: "'NIC_Intel-X710' and

            '78B' and
            '78B' and

-           ('IP6BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            'IACLDST') and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and

            'NDRPDR' and
            '1T1C' and
            'IP6FWD' and
            'NDRPDR' and
            '1T1C' and
            'IP6FWD' and


@@ -12009,32 +12236,29 @@
   - "tags"
   sort:
   - "IP6BASE"
   - "tags"
   sort:
   - "IP6BASE"

-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACLDST"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"

   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:

-    title: "ip6-3n-hsw-x520-78b-1t1c-base_and_features-ndr"
+    title: "ip6-3n-hsw-x710-78b-1t1c-base_and_scale-ndr"

     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"

-  title: "VPP Throughput: ip6-3n-hsw-x520-78b-2t2c-base_and_features-ndr"
+  title: "VPP Throughput: ip6-3n-hsw-x710-78b-1t1c-base_and_scale-pdr"

   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"

-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-2t2c-base_and_features-ndr"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-1t1c-base_and_scale-pdr"

   data: "plot-vpp-throughput-latency-3n-hsw"
   data: "plot-vpp-throughput-latency-3n-hsw"

-  filter: "'NIC_Intel-X520-DA2' and
+  filter: "'NIC_Intel-X710' and

            '78B' and
            '78B' and

-           ('IP6BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            'IACLDST') and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and

            'NDRPDR' and
            'NDRPDR' and

-           '2T2C' and
+           '1T1C' and

            'IP6FWD' and
            not 'SRv6' and
            not 'IPSEC' and
            'IP6FWD' and
            not 'SRv6' and
            not 'IPSEC' and


@@ -12045,32 +12269,29 @@
   - "tags"
   sort:
   - "IP6BASE"
   - "tags"
   sort:
   - "IP6BASE"

-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACLDST"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"

   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:

-    title: "ip6-3n-hsw-x520-78b-2t2c-base_and_features-ndr"
+    title: "ip6-3n-hsw-x710-78b-1t1c-base_and_scale-pdr"

     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"

-  title: "VPP Throughput: ip6-3n-hsw-x520-78b-1t1c-base_and_features-pdr"
+  title: "VPP Throughput: ip6-3n-hsw-x710-78b-2t2c-base_and_scale-ndr"

   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"

-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-1t1c-base_and_features-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-2t2c-base_and_scale-ndr"

   data: "plot-vpp-throughput-latency-3n-hsw"
   data: "plot-vpp-throughput-latency-3n-hsw"

-  filter: "'NIC_Intel-X520-DA2' and
+  filter: "'NIC_Intel-X710' and

            '78B' and
            '78B' and

-           ('IP6BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            'IACLDST') and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and

            'NDRPDR' and
            'NDRPDR' and

-           '1T1C' and
+           '2T2C' and

            'IP6FWD' and
            not 'SRv6' and
            not 'IPSEC' and
            'IP6FWD' and
            not 'SRv6' and
            not 'IPSEC' and


@@ -12081,30 +12302,27 @@
   - "tags"
   sort:
   - "IP6BASE"
   - "tags"
   sort:
   - "IP6BASE"

-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACLDST"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"

   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:

-    title: "ip6-3n-hsw-x520-78b-1t1c-base_and_features-pdr"
+    title: "ip6-3n-hsw-x710-78b-2t2c-base_and_scale-ndr"

     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"

-  title: "VPP Throughput: ip6-3n-hsw-x520-78b-2t2c-base_and_features-pdr"
+  title: "VPP Throughput: ip6-3n-hsw-x710-78b-2t2c-base_and_scale-pdr"

   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"

-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-2t2c-base_and_features-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-2t2c-base_and_scale-pdr"

   data: "plot-vpp-throughput-latency-3n-hsw"
   data: "plot-vpp-throughput-latency-3n-hsw"

-  filter: "'NIC_Intel-X520-DA2' and
+  filter: "'NIC_Intel-X710' and

            '78B' and
            '78B' and

-           ('IP6BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            'IACLDST') and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and

            'NDRPDR' and
            '2T2C' and
            'IP6FWD' and
            'NDRPDR' and
            '2T2C' and
            'IP6FWD' and


@@ -12117,28 +12335,31 @@
   - "tags"
   sort:
   - "IP6BASE"
   - "tags"
   sort:
   - "IP6BASE"

-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACLDST"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"

   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:

-    title: "ip6-3n-hsw-x520-78b-2t2c-base_and_features-pdr"
+    title: "ip6-3n-hsw-x710-78b-2t2c-base_and_scale-pdr"

     layout: "plot-throughput"
 
     layout: "plot-throughput"
 

-# Packet Throughput - VPP IPv6 3n-hsw-x710
+# Packet Throughput - VPP IPv6 3n-hsw-x710 - features

 -
   type: "plot"
 -
   type: "plot"

-  title: "VPP Throughput: ip6-3n-hsw-x710-78b-1t1c-base_and_scale-ndr"
+  title: "VPP Throughput: ip6-3n-hsw-x710-78b-1t1c-base_and_features-ndr"

   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"

-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-1t1c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-1t1c-base_and_features-ndr"

   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '78B' and
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '78B' and

-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           ('IP6BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            'IACLDST') and

            'NDRPDR' and
            '1T1C' and
            'IP6FWD' and
            'NDRPDR' and
            '1T1C' and
            'IP6FWD' and


@@ -12151,168 +12372,32 @@
   - "tags"
   sort:
   - "IP6BASE"
   - "tags"
   sort:
   - "IP6BASE"

-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACLDST"

   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:

-    title: "ip6-3n-hsw-x710-78b-1t1c-base_and_scale-ndr"
+    title: "ip6-3n-hsw-x710-78b-1t1c-base_and_features-ndr"

     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"

-  title: "VPP Throughput: ip6-3n-hsw-x710-78b-1t1c-base_and_scale-pdr"
+  title: "VPP Throughput: ip6-3n-hsw-x710-78b-2t2c-base_and_features-ndr"

   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"

-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-1t1c-base_and_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-2t2c-base_and_features-ndr"

   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '78B' and
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '78B' and

-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           ('IP6BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            'IACLDST') and

            'NDRPDR' and
            'NDRPDR' and

-           '1T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6-3n-hsw-x710-78b-1t1c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-x710-78b-2t2c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-2t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '2T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6-3n-hsw-x710-78b-2t2c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-x710-78b-2t2c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-2t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '2T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6-3n-hsw-x710-78b-2t2c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP IPv6 3n-hsw-x710 - features
--
-  type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-x710-78b-1t1c-base_and_features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-1t1c-base_and_features-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            'IACLDST') and
-           'NDRPDR' and
-           '1T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACLDST"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6-3n-hsw-x710-78b-1t1c-base_and_features-ndr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-x710-78b-2t2c-base_and_features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-2t2c-base_and_features-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            'IACLDST') and
-           'NDRPDR' and
-           '2T2C' and
+           '2T2C' and

            'IP6FWD' and
            not 'SRv6' and
            not 'IPSEC' and
            'IP6FWD' and
            not 'SRv6' and
            not 'IPSEC' and


@@ -13898,20 +13983,162 @@
     title: "vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
     title: "vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 

-# Packet Throughput - VPP vhost l2sw 3n-hsw-x520
+## Packet Throughput - VPP vhost l2sw 3n-hsw-x520
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-X520-DA2' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           '1T1C' and
+#           'L2BDMACLRN' and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "VM"  # "not CFS_OPT"
+##  - "CFS_OPT"
+##  - "FIB_10K"
+##  - "FIB_100K"
+##  - "FIB_1M"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-X520-DA2' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           '2T2C' and
+#           'L2BDMACLRN' and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "VM"  # "not CFS_OPT"
+##  - "CFS_OPT"
+##  - "FIB_10K"
+##  - "FIB_100K"
+##  - "FIB_1M"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-X520-DA2' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           '1T1C' and
+#           'L2BDMACLRN' and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "VM"  # "not CFS_OPT"
+##  - "CFS_OPT"
+##  - "FIB_10K"
+##  - "FIB_100K"
+##  - "FIB_1M"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-X520-DA2' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           '2T2C' and
+#           'L2BDMACLRN' and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "VM"  # "not CFS_OPT"
+##  - "CFS_OPT"
+##  - "FIB_10K"
+##  - "FIB_100K"
+##  - "FIB_1M"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
+#    layout: "plot-throughput"
+
+# Packet Throughput - VPP vhost l2sw 3n-hsw-x520 - base

 -
   type: "plot"
 -
   type: "plot"

-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
+  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-1t1c-base-ndr"

   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"

-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base-ndr"

   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
            ('ETH' or 'DOT1Q') and
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
            ('ETH' or 'DOT1Q') and

+           'BASE' and

            '1T1C' and
            '1T1C' and

-           'L2BDMACLRN' and
+           ('L2BDMACLRN' or 'L2XCFWD') and

            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and


@@ -13920,33 +14147,35 @@
   - "throughput"
   - "parent"
   - "tags"
   - "throughput"
   - "parent"
   - "tags"

-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
+  sort:
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"

   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:

-    title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
+    title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base-ndr"

     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"

-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
+  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-1t1c-base-pdr"

   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"

-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base-pdr"

   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
            ('ETH' or 'DOT1Q') and
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
            ('ETH' or 'DOT1Q') and

-           '2T2C' and
-           'L2BDMACLRN' and
+           'BASE' and
+           '1T1C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and

            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and


@@ -13955,153 +14184,13 @@
   - "throughput"
   - "parent"
   - "tags"
   - "throughput"
   - "parent"
   - "tags"

-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '1T1C' and
-           'L2BDMACLRN' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '2T2C' and
-           'L2BDMACLRN' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP vhost l2sw 3n-hsw-x520 - base
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-1t1c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           'BASE' and
-           '1T1C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base-ndr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-1t1c-base-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           'BASE' and
-           '1T1C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
+  sort:
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"

   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"


@@ -14132,11 +14221,13 @@
   - "throughput"
   - "parent"
   - "tags"
   - "throughput"
   - "parent"
   - "tags"

-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
+  sort:
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"

   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"


@@ -14167,11 +14258,13 @@
   - "throughput"
   - "parent"
   - "tags"
   - "throughput"
   - "parent"
   - "tags"

-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
+  sort:
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"

   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"


@@ -14196,6 +14289,7 @@
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'CFS_OPT' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'CFS_OPT' and

+           not 'DOT1Q' and

            not 'VXLAN' and
            not 'IP4FWD' and
            not 'LBOND'"
            not 'VXLAN' and
            not 'IP4FWD' and
            not 'LBOND'"


@@ -14231,6 +14325,7 @@
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'CFS_OPT' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'CFS_OPT' and

+           not 'DOT1Q' and

            not 'VXLAN' and
            not 'IP4FWD' and
            not 'LBOND'"
            not 'VXLAN' and
            not 'IP4FWD' and
            not 'LBOND'"


@@ -14266,6 +14361,7 @@
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'CFS_OPT' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'CFS_OPT' and

+           not 'DOT1Q' and

            not 'VXLAN' and
            not 'IP4FWD' and
            not 'LBOND'"
            not 'VXLAN' and
            not 'IP4FWD' and
            not 'LBOND'"


@@ -14301,6 +14397,7 @@
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'CFS_OPT' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'CFS_OPT' and

+           not 'DOT1Q' and

            not 'VXLAN' and
            not 'IP4FWD' and
            not 'LBOND'"
            not 'VXLAN' and
            not 'IP4FWD' and
            not 'LBOND'"


@@ -14337,13 +14434,13 @@
            '1T1C' and
            'VHOST_1024' and
            not 'VXLAN' and
            '1T1C' and
            'VHOST_1024' and
            not 'VXLAN' and

+           not 'CFS_OPT' and

            not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
            not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:

-  - "not CFS_OPT"

   - "1VM"
   - "2VM"
   traces:
   - "1VM"
   - "2VM"
   traces:


@@ -14369,13 +14466,13 @@
            '2T2C' and
            'VHOST_1024' and
            not 'VXLAN' and
            '2T2C' and
            'VHOST_1024' and
            not 'VXLAN' and

+           not 'CFS_OPT' and

            not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
            not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:

-  - "not CFS_OPT"

   - "1VM"
   - "2VM"
   traces:
   - "1VM"
   - "2VM"
   traces:


@@ -14401,13 +14498,13 @@
            '1T1C' and
            'VHOST_1024' and
            not 'VXLAN' and
            '1T1C' and
            'VHOST_1024' and
            not 'VXLAN' and

+           not 'CFS_OPT' and

            not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
            not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:

-  - "not CFS_OPT"

   - "1VM"
   - "2VM"
   traces:
   - "1VM"
   - "2VM"
   traces:


@@ -14433,13 +14530,13 @@
            '2T2C' and
            'VHOST_1024' and
            not 'VXLAN' and
            '2T2C' and
            'VHOST_1024' and
            not 'VXLAN' and

+           not 'CFS_OPT' and

            not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
            not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:

-  - "not CFS_OPT"

   - "1VM"
   - "2VM"
   traces:
   - "1VM"
   - "2VM"
   traces:


@@ -14450,151 +14547,151 @@
     title: "vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
     title: "vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 

-# Packet Throughput - VPP vhost l2sw 3n-hsw-x710
+## Packet Throughput - VPP vhost l2sw 3n-hsw-x710
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           '1T1C' and
+#           'L2BDMACLRN' and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "VM"  # "not CFS_OPT"
+##  - "CFS_OPT"
+##  - "FIB_10K"
+##  - "FIB_100K"
+##  - "FIB_1M"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           '2T2C' and
+#           'L2BDMACLRN' and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "VM"  # "not CFS_OPT"
+##  - "CFS_OPT"
+##  - "FIB_10K"
+##  - "FIB_100K"
+##  - "FIB_1M"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           '1T1C' and
+#           'L2BDMACLRN' and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "VM"  # "not CFS_OPT"
+##  - "CFS_OPT"
+##  - "FIB_10K"
+##  - "FIB_100K"
+##  - "FIB_1M"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           '2T2C' and
+#           'L2BDMACLRN' and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "VM"  # "not CFS_OPT"
+##  - "CFS_OPT"
+##  - "FIB_10K"
+##  - "FIB_100K"
+##  - "FIB_1M"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
+#    layout: "plot-throughput"
+
+# Packet Throughput - VPP vhost l2sw 3n-hsw-x710 - base

 -
   type: "plot"
 -
   type: "plot"

-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '1T1C' and
-           'L2BDMACLRN' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '2T2C' and
-           'L2BDMACLRN' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '1T1C' and
-           'L2BDMACLRN' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '2T2C' and
-           'L2BDMACLRN' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP vhost l2sw 3n-hsw-x710 - base
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-1t1c-base-ndr"
+  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-1t1c-base-ndr"

   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base-ndr"


@@ -14614,11 +14711,13 @@
   - "throughput"
   - "parent"
   - "tags"
   - "throughput"
   - "parent"
   - "tags"

-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
+  sort:
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"

   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"


@@ -14649,11 +14748,13 @@
   - "throughput"
   - "parent"
   - "tags"
   - "throughput"
   - "parent"
   - "tags"

-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
+  sort:
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"

   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"


@@ -14684,11 +14785,13 @@
   - "throughput"
   - "parent"
   - "tags"
   - "throughput"
   - "parent"
   - "tags"

-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
+  sort:
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"

   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"


@@ -14719,11 +14822,13 @@
   - "throughput"
   - "parent"
   - "tags"
   - "throughput"
   - "parent"
   - "tags"

-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
+  sort:
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"

   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"


@@ -14755,11 +14860,13 @@
   - "throughput"
   - "parent"
   - "tags"
   - "throughput"
   - "parent"
   - "tags"

-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
+  sort:
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"

   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"


@@ -14790,11 +14897,13 @@
   - "throughput"
   - "parent"
   - "tags"
   - "throughput"
   - "parent"
   - "tags"

-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
+  sort:
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"

   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"


@@ -14825,11 +14934,13 @@
   - "throughput"
   - "parent"
   - "tags"
   - "throughput"
   - "parent"
   - "tags"

-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
+  sort:
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"

   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"


@@ -14860,11 +14971,13 @@
   - "throughput"
   - "parent"
   - "tags"
   - "throughput"
   - "parent"
   - "tags"

-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
+  sort:
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"

   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"


@@ -14873,553 +14986,553 @@
     title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base-vm-pdr"
     layout: "plot-throughput"
 
     title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base-vm-pdr"
     layout: "plot-throughput"
 

-# Packet Throughput - VPP vhost ip4 3n-hsw-xl710
--
-  type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           '1T1C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'DOT1Q'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "1VM"
-  - "2VM"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           '2T2C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'DOT1Q'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "1VM"
-  - "2VM"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           '1T1C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'DOT1Q'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "1VM"
-  - "2VM"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           '2T2C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'DOT1Q'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "1VM"
-  - "2VM"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP vhost l2sw 3n-hsw-xl710
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '1T1C' and
-           'L2BDMACLRN' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '2T2C' and
-           'L2BDMACLRN' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '1T1C' and
-           'L2BDMACLRN' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '2T2C' and
-           'L2BDMACLRN' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP vhost l2sw 3n-hsw-xl710 - base
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           'BASE' and
-           '1T1C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-ndr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           'BASE' and
-           '1T1C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-pdr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           'BASE' and
-           '2T2C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-ndr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           'BASE' and
-           '2T2C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
+## Packet Throughput - VPP vhost ip4 3n-hsw-xl710
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-XL710' and
+#           '64B' and
+#           'NDRPDR' and
+#           'ETH' and
+#           'IP4FWD' and
+#           '1T1C' and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'DOT1Q'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"

 #  sort:
 #  - "not CFS_OPT"
 #  sort:
 #  - "not CFS_OPT"

-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP vhost l2sw 3n-hsw-xl710 - base vm
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-vm-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-vm-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '1T1C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'CFS_OPT' and
-           not 'VXLAN' and
-           not 'IP4FWD'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-vm-ndr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-vm-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-vm-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '1T1C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'CFS_OPT' and
-           not 'VXLAN' and
-           not 'IP4FWD'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"

 #  - "1VM"
 #  - "1VM"

-#  - "L2BDMACLRN"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-vm-pdr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-vm-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-vm-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '2T2C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'CFS_OPT' and
-           not 'VXLAN' and
-           not 'IP4FWD'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
+#  - "2VM"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-XL710' and
+#           '64B' and
+#           'NDRPDR' and
+#           'ETH' and
+#           'IP4FWD' and
+#           '2T2C' and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'DOT1Q'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"

 #  sort:
 #  sort:

+#  - "not CFS_OPT"

 #  - "1VM"
 #  - "1VM"

-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-vm-ndr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-vm-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-vm-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '2T2C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'CFS_OPT' and
-           not 'VXLAN' and
-           not 'IP4FWD'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
+#  - "2VM"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-XL710' and
+#           '64B' and
+#           'NDRPDR' and
+#           'ETH' and
+#           'IP4FWD' and
+#           '1T1C' and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'DOT1Q'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"

 #  sort:
 #  sort:

+#  - "not CFS_OPT"

 #  - "1VM"
 #  - "1VM"

-#  - "L2XCFWD"
+#  - "2VM"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-XL710' and
+#           '64B' and
+#           'NDRPDR' and
+#           'ETH' and
+#           'IP4FWD' and
+#           '2T2C' and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'DOT1Q'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "not CFS_OPT"

 #  - "1VM"
 #  - "1VM"

-#  - "L2BDMACLRN"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-vm-pdr"
-    layout: "plot-throughput"
+#  - "2VM"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
+#    layout: "plot-throughput"
+#
+## Packet Throughput - VPP vhost l2sw 3n-hsw-xl710
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-XL710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           '1T1C' and
+#           'L2BDMACLRN' and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "VM"  # "not CFS_OPT"
+##  - "CFS_OPT"
+##  - "FIB_10K"
+##  - "FIB_100K"
+##  - "FIB_1M"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-XL710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           '2T2C' and
+#           'L2BDMACLRN' and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "VM"  # "not CFS_OPT"
+##  - "CFS_OPT"
+##  - "FIB_10K"
+##  - "FIB_100K"
+##  - "FIB_1M"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-XL710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           '1T1C' and
+#           'L2BDMACLRN' and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "VM"  # "not CFS_OPT"
+##  - "CFS_OPT"
+##  - "FIB_10K"
+##  - "FIB_100K"
+##  - "FIB_1M"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-XL710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           '2T2C' and
+#           'L2BDMACLRN' and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "VM"  # "not CFS_OPT"
+##  - "CFS_OPT"
+##  - "FIB_10K"
+##  - "FIB_100K"
+##  - "FIB_1M"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
+#    layout: "plot-throughput"
+
+## Packet Throughput - VPP vhost l2sw 3n-hsw-xl710 - base
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-ndr"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-XL710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           'BASE' and
+#           '1T1C' and
+#           ('L2BDMACLRN' or 'L2XCFWD') and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "not CFS_OPT"
+##  - "L2XCFWD"
+##  - "not CFS_OPT"
+##  - "CFS_OPT"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-pdr"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-XL710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           'BASE' and
+#           '1T1C' and
+#           ('L2BDMACLRN' or 'L2XCFWD') and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "not CFS_OPT"
+##  - "L2XCFWD"
+##  - "not CFS_OPT"
+##  - "CFS_OPT"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-pdr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-ndr"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-XL710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           'BASE' and
+#           '2T2C' and
+#           ('L2BDMACLRN' or 'L2XCFWD') and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "not CFS_OPT"
+##  - "L2XCFWD"
+##  - "not CFS_OPT"
+##  - "CFS_OPT"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-pdr"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-XL710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           'BASE' and
+#           '2T2C' and
+#           ('L2BDMACLRN' or 'L2XCFWD') and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "not CFS_OPT"
+##  - "L2XCFWD"
+##  - "not CFS_OPT"
+##  - "CFS_OPT"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-pdr"
+#    layout: "plot-throughput"
+#
+## Packet Throughput - VPP vhost l2sw 3n-hsw-xl710 - base vm
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-vm-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-vm-ndr"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-XL710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           '1T1C' and
+#           ('L2BDMACLRN' or 'L2XCFWD') and
+#           'VHOST_1024' and
+#           not 'CFS_OPT' and
+#           not 'VXLAN' and
+#           not 'IP4FWD'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "1VM"
+##  - "L2XCFWD"
+##  - "1VM"
+##  - "L2BDMACLRN"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-vm-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-vm-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-vm-pdr"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-XL710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           '1T1C' and
+#           ('L2BDMACLRN' or 'L2XCFWD') and
+#           'VHOST_1024' and
+#           not 'CFS_OPT' and
+#           not 'VXLAN' and
+#           not 'IP4FWD'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "1VM"
+##  - "L2XCFWD"
+##  - "1VM"
+##  - "L2BDMACLRN"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-vm-pdr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-vm-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-vm-ndr"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-XL710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           '2T2C' and
+#           ('L2BDMACLRN' or 'L2XCFWD') and
+#           'VHOST_1024' and
+#           not 'CFS_OPT' and
+#           not 'VXLAN' and
+#           not 'IP4FWD'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "1VM"
+##  - "L2XCFWD"
+##  - "1VM"
+##  - "L2BDMACLRN"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-vm-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-vm-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-vm-pdr"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-XL710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           '2T2C' and
+#           ('L2BDMACLRN' or 'L2XCFWD') and
+#           'VHOST_1024' and
+#           not 'CFS_OPT' and
+#           not 'VXLAN' and
+#           not 'IP4FWD'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "1VM"
+##  - "L2XCFWD"
+##  - "1VM"
+##  - "L2BDMACLRN"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-vm-pdr"
+#    layout: "plot-throughput"

 
 # Packet Throughput - VPP vhost ip4 3n-skx-x710
 -
 
 # Packet Throughput - VPP vhost ip4 3n-skx-x710
 -


@@ -15443,7 +15556,6 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:

-  - "not CFS_OPT"

   - "1VM"
   - "2VM"
   traces:
   - "1VM"
   - "2VM"
   traces:


@@ -15475,7 +15587,6 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:

-  - "not CFS_OPT"

   - "1VM"
   - "2VM"
   traces:
   - "1VM"
   - "2VM"
   traces:


@@ -15507,7 +15618,6 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:

-  - "not CFS_OPT"

   - "1VM"
   - "2VM"
   traces:
   - "1VM"
   - "2VM"
   traces:


@@ -15539,7 +15649,6 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:

-  - "not CFS_OPT"

   - "1VM"
   - "2VM"
   traces:
   - "1VM"
   - "2VM"
   traces:


@@ -15550,146 +15659,146 @@
     title: "vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
     title: "vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 

-# Packet Throughput - VPP vhost l2sw 3n-skx-x710
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '2T1C' and
-           'L2BDMACLRN' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '4T2C' and
-           'L2BDMACLRN' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '2T1C' and
-           'L2BDMACLRN' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '4T2C' and
-           'L2BDMACLRN' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
-    layout: "plot-throughput"
+## Packet Throughput - VPP vhost l2sw 3n-skx-x710
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+#  data: "plot-vpp-throughput-latency-3n-skx"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           '2T1C' and
+#           'L2BDMACLRN' and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "VM"  # "not CFS_OPT"
+##  - "CFS_OPT"
+##  - "FIB_10K"
+##  - "FIB_100K"
+##  - "FIB_1M"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
+#  data: "plot-vpp-throughput-latency-3n-skx"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           '4T2C' and
+#           'L2BDMACLRN' and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "VM"  # "not CFS_OPT"
+##  - "CFS_OPT"
+##  - "FIB_10K"
+##  - "FIB_100K"
+##  - "FIB_1M"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
+#  data: "plot-vpp-throughput-latency-3n-skx"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           '2T1C' and
+#           'L2BDMACLRN' and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "VM"  # "not CFS_OPT"
+##  - "CFS_OPT"
+##  - "FIB_10K"
+##  - "FIB_100K"
+##  - "FIB_1M"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
+#  data: "plot-vpp-throughput-latency-3n-skx"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           '4T2C' and
+#           'L2BDMACLRN' and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "VM"  # "not CFS_OPT"
+##  - "CFS_OPT"
+##  - "FIB_10K"
+##  - "FIB_100K"
+##  - "FIB_1M"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
+#    layout: "plot-throughput"

 
 # Packet Throughput - VPP vhost l2sw 3n-skx-x710 - base
 -
 
 # Packet Throughput - VPP vhost l2sw 3n-skx-x710 - base
 -


@@ -15715,11 +15824,11 @@
   - "throughput"
   - "parent"
   - "tags"
   - "throughput"
   - "parent"
   - "tags"

-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
+  sort:
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"

   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"


@@ -15751,11 +15860,11 @@
   - "throughput"
   - "parent"
   - "tags"
   - "throughput"
   - "parent"
   - "tags"

-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
+  sort:
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"

   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"


@@ -15787,11 +15896,11 @@
   - "throughput"
   - "parent"
   - "tags"
   - "throughput"
   - "parent"
   - "tags"

-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
+  sort:
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"

   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"


@@ -15823,11 +15932,11 @@
   - "throughput"
   - "parent"
   - "tags"
   - "throughput"
   - "parent"
   - "tags"

-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
+  sort:
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"

   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"


@@ -15859,11 +15968,13 @@
   - "throughput"
   - "parent"
   - "tags"
   - "throughput"
   - "parent"
   - "tags"

-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
+  sort:
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"

   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"


@@ -15894,11 +16005,13 @@
   - "throughput"
   - "parent"
   - "tags"
   - "throughput"
   - "parent"
   - "tags"

-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
+  sort:
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"

   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"


@@ -15929,11 +16042,13 @@
   - "throughput"
   - "parent"
   - "tags"
   - "throughput"
   - "parent"
   - "tags"

-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
+  sort:
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"

   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"


@@ -15964,11 +16079,13 @@
   - "throughput"
   - "parent"
   - "tags"
   - "throughput"
   - "parent"
   - "tags"

-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
+  sort:
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"

   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"


@@ -15994,13 +16111,13 @@
            'VHOST_1024' and
            not 'VXLAN' and
            not 'NF_DENSITY' and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'NF_DENSITY' and

+           not 'CFS_OPT' and

            not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
            not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:

-  - "not CFS_OPT"

   - "1VM"
   - "2VM"
   traces:
   - "1VM"
   - "2VM"
   traces:


@@ -16027,13 +16144,13 @@
            'VHOST_1024' and
            not 'VXLAN' and
            not 'NF_DENSITY' and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'NF_DENSITY' and

+           not 'CFS_OPT' and

            not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
            not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:

-  - "not CFS_OPT"

   - "1VM"
   - "2VM"
   traces:
   - "1VM"
   - "2VM"
   traces:


@@ -16060,13 +16177,13 @@
            'VHOST_1024' and
            not 'VXLAN' and
            not 'NF_DENSITY' and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'NF_DENSITY' and

+           not 'CFS_OPT' and

            not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
            not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:

-  - "not CFS_OPT"

   - "1VM"
   - "2VM"
   traces:
   - "1VM"
   - "2VM"
   traces:


@@ -16093,13 +16210,13 @@
            'VHOST_1024' and
            not 'VXLAN' and
            not 'NF_DENSITY' and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'NF_DENSITY' and

+           not 'CFS_OPT' and

            not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
            not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:

-  - "not CFS_OPT"

   - "1VM"
   - "2VM"
   traces:
   - "1VM"
   - "2VM"
   traces:


@@ -16110,150 +16227,150 @@
     title: "vhost-ip4-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
     title: "vhost-ip4-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 

-# Packet Throughput - VPP vhost l2sw 2n-skx-x710
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '2T1C' and
-           'L2BDMACLRN' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'NF_DENSITY' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '4T2C' and
-           'L2BDMACLRN' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'NF_DENSITY' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '2T1C' and
-           'L2BDMACLRN' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'NF_DENSITY' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '4T2C' and
-           'L2BDMACLRN' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'NF_DENSITY' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
-    layout: "plot-throughput"
+## Packet Throughput - VPP vhost l2sw 2n-skx-x710
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
+#  data: "plot-vpp-throughput-latency-2n-skx"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           '2T1C' and
+#           'L2BDMACLRN' and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'NF_DENSITY' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "VM"  # "not CFS_OPT"
+##  - "CFS_OPT"
+##  - "FIB_10K"
+##  - "FIB_100K"
+##  - "FIB_1M"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
+#  data: "plot-vpp-throughput-latency-2n-skx"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           '4T2C' and
+#           'L2BDMACLRN' and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'NF_DENSITY' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "VM"  # "not CFS_OPT"
+##  - "CFS_OPT"
+##  - "FIB_10K"
+##  - "FIB_100K"
+##  - "FIB_1M"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
+#  data: "plot-vpp-throughput-latency-2n-skx"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           '2T1C' and
+#           'L2BDMACLRN' and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'NF_DENSITY' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "VM"  # "not CFS_OPT"
+##  - "CFS_OPT"
+##  - "FIB_10K"
+##  - "FIB_100K"
+##  - "FIB_1M"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
+#  data: "plot-vpp-throughput-latency-2n-skx"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           '4T2C' and
+#           'L2BDMACLRN' and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'NF_DENSITY' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "VM"  # "not CFS_OPT"
+##  - "CFS_OPT"
+##  - "FIB_10K"
+##  - "FIB_100K"
+##  - "FIB_1M"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
+#    layout: "plot-throughput"

 
 # Packet Throughput - VPP vhost l2sw 2n-skx-x710 - base
 -
 
 # Packet Throughput - VPP vhost l2sw 2n-skx-x710 - base
 -


@@ -16418,6 +16535,7 @@
            not 'CFS_OPT' and
            not 'VXLAN' and
            not 'NF_DENSITY' and
            not 'CFS_OPT' and
            not 'VXLAN' and
            not 'NF_DENSITY' and

+           not 'DOT1Q' and

            not 'IP4FWD'"
   parameters:
   - "throughput"
            not 'IP4FWD'"
   parameters:
   - "throughput"


@@ -16453,6 +16571,7 @@
            not 'CFS_OPT' and
            not 'VXLAN' and
            not 'NF_DENSITY' and
            not 'CFS_OPT' and
            not 'VXLAN' and
            not 'NF_DENSITY' and

+           not 'DOT1Q' and

            not 'IP4FWD'"
   parameters:
   - "throughput"
            not 'IP4FWD'"
   parameters:
   - "throughput"


@@ -16488,6 +16607,7 @@
            not 'CFS_OPT' and
            not 'VXLAN' and
            not 'NF_DENSITY' and
            not 'CFS_OPT' and
            not 'VXLAN' and
            not 'NF_DENSITY' and

+           not 'DOT1Q' and

            not 'IP4FWD'"
   parameters:
   - "throughput"
            not 'IP4FWD'"
   parameters:
   - "throughput"


@@ -16523,6 +16643,7 @@
            not 'CFS_OPT' and
            not 'VXLAN' and
            not 'NF_DENSITY' and
            not 'CFS_OPT' and
            not 'VXLAN' and
            not 'NF_DENSITY' and

+           not 'DOT1Q' and

            not 'IP4FWD'"
   parameters:
   - "throughput"
            not 'IP4FWD'"
   parameters:
   - "throughput"


@@ -16557,13 +16678,13 @@
            '2T1C' and
            'VHOST_1024' and
            not 'VXLAN' and
            '2T1C' and
            'VHOST_1024' and
            not 'VXLAN' and

+           not 'CFS_OPT' and

            not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
            not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:

-  - "not CFS_OPT"

   - "1VM"
   - "2VM"
   traces:
   - "1VM"
   - "2VM"
   traces:


@@ -16589,13 +16710,13 @@
            '4T2C' and
            'VHOST_1024' and
            not 'VXLAN' and
            '4T2C' and
            'VHOST_1024' and
            not 'VXLAN' and

+           not 'CFS_OPT' and

            not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
            not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:

-  - "not CFS_OPT"

   - "1VM"
   - "2VM"
   traces:
   - "1VM"
   - "2VM"
   traces:


@@ -16621,13 +16742,13 @@
            '2T1C' and
            'VHOST_1024' and
            not 'VXLAN' and
            '2T1C' and
            'VHOST_1024' and
            not 'VXLAN' and

+           not 'CFS_OPT' and

            not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
            not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:

-  - "not CFS_OPT"

   - "1VM"
   - "2VM"
   traces:
   - "1VM"
   - "2VM"
   traces:


@@ -16653,13 +16774,13 @@
            '4T2C' and
            'VHOST_1024' and
            not 'VXLAN' and
            '4T2C' and
            'VHOST_1024' and
            not 'VXLAN' and

+           not 'CFS_OPT' and

            not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
            not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:

-  - "not CFS_OPT"

   - "1VM"
   - "2VM"
   traces:
   - "1VM"
   - "2VM"
   traces:


@@ -16670,146 +16791,146 @@
     title: "vhost-ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
     title: "vhost-ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 

-# Packet Throughput - VPP vhost l2sw 2n-skx-xxv710
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '2T1C' and
-           'L2BDMACLRN' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '4T2C' and
-           'L2BDMACLRN' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '2T1C' and
-           'L2BDMACLRN' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '4T2C' and
-           'L2BDMACLRN' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
-    layout: "plot-throughput"
+## Packet Throughput - VPP vhost l2sw 2n-skx-xxv710
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
+#  data: "plot-vpp-throughput-latency-2n-skx"
+#  filter: "'NIC_Intel-XXV710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           '2T1C' and
+#           'L2BDMACLRN' and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "VM"  # "not CFS_OPT"
+##  - "CFS_OPT"
+##  - "FIB_10K"
+##  - "FIB_100K"
+##  - "FIB_1M"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
+#  data: "plot-vpp-throughput-latency-2n-skx"
+#  filter: "'NIC_Intel-XXV710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           '4T2C' and
+#           'L2BDMACLRN' and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "VM"  # "not CFS_OPT"
+##  - "CFS_OPT"
+##  - "FIB_10K"
+##  - "FIB_100K"
+##  - "FIB_1M"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
+#  data: "plot-vpp-throughput-latency-2n-skx"
+#  filter: "'NIC_Intel-XXV710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           '2T1C' and
+#           'L2BDMACLRN' and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "VM"  # "not CFS_OPT"
+##  - "CFS_OPT"
+##  - "FIB_10K"
+##  - "FIB_100K"
+##  - "FIB_1M"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
+#  data: "plot-vpp-throughput-latency-2n-skx"
+#  filter: "'NIC_Intel-XXV710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           '4T2C' and
+#           'L2BDMACLRN' and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "VM"  # "not CFS_OPT"
+##  - "CFS_OPT"
+##  - "FIB_10K"
+##  - "FIB_100K"
+##  - "FIB_1M"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
+#    layout: "plot-throughput"

 
 # Packet Throughput - VPP vhost l2sw 2n-skx-xxv710 - base
 -
 
 # Packet Throughput - VPP vhost l2sw 2n-skx-xxv710 - base
 -


@@ -16969,6 +17090,7 @@
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and

+           not 'DOT1Q' and

            not 'IP4FWD'"
   parameters:
   - "throughput"
            not 'IP4FWD'"
   parameters:
   - "throughput"


@@ -17003,6 +17125,7 @@
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and

+           not 'DOT1Q' and

            not 'IP4FWD'"
   parameters:
   - "throughput"
            not 'IP4FWD'"
   parameters:
   - "throughput"


@@ -17037,6 +17160,7 @@
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and

+           not 'DOT1Q' and

            not 'IP4FWD'"
   parameters:
   - "throughput"
            not 'IP4FWD'"
   parameters:
   - "throughput"


@@ -17071,6 +17195,7 @@
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and

+           not 'DOT1Q' and

            not 'IP4FWD'"
   parameters:
   - "throughput"
            not 'IP4FWD'"
   parameters:
   - "throughput"


@@ -19609,6 +19734,7 @@
            '1T1C' and
            'L2XCFWD' and
            not 'VHOST' and
            '1T1C' and
            'L2XCFWD' and
            not 'VHOST' and

+           not 'NF_DENSITY' and

            'MEMIF'"
   parameters:
   - "latency"
            'MEMIF'"
   parameters:
   - "latency"


@@ -19638,6 +19764,7 @@
            '2T2C' and
            'L2XCFWD' and
            not 'VHOST' and
            '2T2C' and
            'L2XCFWD' and
            not 'VHOST' and

+           not 'NF_DENSITY' and

            'MEMIF'"
   parameters:
   - "latency"
            'MEMIF'"
   parameters:
   - "latency"


@@ -19668,6 +19795,7 @@
            '1T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN') and
            not 'VHOST' and
            '1T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN') and
            not 'VHOST' and

+           not 'NF_DENSITY' and

            'MEMIF'"
   parameters:
   - "latency"
            'MEMIF'"
   parameters:
   - "latency"


@@ -19697,6 +19825,7 @@
            '2T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN') and
            not 'VHOST' and
            '2T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN') and
            not 'VHOST' and

+           not 'NF_DENSITY' and

            'MEMIF'"
   parameters:
   - "latency"
            'MEMIF'"
   parameters:
   - "latency"


@@ -19727,6 +19856,7 @@
            '1T1C' and
            'L2XCFWD' and
            not 'VHOST' and
            '1T1C' and
            'L2XCFWD' and
            not 'VHOST' and

+           not 'NF_DENSITY' and

            'MEMIF'"
   parameters:
   - "latency"
            'MEMIF'"
   parameters:
   - "latency"


@@ -19756,6 +19886,7 @@
            '2T2C' and
            'L2XCFWD' and
            not 'VHOST' and
            '2T2C' and
            'L2XCFWD' and
            not 'VHOST' and

+           not 'NF_DENSITY' and

            'MEMIF'"
   parameters:
   - "latency"
            'MEMIF'"
   parameters:
   - "latency"


@@ -19786,6 +19917,7 @@
            '1T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN') and
            not 'VHOST' and
            '1T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN') and
            not 'VHOST' and

+           not 'NF_DENSITY' and

            'MEMIF'"
   parameters:
   - "latency"
            'MEMIF'"
   parameters:
   - "latency"


@@ -19815,6 +19947,7 @@
            '2T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN') and
            not 'VHOST' and
            '2T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN') and
            not 'VHOST' and

+           not 'NF_DENSITY' and

            'MEMIF'"
   parameters:
   - "latency"
            'MEMIF'"
   parameters:
   - "latency"