Report: Check graphs

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

diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml
index df0b20b..471fc9a 100644 (file)
--- a/resources/tools/presentation/specification.yaml
+++ b/resources/tools/presentation/specification.yaml
@@ -162,13 +162,19 @@
       # TODO Add new data
       csit-vpp-perf-verify-1901-3n-hsw:
       - 10  # NDRPDR sel
+      - 18  # NDRPDR sel F
       - 19  # NDRPDR sel
+      - 31  # NDRPDR sel
+      - 36  # NDRPDR sel
 
     vpp-nic-comparison-3n-hsw:
       # TODO: Add new data
       csit-vpp-perf-verify-1901-3n-hsw:
       - 10  # NDRPDR sel
+      - 18  # NDRPDR sel F
       - 19  # NDRPDR sel
+      - 31  # NDRPDR sel
+      - 36  # NDRPDR sel
 
     vpp-performance-changes-3n-skx:
       csit-vpp-perf-verify-1807-3n-skx:
@@ -195,18 +201,26 @@
       - 25  # NDRPDR sel
       # TODO Add new data:
       csit-vpp-perf-verify-1901-3n-skx:
-      - 28  # 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
 
     vpp-nic-comparison-3n-skx:
       # TODO: Add new data
       csit-vpp-perf-verify-1901-3n-skx:
-      - 28  # 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
 
     vpp-performance-changes-2n-skx:
       csit-vpp-perf-verify-1807-2n-skx:
@@ -234,31 +248,44 @@
       # TODO Add new data:
       csit-vpp-perf-verify-1901-2n-skx:
       - 5   # NDRPDR sel
-      - 10  # NDRPDR sel fails
       - 12  # NDRPDR sel
       - 13  # NDRPDR sel
       - 16  # NDRPDR sel fails
+      - 21  # NDRPDR sel
+      - 23  # NDRPDR sel
+      - 31  # NDRPDR sel
+      - 34  # NDRPDR sel
 
     vpp-nic-comparison-2n-skx:
       # TODO: Add new data
       csit-vpp-perf-verify-1901-2n-skx:
       - 5   # NDRPDR sel
-      - 10  # NDRPDR sel fails
       - 12  # NDRPDR sel
       - 13  # NDRPDR sel
       - 16  # NDRPDR sel fails
+      - 21  # NDRPDR sel
+      - 23  # NDRPDR sel
+      - 31  # NDRPDR sel
+      - 34  # NDRPDR sel
 
     vpp-compare-testbeds:
       # TODO: Add new data
       csit-vpp-perf-verify-1901-3n-hsw:
       - 10  # NDRPDR sel
+      - 18  # NDRPDR sel F
       - 19  # NDRPDR sel
+      - 31  # NDRPDR sel
+      - 36  # NDRPDR sel
       # TODO: Add new data
       csit-vpp-perf-verify-1901-3n-skx:
-      - 28  # 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
 
     vpp-compare-testbeds-mrr:
       # TODO: Add new data
@@ -271,17 +298,24 @@
     vpp-compare-topologies:
       # TODO: Add new data
       csit-vpp-perf-verify-1901-3n-skx:
-      - 28  # 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
       # TODO: Add new data
       csit-vpp-perf-verify-1901-2n-skx:
       - 5   # NDRPDR sel
-      - 10  # NDRPDR sel fails
       - 12  # NDRPDR sel
       - 13  # NDRPDR sel
       - 16  # NDRPDR sel fails
+      - 21  # NDRPDR sel
+      - 23  # NDRPDR sel
+      - 31  # NDRPDR sel
+      - 34  # NDRPDR sel
 
     vpp-compare-topologies-mrr:
       # TODO: Add new data
@@ -366,19 +400,22 @@
       - 22  # MRR sel
 
     vpp-perf-results-3n-hsw:
-      # TODO: Replace with FULL data
+      # TODO: Add FULL data
       csit-vpp-perf-verify-1901-3n-hsw:
-      - 19  # NDRPDR sel
+      - 38  # NDRPDR full
 
     vpp-perf-results-3n-skx:
-      # TODO: Replace with FULL data
+      # TODO: Add FULL data
       csit-vpp-perf-verify-1901-3n-skx:
-      - 28  # NDRPDR sel
+      - 37  # NDRPDR full
+      - 39  # NDRPDR full
+      - 40  # NDRPDR full
 
     vpp-perf-results-2n-skx:
-      # TODO: Replace with FULL data
+      # TODO: Add FULL data
       csit-vpp-perf-verify-1901-2n-skx:
-      - 13  # NDRPDR sel
+      - 25  # NDRPDR full
+      - 30  # NDRPDR full
 
     vpp-mrr-results-3n-hsw:
       # TODO: Replace with FULL data
@@ -399,30 +436,43 @@
       # TODO: Add new data
       csit-vpp-perf-verify-1901-3n-hsw:
       - 10  # NDRPDR sel
+      - 18  # NDRPDR sel F
       - 19  # NDRPDR sel
+      - 31  # NDRPDR sel
+      - 36  # NDRPDR sel
 
     plot-throughput-speedup-analysis-3n-skx:
       # TODO: Add new data
       csit-vpp-perf-verify-1901-3n-skx:
-      - 28  # 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
 
     plot-throughput-speedup-analysis-2n-skx:
       # TODO: Add new data
       csit-vpp-perf-verify-1901-2n-skx:
       - 5   # NDRPDR sel
-      - 10  # NDRPDR sel fails
       - 12  # NDRPDR sel
       - 13  # NDRPDR sel
       - 16  # NDRPDR sel fails
+      - 21  # NDRPDR sel
+      - 23  # NDRPDR sel
+      - 31  # NDRPDR sel
+      - 34  # NDRPDR sel
 
     plot-vpp-throughput-latency-3n-hsw:
       # TODO: Add new data
       csit-vpp-perf-verify-1901-3n-hsw:
       - 10  # NDRPDR sel
+      - 18  # NDRPDR sel F
       - 19  # NDRPDR sel
+      - 31  # NDRPDR sel
+      - 36  # NDRPDR sel
 
     plot-vpp-soak-2n-skx:
       # TODO: Replace with new data
@@ -431,43 +481,44 @@
       - 248  # SOAK sel
       - 251  # SOAK sel
 
-    plot-vpp-vsc-2n-skx:
-      # TODO: Replace with new data
-      # csit-vpp-perf-verify-1901-2n-skx:
-      csit-vpp-perf-verify-master-2n-skx:
-      - 237
-      - 243
-
-    plot-vpp-csc-2n-skx:
-      # TODO: Replace with new data
-      # csit-vpp-perf-verify-1901-2n-skx:
-      csit-vpp-perf-verify-master-2n-skx:
-      - 226
-      - 231
-      - 233
+    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
 
-    plot-vpp-csp-2n-skx:
-      # TODO: Replace with new data
-      # csit-vpp-perf-verify-1901-2n-skx:
-      csit-vpp-perf-verify-master-2n-skx:
-      - 247
+    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
 
     plot-vpp-throughput-latency-3n-skx:
       # TODO: Add new data
       csit-vpp-perf-verify-1901-3n-skx:
-      - 28  # 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
 
     plot-vpp-throughput-latency-2n-skx:
       # TODO: Add new data
       csit-vpp-perf-verify-1901-2n-skx:
       - 5   # NDRPDR sel
-      - 10  # NDRPDR sel fails
       - 12  # NDRPDR sel
       - 13  # NDRPDR sel
       - 16  # NDRPDR sel fails
+      - 21  # NDRPDR sel
+      - 23  # NDRPDR sel
+      - 31  # NDRPDR sel
+      - 34  # NDRPDR sel
 
     plot-vpp-http-server-performance:
       # TODO: Replace with new data
@@ -560,11 +611,17 @@
       - 8   # NDRPDR sel
       - 9   # NDRPDR sel
       - 10  # NDRPDR sel
-      # TODO: Add new data
       csit-dpdk-perf-verify-1901-3n-hsw:
       - 3   # NDRPDR sel
       - 4   # 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
 
     dpdk-performance-changes-3n-skx:
       csit-dpdk-perf-verify-1807-3n-skx:
@@ -590,15 +647,15 @@
       - 12  # NDRPDR sel
       - 13  # NDRPDR sel
       # TODO: Add new data
-      # csit-dpdk-perf-verify-1901-3n-skx:
+      csit-dpdk-perf-verify-1901-3n-skx:
+      - 1   # NDRPDR sel F
+      - 2   # NDRPDR sel F
 
-    dpdk-compare-testbeds:
-      # TODO: Replace with new data
-      # csit-dpdk-perf-verify-1901-3n-skx:
-      csit-dpdk-perf-verify-1810-3n-skx:
+    dpdk-performance-changes-2n-skx:
+      csit-dpdk-perf-verify-1810-2n-skx:
       - 3   # NDRPDR sel
       - 4   # NDRPDR sel
-      - 6   # NDRPDR sel
+      - 5   # NDRPDR sel
       - 7   # NDRPDR sel
       - 8   # NDRPDR sel
       - 9   # NDRPDR sel
@@ -606,18 +663,27 @@
       - 11  # NDRPDR sel
       - 12  # NDRPDR sel
       - 13  # NDRPDR sel
-      # TODO: Add new data
-      csit-dpdk-perf-verify-1901-3n-hsw:
+      csit-dpdk-perf-verify-1901-2n-skx:
+      - 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
+      - 11  # NDRPDR sel
 
-    dpdk-compare-topologies:
+    dpdk-compare-testbeds:
       # TODO: Replace with new data
-      # csit-dpdk-perf-verify-1901-3n-skx:
-      csit-dpdk-perf-verify-1810-3n-skx:
+      csit-dpdk-perf-verify-1901-3n-skx:
+      - 1   # NDRPDR sel F
+      - 2   # NDRPDR sel F
+      csit-dpdk-perf-verify-1901-3n-hsw:
       - 3   # NDRPDR sel
       - 4   # NDRPDR sel
+      - 5   # NDRPDR sel
       - 6   # NDRPDR sel
       - 7   # NDRPDR sel
       - 8   # NDRPDR sel
@@ -625,40 +691,41 @@
       - 10  # NDRPDR sel
       - 11  # NDRPDR sel
       - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
+
+    dpdk-compare-topologies:
       # TODO: Add new data
+      csit-dpdk-perf-verify-1901-3n-skx:
+      - 1   # NDRPDR sel F
+      - 2   # NDRPDR sel F
       csit-dpdk-perf-verify-1901-2n-skx:
       - 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
+      - 11  # NDRPDR sel
 
     dpdk-perf-results-3n-hsw:
-      # TODO: Replace with FULL data
       csit-dpdk-perf-verify-1901-3n-hsw:
       - 6   # NDRPDR sel
 
     dpdk-perf-results-3n-skx:
-      # TODO: Replace with new data
-      # csit-dpdk-perf-verify-1901-3n-skx:
-      csit-dpdk-perf-verify-1810-3n-skx:
-      - 3   # NDRPDR sel
+      csit-dpdk-perf-verify-1901-3n-skx:
+      - 2   # NDRPDR sel F
 
     dpdk-perf-results-2n-skx:
-      # TODO: Replace with FULL data
       csit-dpdk-perf-verify-1901-2n-skx:
       - 2   # NDRPDR sel
 
     plot-dpdk-throughput-latency-3n-hsw:
-      # TODO: Replace with new data
       csit-dpdk-perf-verify-1901-3n-hsw:
       - 3   # NDRPDR sel
       - 4   # NDRPDR sel
-      - 6   # NDRPDR sel
-
-    plot-dpdk-throughput-latency-3n-skx:
-      # TODO: Replace with new data
-      # csit-dpdk-perf-verify-1901-3n-skx:
-      csit-dpdk-perf-verify-1810-3n-skx:
-      - 3   # NDRPDR sel
-      - 4   # NDRPDR sel
+      - 5   # NDRPDR sel
       - 6   # NDRPDR sel
       - 7   # NDRPDR sel
       - 8   # NDRPDR sel
@@ -666,18 +733,29 @@
       - 10  # NDRPDR sel
       - 11  # NDRPDR sel
       - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
 
-    plot-dpdk-throughput-latency-2n-skx:
+    plot-dpdk-throughput-latency-3n-skx:
       # TODO: Add new data
+      csit-dpdk-perf-verify-1901-3n-skx:
+      - 1   # NDRPDR sel F
+      - 2   # NDRPDR sel F
+
+    plot-dpdk-throughput-latency-2n-skx:
       csit-dpdk-perf-verify-1901-2n-skx:
       - 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
+      - 11  # NDRPDR sel
 
     # HoneyComb Functional
     hc-func-results:
-      # TODO: Replace with new data
-      # csit-hc2vpp-verify-func-1901-ubuntu1604:
-      csit-hc2vpp-verify-func-1810-ubuntu1604:
+      csit-hc2vpp-verify-func-1901-ubuntu1604:
       - 3
 
     # NSH SFC Functional
@@ -689,10 +767,8 @@
 
     # DMM Functional
     dmm-func-results:
-      # TODO: Replace with new data
-      # csit-dmm-functional-1901-ubuntu1604-virl:
-      csit-dmm-functional-1810-ubuntu1604-virl:
-      - 1
+      csit-dmm-functional-1901-ubuntu1604-virl:
+      - 2
 
   plot-layouts:
 
@@ -1098,6 +1174,7 @@
 
   builds:
 
+    # TODO: Replace with 1901 data
     intel-dnv-vpp-release-1810:
     - 1
 
@@ -1162,8 +1239,12 @@
     - 37  # WRK
     csit-vpp-perf-verify-1901-3n-hsw:
     - 35  # MRR sel
+    - 38  # NDRPDR full
     - 10  # NDRPDR sel
+    - 18  # NDRPDR sel F
     - 19  # NDRPDR sel
+    - 31  # NDRPDR sel
+    - 36  # NDRPDR sel
     csit-vpp-perf-verify-1807-3n-skx:
     - 31  # MRR full
     - 28  # MRR sel
@@ -1207,10 +1288,17 @@
     - 25  # NDRPDR sel
     csit-vpp-perf-verify-1901-3n-skx:
     - 32  # MRR sel
-    - 28  # NDRPDR sel
+    - 37  # NDRPDR full
+    - 39  # NDRPDR full
+    - 40  # 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
     csit-vpp-perf-verify-1807-2n-skx:
     - 27  # MRR full
     - 31  # MRR sel
@@ -1253,20 +1341,26 @@
     - 27  # NDRPDR sel
     csit-vpp-perf-verify-1901-2n-skx:
     - 22  # MRR sel
+    - 25  # NDRPDR full
+    - 30  # NDRPDR full
     - 5   # NDRPDR sel
-    - 10  # NDRPDR sel fails
     - 12  # NDRPDR sel
     - 13  # NDRPDR sel
     - 16  # NDRPDR sel fails
+    - 21  # NDRPDR sel
+    - 23  # NDRPDR sel
+    - 31  # NDRPDR sel
+    - 34  # NDRPDR sel
+    - 24  # NFV MRR
+    - 26  # NFV MRR
+    - 27  # NFV MRR
+    - 35  # NFV MRR
+    - 28  # NFV NDRPDR
+    - 29  # NFV NDRPDR
+    - 32  # NFV NDRPDR
     csit-vpp-perf-verify-master-2n-skx:
     - 248  # SOAK sel
     - 251  # SOAK sel
-    - 237  # VSC
-    - 226  # CSC
-    - 231  # CSC
-    - 233  # CSC
-    - 243  # VSC
-    - 247  # CSP
     csit-ligato-perf-verify-1810-3n-hsw:
     - 5   # full
     - 6   # sel
@@ -1279,6 +1373,8 @@
     - 16  # sel
     - 17  # sel
     - 18  # sel
+    # TODO: Add new data
+    # csit-ligato-perf-verify-1901-3n-hsw:
     csit-dpdk-perf-verify-1807-3n-hsw:
     - 11
     - 12  # full
@@ -1304,7 +1400,14 @@
     csit-dpdk-perf-verify-1901-3n-hsw:
     - 3   # NDRPDR sel
     - 4   # 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
     csit-dpdk-perf-verify-1807-3n-skx:
     - 1   # NDRPDR sel
     - 2   # NDRPDR sel
@@ -1327,30 +1430,43 @@
     - 11  # NDRPDR sel
     - 12  # NDRPDR sel
     - 13  # NDRPDR sel
-#    csit-dpdk-perf-verify-1810-2n-skx:
-#    - 3   # NDRPDR sel
-#    - 4   # NDRPDR sel
-#    - 5   # NDRPDR sel
-#    - 7   # NDRPDR sel
-#    - 8   # NDRPDR sel
-#    - 9   # NDRPDR sel
-#    - 10  # NDRPDR sel
-#    - 11  # NDRPDR sel
-#    - 12  # NDRPDR sel
-#    - 13  # NDRPDR sel
+    csit-dpdk-perf-verify-1901-3n-skx:
+    - 1   # NDRPDR sel
+    - 2   # NDRPDR sel
+    csit-dpdk-perf-verify-1810-2n-skx:
+    - 3   # NDRPDR sel
+    - 4   # NDRPDR sel
+    - 5   # NDRPDR sel
+    - 7   # NDRPDR sel
+    - 8   # NDRPDR sel
+    - 9   # NDRPDR sel
+    - 10  # NDRPDR sel
+    - 11  # NDRPDR sel
+    - 12  # NDRPDR sel
+    - 13  # NDRPDR sel
     csit-dpdk-perf-verify-1901-2n-skx:
     - 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
+    - 11  # NDRPDR sel
     csit-vpp-functional-1901-ubuntu1604-virl:
     - 48
     csit-vpp-functional-1901-centos7-virl:
     - 50
     csit-vpp-device-1901-ubuntu1804-1n-skx:
     - 49
+    # TODO: Replace with 1901 data
     csit-nsh_sfc-verify-func-1810-ubuntu1604-virl:
     - 1
-    csit-dmm-functional-1810-ubuntu1604-virl:
-    - 1
-    csit-hc2vpp-verify-func-1810-ubuntu1604:
+    csit-dmm-functional-1901-ubuntu1604-virl:
+    - 2
+    csit-hc2vpp-verify-func-1901-ubuntu1604:
     - 3
 
 -
@@ -1359,8 +1475,8 @@
   format:
     html:
     - full
-#    pdf:
-#    - minimal
+    pdf:
+    - minimal
 
 ################################################################################
 ###                               T A B L E S                                ###
@@ -1854,7 +1970,10 @@
       # TODO: Add new data:
       csit-vpp-perf-verify-1901-3n-hsw:
       - 10  # NDRPDR sel
+      - 18  # NDRPDR sel F
       - 19  # NDRPDR sel
+      - 31  # NDRPDR sel
+      - 36  # NDRPDR sel
   data: "vpp-performance-changes-3n-hsw"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -1907,7 +2026,10 @@
       # TODO: Add new data:
       csit-vpp-perf-verify-1901-3n-hsw:
       - 10  # NDRPDR sel
+      - 18  # NDRPDR sel F
       - 19  # NDRPDR sel
+      - 31  # NDRPDR sel
+      - 36  # NDRPDR sel
   data: "vpp-performance-changes-3n-hsw"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -1960,7 +2082,10 @@
       # TODO: Add new data:
       csit-vpp-perf-verify-1901-3n-hsw:
       - 10  # NDRPDR sel
+      - 18  # NDRPDR sel F
       - 19  # NDRPDR sel
+      - 31  # NDRPDR sel
+      - 36  # NDRPDR sel
   data: "vpp-performance-changes-3n-hsw"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -2013,7 +2138,10 @@
       # TODO: Add new data:
       csit-vpp-perf-verify-1901-3n-hsw:
       - 10  # NDRPDR sel
+      - 18  # NDRPDR sel F
       - 19  # NDRPDR sel
+      - 31  # NDRPDR sel
+      - 36  # NDRPDR sel
   data: "vpp-performance-changes-3n-hsw"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -2062,10 +2190,14 @@
     data:
       # TODO: Add new data:
       csit-vpp-perf-verify-1901-3n-skx:
-      - 28  # 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
   data: "vpp-performance-changes-3n-skx"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -2114,10 +2246,14 @@
     data:
       # TODO: Add new data:
       csit-vpp-perf-verify-1901-3n-skx:
-      - 28  # 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
   data: "vpp-performance-changes-3n-skx"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -2166,10 +2302,14 @@
     data:
       # TODO: Add new data:
       csit-vpp-perf-verify-1901-3n-skx:
-      - 28  # 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
   data: "vpp-performance-changes-3n-skx"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -2218,10 +2358,14 @@
     data:
       # TODO: Add new data:
       csit-vpp-perf-verify-1901-3n-skx:
-      - 28  # 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
   data: "vpp-performance-changes-3n-skx"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -2271,10 +2415,13 @@
       # TODO: Add new data:
       csit-vpp-perf-verify-1901-2n-skx:
       - 5   # NDRPDR sel
-      - 10  # NDRPDR sel fails
       - 12  # NDRPDR sel
       - 13  # NDRPDR sel
       - 16  # NDRPDR sel fails
+      - 21  # NDRPDR sel
+      - 23  # NDRPDR sel
+      - 31  # NDRPDR sel
+      - 34  # NDRPDR sel
   data: "vpp-performance-changes-2n-skx"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -2323,10 +2470,13 @@
       # TODO: Add new data:
       csit-vpp-perf-verify-1901-2n-skx:
       - 5   # NDRPDR sel
-      - 10  # NDRPDR sel fails
       - 12  # NDRPDR sel
       - 13  # NDRPDR sel
       - 16  # NDRPDR sel fails
+      - 21  # NDRPDR sel
+      - 23  # NDRPDR sel
+      - 31  # NDRPDR sel
+      - 34  # NDRPDR sel
   data: "vpp-performance-changes-2n-skx"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -2375,10 +2525,13 @@
       # TODO: Add new data:
       csit-vpp-perf-verify-1901-2n-skx:
       - 5   # NDRPDR sel
-      - 10  # NDRPDR sel fails
       - 12  # NDRPDR sel
       - 13  # NDRPDR sel
       - 16  # NDRPDR sel fails
+      - 21  # NDRPDR sel
+      - 23  # NDRPDR sel
+      - 31  # NDRPDR sel
+      - 34  # NDRPDR sel
   data: "vpp-performance-changes-2n-skx"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -2427,10 +2580,13 @@
       # TODO: Add new data:
       csit-vpp-perf-verify-1901-2n-skx:
       - 5   # NDRPDR sel
-      - 10  # NDRPDR sel fails
       - 12  # NDRPDR sel
       - 13  # NDRPDR sel
       - 16  # NDRPDR sel fails
+      - 21  # NDRPDR sel
+      - 23  # NDRPDR sel
+      - 31  # NDRPDR sel
+      - 34  # NDRPDR sel
   data: "vpp-performance-changes-2n-skx"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -2451,16 +2607,23 @@
       # TODO: Add new data:
       csit-vpp-perf-verify-1901-3n-hsw:
       - 10  # NDRPDR sel
+      - 18  # NDRPDR sel F
       - 19  # NDRPDR sel
+      - 31  # NDRPDR sel
+      - 36  # NDRPDR sel
   compare:
     title: "3-Node Skx"
     data:
       # TODO: Add new data:
       csit-vpp-perf-verify-1901-3n-skx:
-      - 28  # 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
   data: "vpp-compare-testbeds"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'NIC_Intel-X710' and 'NDRPDR' and '1C'"
@@ -2481,16 +2644,23 @@
       # TODO: Add new data:
       csit-vpp-perf-verify-1901-3n-hsw:
       - 10  # NDRPDR sel
+      - 18  # NDRPDR sel F
       - 19  # NDRPDR sel
+      - 31  # NDRPDR sel
+      - 36  # NDRPDR sel
   compare:
     title: "3-Node Skx"
     data:
       # TODO: Add new data:
       csit-vpp-perf-verify-1901-3n-skx:
-      - 28  # 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
   data: "vpp-compare-testbeds"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'NIC_Intel-X710' and 'NDRPDR' and '2C'"
@@ -2511,16 +2681,23 @@
       # TODO: Add new data:
       csit-vpp-perf-verify-1901-3n-hsw:
       - 10  # NDRPDR sel
+      - 18  # NDRPDR sel F
       - 19  # NDRPDR sel
+      - 31  # NDRPDR sel
+      - 36  # NDRPDR sel
   compare:
     title: "3-Node Skx"
     data:
       # TODO: Add new data:
       csit-vpp-perf-verify-1901-3n-skx:
-      - 28  # 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
   data: "vpp-compare-testbeds"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'NIC_Intel-X710' and 'NDRPDR' and '1C'"
@@ -2541,16 +2718,23 @@
       # TODO: Add new data:
       csit-vpp-perf-verify-1901-3n-hsw:
       - 10  # NDRPDR sel
+      - 18  # NDRPDR sel F
       - 19  # NDRPDR sel
+      - 31  # NDRPDR sel
+      - 36  # NDRPDR sel
   compare:
     title: "3-Node Skx"
     data:
       # TODO: Add new data:
       csit-vpp-perf-verify-1901-3n-skx:
-      - 28  # 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
   data: "vpp-compare-testbeds"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'NIC_Intel-X710' and 'NDRPDR' and '2C'"
@@ -2570,20 +2754,27 @@
     data:
       # TODO: Add new data:
       csit-vpp-perf-verify-1901-3n-skx:
-      - 28  # 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
   compare:
     title: "2-Node Skx"
     data:
       # TODO: Add new data:
       csit-vpp-perf-verify-1901-2n-skx:
       - 5   # NDRPDR sel
-      - 10  # NDRPDR sel fails
       - 12  # NDRPDR sel
       - 13  # NDRPDR sel
       - 16  # NDRPDR sel fails
+      - 21  # NDRPDR sel
+      - 23  # NDRPDR sel
+      - 31  # NDRPDR sel
+      - 34  # NDRPDR sel
   data: "vpp-compare-topologies"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'NDRPDR' and '1C'"
@@ -2603,20 +2794,27 @@
     data:
       # TODO: Add new data:
       csit-vpp-perf-verify-1901-3n-skx:
-      - 28  # 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
   compare:
     title: "2-Node Skx"
     data:
       # TODO: Add new data:
       csit-vpp-perf-verify-1901-2n-skx:
       - 5   # NDRPDR sel
-      - 10  # NDRPDR sel fails
       - 12  # NDRPDR sel
       - 13  # NDRPDR sel
       - 16  # NDRPDR sel fails
+      - 21  # NDRPDR sel
+      - 23  # NDRPDR sel
+      - 31  # NDRPDR sel
+      - 34  # NDRPDR sel
   data: "vpp-compare-topologies"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'NDRPDR' and '2C'"
@@ -2636,20 +2834,27 @@
     data:
       # TODO: Add new data:
       csit-vpp-perf-verify-1901-3n-skx:
-      - 28  # 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
   compare:
     title: "2-Node Skx"
     data:
       # TODO: Add new data:
       csit-vpp-perf-verify-1901-2n-skx:
       - 5   # NDRPDR sel
-      - 10  # NDRPDR sel fails
       - 12  # NDRPDR sel
       - 13  # NDRPDR sel
       - 16  # NDRPDR sel fails
+      - 21  # NDRPDR sel
+      - 23  # NDRPDR sel
+      - 31  # NDRPDR sel
+      - 34  # NDRPDR sel
   data: "vpp-compare-topologies"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'NDRPDR' and '1C'"
@@ -2669,20 +2874,27 @@
     data:
       # TODO: Add new data:
       csit-vpp-perf-verify-1901-3n-skx:
-      - 28  # 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
   compare:
     title: "2-Node Skx"
     data:
       # TODO: Add new data:
       csit-vpp-perf-verify-1901-2n-skx:
       - 5   # NDRPDR sel
-      - 10  # NDRPDR sel fails
       - 12  # NDRPDR sel
       - 13  # NDRPDR sel
       - 16  # NDRPDR sel fails
+      - 21  # NDRPDR sel
+      - 23  # NDRPDR sel
+      - 31  # NDRPDR sel
+      - 34  # NDRPDR sel
   data: "vpp-compare-topologies"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'NDRPDR' and '2C'"
@@ -3866,11 +4078,17 @@
   compare:
     title: "rls1901"
     data:
-      # TODO: Add new data
       csit-dpdk-perf-verify-1901-3n-hsw:
       - 3   # NDRPDR sel
       - 4   # 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
   data: "dpdk-performance-changes-3n-hsw"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -3917,11 +4135,17 @@
   compare:
     title: "rls1901"
     data:
-      # TODO: Add new data
       csit-dpdk-perf-verify-1901-3n-hsw:
       - 3   # NDRPDR sel
       - 4   # 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
   data: "dpdk-performance-changes-3n-hsw"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -3968,11 +4192,17 @@
   compare:
     title: "rls1901"
     data:
-      # TODO: Add new data
       csit-dpdk-perf-verify-1901-3n-hsw:
       - 3   # NDRPDR sel
       - 4   # 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
   data: "dpdk-performance-changes-3n-hsw"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -4019,11 +4249,17 @@
   compare:
     title: "rls1901"
     data:
-      # TODO: Add new data
       csit-dpdk-perf-verify-1901-3n-hsw:
       - 3   # NDRPDR sel
       - 4   # 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
   data: "dpdk-performance-changes-3n-hsw"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -4070,18 +4306,10 @@
   compare:
     title: "rls1901"
     data:
-      # TODO: Replace with new data
-      csit-dpdk-perf-verify-1810-3n-skx:
-      - 3   # NDRPDR sel
-      - 4   # NDRPDR sel
-      - 6   # NDRPDR sel
-      - 7   # NDRPDR sel
-      - 8   # NDRPDR sel
-      - 9   # NDRPDR sel
-      - 10  # NDRPDR sel
-      - 11  # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
+      # TODO: Add new data
+      csit-dpdk-perf-verify-1901-3n-skx:
+      - 1   # NDRPDR sel F
+      - 2   # NDRPDR sel F
   data: "dpdk-performance-changes-3n-skx"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -4128,18 +4356,10 @@
   compare:
     title: "rls1901"
     data:
-      # TODO: Replace with new data
-      csit-dpdk-perf-verify-1810-3n-skx:
-      - 3   # NDRPDR sel
-      - 4   # NDRPDR sel
-      - 6   # NDRPDR sel
-      - 7   # NDRPDR sel
-      - 8   # NDRPDR sel
-      - 9   # NDRPDR sel
-      - 10  # NDRPDR sel
-      - 11  # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
+      # TODO: Add new data
+      csit-dpdk-perf-verify-1901-3n-skx:
+      - 1   # NDRPDR sel F
+      - 2   # NDRPDR sel F
   data: "dpdk-performance-changes-3n-skx"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -4186,18 +4406,10 @@
   compare:
     title: "rls1901"
     data:
-      # TODO: Replace with new data
-      csit-dpdk-perf-verify-1810-3n-skx:
-      - 3   # NDRPDR sel
-      - 4   # NDRPDR sel
-      - 6   # NDRPDR sel
-      - 7   # NDRPDR sel
-      - 8   # NDRPDR sel
-      - 9   # NDRPDR sel
-      - 10  # NDRPDR sel
-      - 11  # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
+      # TODO: Add new data
+      csit-dpdk-perf-verify-1901-3n-skx:
+      - 1   # NDRPDR sel F
+      - 2   # NDRPDR sel F
   data: "dpdk-performance-changes-3n-skx"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -4244,18 +4456,10 @@
   compare:
     title: "rls1901"
     data:
-      # TODO: Replace with new data
-      csit-dpdk-perf-verify-1810-3n-skx:
-      - 3   # NDRPDR sel
-      - 4   # NDRPDR sel
-      - 6   # NDRPDR sel
-      - 7   # NDRPDR sel
-      - 8   # NDRPDR sel
-      - 9   # NDRPDR sel
-      - 10  # NDRPDR sel
-      - 11  # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
+      # TODO: Add new data
+      csit-dpdk-perf-verify-1901-3n-skx:
+      - 1   # NDRPDR sel F
+      - 2   # NDRPDR sel F
   data: "dpdk-performance-changes-3n-skx"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -4273,18 +4477,10 @@
   reference:
     title: "3-Node Hsw"
     data:
-      # TODO: Add new data
       csit-dpdk-perf-verify-1901-3n-hsw:
       - 3   # NDRPDR sel
       - 4   # NDRPDR sel
-      - 6   # NDRPDR sel
-  compare:
-    title: "3-Node Skx"
-    data:
-      # TODO: Replace with new data
-      csit-dpdk-perf-verify-1810-3n-skx:
-      - 3   # NDRPDR sel
-      - 4   # NDRPDR sel
+      - 5   # NDRPDR sel
       - 6   # NDRPDR sel
       - 7   # NDRPDR sel
       - 8   # NDRPDR sel
@@ -4292,7 +4488,13 @@
       - 10  # NDRPDR sel
       - 11  # NDRPDR sel
       - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
+  compare:
+    title: "3-Node Skx"
+    data:
+      # TODO: Add new data
+      csit-dpdk-perf-verify-1901-3n-skx:
+      - 1   # NDRPDR sel F
+      - 2   # NDRPDR sel F
   data: "dpdk-compare-testbeds"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'NIC_Intel-X710' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -4310,24 +4512,24 @@
   reference:
     title: "3-Node Skx"
     data:
-      # TODO: Replace with new data
-      csit-dpdk-perf-verify-1810-3n-skx:
+      # TODO: Add new data
+      csit-dpdk-perf-verify-1901-3n-skx:
+      - 1   # NDRPDR sel F
+      - 2   # NDRPDR sel F
+  compare:
+    title: "2-Node Skx"
+    data:
+      csit-dpdk-perf-verify-1901-2n-skx:
+      - 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
       - 11  # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
-  compare:
-    title: "2-Node Skx"
-    data:
-      # TODO: Add new data
-      csit-dpdk-perf-verify-1901-2n-skx:
-      - 2   # NDRPDR sel
   data: "dpdk-compare-topologies"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'NDRPDR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -4345,24 +4547,24 @@
   reference:
     title: "3-Node Skx"
     data:
-      # TODO: Replace with new data
-      csit-dpdk-perf-verify-1810-3n-skx:
+      # TODO: Add new data
+      csit-dpdk-perf-verify-1901-3n-skx:
+      - 1   # NDRPDR sel F
+      - 2   # NDRPDR sel F
+  compare:
+    title: "2-Node Skx"
+    data:
+      csit-dpdk-perf-verify-1901-2n-skx:
+      - 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
       - 11  # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
-  compare:
-    title: "2-Node Skx"
-    data:
-      # TODO: Add new data
-      csit-dpdk-perf-verify-1901-2n-skx:
-      - 2   # NDRPDR sel
   data: "dpdk-compare-topologies"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'NDRPDR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -4380,18 +4582,10 @@
   reference:
     title: "3-Node Hsw"
     data:
-      # TODO: Add new data
       csit-dpdk-perf-verify-1901-3n-hsw:
       - 3   # NDRPDR sel
       - 4   # NDRPDR sel
-      - 6   # NDRPDR sel
-  compare:
-    title: "3-Node Skx"
-    data:
-      # TODO: Replace with new data
-      csit-dpdk-perf-verify-1810-3n-skx:
-      - 3   # NDRPDR sel
-      - 4   # NDRPDR sel
+      - 5   # NDRPDR sel
       - 6   # NDRPDR sel
       - 7   # NDRPDR sel
       - 8   # NDRPDR sel
@@ -4399,7 +4593,13 @@
       - 10  # NDRPDR sel
       - 11  # NDRPDR sel
       - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
+  compare:
+    title: "3-Node Skx"
+    data:
+      # TODO: Add new data
+      csit-dpdk-perf-verify-1901-3n-skx:
+      - 1   # NDRPDR sel F
+      - 2   # NDRPDR sel F
   data: "dpdk-compare-testbeds"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'NIC_Intel-X710' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -4451,45 +4651,213 @@
 #  - "parent"
 #  - "result"
 
-# Detailed Test Results - DPDK Performance Results 3n-hsw
+# DPDK Performance Changes 2n-skx 2t1c pdr
 -
   type: "table"
-  title: "Detailed Test Results - DPDK Performance Results 3n-hsw"
-  algorithm: "table_details"
-  output-file-ext: ".csv"
-  output-file: "{DIR[DTR,PERF,DPDK,3N,HSW]}/dpdk_performance_results_3n_hsw"
-  columns:
-  -
-    title: "Name"
-    data: "data name"
-  -
-    title: "Status"
-    data: "data msg"
-  rows: "generated"
-  data: "dpdk-perf-results-3n-hsw"
-  filter: "all"
+  title: "DPDK Performance Changes 2n-skx 2t1c pdr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-skx-2t1c-pdr"
+  reference:
+    title: "rls1810"
+    data:
+      csit-dpdk-perf-verify-1810-2n-skx:
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 5   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
+      - 11  # NDRPDR sel
+      - 12  # NDRPDR sel
+      - 13  # NDRPDR sel
+  compare:
+    title: "rls1901"
+    data:
+      csit-dpdk-perf-verify-1901-2n-skx:
+      - 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
+      - 11  # NDRPDR sel
+  data: "dpdk-performance-changes-2n-skx"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
   - "name"
   - "parent"
-  - "msg"
+  - "throughput"
 
-# Detailed Test Results - DPDK Performance Results 3n-skx
+# DPDK Performance Changes 2n-skx 4t2c pdr
 -
   type: "table"
-  title: "Detailed Test Results - DPDK Performance Results 3n-skx"
-  algorithm: "table_details"
-  output-file-ext: ".csv"
-  output-file: "{DIR[DTR,PERF,DPDK,3N,SKX]}/dpdk_performance_results_3n_skx"
-  columns:
-  -
-    title: "Name"
-    data: "data name"
-  -
-    title: "Status"
-    data: "data msg"
-  rows: "generated"
-  data: "dpdk-perf-results-3n-skx"
-  filter: "all"
+  title: "DPDK Performance Changes 2n-skx 4t2c pdr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-skx-4t2c-pdr"
+  reference:
+    title: "rls1810"
+    data:
+      csit-dpdk-perf-verify-1810-2n-skx:
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 5   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
+      - 11  # NDRPDR sel
+      - 12  # NDRPDR sel
+      - 13  # NDRPDR sel
+  compare:
+    title: "rls1901"
+    data:
+      csit-dpdk-perf-verify-1901-2n-skx:
+      - 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
+      - 11  # NDRPDR sel
+  data: "dpdk-performance-changes-2n-skx"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+
+# DPDK Performance Changes 2n-skx 2t1c ndr
+-
+  type: "table"
+  title: "DPDK Performance Changes 2n-skx 2t1c ndr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-skx-2t1c-ndr"
+  reference:
+    title: "rls1810"
+    data:
+      csit-dpdk-perf-verify-1810-2n-skx:
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 5   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
+      - 11  # NDRPDR sel
+      - 12  # NDRPDR sel
+      - 13  # NDRPDR sel
+  compare:
+    title: "rls1901"
+    data:
+      csit-dpdk-perf-verify-1901-2n-skx:
+      - 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
+      - 11  # NDRPDR sel
+  data: "dpdk-performance-changes-2n-skx"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+
+# DPDK Performance Changes 2n-skx 4t2c ndr
+-
+  type: "table"
+  title: "DPDK Performance Changes 2n-skx 4t2c ndr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-skx-4t2c-ndr"
+  reference:
+    title: "rls1810"
+    data:
+      csit-dpdk-perf-verify-1810-2n-skx:
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 5   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
+      - 11  # NDRPDR sel
+      - 12  # NDRPDR sel
+      - 13  # NDRPDR sel
+  compare:
+    title: "rls1901"
+    data:
+      csit-dpdk-perf-verify-1901-2n-skx:
+      - 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
+      - 11  # NDRPDR sel
+  data: "dpdk-performance-changes-2n-skx"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+
+# Detailed Test Results - DPDK Performance Results 3n-hsw
+-
+  type: "table"
+  title: "Detailed Test Results - DPDK Performance Results 3n-hsw"
+  algorithm: "table_details"
+  output-file-ext: ".csv"
+  output-file: "{DIR[DTR,PERF,DPDK,3N,HSW]}/dpdk_performance_results_3n_hsw"
+  columns:
+  -
+    title: "Name"
+    data: "data name"
+  -
+    title: "Status"
+    data: "data msg"
+  rows: "generated"
+  data: "dpdk-perf-results-3n-hsw"
+  filter: "all"
+  parameters:
+  - "name"
+  - "parent"
+  - "msg"
+
+# Detailed Test Results - DPDK Performance Results 3n-skx
+-
+  type: "table"
+  title: "Detailed Test Results - DPDK Performance Results 3n-skx"
+  algorithm: "table_details"
+  output-file-ext: ".csv"
+  output-file: "{DIR[DTR,PERF,DPDK,3N,SKX]}/dpdk_performance_results_3n_skx"
+  columns:
+  -
+    title: "Name"
+    data: "data name"
+  -
+    title: "Status"
+    data: "data msg"
+  rows: "generated"
+  data: "dpdk-perf-results-3n-skx"
+  filter: "all"
   parameters:
   - "name"
   - "parent"
@@ -5257,7 +5625,7 @@
     layout: "plot-soak-throughput"
 
 ################################################################################
-# Plots - NF Density
+# Plots - NF Density - VSC
 
 -
   type: "plot"
@@ -5265,7 +5633,7 @@
   algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-vsc-mrr"
-  data: "plot-vpp-vsc-2n-skx"
+  data: "plot-vpp-nfv-2n-skx-mrr"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'VM' and
@@ -5291,7 +5659,7 @@
   algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-vsc-mrr"
-  data: "plot-vpp-vsc-2n-skx"
+  data: "plot-vpp-nfv-2n-skx-mrr"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'VM' and
@@ -5313,16 +5681,16 @@
 
 -
   type: "plot"
-  title: "Packet Throughput: 64B-1c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-mrr"
+  title: "Packet Throughput: IMIX-1c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-mrr"
   algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-csc-mrr"
-  data: "plot-vpp-csc-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-vsc-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
-           'DOCKER' and
+           'VM' and
            'CHAIN' and
-           '64B' and
+           'IMIX' and
            '2T1C' and
            'MRR'"
   parameters:
@@ -5330,25 +5698,25 @@
   - "name"
   - "tags"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  x-axis: "X = CNFs per Service Chain"
+  x-axis: "X = VNFs per Service Chain"
   y-axis: "Y = Number of Service Chains"
-  z-axis: "64B Packet Throughput (mean MRR) [Mpps]"
+  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
   layout:
-    title: "<b>Throughput:</b> eth-l2bd-{2XY}memif-{Y}chain-{XY}drc-vppip4-mrr"
+    title: "<b>Throughput:</b> eth-l2bd-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-mrr"
     layout: "plot-service-density"
 
 -
   type: "plot"
-  title: "Packet Throughput: 64B-2c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-mrr"
+  title: "Packet Throughput: IMIX-2c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-mrr"
   algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-csc-mrr"
-  data: "plot-vpp-csc-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-vsc-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
-           'DOCKER' and
+           'VM' and
            'CHAIN' and
-           '64B' and
+           'IMIX' and
            '4T2C' and
            'MRR'"
   parameters:
@@ -5356,139 +5724,925 @@
   - "name"
   - "tags"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  x-axis: "X = CNFs per Service Chain"
+  x-axis: "X = VNFs per Service Chain"
   y-axis: "Y = Number of Service Chains"
-  z-axis: "64B Packet Throughput (mean MRR) [Mpps]"
+  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
   layout:
-    title: "<b>Throughput:</b> eth-l2bd-{2XY}memif-{Y}chain-{XY}drc-vppip4-mrr"
+    title: "<b>Throughput:</b> eth-l2bd-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-mrr"
     layout: "plot-service-density"
 
 -
   type: "plot"
-  title: "Packet Throughput: 64B-1c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-mrr"
+  title: "Packet Throughput: 64B-1c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-ndr"
   algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-csp-mrr"
-  data: "plot-vpp-csp-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-vsc-ndr"
+  data: "plot-vpp-nfv-2n-skx"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
-           'DOCKER' and
-           'PIPELINE' and
+           'VM' and
+           'CHAIN' and
            '64B' and
            '2T1C' and
-           'MRR'"
+           'NDRPDR'"
   parameters:
-  - "result"
+  - "throughput"
   - "name"
   - "tags"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  x-axis: "X = CNFs per Service Pipeline"
-  y-axis: "Y = Number of Service Pipelines"
-  z-axis: "64B Packet Throughput (mean MRR) [Mpps]"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = VNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "64B Packet Throughput (mean NDR) [Mpps]"
   layout:
-    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-mrr"
+    title: "<b>Throughput:</b> eth-l2bd-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-ndr"
     layout: "plot-service-density"
 
 -
   type: "plot"
-  title: "Packet Throughput: 64B-2c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-mrr"
+  title: "Packet Throughput: 64B-2c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-ndr"
   algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-csp-mrr"
-  data: "plot-vpp-csp-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-vsc-ndr"
+  data: "plot-vpp-nfv-2n-skx"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
-           'DOCKER' and
-           'PIPELINE' and
+           'VM' and
+           'CHAIN' and
            '64B' and
            '4T2C' and
-           'MRR'"
+           'NDRPDR'"
   parameters:
-  - "result"
+  - "throughput"
   - "name"
   - "tags"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  x-axis: "X = CNFs per Service Pipeline"
-  y-axis: "Y = Number of Service Pipelines"
-  z-axis: "64B Packet Throughput (mean MRR) [Mpps]"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = VNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "64B Packet Throughput (mean NDR) [Mpps]"
   layout:
-    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-mrr"
+    title: "<b>Throughput:</b> eth-l2bd-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-ndr"
     layout: "plot-service-density"
 
-################################################################################
-# Plots VPP HTTP Server Performance
 -
   type: "plot"
-  title: "VPP HTTP Server Performance"
-  algorithm: "plot_http_server_performance_box"
+  title: "Packet Throughput: IMIX-1c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-ndr"
+  algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/http-server-performance-cps"
-  data:
-    "plot-vpp-http-server-performance"
-  # Keep this formatting, the filter is enclosed with " (quotation mark) and
-  # each tag is enclosed with ' (apostrophe).
-  filter: "'HTTP' and 'TCP_CPS'"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-vsc-ndr"
+  data: "plot-vpp-nfv-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'VM' and
+           'CHAIN' and
+           'IMIX' and
+           '2T1C' and
+           'NDRPDR'"
   parameters:
-  - "result"
+  - "throughput"
   - "name"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  - "tags"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = VNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
   layout:
-    title: "VPP HTTP Server Performance"
-    layout:
-      "plot-cps"
+    title: "<b>Throughput:</b> eth-l2bd-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-ndr"
+    layout: "plot-service-density"
 
 -
   type: "plot"
-  title: "VPP HTTP Server Performance"
-  algorithm: "plot_http_server_performance_box"
+  title: "Packet Throughput: IMIX-2c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-ndr"
+  algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/http-server-performance-rps"
-  data:
-    "plot-vpp-http-server-performance"
-  filter: "'HTTP' and 'TCP_RPS'"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-vsc-ndr"
+  data: "plot-vpp-nfv-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'VM' and
+           'CHAIN' and
+           'IMIX' and
+           '4T2C' and
+           'NDRPDR'"
   parameters:
-  - "result"
+  - "throughput"
   - "name"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  - "tags"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = VNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
   layout:
-    title: "VPP HTTP Server Performance"
-    layout:
-      "plot-rps"
-
-################################################################################
+    title: "<b>Throughput:</b> eth-l2bd-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-ndr"
+    layout: "plot-service-density"
 
-# Packet Throughput - VPP L2 3n-hsw-x520 base and scale
 -
   type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
+  title: "Packet Throughput: 64B-1c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-pdr"
+  algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-vsc-pdr"
+  data: "plot-vpp-nfv-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'VM' and
+           'CHAIN' and
            '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'ETH' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
+           '2T1C' and
+           'NDRPDR'"
   parameters:
   - "throughput"
-  - "parent"
+  - "name"
   - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = VNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "64B Packet Throughput (mean PDR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-pdr"
+    layout: "plot-service-density"
+
+-
+  type: "plot"
+  title: "Packet Throughput: 64B-2c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-pdr"
+  algorithm: "plot_service_density_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-vsc-pdr"
+  data: "plot-vpp-nfv-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'VM' and
+           'CHAIN' and
+           '64B' and
+           '4T2C' and
+           'NDRPDR'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = VNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "64B Packet Throughput (mean PDR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-pdr"
+    layout: "plot-service-density"
+
+-
+  type: "plot"
+  title: "Packet Throughput: IMIX-1c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-pdr"
+  algorithm: "plot_service_density_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-vsc-pdr"
+  data: "plot-vpp-nfv-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'VM' and
+           'CHAIN' and
+           'IMIX' and
+           '2T1C' and
+           'NDRPDR'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = VNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "IMIX Packet Throughput (mean PDR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-pdr"
+    layout: "plot-service-density"
+
+-
+  type: "plot"
+  title: "Packet Throughput: IMIX-2c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-pdr"
+  algorithm: "plot_service_density_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-vsc-pdr"
+  data: "plot-vpp-nfv-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'VM' and
+           'CHAIN' and
+           'IMIX' and
+           '4T2C' and
+           'NDRPDR'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = VNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "IMIX Packet Throughput (mean PDR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-pdr"
+    layout: "plot-service-density"
+
+################################################################################
+# Plots - NF Density - CSC
+
+-
+  type: "plot"
+  title: "Packet Throughput: 64B-1c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-mrr"
+  algorithm: "plot_service_density_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-csc-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'CHAIN' and
+           '64B' and
+           '2T1C' and
+           'MRR'"
+  parameters:
+  - "result"
+  - "name"
+  - "tags"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "64B Packet Throughput (mean MRR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{2XY}memif-{Y}chain-{XY}drc-vppip4-mrr"
+    layout: "plot-service-density"
+
+-
+  type: "plot"
+  title: "Packet Throughput: 64B-2c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-mrr"
+  algorithm: "plot_service_density_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-csc-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'CHAIN' and
+           '64B' and
+           '4T2C' and
+           'MRR'"
+  parameters:
+  - "result"
+  - "name"
+  - "tags"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "64B Packet Throughput (mean MRR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{2XY}memif-{Y}chain-{XY}drc-vppip4-mrr"
+    layout: "plot-service-density"
+
+-
+  type: "plot"
+  title: "Packet Throughput: IMIX-1c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-mrr"
+  algorithm: "plot_service_density_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-csc-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'CHAIN' and
+           'IMIX' and
+           '2T1C' and
+           'MRR'"
+  parameters:
+  - "result"
+  - "name"
+  - "tags"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{2XY}memif-{Y}chain-{XY}drc-vppip4-mrr"
+    layout: "plot-service-density"
+
+-
+  type: "plot"
+  title: "Packet Throughput: IMIX-2c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-mrr"
+  algorithm: "plot_service_density_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-csc-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'CHAIN' and
+           'IMIX' and
+           '4T2C' and
+           'MRR'"
+  parameters:
+  - "result"
+  - "name"
+  - "tags"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{2XY}memif-{Y}chain-{XY}drc-vppip4-mrr"
+    layout: "plot-service-density"
+
+-
+  type: "plot"
+  title: "Packet Throughput: 64B-1c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-ndr"
+  algorithm: "plot_service_density_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-csc-ndr"
+  data: "plot-vpp-nfv-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'CHAIN' and
+           '64B' and
+           '2T1C' and
+           'NDRPDR'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "64B Packet Throughput (mean NDR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{2XY}memif-{Y}chain-{XY}drc-vppip4-ndr"
+    layout: "plot-service-density"
+
+-
+  type: "plot"
+  title: "Packet Throughput: 64B-2c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-ndr"
+  algorithm: "plot_service_density_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-csc-ndr"
+  data: "plot-vpp-nfv-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'CHAIN' and
+           '64B' and
+           '4T2C' and
+           'NDRPDR'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "64B Packet Throughput (mean NDR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{2XY}memif-{Y}chain-{XY}drc-vppip4-ndr"
+    layout: "plot-service-density"
+
+-
+  type: "plot"
+  title: "Packet Throughput: IMIX-1c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-ndr"
+  algorithm: "plot_service_density_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-csc-ndr"
+  data: "plot-vpp-nfv-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'CHAIN' and
+           'IMIX' and
+           '2T1C' and
+           'NDRPDR'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{2XY}memif-{Y}chain-{XY}drc-vppip4-ndr"
+    layout: "plot-service-density"
+
+-
+  type: "plot"
+  title: "Packet Throughput: IMIX-2c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-ndr"
+  algorithm: "plot_service_density_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-csc-ndr"
+  data: "plot-vpp-nfv-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'CHAIN' and
+           'IMIX' and
+           '4T2C' and
+           'NDRPDR'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{2XY}memif-{Y}chain-{XY}drc-vppip4-ndr"
+    layout: "plot-service-density"
+
+-
+  type: "plot"
+  title: "Packet Throughput: 64B-1c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-pdr"
+  algorithm: "plot_service_density_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-csc-pdr"
+  data: "plot-vpp-nfv-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'CHAIN' and
+           '64B' and
+           '2T1C' and
+           'NDRPDR'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "64B Packet Throughput (mean PDR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{2XY}memif-{Y}chain-{XY}drc-vppip4-pdr"
+    layout: "plot-service-density"
+
+-
+  type: "plot"
+  title: "Packet Throughput: 64B-2c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-pdr"
+  algorithm: "plot_service_density_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-csc-pdr"
+  data: "plot-vpp-nfv-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'CHAIN' and
+           '64B' and
+           '4T2C' and
+           'NDRPDR'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "64B Packet Throughput (mean PDR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{2XY}memif-{Y}chain-{XY}drc-vppip4-pdr"
+    layout: "plot-service-density"
+
+-
+  type: "plot"
+  title: "Packet Throughput: IMIX-1c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-pdr"
+  algorithm: "plot_service_density_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-csc-pdr"
+  data: "plot-vpp-nfv-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'CHAIN' and
+           'IMIX' and
+           '2T1C' and
+           'NDRPDR'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "IMIX Packet Throughput (mean PDR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{2XY}memif-{Y}chain-{XY}drc-vppip4-pdr"
+    layout: "plot-service-density"
+
+-
+  type: "plot"
+  title: "Packet Throughput: IMIX-2c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-pdr"
+  algorithm: "plot_service_density_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-csc-pdr"
+  data: "plot-vpp-nfv-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'CHAIN' and
+           'IMIX' and
+           '4T2C' and
+           'NDRPDR'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "IMIX Packet Throughput (mean PDR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{2XY}memif-{Y}chain-{XY}drc-vppip4-pdr"
+    layout: "plot-service-density"
+
+################################################################################
+# Plots - NF Density - CSP
+
+-
+  type: "plot"
+  title: "Packet Throughput: 64B-1c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-mrr"
+  algorithm: "plot_service_density_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-csp-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           '64B' and
+           '2T1C' and
+           'MRR'"
+  parameters:
+  - "result"
+  - "name"
+  - "tags"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Pipeline"
+  y-axis: "Y = Number of Service Pipelines"
+  z-axis: "64B Packet Throughput (mean MRR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-mrr"
+    layout: "plot-service-density"
+
+-
+  type: "plot"
+  title: "Packet Throughput: 64B-2c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-mrr"
+  algorithm: "plot_service_density_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-csp-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           '64B' and
+           '4T2C' and
+           'MRR'"
+  parameters:
+  - "result"
+  - "name"
+  - "tags"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Pipeline"
+  y-axis: "Y = Number of Service Pipelines"
+  z-axis: "64B Packet Throughput (mean MRR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-mrr"
+    layout: "plot-service-density"
+
+-
+  type: "plot"
+  title: "Packet Throughput: IMIX-1c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-mrr"
+  algorithm: "plot_service_density_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-csp-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           'IMIX' and
+           '2T1C' and
+           'MRR'"
+  parameters:
+  - "result"
+  - "name"
+  - "tags"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Pipeline"
+  y-axis: "Y = Number of Service Pipelines"
+  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-mrr"
+    layout: "plot-service-density"
+
+-
+  type: "plot"
+  title: "Packet Throughput: IMIX-2c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-mrr"
+  algorithm: "plot_service_density_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-csp-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           'IMIX' and
+           '4T2C' and
+           'MRR'"
+  parameters:
+  - "result"
+  - "name"
+  - "tags"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Pipeline"
+  y-axis: "Y = Number of Service Pipelines"
+  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-mrr"
+    layout: "plot-service-density"
+
+-
+  type: "plot"
+  title: "Packet Throughput: 64B-1c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-ndr"
+  algorithm: "plot_service_density_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-csp-ndr"
+  data: "plot-vpp-nfv-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           '64B' and
+           '2T1C' and
+           'NDRPDR'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Pipeline"
+  y-axis: "Y = Number of Service Pipelines"
+  z-axis: "64B Packet Throughput (mean NDR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-ndr"
+    layout: "plot-service-density"
+
+-
+  type: "plot"
+  title: "Packet Throughput: 64B-2c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-ndr"
+  algorithm: "plot_service_density_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-csp-ndr"
+  data: "plot-vpp-nfv-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           '64B' and
+           '4T2C' and
+           'NDRPDR'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Pipeline"
+  y-axis: "Y = Number of Service Pipelines"
+  z-axis: "64B Packet Throughput (mean NDR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-ndr"
+    layout: "plot-service-density"
+
+-
+  type: "plot"
+  title: "Packet Throughput: IMIX-1c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-ndr"
+  algorithm: "plot_service_density_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-csp-ndr"
+  data: "plot-vpp-nfv-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           'IMIX' and
+           '2T1C' and
+           'NDRPDR'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Pipeline"
+  y-axis: "Y = Number of Service Pipelines"
+  z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-ndr"
+    layout: "plot-service-density"
+
+-
+  type: "plot"
+  title: "Packet Throughput: IMIX-2c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-ndr"
+  algorithm: "plot_service_density_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-csp-ndr"
+  data: "plot-vpp-nfv-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           'IMIX' and
+           '4T2C' and
+           'NDRPDR'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Pipeline"
+  y-axis: "Y = Number of Service Pipelines"
+  z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-ndr"
+    layout: "plot-service-density"
+
+-
+  type: "plot"
+  title: "Packet Throughput: 64B-1c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-pdr"
+  algorithm: "plot_service_density_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-csp-pdr"
+  data: "plot-vpp-nfv-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           '64B' and
+           '2T1C' and
+           'NDRPDR'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Pipeline"
+  y-axis: "Y = Number of Service Pipelines"
+  z-axis: "64B Packet Throughput (mean PDR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-pdr"
+    layout: "plot-service-density"
+
+-
+  type: "plot"
+  title: "Packet Throughput: 64B-2c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-pdr"
+  algorithm: "plot_service_density_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-csp-pdr"
+  data: "plot-vpp-nfv-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           '64B' and
+           '4T2C' and
+           'NDRPDR'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Pipeline"
+  y-axis: "Y = Number of Service Pipelines"
+  z-axis: "64B Packet Throughput (mean PDR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-pdr"
+    layout: "plot-service-density"
+
+-
+  type: "plot"
+  title: "Packet Throughput: IMIX-1c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-pdr"
+  algorithm: "plot_service_density_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-csp-pdr"
+  data: "plot-vpp-nfv-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           'IMIX' and
+           '2T1C' and
+           'NDRPDR'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Pipeline"
+  y-axis: "Y = Number of Service Pipelines"
+  z-axis: "IMIX Packet Throughput (mean PDR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-pdr"
+    layout: "plot-service-density"
+
+-
+  type: "plot"
+  title: "Packet Throughput: IMIX-2c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-pdr"
+  algorithm: "plot_service_density_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-csp-pdr"
+  data: "plot-vpp-nfv-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           'IMIX' and
+           '4T2C' and
+           'NDRPDR'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Pipeline"
+  y-axis: "Y = Number of Service Pipelines"
+  z-axis: "IMIX Packet Throughput (mean PDR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-pdr"
+    layout: "plot-service-density"
+
+################################################################################
+# Plots VPP HTTP Server Performance
+-
+  type: "plot"
+  title: "VPP HTTP Server Performance"
+  algorithm: "plot_http_server_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/http-server-performance-cps"
+  data:
+    "plot-vpp-http-server-performance"
+  # Keep this formatting, the filter is enclosed with " (quotation mark) and
+  # each tag is enclosed with ' (apostrophe).
+  filter: "'HTTP' and 'TCP_CPS'"
+  parameters:
+  - "result"
+  - "name"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "VPP HTTP Server Performance"
+    layout:
+      "plot-cps"
+
+-
+  type: "plot"
+  title: "VPP HTTP Server Performance"
+  algorithm: "plot_http_server_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/http-server-performance-rps"
+  data:
+    "plot-vpp-http-server-performance"
+  filter: "'HTTP' and 'TCP_RPS'"
+  parameters:
+  - "result"
+  - "name"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "VPP HTTP Server Performance"
+    layout:
+      "plot-rps"
+
+################################################################################
+
+# Packet Throughput - VPP L2 3n-hsw-x520 base and scale
+-
+  type: "plot"
+  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
+  algorithm: "plot_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/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
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
+           'ETH' and
+           '1T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           not 'MEMIF'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  sort:
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
   - "FIB_100K"
   - "FIB_1M"
   traces:
@@ -9303,168 +10457,30 @@
   - "NAT44"
   - "POLICE_MARK"
   - "COPWHLIST"
-  - "IACL"
-  - "OACL"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-x710-64b-2t2c-features-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP IPv4 3n-hsw-x710 features nat44
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-nat44-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-nat44-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '2T1C' and
-           'IP4FWD' and
-           'NAT44' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "BASE"
-  - "BASE"
-  - "SRC_USER_10"
-  - "SRC_USER_100"
-  - "SRC_USER_1000"
-  - "SRC_USER_2000"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-skx-x710-64b-2t1c-features-nat44-ndr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-nat44-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-nat44-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '2T1C' and
-           'IP4FWD' and
-           'NAT44' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "BASE"
-  - "BASE"
-  - "SRC_USER_10"
-  - "SRC_USER_100"
-  - "SRC_USER_1000"
-  - "SRC_USER_2000"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-skx-x710-64b-2t1c-features-nat44-pdr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-nat44-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-nat44-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '4T2C' and
-           'IP4FWD' and
-           'NAT44' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "BASE"
-  - "BASE"
-  - "SRC_USER_10"
-  - "SRC_USER_100"
-  - "SRC_USER_1000"
-  - "SRC_USER_2000"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-skx-x710-64b-4t2c-features-nat44-ndr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-nat44-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-nat44-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '4T2C' and
-           'IP4FWD' and
-           'NAT44' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "BASE"
-  - "BASE"
-  - "SRC_USER_10"
-  - "SRC_USER_100"
-  - "SRC_USER_1000"
-  - "SRC_USER_2000"
+  - "IACL"
+  - "OACL"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-skx-x710-64b-4t2c-features-nat44-pdr"
+    title: "ip4-3n-hsw-x710-64b-2t2c-features-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - VPP IPv4 3n-hsw-x710 features iacl
+# Packet Throughput - VPP IPv4 3n-hsw-x710 features nat44
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-iacl-ndr"
+  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-nat44-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-iacl-ndr"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-nat44-ndr"
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
            '2T1C' and
            'IP4FWD' and
-           'IACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           'NAT44' and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -9472,32 +10488,33 @@
   - "parent"
   - "tags"
   sort:
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
+  - "BASE"
+  - "BASE"
+  - "SRC_USER_10"
+  - "SRC_USER_100"
+  - "SRC_USER_1000"
+  - "SRC_USER_2000"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-skx-x710-64b-2t1c-features-iacl-ndr"
+    title: "ip4-3n-skx-x710-64b-2t1c-features-nat44-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-iacl-pdr"
+  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-nat44-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-iacl-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-nat44-pdr"
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
            '2T1C' and
            'IP4FWD' and
-           'IACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           'NAT44' and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -9505,32 +10522,33 @@
   - "parent"
   - "tags"
   sort:
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
+  - "BASE"
+  - "BASE"
+  - "SRC_USER_10"
+  - "SRC_USER_100"
+  - "SRC_USER_1000"
+  - "SRC_USER_2000"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-skx-x710-64b-2t1c-features-iacl-pdr"
+    title: "ip4-3n-skx-x710-64b-2t1c-features-nat44-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-iacl-ndr"
+  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-nat44-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-iacl-ndr"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-nat44-ndr"
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
            '4T2C' and
            'IP4FWD' and
-           'IACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           'NAT44' and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -9538,32 +10556,33 @@
   - "parent"
   - "tags"
   sort:
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
+  - "BASE"
+  - "BASE"
+  - "SRC_USER_10"
+  - "SRC_USER_100"
+  - "SRC_USER_1000"
+  - "SRC_USER_2000"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-skx-x710-64b-4t2c-features-iacl-ndr"
+    title: "ip4-3n-skx-x710-64b-4t2c-features-nat44-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-iacl-pdr"
+  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-nat44-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-iacl-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-nat44-pdr"
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
            '4T2C' and
            'IP4FWD' and
-           'IACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           'NAT44' and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -9571,32 +10590,34 @@
   - "parent"
   - "tags"
   sort:
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
+  - "BASE"
+  - "BASE"
+  - "SRC_USER_10"
+  - "SRC_USER_100"
+  - "SRC_USER_1000"
+  - "SRC_USER_2000"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-skx-x710-64b-4t2c-features-iacl-pdr"
+    title: "ip4-3n-skx-x710-64b-4t2c-features-nat44-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - VPP IPv4 3n-hsw-x710 features oacl
+# Packet Throughput - VPP IPv4 3n-hsw-x710 features iacl
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-oacl-ndr"
+  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-iacl-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-oacl-ndr"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-iacl-ndr"
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
            '2T1C' and
            'IP4FWD' and
-           'OACL' and
+           'IACL' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
            not 'IPSEC' and
            not 'VHOST'"
@@ -9614,22 +10635,22 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-skx-x710-64b-2t1c-features-oacl-ndr"
+    title: "ip4-3n-skx-x710-64b-2t1c-features-iacl-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-oacl-pdr"
+  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-iacl-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-oacl-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-iacl-pdr"
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
            '2T1C' and
            'IP4FWD' and
-           'OACL' and
+           'IACL' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
            not 'IPSEC' and
            not 'VHOST'"
@@ -9647,22 +10668,22 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-skx-x710-64b-2t1c-features-oacl-pdr"
+    title: "ip4-3n-skx-x710-64b-2t1c-features-iacl-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-oacl-ndr"
+  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-iacl-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-oacl-ndr"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-iacl-ndr"
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
            '4T2C' and
            'IP4FWD' and
-           'OACL' and
+           'IACL' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
            not 'IPSEC' and
            not 'VHOST'"
@@ -9680,22 +10701,22 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-skx-x710-64b-4t2c-features-oacl-ndr"
+    title: "ip4-3n-skx-x710-64b-4t2c-features-iacl-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-oacl-pdr"
+  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-iacl-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-oacl-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-iacl-pdr"
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
            '4T2C' and
            'IP4FWD' and
-           'OACL' and
+           'IACL' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
            not 'IPSEC' and
            not 'VHOST'"
@@ -9713,9 +10734,142 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-skx-x710-64b-4t2c-features-oacl-pdr"
+    title: "ip4-3n-skx-x710-64b-4t2c-features-iacl-pdr"
     layout: "plot-throughput"
 
+## Packet Throughput - VPP IPv4 3n-hsw-x710 features oacl
+#-
+#  type: "plot"
+#  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-oacl-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-oacl-ndr"
+#  data: "plot-vpp-throughput-latency-3n-skx"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           '2T1C' and
+#           'IP4FWD' and
+#           'OACL' and
+#           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+#           not 'IPSEC' and
+#           not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "ACL_STATELESS"
+#  - "ACL_STATEFUL"
+#  - "ACL_STATELESS"
+#  - "ACL_STATEFUL"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "ip4-3n-skx-x710-64b-2t1c-features-oacl-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-oacl-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-oacl-pdr"
+#  data: "plot-vpp-throughput-latency-3n-skx"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           '2T1C' and
+#           'IP4FWD' and
+#           'OACL' and
+#           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+#           not 'IPSEC' and
+#           not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "ACL_STATELESS"
+#  - "ACL_STATEFUL"
+#  - "ACL_STATELESS"
+#  - "ACL_STATEFUL"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "ip4-3n-skx-x710-64b-2t1c-features-oacl-pdr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-oacl-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-oacl-ndr"
+#  data: "plot-vpp-throughput-latency-3n-skx"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           '4T2C' and
+#           'IP4FWD' and
+#           'OACL' and
+#           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+#           not 'IPSEC' and
+#           not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "ACL_STATELESS"
+#  - "ACL_STATEFUL"
+#  - "ACL_STATELESS"
+#  - "ACL_STATEFUL"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "ip4-3n-skx-x710-64b-4t2c-features-oacl-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-oacl-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-oacl-pdr"
+#  data: "plot-vpp-throughput-latency-3n-skx"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           '4T2C' and
+#           'IP4FWD' and
+#           'OACL' and
+#           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+#           not 'IPSEC' and
+#           not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "ACL_STATELESS"
+#  - "ACL_STATEFUL"
+#  - "ACL_STATELESS"
+#  - "ACL_STATEFUL"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "ip4-3n-skx-x710-64b-4t2c-features-oacl-pdr"
+#    layout: "plot-throughput"
+
 # Packet Throughput - VPP IPv4 3n-hsw-xl710 base and scale
 -
   type: "plot"
@@ -10216,168 +11370,33 @@
   - "parent"
   - "tags"
   sort:
-  - "BASE"
-  - "BASE"
-  - "SRC_USER_10"
-  - "SRC_USER_100"
-  - "SRC_USER_1000"
-  - "SRC_USER_2000"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-x710-64b-2t2c-features-nat44-ndr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-features-nat44-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-nat44-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '2T2C' and
-           'IP4FWD' and
-           'NAT44' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "BASE"
-  - "BASE"
-  - "SRC_USER_10"
-  - "SRC_USER_100"
-  - "SRC_USER_1000"
-  - "SRC_USER_2000"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-x710-64b-2t2c-features-nat44-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP IPv4 3n-skx-x710 features iacl
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-features-iacl-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-iacl-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '1T1C' and
-           'IP4FWD' and
-           'IACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-x710-64b-1t1c-features-iacl-ndr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-features-iacl-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-iacl-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '1T1C' and
-           'IP4FWD' and
-           'IACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-x710-64b-1t1c-features-iacl-pdr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-features-iacl-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-iacl-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '2T2C' and
-           'IP4FWD' and
-           'IACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
+  - "BASE"
+  - "BASE"
+  - "SRC_USER_10"
+  - "SRC_USER_100"
+  - "SRC_USER_1000"
+  - "SRC_USER_2000"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x710-64b-2t2c-features-iacl-ndr"
+    title: "ip4-3n-hsw-x710-64b-2t2c-features-nat44-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-features-iacl-pdr"
+  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-features-nat44-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-iacl-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-nat44-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
            '2T2C' and
            'IP4FWD' and
-           'IACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           'NAT44' and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -10385,32 +11404,34 @@
   - "parent"
   - "tags"
   sort:
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
+  - "BASE"
+  - "BASE"
+  - "SRC_USER_10"
+  - "SRC_USER_100"
+  - "SRC_USER_1000"
+  - "SRC_USER_2000"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x710-64b-2t2c-features-iacl-pdr"
+    title: "ip4-3n-hsw-x710-64b-2t2c-features-nat44-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - VPP IPv4 3n-skx-x710 features oacl
+# Packet Throughput - VPP IPv4 3n-skx-x710 features iacl
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-features-oacl-ndr"
+  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-features-iacl-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-oacl-ndr"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-iacl-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
            '1T1C' and
            'IP4FWD' and
-           'OACL' and
+           'IACL' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
            not 'IPSEC' and
            not 'VHOST'"
@@ -10428,22 +11449,22 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x710-64b-1t1c-features-oacl-ndr"
+    title: "ip4-3n-hsw-x710-64b-1t1c-features-iacl-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-features-oacl-pdr"
+  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-features-iacl-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-oacl-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-iacl-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
            '1T1C' and
            'IP4FWD' and
-           'OACL' and
+           'IACL' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
            not 'IPSEC' and
            not 'VHOST'"
@@ -10461,22 +11482,22 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x710-64b-1t1c-features-oacl-pdr"
+    title: "ip4-3n-hsw-x710-64b-1t1c-features-iacl-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-features-oacl-ndr"
+  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-features-iacl-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-oacl-ndr"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-iacl-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
            '2T2C' and
            'IP4FWD' and
-           'OACL' and
+           'IACL' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
            not 'IPSEC' and
            not 'VHOST'"
@@ -10494,22 +11515,22 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x710-64b-2t2c-features-oacl-ndr"
+    title: "ip4-3n-hsw-x710-64b-2t2c-features-iacl-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-features-oacl-pdr"
+  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-features-iacl-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-oacl-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-iacl-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
            '2T2C' and
            'IP4FWD' and
-           'OACL' and
+           'IACL' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
            not 'IPSEC' and
            not 'VHOST'"
@@ -10527,9 +11548,142 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x710-64b-2t2c-features-oacl-pdr"
+    title: "ip4-3n-hsw-x710-64b-2t2c-features-iacl-pdr"
     layout: "plot-throughput"
 
+## Packet Throughput - VPP IPv4 3n-skx-x710 features oacl
+#-
+#  type: "plot"
+#  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-features-oacl-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-oacl-ndr"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           '1T1C' and
+#           'IP4FWD' and
+#           'OACL' and
+#           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+#           not 'IPSEC' and
+#           not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "ACL_STATELESS"
+#  - "ACL_STATEFUL"
+#  - "ACL_STATELESS"
+#  - "ACL_STATEFUL"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "ip4-3n-hsw-x710-64b-1t1c-features-oacl-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-features-oacl-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-oacl-pdr"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           '1T1C' and
+#           'IP4FWD' and
+#           'OACL' and
+#           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+#           not 'IPSEC' and
+#           not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "ACL_STATELESS"
+#  - "ACL_STATEFUL"
+#  - "ACL_STATELESS"
+#  - "ACL_STATEFUL"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "ip4-3n-hsw-x710-64b-1t1c-features-oacl-pdr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-features-oacl-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-oacl-ndr"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           '2T2C' and
+#           'IP4FWD' and
+#           'OACL' and
+#           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+#           not 'IPSEC' and
+#           not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "ACL_STATELESS"
+#  - "ACL_STATEFUL"
+#  - "ACL_STATELESS"
+#  - "ACL_STATEFUL"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "ip4-3n-hsw-x710-64b-2t2c-features-oacl-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-features-oacl-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-oacl-pdr"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           '2T2C' and
+#           'IP4FWD' and
+#           'OACL' and
+#           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+#           not 'IPSEC' and
+#           not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "ACL_STATELESS"
+#  - "ACL_STATEFUL"
+#  - "ACL_STATELESS"
+#  - "ACL_STATEFUL"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "ip4-3n-hsw-x710-64b-2t2c-features-oacl-pdr"
+#    layout: "plot-throughput"
+
 # Packet Throughput - VPP IPv4 2n-skx-x710 base and scale
 -
   type: "plot"
@@ -10915,138 +12069,138 @@
 
 ################################################################################
 
-# Packet Throughput - VPP IPv4 tunnels 3n-hsw-x520 base and scale
--
-  type: "plot"
-  title: "VPP Throughput: ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'ENCAP' and
-           'NDRPDR' and
-           '1T1C' and
-           ('VXLAN' or 'LISP') and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "not DOT1Q"
-  - "VXLAN_1"
-  - "VXLAN_10"
-  - "VXLAN_100"
-  - "VXLAN_1000"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'ENCAP' and
-           'NDRPDR' and
-           '1T1C' and
-           ('VXLAN' or 'LISP') and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "not DOT1Q"
-  - "VXLAN_1"
-  - "VXLAN_10"
-  - "VXLAN_100"
-  - "VXLAN_1000"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'ENCAP' and
-           'NDRPDR' and
-           '2T2C' and
-           ('VXLAN' or 'LISP') and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "not DOT1Q"
-  - "VXLAN_1"
-  - "VXLAN_10"
-  - "VXLAN_100"
-  - "VXLAN_1000"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'ENCAP' and
-           'NDRPDR' and
-           '2T2C' and
-           ('VXLAN' or 'LISP') and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "not DOT1Q"
-  - "VXLAN_1"
-  - "VXLAN_10"
-  - "VXLAN_100"
-  - "VXLAN_1000"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
-    layout: "plot-throughput"
+## Packet Throughput - VPP IPv4 tunnels 3n-hsw-x520 base and scale
+#-
+#  type: "plot"
+#  title: "VPP Throughput: ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-X520-DA2' and
+#           '64B' and
+#           'ENCAP' and
+#           'NDRPDR' and
+#           '1T1C' and
+#           ('VXLAN' or 'LISP') and
+#           not 'VHOST' and
+#           not 'IPSECHW'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "not DOT1Q"
+#  - "VXLAN_1"
+#  - "VXLAN_10"
+#  - "VXLAN_100"
+#  - "VXLAN_1000"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-X520-DA2' and
+#           '64B' and
+#           'ENCAP' and
+#           'NDRPDR' and
+#           '1T1C' and
+#           ('VXLAN' or 'LISP') and
+#           not 'VHOST' and
+#           not 'IPSECHW'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "not DOT1Q"
+#  - "VXLAN_1"
+#  - "VXLAN_10"
+#  - "VXLAN_100"
+#  - "VXLAN_1000"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-X520-DA2' and
+#           '64B' and
+#           'ENCAP' and
+#           'NDRPDR' and
+#           '2T2C' and
+#           ('VXLAN' or 'LISP') and
+#           not 'VHOST' and
+#           not 'IPSECHW'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "not DOT1Q"
+#  - "VXLAN_1"
+#  - "VXLAN_10"
+#  - "VXLAN_100"
+#  - "VXLAN_1000"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-X520-DA2' and
+#           '64B' and
+#           'ENCAP' and
+#           'NDRPDR' and
+#           '2T2C' and
+#           ('VXLAN' or 'LISP') and
+#           not 'VHOST' and
+#           not 'IPSECHW'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "not DOT1Q"
+#  - "VXLAN_1"
+#  - "VXLAN_10"
+#  - "VXLAN_100"
+#  - "VXLAN_1000"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
+#    layout: "plot-throughput"
 
 # Packet Throughput - VPP IPv4 tunnels 3n-hsw-x520 - features
 -
@@ -12568,7 +13722,7 @@
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-4t2c-base_and_features-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('IP6BASE' or
@@ -15846,6 +17000,7 @@
            '2T1C' and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'DOT1Q'"
   parameters:
   - "throughput"
@@ -15878,6 +17033,7 @@
            '4T2C' and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'DOT1Q'"
   parameters:
   - "throughput"
@@ -15910,6 +17066,7 @@
            '2T1C' and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'DOT1Q'"
   parameters:
   - "throughput"
@@ -15942,6 +17099,7 @@
            '4T2C' and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'DOT1Q'"
   parameters:
   - "throughput"
@@ -15975,6 +17133,7 @@
            'L2BDMACLRN' and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'IP4FWD' and
            not '2VM'"
   parameters:
@@ -16010,6 +17169,7 @@
            'L2BDMACLRN' and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'IP4FWD' and
            not '2VM'"
   parameters:
@@ -16045,6 +17205,7 @@
            'L2BDMACLRN' and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'IP4FWD' and
            not '2VM'"
   parameters:
@@ -16080,6 +17241,7 @@
            'L2BDMACLRN' and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'IP4FWD' and
            not '2VM'"
   parameters:
@@ -16117,6 +17279,7 @@
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'IP4FWD' and
            not '2VM'"
   parameters:
@@ -16152,6 +17315,7 @@
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'IP4FWD' and
            not '2VM'"
   parameters:
@@ -16187,6 +17351,7 @@
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'IP4FWD' and
            not '2VM'"
   parameters:
@@ -16222,6 +17387,7 @@
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'IP4FWD' and
            not '2VM'"
   parameters:
@@ -16258,6 +17424,7 @@
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'IP4FWD'"
   parameters:
   - "throughput"
@@ -16292,6 +17459,7 @@
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'IP4FWD'"
   parameters:
   - "throughput"
@@ -16326,6 +17494,7 @@
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'IP4FWD'"
   parameters:
   - "throughput"
@@ -16360,6 +17529,7 @@
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'IP4FWD'"
   parameters:
   - "throughput"
@@ -20202,73 +21372,14 @@
   title: "VPP Latency: ip4-3n-hsw-x710-64b-2t2c-features-iacl-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-iacl-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '2T2C' and
-           'IP4FWD' and
-           'IACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  layout:
-    title: "ip4-3n-hsw-x710-64b-2t2c-features-iacl-ndr"
-    layout: "plot-latency"
-
-# Packet Latency - VPP IPv4 3n-hsw-x710 features oacl
--
-  type: "plot"
-  title: "VPP Latency: ip4-3n-hsw-x710-64b-1t1c-features-oacl-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-oacl-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '1T1C' and
-           'IP4FWD' and
-           'OACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  layout:
-    title: "ip4-3n-hsw-x710-64b-1t1c-features-oacl-ndr"
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: ip4-3n-hsw-x710-64b-2t2c-features-oacl-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-oacl-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-iacl-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
            '2T2C' and
            'IP4FWD' and
-           'OACL' and
+           'IACL' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
            not 'IPSEC' and
            not 'VHOST'"
@@ -20282,9 +21393,68 @@
   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   layout:
-    title: "ip4-3n-hsw-x710-64b-2t2c-features-oacl-ndr"
+    title: "ip4-3n-hsw-x710-64b-2t2c-features-iacl-ndr"
     layout: "plot-latency"
 
+## Packet Latency - VPP IPv4 3n-hsw-x710 features oacl
+#-
+#  type: "plot"
+#  title: "VPP Latency: ip4-3n-hsw-x710-64b-1t1c-features-oacl-ndr-lat"
+#  algorithm: "plot_latency_error_bars"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-oacl-ndr-lat"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           '1T1C' and
+#           'IP4FWD' and
+#           'OACL' and
+#           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+#           not 'IPSEC' and
+#           not 'VHOST'"
+#  parameters:
+#  - "latency"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "ACL_STATELESS"
+#  - "ACL_STATEFUL"
+#  - "ACL_STATELESS"
+#  - "ACL_STATEFUL"
+#  layout:
+#    title: "ip4-3n-hsw-x710-64b-1t1c-features-oacl-ndr"
+#    layout: "plot-latency"
+#
+#-
+#  type: "plot"
+#  title: "VPP Latency: ip4-3n-hsw-x710-64b-2t2c-features-oacl-ndr-lat"
+#  algorithm: "plot_latency_error_bars"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-oacl-ndr-lat"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           '2T2C' and
+#           'IP4FWD' and
+#           'OACL' and
+#           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+#           not 'IPSEC' and
+#           not 'VHOST'"
+#  parameters:
+#  - "latency"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "ACL_STATELESS"
+#  - "ACL_STATEFUL"
+#  - "ACL_STATELESS"
+#  - "ACL_STATEFUL"
+#  layout:
+#    title: "ip4-3n-hsw-x710-64b-2t2c-features-oacl-ndr"
+#    layout: "plot-latency"
+
 # Packet Latency - VPP IPv4 3n-hsw-xl710 base and scale
 -
   type: "plot"
@@ -20588,64 +21758,64 @@
     title: "ip4-3n-skx-x710-64b-4t2c-features-iacl-ndr"
     layout: "plot-latency"
 
-# Packet Latency - VPP IPv4 3n-skx-x710 features oacl
--
-  type: "plot"
-  title: "VPP Latency: ip4-3n-skx-x710-64b-2t1c-features-oacl-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-oacl-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '2T1C' and
-           'IP4FWD' and
-           'OACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  layout:
-    title: "ip4-3n-skx-x710-64b-2t1c-features-oacl-ndr"
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: ip4-3n-skx-x710-64b-4t2c-features-oacl-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-ndr-oacl-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '4T2C' and
-           'IP4FWD' and
-           'OACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  layout:
-    title: "ip4-3n-skx-x710-64b-4t2c-features-oacl-ndr"
-    layout: "plot-latency"
+## Packet Latency - VPP IPv4 3n-skx-x710 features oacl
+#-
+#  type: "plot"
+#  title: "VPP Latency: ip4-3n-skx-x710-64b-2t1c-features-oacl-ndr-lat"
+#  algorithm: "plot_latency_error_bars"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-oacl-ndr-lat"
+#  data: "plot-vpp-throughput-latency-3n-skx"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           '2T1C' and
+#           'IP4FWD' and
+#           'OACL' and
+#           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+#           not 'IPSEC' and
+#           not 'VHOST'"
+#  parameters:
+#  - "latency"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "ACL_STATELESS"
+#  - "ACL_STATEFUL"
+#  - "ACL_STATELESS"
+#  - "ACL_STATEFUL"
+#  layout:
+#    title: "ip4-3n-skx-x710-64b-2t1c-features-oacl-ndr"
+#    layout: "plot-latency"
+#
+#-
+#  type: "plot"
+#  title: "VPP Latency: ip4-3n-skx-x710-64b-4t2c-features-oacl-ndr-lat"
+#  algorithm: "plot_latency_error_bars"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-ndr-oacl-lat"
+#  data: "plot-vpp-throughput-latency-3n-skx"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           '4T2C' and
+#           'IP4FWD' and
+#           'OACL' and
+#           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+#           not 'IPSEC' and
+#           not 'VHOST'"
+#  parameters:
+#  - "latency"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "ACL_STATELESS"
+#  - "ACL_STATEFUL"
+#  - "ACL_STATELESS"
+#  - "ACL_STATEFUL"
+#  layout:
+#    title: "ip4-3n-skx-x710-64b-4t2c-features-oacl-ndr"
+#    layout: "plot-latency"
 
 # Packet Latency - VPP IPv4 2n-skx-x710 base and scale
 -
@@ -20767,64 +21937,64 @@
 
 ################################################################################
 
-# Packet Latency - VPP Ipv4 tunnels 3n-hsw-x520
--
-  type: "plot"
-  title: "VPP Latency: ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'ENCAP' and
-           'NDRPDR' and
-           '1T1C' and
-           ('VXLAN' or 'LISP') and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "not DOT1Q"
-  - "VXLAN_1"
-  - "VXLAN_10"
-  - "VXLAN_100"
-  - "VXLAN_1000"
-  layout:
-    title: "ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'ENCAP' and
-           'NDRPDR' and
-           '2T2C' and
-           ('VXLAN' or 'LISP') and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "not DOT1Q"
-  - "VXLAN_1"
-  - "VXLAN_10"
-  - "VXLAN_100"
-  - "VXLAN_1000"
-  layout:
-    title: "ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
-    layout: "plot-latency"
+## Packet Latency - VPP Ipv4 tunnels 3n-hsw-x520
+#-
+#  type: "plot"
+#  title: "VPP Latency: ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
+#  algorithm: "plot_latency_error_bars"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-X520-DA2' and
+#           '64B' and
+#           'ENCAP' and
+#           'NDRPDR' and
+#           '1T1C' and
+#           ('VXLAN' or 'LISP') and
+#           not 'VHOST' and
+#           not 'IPSECHW'"
+#  parameters:
+#  - "latency"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "not DOT1Q"
+#  - "VXLAN_1"
+#  - "VXLAN_10"
+#  - "VXLAN_100"
+#  - "VXLAN_1000"
+#  layout:
+#    title: "ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
+#    layout: "plot-latency"
+#
+#-
+#  type: "plot"
+#  title: "VPP Latency: ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
+#  algorithm: "plot_latency_error_bars"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-X520-DA2' and
+#           '64B' and
+#           'ENCAP' and
+#           'NDRPDR' and
+#           '2T2C' and
+#           ('VXLAN' or 'LISP') and
+#           not 'VHOST' and
+#           not 'IPSECHW'"
+#  parameters:
+#  - "latency"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "not DOT1Q"
+#  - "VXLAN_1"
+#  - "VXLAN_10"
+#  - "VXLAN_100"
+#  - "VXLAN_1000"
+#  layout:
+#    title: "ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
+#    layout: "plot-latency"
 
 # Packet Latency - VPP Ipv4 tunnels 3n-hsw-x520 - features
 -
@@ -20847,10 +22017,10 @@
   - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "LISP"
+#  sort:
+#  - "L2BDMACLRN"
+#  - "L2XCFWD"
+#  - "LISP"
   layout:
     title: "ip4tun-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
     layout: "plot-latency"
@@ -22720,6 +23890,7 @@
            '2T1C' and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'DOT1Q'"
   parameters:
   - "latency"
@@ -22748,6 +23919,7 @@
            '4T2C' and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'DOT1Q'"
   parameters:
   - "latency"
@@ -22778,6 +23950,7 @@
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
+           not 'NF_DENSITY' and
            not '2VM'"
   parameters:
   - "latency"
@@ -22808,6 +23981,7 @@
            'L2BDMACLRN' and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'IP4FWD' and
            not '2VM'"
   parameters:
@@ -22841,6 +24015,7 @@
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'IP4FWD' and
            not '2VM'"
   parameters:
@@ -22872,6 +24047,7 @@
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'IP4FWD' and
            not '2VM'"
   parameters:
@@ -22904,6 +24080,7 @@
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'IP4FWD'"
   parameters:
   - "latency"
@@ -22934,6 +24111,7 @@
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'IP4FWD'"
   parameters:
   - "latency"
@@ -24063,7 +25241,7 @@
            'NDRPDR' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-            'MEMIF'"
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
@@ -24093,6 +25271,7 @@
            'NDRPDR' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
+           not 'NF_DENSITY' and
            'MEMIF'"
   parameters:
   - "throughput"
@@ -24122,7 +25301,8 @@
            'NDRPDR' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-            'MEMIF'"
+           not 'NF_DENSITY' and
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
@@ -24181,7 +25361,7 @@
            'NDRPDR' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-            'MEMIF'"
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
@@ -24968,62 +26148,62 @@
     title: "ip4-3n-hsw-x710-64b-features-iacl-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP IPv4 3n-hsw-x710 features oacl
--
-  type: "plot"
-  title: "Speedup: ip4-3n-hsw-x710-64b-features-oacl-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-features-oacl-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           'IP4FWD' and
-           'OACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  layout:
-    title: "ip4-3n-hsw-x710-64b-features-oacl-ndr"
-    layout: "plot-throughput-speedup-analysis"
-
--
-  type: "plot"
-  title: "Speedup: ip4-3n-hsw-x710-64b-features-oacl-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-features-oacl-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           'IP4FWD' and
-           'OACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  layout:
-    title: "ip4-3n-hsw-x710-64b-features-oacl-pdr"
-    layout: "plot-throughput-speedup-analysis"
+## Speedup - VPP IPv4 3n-hsw-x710 features oacl
+#-
+#  type: "plot"
+#  title: "Speedup: ip4-3n-hsw-x710-64b-features-oacl-ndr-tsa"
+#  algorithm: "plot_throughput_speedup_analysis"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-features-oacl-ndr-tsa"
+#  data: "plot-throughput-speedup-analysis-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           'IP4FWD' and
+#           'OACL' and
+#           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+#           not 'IPSEC' and
+#           not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "ACL_STATELESS"
+#  - "ACL_STATEFUL"
+#  - "ACL_STATELESS"
+#  - "ACL_STATEFUL"
+#  layout:
+#    title: "ip4-3n-hsw-x710-64b-features-oacl-ndr"
+#    layout: "plot-throughput-speedup-analysis"
+#
+#-
+#  type: "plot"
+#  title: "Speedup: ip4-3n-hsw-x710-64b-features-oacl-pdr-tsa"
+#  algorithm: "plot_throughput_speedup_analysis"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-features-oacl-pdr-tsa"
+#  data: "plot-throughput-speedup-analysis-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           'IP4FWD' and
+#           'OACL' and
+#           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+#           not 'IPSEC' and
+#           not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "ACL_STATELESS"
+#  - "ACL_STATEFUL"
+#  - "ACL_STATELESS"
+#  - "ACL_STATEFUL"
+#  layout:
+#    title: "ip4-3n-hsw-x710-64b-features-oacl-pdr"
+#    layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP IPv4 3n-hsw-xl710 base and scale
 -
@@ -25540,62 +26720,62 @@
 
 ################################################################################
 
-# Speedup - VPP IPv4 Tunnels 3n-hsw-x520
--
-  type: "plot"
-  title: "Speedup: ip4tun-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X520_DA2' and
-           '64B' and
-           'ENCAP' and
-           'NDRPDR' and
-           ('VXLAN' or 'LISP') and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "not DOT1Q"
-  - "VXLAN_1"
-  - "VXLAN_10"
-  - "VXLAN_100"
-  - "VXLAN_1000"
-  layout:
-    title: "ip4tun-3n-hsw-x520-64b-base_and_scale-ndr"
-    layout: "plot-throughput-speedup-analysis"
-
--
-  type: "plot"
-  title: "Speedup: ip4tun-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X520_DA2' and
-           '64B' and
-           'ENCAP' and
-           'NDRPDR' and
-           ('VXLAN' or 'LISP') and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "not DOT1Q"
-  - "VXLAN_1"
-  - "VXLAN_10"
-  - "VXLAN_100"
-  - "VXLAN_1000"
-  layout:
-    title: "ip4tun-3n-hsw-x520-64b-base_and_scale-pdr"
-    layout: "plot-throughput-speedup-analysis"
+## Speedup - VPP IPv4 Tunnels 3n-hsw-x520
+#-
+#  type: "plot"
+#  title: "Speedup: ip4tun-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
+#  algorithm: "plot_throughput_speedup_analysis"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
+#  data: "plot-throughput-speedup-analysis-3n-hsw"
+#  filter: "'NIC_Intel-X520_DA2' and
+#           '64B' and
+#           'ENCAP' and
+#           'NDRPDR' and
+#           ('VXLAN' or 'LISP') and
+#           not 'VHOST' and
+#           not 'IPSECHW'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "not DOT1Q"
+#  - "VXLAN_1"
+#  - "VXLAN_10"
+#  - "VXLAN_100"
+#  - "VXLAN_1000"
+#  layout:
+#    title: "ip4tun-3n-hsw-x520-64b-base_and_scale-ndr"
+#    layout: "plot-throughput-speedup-analysis"
+#
+#-
+#  type: "plot"
+#  title: "Speedup: ip4tun-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
+#  algorithm: "plot_throughput_speedup_analysis"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
+#  data: "plot-throughput-speedup-analysis-3n-hsw"
+#  filter: "'NIC_Intel-X520_DA2' and
+#           '64B' and
+#           'ENCAP' and
+#           'NDRPDR' and
+#           ('VXLAN' or 'LISP') and
+#           not 'VHOST' and
+#           not 'IPSECHW'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "not DOT1Q"
+#  - "VXLAN_1"
+#  - "VXLAN_10"
+#  - "VXLAN_100"
+#  - "VXLAN_1000"
+#  layout:
+#    title: "ip4tun-3n-hsw-x520-64b-base_and_scale-pdr"
+#    layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP IPv4 Tunnels 3n-hsw-x520 - features
 -
@@ -26237,10 +27417,10 @@
 # Speedup - VPP IPv6 3n-skx-x710 features
 -
   type: "plot"
-  title: "Speedup: ip6-3n-skx-x710-78b-base_and_scale-ndr-tsa"
+  title: "Speedup: ip6-3n-skx-x710-78b-base_and_features-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-base_and_scale-ndr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-base_and_features-ndr-tsa"
   data: "plot-throughput-speedup-analysis-3n-skx"
   filter: "'NIC_Intel-X710' and
            '78B' and
@@ -26263,15 +27443,15 @@
   - "COPWHLIST"
   - "IACLDST"
   layout:
-    title: "ip6-3n-skx-x710-78b-base_and_scale-ndr"
+    title: "ip6-3n-skx-x710-78b-base_and_features-ndr"
     layout: "plot-throughput-speedup-analysis"
 
 -
   type: "plot"
-  title: "Speedup: ip6-3n-skx-x710-78b-base_and_scale-pdr-tsa"
+  title: "Speedup: ip6-3n-skx-x710-78b-base_and_features-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-base_and_scale-pdr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-base_and_features-pdr-tsa"
   data: "plot-throughput-speedup-analysis-3n-skx"
   filter: "'NIC_Intel-X710' and
            '78B' and
@@ -26294,7 +27474,7 @@
   - "COPWHLIST"
   - "IACLDST"
   layout:
-    title: "ip6-3n-skx-x710-78b-base_and_scale-pdr"
+    title: "ip6-3n-skx-x710-78b-base_and_features-pdr"
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP IPv6 2n-skx-x710
@@ -28322,6 +29502,7 @@
            'IP4FWD' and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'DOT1Q'"
   parameters:
   - "throughput"
@@ -28349,6 +29530,7 @@
            'IP4FWD' and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'DOT1Q'"
   parameters:
   - "throughput"
@@ -28377,6 +29559,7 @@
            'L2BDMACLRN' and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'IP4FWD' and
            not '2VM'"
   parameters:
@@ -28407,6 +29590,7 @@
            'L2BDMACLRN' and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'IP4FWD' and
            not '2VM'"
   parameters:
@@ -28439,6 +29623,7 @@
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'IP4FWD' and
            not '2VM'"
   parameters:
@@ -28469,6 +29654,7 @@
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'IP4FWD' and
            not '2VM'"
   parameters:
@@ -28500,6 +29686,7 @@
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'IP4FWD'"
   parameters:
   - "throughput"
@@ -28529,6 +29716,7 @@
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'IP4FWD'"
   parameters:
   - "throughput"