Code Review / csit.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
CSIT-1504: Soak tests - box plots
[csit.git] / resources / tools / presentation / specification.yaml
diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml
index f26d0c8..2b55499 100644 (file)
--- a/resources/tools/presentation/specification.yaml
+++ b/resources/tools/presentation/specification.yaml
@@ -1,5 +1,4 @@
--
-  type: "environment"
+- type: "environment"
 
   paths:
     # Top level directories:
 
   paths:
     # Top level directories:
@@ -75,7 +74,7 @@
   urls:
     URL[JENKINS,CSIT]: "https://jenkins.fd.io/view/csit/job"
     URL[JENKINS,HC]: "https://jenkins.fd.io/view/hc2vpp/job"
   urls:
     URL[JENKINS,CSIT]: "https://jenkins.fd.io/view/csit/job"
     URL[JENKINS,HC]: "https://jenkins.fd.io/view/hc2vpp/job"
-    URL[VIRL,DNV]: "http://10.30.51.28/download/denverton/1901/robot-plugin.zip"
+    URL[VIRL,DNV]: "http://10.30.51.28/download/denverton/{release}/robot-plugin.zip"
     # URL[VIRL,DNV]: "http://download.it/from/nexus"
     URL[NEXUS]: "https://docs.fd.io/csit"
     DIR[NEXUS]: "report/_static/archive"
     # URL[VIRL,DNV]: "http://download.it/from/nexus"
     URL[NEXUS]: "https://docs.fd.io/csit"
     DIR[NEXUS]: "report/_static/archive"
@@ -103,8 +102,7 @@
   - "DIR[BUILD,HTML]"
   - "DIR[BUILD,LATEX]"
 
   - "DIR[BUILD,HTML]"
   - "DIR[BUILD,LATEX]"
 
--
-  type: "configuration"
+- type: "configuration"
 
   limits:
     nic:
 
   limits:
     nic:
@@ -131,243 +129,163 @@
 
     # 3n-hsw
 
 
     # 3n-hsw
 
-    plot-vpp-throughput-latency-3n-hsw:
-      csit-vpp-perf-verify-1901-3n-hsw:
-#        - 10  # NDRPDR sel
-#        - 19  # NDRPDR sel
-#        - 31  # NDRPDR sel
-#        - 36  # NDRPDR sel
-#        - 40  # NDRPDR sel
-#        - 42  # NDRPDR sel
-#        - 44  # NDRPDR sel
-#        - 46  # NDRPDR sel
-#        - 47  # NDRPDR sel
-#        - 48  # NDRPDR sel
-#        - 61  # NDRPDR LB
-#        - 62  # NDRPDR LB
-#        - 63  # NDRPDR LB
-#        - 64  # NDRPDR LB
-#        - 65  # NDRPDR LB
-#        - 66  # NDRPDR LB
-#        - 67  # NDRPDR LB
-#        - 69  # NDRPDR LB
-#        - 70  # NDRPDR LB
-#        - 71  # NDRPDR LB
-        - 72  # 1901.1 NDRPDR sel
-        - 78  # 1901.1 NDRPDR sel
-
-    plot-throughput-speedup-analysis-3n-hsw:
-      csit-vpp-perf-verify-1901-3n-hsw:
-#        - 10  # NDRPDR sel
-#        - 19  # NDRPDR sel
-#        - 31  # NDRPDR sel
-#        - 36  # NDRPDR sel
-#        - 40  # NDRPDR sel
-#        - 42  # NDRPDR sel
-#        - 44  # NDRPDR sel
-#        - 46  # NDRPDR sel
-#        - 47  # NDRPDR sel
-#        - 48  # NDRPDR sel
-#        - 61  # NDRPDR LB
-#        - 62  # NDRPDR LB
-#        - 63  # NDRPDR LB
-#        - 64  # NDRPDR LB
-#        - 65  # NDRPDR LB
-#        - 66  # NDRPDR LB
-#        - 67  # NDRPDR LB
-#        - 69  # NDRPDR LB
-#        - 70  # NDRPDR LB
-#        - 71  # NDRPDR LB
-        - 72  # 1901.1 NDRPDR sel
-        - 78  # 1901.1 NDRPDR sel
-
-    plot-vpp-http-server-performance:
-      # TODO: Replace with new data
-      # csit-vpp-perf-verify-1901-3n-hsw:
-      csit-vpp-perf-verify-1810-3n-hsw:
-        - 28  # WRK
-        - 29  # WRK
-        - 30  # WRK
-        - 31  # WRK
-        - 32  # WRK
-        - 33  # WRK
-        - 34  # WRK
-        - 35  # WRK
-        - 36  # WRK
-        - 37  # WRK
-
-    plot-ligato-throughput-latency-3n-hsw:
-      csit-ligato-perf-verify-1901-3n-hsw:
-        - 8   # NDRPDR sel
-        - 9   # NDRPDR sel
+    plot-vpp-throughput-lat-tsa-3n-hsw:
+      csit-vpp-perf-verify-1904-3n-hsw:
         - 11  # NDRPDR sel
         - 12  # NDRPDR sel
         - 11  # NDRPDR sel
         - 12  # NDRPDR sel
+        - 20  # NDRPDR sel
+        - 21  # NDRPDR sel
+        - 23  # NDRPDR sel
+        - 24  # NDRPDR sel
+        - 25  # NDRPDR sel
+        - 26  # NDRPDR sel
+        - 29  # NDRPDR sel
+        - 30  # NDRPDR sel
+
+#    plot-vpp-http-server-performance:
+#      # TODO: Replace with 1904 data
+#      # csit-vpp-perf-verify-1904-3n-hsw:
+#      csit-vpp-perf-verify-1810-3n-hsw:
+#        - 28  # WRK
+#        - 29  # WRK
+#        - 30  # WRK
+#        - 31  # WRK
+#        - 32  # WRK
+#        - 33  # WRK
+#        - 34  # WRK
+#        - 35  # WRK
+#        - 36  # WRK
+#        - 37  # WRK
+
+#    plot-ligato-throughput-lat-tsa-3n-hsw:
+#      # TODO: Replace with 1904 data
+#      # csit-ligato-perf-verify-1904-3n-hsw:
+#      csit-ligato-perf-verify-1901-3n-hsw:
+#        - 8   # NDRPDR sel
+#        - 9   # NDRPDR sel
+#        - 11  # NDRPDR sel
+#        - 12  # NDRPDR sel
+#        - 13  # NDRPDR sel
+#        - 14  # NDRPDR sel
+#        - 15  # NDRPDR sel
+#        - 16  # NDRPDR sel
+#        - 17  # NDRPDR sel
+#        - 18  # NDRPDR sel
+
+    plot-dpdk-throughput-latency-3n-hsw:
+      csit-dpdk-perf-verify-1904-3n-hsw:
+        - 2   # NDRPDR sel
+        - 3   # NDRPDR sel
+        - 5   # NDRPDR sel
+        - 6   # NDRPDR sel
         - 13  # NDRPDR sel
         - 14  # NDRPDR sel
         - 15  # NDRPDR sel
         - 13  # NDRPDR sel
         - 14  # NDRPDR sel
         - 15  # NDRPDR sel
-        - 16  # NDRPDR sel
-        - 17  # NDRPDR sel
         - 18  # NDRPDR sel
         - 18  # NDRPDR sel
+        - 19  # NDRPDR sel
+        - 20  # NDRPDR sel
 
 
-    plot-ligato-throughput-speedup-analysis-3n-hsw:
-      csit-ligato-perf-verify-1901-3n-hsw:
+    # 3n-skx
+
+    plot-vpp-throughput-lat-tsa-3n-skx:
+      csit-vpp-perf-verify-1904-3n-skx:
         - 8   # NDRPDR sel
         - 9   # NDRPDR sel
         - 8   # NDRPDR sel
         - 9   # NDRPDR sel
+        - 10  # NDRPDR sel
         - 11  # NDRPDR sel
         - 12  # NDRPDR sel
         - 11  # NDRPDR sel
         - 12  # NDRPDR sel
-        - 13  # NDRPDR sel
-        - 14  # NDRPDR sel
-        - 15  # NDRPDR sel
-        - 16  # NDRPDR sel
-        - 17  # NDRPDR sel
-        - 18  # NDRPDR sel
-
-    plot-dpdk-throughput-latency-3n-hsw:
-      csit-dpdk-perf-verify-1901-3n-hsw:
-        - 13  # NDRPDR sel
         - 14  # NDRPDR sel
         - 16  # NDRPDR sel
         - 14  # NDRPDR sel
         - 16  # NDRPDR sel
-        - 17  # NDRPDR sel
-        - 18  # NDRPDR sel
-        - 19  # NDRPDR sel
-        - 20  # NDRPDR sel
         - 21  # NDRPDR sel
         - 21  # NDRPDR sel
-        - 22  # NDRPDR sel
         - 23  # NDRPDR sel
         - 23  # NDRPDR sel
-
-    # 3n-skx
-
-    plot-vpp-throughput-latency-3n-skx:
-      csit-vpp-perf-verify-1901-3n-skx:
-#        - 18  # NDRPDR sel
-#        - 19  # NDRPDR sel
-#        - 20  # NDRPDR sel
-#        - 28  # NDRPDR sel
-#        - 31  # NDRPDR sel
-#        - 33  # NDRPDR sel
-#        - 36  # NDRPDR sel
-#        - 38  # NDRPDR sel
-#        - 47  # NDRPDR sel
-#        - 48  # NDRPDR sel
-#        - 54  # NDRPDR LB
-#        - 57  # NDRPDR LB
-#        - 58  # NDRPDR LB
-#        - 59  # NDRPDR LB
-#        - 60  # NDRPDR LB
-#        - 63  # NDRPDR LB
-#        - 64  # NDRPDR LB
-#        - 65  # NDRPDR LB
-#        - 66  # NDRPDR LB
-#        - 67  # NDRPDR LB
-        - 68  # 1901.1 NDRPDR sel
-
-    plot-throughput-speedup-analysis-3n-skx:
-      csit-vpp-perf-verify-1901-3n-skx:
-#        - 18  # NDRPDR sel
-#        - 19  # NDRPDR sel
-#        - 20  # NDRPDR sel
-#        - 28  # NDRPDR sel
-#        - 31  # NDRPDR sel
-#        - 33  # NDRPDR sel
-#        - 36  # NDRPDR sel
-#        - 38  # NDRPDR sel
-#        - 47  # NDRPDR sel
-#        - 48  # NDRPDR sel
-#        - 54  # NDRPDR LB
-#        - 57  # NDRPDR LB
-#        - 58  # NDRPDR LB
-#        - 59  # NDRPDR LB
-#        - 60  # NDRPDR LB
-#        - 63  # NDRPDR LB
-#        - 64  # NDRPDR LB
-#        - 65  # NDRPDR LB
-#        - 66  # NDRPDR LB
-#        - 67  # NDRPDR LB
-        - 68  # 1901.1 NDRPDR sel
+        - 25  # NDRPDR sel
 
     plot-dpdk-throughput-latency-3n-skx:
 
     plot-dpdk-throughput-latency-3n-skx:
-      csit-dpdk-perf-verify-1901-3n-skx:
+      csit-dpdk-perf-verify-1904-3n-skx:
+        - 2   # NDRPDR sel
         - 3   # NDRPDR sel
         - 3   # NDRPDR sel
+        - 4   # NDRPDR sel
         - 5   # NDRPDR sel
         - 6   # NDRPDR sel
         - 7   # 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
         - 11  # NDRPDR sel
         - 12  # NDRPDR sel
         - 13  # NDRPDR sel
+        - 14  # NDRPDR sel
 
     # 2n-skx
 
 
     # 2n-skx
 
-    plot-vpp-throughput-latency-2n-skx:
-      csit-vpp-perf-verify-1901-2n-skx:
-#        - 5   # NDRPDR sel
-#        - 12  # NDRPDR sel
-#        - 13  # NDRPDR sel
-#        - 21  # NDRPDR sel
-#        - 23  # NDRPDR sel
-#        - 31  # NDRPDR sel
-#        - 34  # NDRPDR sel
-#        - 40  # NDRPDR sel
-#        - 42  # NDRPDR sel
-#        - 43  # NDRPDR sel
-        - 64  # 1901.1 NDRPDR sel
-
-    plot-throughput-speedup-analysis-2n-skx:
-      csit-vpp-perf-verify-1901-2n-skx:
-#        - 5   # NDRPDR sel
-#        - 12  # NDRPDR sel
-#        - 13  # NDRPDR sel
-#        - 21  # NDRPDR sel
-#        - 23  # NDRPDR sel
-#        - 31  # NDRPDR sel
-#        - 34  # NDRPDR sel
-#        - 40  # NDRPDR sel
-#        - 42  # NDRPDR sel
-#        - 43  # NDRPDR sel
-        - 64  # 1901.1 NDRPDR sel
-
-    plot-vpp-soak-2n-skx:
-      csit-vpp-perf-verify-1901-2n-skx:
-        - 45  # SOAK sel
-
-    plot-vpp-nfv-2n-skx:
-      csit-vpp-perf-verify-1901-2n-skx:
-        - 28  # NFV NDRPDR
-        - 29  # NFV NDRPDR
-        - 32  # NFV NDRPDR
-        - 39  # NFV NDRPDR
-        - 46  # NFV NDRPDR
-
-    plot-vpp-nfv-2n-skx-mrr:
-      csit-vpp-perf-verify-1901-2n-skx:
-        - 24  # NFV MRR
-        - 26  # NFV MRR
-        - 27  # NFV MRR
-        - 35  # NFV MRR
-        - 37  # NFV MRR
-
-    plot-dpdk-throughput-latency-2n-skx:
-      csit-dpdk-perf-verify-1901-2n-skx:
+    plot-vpp-throughput-lat-tsa-2n-skx:
+      csit-vpp-perf-verify-1904-2n-skx:
         - 12  # NDRPDR sel
         - 12  # NDRPDR sel
-        - 13  # NDRPDR sel
         - 14  # NDRPDR sel
         - 14  # NDRPDR sel
-        - 15  # NDRPDR sel
         - 16  # NDRPDR sel
         - 17  # NDRPDR sel
         - 18  # NDRPDR sel
         - 16  # NDRPDR sel
         - 17  # NDRPDR sel
         - 18  # NDRPDR sel
-        - 19  # NDRPDR sel
-        - 20  # NDRPDR sel
         - 21  # NDRPDR sel
         - 21  # NDRPDR sel
+        - 27  # NDRPDR sel
+        - 30  # NDRPDR sel
+        - 31  # NDRPDR sel
+        - 32  # NDRPDR sel
+
+    plot-vpp-soak-2n-skx:
+      # TODO: Add 1904 data
+      csit-vpp-perf-verify-1904-2n-skx:
+        - 70  # SOAK
+        - 71  # SOAK
+
+    plot-vpp-nfv-2n-skx-ndrpdr-64b:
+      csit-vpp-perf-verify-1904-2n-skx:
+        - 56  # NFV NDRPDR 64b
+        - 59  # NFV NDRPDR 64b
+        - 60  # NFV NDRPDR 64b
+        - 65  # NFV NDRPDR 64b
+        - 68  # NFV NDRPDR 64b
+
+    plot-vpp-nfv-2n-skx-ndrpdr-imix:
+      # TODO: Add 1904 data
+      csit-vpp-perf-verify-1904-2n-skx:
+        - 66  # NFV NDRPDR IMIX
+        - 67  # NFV NDRPDR IMIX
+        - 69  # NFV NDRPDR IMIX
+
+    plot-vpp-nfv-2n-skx-mrr-64b:
+      csit-vpp-perf-verify-1904-2n-skx:
+        - 40  # NFV MRR 64b
+        - 41  # NFV MRR 64b
+        - 42  # NFV MRR 64b
+        - 47  # NFV MRR 64b
+        - 48  # NFV MRR 64b
+
+    plot-vpp-nfv-2n-skx-mrr-imix:
+      csit-vpp-perf-verify-1904-2n-skx:
+        - 49  # NFV MRR IMIX
+        - 50  # NFV MRR IMIX
+        - 51  # NFV MRR IMIX
+        - 54  # NFV MRR IMIX
+        - 55  # NFV MRR IMIX
+
+    plot-dpdk-throughput-latency-2n-skx:
+      csit-dpdk-perf-verify-1904-2n-skx:
+        - 2   # NDRPDR sel
+        - 3   # NDRPDR sel
+        - 4   # NDRPDR sel
+        - 5   # NDRPDR sel
+        - 7   # NDRPDR sel
+        - 8   # NDRPDR sel
+        - 9   # NDRPDR sel
+        - 10  # NDRPDR sel
+        - 11  # NDRPDR sel
+        - 12  # NDRPDR sel
 
     # 3rd party
 
 
     # 3rd party
 
-    # Denverton:
-    intel-dnv-vpp:
-      # Not used
-      intel-dnv-vpp-release-1810:
-        - 1
+#    # Denverton:
+#    intel-dnv-vpp:
+#      # TODO: Replace with 1904 data
+#      # intel-dnv-vpp-release-1904:
+#      intel-dnv-vpp-release-1901:
+#        - 1
 
     ###########################################################################
     # Simple tables (only one data set):
 
     ###########################################################################
     # Simple tables (only one data set):
@@ -375,193 +293,158 @@
     # NIC Comparisons
 
     vpp-nic-comparison-3n-hsw:
     # NIC Comparisons
 
     vpp-nic-comparison-3n-hsw:
-      csit-vpp-perf-verify-1901-3n-hsw:
-#        - 10  # NDRPDR sel
-#        - 19  # NDRPDR sel
-#        - 31  # NDRPDR sel
-#        - 36  # NDRPDR sel
-#        - 40  # NDRPDR sel
-#        - 42  # NDRPDR sel
-#        - 44  # NDRPDR sel
-#        - 46  # NDRPDR sel
-#        - 47  # NDRPDR sel
-#        - 48  # NDRPDR sel
-#        - 61  # NDRPDR LB
-#        - 62  # NDRPDR LB
-#        - 63  # NDRPDR LB
-#        - 64  # NDRPDR LB
-#        - 65  # NDRPDR LB
-#        - 66  # NDRPDR LB
-#        - 67  # NDRPDR LB
-#        - 69  # NDRPDR LB
-#        - 70  # NDRPDR LB
-#        - 71  # NDRPDR LB
-        - 72  # 1901.1 NDRPDR sel
-        - 78  # 1901.1 NDRPDR sel
+      csit-vpp-perf-verify-1904-3n-hsw:
+        - 11  # NDRPDR sel
+        - 12  # NDRPDR sel
+        - 20  # NDRPDR sel
+        - 21  # NDRPDR sel
+        - 23  # NDRPDR sel
+        - 24  # NDRPDR sel
+        - 25  # NDRPDR sel
+        - 26  # NDRPDR sel
+        - 29  # NDRPDR sel
+        - 30  # NDRPDR sel
 
     vpp-nic-comparison-3n-skx:
 
     vpp-nic-comparison-3n-skx:
-      csit-vpp-perf-verify-1901-3n-skx:
-#        - 18  # NDRPDR sel
-#        - 19  # NDRPDR sel
-#        - 20  # NDRPDR sel
-#        - 28  # NDRPDR sel
-#        - 31  # NDRPDR sel
-#        - 33  # NDRPDR sel
-#        - 36  # NDRPDR sel
-#        - 38  # NDRPDR sel
-#        - 47  # NDRPDR sel
-#        - 48  # NDRPDR sel
-#        - 54  # NDRPDR LB
-#        - 57  # NDRPDR LB
-#        - 58  # NDRPDR LB
-#        - 59  # NDRPDR LB
-#        - 60  # NDRPDR LB
-#        - 63  # NDRPDR LB
-#        - 64  # NDRPDR LB
-#        - 65  # NDRPDR LB
-#        - 66  # NDRPDR LB
-#        - 67  # NDRPDR LB
-        - 68  # 1901.1 NDRPDR sel
+      csit-vpp-perf-verify-1904-3n-skx:
+        - 8   # NDRPDR sel
+        - 9   # NDRPDR sel
+        - 10  # NDRPDR sel
+        - 11  # NDRPDR sel
+        - 12  # NDRPDR sel
+        - 14  # NDRPDR sel
+        - 16  # NDRPDR sel
+        - 21  # NDRPDR sel
+        - 23  # NDRPDR sel
+        - 25  # NDRPDR sel
 
     vpp-nic-comparison-2n-skx:
 
     vpp-nic-comparison-2n-skx:
-      csit-vpp-perf-verify-1901-2n-skx:
-#        - 5   # NDRPDR sel
-#        - 12  # NDRPDR sel
-#        - 13  # NDRPDR sel
-#        - 21  # NDRPDR sel
-#        - 23  # NDRPDR sel
-#        - 31  # NDRPDR sel
-#        - 34  # NDRPDR sel
-#        - 40  # NDRPDR sel
-#        - 42  # NDRPDR sel
-#        - 43  # NDRPDR sel
-        - 64  # 1901.1 NDRPDR sel
+      csit-vpp-perf-verify-1904-2n-skx:
+        - 12  # NDRPDR sel
+        - 14  # NDRPDR sel
+        - 16  # NDRPDR sel
+        - 17  # NDRPDR sel
+        - 18  # NDRPDR sel
+        - 21  # NDRPDR sel
+        - 27  # NDRPDR sel
+        - 30  # NDRPDR sel
+        - 31  # NDRPDR sel
+        - 32  # NDRPDR sel
 
     vpp-nic-comparison-3n-hsw-mrr:
 
     vpp-nic-comparison-3n-hsw-mrr:
-      csit-vpp-perf-verify-1901-3n-hsw:
-#        - 35  # MRR sel
-        - 73  # 1901.1 MRR sel
-        - 77  # 1901.1 MRR sel
+      csit-vpp-perf-verify-1904-3n-hsw:
+        - 9   # MRR sel
 
     vpp-nic-comparison-3n-skx-mrr:
 
     vpp-nic-comparison-3n-skx-mrr:
-      csit-vpp-perf-verify-1901-3n-skx:
-#        - 32  # MRR sel
-        - 69  # 1901.1 MRR sel
+      csit-vpp-perf-verify-1904-3n-skx:
+        - 7   # MRR sel
 
     vpp-nic-comparison-2n-skx-mrr:
 
     vpp-nic-comparison-2n-skx-mrr:
-      csit-vpp-perf-verify-1901-2n-skx:
-#        - 22  # MRR sel
-        - 65  # 1901.1 MRR sel
+      csit-vpp-perf-verify-1904-2n-skx:
+        - 11  # MRR sel
 
     # Results
 
     vpp-perf-results-3n-hsw:
 
     # Results
 
     vpp-perf-results-3n-hsw:
-      csit-vpp-perf-verify-1901-3n-hsw:
-#        - 38  # NDRPDR full
-#        - 43  # NDRPDR full
-#        - 45  # NDRPDR full
-#        - 49  # NDRPDR full
-        - 72  # 1901.1 NDRPDR sel
-        - 78  # 1901.1 NDRPDR sel
+      # TODO: Replace with FULL 1904 data
+      csit-vpp-perf-verify-1904-3n-hsw:
+        - 12  # NDRPDR sel
 
     vpp-perf-results-3n-skx:
 
     vpp-perf-results-3n-skx:
-      csit-vpp-perf-verify-1901-3n-skx:
-#        - 37  # NDRPDR full
-#        - 39  # NDRPDR full
-#        - 40  # NDRPDR full
-#        - 49  # NDRPDR full
-        - 68  # 1901.1 NDRPDR sel
+      csit-vpp-perf-verify-1904-3n-skx:
+        - 26  # NDRPDR full
+        - 27  # NDRPDR full
+        - 30  # NDRPDR full
+        - 31  # NDRPDR full
 
     vpp-perf-results-2n-skx:
 
     vpp-perf-results-2n-skx:
-      csit-vpp-perf-verify-1901-2n-skx:
-#        - 25  # NDRPDR full
-#        - 30  # NDRPDR full
-#        - 33  # NDRPDR full
-#        - 44  # NDRPDR full
-        - 64  # 1901.1 NDRPDR sel
+      csit-vpp-perf-verify-1904-2n-skx:
+        - 33  # NDRPDR full
+        - 39  # NDRPDR full
+        - 58  # NDRPDR full
+        - 62  # NDRPDR full
 
     vpp-mrr-results-3n-hsw:
 
     vpp-mrr-results-3n-hsw:
-      csit-vpp-perf-verify-1901-3n-hsw:
-#        - 35  # MRR sel
-        - 73  # 1901.1 MRR sel
-        - 77  # 1901.1 MRR sel
+      csit-vpp-perf-verify-1904-3n-hsw:
+        - 9   # MRR sel
 
     vpp-mrr-results-3n-skx:
 
     vpp-mrr-results-3n-skx:
-      csit-vpp-perf-verify-1901-3n-skx:
-#        - 32  # MRR sel
-        - 69  # 1901.1 MRR sel
+      csit-vpp-perf-verify-1904-3n-skx:
+        - 7   # MRR sel
 
     vpp-mrr-results-2n-skx:
 
     vpp-mrr-results-2n-skx:
-      csit-vpp-perf-verify-1901-2n-skx:
-#        - 22  # MRR sel
-        - 65  # 1901.1 MRR sel
+      csit-vpp-perf-verify-1904-2n-skx:
+        - 11  # MRR sel
 
     vpp-func-results-ubuntu:
 
     vpp-func-results-ubuntu:
-      csit-vpp-functional-1901-ubuntu1604-virl:
-        - 173
+      csit-vpp-functional-1904-ubuntu1604-virl:
+        - 29
 
     vpp-func-results-centos:
 
     vpp-func-results-centos:
-      csit-vpp-functional-1901-centos7-virl:
-        - 175
+      csit-vpp-functional-1904-centos7-virl:
+        - 32
 
     vpp-device-results-ubuntu:
 
     vpp-device-results-ubuntu:
-      csit-vpp-device-1901-ubuntu1804-1n-skx:
-        - 175
+      csit-vpp-device-1904-ubuntu1804-1n-skx:
+        - 33
 
 
-    # VPP Ligato
-    ligato-perf-results-3n-hsw:
-      csit-ligato-perf-verify-1901-3n-hsw:
-        - 10  # NDRPDR full
+#    # VPP Ligato
+#    ligato-perf-results-3n-hsw:
+#      # TODO: Replace with 1904 data
+#      # csit-ligato-perf-verify-1904-3n-hsw:
+#      csit-ligato-perf-verify-1901-3n-hsw:
+#        - 10  # NDRPDR full
 
     dpdk-perf-results-3n-hsw:
 
     dpdk-perf-results-3n-hsw:
-      csit-dpdk-perf-verify-1901-3n-hsw:
-        - 20  # NDRPDR sel
+      csit-dpdk-perf-verify-1904-3n-hsw:
+        - 5   # NDRPDR sel
 
     dpdk-perf-results-3n-skx:
 
     dpdk-perf-results-3n-skx:
-      csit-dpdk-perf-verify-1901-3n-skx:
-        - 13  # NDRPDR sel
+      csit-dpdk-perf-verify-1904-3n-skx:
+        - 7   # NDRPDR sel
 
     dpdk-perf-results-2n-skx:
 
     dpdk-perf-results-2n-skx:
-      csit-dpdk-perf-verify-1901-2n-skx:
-        - 21  # NDRPDR sel
+      csit-dpdk-perf-verify-1904-2n-skx:
+        - 9   # NDRPDR sel
 
     # HoneyComb Functional
     hc-func-results:
 
     # HoneyComb Functional
     hc-func-results:
-      csit-hc2vpp-verify-func-1901-ubuntu1604:
-        - 3
+      csit-hc2vpp-verify-func-1904-ubuntu1604:
+        - 4
 
 
-    # NSH SFC Functional
-    nsh-func-results:
-      # Not used
-      csit-nsh_sfc-verify-func-1810-ubuntu1604-virl:
-        - 1
+#    # NSH SFC Functional
+#    nsh-func-results:
+#      # Not used
+#      csit-nsh_sfc-verify-func-1810-ubuntu1604-virl:
+#        - 1
 
     # DMM Functional
     dmm-func-results:
 
     # DMM Functional
     dmm-func-results:
-      csit-dmm-functional-1901-ubuntu1604-virl:
-        - 2
+      csit-dmm-functional-1904-ubuntu1604-virl:
+        - 1
 
     ###########################################################################
     # Tables (more than one data set)
 
     # Performance changes
 
 
     ###########################################################################
     # Tables (more than one data set)
 
     # Performance changes
 
+#    intel-dnv-vpp-changes-2n-dnv-h1:
+#      intel-dnv-vpp-release-1810:
+#        - 1
+#    intel-dnv-vpp-changes-2n-dnv-ref:
+#      intel-dnv-vpp-release-1901:
+#        - 1
+#    intel-dnv-vpp-changes-2n-dnv-cmp:
+#      # TODO: Replace with 1904 data
+#      # intel-dnv-vpp-release-1904:
+#      intel-dnv-vpp-release-1901:
+#        - 1
+#    intel-dnv-vpp-changes-2n-dnv:
+#      - "intel-dnv-vpp-changes-2n-dnv-h1"
+#      - "intel-dnv-vpp-changes-2n-dnv-ref"
+#      - "intel-dnv-vpp-changes-2n-dnv-cmp"
+
     vpp-performance-changes-3n-hsw-h1:
     vpp-performance-changes-3n-hsw-h1:
-      csit-vpp-perf-verify-1807-3n-hsw:
-        - 11  # NDRPDR full 1
-        - 22  # NDRPDR full 2
-        - 45  # NDRPDR full 3
-        - 46  # NDRPDR full 4
-        - 15  # NDRPDR sel
-        - 16  # NDRPDR sel
-        - 19  # NDRPDR sel
-        - 18  # NDRPDR sel
-        - 20  # NDRPDR sel
-        - 38  # NDRPDR sel
-        - 40  # NDRPDR sel
-        - 44  # NDRPDR sel
-        - 47  # NDRPDR sel
-    vpp-performance-changes-3n-hsw-ref:
       csit-vpp-perf-verify-1810-3n-hsw:
         - 8   # NDRPDR sel
         - 12  # NDRPDR sel
       csit-vpp-perf-verify-1810-3n-hsw:
         - 8   # NDRPDR sel
         - 12  # NDRPDR sel
@@ -573,48 +456,46 @@
         - 39  # NDRPDR sel
         - 41  # NDRPDR sel
         - 42  # NDRPDR sel
         - 39  # NDRPDR sel
         - 41  # NDRPDR sel
         - 42  # NDRPDR sel
-    vpp-performance-changes-3n-hsw-cmp:
+    vpp-performance-changes-3n-hsw-ref:
       csit-vpp-perf-verify-1901-3n-hsw:
       csit-vpp-perf-verify-1901-3n-hsw:
-#        - 10  # NDRPDR sel
-#        - 19  # NDRPDR sel
-#        - 31  # NDRPDR sel
-#        - 36  # NDRPDR sel
-#        - 40  # NDRPDR sel
-#        - 42  # NDRPDR sel
-#        - 44  # NDRPDR sel
-#        - 46  # NDRPDR sel
-#        - 47  # NDRPDR sel
-#        - 48  # NDRPDR sel
-#        - 61  # NDRPDR LB
-#        - 62  # NDRPDR LB
-#        - 63  # NDRPDR LB
-#        - 64  # NDRPDR LB
-#        - 65  # NDRPDR LB
-#        - 66  # NDRPDR LB
-#        - 67  # NDRPDR LB
-#        - 69  # NDRPDR LB
-#        - 70  # NDRPDR LB
-#        - 71  # NDRPDR LB
-        - 72  # 1901.1 NDRPDR sel
-        - 78  # 1901.1 NDRPDR sel
+        - 10  # NDRPDR sel
+        - 19  # NDRPDR sel
+        - 31  # NDRPDR sel
+        - 36  # NDRPDR sel
+        - 40  # NDRPDR sel
+        - 42  # NDRPDR sel
+        - 44  # NDRPDR sel
+        - 46  # NDRPDR sel
+        - 47  # NDRPDR sel
+        - 48  # NDRPDR sel
+        - 61  # NDRPDR LB
+        - 62  # NDRPDR LB
+        - 63  # NDRPDR LB
+        - 64  # NDRPDR LB
+        - 65  # NDRPDR LB
+        - 66  # NDRPDR LB
+        - 67  # NDRPDR LB
+        - 69  # NDRPDR LB
+        - 70  # NDRPDR LB
+        - 71  # NDRPDR LB
+    vpp-performance-changes-3n-hsw-cmp:
+      csit-vpp-perf-verify-1904-3n-hsw:
+        - 11  # NDRPDR sel
+        - 12  # NDRPDR sel
+        - 20  # NDRPDR sel
+        - 21  # NDRPDR sel
+        - 23  # NDRPDR sel
+        - 24  # NDRPDR sel
+        - 25  # NDRPDR sel
+        - 26  # NDRPDR sel
+        - 29  # NDRPDR sel
+        - 30  # NDRPDR sel
     vpp-performance-changes-3n-hsw:
       - "vpp-performance-changes-3n-hsw-h1"
       - "vpp-performance-changes-3n-hsw-ref"
       - "vpp-performance-changes-3n-hsw-cmp"
 
     vpp-performance-changes-3n-skx-h1:
     vpp-performance-changes-3n-hsw:
       - "vpp-performance-changes-3n-hsw-h1"
       - "vpp-performance-changes-3n-hsw-ref"
       - "vpp-performance-changes-3n-hsw-cmp"
 
     vpp-performance-changes-3n-skx-h1:
-      csit-vpp-perf-verify-1807-3n-skx:
-        - 33  # NDRPDR sel
-        - 35  # NDRPDR sel
-        - 37  # NDRPDR sel
-        - 38  # NDRPDR sel
-        - 39  # NDRPDR sel
-        - 43  # NDRPDR sel
-        - 44  # NDRPDR sel
-        - 49  # NDRPDR sel
-        - 50  # NDRPDR sel
-        - 56  # NDRPDR sel
-    vpp-performance-changes-3n-skx-ref:
       csit-vpp-perf-verify-1810-3n-skx:
         - 10  # NDRPDR sel
         - 14  # NDRPDR sel
       csit-vpp-perf-verify-1810-3n-skx:
         - 10  # NDRPDR sel
         - 14  # NDRPDR sel
@@ -626,47 +507,46 @@
         - 21  # NDRPDR sel
         - 22  # NDRPDR sel
         - 25  # NDRPDR sel
         - 21  # NDRPDR sel
         - 22  # NDRPDR sel
         - 25  # NDRPDR sel
-    vpp-performance-changes-3n-skx-cmp:
+    vpp-performance-changes-3n-skx-ref:
       csit-vpp-perf-verify-1901-3n-skx:
       csit-vpp-perf-verify-1901-3n-skx:
-#        - 18  # NDRPDR sel
-#        - 19  # NDRPDR sel
-#        - 20  # NDRPDR sel
-#        - 28  # NDRPDR sel
-#        - 31  # NDRPDR sel
-#        - 33  # NDRPDR sel
-#        - 36  # NDRPDR sel
-#        - 38  # NDRPDR sel
-#        - 47  # NDRPDR sel
-#        - 48  # NDRPDR sel
-#        - 54  # NDRPDR LB
-#        - 57  # NDRPDR LB
-#        - 58  # NDRPDR LB
-#        - 59  # NDRPDR LB
-#        - 60  # NDRPDR LB
-#        - 63  # NDRPDR LB
-#        - 64  # NDRPDR LB
-#        - 65  # NDRPDR LB
-#        - 66  # NDRPDR LB
-#        - 67  # NDRPDR LB
-        - 68  # 1901.1 NDRPDR sel
+        - 18  # NDRPDR sel
+        - 19  # NDRPDR sel
+        - 20  # NDRPDR sel
+        - 28  # NDRPDR sel
+        - 31  # NDRPDR sel
+        - 33  # NDRPDR sel
+        - 36  # NDRPDR sel
+        - 38  # NDRPDR sel
+        - 47  # NDRPDR sel
+        - 48  # NDRPDR sel
+        - 54  # NDRPDR LB
+        - 57  # NDRPDR LB
+        - 58  # NDRPDR LB
+        - 59  # NDRPDR LB
+        - 60  # NDRPDR LB
+        - 63  # NDRPDR LB
+        - 64  # NDRPDR LB
+        - 65  # NDRPDR LB
+        - 66  # NDRPDR LB
+        - 67  # NDRPDR LB
+    vpp-performance-changes-3n-skx-cmp:
+      csit-vpp-perf-verify-1904-3n-skx:
+        - 8   # NDRPDR sel
+        - 9   # NDRPDR sel
+        - 10  # NDRPDR sel
+        - 11  # NDRPDR sel
+        - 12  # NDRPDR sel
+        - 14  # NDRPDR sel
+        - 16  # NDRPDR sel
+        - 21  # NDRPDR sel
+        - 23  # NDRPDR sel
+        - 25  # NDRPDR sel
     vpp-performance-changes-3n-skx:
       - "vpp-performance-changes-3n-skx-h1"
       - "vpp-performance-changes-3n-skx-ref"
       - "vpp-performance-changes-3n-skx-cmp"
 
     vpp-performance-changes-2n-skx-h1:
     vpp-performance-changes-3n-skx:
       - "vpp-performance-changes-3n-skx-h1"
       - "vpp-performance-changes-3n-skx-ref"
       - "vpp-performance-changes-3n-skx-cmp"
 
     vpp-performance-changes-2n-skx-h1:
-      csit-vpp-perf-verify-1807-2n-skx:
-        - 26  # NDRPDR sel
-        - 28  # NDRPDR sel
-        - 29  # NDRPDR sel
-        - 30  # NDRPDR sel
-        - 34  # NDRPDR sel
-        - 35  # NDRPDR sel
-        - 36  # NDRPDR sel
-        - 39  # NDRPDR sel
-        - 40  # NDRPDR sel
-        - 42  # NDRPDR sel
-    vpp-performance-changes-2n-skx-ref:
       csit-vpp-perf-verify-1810-2n-skx:
         - 9   # NDRPDR sel
         - 13  # NDRPDR sel
       csit-vpp-perf-verify-1810-2n-skx:
         - 9   # NDRPDR sel
         - 13  # NDRPDR sel
@@ -678,115 +558,115 @@
         - 23  # NDRPDR sel
         - 24  # NDRPDR sel
         - 27  # NDRPDR sel
         - 23  # NDRPDR sel
         - 24  # NDRPDR sel
         - 27  # NDRPDR sel
-    vpp-performance-changes-2n-skx-cmp:
+    vpp-performance-changes-2n-skx-ref:
       csit-vpp-perf-verify-1901-2n-skx:
       csit-vpp-perf-verify-1901-2n-skx:
-#        - 5   # NDRPDR sel
-#        - 12  # NDRPDR sel
-#        - 13  # NDRPDR sel
-#        - 21  # NDRPDR sel
-#        - 23  # NDRPDR sel
-#        - 31  # NDRPDR sel
-#        - 34  # NDRPDR sel
-#        - 40  # NDRPDR sel
-#        - 42  # NDRPDR sel
-#        - 43  # NDRPDR sel
-        - 64  # 1901.1 NDRPDR sel
+        - 5   # NDRPDR sel
+        - 12  # NDRPDR sel
+        - 13  # NDRPDR sel
+        - 21  # NDRPDR sel
+        - 23  # NDRPDR sel
+        - 31  # NDRPDR sel
+        - 34  # NDRPDR sel
+        - 40  # NDRPDR sel
+        - 42  # NDRPDR sel
+        - 43  # NDRPDR sel
+    vpp-performance-changes-2n-skx-cmp:
+      csit-vpp-perf-verify-1904-2n-skx:
+        - 12  # NDRPDR sel
+        - 14  # NDRPDR sel
+        - 16  # NDRPDR sel
+        - 17  # NDRPDR sel
+        - 18  # NDRPDR sel
+        - 21  # NDRPDR sel
+        - 27  # NDRPDR sel
+        - 30  # NDRPDR sel
+        - 31  # NDRPDR sel
+        - 32  # NDRPDR sel
     vpp-performance-changes-2n-skx:
       - "vpp-performance-changes-2n-skx-h1"
       - "vpp-performance-changes-2n-skx-ref"
       - "vpp-performance-changes-2n-skx-cmp"
 
     vpp-performance-changes-2n-skx:
       - "vpp-performance-changes-2n-skx-h1"
       - "vpp-performance-changes-2n-skx-ref"
       - "vpp-performance-changes-2n-skx-cmp"
 
+    vpp-soak-vs-ndr-2n-skx-ref:
+      csit-vpp-perf-verify-1904-2n-skx:
+        - 12  # NDRPDR sel
+        - 14  # NDRPDR sel
+        - 16  # NDRPDR sel
+        - 17  # NDRPDR sel
+        - 18  # NDRPDR sel
+        - 21  # NDRPDR sel
+        - 27  # NDRPDR sel
+        - 30  # NDRPDR sel
+        - 31  # NDRPDR sel
+        - 32  # NDRPDR sel
+    vpp-soak-vs-ndr-2n-skx-cmp:
+      csit-vpp-perf-verify-1904-2n-skx:
+        - 70  # SOAK
+        - 71  # SOAK
+    vpp-soak-vs-ndr-2n-skx:
+      csit-vpp-perf-verify-1904-2n-skx:
+        - 12  # NDRPDR sel
+        - 14  # NDRPDR sel
+        - 16  # NDRPDR sel
+        - 17  # NDRPDR sel
+        - 18  # NDRPDR sel
+        - 21  # NDRPDR sel
+        - 27  # NDRPDR sel
+        - 30  # NDRPDR sel
+        - 31  # NDRPDR sel
+        - 32  # NDRPDR sel
+        - 70  # SOAK
+        - 71  # SOAK
+
     vpp-performance-changes-3n-hsw-mrr-h1:
     vpp-performance-changes-3n-hsw-mrr-h1:
-      csit-vpp-perf-verify-1807-3n-hsw:
-        - 8   # MRR full
-        - 9   # MRR sel
-        - 21  # MRR sel
-        - 31  # MRR sel
-        - 33  # MRR sel
-        - 36  # MRR sel
-        - 41  # MRR sel
-        - 42  # MRR sel
-        - 48  # MRR sel
-    vpp-performance-changes-3n-hsw-mrr-ref:
       csit-vpp-perf-verify-1810-3n-hsw:
         - 9   # MRR sel
       csit-vpp-perf-verify-1810-3n-hsw:
         - 9   # MRR sel
-    vpp-performance-changes-3n-hsw-mrr-cmp:
+    vpp-performance-changes-3n-hsw-mrr-ref:
       csit-vpp-perf-verify-1901-3n-hsw:
       csit-vpp-perf-verify-1901-3n-hsw:
-#        - 35  # MRR sel
-        - 73  # 1901.1 MRR sel
-        - 77  # 1901.1 MRR sel
+        - 35  # MRR sel
+    vpp-performance-changes-3n-hsw-mrr-cmp:
+      csit-vpp-perf-verify-1904-3n-hsw:
+        - 9   # MRR sel
     vpp-performance-changes-3n-hsw-mrr:
       - "vpp-performance-changes-3n-hsw-mrr-h1"
       - "vpp-performance-changes-3n-hsw-mrr-ref"
       - "vpp-performance-changes-3n-hsw-mrr-cmp"
 
     vpp-performance-changes-3n-skx-mrr-h1:
     vpp-performance-changes-3n-hsw-mrr:
       - "vpp-performance-changes-3n-hsw-mrr-h1"
       - "vpp-performance-changes-3n-hsw-mrr-ref"
       - "vpp-performance-changes-3n-hsw-mrr-cmp"
 
     vpp-performance-changes-3n-skx-mrr-h1:
-      csit-vpp-perf-verify-1807-3n-skx:
-        - 28  # MRR sel
-        - 32  # MRR sel
-        - 36  # MRR sel
-        - 42  # MRR sel
-        - 47  # MRR sel
-        - 48  # MRR sel
-        - 51  # MRR sel
-        - 52  # MRR sel
-        - 53  # MRR sel
-        - 54  # MRR sel
-    vpp-performance-changes-3n-skx-mrr-ref:
       csit-vpp-perf-verify-1810-3n-skx:
         - 9   # MRR sel
         - 11  # MRR sel
         - 12  # MRR sel
         - 13  # MRR sel
       csit-vpp-perf-verify-1810-3n-skx:
         - 9   # MRR sel
         - 11  # MRR sel
         - 12  # MRR sel
         - 13  # MRR sel
-    vpp-performance-changes-3n-skx-mrr-cmp:
+    vpp-performance-changes-3n-skx-mrr-ref:
       csit-vpp-perf-verify-1901-3n-skx:
       csit-vpp-perf-verify-1901-3n-skx:
-#        - 32  # MRR sel
-        - 69  # 1901.1 MRR sel
+        - 32  # MRR sel
+    vpp-performance-changes-3n-skx-mrr-cmp:
+      csit-vpp-perf-verify-1904-3n-skx:
+        - 7   # MRR sel
     vpp-performance-changes-3n-skx-mrr:
       - "vpp-performance-changes-3n-skx-mrr-h1"
       - "vpp-performance-changes-3n-skx-mrr-ref"
       - "vpp-performance-changes-3n-skx-mrr-cmp"
 
     vpp-performance-changes-2n-skx-mrr-h1:
     vpp-performance-changes-3n-skx-mrr:
       - "vpp-performance-changes-3n-skx-mrr-h1"
       - "vpp-performance-changes-3n-skx-mrr-ref"
       - "vpp-performance-changes-3n-skx-mrr-cmp"
 
     vpp-performance-changes-2n-skx-mrr-h1:
-      csit-vpp-perf-verify-1807-2n-skx:
-        - 31  # MRR sel
-        - 33  # MRR sel
-        - 37  # MRR sel
-        - 38  # MRR sel
-        - 41  # MRR sel
-        - 43  # MRR sel
-        - 44  # MRR sel
-        - 45  # MRR sel
-        - 46  # MRR sel
-        - 47  # MRR sel
-    vpp-performance-changes-2n-skx-mrr-ref:
       csit-vpp-perf-verify-1810-2n-skx:
         - 8   # MRR sel
         - 10  # MRR sel
         - 11  # MRR sel
         - 12  # MRR sel
       csit-vpp-perf-verify-1810-2n-skx:
         - 8   # MRR sel
         - 10  # MRR sel
         - 11  # MRR sel
         - 12  # MRR sel
-    vpp-performance-changes-2n-skx-mrr-cmp:
+    vpp-performance-changes-2n-skx-mrr-ref:
       csit-vpp-perf-verify-1901-2n-skx:
       csit-vpp-perf-verify-1901-2n-skx:
-#        - 22  # MRR sel
-        - 65  # 1901.1 MRR sel
+        - 22  # MRR sel
+    vpp-performance-changes-2n-skx-mrr-cmp:
+      csit-vpp-perf-verify-1904-2n-skx:
+        - 11  # MRR sel
     vpp-performance-changes-2n-skx-mrr:
       - "vpp-performance-changes-2n-skx-mrr-h1"
       - "vpp-performance-changes-2n-skx-mrr-ref"
       - "vpp-performance-changes-2n-skx-mrr-cmp"
 
     dpdk-performance-changes-3n-hsw-h1:
     vpp-performance-changes-2n-skx-mrr:
       - "vpp-performance-changes-2n-skx-mrr-h1"
       - "vpp-performance-changes-2n-skx-mrr-ref"
       - "vpp-performance-changes-2n-skx-mrr-cmp"
 
     dpdk-performance-changes-3n-hsw-h1:
-      csit-dpdk-perf-verify-1807-3n-hsw:
-        - 11
-        - 12  # full
-        - 14
-        - 15
-        - 16
-        - 17
-        - 20
-        - 21
-        - 22
-        - 23
-    dpdk-performance-changes-3n-hsw-ref:
       csit-dpdk-perf-verify-1810-3n-hsw:
         - 1   # NDRPDR sel
         - 2   # NDRPDR sel
       csit-dpdk-perf-verify-1810-3n-hsw:
         - 1   # NDRPDR sel
         - 2   # NDRPDR sel
@@ -798,7 +678,7 @@
         - 8   # NDRPDR sel
         - 9   # NDRPDR sel
         - 10  # NDRPDR sel
         - 8   # NDRPDR sel
         - 9   # NDRPDR sel
         - 10  # NDRPDR sel
-    dpdk-performance-changes-3n-hsw-cmp:
+    dpdk-performance-changes-3n-hsw-ref:
       csit-dpdk-perf-verify-1901-3n-hsw:
         - 13  # NDRPDR sel
         - 14  # NDRPDR sel
       csit-dpdk-perf-verify-1901-3n-hsw:
         - 13  # NDRPDR sel
         - 14  # NDRPDR sel
@@ -810,16 +690,27 @@
         - 21  # NDRPDR sel
         - 22  # NDRPDR sel
         - 23  # NDRPDR sel
         - 21  # NDRPDR sel
         - 22  # NDRPDR sel
         - 23  # NDRPDR sel
+    dpdk-performance-changes-3n-hsw-cmp:
+      csit-dpdk-perf-verify-1904-3n-hsw:
+        - 2   # NDRPDR sel
+        - 3   # NDRPDR sel
+        - 5   # NDRPDR sel
+        - 6   # NDRPDR sel
+        - 13  # NDRPDR sel
+        - 14  # NDRPDR sel
+        - 15  # NDRPDR sel
+        - 18  # NDRPDR sel
+        - 19  # NDRPDR sel
+        - 20  # NDRPDR sel
     dpdk-performance-changes-3n-hsw:
       - "dpdk-performance-changes-3n-hsw-h1"
       - "dpdk-performance-changes-3n-hsw-ref"
       - "dpdk-performance-changes-3n-hsw-cmp"
 
     dpdk-performance-changes-3n-skx-h1:
     dpdk-performance-changes-3n-hsw:
       - "dpdk-performance-changes-3n-hsw-h1"
       - "dpdk-performance-changes-3n-hsw-ref"
       - "dpdk-performance-changes-3n-hsw-cmp"
 
     dpdk-performance-changes-3n-skx-h1:
-      csit-dpdk-perf-verify-1807-3n-skx:
-        - 1   # NDRPDR sel
-        - 2   # NDRPDR sel
+      csit-dpdk-perf-verify-1810-3n-skx:
         - 3   # NDRPDR sel
         - 3   # NDRPDR sel
+        - 4   # NDRPDR sel
         - 6   # NDRPDR sel
         - 7   # NDRPDR sel
         - 8   # NDRPDR sel
         - 6   # NDRPDR sel
         - 7   # NDRPDR sel
         - 8   # NDRPDR sel
@@ -827,10 +718,11 @@
         - 10  # NDRPDR sel
         - 11  # NDRPDR sel
         - 12  # NDRPDR sel
         - 10  # NDRPDR sel
         - 11  # NDRPDR sel
         - 12  # NDRPDR sel
+        - 13  # NDRPDR sel
     dpdk-performance-changes-3n-skx-ref:
     dpdk-performance-changes-3n-skx-ref:
-      csit-dpdk-perf-verify-1810-3n-skx:
+      csit-dpdk-perf-verify-1901-3n-skx:
         - 3   # NDRPDR sel
         - 3   # NDRPDR sel
-        - 4   # NDRPDR sel
+        - 5   # NDRPDR sel
         - 6   # NDRPDR sel
         - 7   # NDRPDR sel
         - 8   # NDRPDR sel
         - 6   # NDRPDR sel
         - 7   # NDRPDR sel
         - 8   # NDRPDR sel
@@ -840,23 +732,23 @@
         - 12  # NDRPDR sel
         - 13  # NDRPDR sel
     dpdk-performance-changes-3n-skx-cmp:
         - 12  # NDRPDR sel
         - 13  # NDRPDR sel
     dpdk-performance-changes-3n-skx-cmp:
-      csit-dpdk-perf-verify-1901-3n-skx:
+      csit-dpdk-perf-verify-1904-3n-skx:
+        - 2   # NDRPDR sel
         - 3   # NDRPDR sel
         - 3   # NDRPDR sel
+        - 4   # NDRPDR sel
         - 5   # NDRPDR sel
         - 6   # NDRPDR sel
         - 7   # 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
         - 11  # NDRPDR sel
         - 12  # NDRPDR sel
         - 13  # NDRPDR sel
+        - 14  # NDRPDR sel
     dpdk-performance-changes-3n-skx:
       - "dpdk-performance-changes-3n-skx-h1"
       - "dpdk-performance-changes-3n-skx-ref"
       - "dpdk-performance-changes-3n-skx-cmp"
 
     dpdk-performance-changes-3n-skx:
       - "dpdk-performance-changes-3n-skx-h1"
       - "dpdk-performance-changes-3n-skx-ref"
       - "dpdk-performance-changes-3n-skx-cmp"
 
-    dpdk-performance-changes-2n-skx-ref:
+    dpdk-performance-changes-2n-skx-h1:
       csit-dpdk-perf-verify-1810-2n-skx:
         - 3   # NDRPDR sel
         - 4   # NDRPDR sel
       csit-dpdk-perf-verify-1810-2n-skx:
         - 3   # NDRPDR sel
         - 4   # NDRPDR sel
@@ -868,7 +760,7 @@
         - 11  # NDRPDR sel
         - 12  # NDRPDR sel
         - 13  # NDRPDR sel
         - 11  # NDRPDR sel
         - 12  # NDRPDR sel
         - 13  # NDRPDR sel
-    dpdk-performance-changes-2n-skx-cmp:
+    dpdk-performance-changes-2n-skx-ref:
       csit-dpdk-perf-verify-1901-2n-skx:
         - 12  # NDRPDR sel
         - 13  # NDRPDR sel
       csit-dpdk-perf-verify-1901-2n-skx:
         - 12  # NDRPDR sel
         - 13  # NDRPDR sel
@@ -880,100 +772,87 @@
         - 19  # NDRPDR sel
         - 20  # NDRPDR sel
         - 21  # NDRPDR sel
         - 19  # NDRPDR sel
         - 20  # NDRPDR sel
         - 21  # NDRPDR sel
+    dpdk-performance-changes-2n-skx-cmp:
+      csit-dpdk-perf-verify-1904-2n-skx:
+        - 2   # NDRPDR sel
+        - 3   # NDRPDR sel
+        - 4   # NDRPDR sel
+        - 5   # NDRPDR sel
+        - 7   # NDRPDR sel
+        - 8   # NDRPDR sel
+        - 9   # NDRPDR sel
+        - 10  # NDRPDR sel
+        - 11  # NDRPDR sel
+        - 12  # NDRPDR sel
     dpdk-performance-changes-2n-skx:
     dpdk-performance-changes-2n-skx:
+      - "dpdk-performance-changes-2n-skx-h1"
       - "dpdk-performance-changes-2n-skx-ref"
       - "dpdk-performance-changes-2n-skx-cmp"
 
     # Compare testbeds
 
     vpp-compare-testbeds-ref:
       - "dpdk-performance-changes-2n-skx-ref"
       - "dpdk-performance-changes-2n-skx-cmp"
 
     # Compare testbeds
 
     vpp-compare-testbeds-ref:
-      csit-vpp-perf-verify-1901-3n-hsw:
-#        - 10  # NDRPDR sel
-#        - 19  # NDRPDR sel
-#        - 31  # NDRPDR sel
-#        - 36  # NDRPDR sel
-#        - 40  # NDRPDR sel
-#        - 42  # NDRPDR sel
-#        - 44  # NDRPDR sel
-#        - 46  # NDRPDR sel
-#        - 47  # NDRPDR sel
-#        - 48  # NDRPDR sel
-#        - 61  # NDRPDR LB
-#        - 62  # NDRPDR LB
-#        - 63  # NDRPDR LB
-#        - 64  # NDRPDR LB
-#        - 65  # NDRPDR LB
-#        - 66  # NDRPDR LB
-#        - 67  # NDRPDR LB
-#        - 69  # NDRPDR LB
-#        - 70  # NDRPDR LB
-#        - 71  # NDRPDR LB
-        - 72  # 1901.1 NDRPDR sel
-        - 78  # 1901.1 NDRPDR sel
+      csit-vpp-perf-verify-1904-3n-hsw:
+        - 11  # NDRPDR sel
+        - 12  # NDRPDR sel
+        - 20  # NDRPDR sel
+        - 21  # NDRPDR sel
+        - 23  # NDRPDR sel
+        - 24  # NDRPDR sel
+        - 25  # NDRPDR sel
+        - 26  # NDRPDR sel
+        - 29  # NDRPDR sel
+        - 30  # NDRPDR sel
     vpp-compare-testbeds-cmp:
     vpp-compare-testbeds-cmp:
-      csit-vpp-perf-verify-1901-3n-skx:
-#        - 18  # NDRPDR sel
-#        - 19  # NDRPDR sel
-#        - 20  # NDRPDR sel
-#        - 28  # NDRPDR sel
-#        - 31  # NDRPDR sel
-#        - 33  # NDRPDR sel
-#        - 36  # NDRPDR sel
-#        - 38  # NDRPDR sel
-#        - 47  # NDRPDR sel
-#        - 48  # NDRPDR sel
-#        - 54  # NDRPDR LB
-#        - 57  # NDRPDR LB
-#        - 58  # NDRPDR LB
-#        - 59  # NDRPDR LB
-#        - 60  # NDRPDR LB
-#        - 63  # NDRPDR LB
-#        - 64  # NDRPDR LB
-#        - 65  # NDRPDR LB
-#        - 66  # NDRPDR LB
-#        - 67  # NDRPDR LB
-        - 68  # 1901.1 NDRPDR sel
+      csit-vpp-perf-verify-1904-3n-skx:
+        - 8   # NDRPDR sel
+        - 9   # NDRPDR sel
+        - 10  # NDRPDR sel
+        - 11  # NDRPDR sel
+        - 12  # NDRPDR sel
+        - 14  # NDRPDR sel
+        - 16  # NDRPDR sel
+        - 21  # NDRPDR sel
+        - 23  # NDRPDR sel
+        - 25  # NDRPDR sel
     vpp-compare-testbeds:
       - "vpp-compare-testbeds-ref"
       - "vpp-compare-testbeds-cmp"
 
     vpp-compare-testbeds-mrr-ref:
     vpp-compare-testbeds:
       - "vpp-compare-testbeds-ref"
       - "vpp-compare-testbeds-cmp"
 
     vpp-compare-testbeds-mrr-ref:
-      csit-vpp-perf-verify-1901-3n-hsw:
-#        - 35  # MRR sel
-        - 73  # 1901.1 MRR sel
-        - 77  # 1901.1 MRR sel
+      csit-vpp-perf-verify-1904-3n-hsw:
+        - 9   # MRR sel
     vpp-compare-testbeds-mrr-cmp:
     vpp-compare-testbeds-mrr-cmp:
-      csit-vpp-perf-verify-1901-3n-skx:
-#        - 32  # MRR sel
-        - 69  # 1901.1 MRR sel
+      csit-vpp-perf-verify-1904-3n-skx:
+        - 7   # MRR sel
     vpp-compare-testbeds-mrr:
       - "vpp-compare-testbeds-mrr-ref"
       - "vpp-compare-testbeds-mrr-cmp"
 
     dpdk-compare-testbeds-ref:
     vpp-compare-testbeds-mrr:
       - "vpp-compare-testbeds-mrr-ref"
       - "vpp-compare-testbeds-mrr-cmp"
 
     dpdk-compare-testbeds-ref:
-      csit-dpdk-perf-verify-1901-3n-hsw:
+      csit-dpdk-perf-verify-1904-3n-hsw:
+        - 2   # NDRPDR sel
+        - 3   # NDRPDR sel
+        - 5   # NDRPDR sel
+        - 6   # NDRPDR sel
         - 13  # NDRPDR sel
         - 14  # NDRPDR sel
         - 13  # NDRPDR sel
         - 14  # NDRPDR sel
-        - 16  # NDRPDR sel
-        - 17  # NDRPDR sel
+        - 15  # NDRPDR sel
         - 18  # NDRPDR sel
         - 19  # NDRPDR sel
         - 20  # NDRPDR sel
         - 18  # NDRPDR sel
         - 19  # NDRPDR sel
         - 20  # NDRPDR sel
-        - 21  # NDRPDR sel
-        - 22  # NDRPDR sel
-        - 23  # NDRPDR sel
     dpdk-compare-testbeds-cmp:
     dpdk-compare-testbeds-cmp:
-      csit-dpdk-perf-verify-1901-3n-skx:
+      csit-dpdk-perf-verify-1904-3n-skx:
+        - 2   # NDRPDR sel
         - 3   # NDRPDR sel
         - 3   # NDRPDR sel
+        - 4   # NDRPDR sel
         - 5   # NDRPDR sel
         - 6   # NDRPDR sel
         - 7   # 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
         - 11  # NDRPDR sel
         - 12  # NDRPDR sel
         - 13  # NDRPDR sel
+        - 14  # NDRPDR sel
     dpdk-compare-testbeds:
       - "dpdk-compare-testbeds-ref"
       - "dpdk-compare-testbeds-cmp"
     dpdk-compare-testbeds:
       - "dpdk-compare-testbeds-ref"
       - "dpdk-compare-testbeds-cmp"
@@ -981,81 +860,67 @@
     # Compare topologies
 
     vpp-compare-topologies-ref:
     # Compare topologies
 
     vpp-compare-topologies-ref:
-      csit-vpp-perf-verify-1901-3n-skx:
-#        - 18  # NDRPDR sel
-#        - 19  # NDRPDR sel
-#        - 20  # NDRPDR sel
-#        - 28  # NDRPDR sel
-#        - 31  # NDRPDR sel
-#        - 33  # NDRPDR sel
-#        - 36  # NDRPDR sel
-#        - 38  # NDRPDR sel
-#        - 47  # NDRPDR sel
-#        - 48  # NDRPDR sel
-#        - 54  # NDRPDR LB
-#        - 57  # NDRPDR LB
-#        - 58  # NDRPDR LB
-#        - 59  # NDRPDR LB
-#        - 60  # NDRPDR LB
-#        - 63  # NDRPDR LB
-#        - 64  # NDRPDR LB
-#        - 65  # NDRPDR LB
-#        - 66  # NDRPDR LB
-#        - 67  # NDRPDR LB
-        - 68  # 1901.1 NDRPDR sel
+      csit-vpp-perf-verify-1904-3n-skx:
+        - 8   # NDRPDR sel
+        - 9   # NDRPDR sel
+        - 10  # NDRPDR sel
+        - 11  # NDRPDR sel
+        - 12  # NDRPDR sel
+        - 14  # NDRPDR sel
+        - 16  # NDRPDR sel
+        - 21  # NDRPDR sel
+        - 23  # NDRPDR sel
+        - 25  # NDRPDR sel
     vpp-compare-topologies-cmp:
     vpp-compare-topologies-cmp:
-      csit-vpp-perf-verify-1901-2n-skx:
-#        - 5   # NDRPDR sel
-#        - 12  # NDRPDR sel
-#        - 13  # NDRPDR sel
-#        - 21  # NDRPDR sel
-#        - 23  # NDRPDR sel
-#        - 31  # NDRPDR sel
-#        - 34  # NDRPDR sel
-#        - 40  # NDRPDR sel
-#        - 42  # NDRPDR sel
-#        - 43  # NDRPDR sel
-        - 64  # 1901.1 NDRPDR sel
+      csit-vpp-perf-verify-1904-2n-skx:
+        - 12  # NDRPDR sel
+        - 14  # NDRPDR sel
+        - 16  # NDRPDR sel
+        - 17  # NDRPDR sel
+        - 18  # NDRPDR sel
+        - 21  # NDRPDR sel
+        - 27  # NDRPDR sel
+        - 30  # NDRPDR sel
+        - 31  # NDRPDR sel
+        - 32  # NDRPDR sel
     vpp-compare-topologies:
       - "vpp-compare-topologies-ref"
       - "vpp-compare-topologies-cmp"
 
     vpp-compare-topologies-mrr-ref:
     vpp-compare-topologies:
       - "vpp-compare-topologies-ref"
       - "vpp-compare-topologies-cmp"
 
     vpp-compare-topologies-mrr-ref:
-      csit-vpp-perf-verify-1901-3n-skx:
-#        - 32  # MRR sel
-        - 69  # 1901.1 MRR sel
+      csit-vpp-perf-verify-1904-3n-skx:
+        - 7   # MRR sel
     vpp-compare-topologies-mrr-cmp:
     vpp-compare-topologies-mrr-cmp:
-      csit-vpp-perf-verify-1901-2n-skx:
-#        - 22  # MRR sel
-        - 65  # 1901.1 MRR sel
+      csit-vpp-perf-verify-1904-2n-skx:
+        - 11  # MRR sel
     vpp-compare-topologies-mrr:
       - "vpp-compare-topologies-mrr-ref"
       - "vpp-compare-topologies-mrr-cmp"
 
     dpdk-compare-topologies-ref:
     vpp-compare-topologies-mrr:
       - "vpp-compare-topologies-mrr-ref"
       - "vpp-compare-topologies-mrr-cmp"
 
     dpdk-compare-topologies-ref:
-      csit-dpdk-perf-verify-1901-3n-skx:
+      csit-dpdk-perf-verify-1904-3n-skx:
+        - 2   # NDRPDR sel
         - 3   # NDRPDR sel
         - 3   # NDRPDR sel
+        - 4   # NDRPDR sel
         - 5   # NDRPDR sel
         - 6   # NDRPDR sel
         - 7   # 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
         - 11  # NDRPDR sel
         - 12  # NDRPDR sel
         - 13  # NDRPDR sel
+        - 14  # NDRPDR sel
     dpdk-compare-topologies-cmp:
     dpdk-compare-topologies-cmp:
-      csit-dpdk-perf-verify-1901-2n-skx:
+      csit-dpdk-perf-verify-1904-2n-skx:
+        - 2   # NDRPDR sel
+        - 3   # NDRPDR sel
+        - 4   # NDRPDR sel
+        - 5   # NDRPDR sel
+        - 7   # NDRPDR sel
+        - 8   # NDRPDR sel
+        - 9   # NDRPDR sel
+        - 10  # NDRPDR sel
+        - 11  # NDRPDR sel
         - 12  # NDRPDR sel
         - 12  # NDRPDR sel
-        - 13  # NDRPDR sel
-        - 14  # NDRPDR sel
-        - 15  # NDRPDR sel
-        - 16  # NDRPDR sel
-        - 17  # NDRPDR sel
-        - 18  # NDRPDR sel
-        - 19  # NDRPDR sel
-        - 20  # NDRPDR sel
-        - 21  # NDRPDR sel
     dpdk-compare-topologies:
       - "dpdk-compare-topologies-ref"
       - "dpdk-compare-topologies-cmp"
     dpdk-compare-topologies:
       - "dpdk-compare-topologies-ref"
       - "dpdk-compare-topologies-cmp"
@@ -1449,13 +1314,11 @@
       hoverlabel:
         namelength: -1
 
       hoverlabel:
         namelength: -1
 
--
-  type: "static"
+- type: "static"
   src-path: "{DIR[RST]}"
   dst-path: "{DIR[WORKING,SRC]}"
 
   src-path: "{DIR[RST]}"
   dst-path: "{DIR[WORKING,SRC]}"
 
--
-  type: "input"
+- type: "input"
   general:
     file-name: "robot-plugin.zip"
     file-format: ".zip"
   general:
     file-name: "robot-plugin.zip"
     file-format: ".zip"
@@ -1463,40 +1326,18 @@
     extract: "robot-plugin/output.xml"
 
   builds:
     extract: "robot-plugin/output.xml"
 
   builds:
+#    # TODO: Add 1904 data
+##    intel-dnv-vpp-release-1904:
+##      - 1
+#
+#    intel-dnv-vpp-release-1901:
+#      - 1
+#
+#    intel-dnv-vpp-release-1810:
+#      - 1
 
 
-    # Not used
-    intel-dnv-vpp-release-1810:
-      - 1
-
-    csit-vpp-perf-verify-1807-3n-hsw:
-      - 8   # MRR full
-      - 9   # MRR sel
-      - 21  # MRR sel
-      - 31  # MRR sel
-      - 33  # MRR sel
-      - 36  # MRR sel
-      - 41  # MRR sel
-      - 42  # MRR sel
-      - 48  # MRR sel
-      - 11  # NDRPDR full 1
-      - 22  # NDRPDR full 2
-      - 45  # NDRPDR full 3
-      - 46  # NDRPDR full 4
-      - 15  # NDRPDR sel
-      - 16  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 18  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 38  # NDRPDR sel
-      - 40  # NDRPDR sel
-      - 44  # NDRPDR sel
-      - 47  # NDRPDR sel
     csit-vpp-perf-verify-1810-3n-hsw:
       - 9   # MRR sel
     csit-vpp-perf-verify-1810-3n-hsw:
       - 9   # MRR sel
-      - 20  # NDRPDR full
-      - 21  # NDRPDR full
-      - 22  # NDRPDR full
-      - 27  # NDRPDR full
       - 8   # NDRPDR sel
       - 12  # NDRPDR sel
       - 14  # NDRPDR sel
       - 8   # NDRPDR sel
       - 12  # NDRPDR sel
       - 14  # NDRPDR sel
@@ -1507,77 +1348,57 @@
       - 39  # NDRPDR sel
       - 41  # NDRPDR sel
       - 42  # NDRPDR sel
       - 39  # NDRPDR sel
       - 41  # NDRPDR sel
       - 42  # NDRPDR sel
-      - 28  # WRK
-      - 29  # WRK
-      - 30  # WRK
-      - 31  # WRK
-      - 32  # WRK
-      - 33  # WRK
-      - 34  # WRK
-      - 35  # WRK
-      - 36  # WRK
-      - 37  # WRK
+#      - 28  # WRK
+#      - 29  # WRK
+#      - 30  # WRK
+#      - 31  # WRK
+#      - 32  # WRK
+#      - 33  # WRK
+#      - 34  # WRK
+#      - 35  # WRK
+#      - 36  # WRK
+#      - 37  # WRK
     csit-vpp-perf-verify-1901-3n-hsw:
     csit-vpp-perf-verify-1901-3n-hsw:
-#      - 35  # MRR sel
-#      - 38  # NDRPDR full
-#      - 43  # NDRPDR full
-#      - 45  # NDRPDR full
-#      - 49  # NDRPDR full
-#      - 10  # NDRPDR sel
-#      - 19  # NDRPDR sel
-#      - 31  # NDRPDR sel
-#      - 36  # NDRPDR sel
-#      - 40  # NDRPDR sel
-#      - 42  # NDRPDR sel
-#      - 44  # NDRPDR sel
-#      - 46  # NDRPDR sel
-#      - 47  # NDRPDR sel
-#      - 48  # NDRPDR sel
-#      - 61  # NDRPDR LB
-#      - 62  # NDRPDR LB
-#      - 63  # NDRPDR LB
-#      - 64  # NDRPDR LB
-#      - 65  # NDRPDR LB
-#      - 66  # NDRPDR LB
-#      - 67  # NDRPDR LB
-#      - 69  # NDRPDR LB
-#      - 70  # NDRPDR LB
-#      - 71  # NDRPDR LB
-      - 72  # 1901.1 NDRPDR sel
-      - 78  # 1901.1 NDRPDR sel
-      - 73  # 1901.1 MRR sel
-      - 77  # 1901.1 MRR sel
-    csit-vpp-perf-verify-1807-3n-skx:
-      - 31  # MRR full
-      - 28  # MRR sel
-      - 32  # MRR sel
-      - 36  # MRR sel
-      - 42  # MRR sel
-      - 47  # MRR sel
-      - 48  # MRR sel
-      - 51  # MRR sel
-      - 52  # MRR sel
-      - 53  # MRR sel
-      - 54  # MRR sel
-      - 40  # NDRPDR full 1
-      - 41  # NDRPDR full 2
-      - 33  # NDRPDR sel
-      - 35  # NDRPDR sel
-      - 37  # NDRPDR sel
-      - 38  # NDRPDR sel
-      - 39  # NDRPDR sel
-      - 43  # NDRPDR sel
+      - 35  # MRR sel
+      - 10  # NDRPDR sel
+      - 19  # NDRPDR sel
+      - 31  # NDRPDR sel
+      - 36  # NDRPDR sel
+      - 40  # NDRPDR sel
+      - 42  # NDRPDR sel
       - 44  # NDRPDR sel
       - 44  # NDRPDR sel
-      - 49  # NDRPDR sel
-      - 50  # NDRPDR sel
-      - 56  # NDRPDR sel
+      - 46  # NDRPDR sel
+      - 47  # NDRPDR sel
+      - 48  # NDRPDR sel
+      - 61  # NDRPDR LB
+      - 62  # NDRPDR LB
+      - 63  # NDRPDR LB
+      - 64  # NDRPDR LB
+      - 65  # NDRPDR LB
+      - 66  # NDRPDR LB
+      - 67  # NDRPDR LB
+      - 69  # NDRPDR LB
+      - 70  # NDRPDR LB
+      - 71  # NDRPDR LB
+    # TODO: Add 1904 Data
+    csit-vpp-perf-verify-1904-3n-hsw:
+      - 9   # MRR sel
+      - 11  # NDRPDR sel
+      - 12  # NDRPDR sel
+      - 20  # NDRPDR sel
+      - 21  # NDRPDR sel
+      - 23  # NDRPDR sel
+      - 24  # NDRPDR sel
+      - 25  # NDRPDR sel
+      - 26  # NDRPDR sel
+      - 29  # NDRPDR sel
+      - 30  # NDRPDR sel
+
     csit-vpp-perf-verify-1810-3n-skx:
       - 9   # MRR sel
       - 11  # MRR sel
       - 12  # MRR sel
       - 13  # MRR sel
     csit-vpp-perf-verify-1810-3n-skx:
       - 9   # MRR sel
       - 11  # MRR sel
       - 12  # MRR sel
       - 13  # MRR sel
-      - 23  # NDRPDR full
-      - 24  # NDRPDR full
       - 10  # NDRPDR sel
       - 14  # NDRPDR sel
       - 15  # NDRPDR sel
       - 10  # NDRPDR sel
       - 14  # NDRPDR sel
       - 15  # NDRPDR sel
@@ -1589,63 +1410,49 @@
       - 22  # NDRPDR sel
       - 25  # NDRPDR sel
     csit-vpp-perf-verify-1901-3n-skx:
       - 22  # NDRPDR sel
       - 25  # NDRPDR sel
     csit-vpp-perf-verify-1901-3n-skx:
-#      - 32  # MRR sel
-#      - 37  # NDRPDR full
-#      - 39  # NDRPDR full
-#      - 40  # NDRPDR full
-#      - 49  # NDRPDR full
-#      - 18  # NDRPDR sel
-#      - 19  # NDRPDR sel
-#      - 20  # NDRPDR sel
-#      - 28  # NDRPDR sel
-#      - 31  # NDRPDR sel
-#      - 33  # NDRPDR sel
-#      - 36  # NDRPDR sel
-#      - 38  # NDRPDR sel
-#      - 47  # NDRPDR sel
-#      - 48  # NDRPDR sel
-#      - 54  # NDRPDR LB
-#      - 57  # NDRPDR LB
-#      - 58  # NDRPDR LB
-#      - 59  # NDRPDR LB
-#      - 60  # NDRPDR LB
-#      - 63  # NDRPDR LB
-#      - 64  # NDRPDR LB
-#      - 65  # NDRPDR LB
-#      - 66  # NDRPDR LB
-#      - 67  # NDRPDR LB
-      - 68  # 1901.1 NDRPDR sel
-      - 69  # 1901.1 MRR sel
-    csit-vpp-perf-verify-1807-2n-skx:
-      - 27  # MRR full
-      - 31  # MRR sel
-      - 33  # MRR sel
-      - 37  # MRR sel
-      - 38  # MRR sel
-      - 41  # MRR sel
-      - 43  # MRR sel
-      - 44  # MRR sel
-      - 45  # MRR sel
-      - 46  # MRR sel
-      - 47  # MRR sel
-      - 32  # NDRPDR full
-      - 26  # NDRPDR sel
+      - 32  # MRR sel
+      - 18  # NDRPDR sel
+      - 19  # NDRPDR sel
+      - 20  # NDRPDR sel
       - 28  # NDRPDR sel
       - 28  # NDRPDR sel
-      - 29  # NDRPDR sel
-      - 30  # NDRPDR sel
-      - 34  # NDRPDR sel
-      - 35  # NDRPDR sel
+      - 31  # NDRPDR sel
+      - 33  # NDRPDR sel
       - 36  # NDRPDR sel
       - 36  # NDRPDR sel
-      - 39  # NDRPDR sel
-      - 40  # NDRPDR sel
-      - 42  # NDRPDR sel
+      - 38  # NDRPDR sel
+      - 47  # NDRPDR sel
+      - 48  # NDRPDR sel
+      - 54  # NDRPDR LB
+      - 57  # NDRPDR LB
+      - 58  # NDRPDR LB
+      - 59  # NDRPDR LB
+      - 60  # NDRPDR LB
+      - 63  # NDRPDR LB
+      - 64  # NDRPDR LB
+      - 65  # NDRPDR LB
+      - 66  # NDRPDR LB
+      - 67  # NDRPDR LB
+    csit-vpp-perf-verify-1904-3n-skx:
+      - 7   # MRR sel
+      - 26  # NDRPDR full
+      - 27  # NDRPDR full
+      - 30  # NDRPDR full
+      - 31  # NDRPDR full
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
+      - 11  # NDRPDR sel
+      - 12  # NDRPDR sel
+      - 14  # NDRPDR sel
+      - 16  # NDRPDR sel
+      - 21  # NDRPDR sel
+      - 23  # NDRPDR sel
+      - 25  # NDRPDR sel
+
     csit-vpp-perf-verify-1810-2n-skx:
       - 8   # MRR sel
       - 10  # MRR sel
       - 11  # MRR sel
       - 12  # MRR sel
     csit-vpp-perf-verify-1810-2n-skx:
       - 8   # MRR sel
       - 10  # MRR sel
       - 11  # MRR sel
       - 12  # MRR sel
-      - 25  # NDRPDR full
-      - 26  # NDRPDR full
       - 9   # NDRPDR sel
       - 13  # NDRPDR sel
       - 14  # NDRPDR sel
       - 9   # NDRPDR sel
       - 13  # NDRPDR sel
       - 14  # NDRPDR sel
@@ -1654,60 +1461,74 @@
       - 21  # NDRPDR sel
       - 22  # NDRPDR sel
       - 23  # NDRPDR sel
       - 21  # NDRPDR sel
       - 22  # NDRPDR sel
       - 23  # NDRPDR sel
-      - 24  # NDRPDR sel
-      - 27  # NDRPDR sel
-    csit-vpp-perf-verify-1901-2n-skx:
-#      - 22  # MRR sel
-#      - 25  # NDRPDR full
-#      - 30  # NDRPDR full
-#      - 33  # NDRPDR full
-#      - 44  # NDRPDR full
-#      - 5   # NDRPDR sel
-#      - 12  # NDRPDR sel
-#      - 13  # NDRPDR sel
-#      - 21  # NDRPDR sel
-#      - 23  # NDRPDR sel
-#      - 31  # NDRPDR sel
-#      - 34  # NDRPDR sel
-#      - 40  # NDRPDR sel
-#      - 42  # NDRPDR sel
-#      - 43  # NDRPDR sel
-      - 24  # NFV MRR
-      - 26  # NFV MRR
-      - 27  # NFV MRR
-      - 35  # NFV MRR
-      - 37  # NFV MRR
-      - 28  # NFV NDRPDR
-      - 29  # NFV NDRPDR
-      - 32  # NFV NDRPDR
-      - 39  # NFV NDRPDR
-      - 46  # NFV NDRPDR
-      - 45  # SOAK
-      - 64  # 1901.1 NDRPDR sel
-      - 65  # 1901.1 MRR sel
-    csit-ligato-perf-verify-1901-3n-hsw:
-      - 10  # NDRPDR full
-      - 8   # NDRPDR sel
-      - 9   # NDRPDR sel
-      - 11  # NDRPDR sel
+      - 24  # NDRPDR sel
+      - 27  # NDRPDR sel
+    csit-vpp-perf-verify-1901-2n-skx:
+      - 22  # MRR sel
+      - 5   # NDRPDR sel
       - 12  # NDRPDR sel
       - 13  # NDRPDR sel
       - 12  # NDRPDR sel
       - 13  # NDRPDR sel
+      - 21  # NDRPDR sel
+      - 23  # NDRPDR sel
+      - 31  # NDRPDR sel
+      - 34  # NDRPDR sel
+      - 40  # NDRPDR sel
+      - 42  # NDRPDR sel
+      - 43  # NDRPDR sel
+    # TODO: Add 1904 data
+    csit-vpp-perf-verify-1904-2n-skx:
+      - 11  # MRR sel
+      - 33  # NDRPDR full
+      - 39  # NDRPDR full
+      - 58  # NDRPDR full
+      - 62  # NDRPDR full
+      - 12  # NDRPDR sel
       - 14  # NDRPDR sel
       - 14  # NDRPDR sel
-      - 15  # NDRPDR sel
       - 16  # NDRPDR sel
       - 17  # NDRPDR sel
       - 18  # NDRPDR sel
       - 16  # NDRPDR sel
       - 17  # NDRPDR sel
       - 18  # NDRPDR sel
-    csit-dpdk-perf-verify-1807-3n-hsw:
-      - 11
-      - 12  # full
-      - 14
-      - 15
-      - 16
-      - 17
-      - 20
-      - 21
-      - 22
-      - 23
+      - 21  # NDRPDR sel
+      - 27  # NDRPDR sel
+      - 30  # NDRPDR sel
+      - 31  # NDRPDR sel
+      - 32  # NDRPDR sel
+      - 40  # NFV MRR 64b
+      - 41  # NFV MRR 64b
+      - 42  # NFV MRR 64b
+      - 47  # NFV MRR 64b
+      - 48  # NFV MRR 64b
+      - 49  # NFV MRR IMIX
+      - 50  # NFV MRR IMIX
+      - 51  # NFV MRR IMIX
+      - 54  # NFV MRR IMIX
+      - 55  # NFV MRR IMIX
+      - 56  # NFV NDRPDR 64b
+      - 59  # NFV NDRPDR 64b
+      - 60  # NFV NDRPDR 64b
+      - 65  # NFV NDRPDR 64b
+      - 68  # NFV NDRPDR 64b
+      - 66  # NFV NDRPDR IMIX
+      - 67  # NFV NDRPDR IMIX
+      - 69  # NFV NDRPDR IMIX
+      - 70  # SOAK
+      - 71  # SOAK
+
+#    csit-ligato-perf-verify-1901-3n-hsw:
+#      - 10  # NDRPDR full
+#      - 8   # NDRPDR sel
+#      - 9   # NDRPDR sel
+#      - 11  # NDRPDR sel
+#      - 12  # NDRPDR sel
+#      - 13  # NDRPDR sel
+#      - 14  # NDRPDR sel
+#      - 15  # NDRPDR sel
+#      - 16  # NDRPDR sel
+#      - 17  # NDRPDR sel
+#      - 18  # NDRPDR sel
+#    # TODO: Add 1904 data
+##    csit-ligato-perf-verify-1904-3n-hsw:
+##      -
+
     csit-dpdk-perf-verify-1810-3n-hsw:
       - 1   # NDRPDR sel
       - 2   # NDRPDR sel
     csit-dpdk-perf-verify-1810-3n-hsw:
       - 1   # NDRPDR sel
       - 2   # NDRPDR sel
@@ -1730,17 +1551,18 @@
       - 21  # NDRPDR sel
       - 22  # NDRPDR sel
       - 23  # NDRPDR sel
       - 21  # NDRPDR sel
       - 22  # NDRPDR sel
       - 23  # NDRPDR sel
-    csit-dpdk-perf-verify-1807-3n-skx:
-      - 1   # NDRPDR sel
+    csit-dpdk-perf-verify-1904-3n-hsw:
       - 2   # NDRPDR sel
       - 3   # NDRPDR sel
       - 2   # NDRPDR sel
       - 3   # NDRPDR sel
+      - 5   # NDRPDR sel
       - 6   # 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
+      - 14  # NDRPDR sel
+      - 15  # NDRPDR sel
+      - 18  # NDRPDR sel
+      - 19  # NDRPDR sel
+      - 20  # NDRPDR sel
+
     csit-dpdk-perf-verify-1810-3n-skx:
       - 3   # NDRPDR sel
       - 4   # NDRPDR sel
     csit-dpdk-perf-verify-1810-3n-skx:
       - 3   # NDRPDR sel
       - 4   # NDRPDR sel
@@ -1763,6 +1585,18 @@
       - 11  # NDRPDR sel
       - 12  # NDRPDR sel
       - 13  # NDRPDR sel
       - 11  # NDRPDR sel
       - 12  # NDRPDR sel
       - 13  # NDRPDR sel
+    csit-dpdk-perf-verify-1904-3n-skx:
+      - 2   # NDRPDR sel
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 5   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 11  # NDRPDR sel
+      - 12  # NDRPDR sel
+      - 13  # NDRPDR sel
+      - 14  # NDRPDR sel
+
     csit-dpdk-perf-verify-1810-2n-skx:
       - 3   # NDRPDR sel
       - 4   # NDRPDR sel
     csit-dpdk-perf-verify-1810-2n-skx:
       - 3   # NDRPDR sel
       - 4   # NDRPDR sel
@@ -1785,36 +1619,67 @@
       - 19  # NDRPDR sel
       - 20  # NDRPDR sel
       - 21  # NDRPDR sel
       - 19  # NDRPDR sel
       - 20  # NDRPDR sel
       - 21  # NDRPDR sel
-    csit-vpp-functional-1901-ubuntu1604-virl:
-      - 173
-    csit-vpp-functional-1901-centos7-virl:
-      - 175
-    csit-vpp-device-1901-ubuntu1804-1n-skx:
-      - 175
-    # Not used
-    csit-nsh_sfc-verify-func-1810-ubuntu1604-virl:
+    csit-dpdk-perf-verify-1904-2n-skx:
+      - 2   # NDRPDR sel
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 5   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
+      - 11  # NDRPDR sel
+      - 12  # NDRPDR sel
+
+    csit-vpp-functional-1904-ubuntu1604-virl:
+      - 33
+    csit-vpp-functional-1904-centos7-virl:
+      - 32
+    csit-vpp-device-1904-ubuntu1804-1n-skx:
+      - 32
+#    # Not used
+#    csit-nsh_sfc-verify-func-1810-ubuntu1604-virl:
+#      - 1
+    csit-dmm-functional-1904-ubuntu1604-virl:
       - 1
       - 1
-    csit-dmm-functional-1901-ubuntu1604-virl:
-      - 2
-    csit-hc2vpp-verify-func-1901-ubuntu1604:
-      - 3
+    csit-hc2vpp-verify-func-1904-ubuntu1604:
+      - 4
 
 
--
-  type: "output"
+- type: "output"
   output: "report"
   format:
     html:
     - full
   output: "report"
   format:
     html:
     - full
-    pdf:
-    - minimal
+#    pdf:
+#    - minimal
 
 ################################################################################
 ###                               T A B L E S                                ###
 ################################################################################
 
 
 ################################################################################
 ###                               T A B L E S                                ###
 ################################################################################
 
+# VPP SOAK vs NDR
+- type: "table"
+  title: "VPP Soak vs NDR 2n-skx"
+  algorithm: "table_soak_vs_ndr"
+  output-file: "{DIR[STATIC,VPP]}/soak-vs-ndr-2n-skx"
+  reference:
+    title: "NDR"
+    data: "vpp-soak-vs-ndr-2n-skx-ref"
+  compare:
+    title: "Soak"
+    data: "vpp-soak-vs-ndr-2n-skx-cmp"
+  data: "vpp-soak-vs-ndr-2n-skx"
+  include-tests: "NDR"
+  filter: "('NDRPDR' or 'SOAK')"
+  parameters:
+    - "throughput"
+    - "name"
+    - "parent"
+
+################################################################################
+
 # VPP Compare NICs 3n-hsw 1t1c ndr
 # VPP Compare NICs 3n-hsw 1t1c ndr
--
-  type: "table"
+- type: "table"
   title: "VPP Compare NICs 3n-hsw 1t1c ndr"
   algorithm: "table_nics_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-1t1c-nics-ndr"
   title: "VPP Compare NICs 3n-hsw 1t1c ndr"
   algorithm: "table_nics_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-1t1c-nics-ndr"
@@ -1834,8 +1699,7 @@
   - "tags"
 
 # VPP Compare NICs 3n-hsw 2t2c ndr
   - "tags"
 
 # VPP Compare NICs 3n-hsw 2t2c ndr
--
-  type: "table"
+- type: "table"
   title: "VPP Compare NICs 3n-hsw 2t2c ndr"
   algorithm: "table_nics_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-2t2c-nics-ndr"
   title: "VPP Compare NICs 3n-hsw 2t2c ndr"
   algorithm: "table_nics_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-2t2c-nics-ndr"
@@ -1855,8 +1719,7 @@
   - "tags"
 
 # VPP Compare NICs 3n-hsw 1t1c pdr
   - "tags"
 
 # VPP Compare NICs 3n-hsw 1t1c pdr
--
-  type: "table"
+- type: "table"
   title: "VPP Compare NICs 3n-hsw 1t1c pdr"
   algorithm: "table_nics_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-1t1c-nics-pdr"
   title: "VPP Compare NICs 3n-hsw 1t1c pdr"
   algorithm: "table_nics_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-1t1c-nics-pdr"
@@ -1876,8 +1739,7 @@
   - "tags"
 
 # VPP Compare NICs 3n-hsw 2t2c pdr
   - "tags"
 
 # VPP Compare NICs 3n-hsw 2t2c pdr
--
-  type: "table"
+- type: "table"
   title: "VPP Compare NICs 3n-hsw 2t2c pdr"
   algorithm: "table_nics_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-2t2c-nics-pdr"
   title: "VPP Compare NICs 3n-hsw 2t2c pdr"
   algorithm: "table_nics_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-2t2c-nics-pdr"
@@ -1897,8 +1759,7 @@
   - "tags"
 
 # VPP Compare NICs 3n-hsw 1t1c mrr
   - "tags"
 
 # VPP Compare NICs 3n-hsw 1t1c mrr
--
-  type: "table"
+- type: "table"
   title: "VPP Compare NICs 3n-hsw 1t1c mrr"
   algorithm: "table_nics_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-1t1c-nics-mrr"
   title: "VPP Compare NICs 3n-hsw 1t1c mrr"
   algorithm: "table_nics_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-1t1c-nics-mrr"
@@ -1918,8 +1779,7 @@
   - "tags"
 
 # VPP Compare NICs 3n-hsw 2t2c mrr
   - "tags"
 
 # VPP Compare NICs 3n-hsw 2t2c mrr
--
-  type: "table"
+- type: "table"
   title: "VPP Compare NICs 3n-hsw 2t2c mrr"
   algorithm: "table_nics_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-2t2c-nics-mrr"
   title: "VPP Compare NICs 3n-hsw 2t2c mrr"
   algorithm: "table_nics_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-2t2c-nics-mrr"
@@ -1939,8 +1799,7 @@
   - "tags"
 
 # VPP Compare NICs 3n-hsw 4t4c mrr
   - "tags"
 
 # VPP Compare NICs 3n-hsw 4t4c mrr
--
-  type: "table"
+- type: "table"
   title: "VPP Compare NICs 3n-hsw 4t4c mrr"
   algorithm: "table_nics_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-4t4c-nics-mrr"
   title: "VPP Compare NICs 3n-hsw 4t4c mrr"
   algorithm: "table_nics_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-4t4c-nics-mrr"
@@ -1960,8 +1819,7 @@
   - "tags"
 
 # VPP Compare NICs 3n-skx 2t1c ndr
   - "tags"
 
 # VPP Compare NICs 3n-skx 2t1c ndr
--
-  type: "table"
+- type: "table"
   title: "VPP Compare NICs 3n-skx 2t1c ndr"
   algorithm: "table_nics_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-2t1c-nics-ndr"
   title: "VPP Compare NICs 3n-skx 2t1c ndr"
   algorithm: "table_nics_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-2t1c-nics-ndr"
@@ -1981,8 +1839,7 @@
   - "tags"
 
 # VPP Compare NICs 3n-skx 4t2c ndr
   - "tags"
 
 # VPP Compare NICs 3n-skx 4t2c ndr
--
-  type: "table"
+- type: "table"
   title: "VPP Compare NICs 3n-skx 4t2c ndr"
   algorithm: "table_nics_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-4t2c-nics-ndr"
   title: "VPP Compare NICs 3n-skx 4t2c ndr"
   algorithm: "table_nics_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-4t2c-nics-ndr"
@@ -2002,8 +1859,7 @@
   - "tags"
 
 # VPP Compare NICs 3n-skx 2t1c pdr
   - "tags"
 
 # VPP Compare NICs 3n-skx 2t1c pdr
--
-  type: "table"
+- type: "table"
   title: "VPP Compare NICs 3n-skx 2t1c pdr"
   algorithm: "table_nics_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-2t1c-nics-pdr"
   title: "VPP Compare NICs 3n-skx 2t1c pdr"
   algorithm: "table_nics_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-2t1c-nics-pdr"
@@ -2023,8 +1879,7 @@
   - "tags"
 
  # VPP Compare NICs 3n-skx 4t2c pdr
   - "tags"
 
  # VPP Compare NICs 3n-skx 4t2c pdr
--
-  type: "table"
+- type: "table"
   title: "VPP Compare NICs 3n-skx 4t2c pdr"
   algorithm: "table_nics_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-4t2c-nics-pdr"
   title: "VPP Compare NICs 3n-skx 4t2c pdr"
   algorithm: "table_nics_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-4t2c-nics-pdr"
@@ -2044,8 +1899,7 @@
   - "tags"
 
 # VPP Compare NICs 3n-skx 2t1c mrr
   - "tags"
 
 # VPP Compare NICs 3n-skx 2t1c mrr
--
-  type: "table"
+- type: "table"
   title: "VPP Compare NICs 3n-skx 2t1c mrr"
   algorithm: "table_nics_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-2t1c-nics-mrr"
   title: "VPP Compare NICs 3n-skx 2t1c mrr"
   algorithm: "table_nics_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-2t1c-nics-mrr"
@@ -2065,8 +1919,7 @@
   - "tags"
 
 # VPP Compare NICs 3n-skx 4t2c mrr
   - "tags"
 
 # VPP Compare NICs 3n-skx 4t2c mrr
--
-  type: "table"
+- type: "table"
   title: "VPP Compare NICs 3n-skx 4t2c mrr"
   algorithm: "table_nics_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-4t2c-nics-mrr"
   title: "VPP Compare NICs 3n-skx 4t2c mrr"
   algorithm: "table_nics_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-4t2c-nics-mrr"
@@ -2086,8 +1939,7 @@
   - "tags"
 
  # VPP Compare NICs 3n-skx 8t4c mrr
   - "tags"
 
  # VPP Compare NICs 3n-skx 8t4c mrr
--
-  type: "table"
+- type: "table"
   title: "VPP Compare NICs 3n-skx 8t4c mrr"
   algorithm: "table_nics_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-8t4c-nics-mrr"
   title: "VPP Compare NICs 3n-skx 8t4c mrr"
   algorithm: "table_nics_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-8t4c-nics-mrr"
@@ -2107,8 +1959,7 @@
   - "tags"
 
 # VPP Compare NICs 2n-skx 2t1c ndr
   - "tags"
 
 # VPP Compare NICs 2n-skx 2t1c ndr
--
-  type: "table"
+- type: "table"
   title: "VPP Compare NICs 2n-skx 2t1c ndr"
   algorithm: "table_nics_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-2t1c-nics-ndr"
   title: "VPP Compare NICs 2n-skx 2t1c ndr"
   algorithm: "table_nics_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-2t1c-nics-ndr"
@@ -2128,8 +1979,7 @@
   - "tags"
 
 # VPP Compare NICs 2n-skx 4t2c ndr
   - "tags"
 
 # VPP Compare NICs 2n-skx 4t2c ndr
--
-  type: "table"
+- type: "table"
   title: "VPP Compare NICs 2n-skx 4t2c ndr"
   algorithm: "table_nics_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-4t2c-nics-ndr"
   title: "VPP Compare NICs 2n-skx 4t2c ndr"
   algorithm: "table_nics_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-4t2c-nics-ndr"
@@ -2149,8 +1999,7 @@
   - "tags"
 
  # VPP Compare NICs 2n-skx 2t1c pdr
   - "tags"
 
  # VPP Compare NICs 2n-skx 2t1c pdr
--
-  type: "table"
+- type: "table"
   title: "VPP Compare NICs 2n-skx 2t1c pdr"
   algorithm: "table_nics_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-2t1c-nics-pdr"
   title: "VPP Compare NICs 2n-skx 2t1c pdr"
   algorithm: "table_nics_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-2t1c-nics-pdr"
@@ -2170,8 +2019,7 @@
   - "tags"
 
 # VPP Compare NICs 2n-skx 4t2c pdr
   - "tags"
 
 # VPP Compare NICs 2n-skx 4t2c pdr
--
-  type: "table"
+- type: "table"
   title: "VPP Compare NICs 2n-skx 4t2c pdr"
   algorithm: "table_nics_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-4t2c-nics-pdr"
   title: "VPP Compare NICs 2n-skx 4t2c pdr"
   algorithm: "table_nics_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-4t2c-nics-pdr"
@@ -2191,8 +2039,7 @@
   - "tags"
 
 # VPP Compare NICs 2n-skx 2t1c mrr
   - "tags"
 
 # VPP Compare NICs 2n-skx 2t1c mrr
--
-  type: "table"
+- type: "table"
   title: "VPP Compare NICs 2n-skx 2t1c mrr"
   algorithm: "table_nics_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-2t1c-nics-mrr"
   title: "VPP Compare NICs 2n-skx 2t1c mrr"
   algorithm: "table_nics_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-2t1c-nics-mrr"
@@ -2212,8 +2059,7 @@
   - "tags"
 
 # VPP Compare NICs 2n-skx 4t2c mrr
   - "tags"
 
 # VPP Compare NICs 2n-skx 4t2c mrr
--
-  type: "table"
+- type: "table"
   title: "VPP Compare NICs 2n-skx 4t2c mrr"
   algorithm: "table_nics_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-4t2c-nics-mrr"
   title: "VPP Compare NICs 2n-skx 4t2c mrr"
   algorithm: "table_nics_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-4t2c-nics-mrr"
@@ -2233,8 +2079,7 @@
   - "tags"
 
 # VPP Compare NICs 2n-skx 8t4c mrr
   - "tags"
 
 # VPP Compare NICs 2n-skx 8t4c mrr
--
-  type: "table"
+- type: "table"
   title: "VPP Compare NICs 2n-skx 8t4c mrr"
   algorithm: "table_nics_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-8t4c-nics-mrr"
   title: "VPP Compare NICs 2n-skx 8t4c mrr"
   algorithm: "table_nics_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-8t4c-nics-mrr"
@@ -2256,21 +2101,173 @@
 ################################################################################
 # VPP
 
 ################################################################################
 # VPP
 
+## VPP Performance Changes 2n-dnv 1t1c pdr
+#- type: "table"
+#  title: "VPP Performance Changes 2n-dnv 1t1c pdr"
+#  algorithm: "table_performance_comparison"
+#  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-dnv-1t1c-pdr"
+#  history:
+#    - title: "rls1810"
+#      data: "intel-dnv-vpp-changes-2n-dnv-h1"
+#  reference:
+#    title: "rls1901"
+#    data: "intel-dnv-vpp-changes-2n-dnv-ref"
+#  compare:
+#    title: "rls1904"
+#    data: "intel-dnv-vpp-changes-2n-dnv-cmp"
+#  data: "intel-dnv-vpp-changes-2n-dnv"
+#  include-tests: "PDR"
+#  filter: "'1T1C' and ('NDRPDR' or 'NDRPDRDISC')"
+#  parameters:
+#  - "name"
+#  - "parent"
+#  - "throughput"
+#
+## VPP Performance Changes 2n-dnv 2t2c pdr
+#- type: "table"
+#  title: "VPP Performance Changes 2n-dnv 2t2c pdr"
+#  algorithm: "table_performance_comparison"
+#  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-dnv-2t2c-pdr"
+#  history:
+#    - title: "rls1810"
+#      data: "intel-dnv-vpp-changes-2n-dnv-h1"
+#  reference:
+#    title: "rls1901"
+#    data: "intel-dnv-vpp-changes-2n-dnv-ref"
+#  compare:
+#    title: "rls1904"
+#    data: "intel-dnv-vpp-changes-2n-dnv-cmp"
+#  data: "intel-dnv-vpp-changes-2n-dnv"
+#  include-tests: "PDR"
+#  filter: "'2T2C' and ('NDRPDR' or 'NDRPDRDISC')"
+#  parameters:
+#  - "name"
+#  - "parent"
+#  - "throughput"
+#
+## VPP Performance Changes 2n-dnv 1t1c ndr
+#- type: "table"
+#  title: "VPP Performance Changes 2n-dnv 1t1c ndr"
+#  algorithm: "table_performance_comparison"
+#  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-dnv-1t1c-ndr"
+#  history:
+#    - title: "rls1810"
+#      data: "intel-dnv-vpp-changes-2n-dnv-h1"
+#  reference:
+#    title: "rls1901"
+#    data: "intel-dnv-vpp-changes-2n-dnv-ref"
+#  compare:
+#    title: "rls1904"
+#    data: "intel-dnv-vpp-changes-2n-dnv-cmp"
+#  data: "intel-dnv-vpp-changes-2n-dnv"
+#  include-tests: "NDR"
+#  filter: "'1T1C' and ('NDRPDR' or 'NDRPDRDISC')"
+#  parameters:
+#  - "name"
+#  - "parent"
+#  - "throughput"
+#
+## VPP Performance Changes 2n-dnv 2t2c ndr
+#- type: "table"
+#  title: "VPP Performance Changes 2n-dnv 2t2c ndr"
+#  algorithm: "table_performance_comparison"
+#  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-dnv-2t2c-ndr"
+#  history:
+#    - title: "rls1810"
+#      data: "intel-dnv-vpp-changes-2n-dnv-h1"
+#  reference:
+#    title: "rls1901"
+#    data: "intel-dnv-vpp-changes-2n-dnv-ref"
+#  compare:
+#    title: "rls1904"
+#    data: "intel-dnv-vpp-changes-2n-dnv-cmp"
+#  data: "intel-dnv-vpp-changes-2n-dnv"
+#  include-tests: "NDR"
+#  filter: "'2T2C' and ('NDRPDR' or 'NDRPDRDISC')"
+#  parameters:
+#  - "name"
+#  - "parent"
+#  - "throughput"
+#
+## VPP Performance Changes 2n-dnv 1t1c MRR
+#- type: "table"
+#  title: "VPP Performance Changes 2n-dnv 1t1c MRR"
+#  algorithm: "table_performance_comparison"
+#  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-dnv-1t1c-mrr"
+#  history:
+#    - title: "rls1810"
+#      data: "intel-dnv-vpp-changes-2n-dnv-h1"
+#  reference:
+#    title: "rls1901"
+#    data: "intel-dnv-vpp-changes-2n-dnv-ref"
+#  compare:
+#    title: "rls1904"
+#    data: "intel-dnv-vpp-changes-2n-dnv-cmp"
+#  data: "intel-dnv-vpp-changes-2n-dnv"
+#  include-tests: "MRR"
+#  filter: "'1T1C' and 'MRR'"
+#  parameters:
+#  - "name"
+#  - "parent"
+#  - "result"
+#
+## VPP Performance Changes 2n-dnv 2t2c MRR
+#- type: "table"
+#  title: "VPP Performance Changes 2n-dnv 2t2c MRR"
+#  algorithm: "table_performance_comparison"
+#  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-dnv-2t2c-mrr"
+#  history:
+#    - title: "rls1810"
+#      data: "intel-dnv-vpp-changes-2n-dnv-h1"
+#  reference:
+#    title: "rls1901"
+#    data: "intel-dnv-vpp-changes-2n-dnv-ref"
+#  compare:
+#    title: "rls1904"
+#    data: "intel-dnv-vpp-changes-2n-dnv-cmp"
+#  data: "intel-dnv-vpp-changes-2n-dnv"
+#  include-tests: "MRR"
+#  filter: "'2T2C' and 'MRR'"
+#  parameters:
+#  - "name"
+#  - "parent"
+#  - "result"
+#
+## VPP Performance Changes 2n-dnv 4t4c MRR
+#- type: "table"
+#  title: "VPP Performance Changes 2n-dnv 4t4c MRR"
+#  algorithm: "table_performance_comparison"
+#  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-dnv-4t4c-mrr"
+#  history:
+#    - title: "rls1810"
+#      data: "intel-dnv-vpp-changes-2n-dnv-h1"
+#  reference:
+#    title: "rls1901"
+#    data: "intel-dnv-vpp-changes-2n-dnv-ref"
+#  compare:
+#    title: "rls1904"
+#    data: "intel-dnv-vpp-changes-2n-dnv-cmp"
+#  data: "intel-dnv-vpp-changes-2n-dnv"
+#  include-tests: "MRR"
+#  filter: "'4T4C' and 'MRR'"
+#  parameters:
+#  - "name"
+#  - "parent"
+#  - "result"
+
 # VPP Performance Changes 3n-hsw 1t1c pdr
 # VPP Performance Changes 3n-hsw 1t1c pdr
--
-  type: "table"
+- type: "table"
   title: "VPP Performance Changes 3n-hsw 1t1c pdr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-1t1c-pdr"
   history:
   title: "VPP Performance Changes 3n-hsw 1t1c pdr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-1t1c-pdr"
   history:
-    -
-      title: "rls1807"
+    - title: "rls1810"
       data: "vpp-performance-changes-3n-hsw-h1"
   reference:
       data: "vpp-performance-changes-3n-hsw-h1"
   reference:
-    title: "rls1810"
+    title: "rls1901"
     data: "vpp-performance-changes-3n-hsw-ref"
   compare:
     data: "vpp-performance-changes-3n-hsw-ref"
   compare:
-    title: "rls1901.1"
+    title: "rls1904"
     data: "vpp-performance-changes-3n-hsw-cmp"
   data: "vpp-performance-changes-3n-hsw"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
     data: "vpp-performance-changes-3n-hsw-cmp"
   data: "vpp-performance-changes-3n-hsw"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
@@ -2281,20 +2278,18 @@
   - "throughput"
 
 # VPP Performance Changes 3n-hsw 2t2c pdr
   - "throughput"
 
 # VPP Performance Changes 3n-hsw 2t2c pdr
--
-  type: "table"
+- type: "table"
   title: "VPP Performance Changes 3n-hsw 2t2c pdr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-2t2c-pdr"
   history:
   title: "VPP Performance Changes 3n-hsw 2t2c pdr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-2t2c-pdr"
   history:
-    -
-      title: "rls1807"
+    - title: "rls1810"
       data: "vpp-performance-changes-3n-hsw-h1"
   reference:
       data: "vpp-performance-changes-3n-hsw-h1"
   reference:
-    title: "rls1810"
+    title: "rls1901"
     data: "vpp-performance-changes-3n-hsw-ref"
   compare:
     data: "vpp-performance-changes-3n-hsw-ref"
   compare:
-    title: "rls1901.1"
+    title: "rls1904"
     data: "vpp-performance-changes-3n-hsw-cmp"
   data: "vpp-performance-changes-3n-hsw"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
     data: "vpp-performance-changes-3n-hsw-cmp"
   data: "vpp-performance-changes-3n-hsw"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
@@ -2305,20 +2300,18 @@
   - "throughput"
 
 # VPP Performance Changes 3n-hsw 1t1c ndr
   - "throughput"
 
 # VPP Performance Changes 3n-hsw 1t1c ndr
--
-  type: "table"
+- type: "table"
   title: "VPP Performance Changes 3n-hsw 1t1c ndr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-1t1c-ndr"
   history:
   title: "VPP Performance Changes 3n-hsw 1t1c ndr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-1t1c-ndr"
   history:
-    -
-      title: "rls1807"
+    - title: "rls1810"
       data: "vpp-performance-changes-3n-hsw-h1"
   reference:
       data: "vpp-performance-changes-3n-hsw-h1"
   reference:
-    title: "rls1810"
+    title: "rls1901"
     data: "vpp-performance-changes-3n-hsw-ref"
   compare:
     data: "vpp-performance-changes-3n-hsw-ref"
   compare:
-    title: "rls1901.1"
+    title: "rls1904"
     data: "vpp-performance-changes-3n-hsw-cmp"
   data: "vpp-performance-changes-3n-hsw"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
     data: "vpp-performance-changes-3n-hsw-cmp"
   data: "vpp-performance-changes-3n-hsw"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
@@ -2329,20 +2322,18 @@
   - "throughput"
 
 # VPP Performance Changes 3n-hsw 2t2c ndr
   - "throughput"
 
 # VPP Performance Changes 3n-hsw 2t2c ndr
--
-  type: "table"
+- type: "table"
   title: "VPP Performance Changes 3n-hsw 2t2c ndr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-2t2c-ndr"
   history:
   title: "VPP Performance Changes 3n-hsw 2t2c ndr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-2t2c-ndr"
   history:
-    -
-      title: "rls1807"
+    - title: "rls1810"
       data: "vpp-performance-changes-3n-hsw-h1"
   reference:
       data: "vpp-performance-changes-3n-hsw-h1"
   reference:
-    title: "rls1810"
+    title: "rls1901"
     data: "vpp-performance-changes-3n-hsw-ref"
   compare:
     data: "vpp-performance-changes-3n-hsw-ref"
   compare:
-    title: "rls1901.1"
+    title: "rls1904"
     data: "vpp-performance-changes-3n-hsw-cmp"
   data: "vpp-performance-changes-3n-hsw"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
     data: "vpp-performance-changes-3n-hsw-cmp"
   data: "vpp-performance-changes-3n-hsw"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
@@ -2353,20 +2344,18 @@
   - "throughput"
 
 # VPP Performance Changes 3n-skx 2t1c pdr
   - "throughput"
 
 # VPP Performance Changes 3n-skx 2t1c pdr
--
-  type: "table"
+- type: "table"
   title: "VPP Performance Changes 3n-skx 2t1c pdr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-2t1c-pdr"
   history:
   title: "VPP Performance Changes 3n-skx 2t1c pdr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-2t1c-pdr"
   history:
-    -
-      title: "rls1807"
+    - title: "rls1810"
       data: "vpp-performance-changes-3n-skx-h1"
   reference:
       data: "vpp-performance-changes-3n-skx-h1"
   reference:
-    title: "rls1810"
+    title: "rls1901"
     data: "vpp-performance-changes-3n-skx-ref"
   compare:
     data: "vpp-performance-changes-3n-skx-ref"
   compare:
-    title: "rls1901.1"
+    title: "rls1904"
     data: "vpp-performance-changes-3n-skx-cmp"
   data: "vpp-performance-changes-3n-skx"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
     data: "vpp-performance-changes-3n-skx-cmp"
   data: "vpp-performance-changes-3n-skx"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
@@ -2377,20 +2366,18 @@
   - "throughput"
 
 # VPP Performance Changes 3n-skx 4t2c pdr
   - "throughput"
 
 # VPP Performance Changes 3n-skx 4t2c pdr
--
-  type: "table"
+- type: "table"
   title: "VPP Performance Changes 3n-skx 4t2c pdr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-4t2c-pdr"
   history:
   title: "VPP Performance Changes 3n-skx 4t2c pdr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-4t2c-pdr"
   history:
-    -
-      title: "rls1807"
+    - title: "rls1810"
       data: "vpp-performance-changes-3n-skx-h1"
   reference:
       data: "vpp-performance-changes-3n-skx-h1"
   reference:
-    title: "rls1810"
+    title: "rls1901"
     data: "vpp-performance-changes-3n-skx-ref"
   compare:
     data: "vpp-performance-changes-3n-skx-ref"
   compare:
-    title: "rls1901.1"
+    title: "rls1904"
     data: "vpp-performance-changes-3n-skx-cmp"
   data: "vpp-performance-changes-3n-skx"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
     data: "vpp-performance-changes-3n-skx-cmp"
   data: "vpp-performance-changes-3n-skx"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
@@ -2401,20 +2388,18 @@
   - "throughput"
 
 # VPP Performance Changes 3n-skx 2t1c ndr
   - "throughput"
 
 # VPP Performance Changes 3n-skx 2t1c ndr
--
-  type: "table"
+- type: "table"
   title: "VPP Performance Changes 3n-skx 2t1c ndr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-2t1c-ndr"
   history:
   title: "VPP Performance Changes 3n-skx 2t1c ndr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-2t1c-ndr"
   history:
-    -
-      title: "rls1807"
+    - title: "rls1810"
       data: "vpp-performance-changes-3n-skx-h1"
   reference:
       data: "vpp-performance-changes-3n-skx-h1"
   reference:
-    title: "rls1810"
+    title: "rls1901"
     data: "vpp-performance-changes-3n-skx-ref"
   compare:
     data: "vpp-performance-changes-3n-skx-ref"
   compare:
-    title: "rls1901.1"
+    title: "rls1904"
     data: "vpp-performance-changes-3n-skx-cmp"
   data: "vpp-performance-changes-3n-skx"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
     data: "vpp-performance-changes-3n-skx-cmp"
   data: "vpp-performance-changes-3n-skx"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
@@ -2425,20 +2410,18 @@
   - "throughput"
 
 # VPP Performance Changes 3n-skx 4t2c ndr
   - "throughput"
 
 # VPP Performance Changes 3n-skx 4t2c ndr
--
-  type: "table"
+- type: "table"
   title: "VPP Performance Changes 3n-skx 4t2c ndr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-4t2c-ndr"
   history:
   title: "VPP Performance Changes 3n-skx 4t2c ndr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-4t2c-ndr"
   history:
-    -
-      title: "rls1807"
+    - title: "rls1810"
       data: "vpp-performance-changes-3n-skx-h1"
   reference:
       data: "vpp-performance-changes-3n-skx-h1"
   reference:
-    title: "rls1810"
+    title: "rls1901"
     data: "vpp-performance-changes-3n-skx-ref"
   compare:
     data: "vpp-performance-changes-3n-skx-ref"
   compare:
-    title: "rls1901.1"
+    title: "rls1904"
     data: "vpp-performance-changes-3n-skx-cmp"
   data: "vpp-performance-changes-3n-skx"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
     data: "vpp-performance-changes-3n-skx-cmp"
   data: "vpp-performance-changes-3n-skx"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
@@ -2449,20 +2432,18 @@
   - "throughput"
 
 # VPP Performance Changes 2n-skx 2t1c pdr
   - "throughput"
 
 # VPP Performance Changes 2n-skx 2t1c pdr
--
-  type: "table"
+- type: "table"
   title: "VPP Performance Changes 2n-skx 2t1c pdr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-2t1c-pdr"
   history:
   title: "VPP Performance Changes 2n-skx 2t1c pdr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-2t1c-pdr"
   history:
-    -
-      title: "rls1807"
+    - title: "rls1810"
       data: "vpp-performance-changes-2n-skx-h1"
   reference:
       data: "vpp-performance-changes-2n-skx-h1"
   reference:
-    title: "rls1810"
+    title: "rls1901"
     data: "vpp-performance-changes-2n-skx-ref"
   compare:
     data: "vpp-performance-changes-2n-skx-ref"
   compare:
-    title: "rls1901.1"
+    title: "rls1904"
     data: "vpp-performance-changes-2n-skx-cmp"
   data: "vpp-performance-changes-2n-skx"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
     data: "vpp-performance-changes-2n-skx-cmp"
   data: "vpp-performance-changes-2n-skx"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
@@ -2473,19 +2454,18 @@
   - "throughput"
 
 # VPP Performance Changes 2n-skx 4t2c pdr
   - "throughput"
 
 # VPP Performance Changes 2n-skx 4t2c pdr
--
-  type: "table"
+- type: "table"
   title: "VPP Performance Changes 2n-skx 4t2c pdr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-4t2c-pdr"
   history:
   title: "VPP Performance Changes 2n-skx 4t2c pdr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-4t2c-pdr"
   history:
-    - title: "rls1807"
+    - title: "rls1810"
       data: "vpp-performance-changes-2n-skx-h1"
   reference:
       data: "vpp-performance-changes-2n-skx-h1"
   reference:
-    title: "rls1810"
+    title: "rls1901"
     data: "vpp-performance-changes-2n-skx-ref"
   compare:
     data: "vpp-performance-changes-2n-skx-ref"
   compare:
-    title: "rls1901.1"
+    title: "rls1904"
     data: "vpp-performance-changes-2n-skx-cmp"
   data: "vpp-performance-changes-2n-skx"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
     data: "vpp-performance-changes-2n-skx-cmp"
   data: "vpp-performance-changes-2n-skx"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
@@ -2496,19 +2476,18 @@
   - "throughput"
 
 # VPP Performance Changes 2n-skx 2t1c ndr
   - "throughput"
 
 # VPP Performance Changes 2n-skx 2t1c ndr
--
-  type: "table"
+- type: "table"
   title: "VPP Performance Changes 2n-skx 2t1c ndr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-2t1c-ndr"
   history:
   title: "VPP Performance Changes 2n-skx 2t1c ndr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-2t1c-ndr"
   history:
-    - title: "rls1807"
+    - title: "rls1810"
       data: "vpp-performance-changes-2n-skx-h1"
   reference:
       data: "vpp-performance-changes-2n-skx-h1"
   reference:
-    title: "rls1810"
+    title: "rls1901"
     data: "vpp-performance-changes-2n-skx-ref"
   compare:
     data: "vpp-performance-changes-2n-skx-ref"
   compare:
-    title: "rls1901.1"
+    title: "rls1904"
     data: "vpp-performance-changes-2n-skx-cmp"
   data: "vpp-performance-changes-2n-skx"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
     data: "vpp-performance-changes-2n-skx-cmp"
   data: "vpp-performance-changes-2n-skx"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
@@ -2519,19 +2498,18 @@
   - "throughput"
 
 # VPP Performance Changes 2n-skx 4t2c ndr
   - "throughput"
 
 # VPP Performance Changes 2n-skx 4t2c ndr
--
-  type: "table"
+- type: "table"
   title: "VPP Performance Changes 2n-skx 4t2c ndr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-4t2c-ndr"
   history:
   title: "VPP Performance Changes 2n-skx 4t2c ndr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-4t2c-ndr"
   history:
-    - title: "rls1807"
+    - title: "rls1810"
       data: "vpp-performance-changes-2n-skx-h1"
   reference:
       data: "vpp-performance-changes-2n-skx-h1"
   reference:
-    title: "rls1810"
+    title: "rls1901"
     data: "vpp-performance-changes-2n-skx-ref"
   compare:
     data: "vpp-performance-changes-2n-skx-ref"
   compare:
-    title: "rls1901.1"
+    title: "rls1904"
     data: "vpp-performance-changes-2n-skx-cmp"
   data: "vpp-performance-changes-2n-skx"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
     data: "vpp-performance-changes-2n-skx-cmp"
   data: "vpp-performance-changes-2n-skx"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
@@ -2542,8 +2520,7 @@
   - "throughput"
 
 # VPP Comparison Across Testbeds 3n-hsw to 3n-skx 1c ndr
   - "throughput"
 
 # VPP Comparison Across Testbeds 3n-hsw to 3n-skx 1c ndr
--
-  type: "table"
+- type: "table"
   title: "VPP Comparison Across Testbeds 3n-hsw to 3n-skx 1c ndr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-hsw-3n-skx-1c-ndr"
   title: "VPP Comparison Across Testbeds 3n-hsw to 3n-skx 1c ndr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-hsw-3n-skx-1c-ndr"
@@ -2562,8 +2539,7 @@
   - "throughput"
 
 # VPP Comparison Across Testbeds 3n-hsw to 3n-skx 2c ndr
   - "throughput"
 
 # VPP Comparison Across Testbeds 3n-hsw to 3n-skx 2c ndr
--
-  type: "table"
+- type: "table"
   title: "VPP Comparison Across Testbeds 3n-hsw to 3n-skx 2c ndr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-hsw-3n-skx-2c-ndr"
   title: "VPP Comparison Across Testbeds 3n-hsw to 3n-skx 2c ndr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-hsw-3n-skx-2c-ndr"
@@ -2582,8 +2558,7 @@
   - "throughput"
 
 # VPP Comparison Across Testbeds 3n-hsw to 3n-skx 1c pdr
   - "throughput"
 
 # VPP Comparison Across Testbeds 3n-hsw to 3n-skx 1c pdr
--
-  type: "table"
+- type: "table"
   title: "VPP Comparison Across Testbeds 3n-hsw to 3n-skx 1c pdr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-hsw-3n-skx-1c-pdr"
   title: "VPP Comparison Across Testbeds 3n-hsw to 3n-skx 1c pdr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-hsw-3n-skx-1c-pdr"
@@ -2602,8 +2577,7 @@
   - "throughput"
 
 # VPP Comparison Across Testbeds 3n-hsw to 3n-skx 2c pdr
   - "throughput"
 
 # VPP Comparison Across Testbeds 3n-hsw to 3n-skx 2c pdr
--
-  type: "table"
+- type: "table"
   title: "VPP Comparison Across Testbeds 3n-hsw to 3n-skx 2c pdr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-hsw-3n-skx-2c-pdr"
   title: "VPP Comparison Across Testbeds 3n-hsw to 3n-skx 2c pdr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-hsw-3n-skx-2c-pdr"
@@ -2622,8 +2596,7 @@
   - "throughput"
 
 # VPP Comparison Across Topologies 3n-skx to 2n-skx 1c ndr
   - "throughput"
 
 # VPP Comparison Across Topologies 3n-skx to 2n-skx 1c ndr
--
-  type: "table"
+- type: "table"
   title: "VPP Comparison Across Topologies 3n-skx to 2n-skx 1c ndr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-compare-topologies-3n-skx-2n-skx-1c-ndr"
   title: "VPP Comparison Across Topologies 3n-skx to 2n-skx 1c ndr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-compare-topologies-3n-skx-2n-skx-1c-ndr"
@@ -2642,8 +2615,7 @@
   - "throughput"
 
 # VPP Comparison Across Topologies 3n-skx to 2n-skx 2c ndr
   - "throughput"
 
 # VPP Comparison Across Topologies 3n-skx to 2n-skx 2c ndr
--
-  type: "table"
+- type: "table"
   title: "VPP Comparison Across Topologies 3n-skx to 2n-skx 2c ndr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-compare-topologies-3n-skx-2n-skx-2c-ndr"
   title: "VPP Comparison Across Topologies 3n-skx to 2n-skx 2c ndr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-compare-topologies-3n-skx-2n-skx-2c-ndr"
@@ -2662,8 +2634,7 @@
   - "throughput"
 
 # VPP Comparison Across Topologies 3n-skx to 2n-skx 1c pdr
   - "throughput"
 
 # VPP Comparison Across Topologies 3n-skx to 2n-skx 1c pdr
--
-  type: "table"
+- type: "table"
   title: "VPP Comparison Across Topologies 3n-skx to 2n-skx 1c pdr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-compare-topologies-3n-skx-2n-skx-1c-pdr"
   title: "VPP Comparison Across Topologies 3n-skx to 2n-skx 1c pdr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-compare-topologies-3n-skx-2n-skx-1c-pdr"
@@ -2682,8 +2653,7 @@
   - "throughput"
 
 # VPP Comparison Across Topologies 3n-skx to 2n-skx 2c pdr
   - "throughput"
 
 # VPP Comparison Across Topologies 3n-skx to 2n-skx 2c pdr
--
-  type: "table"
+- type: "table"
   title: "VPP Comparison Across Topologies 3n-skx to 2n-skx 2c pdr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-compare-topologies-3n-skx-2n-skx-2c-pdr"
   title: "VPP Comparison Across Topologies 3n-skx to 2n-skx 2c pdr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-compare-topologies-3n-skx-2n-skx-2c-pdr"
@@ -2702,20 +2672,18 @@
   - "throughput"
 
 # VPP Performance Changes 3n-hsw 1t1c MRR
   - "throughput"
 
 # VPP Performance Changes 3n-hsw 1t1c MRR
--
-  type: "table"
+- type: "table"
   title: "VPP Performance Changes 3n-hsw 1t1c MRR"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-1t1c-mrr"
   history:
   title: "VPP Performance Changes 3n-hsw 1t1c MRR"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-1t1c-mrr"
   history:
-    -
-      title: "rls1807"
+    - title: "rls1810"
       data: "vpp-performance-changes-3n-hsw-mrr-h1"
   reference:
       data: "vpp-performance-changes-3n-hsw-mrr-h1"
   reference:
-    title: "rls1810"
+    title: "rls1901"
     data: "vpp-performance-changes-3n-hsw-mrr-ref"
   compare:
     data: "vpp-performance-changes-3n-hsw-mrr-ref"
   compare:
-    title: "rls1901.1"
+    title: "rls1904"
     data: "vpp-performance-changes-3n-hsw-mrr-cmp"
   data: "vpp-performance-changes-3n-hsw-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
     data: "vpp-performance-changes-3n-hsw-mrr-cmp"
   data: "vpp-performance-changes-3n-hsw-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
@@ -2726,20 +2694,18 @@
   - "result"
 
 # VPP Performance Changes 3n-hsw 2t2c MRR
   - "result"
 
 # VPP Performance Changes 3n-hsw 2t2c MRR
--
-  type: "table"
+- type: "table"
   title: "VPP Performance Changes 3n-hsw 2t2c MRR"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-2t2c-mrr"
   history:
   title: "VPP Performance Changes 3n-hsw 2t2c MRR"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-2t2c-mrr"
   history:
-    -
-      title: "rls1807"
+    - title: "rls1810"
       data: "vpp-performance-changes-3n-hsw-mrr-h1"
   reference:
       data: "vpp-performance-changes-3n-hsw-mrr-h1"
   reference:
-    title: "rls1810"
+    title: "rls1901"
     data: "vpp-performance-changes-3n-hsw-mrr-ref"
   compare:
     data: "vpp-performance-changes-3n-hsw-mrr-ref"
   compare:
-    title: "rls1901.1"
+    title: "rls1904"
     data: "vpp-performance-changes-3n-hsw-mrr-cmp"
   data: "vpp-performance-changes-3n-hsw-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
     data: "vpp-performance-changes-3n-hsw-mrr-cmp"
   data: "vpp-performance-changes-3n-hsw-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
@@ -2750,20 +2716,18 @@
   - "result"
 
 # VPP Performance Changes 3n-hsw 4t4c MRR
   - "result"
 
 # VPP Performance Changes 3n-hsw 4t4c MRR
--
-  type: "table"
+- type: "table"
   title: "VPP Performance Changes 3n-hsw 4t4c MRR"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-4t4c-mrr"
   history:
   title: "VPP Performance Changes 3n-hsw 4t4c MRR"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-4t4c-mrr"
   history:
-    -
-      title: "rls1807"
+    - title: "rls1810"
       data: "vpp-performance-changes-3n-hsw-mrr-h1"
   reference:
       data: "vpp-performance-changes-3n-hsw-mrr-h1"
   reference:
-    title: "rls1810"
+    title: "rls1901"
     data: "vpp-performance-changes-3n-hsw-mrr-ref"
   compare:
     data: "vpp-performance-changes-3n-hsw-mrr-ref"
   compare:
-    title: "rls1901.1"
+    title: "rls1904"
     data: "vpp-performance-changes-3n-hsw-mrr-cmp"
   data: "vpp-performance-changes-3n-hsw-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
     data: "vpp-performance-changes-3n-hsw-mrr-cmp"
   data: "vpp-performance-changes-3n-hsw-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
@@ -2774,20 +2738,18 @@
   - "result"
 
 # VPP Performance Changes 3n-skx 2t1c MRR
   - "result"
 
 # VPP Performance Changes 3n-skx 2t1c MRR
--
-  type: "table"
+- type: "table"
   title: "VPP Performance Changes 3n-skx 2t1c MRR"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-2t1c-mrr"
   history:
   title: "VPP Performance Changes 3n-skx 2t1c MRR"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-2t1c-mrr"
   history:
-    -
-      title: "rls1807"
+    - title: "rls1810"
       data: "vpp-performance-changes-3n-skx-mrr-h1"
   reference:
       data: "vpp-performance-changes-3n-skx-mrr-h1"
   reference:
-    title: "rls1810"
+    title: "rls1901"
     data: "vpp-performance-changes-3n-skx-mrr-ref"
   compare:
     data: "vpp-performance-changes-3n-skx-mrr-ref"
   compare:
-    title: "rls1901.1"
+    title: "rls1904"
     data: "vpp-performance-changes-3n-skx-mrr-cmp"
   data: "vpp-performance-changes-3n-skx-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
     data: "vpp-performance-changes-3n-skx-mrr-cmp"
   data: "vpp-performance-changes-3n-skx-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
@@ -2798,20 +2760,18 @@
   - "result"
 
 # VPP Performance Changes 3n-skx 4t2c MRR
   - "result"
 
 # VPP Performance Changes 3n-skx 4t2c MRR
--
-  type: "table"
+- type: "table"
   title: "VPP Performance Changes 3n-skx 4t2c MRR"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-4t2c-mrr"
   history:
   title: "VPP Performance Changes 3n-skx 4t2c MRR"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-4t2c-mrr"
   history:
-    -
-      title: "rls1807"
+    - title: "rls1810"
       data: "vpp-performance-changes-3n-skx-mrr-h1"
   reference:
       data: "vpp-performance-changes-3n-skx-mrr-h1"
   reference:
-    title: "rls1810"
+    title: "rls1901"
     data: "vpp-performance-changes-3n-skx-mrr-ref"
   compare:
     data: "vpp-performance-changes-3n-skx-mrr-ref"
   compare:
-    title: "rls1901.1"
+    title: "rls1904"
     data: "vpp-performance-changes-3n-skx-mrr-cmp"
   data: "vpp-performance-changes-3n-skx-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
     data: "vpp-performance-changes-3n-skx-mrr-cmp"
   data: "vpp-performance-changes-3n-skx-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
@@ -2822,20 +2782,18 @@
   - "result"
 
 # VPP Performance Changes 3n-skx 8t4c MRR
   - "result"
 
 # VPP Performance Changes 3n-skx 8t4c MRR
--
-  type: "table"
+- type: "table"
   title: "VPP Performance Changes 3n-skx 8t4c MRR"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-8t4c-mrr"
   history:
   title: "VPP Performance Changes 3n-skx 8t4c MRR"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-8t4c-mrr"
   history:
-    -
-      title: "rls1807"
+    - title: "rls1810"
       data: "vpp-performance-changes-3n-skx-mrr-h1"
   reference:
       data: "vpp-performance-changes-3n-skx-mrr-h1"
   reference:
-    title: "rls1810"
+    title: "rls1901"
     data: "vpp-performance-changes-3n-skx-mrr-ref"
   compare:
     data: "vpp-performance-changes-3n-skx-mrr-ref"
   compare:
-    title: "rls1901.1"
+    title: "rls1904"
     data: "vpp-performance-changes-3n-skx-mrr-cmp"
   data: "vpp-performance-changes-3n-skx-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
     data: "vpp-performance-changes-3n-skx-mrr-cmp"
   data: "vpp-performance-changes-3n-skx-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
@@ -2846,20 +2804,18 @@
   - "result"
 
 # VPP Performance Changes 2n-skx 2t1c MRR
   - "result"
 
 # VPP Performance Changes 2n-skx 2t1c MRR
--
-  type: "table"
+- type: "table"
   title: "VPP Performance Changes 2n-skx 2t1c MRR"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-2t1c-mrr"
   history:
   title: "VPP Performance Changes 2n-skx 2t1c MRR"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-2t1c-mrr"
   history:
-    -
-      title: "rls1807"
+    - title: "rls1810"
       data: "vpp-performance-changes-2n-skx-mrr-h1"
   reference:
       data: "vpp-performance-changes-2n-skx-mrr-h1"
   reference:
-    title: "rls1810"
+    title: "rls1901"
     data: "vpp-performance-changes-2n-skx-mrr-ref"
   compare:
     data: "vpp-performance-changes-2n-skx-mrr-ref"
   compare:
-    title: "rls1901.1"
+    title: "rls1904"
     data: "vpp-performance-changes-2n-skx-mrr-cmp"
   data: "vpp-performance-changes-2n-skx-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
     data: "vpp-performance-changes-2n-skx-mrr-cmp"
   data: "vpp-performance-changes-2n-skx-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
@@ -2870,20 +2826,18 @@
   - "result"
 
 # VPP Performance Changes 2n-skx 4t2c MRR
   - "result"
 
 # VPP Performance Changes 2n-skx 4t2c MRR
--
-  type: "table"
+- type: "table"
   title: "VPP Performance Changes 2n-skx 4t2c MRR"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-4t2c-mrr"
   history:
   title: "VPP Performance Changes 2n-skx 4t2c MRR"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-4t2c-mrr"
   history:
-    -
-      title: "rls1807"
+    - title: "rls1810"
       data: "vpp-performance-changes-2n-skx-mrr-h1"
   reference:
       data: "vpp-performance-changes-2n-skx-mrr-h1"
   reference:
-    title: "rls1810"
+    title: "rls1901"
     data: "vpp-performance-changes-2n-skx-mrr-ref"
   compare:
     data: "vpp-performance-changes-2n-skx-mrr-ref"
   compare:
-    title: "rls1901.1"
+    title: "rls1904"
     data: "vpp-performance-changes-2n-skx-mrr-cmp"
   data: "vpp-performance-changes-2n-skx-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
     data: "vpp-performance-changes-2n-skx-mrr-cmp"
   data: "vpp-performance-changes-2n-skx-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
@@ -2894,20 +2848,18 @@
   - "result"
 
 # VPP Performance Changes 2n-skx 8t4c MRR
   - "result"
 
 # VPP Performance Changes 2n-skx 8t4c MRR
--
-  type: "table"
+- type: "table"
   title: "VPP Performance Changes 2n-skx 8t4c MRR"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-8t4c-mrr"
   history:
   title: "VPP Performance Changes 2n-skx 8t4c MRR"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-8t4c-mrr"
   history:
-    -
-      title: "rls1807"
+    - title: "rls1810"
       data: "vpp-performance-changes-2n-skx-mrr-h1"
   reference:
       data: "vpp-performance-changes-2n-skx-mrr-h1"
   reference:
-    title: "rls1810"
+    title: "rls1901"
     data: "vpp-performance-changes-2n-skx-mrr-ref"
   compare:
     data: "vpp-performance-changes-2n-skx-mrr-ref"
   compare:
-    title: "rls1901.1"
+    title: "rls1904"
     data: "vpp-performance-changes-2n-skx-mrr-cmp"
   data: "vpp-performance-changes-2n-skx-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
     data: "vpp-performance-changes-2n-skx-mrr-cmp"
   data: "vpp-performance-changes-2n-skx-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
@@ -2918,8 +2870,7 @@
   - "result"
 
 # VPP Comparison Across Testbeds 3n-hsw to 3n-skx 1c mrr
   - "result"
 
 # VPP Comparison Across Testbeds 3n-hsw to 3n-skx 1c mrr
--
-  type: "table"
+- type: "table"
   title: "VPP Comparison Across Testbeds 3n-hsw to 3n-skx 1c mrr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-hsw-3n-skx-1c-mrr"
   title: "VPP Comparison Across Testbeds 3n-hsw to 3n-skx 1c mrr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-hsw-3n-skx-1c-mrr"
@@ -2938,8 +2889,7 @@
   - "result"
 
 # VPP Comparison Across Testbeds 3n-hsw to 3n-skx 2c mrr
   - "result"
 
 # VPP Comparison Across Testbeds 3n-hsw to 3n-skx 2c mrr
--
-  type: "table"
+- type: "table"
   title: "VPP Comparison Across Testbeds 3n-hsw to 3n-skx 2c mrr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-hsw-3n-skx-2c-mrr"
   title: "VPP Comparison Across Testbeds 3n-hsw to 3n-skx 2c mrr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-hsw-3n-skx-2c-mrr"
@@ -2958,8 +2908,7 @@
   - "result"
 
 # VPP Comparison Across Testbeds 3n-hsw to 3n-skx 4c mrr
   - "result"
 
 # VPP Comparison Across Testbeds 3n-hsw to 3n-skx 4c mrr
--
-  type: "table"
+- type: "table"
   title: "VPP Comparison Across Testbeds 3n-hsw to 3n-skx 4c mrr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-hsw-3n-skx-4c-mrr"
   title: "VPP Comparison Across Testbeds 3n-hsw to 3n-skx 4c mrr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-hsw-3n-skx-4c-mrr"
@@ -2978,8 +2927,7 @@
   - "result"
 
 # VPP Comparison Across Topologies 3n-skx to 2n-skx 1c mrr
   - "result"
 
 # VPP Comparison Across Topologies 3n-skx to 2n-skx 1c mrr
--
-  type: "table"
+- type: "table"
   title: "VPP Comparison Across Topologies 3n-skx to 2n-skx 1c mrr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-compare-topologies-3n-skx-2n-skx-1c-mrr"
   title: "VPP Comparison Across Topologies 3n-skx to 2n-skx 1c mrr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-compare-topologies-3n-skx-2n-skx-1c-mrr"
@@ -2998,8 +2946,7 @@
   - "result"
 
 # VPP Comparison Across Topologies 3n-skx to 2n-skx 2c mrr
   - "result"
 
 # VPP Comparison Across Topologies 3n-skx to 2n-skx 2c mrr
--
-  type: "table"
+- type: "table"
   title: "VPP Comparison Across Topologies 3n-skx to 2n-skx 2c mrr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-compare-topologies-3n-skx-2n-skx-2c-mrr"
   title: "VPP Comparison Across Topologies 3n-skx to 2n-skx 2c mrr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-compare-topologies-3n-skx-2n-skx-2c-mrr"
@@ -3018,8 +2965,7 @@
   - "result"
 
 # VPP Comparison Across Topologies 3n-skx to 2n-skx 4c mrr
   - "result"
 
 # VPP Comparison Across Topologies 3n-skx to 2n-skx 4c mrr
--
-  type: "table"
+- type: "table"
   title: "VPP Comparison Across Topologies 3n-skx to 2n-skx 4c mrr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-compare-topologies-3n-skx-2n-skx-4c-mrr"
   title: "VPP Comparison Across Topologies 3n-skx to 2n-skx 4c mrr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-compare-topologies-3n-skx-2n-skx-4c-mrr"
@@ -3038,18 +2984,15 @@
   - "result"
 
 # Detailed Test Results - VPP Performance Results 3n-hsw
   - "result"
 
 # Detailed Test Results - VPP Performance Results 3n-hsw
--
-  type: "table"
+- type: "table"
   title: "Detailed Test Results - VPP Performance Results 3n-hsw"
   algorithm: "table_merged_details"
   output-file-ext: ".csv"
   output-file: "{DIR[DTR,PERF,VPP,3N,HSW]}/vpp_performance_results_3n_hsw"
   columns:
   title: "Detailed Test Results - VPP Performance Results 3n-hsw"
   algorithm: "table_merged_details"
   output-file-ext: ".csv"
   output-file: "{DIR[DTR,PERF,VPP,3N,HSW]}/vpp_performance_results_3n_hsw"
   columns:
-  -
-    title: "Name"
+  - title: "Name"
     data: "data name"
     data: "data name"
-  -
-    title: "Status"
+  - title: "Status"
     data: "data msg"
   rows: "generated"
   data: "vpp-perf-results-3n-hsw"
     data: "data msg"
   rows: "generated"
   data: "vpp-perf-results-3n-hsw"
@@ -3060,84 +3003,72 @@
   - "msg"
 
 # Detailed Test Results - VPP Performance Results 3n-skx
   - "msg"
 
 # Detailed Test Results - VPP Performance Results 3n-skx
--
-  type: "table"
+- type: "table"
   title: "Detailed Test Results - VPP Performance Results 3n-skx"
   algorithm: "table_merged_details"
   output-file-ext: ".csv"
   output-file: "{DIR[DTR,PERF,VPP,3N,SKX]}/vpp_performance_results_3n_skx"
   columns:
   title: "Detailed Test Results - VPP Performance Results 3n-skx"
   algorithm: "table_merged_details"
   output-file-ext: ".csv"
   output-file: "{DIR[DTR,PERF,VPP,3N,SKX]}/vpp_performance_results_3n_skx"
   columns:
-  -
-    title: "Name"
+  - title: "Name"
     data: "data name"
     data: "data name"
-  -
-    title: "Status"
+  - title: "Status"
     data: "data msg"
   rows: "generated"
   data: "vpp-perf-results-3n-skx"
     data: "data msg"
   rows: "generated"
   data: "vpp-perf-results-3n-skx"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  filter: "not 'CFS_OPT'"
   parameters:
   - "name"
   - "parent"
   - "msg"
 
 # Detailed Test Results - VPP Performance Results 2n-skx
   parameters:
   - "name"
   - "parent"
   - "msg"
 
 # Detailed Test Results - VPP Performance Results 2n-skx
--
-  type: "table"
+- type: "table"
   title: "Detailed Test Results - VPP Performance Results 2n-skx"
   algorithm: "table_merged_details"
   output-file-ext: ".csv"
   output-file: "{DIR[DTR,PERF,VPP,2N,SKX]}/vpp_performance_results_2n_skx"
   columns:
   title: "Detailed Test Results - VPP Performance Results 2n-skx"
   algorithm: "table_merged_details"
   output-file-ext: ".csv"
   output-file: "{DIR[DTR,PERF,VPP,2N,SKX]}/vpp_performance_results_2n_skx"
   columns:
-  -
-    title: "Name"
+  - title: "Name"
     data: "data name"
     data: "data name"
-  -
-    title: "Status"
+  - title: "Status"
     data: "data msg"
   rows: "generated"
   data: "vpp-perf-results-2n-skx"
     data: "data msg"
   rows: "generated"
   data: "vpp-perf-results-2n-skx"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  filter: "not 'CFS_OPT'"
   parameters:
   - "name"
   - "parent"
   - "msg"
 
   parameters:
   - "name"
   - "parent"
   - "msg"
 
-# Detailed Test Results - VPP Performance Results 2n-dnv
--
-  type: "table"
-  title: "Detailed Test Results - VPP Performance Results 2n-dnv"
-  algorithm: "table_details"
-  output-file-ext: ".csv"
-  output-file: "{DIR[DTR,PERF,VPP,2N,DNV]}/vpp_performance_results_2n_dnv"
-  columns:
-  -
-    title: "Name"
-    data: "data name"
-  -
-    title: "Status"
-    data: "data msg"
-  rows: "generated"
-  data: "intel-dnv-vpp"
-  filter: "'NDRPDR'"
-  parameters:
-  - "name"
-  - "parent"
-  - "msg"
+## Detailed Test Results - VPP Performance Results 2n-dnv
+#- type: "table"
+#  title: "Detailed Test Results - VPP Performance Results 2n-dnv"
+#  algorithm: "table_details"
+#  output-file-ext: ".csv"
+#  output-file: "{DIR[DTR,PERF,VPP,2N,DNV]}/vpp_performance_results_2n_dnv"
+#  columns:
+#  - title: "Name"
+#    data: "data name"
+#  - title: "Status"
+#    data: "data msg"
+#  rows: "generated"
+#  data: "intel-dnv-vpp"
+#  filter: "'NDRPDR'"
+#  parameters:
+#  - "name"
+#  - "parent"
+#  - "msg"
 
 # Test configuration - VPP Performance Test Configs 3n-hsw
 
 # Test configuration - VPP Performance Test Configs 3n-hsw
--
-  type: "table"
+- type: "table"
   title: "Test configuration - VPP Performance Test Configs 3n-hsw"
   algorithm: "table_merged_details"
   output-file-ext: ".csv"
   output-file: "{DIR[DTC,PERF,VPP,3N,HSW]}/vpp_test_configuration_3n_hsw"
   columns:
   title: "Test configuration - VPP Performance Test Configs 3n-hsw"
   algorithm: "table_merged_details"
   output-file-ext: ".csv"
   output-file: "{DIR[DTC,PERF,VPP,3N,HSW]}/vpp_test_configuration_3n_hsw"
   columns:
-  -
-    title: "Name"
+  - title: "Name"
     data: "data name"
     data: "data name"
-  -
-    title: "VPP API Test Commands History - Commands Used Per Test Case"
+  - title: "VPP API Test Commands History - Commands Used Per Test Case"
     data: "data conf-history"
   rows: "generated"
   data: "vpp-perf-results-3n-hsw"
     data: "data conf-history"
   rows: "generated"
   data: "vpp-perf-results-3n-hsw"
@@ -3148,84 +3079,72 @@
   - "conf-history"
 
 # Test configuration - VPP Performance Test Configs 3n-skx
   - "conf-history"
 
 # Test configuration - VPP Performance Test Configs 3n-skx
--
-  type: "table"
+- type: "table"
   title: "Test configuration - VPP Performance Test Configs 3n-skx"
   algorithm: "table_merged_details"
   output-file-ext: ".csv"
   output-file: "{DIR[DTC,PERF,VPP,3N,SKX]}/vpp_test_configuration_3n_skx"
   columns:
   title: "Test configuration - VPP Performance Test Configs 3n-skx"
   algorithm: "table_merged_details"
   output-file-ext: ".csv"
   output-file: "{DIR[DTC,PERF,VPP,3N,SKX]}/vpp_test_configuration_3n_skx"
   columns:
-  -
-    title: "Name"
+  - title: "Name"
     data: "data name"
     data: "data name"
-  -
-    title: "VPP API Test Commands History - Commands Used Per Test Case"
+  - title: "VPP API Test Commands History - Commands Used Per Test Case"
     data: "data conf-history"
   rows: "generated"
   data: "vpp-perf-results-3n-skx"
     data: "data conf-history"
   rows: "generated"
   data: "vpp-perf-results-3n-skx"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  filter: "not 'CFS_OPT'"
   parameters:
   - "parent"
   - "name"
   - "conf-history"
 
 # Test configuration - VPP Performance Test Configs 2n-skx
   parameters:
   - "parent"
   - "name"
   - "conf-history"
 
 # Test configuration - VPP Performance Test Configs 2n-skx
--
-  type: "table"
+- type: "table"
   title: "Test configuration - VPP Performance Test Configs 2n-skx"
   algorithm: "table_merged_details"
   output-file-ext: ".csv"
   output-file: "{DIR[DTC,PERF,VPP,2N,SKX]}/vpp_test_configuration_2n_skx"
   columns:
   title: "Test configuration - VPP Performance Test Configs 2n-skx"
   algorithm: "table_merged_details"
   output-file-ext: ".csv"
   output-file: "{DIR[DTC,PERF,VPP,2N,SKX]}/vpp_test_configuration_2n_skx"
   columns:
-  -
-    title: "Name"
+  - title: "Name"
     data: "data name"
     data: "data name"
-  -
-    title: "VPP API Test Commands History - Commands Used Per Test Case"
+  - title: "VPP API Test Commands History - Commands Used Per Test Case"
     data: "data conf-history"
   rows: "generated"
   data: "vpp-perf-results-2n-skx"
     data: "data conf-history"
   rows: "generated"
   data: "vpp-perf-results-2n-skx"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  filter: "not 'CFS_OPT'"
   parameters:
   - "parent"
   - "name"
   - "conf-history"
 
   parameters:
   - "parent"
   - "name"
   - "conf-history"
 
-# Test configuration - VPP Performance Test Configs 2n-dnv
--
-  type: "table"
-  title: "Test configuration - VPP Performance Test Configs 2n-dnv"
-  algorithm: "table_details"
-  output-file-ext: ".csv"
-  output-file: "{DIR[DTC,PERF,VPP,2N,DNV]}/vpp_test_configuration_2n_dnv"
-  columns:
-  -
-    title: "Name"
-    data: "data name"
-  -
-    title: "VPP API Test Commands History - Commands Used Per Test Case"
-    data: "data conf-history"
-  rows: "generated"
-  data: "intel-dnv-vpp"
-  filter: "'NDRPDR'"
-  parameters:
-  - "parent"
-  - "name"
-  - "conf-history"
+## Test configuration - VPP Performance Test Configs 2n-dnv
+#- type: "table"
+#  title: "Test configuration - VPP Performance Test Configs 2n-dnv"
+#  algorithm: "table_details"
+#  output-file-ext: ".csv"
+#  output-file: "{DIR[DTC,PERF,VPP,2N,DNV]}/vpp_test_configuration_2n_dnv"
+#  columns:
+#  - title: "Name"
+#    data: "data name"
+#  - title: "VPP API Test Commands History - Commands Used Per Test Case"
+#    data: "data conf-history"
+#  rows: "generated"
+#  data: "intel-dnv-vpp"
+#  filter: "'NDRPDR'"
+#  parameters:
+#  - "parent"
+#  - "name"
+#  - "conf-history"
 
 # Test Operational Data - VPP Performance Operational Data 3n-hsw
 
 # Test Operational Data - VPP Performance Operational Data 3n-hsw
--
-  type: "table"
+- type: "table"
   title: "Test Operational Data - VPP Performance Operational Data 3n-hsw"
   algorithm: "table_merged_details"
   output-file-ext: ".csv"
   output-file: "{DIR[DTO,PERF,VPP,3N,HSW]}/vpp_test_operational_3n_hsw"
   columns:
   title: "Test Operational Data - VPP Performance Operational Data 3n-hsw"
   algorithm: "table_merged_details"
   output-file-ext: ".csv"
   output-file: "{DIR[DTO,PERF,VPP,3N,HSW]}/vpp_test_operational_3n_hsw"
   columns:
-  -
-    title: "Name"
+  - title: "Name"
     data: "data name"
     data: "data name"
-  -
-    title: "VPP Operational Data - Outputs of 'show runtime' at NDR packet rate"
+  - title: "VPP Operational Data - Outputs of 'show runtime' at NDR packet rate"
     data: "data show-run"
   rows: "generated"
   data: "vpp-perf-results-3n-hsw"
     data: "data show-run"
   rows: "generated"
   data: "vpp-perf-results-3n-hsw"
@@ -3236,84 +3155,72 @@
   - "show-run"
 
 # Test Operational Data - VPP Performance Operational Data 3n-skx
   - "show-run"
 
 # Test Operational Data - VPP Performance Operational Data 3n-skx
--
-  type: "table"
+- type: "table"
   title: "Test Operational Data - VPP Performance Operational Data 3n-skx"
   algorithm: "table_merged_details"
   output-file-ext: ".csv"
   output-file: "{DIR[DTO,PERF,VPP,3N,SKX]}/vpp_test_operational_3n_skx"
   columns:
   title: "Test Operational Data - VPP Performance Operational Data 3n-skx"
   algorithm: "table_merged_details"
   output-file-ext: ".csv"
   output-file: "{DIR[DTO,PERF,VPP,3N,SKX]}/vpp_test_operational_3n_skx"
   columns:
-  -
-    title: "Name"
+  - title: "Name"
     data: "data name"
     data: "data name"
-  -
-    title: "VPP Operational Data - Outputs of 'show runtime' at NDR packet rate"
+  - title: "VPP Operational Data - Outputs of 'show runtime' at NDR packet rate"
     data: "data show-run"
   rows: "generated"
   data: "vpp-perf-results-3n-skx"
     data: "data show-run"
   rows: "generated"
   data: "vpp-perf-results-3n-skx"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  filter: "not 'CFS_OPT'"
   parameters:
   - "parent"
   - "name"
   - "show-run"
 
 # Test Operational Data - VPP Performance Operational Data 2n-skx
   parameters:
   - "parent"
   - "name"
   - "show-run"
 
 # Test Operational Data - VPP Performance Operational Data 2n-skx
--
-  type: "table"
+- type: "table"
   title: "Test Operational Data - VPP Performance Operational Data 2n-skx"
   algorithm: "table_merged_details"
   output-file-ext: ".csv"
   output-file: "{DIR[DTO,PERF,VPP,2N,SKX]}/vpp_test_operational_2n_skx"
   columns:
   title: "Test Operational Data - VPP Performance Operational Data 2n-skx"
   algorithm: "table_merged_details"
   output-file-ext: ".csv"
   output-file: "{DIR[DTO,PERF,VPP,2N,SKX]}/vpp_test_operational_2n_skx"
   columns:
-  -
-    title: "Name"
+  - title: "Name"
     data: "data name"
     data: "data name"
-  -
-    title: "VPP Operational Data - Outputs of 'show runtime' at NDR packet rate"
+  - title: "VPP Operational Data - Outputs of 'show runtime' at NDR packet rate"
     data: "data show-run"
   rows: "generated"
   data: "vpp-perf-results-2n-skx"
     data: "data show-run"
   rows: "generated"
   data: "vpp-perf-results-2n-skx"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  filter: "not 'CFS_OPT'"
   parameters:
   - "parent"
   - "name"
   - "show-run"
 
   parameters:
   - "parent"
   - "name"
   - "show-run"
 
-# Test Operational Data - VPP Performance Operational Data 2n-dnv
--
-  type: "table"
-  title: "Test Operational Data - VPP Performance Operational Data 2n-dnv"
-  algorithm: "table_details"
-  output-file-ext: ".csv"
-  output-file: "{DIR[DTO,PERF,VPP,2N,DNV]}/vpp_test_operational_2n_dnv"
-  columns:
-  -
-    title: "Name"
-    data: "data name"
-  -
-    title: "VPP Operational Data - Outputs of 'show runtime' at NDR packet rate"
-    data: "data show-run"
-  rows: "generated"
-  data: "intel-dnv-vpp"
-  filter: "'NDRPDR'"
-  parameters:
-  - "parent"
-  - "name"
-  - "show-run"
+## Test Operational Data - VPP Performance Operational Data 2n-dnv
+#- type: "table"
+#  title: "Test Operational Data - VPP Performance Operational Data 2n-dnv"
+#  algorithm: "table_details"
+#  output-file-ext: ".csv"
+#  output-file: "{DIR[DTO,PERF,VPP,2N,DNV]}/vpp_test_operational_2n_dnv"
+#  columns:
+#  - title: "Name"
+#    data: "data name"
+#  - title: "VPP Operational Data - Outputs of 'show runtime' at NDR packet rate"
+#    data: "data show-run"
+#  rows: "generated"
+#  data: "intel-dnv-vpp"
+#  filter: "'NDRPDR'"
+#  parameters:
+#  - "parent"
+#  - "name"
+#  - "show-run"
 
 # Detailed Test Results - VPP MRR Results 3n-hsw
 
 # Detailed Test Results - VPP MRR Results 3n-hsw
--
-  type: "table"
+- type: "table"
   title: "Detailed Test Results - VPP MRR Results 3n-hsw"
   algorithm: "table_details"
   output-file-ext: ".csv"
   output-file: "{DIR[DTR,MRR,VPP,3N,HSW]}/vpp_mrr_results_3n_hsw"
   columns:
   title: "Detailed Test Results - VPP MRR Results 3n-hsw"
   algorithm: "table_details"
   output-file-ext: ".csv"
   output-file: "{DIR[DTR,MRR,VPP,3N,HSW]}/vpp_mrr_results_3n_hsw"
   columns:
-  -
-    title: "Name"
+  - title: "Name"
     data: "data name"
     data: "data name"
-  -
-    title: "Status"
+  - title: "Status"
     data: "data msg"
   rows: "generated"
   data: "vpp-mrr-results-3n-hsw"
     data: "data msg"
   rows: "generated"
   data: "vpp-mrr-results-3n-hsw"
@@ -3324,18 +3231,15 @@
   - "msg"
 
 # Detailed Test Results - VPP MRR Results 3n-skx
   - "msg"
 
 # Detailed Test Results - VPP MRR Results 3n-skx
--
-  type: "table"
+- type: "table"
   title: "Detailed Test Results - VPP MRR Results 3n-skx"
   algorithm: "table_details"
   output-file-ext: ".csv"
   output-file: "{DIR[DTR,MRR,VPP,3N,SKX]}/vpp_mrr_results_3n_skx"
   columns:
   title: "Detailed Test Results - VPP MRR Results 3n-skx"
   algorithm: "table_details"
   output-file-ext: ".csv"
   output-file: "{DIR[DTR,MRR,VPP,3N,SKX]}/vpp_mrr_results_3n_skx"
   columns:
-  -
-    title: "Name"
+  - title: "Name"
     data: "data name"
     data: "data name"
-  -
-    title: "Status"
+  - title: "Status"
     data: "data msg"
   rows: "generated"
   data: "vpp-mrr-results-3n-skx"
     data: "data msg"
   rows: "generated"
   data: "vpp-mrr-results-3n-skx"
@@ -3346,18 +3250,15 @@
   - "msg"
 
 # Detailed Test Results - VPP MRR Results 2n-skx
   - "msg"
 
 # Detailed Test Results - VPP MRR Results 2n-skx
--
-  type: "table"
+- type: "table"
   title: "Detailed Test Results - VPP MRR Results 2n-skx"
   algorithm: "table_details"
   output-file-ext: ".csv"
   output-file: "{DIR[DTR,MRR,VPP,2N,SKX]}/vpp_mrr_results_2n_skx"
   columns:
   title: "Detailed Test Results - VPP MRR Results 2n-skx"
   algorithm: "table_details"
   output-file-ext: ".csv"
   output-file: "{DIR[DTR,MRR,VPP,2N,SKX]}/vpp_mrr_results_2n_skx"
   columns:
-  -
-    title: "Name"
+  - title: "Name"
     data: "data name"
     data: "data name"
-  -
-    title: "Status"
+  - title: "Status"
     data: "data msg"
   rows: "generated"
   data: "vpp-mrr-results-2n-skx"
     data: "data msg"
   rows: "generated"
   data: "vpp-mrr-results-2n-skx"
@@ -3367,41 +3268,35 @@
   - "parent"
   - "msg"
 
   - "parent"
   - "msg"
 
-# Detailed Test Results - VPP MRR Results 2n-dnv
--
-  type: "table"
-  title: "Detailed Test Results - VPP MRR Results 2n-dnv"
-  algorithm: "table_details"
-  output-file-ext: ".csv"
-  output-file: "{DIR[DTR,MRR,VPP,2N,DNV]}/vpp_mrr_results_2n_dnv"
-  columns:
-  -
-    title: "Name"
-    data: "data name"
-  -
-    title: "Status"
-    data: "data msg"
-  rows: "generated"
-  data: "intel-dnv-vpp"
-  filter: "'MRR'"
-  parameters:
-  - "name"
-  - "parent"
-  - "msg"
+## Detailed Test Results - VPP MRR Results 2n-dnv
+#- type: "table"
+#  title: "Detailed Test Results - VPP MRR Results 2n-dnv"
+#  algorithm: "table_details"
+#  output-file-ext: ".csv"
+#  output-file: "{DIR[DTR,MRR,VPP,2N,DNV]}/vpp_mrr_results_2n_dnv"
+#  columns:
+#  - title: "Name"
+#    data: "data name"
+#  - title: "Status"
+#    data: "data msg"
+#  rows: "generated"
+#  data: "intel-dnv-vpp"
+#  filter: "'MRR'"
+#  parameters:
+#  - "name"
+#  - "parent"
+#  - "msg"
 
 # Test configuration - VPP MRR Test Configs 3n-hsw
 
 # Test configuration - VPP MRR Test Configs 3n-hsw
--
-  type: "table"
+- type: "table"
   title: "Test configuration - VPP MRR Test Configs 3n-hsw"
   algorithm: "table_details"
   output-file-ext: ".csv"
   output-file: "{DIR[DTC,MRR,VPP,3N,HSW]}/vpp_mrr_test_configuration_3n_hsw"
   columns:
   title: "Test configuration - VPP MRR Test Configs 3n-hsw"
   algorithm: "table_details"
   output-file-ext: ".csv"
   output-file: "{DIR[DTC,MRR,VPP,3N,HSW]}/vpp_mrr_test_configuration_3n_hsw"
   columns:
-  -
-    title: "Name"
+  - title: "Name"
     data: "data name"
     data: "data name"
-  -
-    title: "VPP API Test Commands History - Commands Used Per Test Case"
+  - title: "VPP API Test Commands History - Commands Used Per Test Case"
     data: "data conf-history"
   rows: "generated"
   data: "vpp-mrr-results-3n-hsw"
     data: "data conf-history"
   rows: "generated"
   data: "vpp-mrr-results-3n-hsw"
@@ -3412,18 +3307,15 @@
   - "conf-history"
 
 # Test configuration - VPP MRR Test Configs 3n-skx
   - "conf-history"
 
 # Test configuration - VPP MRR Test Configs 3n-skx
--
-  type: "table"
+- type: "table"
   title: "Test configuration - VPP MRR Test Configs 3n-skx"
   algorithm: "table_details"
   output-file-ext: ".csv"
   output-file: "{DIR[DTC,MRR,VPP,3N,SKX]}/vpp_mrr_test_configuration_3n_skx"
   columns:
   title: "Test configuration - VPP MRR Test Configs 3n-skx"
   algorithm: "table_details"
   output-file-ext: ".csv"
   output-file: "{DIR[DTC,MRR,VPP,3N,SKX]}/vpp_mrr_test_configuration_3n_skx"
   columns:
-  -
-    title: "Name"
+  - title: "Name"
     data: "data name"
     data: "data name"
-  -
-    title: "VPP API Test Commands History - Commands Used Per Test Case"
+  - title: "VPP API Test Commands History - Commands Used Per Test Case"
     data: "data conf-history"
   rows: "generated"
   data: "vpp-mrr-results-3n-skx"
     data: "data conf-history"
   rows: "generated"
   data: "vpp-mrr-results-3n-skx"
@@ -3434,18 +3326,15 @@
   - "conf-history"
 
 # Test configuration - VPP MRR Test Configs 2n-skx
   - "conf-history"
 
 # Test configuration - VPP MRR Test Configs 2n-skx
--
-  type: "table"
+- type: "table"
   title: "Test configuration - VPP MRR Test Configs 2n-skx"
   algorithm: "table_details"
   output-file-ext: ".csv"
   output-file: "{DIR[DTC,MRR,VPP,2N,SKX]}/vpp_mrr_test_configuration_2n_skx"
   columns:
   title: "Test configuration - VPP MRR Test Configs 2n-skx"
   algorithm: "table_details"
   output-file-ext: ".csv"
   output-file: "{DIR[DTC,MRR,VPP,2N,SKX]}/vpp_mrr_test_configuration_2n_skx"
   columns:
-  -
-    title: "Name"
+  - title: "Name"
     data: "data name"
     data: "data name"
-  -
-    title: "VPP API Test Commands History - Commands Used Per Test Case"
+  - title: "VPP API Test Commands History - Commands Used Per Test Case"
     data: "data conf-history"
   rows: "generated"
   data: "vpp-mrr-results-2n-skx"
     data: "data conf-history"
   rows: "generated"
   data: "vpp-mrr-results-2n-skx"
@@ -3455,44 +3344,37 @@
   - "name"
   - "conf-history"
 
   - "name"
   - "conf-history"
 
-# Test configuration - VPP MRR Test Configs 2n-dnv
--
-  type: "table"
-  title: "Test configuration - VPP MRR Test Configs 2n-dnv"
-  algorithm: "table_details"
-  output-file-ext: ".csv"
-  output-file: "{DIR[DTC,MRR,VPP,2N,DNV]}/vpp_mrr_test_configuration_2n_dnv"
-  columns:
-  -
-    title: "Name"
-    data: "data name"
-  -
-    title: "VPP API Test Commands History - Commands Used Per Test Case"
-    data: "data conf-history"
-  rows: "generated"
-  data: "intel-dnv-vpp"
-  filter: "'MRR'"
-  parameters:
-  - "parent"
-  - "name"
-  - "conf-history"
+## Test configuration - VPP MRR Test Configs 2n-dnv
+#- type: "table"
+#  title: "Test configuration - VPP MRR Test Configs 2n-dnv"
+#  algorithm: "table_details"
+#  output-file-ext: ".csv"
+#  output-file: "{DIR[DTC,MRR,VPP,2N,DNV]}/vpp_mrr_test_configuration_2n_dnv"
+#  columns:
+#  - title: "Name"
+#    data: "data name"
+#  - title: "VPP API Test Commands History - Commands Used Per Test Case"
+#    data: "data conf-history"
+#  rows: "generated"
+#  data: "intel-dnv-vpp"
+#  filter: "'MRR'"
+#  parameters:
+#  - "parent"
+#  - "name"
+#  - "conf-history"
 
 # Detailed Test Results - VPP Functional Results - Ubuntu
 
 # Detailed Test Results - VPP Functional Results - Ubuntu
--
-  type: "table"
+- type: "table"
   title: "Detailed Test Results - VPP Functional Results - Ubuntu"
   algorithm: "table_details"
   output-file-ext: ".csv"
   output-file: "{DIR[DTR,FUNC,VPP,UBUNTU]}/vpp_functional_results_ubuntu"
   columns:
   title: "Detailed Test Results - VPP Functional Results - Ubuntu"
   algorithm: "table_details"
   output-file-ext: ".csv"
   output-file: "{DIR[DTR,FUNC,VPP,UBUNTU]}/vpp_functional_results_ubuntu"
   columns:
-  -
-    title: "Name"
+  - title: "Name"
     data: "data name"
     data: "data name"
-  -
-    title: "Documentation"
+  - title: "Documentation"
     data: "data doc"
     data: "data doc"
-  -
-    title: "Status"
+  - title: "Status"
     data: "data status"
   rows: "generated"
   data: "vpp-func-results-ubuntu"
     data: "data status"
   rows: "generated"
   data: "vpp-func-results-ubuntu"
@@ -3504,18 +3386,15 @@
   - "status"
 
 # Detailed Test Results - VPP Functional Results - CentOS
   - "status"
 
 # Detailed Test Results - VPP Functional Results - CentOS
--
-  type: "table"
+- type: "table"
   title: "Detailed Test Results - VPP Functional Results - CentOS"
   algorithm: "table_details"
   output-file-ext: ".csv"
   output-file: "{DIR[DTR,FUNC,VPP,CENTOS]}/vpp_functional_results_centos"
   columns:
   title: "Detailed Test Results - VPP Functional Results - CentOS"
   algorithm: "table_details"
   output-file-ext: ".csv"
   output-file: "{DIR[DTR,FUNC,VPP,CENTOS]}/vpp_functional_results_centos"
   columns:
-  -
-    title: "Name"
+  - title: "Name"
     data: "data name"
     data: "data name"
-  -
-    title: "Documentation"
+  - title: "Documentation"
     data: "data doc"
   -
     title: "Status"
     data: "data doc"
   -
     title: "Status"
@@ -3531,18 +3410,15 @@
   - "status"
 
 # Test configuration - VPP Functional Test Configs - Ubuntu
   - "status"
 
 # Test configuration - VPP Functional Test Configs - Ubuntu
--
-  type: "table"
+- type: "table"
   title: "Test configuration - VPP Functional Test Configs - Ubuntu"
   algorithm: "table_details"
   output-file-ext: ".csv"
   output-file: "{DIR[DTC,FUNC,VPP,UBUNTU]}/vpp_functional_configuration_ubuntu"
   columns:
   title: "Test configuration - VPP Functional Test Configs - Ubuntu"
   algorithm: "table_details"
   output-file-ext: ".csv"
   output-file: "{DIR[DTC,FUNC,VPP,UBUNTU]}/vpp_functional_configuration_ubuntu"
   columns:
-  -
-    title: "Name"
+  - title: "Name"
     data: "data name"
     data: "data name"
-  -
-    title: "VPP API Test Commands History - Commands Used Per Test Case"
+  - title: "VPP API Test Commands History - Commands Used Per Test Case"
     data: "data conf-history"
   rows: "generated"
   data: "vpp-func-results-ubuntu"
     data: "data conf-history"
   rows: "generated"
   data: "vpp-func-results-ubuntu"
@@ -3553,18 +3429,15 @@
   - "conf-history"
 
 # Test configuration - VPP Functional Test Configs - CentOS
   - "conf-history"
 
 # Test configuration - VPP Functional Test Configs - CentOS
--
-  type: "table"
+- type: "table"
   title: "Test configuration - VPP Functional Test Configs - CentOS"
   algorithm: "table_details"
   output-file-ext: ".csv"
   output-file: "{DIR[DTC,FUNC,VPP,CENTOS]}/vpp_functional_configuration_centos"
   columns:
   title: "Test configuration - VPP Functional Test Configs - CentOS"
   algorithm: "table_details"
   output-file-ext: ".csv"
   output-file: "{DIR[DTC,FUNC,VPP,CENTOS]}/vpp_functional_configuration_centos"
   columns:
-  -
-    title: "Name"
+  - title: "Name"
     data: "data name"
     data: "data name"
-  -
-    title: "VPP API Test Commands History - Commands Used Per Test Case"
+  - title: "VPP API Test Commands History - Commands Used Per Test Case"
     data: "data conf-history"
   rows: "generated"
   data: "vpp-func-results-centos"
     data: "data conf-history"
   rows: "generated"
   data: "vpp-func-results-centos"
@@ -3574,44 +3447,37 @@
   - "name"
   - "conf-history"
 
   - "name"
   - "conf-history"
 
-# Detailed Test Results - Container Orchestrated Topologies Performance Results 3n-hsw
--
-  type: "table"
-  title: "Detailed Test Results - Container Orchestrated Topologies Performance Results 3n-hsw"
-  algorithm: "table_details"
-  output-file-ext: ".csv"
-  output-file: "{DIR[DTR,PERF,COT,3N,HSW]}/cot_performance_results_3n_hsw"
-  columns:
-  -
-    title: "Name"
-    data: "data name"
-  -
-    title: "Status"
-    data: "data msg"
-  rows: "generated"
-  data: "ligato-perf-results-3n-hsw"
-  filter: "all"
-  parameters:
-  - "name"
-  - "parent"
-  - "msg"
+## Detailed Test Results - Container Orchestrated Topologies Performance Results 3n-hsw
+#- type: "table"
+#  title: "Detailed Test Results - Container Orchestrated Topologies Performance Results 3n-hsw"
+#  algorithm: "table_details"
+#  output-file-ext: ".csv"
+#  output-file: "{DIR[DTR,PERF,COT,3N,HSW]}/cot_performance_results_3n_hsw"
+#  columns:
+#  - title: "Name"
+#    data: "data name"
+#  - title: "Status"
+#    data: "data msg"
+#  rows: "generated"
+#  data: "ligato-perf-results-3n-hsw"
+#  filter: "all"
+#  parameters:
+#  - "name"
+#  - "parent"
+#  - "msg"
 
 # Detailed Test Results - VPP Device Results - Ubuntu
 
 # Detailed Test Results - VPP Device Results - Ubuntu
--
-  type: "table"
+- type: "table"
   title: "Detailed Test Results - VPP Device Results - Ubuntu"
   algorithm: "table_details"
   output-file-ext: ".csv"
   output-file: "{DIR[DTR,FUNC,VPP,DEVICE,UBUNTU]}/vpp_device_results_ubuntu"
   columns:
   title: "Detailed Test Results - VPP Device Results - Ubuntu"
   algorithm: "table_details"
   output-file-ext: ".csv"
   output-file: "{DIR[DTR,FUNC,VPP,DEVICE,UBUNTU]}/vpp_device_results_ubuntu"
   columns:
-  -
-    title: "Name"
+  - title: "Name"
     data: "data name"
     data: "data name"
-  -
-    title: "Documentation"
+  - title: "Documentation"
     data: "data doc"
     data: "data doc"
-  -
-    title: "Status"
+  - title: "Status"
     data: "data status"
   rows: "generated"
   data: "vpp-device-results-ubuntu"
     data: "data status"
   rows: "generated"
   data: "vpp-device-results-ubuntu"
@@ -3623,18 +3489,15 @@
   - "status"
 
 # Test configuration - VPP Device Test Configs - Ubuntu
   - "status"
 
 # Test configuration - VPP Device Test Configs - Ubuntu
--
-  type: "table"
+- type: "table"
   title: "Test configuration - VPP Device Test Configs - Ubuntu"
   algorithm: "table_details"
   output-file-ext: ".csv"
   output-file: "{DIR[DTC,FUNC,VPP,DEVICE,UBUNTU]}/vpp_device_configuration_ubuntu"
   columns:
   title: "Test configuration - VPP Device Test Configs - Ubuntu"
   algorithm: "table_details"
   output-file-ext: ".csv"
   output-file: "{DIR[DTC,FUNC,VPP,DEVICE,UBUNTU]}/vpp_device_configuration_ubuntu"
   columns:
-  -
-    title: "Name"
+  - title: "Name"
     data: "data name"
     data: "data name"
-  -
-    title: "VPP API Test Commands History - Commands Used Per Test Case"
+  - title: "VPP API Test Commands History - Commands Used Per Test Case"
     data: "data conf-history"
   rows: "generated"
   data: "vpp-device-results-ubuntu"
     data: "data conf-history"
   rows: "generated"
   data: "vpp-device-results-ubuntu"
@@ -3647,20 +3510,18 @@
 ################################################################################
 
 # DPDK Performance Changes 3n-hsw 1t1c pdr
 ################################################################################
 
 # DPDK Performance Changes 3n-hsw 1t1c pdr
--
-  type: "table"
+- type: "table"
   title: "DPDK Performance Changes 3n-hsw 1t1c pdr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-hsw-1t1c-pdr"
   history:
   title: "DPDK Performance Changes 3n-hsw 1t1c pdr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-hsw-1t1c-pdr"
   history:
-    -
-      title: "rls1807"
+    - title: "rls1810"
       data: "dpdk-performance-changes-3n-hsw-h1"
   reference:
       data: "dpdk-performance-changes-3n-hsw-h1"
   reference:
-    title: "rls1810"
+    title: "rls1901"
     data: "dpdk-performance-changes-3n-hsw-ref"
   compare:
     data: "dpdk-performance-changes-3n-hsw-ref"
   compare:
-    title: "rls1901"
+    title: "rls1904"
     data: "dpdk-performance-changes-3n-hsw-cmp"
   data: "dpdk-performance-changes-3n-hsw"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
     data: "dpdk-performance-changes-3n-hsw-cmp"
   data: "dpdk-performance-changes-3n-hsw"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
@@ -3671,20 +3532,18 @@
   - "throughput"
 
 # DPDK Performance Changes 3n-hsw 2t2c pdr
   - "throughput"
 
 # DPDK Performance Changes 3n-hsw 2t2c pdr
--
-  type: "table"
+- type: "table"
   title: "DPDK Performance Changes 3n-hsw 2t2c pdr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-hsw-2t2c-pdr"
   history:
   title: "DPDK Performance Changes 3n-hsw 2t2c pdr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-hsw-2t2c-pdr"
   history:
-    -
-      title: "rls1807"
+    - title: "rls1810"
       data: "dpdk-performance-changes-3n-hsw-h1"
   reference:
       data: "dpdk-performance-changes-3n-hsw-h1"
   reference:
-    title: "rls1810"
+    title: "rls1901"
     data: "dpdk-performance-changes-3n-hsw-ref"
   compare:
     data: "dpdk-performance-changes-3n-hsw-ref"
   compare:
-    title: "rls1901"
+    title: "rls1904"
     data: "dpdk-performance-changes-3n-hsw-cmp"
   data: "dpdk-performance-changes-3n-hsw"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
     data: "dpdk-performance-changes-3n-hsw-cmp"
   data: "dpdk-performance-changes-3n-hsw"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
@@ -3695,20 +3554,18 @@
   - "throughput"
 
 # DPDK Performance Changes 3n-hsw 1t1c ndr
   - "throughput"
 
 # DPDK Performance Changes 3n-hsw 1t1c ndr
--
-  type: "table"
+- type: "table"
   title: "DPDK Performance Changes 3n-hsw 1t1c ndr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-hsw-1t1c-ndr"
   history:
   title: "DPDK Performance Changes 3n-hsw 1t1c ndr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-hsw-1t1c-ndr"
   history:
-    -
-      title: "rls1807"
+    - title: "rls1810"
       data: "dpdk-performance-changes-3n-hsw-h1"
   reference:
       data: "dpdk-performance-changes-3n-hsw-h1"
   reference:
-    title: "rls1810"
+    title: "rls1901"
     data: "dpdk-performance-changes-3n-hsw-ref"
   compare:
     data: "dpdk-performance-changes-3n-hsw-ref"
   compare:
-    title: "rls1901"
+    title: "rls1904"
     data: "dpdk-performance-changes-3n-hsw-cmp"
   data: "dpdk-performance-changes-3n-hsw"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
     data: "dpdk-performance-changes-3n-hsw-cmp"
   data: "dpdk-performance-changes-3n-hsw"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
@@ -3719,20 +3576,18 @@
   - "throughput"
 
 # DPDK Performance Changes 3n-hsw 2t2c ndr
   - "throughput"
 
 # DPDK Performance Changes 3n-hsw 2t2c ndr
--
-  type: "table"
+- type: "table"
   title: "DPDK Performance Changes 3n-hsw 2t2c ndr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-hsw-2t2c-ndr"
   history:
   title: "DPDK Performance Changes 3n-hsw 2t2c ndr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-hsw-2t2c-ndr"
   history:
-    -
-      title: "rls1807"
+    - title: "rls1810"
       data: "dpdk-performance-changes-3n-hsw-h1"
   reference:
       data: "dpdk-performance-changes-3n-hsw-h1"
   reference:
-    title: "rls1810"
+    title: "rls1901"
     data: "dpdk-performance-changes-3n-hsw-ref"
   compare:
     data: "dpdk-performance-changes-3n-hsw-ref"
   compare:
-    title: "rls1901"
+    title: "rls1904"
     data: "dpdk-performance-changes-3n-hsw-cmp"
   data: "dpdk-performance-changes-3n-hsw"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
     data: "dpdk-performance-changes-3n-hsw-cmp"
   data: "dpdk-performance-changes-3n-hsw"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
@@ -3743,20 +3598,18 @@
   - "throughput"
 
 # DPDK Performance Changes 3n-skx 2t1c pdr
   - "throughput"
 
 # DPDK Performance Changes 3n-skx 2t1c pdr
--
-  type: "table"
+- type: "table"
   title: "DPDK Performance Changes 3n-skx 2t1c pdr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-skx-2t1c-pdr"
   history:
   title: "DPDK Performance Changes 3n-skx 2t1c pdr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-skx-2t1c-pdr"
   history:
-    -
-      title: "rls1807"
+    - title: "rls1810"
       data: "dpdk-performance-changes-3n-skx-h1"
   reference:
       data: "dpdk-performance-changes-3n-skx-h1"
   reference:
-    title: "rls1810"
+    title: "rls1901"
     data: "dpdk-performance-changes-3n-skx-ref"
   compare:
     data: "dpdk-performance-changes-3n-skx-ref"
   compare:
-    title: "rls1901"
+    title: "rls1904"
     data: "dpdk-performance-changes-3n-skx-cmp"
   data: "dpdk-performance-changes-3n-skx"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
     data: "dpdk-performance-changes-3n-skx-cmp"
   data: "dpdk-performance-changes-3n-skx"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
@@ -3767,20 +3620,18 @@
   - "throughput"
 
 # DPDK Performance Changes 3n-skx 4t2c pdr
   - "throughput"
 
 # DPDK Performance Changes 3n-skx 4t2c pdr
--
-  type: "table"
+- type: "table"
   title: "DPDK Performance Changes 3n-skx 4t2c pdr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-skx-4t2c-pdr"
   history:
   title: "DPDK Performance Changes 3n-skx 4t2c pdr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-skx-4t2c-pdr"
   history:
-    -
-      title: "rls1807"
+    - title: "rls1810"
       data: "dpdk-performance-changes-3n-skx-h1"
   reference:
       data: "dpdk-performance-changes-3n-skx-h1"
   reference:
-    title: "rls1810"
+    title: "rls1901"
     data: "dpdk-performance-changes-3n-skx-ref"
   compare:
     data: "dpdk-performance-changes-3n-skx-ref"
   compare:
-    title: "rls1901"
+    title: "rls1904"
     data: "dpdk-performance-changes-3n-skx-cmp"
   data: "dpdk-performance-changes-3n-skx"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
     data: "dpdk-performance-changes-3n-skx-cmp"
   data: "dpdk-performance-changes-3n-skx"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
@@ -3791,20 +3642,18 @@
   - "throughput"
 
 # DPDK Performance Changes 3n-skx 2t1c ndr
   - "throughput"
 
 # DPDK Performance Changes 3n-skx 2t1c ndr
--
-  type: "table"
+- type: "table"
   title: "DPDK Performance Changes 3n-skx 2t1c ndr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-skx-2t1c-ndr"
   history:
   title: "DPDK Performance Changes 3n-skx 2t1c ndr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-skx-2t1c-ndr"
   history:
-    -
-      title: "rls1807"
+    - title: "rls1810"
       data: "dpdk-performance-changes-3n-skx-h1"
   reference:
       data: "dpdk-performance-changes-3n-skx-h1"
   reference:
-    title: "rls1810"
+    title: "rls1901"
     data: "dpdk-performance-changes-3n-skx-ref"
   compare:
     data: "dpdk-performance-changes-3n-skx-ref"
   compare:
-    title: "rls1901"
+    title: "rls1904"
     data: "dpdk-performance-changes-3n-skx-cmp"
   data: "dpdk-performance-changes-3n-skx"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
     data: "dpdk-performance-changes-3n-skx-cmp"
   data: "dpdk-performance-changes-3n-skx"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
@@ -3815,20 +3664,18 @@
   - "throughput"
 
 # DPDK Performance Changes 3n-skx 4t2c ndr
   - "throughput"
 
 # DPDK Performance Changes 3n-skx 4t2c ndr
--
-  type: "table"
+- type: "table"
   title: "DPDK Performance Changes 3n-skx 4t2c ndr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-skx-4t2c-ndr"
   history:
   title: "DPDK Performance Changes 3n-skx 4t2c ndr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-skx-4t2c-ndr"
   history:
-    -
-      title: "rls1807"
+    - title: "rls1810"
       data: "dpdk-performance-changes-3n-skx-h1"
   reference:
       data: "dpdk-performance-changes-3n-skx-h1"
   reference:
-    title: "rls1810"
+    title: "rls1901"
     data: "dpdk-performance-changes-3n-skx-ref"
   compare:
     data: "dpdk-performance-changes-3n-skx-ref"
   compare:
-    title: "rls1901"
+    title: "rls1904"
     data: "dpdk-performance-changes-3n-skx-cmp"
   data: "dpdk-performance-changes-3n-skx"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
     data: "dpdk-performance-changes-3n-skx-cmp"
   data: "dpdk-performance-changes-3n-skx"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
@@ -3839,8 +3686,7 @@
   - "throughput"
 
 # DPDK Comparison Across Testbeds 3n-hsw to 3n-skx ndr
   - "throughput"
 
 # DPDK Comparison Across Testbeds 3n-hsw to 3n-skx ndr
--
-  type: "table"
+- type: "table"
   title: "DPDK Comparison Across Testbeds 3n-hsw to 3n-skx ndr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-compare-testbeds-3n-hsw-3n-skx-ndr"
   title: "DPDK Comparison Across Testbeds 3n-hsw to 3n-skx ndr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-compare-testbeds-3n-hsw-3n-skx-ndr"
@@ -3859,8 +3705,7 @@
   - "throughput"
 
 # DPDK Comparison Across Testbeds 3n-hsw to 3n-skx pdr
   - "throughput"
 
 # DPDK Comparison Across Testbeds 3n-hsw to 3n-skx pdr
--
-  type: "table"
+- type: "table"
   title: "DPDK Comparison Across Testbeds 3n-hsw to 3n-skx pdr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-compare-testbeds-3n-hsw-3n-skx-pdr"
   title: "DPDK Comparison Across Testbeds 3n-hsw to 3n-skx pdr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-compare-testbeds-3n-hsw-3n-skx-pdr"
@@ -3879,8 +3724,7 @@
   - "throughput"
 
 # DPDK Comparison Across Topologies 3n-skx to 2n-skx ndr
   - "throughput"
 
 # DPDK Comparison Across Topologies 3n-skx to 2n-skx ndr
--
-  type: "table"
+- type: "table"
   title: "DPDK Comparison Across Topologies 3n-skx to 2n-skx ndr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-compare-topologies-3n-skx-2n-skx-ndr"
   title: "DPDK Comparison Across Topologies 3n-skx to 2n-skx ndr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-compare-topologies-3n-skx-2n-skx-ndr"
@@ -3899,8 +3743,7 @@
   - "throughput"
 
 # DPDK Comparison Across Topologies 3n-skx to 2n-skx pdr
   - "throughput"
 
 # DPDK Comparison Across Topologies 3n-skx to 2n-skx pdr
--
-  type: "table"
+- type: "table"
   title: "DPDK Comparison Across Topologies 3n-skx to 2n-skx pdr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-compare-topologies-3n-skx-2n-skx-pdr"
   title: "DPDK Comparison Across Topologies 3n-skx to 2n-skx pdr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-compare-topologies-3n-skx-2n-skx-pdr"
@@ -3919,16 +3762,18 @@
   - "throughput"
 
 # DPDK Performance Changes 2n-skx 2t1c pdr
   - "throughput"
 
 # DPDK Performance Changes 2n-skx 2t1c pdr
--
-  type: "table"
+- type: "table"
   title: "DPDK Performance Changes 2n-skx 2t1c pdr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-skx-2t1c-pdr"
   title: "DPDK Performance Changes 2n-skx 2t1c pdr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-skx-2t1c-pdr"
+  history:
+    - title: "rls1810"
+      data: "dpdk-performance-changes-2n-skx-h1"
   reference:
   reference:
-    title: "rls1810"
+    title: "rls1901"
     data: "dpdk-performance-changes-2n-skx-ref"
   compare:
     data: "dpdk-performance-changes-2n-skx-ref"
   compare:
-    title: "rls1901"
+    title: "rls1904"
     data: "dpdk-performance-changes-2n-skx-cmp"
   data: "dpdk-performance-changes-2n-skx"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
     data: "dpdk-performance-changes-2n-skx-cmp"
   data: "dpdk-performance-changes-2n-skx"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
@@ -3939,16 +3784,18 @@
   - "throughput"
 
 # DPDK Performance Changes 2n-skx 4t2c pdr
   - "throughput"
 
 # DPDK Performance Changes 2n-skx 4t2c pdr
--
-  type: "table"
+- type: "table"
   title: "DPDK Performance Changes 2n-skx 4t2c pdr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-skx-4t2c-pdr"
   title: "DPDK Performance Changes 2n-skx 4t2c pdr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-skx-4t2c-pdr"
+  history:
+    - title: "rls1810"
+      data: "dpdk-performance-changes-2n-skx-h1"
   reference:
   reference:
-    title: "rls1810"
+    title: "rls1901"
     data: "dpdk-performance-changes-2n-skx-ref"
   compare:
     data: "dpdk-performance-changes-2n-skx-ref"
   compare:
-    title: "rls1901"
+    title: "rls1904"
     data: "dpdk-performance-changes-2n-skx-cmp"
   data: "dpdk-performance-changes-2n-skx"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
     data: "dpdk-performance-changes-2n-skx-cmp"
   data: "dpdk-performance-changes-2n-skx"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
@@ -3959,16 +3806,18 @@
   - "throughput"
 
 # DPDK Performance Changes 2n-skx 2t1c ndr
   - "throughput"
 
 # DPDK Performance Changes 2n-skx 2t1c ndr
--
-  type: "table"
+- 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"
   title: "DPDK Performance Changes 2n-skx 2t1c ndr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-skx-2t1c-ndr"
+  history:
+    - title: "rls1810"
+      data: "dpdk-performance-changes-2n-skx-h1"
   reference:
   reference:
-    title: "rls1810"
+    title: "rls1901"
     data: "dpdk-performance-changes-2n-skx-ref"
   compare:
     data: "dpdk-performance-changes-2n-skx-ref"
   compare:
-    title: "rls1901"
+    title: "rls1904"
     data: "dpdk-performance-changes-2n-skx-cmp"
   data: "dpdk-performance-changes-2n-skx"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
     data: "dpdk-performance-changes-2n-skx-cmp"
   data: "dpdk-performance-changes-2n-skx"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
@@ -3979,16 +3828,18 @@
   - "throughput"
 
 # DPDK Performance Changes 2n-skx 4t2c ndr
   - "throughput"
 
 # DPDK Performance Changes 2n-skx 4t2c ndr
--
-  type: "table"
+- 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"
   title: "DPDK Performance Changes 2n-skx 4t2c ndr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-skx-4t2c-ndr"
+  history:
+    - title: "rls1810"
+      data: "dpdk-performance-changes-2n-skx-h1"
   reference:
   reference:
-    title: "rls1810"
+    title: "rls1901"
     data: "dpdk-performance-changes-2n-skx-ref"
   compare:
     data: "dpdk-performance-changes-2n-skx-ref"
   compare:
-    title: "rls1901"
+    title: "rls1904"
     data: "dpdk-performance-changes-2n-skx-cmp"
   data: "dpdk-performance-changes-2n-skx"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
     data: "dpdk-performance-changes-2n-skx-cmp"
   data: "dpdk-performance-changes-2n-skx"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
@@ -3999,18 +3850,15 @@
   - "throughput"
 
 # Detailed Test Results - DPDK Performance Results 3n-hsw
   - "throughput"
 
 # Detailed Test Results - DPDK Performance Results 3n-hsw
--
-  type: "table"
+- 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: "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"
+  - title: "Name"
     data: "data name"
     data: "data name"
-  -
-    title: "Status"
+  - title: "Status"
     data: "data msg"
   rows: "generated"
   data: "dpdk-perf-results-3n-hsw"
     data: "data msg"
   rows: "generated"
   data: "dpdk-perf-results-3n-hsw"
@@ -4021,18 +3869,15 @@
   - "msg"
 
 # Detailed Test Results - DPDK Performance Results 3n-skx
   - "msg"
 
 # Detailed Test Results - DPDK Performance Results 3n-skx
--
-  type: "table"
+- 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: "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"
+  - title: "Name"
+    data: "data name"
+  - title: "Status"
     data: "data msg"
   rows: "generated"
   data: "dpdk-perf-results-3n-skx"
     data: "data msg"
   rows: "generated"
   data: "dpdk-perf-results-3n-skx"
@@ -4043,18 +3888,15 @@
   - "msg"
 
 # Detailed Test Results - DPDK Performance Results 2n-skx
   - "msg"
 
 # Detailed Test Results - DPDK Performance Results 2n-skx
--
-  type: "table"
+- type: "table"
   title: "Detailed Test Results - DPDK Performance Results 2n-skx"
   algorithm: "table_details"
   output-file-ext: ".csv"
   output-file: "{DIR[DTR,PERF,DPDK,2N,SKX]}/dpdk_performance_results_2n_skx"
   columns:
   title: "Detailed Test Results - DPDK Performance Results 2n-skx"
   algorithm: "table_details"
   output-file-ext: ".csv"
   output-file: "{DIR[DTR,PERF,DPDK,2N,SKX]}/dpdk_performance_results_2n_skx"
   columns:
-  -
-    title: "Name"
+  - title: "Name"
     data: "data name"
     data: "data name"
-  -
-    title: "Status"
+  - title: "Status"
     data: "data msg"
   rows: "generated"
   data: "dpdk-perf-results-2n-skx"
     data: "data msg"
   rows: "generated"
   data: "dpdk-perf-results-2n-skx"
@@ -4066,21 +3908,17 @@
 
 ################################################################################
 # HoneyComb
 
 ################################################################################
 # HoneyComb
--
-  type: "table"
+- type: "table"
   title: "Detailed Test Results - Honeycomb Functional Results"
   algorithm: "table_details"
   output-file-ext: ".csv"
   output-file: "{DIR[DTR,FUNC,HC]}/hc_functional_results"
   columns:
   title: "Detailed Test Results - Honeycomb Functional Results"
   algorithm: "table_details"
   output-file-ext: ".csv"
   output-file: "{DIR[DTR,FUNC,HC]}/hc_functional_results"
   columns:
-  -
-    title: "Name"
+  - title: "Name"
     data: "data name"
     data: "data name"
-  -
-    title: "Documentation"
+  - title: "Documentation"
     data: "data doc"
     data: "data doc"
-  -
-    title: "Status"
+  - title: "Status"
     data: "data status"
   rows: "generated"
   data:
     data: "data status"
   rows: "generated"
   data:
@@ -4094,49 +3932,45 @@
 
 ################################################################################
 # NSH SFC
 
 ################################################################################
 # NSH SFC
--
-  type: "table"
-  title: "Detailed Test Results - NSH SFC Functional Results"
-  algorithm: "table_details"
-  output-file-ext: ".csv"
-  output-file: "{DIR[DTR,FUNC,NSHSFC]}/nsh_sfc_functional_results"
-  columns:
-  -
-    title: "Name"
-    data: "data name"
-  -
-    title: "Documentation"
-    data: "data doc"
-  -
-    title: "Status"
-    data: "data status"
-  rows: "generated"
-  data:
-    "nsh-func-results"
-  filter: "all"
-  parameters:
-  - "name"
-  - "parent"
-  - "doc"
-  - "status"
+#-
+#  type: "table"
+#  title: "Detailed Test Results - NSH SFC Functional Results"
+#  algorithm: "table_details"
+#  output-file-ext: ".csv"
+#  output-file: "{DIR[DTR,FUNC,NSHSFC]}/nsh_sfc_functional_results"
+#  columns:
+#  -
+#    title: "Name"
+#    data: "data name"
+#  -
+#    title: "Documentation"
+#    data: "data doc"
+#  -
+#    title: "Status"
+#    data: "data status"
+#  rows: "generated"
+#  data:
+#    "nsh-func-results"
+#  filter: "all"
+#  parameters:
+#  - "name"
+#  - "parent"
+#  - "doc"
+#  - "status"
 
 ################################################################################
 # DMM
 
 ################################################################################
 # DMM
--
-  type: "table"
+- type: "table"
   title: "Detailed Test Results - DMM Functional Results"
   algorithm: "table_details"
   output-file-ext: ".csv"
   output-file: "{DIR[DTR,FUNC,DMM]}/dmm_functional_results"
   columns:
   title: "Detailed Test Results - DMM Functional Results"
   algorithm: "table_details"
   output-file-ext: ".csv"
   output-file: "{DIR[DTR,FUNC,DMM]}/dmm_functional_results"
   columns:
-  -
-    title: "Name"
+  - title: "Name"
     data: "data name"
     data: "data name"
-  -
-    title: "Documentation"
+  - title: "Documentation"
     data: "data doc"
     data: "data doc"
-  -
-    title: "Status"
+  - title: "Status"
     data: "data status"
   rows: "generated"
   data:
     data: "data status"
   rows: "generated"
   data:
@@ -4153,8 +3987,7 @@
 ################################################################################
 
 # VPP Performance Results 3n-hsw
 ################################################################################
 
 # VPP Performance Results 3n-hsw
--
-  type: "file"
+- type: "file"
   title: "VPP Performance Results 3n-hsw"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
   title: "VPP Performance Results 3n-hsw"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
@@ -4171,8 +4004,7 @@
   data-start-level: 3
 
 # VPP Performance Results 3n-skx
   data-start-level: 3
 
 # VPP Performance Results 3n-skx
--
-  type: "file"
+- type: "file"
   title: "VPP Performance Results 3n-skx"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
   title: "VPP Performance Results 3n-skx"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
@@ -4180,7 +4012,7 @@
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
   dir-tables: "{DIR[DTR,PERF,VPP,3N,SKX]}"
   data: "vpp-perf-results-3n-skx"
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
   dir-tables: "{DIR[DTR,PERF,VPP,3N,SKX]}"
   data: "vpp-perf-results-3n-skx"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  filter: "not 'CFS_OPT'"
   parameters:
   - "name"
   - "doc"
   parameters:
   - "name"
   - "doc"
@@ -4189,8 +4021,7 @@
   data-start-level: 3
 
 # VPP Performance Results 2n-skx
   data-start-level: 3
 
 # VPP Performance Results 2n-skx
--
-  type: "file"
+- type: "file"
   title: "VPP Performance Results 2n-skx"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
   title: "VPP Performance Results 2n-skx"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
@@ -4198,7 +4029,7 @@
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
   dir-tables: "{DIR[DTR,PERF,VPP,2N,SKX]}"
   data: "vpp-perf-results-2n-skx"
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
   dir-tables: "{DIR[DTR,PERF,VPP,2N,SKX]}"
   data: "vpp-perf-results-2n-skx"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  filter: "not 'CFS_OPT'"
   parameters:
   - "name"
   - "doc"
   parameters:
   - "name"
   - "doc"
@@ -4206,27 +4037,25 @@
   - "parent"
   data-start-level: 3
 
   - "parent"
   data-start-level: 3
 
-# VPP Performance Results 2n-dnv
--
-  type: "file"
-  title: "VPP Performance Results 2n-dnv"
-  algorithm: "file_test_results"
-  output-file-ext: ".rst"
-  output-file: "{DIR[DTR,PERF,VPP,2N,DNV]}/vpp_performance_results_2n_dnv"
-  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
-  dir-tables: "{DIR[DTR,PERF,VPP,2N,DNV]}"
-  data: "intel-dnv-vpp"
-  filter: "'NDRPDR'"
-  parameters:
-  - "name"
-  - "doc"
-  - "level"
-  - "parent"
-  data-start-level: 3
+## VPP Performance Results 2n-dnv
+#- type: "file"
+#  title: "VPP Performance Results 2n-dnv"
+#  algorithm: "file_test_results"
+#  output-file-ext: ".rst"
+#  output-file: "{DIR[DTR,PERF,VPP,2N,DNV]}/vpp_performance_results_2n_dnv"
+#  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
+#  dir-tables: "{DIR[DTR,PERF,VPP,2N,DNV]}"
+#  data: "intel-dnv-vpp"
+#  filter: "'NDRPDR'"
+#  parameters:
+#  - "name"
+#  - "doc"
+#  - "level"
+#  - "parent"
+#  data-start-level: 3
 
 # VPP Performance Configuration 3n-hsw
 
 # VPP Performance Configuration 3n-hsw
--
-  type: "file"
+- type: "file"
   title: "VPP Performance Configuration 3n-hsw"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
   title: "VPP Performance Configuration 3n-hsw"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
@@ -4243,8 +4072,7 @@
   data-start-level: 3
 
 # VPP Performance Configuration 3n-skx
   data-start-level: 3
 
 # VPP Performance Configuration 3n-skx
--
-  type: "file"
+- type: "file"
   title: "VPP Performance Configuration 3n-skx"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
   title: "VPP Performance Configuration 3n-skx"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
@@ -4252,7 +4080,7 @@
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
   dir-tables: "{DIR[DTC,PERF,VPP,3N,SKX]}"
   data: "vpp-perf-results-3n-skx"
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
   dir-tables: "{DIR[DTC,PERF,VPP,3N,SKX]}"
   data: "vpp-perf-results-3n-skx"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  filter: "not 'CFS_OPT'"
   parameters:
   - "name"
   - "doc"
   parameters:
   - "name"
   - "doc"
@@ -4261,8 +4089,7 @@
   data-start-level: 3
 
 # VPP Performance Configuration 2n-skx
   data-start-level: 3
 
 # VPP Performance Configuration 2n-skx
--
-  type: "file"
+- type: "file"
   title: "VPP Performance Configuration 2n-skx"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
   title: "VPP Performance Configuration 2n-skx"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
@@ -4270,7 +4097,7 @@
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
   dir-tables: "{DIR[DTC,PERF,VPP,2N,SKX]}"
   data: "vpp-perf-results-2n-skx"
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
   dir-tables: "{DIR[DTC,PERF,VPP,2N,SKX]}"
   data: "vpp-perf-results-2n-skx"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  filter: "not 'CFS_OPT'"
   parameters:
   - "name"
   - "doc"
   parameters:
   - "name"
   - "doc"
@@ -4278,27 +4105,25 @@
   - "parent"
   data-start-level: 3
 
   - "parent"
   data-start-level: 3
 
-# VPP Performance Configuration 2n-dnv
--
-  type: "file"
-  title: "VPP Performance Configuration 2n-dnv"
-  algorithm: "file_test_results"
-  output-file-ext: ".rst"
-  output-file: "{DIR[DTC,PERF,VPP,2N,DNV]}/vpp_performance_configuration_2n_dnv"
-  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
-  dir-tables: "{DIR[DTC,PERF,VPP,2N,DNV]}"
-  data: "intel-dnv-vpp"
-  filter: "'NDRPDR'"
-  parameters:
-  - "name"
-  - "doc"
-  - "level"
-  - "parent"
-  data-start-level: 3
+## VPP Performance Configuration 2n-dnv
+#- type: "file"
+#  title: "VPP Performance Configuration 2n-dnv"
+#  algorithm: "file_test_results"
+#  output-file-ext: ".rst"
+#  output-file: "{DIR[DTC,PERF,VPP,2N,DNV]}/vpp_performance_configuration_2n_dnv"
+#  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
+#  dir-tables: "{DIR[DTC,PERF,VPP,2N,DNV]}"
+#  data: "intel-dnv-vpp"
+#  filter: "'NDRPDR'"
+#  parameters:
+#  - "name"
+#  - "doc"
+#  - "level"
+#  - "parent"
+#  data-start-level: 3
 
 # VPP Performance Operational Data 3n-hsw
 
 # VPP Performance Operational Data 3n-hsw
--
-  type: "file"
+- type: "file"
   title: "VPP Performance Operational Data 3n-hsw"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
   title: "VPP Performance Operational Data 3n-hsw"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
@@ -4315,8 +4140,7 @@
   data-start-level: 3
 
 # VPP Performance Operational Data 3n-skx
   data-start-level: 3
 
 # VPP Performance Operational Data 3n-skx
--
-  type: "file"
+- type: "file"
   title: "VPP Performance Operational Data 3n-skx"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
   title: "VPP Performance Operational Data 3n-skx"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
@@ -4324,7 +4148,7 @@
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
   dir-tables: "{DIR[DTO,PERF,VPP,3N,SKX]}"
   data: "vpp-perf-results-3n-skx"
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
   dir-tables: "{DIR[DTO,PERF,VPP,3N,SKX]}"
   data: "vpp-perf-results-3n-skx"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  filter: "not 'CFS_OPT'"
   parameters:
   - "name"
   - "doc"
   parameters:
   - "name"
   - "doc"
@@ -4333,8 +4157,7 @@
   data-start-level: 3
 
 # VPP Performance Operational Data 2n-skx
   data-start-level: 3
 
 # VPP Performance Operational Data 2n-skx
--
-  type: "file"
+- type: "file"
   title: "VPP Performance Operational Data 2n-skx"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
   title: "VPP Performance Operational Data 2n-skx"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
@@ -4342,7 +4165,7 @@
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
   dir-tables: "{DIR[DTO,PERF,VPP,2N,SKX]}"
   data: "vpp-perf-results-2n-skx"
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
   dir-tables: "{DIR[DTO,PERF,VPP,2N,SKX]}"
   data: "vpp-perf-results-2n-skx"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  filter: "not 'CFS_OPT'"
   parameters:
   - "name"
   - "doc"
   parameters:
   - "name"
   - "doc"
@@ -4350,27 +4173,25 @@
   - "parent"
   data-start-level: 3
 
   - "parent"
   data-start-level: 3
 
-# VPP Performance Operational Data 2n-dnv
--
-  type: "file"
-  title: "VPP Performance Operational Data 2n-dnv"
-  algorithm: "file_test_results"
-  output-file-ext: ".rst"
-  output-file: "{DIR[DTO,PERF,VPP,2N,DNV]}/vpp_performance_operational_data_2n_dnv"
-  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
-  dir-tables: "{DIR[DTO,PERF,VPP,2N,DNV]}"
-  data: "intel-dnv-vpp"
-  filter: "'NDRPDR'"
-  parameters:
-  - "name"
-  - "doc"
-  - "level"
-  - "parent"
-  data-start-level: 3
+## VPP Performance Operational Data 2n-dnv
+#- type: "file"
+#  title: "VPP Performance Operational Data 2n-dnv"
+#  algorithm: "file_test_results"
+#  output-file-ext: ".rst"
+#  output-file: "{DIR[DTO,PERF,VPP,2N,DNV]}/vpp_performance_operational_data_2n_dnv"
+#  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
+#  dir-tables: "{DIR[DTO,PERF,VPP,2N,DNV]}"
+#  data: "intel-dnv-vpp"
+#  filter: "'NDRPDR'"
+#  parameters:
+#  - "name"
+#  - "doc"
+#  - "level"
+#  - "parent"
+#  data-start-level: 3
 
 # VPP MRR Results 3n-hsw
 
 # VPP MRR Results 3n-hsw
--
-  type: "file"
+- type: "file"
   title: "VPP MRR Results 3n-hsw"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
   title: "VPP MRR Results 3n-hsw"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
@@ -4387,8 +4208,7 @@
   data-start-level: 3
 
 # VPP MRR Results 3n-skx
   data-start-level: 3
 
 # VPP MRR Results 3n-skx
--
-  type: "file"
+- type: "file"
   title: "VPP MRR Results 3n-skx"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
   title: "VPP MRR Results 3n-skx"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
@@ -4405,8 +4225,7 @@
   data-start-level: 3
 
 # VPP MRR Results 2n-skx
   data-start-level: 3
 
 # VPP MRR Results 2n-skx
--
-  type: "file"
+- type: "file"
   title: "VPP MRR Results 2n-skx"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
   title: "VPP MRR Results 2n-skx"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
@@ -4422,27 +4241,25 @@
   - "parent"
   data-start-level: 3
 
   - "parent"
   data-start-level: 3
 
-# VPP MRR Results 2n-dnv
--
-  type: "file"
-  title: "VPP MRR Results 2n-dnv"
-  algorithm: "file_test_results"
-  output-file-ext: ".rst"
-  output-file: "{DIR[DTR,MRR,VPP,2N,DNV]}/vpp_mrr_results_2n_dnv"
-  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
-  dir-tables: "{DIR[DTR,MRR,VPP,2N,DNV]}"
-  data: "intel-dnv-vpp"
-  filter: "'MRR'"
-  parameters:
-  - "name"
-  - "doc"
-  - "level"
-  - "parent"
-  data-start-level: 3
+## VPP MRR Results 2n-dnv
+#- type: "file"
+#  title: "VPP MRR Results 2n-dnv"
+#  algorithm: "file_test_results"
+#  output-file-ext: ".rst"
+#  output-file: "{DIR[DTR,MRR,VPP,2N,DNV]}/vpp_mrr_results_2n_dnv"
+#  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
+#  dir-tables: "{DIR[DTR,MRR,VPP,2N,DNV]}"
+#  data: "intel-dnv-vpp"
+#  filter: "'MRR'"
+#  parameters:
+#  - "name"
+#  - "doc"
+#  - "level"
+#  - "parent"
+#  data-start-level: 3
 
 # VPP MRR Configuration 3n-hsw
 
 # VPP MRR Configuration 3n-hsw
--
-  type: "file"
+- type: "file"
   title: "VPP MRR Configuration 3n-hsw"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
   title: "VPP MRR Configuration 3n-hsw"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
@@ -4459,8 +4276,7 @@
   data-start-level: 3
 
 # VPP MRR Configuration 3n-skx
   data-start-level: 3
 
 # VPP MRR Configuration 3n-skx
--
-  type: "file"
+- type: "file"
   title: "VPP MRR Configuration 3n-skx"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
   title: "VPP MRR Configuration 3n-skx"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
@@ -4477,8 +4293,7 @@
   data-start-level: 3
 
 # VPP MRR Configuration 2n-skx
   data-start-level: 3
 
 # VPP MRR Configuration 2n-skx
--
-  type: "file"
+- type: "file"
   title: "VPP MRR Configuration 2n-skx"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
   title: "VPP MRR Configuration 2n-skx"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
@@ -4494,27 +4309,25 @@
   - "parent"
   data-start-level: 3
 
   - "parent"
   data-start-level: 3
 
-# VPP MRR Configuration 2n-dnv
--
-  type: "file"
-  title: "VPP MRR Configuration 2n-dnv"
-  algorithm: "file_test_results"
-  output-file-ext: ".rst"
-  output-file: "{DIR[DTC,MRR,VPP,2N,DNV]}/vpp_mrr_configuration_2n_dnv"
-  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
-  dir-tables: "{DIR[DTC,MRR,VPP,2N,DNV]}"
-  data: "intel-dnv-vpp"
-  filter: "'MRR'"
-  parameters:
-  - "name"
-  - "doc"
-  - "level"
-  - "parent"
-  data-start-level: 3
+## VPP MRR Configuration 2n-dnv
+#- type: "file"
+#  title: "VPP MRR Configuration 2n-dnv"
+#  algorithm: "file_test_results"
+#  output-file-ext: ".rst"
+#  output-file: "{DIR[DTC,MRR,VPP,2N,DNV]}/vpp_mrr_configuration_2n_dnv"
+#  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
+#  dir-tables: "{DIR[DTC,MRR,VPP,2N,DNV]}"
+#  data: "intel-dnv-vpp"
+#  filter: "'MRR'"
+#  parameters:
+#  - "name"
+#  - "doc"
+#  - "level"
+#  - "parent"
+#  data-start-level: 3
 
 # VPP Functional Results - Ubuntu
 
 # VPP Functional Results - Ubuntu
--
-  type: "file"
+- type: "file"
   title: "VPP Functional Results - Ubuntu"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
   title: "VPP Functional Results - Ubuntu"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
@@ -4531,8 +4344,7 @@
   data-start-level: 3
 
 # VPP Functional Results - CentOS
   data-start-level: 3
 
 # VPP Functional Results - CentOS
--
-  type: "file"
+- type: "file"
   title: "VPP Functional Results - CentOS"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
   title: "VPP Functional Results - CentOS"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
@@ -4550,8 +4362,7 @@
   data-start-level: 3
 
 # VPP Functional Configuration - Ubuntu
   data-start-level: 3
 
 # VPP Functional Configuration - Ubuntu
--
-  type: "file"
+- type: "file"
   title: "VPP Functional Configuration - Ubuntu"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
   title: "VPP Functional Configuration - Ubuntu"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
@@ -4568,8 +4379,7 @@
   data-start-level: 3
 
 # VPP Functional Configuration - CentOS
   data-start-level: 3
 
 # VPP Functional Configuration - CentOS
--
-  type: "file"
+- type: "file"
   title: "VPP Functional Configuration - CentOS"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
   title: "VPP Functional Configuration - CentOS"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
@@ -4587,8 +4397,7 @@
   data-start-level: 3
 
 # VPP Device Results - Ubuntu
   data-start-level: 3
 
 # VPP Device Results - Ubuntu
--
-  type: "file"
+- type: "file"
   title: "VPP Device Results - Ubuntu"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
   title: "VPP Device Results - Ubuntu"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
@@ -4605,8 +4414,7 @@
   data-start-level: 2
 
 # VPP Device Configuration - Ubuntu
   data-start-level: 2
 
 # VPP Device Configuration - Ubuntu
--
-  type: "file"
+- type: "file"
   title: "VPP Device Configuration - Ubuntu"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
   title: "VPP Device Configuration - Ubuntu"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
@@ -4622,27 +4430,25 @@
   - "parent"
   data-start-level: 2
 
   - "parent"
   data-start-level: 2
 
-# Container Orchestrated Performance Results 3n-hsw
--
-  type: "file"
-  title: "Container Orchestrated Performance Results 3n-hsw"
-  algorithm: "file_test_results"
-  output-file-ext: ".rst"
-  output-file: "{DIR[DTR,PERF,COT,3N,HSW]}/cot_performance_results_3n_hsw"
-  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
-  dir-tables: "{DIR[DTR,PERF,COT,3N,HSW]}"
-  data: "ligato-perf-results-3n-hsw"
-  filter: "all"
-  parameters:
-  - "name"
-  - "doc"
-  - "level"
-  - "parent"
-  data-start-level: 3
+## Container Orchestrated Performance Results 3n-hsw
+#- type: "file"
+#  title: "Container Orchestrated Performance Results 3n-hsw"
+#  algorithm: "file_test_results"
+#  output-file-ext: ".rst"
+#  output-file: "{DIR[DTR,PERF,COT,3N,HSW]}/cot_performance_results_3n_hsw"
+#  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
+#  dir-tables: "{DIR[DTR,PERF,COT,3N,HSW]}"
+#  data: "ligato-perf-results-3n-hsw"
+#  filter: "all"
+#  parameters:
+#  - "name"
+#  - "doc"
+#  - "level"
+#  - "parent"
+#  data-start-level: 3
 
 # DPDK Performance Results 3n-hsw
 
 # DPDK Performance Results 3n-hsw
--
-  type: "file"
+- type: "file"
   title: "DPDK Performance Results 3n-hsw"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
   title: "DPDK Performance Results 3n-hsw"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
@@ -4659,8 +4465,7 @@
   data-start-level: 3
 
 # DPDK Performance Results 3n-skx
   data-start-level: 3
 
 # DPDK Performance Results 3n-skx
--
-  type: "file"
+- type: "file"
   title: "DPDK Performance Results 3n-skx"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
   title: "DPDK Performance Results 3n-skx"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
@@ -4677,8 +4482,7 @@
   data-start-level: 3
 
 # DPDK Performance Results 2n-skx
   data-start-level: 3
 
 # DPDK Performance Results 2n-skx
--
-  type: "file"
+- type: "file"
   title: "DPDK Performance Results 2n-skx"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
   title: "DPDK Performance Results 2n-skx"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
@@ -4695,8 +4499,7 @@
   data-start-level: 3
 
 # Honeycomb Functional Results
   data-start-level: 3
 
 # Honeycomb Functional Results
--
-  type: "file"
+- type: "file"
   title: "Honeycomb Functional Results"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
   title: "Honeycomb Functional Results"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
@@ -4714,27 +4517,26 @@
   data-start-level: 3
 
 # NSH SFC Functional Results
   data-start-level: 3
 
 # NSH SFC Functional Results
--
-  type: "file"
-  title: "NSH SFC Functional Results"
-  algorithm: "file_test_results"
-  output-file-ext: ".rst"
-  output-file: "{DIR[DTR,FUNC,NSHSFC]}/nshsfc_functional_results"
-  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
-  dir-tables: "{DIR[DTR,FUNC,NSHSFC]}"
-  data:
-    "nsh-func-results"
-  filter: "all"
-  parameters:
-  - "name"
-  - "doc"
-  - "level"
-  - "parent"
-  data-start-level: 3
+#-
+#  type: "file"
+#  title: "NSH SFC Functional Results"
+#  algorithm: "file_test_results"
+#  output-file-ext: ".rst"
+#  output-file: "{DIR[DTR,FUNC,NSHSFC]}/nshsfc_functional_results"
+#  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
+#  dir-tables: "{DIR[DTR,FUNC,NSHSFC]}"
+#  data:
+#    "nsh-func-results"
+#  filter: "all"
+#  parameters:
+#  - "name"
+#  - "doc"
+#  - "level"
+#  - "parent"
+#  data-start-level: 3
 
 # DMM Functional Results
 
 # DMM Functional Results
--
-  type: "file"
+- type: "file"
   title: "DMM Functional Results"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
   title: "DMM Functional Results"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
@@ -4756,70 +4558,71 @@
 ################################################################################
 
 # Soak test - 30min Soak Test (PLRsearch), boxes
 ################################################################################
 
 # Soak test - 30min Soak Test (PLRsearch), boxes
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: 30min Soak Test (PLRsearch) boxes"
   title: "VPP Throughput: 30min Soak Test (PLRsearch) boxes"
-  algorithm: "plot_soak_boxes"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/example-soak-boxes"
+  output-file: "{DIR[STATIC,VPP]}/soak-test-1"
   data: "plot-vpp-soak-2n-skx"
   data: "plot-vpp-soak-2n-skx"
-  filter: "'SOAK'"
+  filter: "('L2BDMACLRN' or 'L2PATCH' or 'L2XCBASE') and not 'VHOST' and not 'MEMIF'"
   parameters:
   parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
+    - "throughput"
+    - "parent"
+    - "tags"
   sort:
   sort:
-  - "L2PATCH"
-#  - "L2XCBASE"
-#  - "L2BDMACLRN"
-#  - "IP4FWD"
-#  - "IP6FWD"
-  - "VHOST"
+    - "DRV_AVF"
+    - "DRV_AVF"
+    - "DRV_AVF"
+    - "L2PATCH"
+    - "L2BDMACLRN"
+    - "L2XCBASE"
   layout:
     title: "30min Soak Test (PLRsearch)"
     layout: "plot-soak-throughput"
 
   layout:
     title: "30min Soak Test (PLRsearch)"
     layout: "plot-soak-throughput"
 
-# Soak test - example, not used
--
-  type: "plot"
-  title: "VPP Throughput: 30min Soak Test (PLRsearch) bars"
-  algorithm: "plot_soak_bars"
+# Soak test - 30min Soak Test (PLRsearch), boxes
+- type: "plot"
+  title: "VPP Throughput: 30min Soak Test (PLRsearch) boxes"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/example-soak-bars"
+  output-file: "{DIR[STATIC,VPP]}/soak-test-2"
   data: "plot-vpp-soak-2n-skx"
   data: "plot-vpp-soak-2n-skx"
-  filter: "'SOAK'"
+  filter: "'L2BDMACLRN' and ('VHOST' or 'MEMIF') or 'IP4BASE' or 'IP6BASE'"
   parameters:
   parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
+    - "throughput"
+    - "parent"
+    - "tags"
   sort:
   sort:
-  - "L2PATCH"
-#  - "L2XCBASE"
-#  - "L2BDMACLRN"
-#  - "IP4FWD"
-#  - "IP6FWD"
-  - "VHOST"
+    - "VHOST"
+    - "MEMIF"
+    - "IP4FWD"
+    - "IP6FWD"
   layout:
     title: "30min Soak Test (PLRsearch)"
     layout: "plot-soak-throughput"
 
 ################################################################################
   layout:
     title: "30min Soak Test (PLRsearch)"
     layout: "plot-soak-throughput"
 
 ################################################################################
-# Plots - NF Density - VSC
-
--
-  type: "plot"
-  title: "Packet Throughput: 64B-1c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-mrr"
-  algorithm: "plot_service_density_heatmap"
+# Plots - NF Density - VSC - MRR 64b
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
+  algorithm: "plot_service_density_heatmap_compare"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-vsc-mrr"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-vsc-mrr"
-  data: "plot-vpp-nfv-2n-skx-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr-64b"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
-           'VM' and
+           'VHOST' and
            'CHAIN' and
            'CHAIN' and
+           'NF_VPPIP4' and
            '64B' and
            '2T1C' and
            'MRR'"
            '64B' and
            '2T1C' and
            'MRR'"
+  reference:
+    include: "2"
+    name: "VNF-1c"
+  compare:
+    include: "1"
+    name: "VNF-0.5c"
   parameters:
   - "result"
   - "name"
   parameters:
   - "result"
   - "name"
@@ -4829,23 +4632,61 @@
   y-axis: "Y = Number of Service Chains"
   z-axis: "64B Packet Throughput (mean MRR) [Mpps]"
   layout:
   y-axis: "Y = Number of Service Chains"
   z-axis: "64B Packet Throughput (mean MRR) [Mpps]"
   layout:
-    title: "<b>Throughput:</b> eth-l2bd-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-mrr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
     layout: "plot-service-density"
 
     layout: "plot-service-density"
 
--
-  type: "plot"
-  title: "Packet Throughput: 64B-2c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-mrr"
-  algorithm: "plot_service_density_heatmap"
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
+  algorithm: "plot_service_density_heatmap_compare"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-vsc-mrr"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-vsc-mrr"
-  data: "plot-vpp-nfv-2n-skx-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr-64b"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
-           'VM' and
+           'VHOST' and
            'CHAIN' and
            'CHAIN' and
+           'NF_VPPIP4' and
            '64B' and
            '4T2C' and
            'MRR'"
            '64B' and
            '4T2C' and
            'MRR'"
+  reference:
+    include: "2"
+    name: "VNF-1c"
+  compare:
+    include: "1"
+    name: "VNF-0.5c"
+  parameters:
+  - "result"
+  - "name"
+  - "tags"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = VNFs 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-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
+  algorithm: "plot_service_density_heatmap_compare"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-8t4c-base-vsc-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr-64b"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'VHOST' and
+           'CHAIN' and
+           'NF_VPPIP4' and
+           '64B' and
+           '8T4C' and
+           'MRR'"
+  reference:
+    include: "2"
+    name: "VNF-1c"
+  compare:
+    include: "1"
+    name: "VNF-0.5c"
   parameters:
   - "result"
   - "name"
   parameters:
   - "result"
   - "name"
@@ -4855,23 +4696,30 @@
   y-axis: "Y = Number of Service Chains"
   z-axis: "64B Packet Throughput (mean MRR) [Mpps]"
   layout:
   y-axis: "Y = Number of Service Chains"
   z-axis: "64B Packet Throughput (mean MRR) [Mpps]"
   layout:
-    title: "<b>Throughput:</b> eth-l2bd-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-mrr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
     layout: "plot-service-density"
 
     layout: "plot-service-density"
 
--
-  type: "plot"
-  title: "Packet Throughput: IMIX-1c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-mrr"
-  algorithm: "plot_service_density_heatmap"
+# Plots - NF Density - VSC - MRR IMIX
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
+  algorithm: "plot_service_density_heatmap_compare"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-vsc-mrr"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-vsc-mrr"
-  data: "plot-vpp-nfv-2n-skx-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr-imix"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
-           'VM' and
+           'VHOST' and
            'CHAIN' and
            'CHAIN' and
+           'NF_VPPIP4' and
            'IMIX' and
            '2T1C' and
            'MRR'"
            'IMIX' and
            '2T1C' and
            'MRR'"
+  reference:
+    include: "2"
+    name: "VNF-1c"
+  compare:
+    include: "1"
+    name: "VNF-0.5c"
   parameters:
   - "result"
   - "name"
   parameters:
   - "result"
   - "name"
@@ -4881,23 +4729,61 @@
   y-axis: "Y = Number of Service Chains"
   z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
   layout:
   y-axis: "Y = Number of Service Chains"
   z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
   layout:
-    title: "<b>Throughput:</b> eth-l2bd-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-mrr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
     layout: "plot-service-density"
 
     layout: "plot-service-density"
 
--
-  type: "plot"
-  title: "Packet Throughput: IMIX-2c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-mrr"
-  algorithm: "plot_service_density_heatmap"
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
+  algorithm: "plot_service_density_heatmap_compare"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-vsc-mrr"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-vsc-mrr"
-  data: "plot-vpp-nfv-2n-skx-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr-imix"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
-           'VM' and
+           'VHOST' and
            'CHAIN' and
            'CHAIN' and
+           'NF_VPPIP4' and
            'IMIX' and
            '4T2C' and
            'MRR'"
            'IMIX' and
            '4T2C' and
            'MRR'"
+  reference:
+    include: "2"
+    name: "VNF-1c"
+  compare:
+    include: "1"
+    name: "VNF-0.5c"
+  parameters:
+  - "result"
+  - "name"
+  - "tags"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = VNFs 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-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
+  algorithm: "plot_service_density_heatmap_compare"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-8t4c-base-vsc-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr-imix"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'VHOST' and
+           'CHAIN' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '8T4C' and
+           'MRR'"
+  reference:
+    include: "2"
+    name: "VNF-1c"
+  compare:
+    include: "1"
+    name: "VNF-0.5c"
   parameters:
   - "result"
   - "name"
   parameters:
   - "result"
   - "name"
@@ -4907,23 +4793,30 @@
   y-axis: "Y = Number of Service Chains"
   z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
   layout:
   y-axis: "Y = Number of Service Chains"
   z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
   layout:
-    title: "<b>Throughput:</b> eth-l2bd-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-mrr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
     layout: "plot-service-density"
 
     layout: "plot-service-density"
 
--
-  type: "plot"
-  title: "Packet Throughput: 64B-1c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-ndr"
-  algorithm: "plot_service_density_heatmap"
+# Plots - NF Density - VSC - NDR 64b
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-ndr"
+  algorithm: "plot_service_density_heatmap_compare"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-vsc-ndr"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-vsc-ndr"
-  data: "plot-vpp-nfv-2n-skx"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr-64b"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
-           'VM' and
+           'VHOST' and
            'CHAIN' and
            'CHAIN' and
+           'NF_VPPIP4' and
            '64B' and
            '2T1C' and
            'NDRPDR'"
            '64B' and
            '2T1C' and
            'NDRPDR'"
+  reference:
+    include: "2"
+    name: "VNF-1c"
+  compare:
+    include: "1"
+    name: "VNF-0.5c"
   parameters:
   - "throughput"
   - "name"
   parameters:
   - "throughput"
   - "name"
@@ -4933,23 +4826,61 @@
   y-axis: "Y = Number of Service Chains"
   z-axis: "64B Packet Throughput (mean NDR) [Mpps]"
   layout:
   y-axis: "Y = Number of Service Chains"
   z-axis: "64B Packet Throughput (mean NDR) [Mpps]"
   layout:
-    title: "<b>Throughput:</b> eth-l2bd-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-ndr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-ndr"
     layout: "plot-service-density"
 
     layout: "plot-service-density"
 
--
-  type: "plot"
-  title: "Packet Throughput: 64B-2c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-ndr"
-  algorithm: "plot_service_density_heatmap"
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-ndr"
+  algorithm: "plot_service_density_heatmap_compare"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-vsc-ndr"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-vsc-ndr"
-  data: "plot-vpp-nfv-2n-skx"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr-64b"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
-           'VM' and
+           'VHOST' and
            'CHAIN' and
            'CHAIN' and
+           'NF_VPPIP4' and
            '64B' and
            '4T2C' and
            'NDRPDR'"
            '64B' and
            '4T2C' and
            'NDRPDR'"
+  reference:
+    include: "2"
+    name: "VNF-1c"
+  compare:
+    include: "1"
+    name: "VNF-0.5c"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  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-{Y}ch-{2XY}vh-{XY}vm-vppip4-ndr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-ndr"
+  algorithm: "plot_service_density_heatmap_compare"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-8t4c-base-vsc-ndr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr-64b"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'VHOST' and
+           'CHAIN' and
+           'NF_VPPIP4' and
+           '64B' and
+           '8T4C' and
+           'NDRPDR'"
+  reference:
+    include: "2"
+    name: "VNF-1c"
+  compare:
+    include: "1"
+    name: "VNF-0.5c"
   parameters:
   - "throughput"
   - "name"
   parameters:
   - "throughput"
   - "name"
@@ -4959,23 +4890,30 @@
   y-axis: "Y = Number of Service Chains"
   z-axis: "64B Packet Throughput (mean NDR) [Mpps]"
   layout:
   y-axis: "Y = Number of Service Chains"
   z-axis: "64B Packet Throughput (mean NDR) [Mpps]"
   layout:
-    title: "<b>Throughput:</b> eth-l2bd-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-ndr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-ndr"
     layout: "plot-service-density"
 
     layout: "plot-service-density"
 
--
-  type: "plot"
-  title: "Packet Throughput: IMIX-1c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-ndr"
-  algorithm: "plot_service_density_heatmap"
+# Plots - NF Density - VSC - NDR IMIX
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-ndr"
+  algorithm: "plot_service_density_heatmap_compare"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-vsc-ndr"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-vsc-ndr"
-  data: "plot-vpp-nfv-2n-skx"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr-imix"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
-           'VM' and
+           'VHOST' and
            'CHAIN' and
            'CHAIN' and
+           'NF_VPPIP4' and
            'IMIX' and
            '2T1C' and
            'NDRPDR'"
            'IMIX' and
            '2T1C' and
            'NDRPDR'"
+  reference:
+    include: "2"
+    name: "VNF-1c"
+  compare:
+    include: "1"
+    name: "VNF-0.5c"
   parameters:
   - "throughput"
   - "name"
   parameters:
   - "throughput"
   - "name"
@@ -4985,23 +4923,61 @@
   y-axis: "Y = Number of Service Chains"
   z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
   layout:
   y-axis: "Y = Number of Service Chains"
   z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
   layout:
-    title: "<b>Throughput:</b> eth-l2bd-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-ndr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-ndr"
     layout: "plot-service-density"
 
     layout: "plot-service-density"
 
--
-  type: "plot"
-  title: "Packet Throughput: IMIX-2c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-ndr"
-  algorithm: "plot_service_density_heatmap"
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-ndr"
+  algorithm: "plot_service_density_heatmap_compare"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-vsc-ndr"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-vsc-ndr"
-  data: "plot-vpp-nfv-2n-skx"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr-imix"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
-           'VM' and
+           'VHOST' and
            'CHAIN' and
            'CHAIN' and
+           'NF_VPPIP4' and
            'IMIX' and
            '4T2C' and
            'NDRPDR'"
            'IMIX' and
            '4T2C' and
            'NDRPDR'"
+  reference:
+    include: "2"
+    name: "VNF-1c"
+  compare:
+    include: "1"
+    name: "VNF-0.5c"
+  parameters:
+  - "throughput"
+  - "name"
+  - "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: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-ndr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-ndr"
+  algorithm: "plot_service_density_heatmap_compare"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-8t4c-base-vsc-ndr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr-imix"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'VHOST' and
+           'CHAIN' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '8T4C' and
+           'NDRPDR'"
+  reference:
+    include: "2"
+    name: "VNF-1c"
+  compare:
+    include: "1"
+    name: "VNF-0.5c"
   parameters:
   - "throughput"
   - "name"
   parameters:
   - "throughput"
   - "name"
@@ -5011,23 +4987,94 @@
   y-axis: "Y = Number of Service Chains"
   z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
   layout:
   y-axis: "Y = Number of Service Chains"
   z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
   layout:
-    title: "<b>Throughput:</b> eth-l2bd-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-ndr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-ndr"
     layout: "plot-service-density"
 
     layout: "plot-service-density"
 
--
-  type: "plot"
-  title: "Packet Throughput: 64B-1c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-pdr"
-  algorithm: "plot_service_density_heatmap"
+# Plots - NF Density - VSC - PDR 64b
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-pdr"
+  algorithm: "plot_service_density_heatmap_compare"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-vsc-pdr"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-vsc-pdr"
-  data: "plot-vpp-nfv-2n-skx"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr-64b"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
-           'VM' and
+           'VHOST' and
            'CHAIN' and
            'CHAIN' and
+           'NF_VPPIP4' and
            '64B' and
            '2T1C' and
            'NDRPDR'"
            '64B' and
            '2T1C' and
            'NDRPDR'"
+  reference:
+    include: "2"
+    name: "VNF-1c"
+  compare:
+    include: "1"
+    name: "VNF-0.5c"
+  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-{Y}ch-{2XY}vh-{XY}vm-vppip4-pdr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-pdr"
+  algorithm: "plot_service_density_heatmap_compare"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-vsc-pdr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr-64b"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'VHOST' and
+           'CHAIN' and
+           'NF_VPPIP4' and
+           '64B' and
+           '4T2C' and
+           'NDRPDR'"
+  reference:
+    include: "2"
+    name: "VNF-1c"
+  compare:
+    include: "1"
+    name: "VNF-0.5c"
+  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-{Y}ch-{2XY}vh-{XY}vm-vppip4-pdr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-pdr"
+  algorithm: "plot_service_density_heatmap_compare"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-8t4c-base-vsc-pdr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr-64b"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'VHOST' and
+           'CHAIN' and
+           'NF_VPPIP4' and
+           '64B' and
+           '8T4C' and
+           'NDRPDR'"
+  reference:
+    include: "2"
+    name: "VNF-1c"
+  compare:
+    include: "1"
+    name: "VNF-0.5c"
   parameters:
   - "throughput"
   - "name"
   parameters:
   - "throughput"
   - "name"
@@ -5037,23 +5084,30 @@
   y-axis: "Y = Number of Service Chains"
   z-axis: "64B Packet Throughput (mean PDR) [Mpps]"
   layout:
   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"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-pdr"
     layout: "plot-service-density"
 
     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"
+# Plots - NF Density - VSC - PDR IMIX
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-pdr"
+  algorithm: "plot_service_density_heatmap_compare"
   output-file-type: ".html"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-vsc-pdr"
-  data: "plot-vpp-nfv-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-vsc-pdr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr-imix"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
-           'VM' and
+           'VHOST' and
            'CHAIN' and
            'CHAIN' and
-           '64B' and
-           '4T2C' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '2T1C' and
            'NDRPDR'"
            'NDRPDR'"
+  reference:
+    include: "2"
+    name: "VNF-1c"
+  compare:
+    include: "1"
+    name: "VNF-0.5c"
   parameters:
   - "throughput"
   - "name"
   parameters:
   - "throughput"
   - "name"
@@ -5061,25 +5115,31 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   x-axis: "X = VNFs per Service Chain"
   y-axis: "Y = Number of Service Chains"
   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]"
+  z-axis: "IMIX Packet Throughput (mean PDR) [Mpps]"
   layout:
   layout:
-    title: "<b>Throughput:</b> eth-l2bd-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-pdr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-pdr"
     layout: "plot-service-density"
 
     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"
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-pdr"
+  algorithm: "plot_service_density_heatmap_compare"
   output-file-type: ".html"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-vsc-pdr"
-  data: "plot-vpp-nfv-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-vsc-pdr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr-imix"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
-           'VM' and
+           'VHOST' and
            'CHAIN' and
            'CHAIN' and
+           'NF_VPPIP4' and
            'IMIX' and
            'IMIX' and
-           '2T1C' and
+           '4T2C' and
            'NDRPDR'"
            'NDRPDR'"
+  reference:
+    include: "2"
+    name: "VNF-1c"
+  compare:
+    include: "1"
+    name: "VNF-0.5c"
   parameters:
   - "throughput"
   - "name"
   parameters:
   - "throughput"
   - "name"
@@ -5089,23 +5149,29 @@
   y-axis: "Y = Number of Service Chains"
   z-axis: "IMIX Packet Throughput (mean PDR) [Mpps]"
   layout:
   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"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-pdr"
     layout: "plot-service-density"
 
     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"
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-pdr"
+  algorithm: "plot_service_density_heatmap_compare"
   output-file-type: ".html"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-vsc-pdr"
-  data: "plot-vpp-nfv-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-8t4c-base-vsc-pdr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr-imix"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
-           'VM' and
+           'VHOST' and
            'CHAIN' and
            'CHAIN' and
+           'NF_VPPIP4' and
            'IMIX' and
            'IMIX' and
-           '4T2C' and
+           '8T4C' and
            'NDRPDR'"
            'NDRPDR'"
+  reference:
+    include: "2"
+    name: "VNF-1c"
+  compare:
+    include: "1"
+    name: "VNF-0.5c"
   parameters:
   - "throughput"
   - "name"
   parameters:
   - "throughput"
   - "name"
@@ -5115,26 +5181,31 @@
   y-axis: "Y = Number of Service Chains"
   z-axis: "IMIX Packet Throughput (mean PDR) [Mpps]"
   layout:
   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"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-pdr"
     layout: "plot-service-density"
 
 ################################################################################
     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"
+# Plots - NF Density - CSC - MRR 64b
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
+  algorithm: "plot_service_density_heatmap_compare"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-csc-mrr"
   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"
+  data: "plot-vpp-nfv-2n-skx-mrr-64b"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'CHAIN' and
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'CHAIN' and
+           'NF_VPPIP4' and
            '64B' and
            '2T1C' and
            'MRR'"
            '64B' and
            '2T1C' and
            'MRR'"
+  reference:
+    include: "2"
+    name: "CNF-1c"
+  compare:
+    include: "1"
+    name: "CNF-0.5c"
   parameters:
   - "result"
   - "name"
   parameters:
   - "result"
   - "name"
@@ -5144,23 +5215,61 @@
   y-axis: "Y = Number of Service Chains"
   z-axis: "64B Packet Throughput (mean MRR) [Mpps]"
   layout:
   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"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
     layout: "plot-service-density"
 
     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"
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
+  algorithm: "plot_service_density_heatmap_compare"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-csc-mrr"
   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"
+  data: "plot-vpp-nfv-2n-skx-mrr-64b"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'CHAIN' and
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'CHAIN' and
+           'NF_VPPIP4' and
            '64B' and
            '4T2C' and
            'MRR'"
            '64B' and
            '4T2C' and
            'MRR'"
+  reference:
+    include: "2"
+    name: "CNF-1c"
+  compare:
+    include: "1"
+    name: "CNF-0.5c"
+  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-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
+  algorithm: "plot_service_density_heatmap_compare"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-8t4c-base-csc-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr-64b"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'CHAIN' and
+           'NF_VPPIP4' and
+           '64B' and
+           '8T4C' and
+           'MRR'"
+  reference:
+    include: "2"
+    name: "CNF-1c"
+  compare:
+    include: "1"
+    name: "CNF-0.5c"
   parameters:
   - "result"
   - "name"
   parameters:
   - "result"
   - "name"
@@ -5170,23 +5279,30 @@
   y-axis: "Y = Number of Service Chains"
   z-axis: "64B Packet Throughput (mean MRR) [Mpps]"
   layout:
   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"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
     layout: "plot-service-density"
 
     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"
+# Plots - NF Density - CSC - MRR IMIX
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
+  algorithm: "plot_service_density_heatmap_compare"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-csc-mrr"
   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"
+  data: "plot-vpp-nfv-2n-skx-mrr-imix"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'CHAIN' and
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'CHAIN' and
+           'NF_VPPIP4' and
            'IMIX' and
            '2T1C' and
            'MRR'"
            'IMIX' and
            '2T1C' and
            'MRR'"
+  reference:
+    include: "2"
+    name: "CNF-1c"
+  compare:
+    include: "1"
+    name: "CNF-0.5c"
   parameters:
   - "result"
   - "name"
   parameters:
   - "result"
   - "name"
@@ -5196,23 +5312,61 @@
   y-axis: "Y = Number of Service Chains"
   z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
   layout:
   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"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
     layout: "plot-service-density"
 
     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"
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
+  algorithm: "plot_service_density_heatmap_compare"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-csc-mrr"
   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"
+  data: "plot-vpp-nfv-2n-skx-mrr-imix"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'CHAIN' and
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'CHAIN' and
+           'NF_VPPIP4' and
            'IMIX' and
            '4T2C' and
            'MRR'"
            'IMIX' and
            '4T2C' and
            'MRR'"
+  reference:
+    include: "2"
+    name: "CNF-1c"
+  compare:
+    include: "1"
+    name: "CNF-0.5c"
+  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-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
+  algorithm: "plot_service_density_heatmap_compare"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-8t4c-base-csc-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr-imix"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'CHAIN' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '8T4C' and
+           'MRR'"
+  reference:
+    include: "2"
+    name: "CNF-1c"
+  compare:
+    include: "1"
+    name: "CNF-0.5c"
   parameters:
   - "result"
   - "name"
   parameters:
   - "result"
   - "name"
@@ -5222,23 +5376,30 @@
   y-axis: "Y = Number of Service Chains"
   z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
   layout:
   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"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
     layout: "plot-service-density"
 
     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"
+# Plots - NF Density - CSC - NDR 64b
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-ndr"
+  algorithm: "plot_service_density_heatmap_compare"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-csc-ndr"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-csc-ndr"
-  data: "plot-vpp-nfv-2n-skx"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr-64b"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'CHAIN' and
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'CHAIN' and
+           'NF_VPPIP4' and
            '64B' and
            '2T1C' and
            'NDRPDR'"
            '64B' and
            '2T1C' and
            'NDRPDR'"
+  reference:
+    include: "2"
+    name: "CNF-1c"
+  compare:
+    include: "1"
+    name: "CNF-0.5c"
   parameters:
   - "throughput"
   - "name"
   parameters:
   - "throughput"
   - "name"
@@ -5248,23 +5409,61 @@
   y-axis: "Y = Number of Service Chains"
   z-axis: "64B Packet Throughput (mean NDR) [Mpps]"
   layout:
   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"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-ndr"
     layout: "plot-service-density"
 
     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"
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-ndr"
+  algorithm: "plot_service_density_heatmap_compare"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-csc-ndr"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-csc-ndr"
-  data: "plot-vpp-nfv-2n-skx"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr-64b"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'CHAIN' and
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'CHAIN' and
+           'NF_VPPIP4' and
            '64B' and
            '4T2C' and
            'NDRPDR'"
            '64B' and
            '4T2C' and
            'NDRPDR'"
+  reference:
+    include: "2"
+    name: "CNF-1c"
+  compare:
+    include: "1"
+    name: "CNF-0.5c"
+  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-{Y}ch-{2XY}mif-{XY}dcr-vppip4-ndr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-ndr"
+  algorithm: "plot_service_density_heatmap_compare"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-8t4c-base-csc-ndr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr-64b"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'CHAIN' and
+           'NF_VPPIP4' and
+           '64B' and
+           '8T4C' and
+           'NDRPDR'"
+  reference:
+    include: "2"
+    name: "CNF-1c"
+  compare:
+    include: "1"
+    name: "CNF-0.5c"
   parameters:
   - "throughput"
   - "name"
   parameters:
   - "throughput"
   - "name"
@@ -5274,23 +5473,30 @@
   y-axis: "Y = Number of Service Chains"
   z-axis: "64B Packet Throughput (mean NDR) [Mpps]"
   layout:
   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"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-ndr"
     layout: "plot-service-density"
 
     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"
+# Plots - NF Density - CSC - NDR IMIX
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-ndr"
+  algorithm: "plot_service_density_heatmap_compare"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-csc-ndr"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-csc-ndr"
-  data: "plot-vpp-nfv-2n-skx"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr-imix"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'CHAIN' and
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'CHAIN' and
+           'NF_VPPIP4' and
            'IMIX' and
            '2T1C' and
            'NDRPDR'"
            'IMIX' and
            '2T1C' and
            'NDRPDR'"
+  reference:
+    include: "2"
+    name: "CNF-1c"
+  compare:
+    include: "1"
+    name: "CNF-0.5c"
   parameters:
   - "throughput"
   - "name"
   parameters:
   - "throughput"
   - "name"
@@ -5300,23 +5506,61 @@
   y-axis: "Y = Number of Service Chains"
   z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
   layout:
   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"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-ndr"
     layout: "plot-service-density"
 
     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"
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-ndr"
+  algorithm: "plot_service_density_heatmap_compare"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-csc-ndr"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-csc-ndr"
-  data: "plot-vpp-nfv-2n-skx"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr-imix"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'CHAIN' and
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'CHAIN' and
+           'NF_VPPIP4' and
            'IMIX' and
            '4T2C' and
            'NDRPDR'"
            'IMIX' and
            '4T2C' and
            'NDRPDR'"
+  reference:
+    include: "2"
+    name: "CNF-1c"
+  compare:
+    include: "1"
+    name: "CNF-0.5c"
+  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-{Y}ch-{2XY}mif-{XY}dcr-vppip4-ndr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-ndr"
+  algorithm: "plot_service_density_heatmap_compare"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-8t4c-base-csc-ndr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr-imix"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'CHAIN' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '8T4C' and
+           'NDRPDR'"
+  reference:
+    include: "2"
+    name: "CNF-1c"
+  compare:
+    include: "1"
+    name: "CNF-0.5c"
   parameters:
   - "throughput"
   - "name"
   parameters:
   - "throughput"
   - "name"
@@ -5326,23 +5570,30 @@
   y-axis: "Y = Number of Service Chains"
   z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
   layout:
   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"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-ndr"
     layout: "plot-service-density"
 
     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"
+# Plots - NF Density - CSC - PDR 64b
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-pdr"
+  algorithm: "plot_service_density_heatmap_compare"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-csc-pdr"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-csc-pdr"
-  data: "plot-vpp-nfv-2n-skx"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr-64b"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'CHAIN' and
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'CHAIN' and
+           'NF_VPPIP4' and
            '64B' and
            '2T1C' and
            'NDRPDR'"
            '64B' and
            '2T1C' and
            'NDRPDR'"
+  reference:
+    include: "2"
+    name: "CNF-1c"
+  compare:
+    include: "1"
+    name: "CNF-0.5c"
   parameters:
   - "throughput"
   - "name"
   parameters:
   - "throughput"
   - "name"
@@ -5352,23 +5603,61 @@
   y-axis: "Y = Number of Service Chains"
   z-axis: "64B Packet Throughput (mean PDR) [Mpps]"
   layout:
   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"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-pdr"
     layout: "plot-service-density"
 
     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"
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-pdr"
+  algorithm: "plot_service_density_heatmap_compare"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-csc-pdr"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-csc-pdr"
-  data: "plot-vpp-nfv-2n-skx"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr-64b"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'CHAIN' and
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'CHAIN' and
+           'NF_VPPIP4' and
            '64B' and
            '4T2C' and
            'NDRPDR'"
            '64B' and
            '4T2C' and
            'NDRPDR'"
+  reference:
+    include: "2"
+    name: "CNF-1c"
+  compare:
+    include: "1"
+    name: "CNF-0.5c"
+  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-{Y}ch-{2XY}mif-{XY}dcr-vppip4-pdr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-pdr"
+  algorithm: "plot_service_density_heatmap_compare"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-8t4c-base-csc-pdr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr-64b"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'CHAIN' and
+           'NF_VPPIP4' and
+           '64B' and
+           '8T4C' and
+           'NDRPDR'"
+  reference:
+    include: "2"
+    name: "CNF-1c"
+  compare:
+    include: "1"
+    name: "CNF-0.5c"
   parameters:
   - "throughput"
   - "name"
   parameters:
   - "throughput"
   - "name"
@@ -5378,23 +5667,30 @@
   y-axis: "Y = Number of Service Chains"
   z-axis: "64B Packet Throughput (mean PDR) [Mpps]"
   layout:
   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"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-pdr"
     layout: "plot-service-density"
 
     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"
+# Plots - NF Density - CSC - PDR IMIX
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-pdr"
+  algorithm: "plot_service_density_heatmap_compare"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-csc-pdr"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-csc-pdr"
-  data: "plot-vpp-nfv-2n-skx"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr-imix"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'CHAIN' and
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'CHAIN' and
+           'NF_VPPIP4' and
            'IMIX' and
            '2T1C' and
            'NDRPDR'"
            'IMIX' and
            '2T1C' and
            'NDRPDR'"
+  reference:
+    include: "2"
+    name: "CNF-1c"
+  compare:
+    include: "1"
+    name: "CNF-0.5c"
   parameters:
   - "throughput"
   - "name"
   parameters:
   - "throughput"
   - "name"
@@ -5404,23 +5700,29 @@
   y-axis: "Y = Number of Service Chains"
   z-axis: "IMIX Packet Throughput (mean PDR) [Mpps]"
   layout:
   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"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-pdr"
     layout: "plot-service-density"
 
     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"
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-pdr"
+  algorithm: "plot_service_density_heatmap_compare"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-csc-pdr"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-csc-pdr"
-  data: "plot-vpp-nfv-2n-skx"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr-imix"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'CHAIN' and
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'CHAIN' and
+           'NF_VPPIP4' and
            'IMIX' and
            '4T2C' and
            'NDRPDR'"
            'IMIX' and
            '4T2C' and
            'NDRPDR'"
+  reference:
+    include: "2"
+    name: "CNF-1c"
+  compare:
+    include: "1"
+    name: "CNF-0.5c"
   parameters:
   - "throughput"
   - "name"
   parameters:
   - "throughput"
   - "name"
@@ -5430,26 +5732,63 @@
   y-axis: "Y = Number of Service Chains"
   z-axis: "IMIX Packet Throughput (mean PDR) [Mpps]"
   layout:
   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"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-pdr"
     layout: "plot-service-density"
 
     layout: "plot-service-density"
 
-################################################################################
-# Plots - NF Density - CSP
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-pdr"
+  algorithm: "plot_service_density_heatmap_compare"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-8t4c-base-csc-pdr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr-imix"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'CHAIN' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '8T4C' and
+           'NDRPDR'"
+  reference:
+    include: "2"
+    name: "CNF-1c"
+  compare:
+    include: "1"
+    name: "CNF-0.5c"
+  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-{Y}ch-{2XY}mif-{XY}dcr-vppip4-pdr"
+    layout: "plot-service-density"
 
 
--
-  type: "plot"
-  title: "Packet Throughput: 64B-1c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-mrr"
-  algorithm: "plot_service_density_heatmap"
+################################################################################
+# Plots - NF Density - CSP - MRR 64b
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
+  algorithm: "plot_service_density_heatmap_compare"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-csp-mrr"
   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"
+  data: "plot-vpp-nfv-2n-skx-mrr-64b"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'PIPELINE' and
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'PIPELINE' and
+           'NF_VPPIP4' and
            '64B' and
            '2T1C' and
            'MRR'"
            '64B' and
            '2T1C' and
            'MRR'"
+  reference:
+    include: "2"
+    name: "CNF-1c"
+  compare:
+    include: "1"
+    name: "CNF-0.5c"
   parameters:
   - "result"
   - "name"
   parameters:
   - "result"
   - "name"
@@ -5459,23 +5798,61 @@
   y-axis: "Y = Number of Service Pipelines"
   z-axis: "64B Packet Throughput (mean MRR) [Mpps]"
   layout:
   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"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
     layout: "plot-service-density"
 
     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"
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
+  algorithm: "plot_service_density_heatmap_compare"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-csp-mrr"
   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"
+  data: "plot-vpp-nfv-2n-skx-mrr-64b"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'PIPELINE' and
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'PIPELINE' and
+           'NF_VPPIP4' and
            '64B' and
            '4T2C' and
            'MRR'"
            '64B' and
            '4T2C' and
            'MRR'"
+  reference:
+    include: "2"
+    name: "CNF-1c"
+  compare:
+    include: "1"
+    name: "CNF-0.5c"
+  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-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
+  algorithm: "plot_service_density_heatmap_compare"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-8t4c-base-csp-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr-64b"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           'NF_VPPIP4' and
+           '64B' and
+           '8T4C' and
+           'MRR'"
+  reference:
+    include: "2"
+    name: "CNF-1c"
+  compare:
+    include: "1"
+    name: "CNF-0.5c"
   parameters:
   - "result"
   - "name"
   parameters:
   - "result"
   - "name"
@@ -5485,75 +5862,191 @@
   y-axis: "Y = Number of Service Pipelines"
   z-axis: "64B Packet Throughput (mean MRR) [Mpps]"
   layout:
   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"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
     layout: "plot-service-density"
 
     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"
+# Plots - NF Density - CSP - MRR IMIX
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
+  algorithm: "plot_service_density_heatmap_compare"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-csp-mrr"
   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"
+  data: "plot-vpp-nfv-2n-skx-mrr-imix"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'PIPELINE' and
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'PIPELINE' and
+           'NF_VPPIP4' and
            'IMIX' and
            '2T1C' and
            'MRR'"
            'IMIX' and
            '2T1C' and
            'MRR'"
+  reference:
+    include: "2"
+    name: "CNF-1c"
+  compare:
+    include: "1"
+    name: "CNF-0.5c"
+  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-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
+  algorithm: "plot_service_density_heatmap_compare"
+  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-imix"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '4T2C' and
+           'MRR'"
+  reference:
+    include: "2"
+    name: "CNF-1c"
+  compare:
+    include: "1"
+    name: "CNF-0.5c"
+  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-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
+  algorithm: "plot_service_density_heatmap_compare"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-8t4c-base-csp-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr-imix"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '8T4C' and
+           'MRR'"
+  reference:
+    include: "2"
+    name: "CNF-1c"
+  compare:
+    include: "1"
+    name: "CNF-0.5c"
   parameters:
   - "result"
   - "name"
   - "tags"
   parameters:
   - "result"
   - "name"
   - "tags"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  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-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
+    layout: "plot-service-density"
+
+# Plots - NF Density - CSP - NDR 64b
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
+  algorithm: "plot_service_density_heatmap_compare"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-csp-ndr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr-64b"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           'NF_VPPIP4' and
+           '64B' and
+           '2T1C' and
+           'NDRPDR'"
+  reference:
+    include: "2"
+    name: "CNF-1c"
+  compare:
+    include: "1"
+    name: "CNF-0.5c"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   x-axis: "X = CNFs per Service Pipeline"
   y-axis: "Y = Number of Service Pipelines"
   x-axis: "X = CNFs per Service Pipeline"
   y-axis: "Y = Number of Service Pipelines"
-  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
+  z-axis: "64B Packet Throughput (mean NDR) [Mpps]"
   layout:
   layout:
-    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-mrr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
     layout: "plot-service-density"
 
     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"
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
+  algorithm: "plot_service_density_heatmap_compare"
   output-file-type: ".html"
   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"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-csp-ndr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr-64b"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'PIPELINE' and
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'PIPELINE' and
-           'IMIX' and
+           'NF_VPPIP4' and
+           '64B' and
            '4T2C' and
            '4T2C' and
-           'MRR'"
+           'NDRPDR'"
+  reference:
+    include: "2"
+    name: "CNF-1c"
+  compare:
+    include: "1"
+    name: "CNF-0.5c"
   parameters:
   parameters:
-  - "result"
+  - "throughput"
   - "name"
   - "tags"
   - "name"
   - "tags"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   x-axis: "X = CNFs per Service Pipeline"
   y-axis: "Y = Number of Service Pipelines"
   x-axis: "X = CNFs per Service Pipeline"
   y-axis: "Y = Number of Service Pipelines"
-  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
+  z-axis: "64B Packet Throughput (mean NDR) [Mpps]"
   layout:
   layout:
-    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-mrr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
     layout: "plot-service-density"
 
     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"
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
+  algorithm: "plot_service_density_heatmap_compare"
   output-file-type: ".html"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-csp-ndr"
-  data: "plot-vpp-nfv-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-8t4c-base-csp-ndr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr-64b"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'PIPELINE' and
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'PIPELINE' and
+           'NF_VPPIP4' and
            '64B' and
            '64B' and
-           '2T1C' and
+           '8T4C' and
            'NDRPDR'"
            'NDRPDR'"
+  reference:
+    include: "2"
+    name: "CNF-1c"
+  compare:
+    include: "1"
+    name: "CNF-0.5c"
   parameters:
   - "throughput"
   - "name"
   parameters:
   - "throughput"
   - "name"
@@ -5563,23 +6056,30 @@
   y-axis: "Y = Number of Service Pipelines"
   z-axis: "64B Packet Throughput (mean NDR) [Mpps]"
   layout:
   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"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
     layout: "plot-service-density"
 
     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"
+# Plots - NF Density - CSP - NDR IMIX
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
+  algorithm: "plot_service_density_heatmap_compare"
   output-file-type: ".html"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-csp-ndr"
-  data: "plot-vpp-nfv-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-csp-ndr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr-imix"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'PIPELINE' and
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'PIPELINE' and
-           '64B' and
-           '4T2C' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '2T1C' and
            'NDRPDR'"
            'NDRPDR'"
+  reference:
+    include: "2"
+    name: "CNF-1c"
+  compare:
+    include: "1"
+    name: "CNF-0.5c"
   parameters:
   - "throughput"
   - "name"
   parameters:
   - "throughput"
   - "name"
@@ -5587,25 +6087,31 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   x-axis: "X = CNFs per Service Pipeline"
   y-axis: "Y = Number of Service Pipelines"
   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]"
+  z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
   layout:
   layout:
-    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-ndr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
     layout: "plot-service-density"
 
     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"
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
+  algorithm: "plot_service_density_heatmap_compare"
   output-file-type: ".html"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-csp-ndr"
-  data: "plot-vpp-nfv-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-csp-ndr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr-imix"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'PIPELINE' and
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'PIPELINE' and
+           'NF_VPPIP4' and
            'IMIX' and
            'IMIX' and
-           '2T1C' and
+           '4T2C' and
            'NDRPDR'"
            'NDRPDR'"
+  reference:
+    include: "2"
+    name: "CNF-1c"
+  compare:
+    include: "1"
+    name: "CNF-0.5c"
   parameters:
   - "throughput"
   - "name"
   parameters:
   - "throughput"
   - "name"
@@ -5615,23 +6121,29 @@
   y-axis: "Y = Number of Service Pipelines"
   z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
   layout:
   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"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
     layout: "plot-service-density"
 
     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"
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
+  algorithm: "plot_service_density_heatmap_compare"
   output-file-type: ".html"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-csp-ndr"
-  data: "plot-vpp-nfv-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-8t4c-base-csp-ndr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr-imix"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'PIPELINE' and
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'PIPELINE' and
+           'NF_VPPIP4' and
            'IMIX' and
            'IMIX' and
-           '4T2C' and
+           '8T4C' and
            'NDRPDR'"
            'NDRPDR'"
+  reference:
+    include: "2"
+    name: "CNF-1c"
+  compare:
+    include: "1"
+    name: "CNF-0.5c"
   parameters:
   - "throughput"
   - "name"
   parameters:
   - "throughput"
   - "name"
@@ -5641,23 +6153,30 @@
   y-axis: "Y = Number of Service Pipelines"
   z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
   layout:
   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"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
     layout: "plot-service-density"
 
     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"
+# Plots - NF Density - CSP - PDR 64b
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
+  algorithm: "plot_service_density_heatmap_compare"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-csp-pdr"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-csp-pdr"
-  data: "plot-vpp-nfv-2n-skx"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr-64b"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'PIPELINE' and
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'PIPELINE' and
+           'NF_VPPIP4' and
            '64B' and
            '2T1C' and
            'NDRPDR'"
            '64B' and
            '2T1C' and
            'NDRPDR'"
+  reference:
+    include: "2"
+    name: "CNF-1c"
+  compare:
+    include: "1"
+    name: "CNF-0.5c"
   parameters:
   - "throughput"
   - "name"
   parameters:
   - "throughput"
   - "name"
@@ -5667,23 +6186,61 @@
   y-axis: "Y = Number of Service Pipelines"
   z-axis: "64B Packet Throughput (mean PDR) [Mpps]"
   layout:
   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"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
     layout: "plot-service-density"
 
     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"
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
+  algorithm: "plot_service_density_heatmap_compare"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-csp-pdr"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-csp-pdr"
-  data: "plot-vpp-nfv-2n-skx"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr-64b"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'PIPELINE' and
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'PIPELINE' and
+           'NF_VPPIP4' and
            '64B' and
            '4T2C' and
            'NDRPDR'"
            '64B' and
            '4T2C' and
            'NDRPDR'"
+  reference:
+    include: "2"
+    name: "CNF-1c"
+  compare:
+    include: "1"
+    name: "CNF-0.5c"
+  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-{Y}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
+  algorithm: "plot_service_density_heatmap_compare"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-8t4c-base-csp-pdr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr-64b"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           'NF_VPPIP4' and
+           '64B' and
+           '8T4C' and
+           'NDRPDR'"
+  reference:
+    include: "2"
+    name: "CNF-1c"
+  compare:
+    include: "1"
+    name: "CNF-0.5c"
   parameters:
   - "throughput"
   - "name"
   parameters:
   - "throughput"
   - "name"
@@ -5693,23 +6250,30 @@
   y-axis: "Y = Number of Service Pipelines"
   z-axis: "64B Packet Throughput (mean PDR) [Mpps]"
   layout:
   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"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
     layout: "plot-service-density"
 
     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"
+# Plots - NF Density - CSP - PDR IMIX
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
+  algorithm: "plot_service_density_heatmap_compare"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-csp-pdr"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-csp-pdr"
-  data: "plot-vpp-nfv-2n-skx"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr-imix"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'PIPELINE' and
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'PIPELINE' and
+           'NF_VPPIP4' and
            'IMIX' and
            '2T1C' and
            'NDRPDR'"
            'IMIX' and
            '2T1C' and
            'NDRPDR'"
+  reference:
+    include: "2"
+    name: "CNF-1c"
+  compare:
+    include: "1"
+    name: "CNF-0.5c"
   parameters:
   - "throughput"
   - "name"
   parameters:
   - "throughput"
   - "name"
@@ -5719,23 +6283,29 @@
   y-axis: "Y = Number of Service Pipelines"
   z-axis: "IMIX Packet Throughput (mean PDR) [Mpps]"
   layout:
   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"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
     layout: "plot-service-density"
 
     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"
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
+  algorithm: "plot_service_density_heatmap_compare"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-csp-pdr"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-csp-pdr"
-  data: "plot-vpp-nfv-2n-skx"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr-imix"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'PIPELINE' and
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'PIPELINE' and
+           'NF_VPPIP4' and
            'IMIX' and
            '4T2C' and
            'NDRPDR'"
            'IMIX' and
            '4T2C' and
            'NDRPDR'"
+  reference:
+    include: "2"
+    name: "CNF-1c"
+  compare:
+    include: "1"
+    name: "CNF-0.5c"
   parameters:
   - "throughput"
   - "name"
   parameters:
   - "throughput"
   - "name"
@@ -5745,65 +6315,94 @@
   y-axis: "Y = Number of Service Pipelines"
   z-axis: "IMIX Packet Throughput (mean PDR) [Mpps]"
   layout:
   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"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
     layout: "plot-service-density"
 
     layout: "plot-service-density"
 
-################################################################################
-# Plots VPP HTTP Server Performance
--
-  type: "plot"
-  title: "VPP HTTP Server Performance"
-  algorithm: "plot_http_server_performance_box"
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
+  algorithm: "plot_service_density_heatmap_compare"
   output-file-type: ".html"
   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-8t4c-base-csp-pdr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr-imix"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '8T4C' and
+           'NDRPDR'"
+  reference:
+    include: "2"
+    name: "CNF-1c"
+  compare:
+    include: "1"
+    name: "CNF-0.5c"
   parameters:
   parameters:
-  - "result"
+  - "throughput"
   - "name"
   - "name"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  - "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:
   layout:
-    title: "VPP HTTP Server Performance"
-    layout:
-      "plot-cps"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
+    layout: "plot-service-density"
 
 
--
-  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"
+################################################################################
+## 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
 
 ################################################################################
 
 # Packet Throughput - VPP L2 3n-hsw-x520 base and scale
--
-  type: "plot"
+- 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"
   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"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -5832,13 +6431,12 @@
     title: "l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
     title: "l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
   title: "VPP Throughput: l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -5867,13 +6465,12 @@
     title: "l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
     title: "l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
   title: "VPP Throughput: l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -5902,13 +6499,12 @@
     title: "l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
     title: "l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
   title: "VPP Throughput: l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -5938,13 +6534,12 @@
     layout: "plot-throughput"
 
 # Packet Throughput - VPP L2 3n-hsw-x520 features
     layout: "plot-throughput"
 
 # Packet Throughput - VPP L2 3n-hsw-x520 features
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: l2sw-3n-hsw-x520-64b-1t1c-features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-1t1c-features-ndr"
   title: "VPP Throughput: l2sw-3n-hsw-x520-64b-1t1c-features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-1t1c-features-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
@@ -5970,13 +6565,12 @@
     title: "l2sw-3n-hsw-x520-64b-1t1c-features-ndr"
     layout: "plot-throughput"
 
     title: "l2sw-3n-hsw-x520-64b-1t1c-features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: l2sw-3n-hsw-x520-64b-1t1c-features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-1t1c-features-pdr"
   title: "VPP Throughput: l2sw-3n-hsw-x520-64b-1t1c-features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-1t1c-features-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
@@ -6002,13 +6596,12 @@
     title: "l2sw-3n-hsw-x520-64b-1t1c-features-pdr"
     layout: "plot-throughput"
 
     title: "l2sw-3n-hsw-x520-64b-1t1c-features-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: l2sw-3n-hsw-x520-64b-2t2c-features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-2t2c-features-ndr"
   title: "VPP Throughput: l2sw-3n-hsw-x520-64b-2t2c-features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-2t2c-features-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
@@ -6034,13 +6627,12 @@
     title: "l2sw-3n-hsw-x520-64b-2t2c-features-ndr"
     layout: "plot-throughput"
 
     title: "l2sw-3n-hsw-x520-64b-2t2c-features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: l2sw-3n-hsw-x520-64b-2t2c-features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-2t2c-features-pdr"
   title: "VPP Throughput: l2sw-3n-hsw-x520-64b-2t2c-features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-2t2c-features-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
@@ -6066,435 +6658,389 @@
     title: "l2sw-3n-hsw-x520-64b-2t2c-features-pdr"
     layout: "plot-throughput"
 
     title: "l2sw-3n-hsw-x520-64b-2t2c-features-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - VPP L2 3n-hsw-x710 base and scale
--
-  type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
+# Packet Throughput - VPP L2 3n-hsw-x520 features-iacl
+- type: "plot"
+  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-1t1c-features-iacl-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-1t1c-features-iacl-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
            'NDRPDR' and
-           'ETH' and
            '1T1C' and
            '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'IACL' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
+           not 'MACIP' and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
+    title: "l2sw-3n-hsw-x520-64b-1t1c-features-iacl-ndr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
+- type: "plot"
+  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-1t1c-features-iacl-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-1t1c-features-iacl-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
            'NDRPDR' and
-           'ETH' and
            '1T1C' and
            '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'IACL' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
+           not 'MACIP' and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
+    title: "l2sw-3n-hsw-x520-64b-1t1c-features-iacl-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+- type: "plot"
+  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-2t2c-features-iacl-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-2t2c-features-iacl-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
            'NDRPDR' and
-           'ETH' and
            '2T2C' and
            '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'IACL' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
+           not 'MACIP' and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+    title: "l2sw-3n-hsw-x520-64b-2t2c-features-iacl-ndr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
+- type: "plot"
+  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-2t2c-features-iacl-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-2t2c-features-iacl-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
            'NDRPDR' and
-           'ETH' and
            '2T2C' and
            '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'IACL' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
+           not 'MACIP' and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
+    title: "l2sw-3n-hsw-x520-64b-2t2c-features-iacl-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
-# Packet Throughput - VPP L2 3n-hsw-x710 features
--
-  type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x710-64b-1t1c-features-ndr"
+# Packet Throughput - VPP L2 3n-hsw-x520 features-oacl
+- type: "plot"
+  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-1t1c-features-oacl-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-1t1c-features-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-1t1c-features-oacl-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
            '1T1C' and
            '64B' and
            'NDRPDR' and
            '1T1C' and
-           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
-           not 'ACL' and
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'OACL' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
+           not 'MACIP' and
            not 'VHOST' and
            not 'VHOST' and
-           not 'L2OVRLAY' and
            not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
            not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "L2XCBASE"    # l2xcbase
-  - "L2BDBASE"    # l2bdbase
-  - "L2XCFWD"     # dot1q-l2xcbase
-  - "L2BDMACLRN"  # dot1q-l2bdbase
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-3n-hsw-x710-64b-1t1c-features-ndr"
+    title: "l2sw-3n-hsw-x520-64b-1t1c-features-oacl-ndr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x710-64b-1t1c-features-pdr"
+- type: "plot"
+  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-1t1c-features-oacl-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-1t1c-features-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-1t1c-features-oacl-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
            '1T1C' and
            '64B' and
            'NDRPDR' and
            '1T1C' and
-           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
-           not 'ACL' and
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'OACL' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
+           not 'MACIP' and
            not 'VHOST' and
            not 'VHOST' and
-           not 'L2OVRLAY' and
            not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
            not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "L2XCBASE"    # l2xcbase
-  - "L2BDBASE"    # l2bdbase
-  - "L2XCFWD"     # dot1q-l2xcbase
-  - "L2BDMACLRN"  # dot1q-l2bdbase
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-3n-hsw-x710-64b-1t1c-features-pdr"
+    title: "l2sw-3n-hsw-x520-64b-1t1c-features-oacl-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x710-64b-2t2c-features-ndr"
+- type: "plot"
+  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-2t2c-features-oacl-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-2t2c-features-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-2t2c-features-oacl-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
            '2T2C' and
            '64B' and
            'NDRPDR' and
            '2T2C' and
-           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
-           not 'ACL' and
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'OACL' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
+           not 'MACIP' and
            not 'VHOST' and
            not 'VHOST' and
-           not 'L2OVRLAY' and
            not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
            not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "L2XCBASE"    # l2xcbase
-  - "L2BDBASE"    # l2bdbase
-  - "L2XCFWD"     # dot1q-l2xcbase
-  - "L2BDMACLRN"  # dot1q-l2bdbase
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-3n-hsw-x710-64b-2t2c-features-ndr"
+    title: "l2sw-3n-hsw-x520-64b-2t2c-features-oacl-ndr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x710-64b-2t2c-features-pdr"
+- type: "plot"
+  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-2t2c-features-oacl-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-2t2c-features-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-2t2c-features-oacl-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
            '2T2C' and
            '64B' and
            'NDRPDR' and
            '2T2C' and
-           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
-           not 'ACL' and
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'OACL' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
+           not 'MACIP' and
            not 'VHOST' and
            not 'VHOST' and
-           not 'L2OVRLAY' and
            not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
            not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "L2XCBASE"    # l2xcbase
-  - "L2BDBASE"    # l2bdbase
-  - "L2XCFWD"     # dot1q-l2xcbase
-  - "L2BDMACLRN"  # dot1q-l2bdbase
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-3n-hsw-x710-64b-2t2c-features-pdr"
+    title: "l2sw-3n-hsw-x520-64b-2t2c-features-oacl-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
-# Packet Throughput - VPP L2 3n-hsw-xl710 base and scale
--
-  type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-xl710-64b-1t1c-base-ndr"
+# Packet Throughput - VPP L2 3n-hsw-x520 features-macip
+- type: "plot"
+  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-1t1c-features-macip-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-xl710-64b-1t1c-base-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-1t1c-features-macip-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            '64B' and
-           'BASE' and
            'NDRPDR' and
            'NDRPDR' and
-           'ETH' and
            '1T1C' and
            '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'MACIP' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-3n-hsw-xl710-64b-1t1c-base-ndr"
+    title: "l2sw-3n-hsw-x520-64b-1t1c-features-macip-ndr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-xl710-64b-1t1c-base-pdr"
+- type: "plot"
+  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-1t1c-features-macip-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-xl710-64b-1t1c-base-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-1t1c-features-macip-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            '64B' and
-           'BASE' and
            'NDRPDR' and
            'NDRPDR' and
-           'ETH' and
            '1T1C' and
            '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'MACIP' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-3n-hsw-xl710-64b-1t1c-base-pdr"
+    title: "l2sw-3n-hsw-x520-64b-1t1c-features-macip-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-xl710-64b-2t2c-base-ndr"
+- type: "plot"
+  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-2t2c-features-macip-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-xl710-64b-2t2c-base-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-2t2c-features-macip-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            '64B' and
-           'BASE' and
            'NDRPDR' and
            'NDRPDR' and
-           'ETH' and
            '2T2C' and
            '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'MACIP' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-3n-hsw-xl710-64b-2t2c-base-ndr"
+    title: "l2sw-3n-hsw-x520-64b-2t2c-features-macip-ndr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-xl710-64b-2t2c-base-pdr"
+- type: "plot"
+  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-2t2c-features-macip-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-xl710-64b-2t2c-base-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-2t2c-features-macip-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            '64B' and
-           'BASE' and
            'NDRPDR' and
            'NDRPDR' and
-           'ETH' and
            '2T2C' and
            '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'MACIP' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-3n-hsw-xl710-64b-2t2c-base-pdr"
+    title: "l2sw-3n-hsw-x520-64b-2t2c-features-macip-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
-# Packet Throughput - VPP L2 3n-skx-x710 base and scale
--
-  type: "plot"
-  title: "VPP Throughput: l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+# Packet Throughput - VPP L2 3n-hsw-x710 base and scale
+- type: "plot"
+  title: "VPP Throughput: l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            'ETH' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            'ETH' and
-           '2T1C' and
+           '1T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           not 'MEMIF' and
-           not 'DRV_AVF'"
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   - "L2PATCH"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
   - "FIB_10K"
   - "FIB_100K"
   - "FIB_1M"
   - "FIB_10K"
   - "FIB_100K"
   - "FIB_1M"
@@ -6503,34 +7049,32 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+    title: "l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: l2sw-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
+- type: "plot"
+  title: "VPP Throughput: l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            'ETH' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            'ETH' and
-           '2T1C' and
+           '1T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           not 'MEMIF' and
-           not 'DRV_AVF'"
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   - "L2PATCH"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
   - "FIB_10K"
   - "FIB_100K"
   - "FIB_1M"
   - "FIB_10K"
   - "FIB_100K"
   - "FIB_1M"
@@ -6539,34 +7083,32 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
+    title: "l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
+- type: "plot"
+  title: "VPP Throughput: l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            'ETH' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            'ETH' and
-           '4T2C' and
+           '2T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           not 'MEMIF' and
-           not 'DRV_AVF'"
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   - "L2PATCH"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
   - "FIB_10K"
   - "FIB_100K"
   - "FIB_1M"
   - "FIB_10K"
   - "FIB_100K"
   - "FIB_1M"
@@ -6575,34 +7117,32 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
+    title: "l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: l2sw-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
+- type: "plot"
+  title: "VPP Throughput: l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            'ETH' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            'ETH' and
-           '4T2C' and
+           '2T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           not 'MEMIF' and
-           not 'DRV_AVF'"
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   - "L2PATCH"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
   - "FIB_10K"
   - "FIB_100K"
   - "FIB_1M"
   - "FIB_10K"
   - "FIB_100K"
   - "FIB_1M"
@@ -6611,25 +7151,23 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
+    title: "l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
-# Packet Throughput - VPP L2 3n-skx-x710 features
--
-  type: "plot"
-  title: "VPP Throughput: l2sw-3n-skx-x710-64b-2t1c-features-ndr"
+# Packet Throughput - VPP L2 3n-hsw-x710 features
+- type: "plot"
+  title: "VPP Throughput: l2sw-3n-hsw-x710-64b-1t1c-features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-2t1c-features-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-1t1c-features-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           '2T1C' and
+           '1T1C' and
            (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
            not 'ACL' and
            not 'VHOST' and
            (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
            not 'ACL' and
            not 'VHOST' and
-           not 'DRV_AVF' and
            not 'L2OVRLAY' and
            not 'MEMIF'"
   parameters:
            not 'L2OVRLAY' and
            not 'MEMIF'"
   parameters:
@@ -6646,24 +7184,22 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-3n-skx-x710-64b-2t1c-features-ndr"
+    title: "l2sw-3n-hsw-x710-64b-1t1c-features-ndr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: l2sw-3n-skx-x710-64b-2t1c-features-pdr"
+- type: "plot"
+  title: "VPP Throughput: l2sw-3n-hsw-x710-64b-1t1c-features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-2t1c-features-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-1t1c-features-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           '2T1C' and
+           '1T1C' and
            (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
            not 'ACL' and
            not 'VHOST' and
            (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
            not 'ACL' and
            not 'VHOST' and
-           not 'DRV_AVF' and
            not 'L2OVRLAY' and
            not 'MEMIF'"
   parameters:
            not 'L2OVRLAY' and
            not 'MEMIF'"
   parameters:
@@ -6680,24 +7216,22 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-3n-skx-x710-64b-2t1c-features-pdr"
+    title: "l2sw-3n-hsw-x710-64b-1t1c-features-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: l2sw-3n-skx-x710-64b-4t2c-features-ndr"
+- type: "plot"
+  title: "VPP Throughput: l2sw-3n-hsw-x710-64b-2t2c-features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-4t2c-features-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-2t2c-features-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           '4T2C' and
+           '2T2C' and
            (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
            not 'ACL' and
            not 'VHOST' and
            (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
            not 'ACL' and
            not 'VHOST' and
-           not 'DRV_AVF' and
            not 'L2OVRLAY' and
            not 'MEMIF'"
   parameters:
            not 'L2OVRLAY' and
            not 'MEMIF'"
   parameters:
@@ -6714,331 +7248,175 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-3n-skx-x710-64b-4t2c-features-ndr"
+    title: "l2sw-3n-hsw-x710-64b-2t2c-features-ndr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: l2sw-3n-skx-x710-64b-4t2c-features-pdr"
+- type: "plot"
+  title: "VPP Throughput: l2sw-3n-hsw-x710-64b-2t2c-features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-4t2c-features-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-2t2c-features-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           '4T2C' and
+           '2T2C' and
            (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
            not 'ACL' and
            not 'VHOST' and
            (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
            not 'ACL' and
            not 'VHOST' and
-           not 'DRV_AVF' and
            not 'L2OVRLAY' and
            not 'MEMIF'"
   parameters:
   - "throughput"
            not 'L2OVRLAY' and
            not 'MEMIF'"
   parameters:
   - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCBASE"    # l2xcbase
-  - "L2BDBASE"    # l2bdbase
-  - "L2XCFWD"     # dot1q-l2xcbase
-  - "L2BDMACLRN"  # dot1q-l2bdbase
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l2sw-3n-skx-x710-64b-4t2c-features-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP L2 3n-skx-xxv710 base and scale
--
-  type: "plot"
-  title: "VPP Throughput: l2sw-3n-skx-xxv710-64b-2t1c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-2t1c-base-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'ETH' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "L2BDMACLRN"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l2sw-3n-skx-xxv710-64b-2t1c-base-ndr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: l2sw-3n-skx-xxv710-64b-2t1c-base-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-2t1c-base-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'ETH' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "L2BDMACLRN"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l2sw-3n-skx-xxv710-64b-2t1c-base-pdr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: l2sw-3n-skx-xxv710-64b-4t2c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-4t2c-base-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'ETH' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "L2BDMACLRN"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l2sw-3n-skx-xxv710-64b-4t2c-base-ndr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: l2sw-3n-skx-xxv710-64b-4t2c-base-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-4t2c-base-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'ETH' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "L2BDMACLRN"
+  - "parent"
+  - "tags"
+  sort:
+  - "L2XCBASE"    # l2xcbase
+  - "L2BDBASE"    # l2bdbase
+  - "L2XCFWD"     # dot1q-l2xcbase
+  - "L2BDMACLRN"  # dot1q-l2bdbase
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-3n-skx-xxv710-64b-4t2c-base-pdr"
+    title: "l2sw-3n-hsw-x710-64b-2t2c-features-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
-# Packet Throughput - VPP L2 2n-skx-x710 base and scale
--
-  type: "plot"
-  title: "VPP Throughput: l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
+# Packet Throughput - VPP L2 3n-hsw-x710 features-iacl
+- type: "plot"
+  title: "VPP Throughput: l2sw-3n-hsw-x710-64b-1t1c-features-iacl-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-1t1c-features-iacl-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
   filter: "'NIC_Intel-X710' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
            'NDRPDR' and
-           'ETH' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           '1T1C' and
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'IACL' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
+           not 'MACIP' and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
+    title: "l2sw-3n-hsw-x710-64b-1t1c-features-iacl-ndr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: l2sw-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
+- type: "plot"
+  title: "VPP Throughput: l2sw-3n-hsw-x710-64b-1t1c-features-iacl-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-1t1c-features-iacl-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
   filter: "'NIC_Intel-X710' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
            'NDRPDR' and
-           'ETH' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           '1T1C' and
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'IACL' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
+           not 'MACIP' and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
+    title: "l2sw-3n-hsw-x710-64b-1t1c-features-iacl-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
+- type: "plot"
+  title: "VPP Throughput: l2sw-3n-hsw-x710-64b-2t2c-features-iacl-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-2t2c-features-iacl-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
   filter: "'NIC_Intel-X710' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
            'NDRPDR' and
-           'ETH' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           '2T2C' and
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'IACL' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
+           not 'MACIP' and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
+    title: "l2sw-3n-hsw-x710-64b-2t2c-features-iacl-ndr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: l2sw-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
+- type: "plot"
+  title: "VPP Throughput: l2sw-3n-hsw-x710-64b-2t2c-features-iacl-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-2t2c-features-iacl-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
   filter: "'NIC_Intel-X710' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
            'NDRPDR' and
-           'ETH' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           '2T2C' and
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'IACL' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
+           not 'MACIP' and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
+    title: "l2sw-3n-hsw-x710-64b-2t2c-features-iacl-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
-# Packet Throughput - VPP L2 2n-skx-xxv710 base and scale
--
-  type: "plot"
-  title: "VPP Throughput: l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
+# Packet Throughput - VPP L2 3n-hsw-xl710 base and scale
+- type: "plot"
+  title: "VPP Throughput: l2sw-3n-hsw-xl710-64b-1t1c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-xl710-64b-1t1c-base-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '64B' and
            '64B' and
-           ('BASE' or 'SCALE') and
+           'BASE' and
            'NDRPDR' and
            'ETH' and
            'NDRPDR' and
            'ETH' and
-           '2T1C' and
+           '1T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
@@ -7048,32 +7426,28 @@
   - "tags"
   sort:
   - "L2PATCH"
   - "tags"
   sort:
   - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
+    title: "l2sw-3n-hsw-xl710-64b-1t1c-base-ndr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
+- type: "plot"
+  title: "VPP Throughput: l2sw-3n-hsw-xl710-64b-1t1c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-xl710-64b-1t1c-base-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '64B' and
            '64B' and
-           ('BASE' or 'SCALE') and
+           'BASE' and
            'NDRPDR' and
            'ETH' and
            'NDRPDR' and
            'ETH' and
-           '2T1C' and
+           '1T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
@@ -7083,32 +7457,28 @@
   - "tags"
   sort:
   - "L2PATCH"
   - "tags"
   sort:
   - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
+    title: "l2sw-3n-hsw-xl710-64b-1t1c-base-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
+- type: "plot"
+  title: "VPP Throughput: l2sw-3n-hsw-xl710-64b-2t2c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-xl710-64b-2t2c-base-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '64B' and
            '64B' and
-           ('BASE' or 'SCALE') and
+           'BASE' and
            'NDRPDR' and
            'ETH' and
            'NDRPDR' and
            'ETH' and
-           '4T2C' and
+           '2T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
@@ -7118,32 +7488,28 @@
   - "tags"
   sort:
   - "L2PATCH"
   - "tags"
   sort:
   - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
+    title: "l2sw-3n-hsw-xl710-64b-2t2c-base-ndr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
+- type: "plot"
+  title: "VPP Throughput: l2sw-3n-hsw-xl710-64b-2t2c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-xl710-64b-2t2c-base-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '64B' and
            '64B' and
-           ('BASE' or 'SCALE') and
+           'BASE' and
            'NDRPDR' and
            'ETH' and
            'NDRPDR' and
            'ETH' and
-           '4T2C' and
+           '2T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
@@ -7153,872 +7519,953 @@
   - "tags"
   sort:
   - "L2PATCH"
   - "tags"
   sort:
   - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
+    title: "l2sw-3n-hsw-xl710-64b-2t2c-base-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
-# Packet Throughput - VPP L2 2n-dnv-x553 base
--
-  type: "plot"
-  title: "VPP Throughput: l2sw-2n-dnv-x553-64b-1t1c-base-ndr"
+# Packet Throughput - VPP L2 3n-skx-x710 base and scale
+- type: "plot"
+  title: "VPP Throughput: l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-dnv-x553-64b-1t1c-base-ndr"
-  data: "intel-dnv-vpp"
-  filter: "'NIC_Intel-X553' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            '64B' and
-           'BASE' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
            'ETH' and
            'NDRPDR' and
            'ETH' and
-           '1T1C' and
+           '2T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           not 'MEMIF'"
+           not 'MEMIF' and
+           not 'DRV_AVF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2XCBASE"
-  - "L2BDMACLRN"
   - "L2PATCH"
   - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-2n-dnv-x553-64b-1t1c-base-ndr"
+    title: "l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: l2sw-2n-dnv-x553-64b-1t1c-base-pdr"
+- type: "plot"
+  title: "VPP Throughput: l2sw-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-dnv-x553-64b-1t1c-base-pdr"
-  data: "intel-dnv-vpp"
-  filter: "'NIC_Intel-X553' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            'ETH' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            'ETH' and
-           '1T1C' and
+           '2T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           not 'MEMIF'"
+           not 'MEMIF' and
+           not 'DRV_AVF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2XCBASE"
-  - "L2BDMACLRN"
   - "L2PATCH"
   - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-2n-dnv-x553-64b-1t1c-base-pdr"
+    title: "l2sw-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: l2sw-2n-dnv-x553-64b-2t2c-base-ndr"
+- type: "plot"
+  title: "VPP Throughput: l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-dnv-x553-64b-2t2c-base-ndr"
-  data: "intel-dnv-vpp"
-  filter: "'NIC_Intel-X553' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            'ETH' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            'ETH' and
-           '2T2C' and
+           '4T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           not 'MEMIF'"
+           not 'MEMIF' and
+           not 'DRV_AVF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2XCBASE"
-  - "L2BDMACLRN"
   - "L2PATCH"
   - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-2n-dnv-x553-64b-2t2c-base-ndr"
+    title: "l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: l2sw-2n-dnv-x553-64b-2t2c-base-pdr"
+- type: "plot"
+  title: "VPP Throughput: l2sw-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-dnv-x553-64b-2t2c-base-pdr"
-  data: "intel-dnv-vpp"
-  filter: "'NIC_Intel-X553' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            'ETH' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            'ETH' and
-           '2T2C' and
+           '4T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           not 'MEMIF'"
+           not 'MEMIF' and
+           not 'DRV_AVF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2XCBASE"
-  - "L2BDMACLRN"
   - "L2PATCH"
   - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-2n-dnv-x553-64b-2t2c-base-pdr"
+    title: "l2sw-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
-################################################################################
-
-# Packet Throughput - VPP Container Memif 3n-hsw-x520
--
-  type: "plot"
-  title: "VPP Throughput: memif-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
+# Packet Throughput - VPP L2 3n-skx-x710 features
+- type: "plot"
+  title: "VPP Throughput: l2sw-3n-skx-x710-64b-2t1c-features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-2t1c-features-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
            'NDRPDR' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
+           '2T1C' and
+           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
+           not 'ACL' and
            not 'VHOST' and
            not 'VHOST' and
-           'MEMIF'"
+           not 'DRV_AVF' and
+           not 'L2OVRLAY' and
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
+  - "L2XCBASE"    # l2xcbase
+  - "L2BDBASE"    # l2bdbase
+  - "L2XCFWD"     # dot1q-l2xcbase
+  - "L2BDMACLRN"  # dot1q-l2bdbase
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "memif-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
+    title: "l2sw-3n-skx-x710-64b-2t1c-features-ndr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: memif-3n-hsw-x520-64b-1t1c-base_and_features-pdr"
+- type: "plot"
+  title: "VPP Throughput: l2sw-3n-skx-x710-64b-2t1c-features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-1t1c-base_and_features-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-2t1c-features-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
            'NDRPDR' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
+           '2T1C' and
+           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
+           not 'ACL' and
            not 'VHOST' and
            not 'VHOST' and
-           'MEMIF'"
+           not 'DRV_AVF' and
+           not 'L2OVRLAY' and
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
+  - "L2XCBASE"    # l2xcbase
+  - "L2BDBASE"    # l2bdbase
+  - "L2XCFWD"     # dot1q-l2xcbase
+  - "L2BDMACLRN"  # dot1q-l2bdbase
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "memif-3n-hsw-x520-64b-1t1c-base_and_features-pdr"
+    title: "l2sw-3n-skx-x710-64b-2t1c-features-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: memif-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
+- type: "plot"
+  title: "VPP Throughput: l2sw-3n-skx-x710-64b-4t2c-features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-4t2c-features-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
            'NDRPDR' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
+           '4T2C' and
+           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
+           not 'ACL' and
            not 'VHOST' and
            not 'VHOST' and
-           'MEMIF'"
+           not 'DRV_AVF' and
+           not 'L2OVRLAY' and
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
+  - "L2XCBASE"    # l2xcbase
+  - "L2BDBASE"    # l2bdbase
+  - "L2XCFWD"     # dot1q-l2xcbase
+  - "L2BDMACLRN"  # dot1q-l2bdbase
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "memif-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
+    title: "l2sw-3n-skx-x710-64b-4t2c-features-ndr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: memif-3n-hsw-x520-64b-2t2c-base_and_features-pdr"
+- type: "plot"
+  title: "VPP Throughput: l2sw-3n-skx-x710-64b-4t2c-features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-2t2c-base_and_features-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-4t2c-features-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
            'NDRPDR' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
+           '4T2C' and
+           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
+           not 'ACL' and
            not 'VHOST' and
            not 'VHOST' and
-           'MEMIF'"
+           not 'DRV_AVF' and
+           not 'L2OVRLAY' and
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
+  - "L2XCBASE"    # l2xcbase
+  - "L2BDBASE"    # l2bdbase
+  - "L2XCFWD"     # dot1q-l2xcbase
+  - "L2BDMACLRN"  # dot1q-l2bdbase
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "memif-3n-hsw-x520-64b-2t2c-base_and_features-pdr"
+    title: "l2sw-3n-skx-x710-64b-4t2c-features-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
-# Packet Throughput - VPP Container Memif 3n-hsw-x710
--
-  type: "plot"
-  title: "VPP Throughput: memif-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
+# Packet Throughput - VPP L2 3n-skx-x710 features-iacl
+- type: "plot"
+  title: "VPP Throughput: l2sw-3n-skx-x710-64b-2t1c-features-iacl-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-2t1c-features-iacl-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
   filter: "'NIC_Intel-X710' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
            'NDRPDR' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
+           '2T1C' and
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'IACL' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
+           not 'MACIP' and
            not 'VHOST' and
            not 'VHOST' and
-           'MEMIF'"
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "memif-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
+    title: "l2sw-3n-skx-x710-64b-2t1c-features-iacl-ndr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: memif-3n-hsw-x710-64b-1t1c-base_and_features-pdr"
+- type: "plot"
+  title: "VPP Throughput: l2sw-3n-skx-x710-64b-2t1c-features-iacl-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-1t1c-base_and_features-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-2t1c-features-iacl-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
   filter: "'NIC_Intel-X710' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
            'NDRPDR' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
+           '2T1C' and
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'IACL' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
+           not 'MACIP' and
            not 'VHOST' and
            not 'VHOST' and
-           'MEMIF'"
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "memif-3n-hsw-x710-64b-1t1c-base_and_features-pdr"
+    title: "l2sw-3n-skx-x710-64b-2t1c-features-iacl-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: memif-3n-hsw-x710-64b-2t2c-base_and_features-ndr"
+- type: "plot"
+  title: "VPP Throughput: l2sw-3n-skx-x710-64b-4t2c-features-iacl-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-2t2c-base_and_features-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-4t2c-features-iacl-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
   filter: "'NIC_Intel-X710' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
            'NDRPDR' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
+           '4T2C' and
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'IACL' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
+           not 'MACIP' and
            not 'VHOST' and
            not 'VHOST' and
-           'MEMIF'"
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "memif-3n-hsw-x710-64b-2t2c-base_and_features-ndr"
+    title: "l2sw-3n-skx-x710-64b-4t2c-features-iacl-ndr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: memif-3n-hsw-x710-64b-2t2c-base_and_features-pdr"
+- type: "plot"
+  title: "VPP Throughput: l2sw-3n-skx-x710-64b-4t2c-features-iacl-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-2t2c-base_and_features-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-4t2c-features-iacl-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
   filter: "'NIC_Intel-X710' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
            'NDRPDR' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
+           '4T2C' and
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'IACL' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
+           not 'MACIP' and
            not 'VHOST' and
            not 'VHOST' and
-           'MEMIF'"
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "memif-3n-hsw-x710-64b-2t2c-base_and_features-pdr"
+    title: "l2sw-3n-skx-x710-64b-4t2c-features-iacl-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
-# Packet Throughput - VPP Container Memif 3n-hsw-xl710
--
-  type: "plot"
-  title: "VPP Throughput: memif-3n-hsw-xl710-64b-1t1c-base_and_features-ndr"
+# Packet Throughput - VPP L2 3n-skx-xxv710 base
+- type: "plot"
+  title: "VPP Throughput: l2sw-3n-skx-xxv710-64b-2t1c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-1t1c-base_and_features-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-2t1c-base-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
+           'ETH' and
+           '2T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'VHOST' and
-           'MEMIF'"
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
+  - "L2PATCH"
+  - "L2PATCH"
+  - "L2XCBASE"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
-  - "IP4FWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "memif-3n-hsw-xl710-64b-1t1c-base_and_features-ndr"
+    title: "l2sw-3n-skx-xxv710-64b-2t1c-base-ndr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: memif-3n-hsw-xl710-64b-1t1c-base_and_features-pdr"
+- type: "plot"
+  title: "VPP Throughput: l2sw-3n-skx-xxv710-64b-2t1c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-1t1c-base_and_features-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-2t1c-base-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
+           'ETH' and
+           '2T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'VHOST' and
-           'MEMIF'"
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
+  - "L2PATCH"
+  - "L2PATCH"
+  - "L2XCBASE"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
-  - "IP4FWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "memif-3n-hsw-xl710-64b-1t1c-base_and_features-pdr"
+    title: "l2sw-3n-skx-xxv710-64b-2t1c-base-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: memif-3n-hsw-xl710-64b-2t2c-base_and_features-ndr"
+- type: "plot"
+  title: "VPP Throughput: l2sw-3n-skx-xxv710-64b-4t2c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-2t2c-base_and_features-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-4t2c-base-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
+           'ETH' and
+           '4T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'VHOST' and
-           'MEMIF'"
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
+  - "L2PATCH"
+  - "L2PATCH"
+  - "L2XCBASE"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
-  - "IP4FWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "memif-3n-hsw-xl710-64b-2t2c-base_and_features-ndr"
+    title: "l2sw-3n-skx-xxv710-64b-4t2c-base-ndr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: memif-3n-hsw-xl710-64b-2t2c-base_and_features-pdr"
+- type: "plot"
+  title: "VPP Throughput: l2sw-3n-skx-xxv710-64b-4t2c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-2t2c-base_and_features-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-4t2c-base-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
+           'ETH' and
+           '4T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'VHOST' and
-           'MEMIF'"
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
+  sort:
+  - "L2PATCH"
+  - "L2PATCH"
+  - "L2XCBASE"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
-  - "IP4FWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "memif-3n-hsw-xl710-64b-2t2c-base_and_features-pdr"
+    title: "l2sw-3n-skx-xxv710-64b-4t2c-base-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
-# Packet Throughput - VPP Container Memif 3n-skx-x710
--
-  type: "plot"
-  title: "VPP Throughput: memif-3n-skx-x710-64b-2t1c-base_and_features-ndr"
+# Packet Throughput - VPP L2 2n-skx-x710 base and scale
+- type: "plot"
+  title: "VPP Throughput: l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-2t1c-base_and_features-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
+           'ETH' and
            '2T1C' and
            '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'VHOST' and
-           'MEMIF'"
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "memif-3n-skx-x710-64b-2t1c-base_and_features-ndr"
+    title: "l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: memif-3n-skx-x710-64b-2t1c-base_and_features-pdr"
+- type: "plot"
+  title: "VPP Throughput: l2sw-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-2t1c-base_and_features-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
+           'ETH' and
            '2T1C' and
            '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'VHOST' and
-           'MEMIF'"
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "memif-3n-skx-x710-64b-2t1c-base_and_features-pdr"
+    title: "l2sw-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: memif-3n-skx-x710-64b-4t2c-base_and_features-ndr"
+- type: "plot"
+  title: "VPP Throughput: l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-4t2c-base_and_features-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
+           'ETH' and
            '4T2C' and
            '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'VHOST' and
-           'MEMIF'"
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "memif-3n-skx-x710-64b-4t2c-base_and_features-ndr"
+    title: "l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: memif-3n-skx-x710-64b-4t2c-base_and_features-pdr"
+- type: "plot"
+  title: "VPP Throughput: l2sw-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-4t2c-base_and_features-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
+           'ETH' and
            '4T2C' and
            '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'VHOST' and
-           'MEMIF'"
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "memif-3n-skx-x710-64b-4t2c-base_and_features-pdr"
+    title: "l2sw-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
-# Packet Throughput - VPP Container Memif 2n-skx-x710
--
-  type: "plot"
-  title: "VPP Throughput: memif-2n-skx-x710-64b-2t1c-base_and_features-ndr"
+# Packet Throughput - VPP L2 2n-skx-xxv710 base and scale
+- type: "plot"
+  title: "VPP Throughput: l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-2t1c-base_and_features-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
+           'ETH' and
            '2T1C' and
            '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'VHOST' and
-           not 'NF_DENSITY' and
-           'MEMIF'"
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "memif-2n-skx-x710-64b-2t1c-base_and_features-ndr"
+    title: "l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: memif-2n-skx-x710-64b-2t1c-base_and_features-pdr"
+- type: "plot"
+  title: "VPP Throughput: l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-2t1c-base_and_features-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
+           'ETH' and
            '2T1C' and
            '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'VHOST' and
-           not 'NF_DENSITY' and
-           'MEMIF'"
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "memif-2n-skx-x710-64b-2t1c-base_and_features-pdr"
+    title: "l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: memif-2n-skx-x710-64b-4t2c-base_and_features-ndr"
+- type: "plot"
+  title: "VPP Throughput: l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-4t2c-base_and_features-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
+           'ETH' and
            '4T2C' and
            '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'VHOST' and
-           not 'NF_DENSITY' and
-           'MEMIF'"
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "memif-2n-skx-x710-64b-4t2c-base_and_features-ndr"
+    title: "l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: memif-2n-skx-x710-64b-4t2c-base_and_features-pdr"
+- type: "plot"
+  title: "VPP Throughput: l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-4t2c-base_and_features-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
+           'ETH' and
            '4T2C' and
            '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'VHOST' and
-           not 'NF_DENSITY' and
-           'MEMIF'"
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "memif-2n-skx-x710-64b-4t2c-base_and_features-pdr"
+    title: "l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
-# Packet Throughput - VPP Container Memif 2n-skx-xxv710
--
-  type: "plot"
-  title: "VPP Throughput: memif-2n-skx-xxv710-64b-2t1c-base_and_features-ndr"
+## Packet Throughput - VPP L2 2n-dnv-x553 base
+#- type: "plot"
+#  title: "VPP Throughput: l2sw-2n-dnv-x553-64b-1t1c-base-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-dnv-x553-64b-1t1c-base-ndr"
+#  data: "intel-dnv-vpp"
+#  filter: "'NIC_Intel-X553' and
+#           '64B' and
+#           'BASE' 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:
+#  - "L2XCBASE"
+#  - "L2BDMACLRN"
+#  - "L2PATCH"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "l2sw-2n-dnv-x553-64b-1t1c-base-ndr"
+#    layout: "plot-throughput"
+#
+#- type: "plot"
+#  title: "VPP Throughput: l2sw-2n-dnv-x553-64b-1t1c-base-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-dnv-x553-64b-1t1c-base-pdr"
+#  data: "intel-dnv-vpp"
+#  filter: "'NIC_Intel-X553' 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:
+#  - "L2XCBASE"
+#  - "L2BDMACLRN"
+#  - "L2PATCH"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "l2sw-2n-dnv-x553-64b-1t1c-base-pdr"
+#    layout: "plot-throughput"
+#
+#- type: "plot"
+#  title: "VPP Throughput: l2sw-2n-dnv-x553-64b-2t2c-base-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-dnv-x553-64b-2t2c-base-ndr"
+#  data: "intel-dnv-vpp"
+#  filter: "'NIC_Intel-X553' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
+#           'NDRPDR' and
+#           'ETH' and
+#           '2T2C' and
+#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+#           not 'VHOST' and
+#           not 'MEMIF'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "L2XCBASE"
+#  - "L2BDMACLRN"
+#  - "L2PATCH"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "l2sw-2n-dnv-x553-64b-2t2c-base-ndr"
+#    layout: "plot-throughput"
+#
+#- type: "plot"
+#  title: "VPP Throughput: l2sw-2n-dnv-x553-64b-2t2c-base-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-dnv-x553-64b-2t2c-base-pdr"
+#  data: "intel-dnv-vpp"
+#  filter: "'NIC_Intel-X553' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
+#           'NDRPDR' and
+#           'ETH' and
+#           '2T2C' and
+#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+#           not 'VHOST' and
+#           not 'MEMIF'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "L2XCBASE"
+#  - "L2BDMACLRN"
+#  - "L2PATCH"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "l2sw-2n-dnv-x553-64b-2t2c-base-pdr"
+#    layout: "plot-throughput"
+
+################################################################################
+
+# Packet Throughput - VPP Container Memif 3n-hsw-x520
+- type: "plot"
+  title: "VPP Throughput: memif-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-xxv710-64b-2t1c-base_and_features-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '2T1C' and
+           '1T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
            'MEMIF'"
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
            'MEMIF'"
@@ -8039,21 +8486,20 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "memif-2n-skx-xxv710-64b-2t1c-base_and_features-ndr"
+    title: "memif-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: memif-2n-skx-xxv710-64b-2t1c-base_and_features-pdr"
+- type: "plot"
+  title: "VPP Throughput: memif-3n-hsw-x520-64b-1t1c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-xxv710-64b-2t1c-base_and_features-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-1t1c-base_and_features-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '2T1C' and
+           '1T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
            'MEMIF'"
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
            'MEMIF'"
@@ -8074,21 +8520,20 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "memif-2n-skx-xxv710-64b-2t1c-base_and_features-pdr"
+    title: "memif-3n-hsw-x520-64b-1t1c-base_and_features-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: memif-2n-skx-xxv710-64b-4t2c-base_and_features-ndr"
+- type: "plot"
+  title: "VPP Throughput: memif-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-xxv710-64b-4t2c-base_and_features-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '4T2C' and
+           '2T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
            'MEMIF'"
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
            'MEMIF'"
@@ -8109,21 +8554,20 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "memif-2n-skx-xxv710-64b-4t2c-base_and_features-ndr"
+    title: "memif-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: memif-2n-skx-xxv710-64b-4t2c-base_and_features-pdr"
+- type: "plot"
+  title: "VPP Throughput: memif-3n-hsw-x520-64b-2t2c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-xxv710-64b-4t2c-base_and_features-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-2t2c-base_and_features-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '4T2C' and
+           '2T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
            'MEMIF'"
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
            'MEMIF'"
@@ -8144,436 +8588,433 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "memif-2n-skx-xxv710-64b-4t2c-base_and_features-pdr"
+    title: "memif-3n-hsw-x520-64b-2t2c-base_and_features-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
-################################################################################
-
-# Packet Throughput - VPP Container Orchestrated Memif 3n-hsw-x520 l2xc
--
-  type: "plot"
-  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-ndr"
+# Packet Throughput - VPP Container Memif 3n-hsw-x710
+- type: "plot"
+  title: "VPP Throughput: memif-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-ndr"
-  data: "plot-ligato-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '1T1C' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '1T1C' and
-           'L2XCFWD' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
            not 'VHOST' and
-           not 'NF_DENSITY' and
            'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
            'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "IP4FWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-ndr"
+    title: "memif-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-pdr"
+- type: "plot"
+  title: "VPP Throughput: memif-3n-hsw-x710-64b-1t1c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-pdr"
-  data: "plot-ligato-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-1t1c-base_and_features-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '1T1C' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '1T1C' and
-           'L2XCFWD' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
            not 'VHOST' and
-           not 'NF_DENSITY' and
            'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
            'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "IP4FWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-pdr"
+    title: "memif-3n-hsw-x710-64b-1t1c-base_and_features-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-ndr"
+- type: "plot"
+  title: "VPP Throughput: memif-3n-hsw-x710-64b-2t2c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-ndr"
-  data: "plot-ligato-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-2t2c-base_and_features-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T2C' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T2C' and
-           'L2XCFWD' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
            not 'VHOST' and
-           not 'NF_DENSITY' and
            'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
            'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "IP4FWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-ndr"
+    title: "memif-3n-hsw-x710-64b-2t2c-base_and_features-ndr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-pdr"
+- type: "plot"
+  title: "VPP Throughput: memif-3n-hsw-x710-64b-2t2c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-pdr"
-  data: "plot-ligato-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-2t2c-base_and_features-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T2C' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T2C' and
-           'L2XCFWD' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
            not 'VHOST' and
-           not 'NF_DENSITY' and
            'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
            'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "IP4FWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-pdr"
+    title: "memif-3n-hsw-x710-64b-2t2c-base_and_features-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
-# Packet Throughput - VPP Container Orchestrated Memif 3n-hsw-x520 l2bd
--
-  type: "plot"
-  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-ndr"
+# Packet Throughput - VPP Container Memif 3n-hsw-xl710
+- type: "plot"
+  title: "VPP Throughput: memif-3n-hsw-xl710-64b-1t1c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-ndr"
-  data: "plot-ligato-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-1t1c-base_and_features-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '1T1C' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
            not 'VHOST' and
-           not 'NF_DENSITY' and
            'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
            'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "IP4FWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-ndr"
+    title: "memif-3n-hsw-xl710-64b-1t1c-base_and_features-ndr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-pdr"
+- type: "plot"
+  title: "VPP Throughput: memif-3n-hsw-xl710-64b-1t1c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-pdr"
-  data: "plot-ligato-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-1t1c-base_and_features-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '1T1C' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
            not 'VHOST' and
-           not 'NF_DENSITY' and
            'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
            'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "IP4FWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-pdr"
+    title: "memif-3n-hsw-xl710-64b-1t1c-base_and_features-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-ndr"
+- type: "plot"
+  title: "VPP Throughput: memif-3n-hsw-xl710-64b-2t2c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-ndr"
-  data: "plot-ligato-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-2t2c-base_and_features-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T2C' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
            not 'VHOST' and
-           not 'NF_DENSITY' and
            'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
            'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "IP4FWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-ndr"
+    title: "memif-3n-hsw-xl710-64b-2t2c-base_and_features-ndr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-pdr"
+- type: "plot"
+  title: "VPP Throughput: memif-3n-hsw-xl710-64b-2t2c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-pdr"
-  data: "plot-ligato-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-2t2c-base_and_features-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T2C' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
            not 'VHOST' and
-           not 'NF_DENSITY' and
            'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
            'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "IP4FWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-pdr"
+    title: "memif-3n-hsw-xl710-64b-2t2c-base_and_features-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
-# Packet Throughput - VPP Container Orchestrated Memif 3n-hsw-x710 l2xc
--
-  type: "plot"
-  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-ndr"
+# Packet Throughput - VPP Container Memif 3n-skx-x710
+- type: "plot"
+  title: "VPP Throughput: memif-3n-skx-x710-64b-2t1c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-ndr"
-  data: "plot-ligato-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-2t1c-base_and_features-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '1T1C' and
-           'L2XCFWD' and
+           '2T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
            not 'VHOST' and
-           not 'NF_DENSITY' and
            'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
            'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "IP4FWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-ndr"
+    title: "memif-3n-skx-x710-64b-2t1c-base_and_features-ndr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-pdr"
+- type: "plot"
+  title: "VPP Throughput: memif-3n-skx-x710-64b-2t1c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-pdr"
-  data: "plot-ligato-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-2t1c-base_and_features-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '1T1C' and
-           'L2XCFWD' and
+           '2T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
            not 'VHOST' and
-           not 'NF_DENSITY' and
            'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
            'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "IP4FWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-pdr"
+    title: "memif-3n-skx-x710-64b-2t1c-base_and_features-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-ndr"
+- type: "plot"
+  title: "VPP Throughput: memif-3n-skx-x710-64b-4t2c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-ndr"
-  data: "plot-ligato-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-4t2c-base_and_features-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '2T2C' and
-           'L2XCFWD' and
+           '4T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
            not 'VHOST' and
-           not 'NF_DENSITY' and
            'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
            'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "IP4FWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-ndr"
+    title: "memif-3n-skx-x710-64b-4t2c-base_and_features-ndr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-pdr"
+- type: "plot"
+  title: "VPP Throughput: memif-3n-skx-x710-64b-4t2c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-pdr"
-  data: "plot-ligato-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-4t2c-base_and_features-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '2T2C' and
-           'L2XCFWD' and
+           '4T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
            not 'VHOST' and
-           not 'NF_DENSITY' and
            'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
            'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "IP4FWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-pdr"
+    title: "memif-3n-skx-x710-64b-4t2c-base_and_features-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
-# Packet Throughput - VPP Container Orchestrated Memif 3n-hsw-x710 l2bd
--
-  type: "plot"
-  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-ndr"
+# Packet Throughput - VPP Container Memif 2n-skx-x710
+- type: "plot"
+  title: "VPP Throughput: memif-2n-skx-x710-64b-2t1c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-ndr"
-  data: "plot-ligato-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-2t1c-base_and_features-ndr"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+           '2T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
            not 'NF_DENSITY' and
            'MEMIF'"
            not 'VHOST' and
            not 'NF_DENSITY' and
            'MEMIF'"
@@ -8582,32 +9023,33 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "IP4FWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-ndr"
+    title: "memif-2n-skx-x710-64b-2t1c-base_and_features-ndr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-pdr"
+- type: "plot"
+  title: "VPP Throughput: memif-2n-skx-x710-64b-2t1c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-pdr"
-  data: "plot-ligato-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-2t1c-base_and_features-pdr"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+           '2T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
            not 'NF_DENSITY' and
            'MEMIF'"
            not 'VHOST' and
            not 'NF_DENSITY' and
            'MEMIF'"
@@ -8616,32 +9058,33 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "IP4FWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-pdr"
+    title: "memif-2n-skx-x710-64b-2t1c-base_and_features-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-ndr"
+- type: "plot"
+  title: "VPP Throughput: memif-2n-skx-x710-64b-4t2c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-ndr"
-  data: "plot-ligato-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-4t2c-base_and_features-ndr"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+           '4T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
            not 'NF_DENSITY' and
            'MEMIF'"
            not 'VHOST' and
            not 'NF_DENSITY' and
            'MEMIF'"
@@ -8650,32 +9093,33 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "IP4FWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-ndr"
+    title: "memif-2n-skx-x710-64b-4t2c-base_and_features-ndr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-pdr"
+- type: "plot"
+  title: "VPP Throughput: memif-2n-skx-x710-64b-4t2c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-pdr"
-  data: "plot-ligato-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-4t2c-base_and_features-pdr"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+           '4T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
            not 'NF_DENSITY' and
            'MEMIF'"
            not 'VHOST' and
            not 'NF_DENSITY' and
            'MEMIF'"
@@ -8684,32 +9128,704 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "IP4FWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-pdr"
+    title: "memif-2n-skx-x710-64b-4t2c-base_and_features-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
+## Packet Throughput - VPP Container Memif 2n-skx-xxv710
+#- type: "plot"
+#  title: "VPP Throughput: memif-2n-skx-xxv710-64b-2t1c-base_and_features-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-xxv710-64b-2t1c-base_and_features-ndr"
+#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+#  filter: "'NIC_Intel-XXV710' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
+#           'NDRPDR' and
+#           '2T1C' and
+#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
+#           not 'VHOST' and
+#           'MEMIF'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "L2XCFWD"
+#  - "L2XCFWD"
+#  - "L2XCFWD"
+#  - "L2BDMACLRN"
+#  - "L2BDMACLRN"
+#  - "L2BDMACLRN"
+#  - "IP4FWD"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "memif-2n-skx-xxv710-64b-2t1c-base_and_features-ndr"
+#    layout: "plot-throughput"
+#
+#- type: "plot"
+#  title: "VPP Throughput: memif-2n-skx-xxv710-64b-2t1c-base_and_features-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-xxv710-64b-2t1c-base_and_features-pdr"
+#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+#  filter: "'NIC_Intel-XXV710' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
+#           'NDRPDR' and
+#           '2T1C' and
+#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
+#           not 'VHOST' and
+#           'MEMIF'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "L2XCFWD"
+#  - "L2XCFWD"
+#  - "L2XCFWD"
+#  - "L2BDMACLRN"
+#  - "L2BDMACLRN"
+#  - "L2BDMACLRN"
+#  - "IP4FWD"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "memif-2n-skx-xxv710-64b-2t1c-base_and_features-pdr"
+#    layout: "plot-throughput"
+#
+#- type: "plot"
+#  title: "VPP Throughput: memif-2n-skx-xxv710-64b-4t2c-base_and_features-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-xxv710-64b-4t2c-base_and_features-ndr"
+#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+#  filter: "'NIC_Intel-XXV710' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
+#           'NDRPDR' and
+#           '4T2C' and
+#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
+#           not 'VHOST' and
+#           'MEMIF'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "L2XCFWD"
+#  - "L2XCFWD"
+#  - "L2XCFWD"
+#  - "L2BDMACLRN"
+#  - "L2BDMACLRN"
+#  - "L2BDMACLRN"
+#  - "IP4FWD"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "memif-2n-skx-xxv710-64b-4t2c-base_and_features-ndr"
+#    layout: "plot-throughput"
+#
+#- type: "plot"
+#  title: "VPP Throughput: memif-2n-skx-xxv710-64b-4t2c-base_and_features-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-xxv710-64b-4t2c-base_and_features-pdr"
+#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+#  filter: "'NIC_Intel-XXV710' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
+#           'NDRPDR' and
+#           '4T2C' and
+#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
+#           not 'VHOST' and
+#           'MEMIF'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "L2XCFWD"
+#  - "L2XCFWD"
+#  - "L2XCFWD"
+#  - "L2BDMACLRN"
+#  - "L2BDMACLRN"
+#  - "L2BDMACLRN"
+#  - "IP4FWD"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "memif-2n-skx-xxv710-64b-4t2c-base_and_features-pdr"
+#    layout: "plot-throughput"
+
+################################################################################
+
+## Packet Throughput - VPP Container Orchestrated Memif 3n-hsw-x520 l2xc
+#- type: "plot"
+#  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-ndr"
+#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X520-DA2' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
+#           'NDRPDR' and
+#           '1T1C' and
+#           'L2XCFWD' and
+#           not 'VHOST' and
+#           not 'NF_DENSITY' and
+#           'MEMIF'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "1VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-ndr"
+#    layout: "plot-throughput"
+#
+#- type: "plot"
+#  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-pdr"
+#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X520-DA2' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
+#           'NDRPDR' and
+#           '1T1C' and
+#           'L2XCFWD' and
+#           not 'VHOST' and
+#           not 'NF_DENSITY' and
+#           'MEMIF'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "1VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-pdr"
+#    layout: "plot-throughput"
+#
+#- type: "plot"
+#  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-ndr"
+#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X520-DA2' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
+#           'NDRPDR' and
+#           '2T2C' and
+#           'L2XCFWD' and
+#           not 'VHOST' and
+#           not 'NF_DENSITY' and
+#           'MEMIF'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "1VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-ndr"
+#    layout: "plot-throughput"
+#
+#- type: "plot"
+#  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-pdr"
+#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X520-DA2' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
+#           'NDRPDR' and
+#           '2T2C' and
+#           'L2XCFWD' and
+#           not 'VHOST' and
+#           not 'NF_DENSITY' and
+#           'MEMIF'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "1VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-pdr"
+#    layout: "plot-throughput"
+#
+## Packet Throughput - VPP Container Orchestrated Memif 3n-hsw-x520 l2bd
+#- type: "plot"
+#  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-ndr"
+#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X520-DA2' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
+#           'NDRPDR' and
+#           '1T1C' and
+#           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+#           not 'VHOST' and
+#           not 'NF_DENSITY' and
+#           'MEMIF'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "1VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-ndr"
+#    layout: "plot-throughput"
+#
+#- type: "plot"
+#  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-pdr"
+#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X520-DA2' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
+#           'NDRPDR' and
+#           '1T1C' and
+#           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+#           not 'VHOST' and
+#           not 'NF_DENSITY' and
+#           'MEMIF'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "1VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-pdr"
+#    layout: "plot-throughput"
+#
+#- type: "plot"
+#  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-ndr"
+#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X520-DA2' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
+#           'NDRPDR' and
+#           '2T2C' and
+#           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+#           not 'VHOST' and
+#           not 'NF_DENSITY' and
+#           'MEMIF'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "1VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-ndr"
+#    layout: "plot-throughput"
+#
+#- type: "plot"
+#  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-pdr"
+#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X520-DA2' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
+#           'NDRPDR' and
+#           '2T2C' and
+#           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+#           not 'VHOST' and
+#           not 'NF_DENSITY' and
+#           'MEMIF'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "1VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-pdr"
+#    layout: "plot-throughput"
+#
+## Packet Throughput - VPP Container Orchestrated Memif 3n-hsw-x710 l2xc
+#- type: "plot"
+#  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-ndr"
+#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
+#           'NDRPDR' and
+#           '1T1C' and
+#           'L2XCFWD' and
+#           not 'VHOST' and
+#           not 'NF_DENSITY' and
+#           'MEMIF'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "1VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-ndr"
+#    layout: "plot-throughput"
+#
+#- type: "plot"
+#  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-pdr"
+#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
+#           'NDRPDR' and
+#           '1T1C' and
+#           'L2XCFWD' and
+#           not 'VHOST' and
+#           not 'NF_DENSITY' and
+#           'MEMIF'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "1VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-pdr"
+#    layout: "plot-throughput"
+#
+#- type: "plot"
+#  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-ndr"
+#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
+#           'NDRPDR' and
+#           '2T2C' and
+#           'L2XCFWD' and
+#           not 'VHOST' and
+#           not 'NF_DENSITY' and
+#           'MEMIF'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "1VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-ndr"
+#    layout: "plot-throughput"
+#
+#- type: "plot"
+#  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-pdr"
+#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
+#           'NDRPDR' and
+#           '2T2C' and
+#           'L2XCFWD' and
+#           not 'VHOST' and
+#           not 'NF_DENSITY' and
+#           'MEMIF'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "1VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-pdr"
+#    layout: "plot-throughput"
+#
+## Packet Throughput - VPP Container Orchestrated Memif 3n-hsw-x710 l2bd
+#- type: "plot"
+#  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-ndr"
+#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
+#           'NDRPDR' and
+#           '1T1C' and
+#           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+#           not 'VHOST' and
+#           not 'NF_DENSITY' and
+#           'MEMIF'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "1VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-ndr"
+#    layout: "plot-throughput"
+#
+#- type: "plot"
+#  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-pdr"
+#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
+#           'NDRPDR' and
+#           '1T1C' and
+#           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+#           not 'VHOST' and
+#           not 'NF_DENSITY' and
+#           'MEMIF'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "1VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-pdr"
+#    layout: "plot-throughput"
+#
+#- type: "plot"
+#  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-ndr"
+#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
+#           'NDRPDR' and
+#           '2T2C' and
+#           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+#           not 'VHOST' and
+#           not 'NF_DENSITY' and
+#           'MEMIF'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "1VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-ndr"
+#    layout: "plot-throughput"
+#
+#- type: "plot"
+#  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-pdr"
+#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
+#           'NDRPDR' and
+#           '2T2C' and
+#           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+#           not 'VHOST' and
+#           not 'NF_DENSITY' and
+#           'MEMIF'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "1VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-pdr"
+#    layout: "plot-throughput"
+
 ################################################################################
 
 # Packet Throughput - VPP IPv4 3n-hsw-x520 base and scale
 ################################################################################
 
 # Packet Throughput - VPP IPv4 3n-hsw-x520 base and scale
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
   title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            '1T1C' and
            'IP4FWD' and
            'NDRPDR' and
            '1T1C' and
            'IP4FWD' and
@@ -8722,8 +9838,8 @@
   - "tags"
   sort:
   - "IP4BASE"
   - "tags"
   sort:
   - "IP4BASE"
-  - "FIB_20k"
-  - "FIB_200k"
+  - "FIB_20K"
+  - "FIB_200K"
   - "FIB_2M"
   traces:
     hoverinfo: "x+y"
   - "FIB_2M"
   traces:
     hoverinfo: "x+y"
@@ -8733,16 +9849,15 @@
     title: "ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
     title: "ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
   title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            '1T1C' and
            'IP4FWD' and
            'NDRPDR' and
            '1T1C' and
            'IP4FWD' and
@@ -8755,8 +9870,8 @@
   - "tags"
   sort:
   - "IP4BASE"
   - "tags"
   sort:
   - "IP4BASE"
-  - "FIB_20k"
-  - "FIB_200k"
+  - "FIB_20K"
+  - "FIB_200K"
   - "FIB_2M"
   traces:
     hoverinfo: "x+y"
   - "FIB_2M"
   traces:
     hoverinfo: "x+y"
@@ -8766,16 +9881,15 @@
     title: "ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
     title: "ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
   title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            '2T2C' and
            'IP4FWD' and
            'NDRPDR' and
            '2T2C' and
            'IP4FWD' and
@@ -8788,8 +9902,8 @@
   - "tags"
   sort:
   - "IP4BASE"
   - "tags"
   sort:
   - "IP4BASE"
-  - "FIB_20k"
-  - "FIB_200k"
+  - "FIB_20K"
+  - "FIB_200K"
   - "FIB_2M"
   traces:
     hoverinfo: "x+y"
   - "FIB_2M"
   traces:
     hoverinfo: "x+y"
@@ -8799,16 +9913,15 @@
     title: "ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
     title: "ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
   title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            '2T2C' and
            'IP4FWD' and
            'NDRPDR' and
            '2T2C' and
            'IP4FWD' and
@@ -8821,8 +9934,8 @@
   - "tags"
   sort:
   - "IP4BASE"
   - "tags"
   sort:
   - "IP4BASE"
-  - "FIB_20k"
-  - "FIB_200k"
+  - "FIB_20K"
+  - "FIB_200K"
   - "FIB_2M"
   traces:
     hoverinfo: "x+y"
   - "FIB_2M"
   traces:
     hoverinfo: "x+y"
@@ -8833,20 +9946,19 @@
     layout: "plot-throughput"
 
 # Packet Throughput - VPP IPv4 3n-hsw-x520 features
     layout: "plot-throughput"
 
 # Packet Throughput - VPP IPv4 3n-hsw-x520 features
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-ndr"
   title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('IP4BASE' or
             'POLICE_MARK' or
             'COPWHLIST' or
             ('NAT44' and 'BASE') or
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('IP4BASE' or
             'POLICE_MARK' or
             'COPWHLIST' or
             ('NAT44' and 'BASE') or
-            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
+            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
            'NDRPDR' and
            '1T1C' and
            'IP4FWD' and
            'NDRPDR' and
            '1T1C' and
            'IP4FWD' and
@@ -8872,20 +9984,19 @@
     title: "ip4-3n-hsw-x520-64b-1t1c-features-ndr"
     layout: "plot-throughput"
 
     title: "ip4-3n-hsw-x520-64b-1t1c-features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-pdr"
   title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('IP4BASE' or
             'POLICE_MARK' or
             'COPWHLIST' or
             ('NAT44' and 'BASE') or
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('IP4BASE' or
             'POLICE_MARK' or
             'COPWHLIST' or
             ('NAT44' and 'BASE') or
-            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
+            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
            'NDRPDR' and
            '1T1C' and
            'IP4FWD' and
            'NDRPDR' and
            '1T1C' and
            'IP4FWD' and
@@ -8911,20 +10022,19 @@
     title: "ip4-3n-hsw-x520-64b-1t1c-features-pdr"
     layout: "plot-throughput"
 
     title: "ip4-3n-hsw-x520-64b-1t1c-features-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-ndr"
   title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('IP4BASE' or
             'POLICE_MARK' or
             'COPWHLIST' or
             ('NAT44' and 'BASE') or
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('IP4BASE' or
             'POLICE_MARK' or
             'COPWHLIST' or
             ('NAT44' and 'BASE') or
-            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
+            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
            'NDRPDR' and
            '2T2C' and
            'IP4FWD' and
            'NDRPDR' and
            '2T2C' and
            'IP4FWD' and
@@ -8950,20 +10060,19 @@
     title: "ip4-3n-hsw-x520-64b-2t2c-features-ndr"
     layout: "plot-throughput"
 
     title: "ip4-3n-hsw-x520-64b-2t2c-features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-pdr"
   title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('IP4BASE' or
             'POLICE_MARK' or
             'COPWHLIST' or
             ('NAT44' and 'BASE') or
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('IP4BASE' or
             'POLICE_MARK' or
             'COPWHLIST' or
             ('NAT44' and 'BASE') or
-            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
+            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
            'NDRPDR' and
            '2T2C' and
            'IP4FWD' and
            'NDRPDR' and
            '2T2C' and
            'IP4FWD' and
@@ -8990,13 +10099,12 @@
     layout: "plot-throughput"
 
 # Packet Throughput - VPP IPv4 3n-hsw-x520 features nat44
     layout: "plot-throughput"
 
 # Packet Throughput - VPP IPv4 3n-hsw-x520 features nat44
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-features-nat44-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-nat44-ndr"
   title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-features-nat44-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-nat44-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
@@ -9025,13 +10133,12 @@
     title: "ip4-3n-hsw-x520-64b-1t1c-features-nat44-ndr"
     layout: "plot-throughput"
 
     title: "ip4-3n-hsw-x520-64b-1t1c-features-nat44-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-features-nat44-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-nat44-pdr"
   title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-features-nat44-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-nat44-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
@@ -9060,13 +10167,12 @@
     title: "ip4-3n-hsw-x520-64b-1t1c-features-nat44-pdr"
     layout: "plot-throughput"
 
     title: "ip4-3n-hsw-x520-64b-1t1c-features-nat44-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-features-nat44-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-nat44-ndr"
   title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-features-nat44-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-nat44-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
@@ -9095,13 +10201,12 @@
     title: "ip4-3n-hsw-x520-64b-2t2c-features-nat44-ndr"
     layout: "plot-throughput"
 
     title: "ip4-3n-hsw-x520-64b-2t2c-features-nat44-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-features-nat44-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-nat44-pdr"
   title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-features-nat44-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-nat44-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
@@ -9131,19 +10236,18 @@
     layout: "plot-throughput"
 
 # Packet Throughput - VPP IPv4 3n-hsw-x520 features iacl
     layout: "plot-throughput"
 
 # Packet Throughput - VPP IPv4 3n-hsw-x520 features iacl
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-features-iacl-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-iacl-ndr"
   title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-features-iacl-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-iacl-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
            '1T1C' and
            'IP4FWD' and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
            '1T1C' and
            'IP4FWD' and
-           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
+           (('IACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
            not 'IPSEC' and
            not 'DOT1Q' and
            not 'VHOST'"
            not 'IPSEC' and
            not 'DOT1Q' and
            not 'VHOST'"
@@ -9165,19 +10269,18 @@
     title: "ip4-3n-hsw-x520-64b-1t1c-features-iacl-ndr"
     layout: "plot-throughput"
 
     title: "ip4-3n-hsw-x520-64b-1t1c-features-iacl-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-features-iacl-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-iacl-pdr"
   title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-features-iacl-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-iacl-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
            '1T1C' and
            'IP4FWD' and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
            '1T1C' and
            'IP4FWD' and
-           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
+           (('IACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
            not 'IPSEC' and
            not 'DOT1Q' and
            not 'VHOST'"
            not 'IPSEC' and
            not 'DOT1Q' and
            not 'VHOST'"
@@ -9199,19 +10302,18 @@
     title: "ip4-3n-hsw-x520-64b-1t1c-features-iacl-pdr"
     layout: "plot-throughput"
 
     title: "ip4-3n-hsw-x520-64b-1t1c-features-iacl-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-features-iacl-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-iacl-ndr"
   title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-features-iacl-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-iacl-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
            '2T2C' and
            'IP4FWD' and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
            '2T2C' and
            'IP4FWD' and
-           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
+           (('IACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
            not 'IPSEC' and
            not 'DOT1Q' and
            not 'VHOST'"
            not 'IPSEC' and
            not 'DOT1Q' and
            not 'VHOST'"
@@ -9233,19 +10335,18 @@
     title: "ip4-3n-hsw-x520-64b-2t2c-features-iacl-ndr"
     layout: "plot-throughput"
 
     title: "ip4-3n-hsw-x520-64b-2t2c-features-iacl-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-features-iacl-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-iacl-pdr"
   title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-features-iacl-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-iacl-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
            '2T2C' and
            'IP4FWD' and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
            '2T2C' and
            'IP4FWD' and
-           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
+           (('IACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
            not 'IPSEC' and
            not 'DOT1Q' and
            not 'VHOST'"
            not 'IPSEC' and
            not 'DOT1Q' and
            not 'VHOST'"
@@ -9268,19 +10369,18 @@
     layout: "plot-throughput"
 
 # Packet Throughput - VPP IPv4 3n-hsw-x520 features oacl
     layout: "plot-throughput"
 
 # Packet Throughput - VPP IPv4 3n-hsw-x520 features oacl
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-features-oacl-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-oacl-ndr"
   title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-features-oacl-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-oacl-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
            '1T1C' and
            'IP4FWD' and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
            '1T1C' and
            'IP4FWD' and
-           ('OACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
+           (('OACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
            not 'IPSEC' and
            not 'DOT1Q' and
            not 'VHOST'"
            not 'IPSEC' and
            not 'DOT1Q' and
            not 'VHOST'"
@@ -9302,19 +10402,18 @@
     title: "ip4-3n-hsw-x520-64b-1t1c-features-oacl-ndr"
     layout: "plot-throughput"
 
     title: "ip4-3n-hsw-x520-64b-1t1c-features-oacl-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-features-oacl-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-oacl-pdr"
   title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-features-oacl-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-oacl-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
            '1T1C' and
            'IP4FWD' and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
            '1T1C' and
            'IP4FWD' and
-           ('OACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
+           (('OACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
            not 'IPSEC' and
            not 'DOT1Q' and
            not 'VHOST'"
            not 'IPSEC' and
            not 'DOT1Q' and
            not 'VHOST'"
@@ -9336,19 +10435,18 @@
     title: "ip4-3n-hsw-x520-64b-1t1c-features-oacl-pdr"
     layout: "plot-throughput"
 
     title: "ip4-3n-hsw-x520-64b-1t1c-features-oacl-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-features-oacl-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-oacl-ndr"
   title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-features-oacl-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-oacl-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
            '2T2C' and
            'IP4FWD' and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
            '2T2C' and
            'IP4FWD' and
-           ('OACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
+           (('OACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
            not 'IPSEC' and
            not 'DOT1Q' and
            not 'VHOST'"
            not 'IPSEC' and
            not 'DOT1Q' and
            not 'VHOST'"
@@ -9370,19 +10468,18 @@
     title: "ip4-3n-hsw-x520-64b-2t2c-features-oacl-ndr"
     layout: "plot-throughput"
 
     title: "ip4-3n-hsw-x520-64b-2t2c-features-oacl-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-features-oacl-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-oacl-pdr"
   title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-features-oacl-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-oacl-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
            '2T2C' and
            'IP4FWD' and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
            '2T2C' and
            'IP4FWD' and
-           ('OACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
+           (('OACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
            not 'IPSEC' and
            not 'DOT1Q' and
            not 'VHOST'"
            not 'IPSEC' and
            not 'DOT1Q' and
            not 'VHOST'"
@@ -9405,13 +10502,12 @@
     layout: "plot-throughput"
 
 # Packet Throughput - VPP IPv4 3n-hsw-x710 base and scale
     layout: "plot-throughput"
 
 # Packet Throughput - VPP IPv4 3n-hsw-x710 base and scale
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
   title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
@@ -9438,13 +10534,12 @@
     title: "ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
     title: "ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
   title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
@@ -9471,13 +10566,12 @@
     title: "ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
     title: "ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
   title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
@@ -9504,13 +10598,12 @@
     title: "ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
     title: "ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
   title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
@@ -9538,20 +10631,19 @@
     layout: "plot-throughput"
 
 # Packet Throughput - VPP IPv4 3n-hsw-x710 features
     layout: "plot-throughput"
 
 # Packet Throughput - VPP IPv4 3n-hsw-x710 features
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-ndr"
   title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or
             'POLICE_MARK' or
             'COPWHLIST' or
             ('NAT44' and 'BASE') or
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or
             'POLICE_MARK' or
             'COPWHLIST' or
             ('NAT44' and 'BASE') or
-            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
+            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
            'NDRPDR' and
            '1T1C' and
            'IP4FWD' and
            'NDRPDR' and
            '1T1C' and
            'IP4FWD' and
@@ -9577,20 +10669,19 @@
     title: "ip4-3n-hsw-x710-64b-1t1c-features-ndr"
     layout: "plot-throughput"
 
     title: "ip4-3n-hsw-x710-64b-1t1c-features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-pdr"
   title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or
             'POLICE_MARK' or
             'COPWHLIST' or
             ('NAT44' and 'BASE') or
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or
             'POLICE_MARK' or
             'COPWHLIST' or
             ('NAT44' and 'BASE') or
-            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
+            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
            'NDRPDR' and
            '1T1C' and
            'IP4FWD' and
            'NDRPDR' and
            '1T1C' and
            'IP4FWD' and
@@ -9616,20 +10707,19 @@
     title: "ip4-3n-hsw-x710-64b-1t1c-features-pdr"
     layout: "plot-throughput"
 
     title: "ip4-3n-hsw-x710-64b-1t1c-features-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-ndr"
   title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or
             'POLICE_MARK' or
             'COPWHLIST' or
             ('NAT44' and 'BASE') or
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or
             'POLICE_MARK' or
             'COPWHLIST' or
             ('NAT44' and 'BASE') or
-            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
+            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
            'NDRPDR' and
            '2T2C' and
            'IP4FWD' and
            'NDRPDR' and
            '2T2C' and
            'IP4FWD' and
@@ -9655,20 +10745,19 @@
     title: "ip4-3n-hsw-x710-64b-2t2c-features-ndr"
     layout: "plot-throughput"
 
     title: "ip4-3n-hsw-x710-64b-2t2c-features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-pdr"
   title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or
             'POLICE_MARK' or
             'COPWHLIST' or
             ('NAT44' and 'BASE') or
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or
             'POLICE_MARK' or
             'COPWHLIST' or
             ('NAT44' and 'BASE') or
-            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
+            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
            'NDRPDR' and
            '2T2C' and
            'IP4FWD' and
            'NDRPDR' and
            '2T2C' and
            'IP4FWD' and
@@ -9695,13 +10784,12 @@
     layout: "plot-throughput"
 
 # Packet Throughput - VPP IPv4 3n-hsw-x710 features nat44
     layout: "plot-throughput"
 
 # Packet Throughput - VPP IPv4 3n-hsw-x710 features nat44
--
-  type: "plot"
+- 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"
   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"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -9729,13 +10817,12 @@
     title: "ip4-3n-skx-x710-64b-2t1c-features-nat44-ndr"
     layout: "plot-throughput"
 
     title: "ip4-3n-skx-x710-64b-2t1c-features-nat44-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- 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"
   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"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -9763,13 +10850,12 @@
     title: "ip4-3n-skx-x710-64b-2t1c-features-nat44-pdr"
     layout: "plot-throughput"
 
     title: "ip4-3n-skx-x710-64b-2t1c-features-nat44-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- 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"
   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"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -9797,13 +10883,12 @@
     title: "ip4-3n-skx-x710-64b-4t2c-features-nat44-ndr"
     layout: "plot-throughput"
 
     title: "ip4-3n-skx-x710-64b-4t2c-features-nat44-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- 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"
   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"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -9832,19 +10917,18 @@
     layout: "plot-throughput"
 
 # Packet Throughput - VPP IPv4 3n-hsw-x710 features iacl
     layout: "plot-throughput"
 
 # Packet Throughput - VPP IPv4 3n-hsw-x710 features iacl
--
-  type: "plot"
+- type: "plot"
   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-iacl-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-iacl-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
            '2T1C' and
            'IP4FWD' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
            '2T1C' and
            'IP4FWD' and
-           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
+           ('IACL' and ('ACL10' or 'ACL50') and '10K_FLOWS' or 'IP4BASE') and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -9865,19 +10949,18 @@
     title: "ip4-3n-skx-x710-64b-2t1c-features-iacl-ndr"
     layout: "plot-throughput"
 
     title: "ip4-3n-skx-x710-64b-2t1c-features-iacl-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   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-iacl-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-iacl-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
            '2T1C' and
            'IP4FWD' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
            '2T1C' and
            'IP4FWD' and
-           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
+           ('IACL' and ('ACL10' or 'ACL50') and '10K_FLOWS' or 'IP4BASE') and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -9898,19 +10981,18 @@
     title: "ip4-3n-skx-x710-64b-2t1c-features-iacl-pdr"
     layout: "plot-throughput"
 
     title: "ip4-3n-skx-x710-64b-2t1c-features-iacl-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   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-iacl-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-iacl-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
            '4T2C' and
            'IP4FWD' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
            '4T2C' and
            'IP4FWD' and
-           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
+           ('IACL' and ('ACL10' or 'ACL50') and '10K_FLOWS' or 'IP4BASE') and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -9931,19 +11013,18 @@
     title: "ip4-3n-skx-x710-64b-4t2c-features-iacl-ndr"
     layout: "plot-throughput"
 
     title: "ip4-3n-skx-x710-64b-4t2c-features-iacl-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   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-iacl-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-iacl-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
            '4T2C' and
            'IP4FWD' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
            '4T2C' and
            'IP4FWD' and
-           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
+           ('IACL' and ('ACL10' or 'ACL50') and '10K_FLOWS' or 'IP4BASE') and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -9965,13 +11046,12 @@
     layout: "plot-throughput"
 
 # Packet Throughput - VPP IPv4 3n-hsw-xl710 base and scale
     layout: "plot-throughput"
 
 # Packet Throughput - VPP IPv4 3n-hsw-xl710 base and scale
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip4-3n-hsw-xl710-64b-1t1c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-1t1c-base-ndr"
   title: "VPP Throughput: ip4-3n-hsw-xl710-64b-1t1c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-1t1c-base-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
   filter: "'NIC_Intel-XL710' and
            '64B' and
            ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
@@ -9997,13 +11077,12 @@
     title: "ip4-3n-hsw-xl710-64b-1t1c-base-ndr"
     layout: "plot-throughput"
 
     title: "ip4-3n-hsw-xl710-64b-1t1c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip4-3n-hsw-xl710-64b-1t1c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-1t1c-base-pdr"
   title: "VPP Throughput: ip4-3n-hsw-xl710-64b-1t1c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-1t1c-base-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
   filter: "'NIC_Intel-XL710' and
            '64B' and
            ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
@@ -10029,13 +11108,12 @@
     title: "ip4-3n-hsw-xl710-64b-1t1c-base-pdr"
     layout: "plot-throughput"
 
     title: "ip4-3n-hsw-xl710-64b-1t1c-base-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip4-3n-hsw-xl710-64b-2t2c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-2t2c-base-ndr"
   title: "VPP Throughput: ip4-3n-hsw-xl710-64b-2t2c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-2t2c-base-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
   filter: "'NIC_Intel-XL710' and
            '64B' and
            ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
@@ -10061,13 +11139,12 @@
     title: "ip4-3n-hsw-xl710-64b-2t2c-base-ndr"
     layout: "plot-throughput"
 
     title: "ip4-3n-hsw-xl710-64b-2t2c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip4-3n-hsw-xl710-64b-2t2c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-2t2c-base-pdr"
   title: "VPP Throughput: ip4-3n-hsw-xl710-64b-2t2c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-2t2c-base-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
   filter: "'NIC_Intel-XL710' and
            '64B' and
            ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
@@ -10094,13 +11171,12 @@
     layout: "plot-throughput"
 
 # Packet Throughput - VPP IPv4 3n-skx-x710 base and scale
     layout: "plot-throughput"
 
 # Packet Throughput - VPP IPv4 3n-skx-x710 base and scale
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
   title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
@@ -10127,13 +11203,12 @@
     title: "ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
     title: "ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
   title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
@@ -10160,13 +11235,12 @@
     title: "ip4-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
     title: "ip4-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
   title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
@@ -10193,13 +11267,12 @@
     title: "ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
     title: "ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
   title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
@@ -10227,20 +11300,19 @@
     layout: "plot-throughput"
 
 # Packet Throughput - VPP IPv4 3n-skx-x710 features
     layout: "plot-throughput"
 
 # Packet Throughput - VPP IPv4 3n-skx-x710 features
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-ndr"
   title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or
             'POLICE_MARK' or
             'COPWHLIST' or
             ('NAT44' and 'BASE') or
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or
             'POLICE_MARK' or
             'COPWHLIST' or
             ('NAT44' and 'BASE') or
-            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
+            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
            'NDRPDR' and
            '2T1C' and
            'IP4FWD' and
            'NDRPDR' and
            '2T1C' and
            'IP4FWD' and
@@ -10266,20 +11338,19 @@
     title: "ip4-3n-skx-x710-64b-2t1c-features-ndr"
     layout: "plot-throughput"
 
     title: "ip4-3n-skx-x710-64b-2t1c-features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-pdr"
   title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or
             'POLICE_MARK' or
             'COPWHLIST' or
             ('NAT44' and 'BASE') or
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or
             'POLICE_MARK' or
             'COPWHLIST' or
             ('NAT44' and 'BASE') or
-            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
+            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
            'NDRPDR' and
            '2T1C' and
            'IP4FWD' and
            'NDRPDR' and
            '2T1C' and
            'IP4FWD' and
@@ -10305,20 +11376,19 @@
     title: "ip4-3n-skx-x710-64b-2t1c-features-pdr"
     layout: "plot-throughput"
 
     title: "ip4-3n-skx-x710-64b-2t1c-features-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-ndr"
   title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or
             'POLICE_MARK' or
             'COPWHLIST' or
             ('NAT44' and 'BASE') or
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or
             'POLICE_MARK' or
             'COPWHLIST' or
             ('NAT44' and 'BASE') or
-            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
+            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
            'NDRPDR' and
            '4T2C' and
            'IP4FWD' and
            'NDRPDR' and
            '4T2C' and
            'IP4FWD' and
@@ -10344,20 +11414,19 @@
     title: "ip4-3n-skx-x710-64b-4t2c-features-ndr"
     layout: "plot-throughput"
 
     title: "ip4-3n-skx-x710-64b-4t2c-features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-pdr"
   title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or
             'POLICE_MARK' or
             'COPWHLIST' or
             ('NAT44' and 'BASE') or
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or
             'POLICE_MARK' or
             'COPWHLIST' or
             ('NAT44' and 'BASE') or
-            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
+            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
            'NDRPDR' and
            '4T2C' and
            'IP4FWD' and
            'NDRPDR' and
            '4T2C' and
            'IP4FWD' and
@@ -10384,13 +11453,12 @@
     layout: "plot-throughput"
 
 # Packet Throughput - VPP IPv4 3n-skx-x710 features nat44
     layout: "plot-throughput"
 
 # Packet Throughput - VPP IPv4 3n-skx-x710 features nat44
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-features-nat44-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-nat44-ndr"
   title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-features-nat44-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-nat44-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -10418,13 +11486,12 @@
     title: "ip4-3n-hsw-x710-64b-1t1c-features-nat44-ndr"
     layout: "plot-throughput"
 
     title: "ip4-3n-hsw-x710-64b-1t1c-features-nat44-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-features-nat44-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-nat44-pdr"
   title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-features-nat44-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-nat44-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -10452,13 +11519,12 @@
     title: "ip4-3n-hsw-x710-64b-1t1c-features-nat44-pdr"
     layout: "plot-throughput"
 
     title: "ip4-3n-hsw-x710-64b-1t1c-features-nat44-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-features-nat44-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-nat44-ndr"
   title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-features-nat44-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-nat44-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -10486,13 +11552,12 @@
     title: "ip4-3n-hsw-x710-64b-2t2c-features-nat44-ndr"
     layout: "plot-throughput"
 
     title: "ip4-3n-hsw-x710-64b-2t2c-features-nat44-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- 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"
   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"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -10521,19 +11586,18 @@
     layout: "plot-throughput"
 
 # Packet Throughput - VPP IPv4 3n-skx-x710 features iacl
     layout: "plot-throughput"
 
 # Packet Throughput - VPP IPv4 3n-skx-x710 features iacl
--
-  type: "plot"
+- 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"
   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"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
            '1T1C' and
            'IP4FWD' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
            '1T1C' and
            'IP4FWD' and
-           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
+           ('IACL' and ('ACL10' or 'ACL50') and '10K_FLOWS' or 'IP4BASE') and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -10554,19 +11618,18 @@
     title: "ip4-3n-hsw-x710-64b-1t1c-features-iacl-ndr"
     layout: "plot-throughput"
 
     title: "ip4-3n-hsw-x710-64b-1t1c-features-iacl-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- 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"
   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"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
            '1T1C' and
            'IP4FWD' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
            '1T1C' and
            'IP4FWD' and
-           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
+           ('IACL' and ('ACL10' or 'ACL50') and '10K_FLOWS' or 'IP4BASE') and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -10587,19 +11650,18 @@
     title: "ip4-3n-hsw-x710-64b-1t1c-features-iacl-pdr"
     layout: "plot-throughput"
 
     title: "ip4-3n-hsw-x710-64b-1t1c-features-iacl-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- 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"
   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"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
            '2T2C' and
            'IP4FWD' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
            '2T2C' and
            'IP4FWD' and
-           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
+           ('IACL' and ('ACL10' or 'ACL50') and '10K_FLOWS' or 'IP4BASE') and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -10620,19 +11682,18 @@
     title: "ip4-3n-hsw-x710-64b-2t2c-features-iacl-ndr"
     layout: "plot-throughput"
 
     title: "ip4-3n-hsw-x710-64b-2t2c-features-iacl-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   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-iacl-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-iacl-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
            '2T2C' and
            'IP4FWD' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
            '2T2C' and
            'IP4FWD' and
-           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
+           ('IACL' and ('ACL10' or 'ACL50') and '10K_FLOWS' or 'IP4BASE') and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -10654,16 +11715,15 @@
     layout: "plot-throughput"
 
 # Packet Throughput - VPP IPv4 2n-skx-x710 base and scale
     layout: "plot-throughput"
 
 # Packet Throughput - VPP IPv4 2n-skx-x710 base and scale
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
   title: "VPP Throughput: ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
   filter: "'NIC_Intel-X710' and
            '64B' and
-           ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            '2T1C' and
            'IP4FWD' and
            'NDRPDR' and
            '2T1C' and
            'IP4FWD' and
@@ -10676,8 +11736,8 @@
   - "tags"
   sort:
   - "IP4BASE"
   - "tags"
   sort:
   - "IP4BASE"
-  - "FIB_20k"
-  - "FIB_200k"
+  - "FIB_20K"
+  - "FIB_200K"
   - "FIB_2M"
   traces:
     hoverinfo: "x+y"
   - "FIB_2M"
   traces:
     hoverinfo: "x+y"
@@ -10687,16 +11747,15 @@
     title: "ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
     title: "ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip4-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
   title: "VPP Throughput: ip4-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
   filter: "'NIC_Intel-X710' and
            '64B' and
-           ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            '2T1C' and
            'IP4FWD' and
            'NDRPDR' and
            '2T1C' and
            'IP4FWD' and
@@ -10709,8 +11768,8 @@
   - "tags"
   sort:
   - "IP4BASE"
   - "tags"
   sort:
   - "IP4BASE"
-  - "FIB_20k"
-  - "FIB_200k"
+  - "FIB_20K"
+  - "FIB_200K"
   - "FIB_2M"
   traces:
     hoverinfo: "x+y"
   - "FIB_2M"
   traces:
     hoverinfo: "x+y"
@@ -10720,16 +11779,15 @@
     title: "ip4-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
     title: "ip4-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
   title: "VPP Throughput: ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
   filter: "'NIC_Intel-X710' and
            '64B' and
-           ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            '4T2C' and
            'IP4FWD' and
            'NDRPDR' and
            '4T2C' and
            'IP4FWD' and
@@ -10742,8 +11800,8 @@
   - "tags"
   sort:
   - "IP4BASE"
   - "tags"
   sort:
   - "IP4BASE"
-  - "FIB_20k"
-  - "FIB_200k"
+  - "FIB_20K"
+  - "FIB_200K"
   - "FIB_2M"
   traces:
     hoverinfo: "x+y"
   - "FIB_2M"
   traces:
     hoverinfo: "x+y"
@@ -10753,16 +11811,15 @@
     title: "ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
     title: "ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip4-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
   title: "VPP Throughput: ip4-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
   filter: "'NIC_Intel-X710' and
            '64B' and
-           ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            '4T2C' and
            'IP4FWD' and
            'NDRPDR' and
            '4T2C' and
            'IP4FWD' and
@@ -10775,8 +11832,8 @@
   - "tags"
   sort:
   - "IP4BASE"
   - "tags"
   sort:
   - "IP4BASE"
-  - "FIB_20k"
-  - "FIB_200k"
+  - "FIB_20K"
+  - "FIB_200K"
   - "FIB_2M"
   traces:
     hoverinfo: "x+y"
   - "FIB_2M"
   traces:
     hoverinfo: "x+y"
@@ -10786,17 +11843,16 @@
     title: "ip4-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
     title: "ip4-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - VPP IPv4 2n-skx-xxv710 base and scale
--
-  type: "plot"
-  title: "VPP Throughput: ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
+# Packet Throughput - VPP IPv4 2n-skx-x710 features iacl
+- type: "plot"
+  title: "VPP Throughput: ip4-2n-skx-x710-64b-2t1c-features-iacl-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-2t1c-features-iacl-ndr"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            '64B' and
-           ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
+           (('IACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
            'NDRPDR' and
            '2T1C' and
            'IP4FWD' and
            'NDRPDR' and
            '2T1C' and
            'IP4FWD' and
@@ -10809,27 +11865,27 @@
   - "tags"
   sort:
   - "IP4BASE"
   - "tags"
   sort:
   - "IP4BASE"
-  - "FIB_20k"
-  - "FIB_200k"
-  - "FIB_2M"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
+    title: "ip4-2n-skx-x710-64b-2t1c-features-iacl-ndr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
+- type: "plot"
+  title: "VPP Throughput: ip4-2n-skx-x710-64b-2t1c-features-iacl-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-2t1c-features-iacl-pdr"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            '64B' and
-           ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
+           (('IACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
            'NDRPDR' and
            '2T1C' and
            'IP4FWD' and
            'NDRPDR' and
            '2T1C' and
            'IP4FWD' and
@@ -10842,27 +11898,27 @@
   - "tags"
   sort:
   - "IP4BASE"
   - "tags"
   sort:
   - "IP4BASE"
-  - "FIB_20k"
-  - "FIB_200k"
-  - "FIB_2M"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
+    title: "ip4-2n-skx-x710-64b-2t1c-features-iacl-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
+- type: "plot"
+  title: "VPP Throughput: ip4-2n-skx-x710-64b-4t2c-features-iacl-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-4t2c-features-iacl-ndr"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            '64B' and
-           ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
+           (('IACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
            'NDRPDR' and
            '4T2C' and
            'IP4FWD' and
            'NDRPDR' and
            '4T2C' and
            'IP4FWD' and
@@ -10875,27 +11931,27 @@
   - "tags"
   sort:
   - "IP4BASE"
   - "tags"
   sort:
   - "IP4BASE"
-  - "FIB_20k"
-  - "FIB_200k"
-  - "FIB_2M"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
+    title: "ip4-2n-skx-x710-64b-4t2c-features-iacl-ndr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
+- type: "plot"
+  title: "VPP Throughput: ip4-2n-skx-x710-64b-4t2c-features-iacl-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-4t2c-features-iacl-pdr"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            '64B' and
-           ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
+           (('IACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
            'NDRPDR' and
            '4T2C' and
            'IP4FWD' and
            'NDRPDR' and
            '4T2C' and
            'IP4FWD' and
@@ -10908,32 +11964,33 @@
   - "tags"
   sort:
   - "IP4BASE"
   - "tags"
   sort:
   - "IP4BASE"
-  - "FIB_20k"
-  - "FIB_200k"
-  - "FIB_2M"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
+    title: "ip4-2n-skx-x710-64b-4t2c-features-iacl-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
-# Packet Throughput - VPP IPv4 2n-dnv-x553 base and scale
--
-  type: "plot"
-  title: "VPP Throughput: ip4-2n-dnv-x553-64b-1t1c-base-ndr"
+# Packet Throughput - VPP IPv4 2n-skx-xxv710 base and scale
+- type: "plot"
+  title: "VPP Throughput: ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-dnv-x553-64b-1t1c-base-ndr"
-  data: "intel-dnv-vpp"
-  filter: "'NIC_Intel-X553' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
            '64B' and
-           'IP4BASE' and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            'NDRPDR' and
-           '1T1C' and
+           '2T1C' and
            'IP4FWD' and
            not 'IPSEC' and
            'IP4FWD' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "throughput"
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -10941,28 +11998,31 @@
   - "tags"
   sort:
   - "IP4BASE"
   - "tags"
   sort:
   - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-2n-dnv-x553-64b-1t1c-base-ndr"
+    title: "ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4-2n-dnv-x553-64b-1t1c-base-pdr"
+- type: "plot"
+  title: "VPP Throughput: ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-dnv-x553-64b-1t1c-base-pdr"
-  data: "intel-dnv-vpp"
-  filter: "'NIC_Intel-X553' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
            '64B' and
-           'IP4BASE' and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            'NDRPDR' and
-           '1T1C' and
+           '2T1C' and
            'IP4FWD' and
            not 'IPSEC' and
            'IP4FWD' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "throughput"
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -10970,28 +12030,31 @@
   - "tags"
   sort:
   - "IP4BASE"
   - "tags"
   sort:
   - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-2n-dnv-x553-64b-1t1c-base-pdr"
+    title: "ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4-2n-dnv-x553-64b-2t2c-base-ndr"
+- type: "plot"
+  title: "VPP Throughput: ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-dnv-x553-64b-2t2c-base-ndr"
-  data: "intel-dnv-vpp"
-  filter: "'NIC_Intel-X553' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
            '64B' and
-           'IP4BASE' and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            'NDRPDR' and
-           '2T2C' and
+           '4T2C' and
            'IP4FWD' and
            not 'IPSEC' and
            'IP4FWD' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "throughput"
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -10999,28 +12062,31 @@
   - "tags"
   sort:
   - "IP4BASE"
   - "tags"
   sort:
   - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-2n-dnv-x553-64b-2t2c-base-ndr"
+    title: "ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip4-2n-dnv-x553-64b-2t2c-base-pdr"
+- type: "plot"
+  title: "VPP Throughput: ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-dnv-x553-64b-2t2c-base-pdr"
-  data: "intel-dnv-vpp"
-  filter: "'NIC_Intel-X553' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
            '64B' and
-           'IP4BASE' and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            'NDRPDR' and
-           '2T2C' and
+           '4T2C' and
            'IP4FWD' and
            not 'IPSEC' and
            'IP4FWD' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "throughput"
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -11028,24 +12094,139 @@
   - "tags"
   sort:
   - "IP4BASE"
   - "tags"
   sort:
   - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-2n-dnv-x553-64b-2t2c-base-pdr"
+    title: "ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
+## Packet Throughput - VPP IPv4 2n-dnv-x553 base and scale
+#- type: "plot"
+#  title: "VPP Throughput: ip4-2n-dnv-x553-64b-1t1c-base-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip4-2n-dnv-x553-64b-1t1c-base-ndr"
+#  data: "intel-dnv-vpp"
+#  filter: "'NIC_Intel-X553' and
+#           '64B' and
+#           'IP4BASE' and
+#           'NDRPDR' and
+#           '1T1C' and
+#           'IP4FWD' and
+#           not 'IPSEC' and
+#           not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "IP4BASE"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "ip4-2n-dnv-x553-64b-1t1c-base-ndr"
+#    layout: "plot-throughput"
+#
+#- type: "plot"
+#  title: "VPP Throughput: ip4-2n-dnv-x553-64b-1t1c-base-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip4-2n-dnv-x553-64b-1t1c-base-pdr"
+#  data: "intel-dnv-vpp"
+#  filter: "'NIC_Intel-X553' and
+#           '64B' and
+#           'IP4BASE' and
+#           'NDRPDR' and
+#           '1T1C' and
+#           'IP4FWD' and
+#           not 'IPSEC' and
+#           not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "IP4BASE"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "ip4-2n-dnv-x553-64b-1t1c-base-pdr"
+#    layout: "plot-throughput"
+#
+#- type: "plot"
+#  title: "VPP Throughput: ip4-2n-dnv-x553-64b-2t2c-base-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip4-2n-dnv-x553-64b-2t2c-base-ndr"
+#  data: "intel-dnv-vpp"
+#  filter: "'NIC_Intel-X553' and
+#           '64B' and
+#           'IP4BASE' and
+#           'NDRPDR' and
+#           '2T2C' and
+#           'IP4FWD' and
+#           not 'IPSEC' and
+#           not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "IP4BASE"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "ip4-2n-dnv-x553-64b-2t2c-base-ndr"
+#    layout: "plot-throughput"
+#
+#- type: "plot"
+#  title: "VPP Throughput: ip4-2n-dnv-x553-64b-2t2c-base-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip4-2n-dnv-x553-64b-2t2c-base-pdr"
+#  data: "intel-dnv-vpp"
+#  filter: "'NIC_Intel-X553' and
+#           '64B' and
+#           'IP4BASE' and
+#           'NDRPDR' and
+#           '2T2C' and
+#           'IP4FWD' and
+#           not 'IPSEC' and
+#           not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "IP4BASE"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "ip4-2n-dnv-x553-64b-2t2c-base-pdr"
+#    layout: "plot-throughput"
+
 ################################################################################
 
 # Packet Throughput - VPP IPv4 tunnels 3n-hsw-x520 - features
 ################################################################################
 
 # Packet Throughput - VPP IPv4 tunnels 3n-hsw-x520 - features
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip4tun-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
   title: "VPP Throughput: ip4tun-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'ENCAP' and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'ENCAP' and
@@ -11072,13 +12253,12 @@
     title: "ip4tun-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
     layout: "plot-throughput"
 
     title: "ip4tun-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip4tun-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
   title: "VPP Throughput: ip4tun-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'ENCAP' and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'ENCAP' and
@@ -11105,13 +12285,12 @@
     title: "ip4tun-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
     layout: "plot-throughput"
 
     title: "ip4tun-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip4tun-3n-hsw-x520-64b-1t1c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-1t1c-base_and_features-pdr"
   title: "VPP Throughput: ip4tun-3n-hsw-x520-64b-1t1c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-1t1c-base_and_features-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'ENCAP' and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'ENCAP' and
@@ -11138,13 +12317,12 @@
     title: "ip4tun-3n-hsw-x520-64b-1t1c-base_and_features-pdr"
     layout: "plot-throughput"
 
     title: "ip4tun-3n-hsw-x520-64b-1t1c-base_and_features-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip4tun-3n-hsw-x520-64b-2t2c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-2t2c-base_and_features-pdr"
   title: "VPP Throughput: ip4tun-3n-hsw-x520-64b-2t2c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-2t2c-base_and_features-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'ENCAP' and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'ENCAP' and
@@ -11172,13 +12350,12 @@
     layout: "plot-throughput"
 
 # Packet Throughput - VPP IPv4 tunnels 3n-hsw-x710 base and scale
     layout: "plot-throughput"
 
 # Packet Throughput - VPP IPv4 tunnels 3n-hsw-x710 base and scale
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
   title: "VPP Throughput: ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
@@ -11206,13 +12383,12 @@
     title: "ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
     title: "ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
   title: "VPP Throughput: ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
@@ -11240,13 +12416,12 @@
     title: "ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
     title: "ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
   title: "VPP Throughput: ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
@@ -11274,13 +12449,12 @@
     title: "ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
     title: "ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
   title: "VPP Throughput: ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
@@ -11309,13 +12483,12 @@
     layout: "plot-throughput"
 
 # Packet Throughput - VPP IPv4 tunnels 3n-hsw-x710 - features
     layout: "plot-throughput"
 
 # Packet Throughput - VPP IPv4 tunnels 3n-hsw-x710 - features
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
   title: "VPP Throughput: ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
@@ -11342,13 +12515,12 @@
     title: "ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
     layout: "plot-throughput"
 
     title: "ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip4tun-3n-hsw-x710-64b-2t2c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-2t2c-base_and_features-ndr"
   title: "VPP Throughput: ip4tun-3n-hsw-x710-64b-2t2c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-2t2c-base_and_features-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
@@ -11375,13 +12547,12 @@
     title: "ip4tun-3n-hsw-x710-64b-2t2c-base_and_features-ndr"
     layout: "plot-throughput"
 
     title: "ip4tun-3n-hsw-x710-64b-2t2c-base_and_features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-pdr"
   title: "VPP Throughput: ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
@@ -11408,13 +12579,12 @@
     title: "ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-pdr"
     layout: "plot-throughput"
 
     title: "ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip4tun-3n-hsw-x710-64b-2t2c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-2t2c-base_and_features-pdr"
   title: "VPP Throughput: ip4tun-3n-hsw-x710-64b-2t2c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-2t2c-base_and_features-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
@@ -11442,13 +12612,12 @@
     layout: "plot-throughput"
 
 # Packet Throughput - VPP IPv4 tunnels 3n-skx-x710 base and scale
     layout: "plot-throughput"
 
 # Packet Throughput - VPP IPv4 tunnels 3n-skx-x710 base and scale
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
   title: "VPP Throughput: ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
@@ -11476,13 +12645,12 @@
     title: "ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
     title: "ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
   title: "VPP Throughput: ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
@@ -11510,13 +12678,12 @@
     title: "ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
     title: "ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
   title: "VPP Throughput: ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
@@ -11544,13 +12711,12 @@
     title: "ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
     title: "ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
   title: "VPP Throughput: ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
@@ -11579,13 +12745,12 @@
     layout: "plot-throughput"
 
 # Packet Throughput - VPP IPv4 tunnels 3n-skx-x710 - features
     layout: "plot-throughput"
 
 # Packet Throughput - VPP IPv4 tunnels 3n-skx-x710 - features
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip4tun-3n-skx-x710-64b-2t1c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-2t1c-base_and_features-ndr"
   title: "VPP Throughput: ip4tun-3n-skx-x710-64b-2t1c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-2t1c-base_and_features-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
@@ -11612,13 +12777,12 @@
     title: "ip4tun-3n-skx-x710-64b-2t1c-base_and_features-ndr"
     layout: "plot-throughput"
 
     title: "ip4tun-3n-skx-x710-64b-2t1c-base_and_features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip4tun-3n-skx-x710-64b-4t2c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-4t2c-base_and_features-ndr"
   title: "VPP Throughput: ip4tun-3n-skx-x710-64b-4t2c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-4t2c-base_and_features-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
@@ -11645,13 +12809,12 @@
     title: "ip4tun-3n-skx-x710-64b-4t2c-base_and_features-ndr"
     layout: "plot-throughput"
 
     title: "ip4tun-3n-skx-x710-64b-4t2c-base_and_features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip4tun-3n-skx-x710-64b-2t1c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-2t1c-base_and_features-pdr"
   title: "VPP Throughput: ip4tun-3n-skx-x710-64b-2t1c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-2t1c-base_and_features-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
@@ -11678,13 +12841,12 @@
     title: "ip4tun-3n-skx-x710-64b-2t1c-base_and_features-pdr"
     layout: "plot-throughput"
 
     title: "ip4tun-3n-skx-x710-64b-2t1c-base_and_features-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip4tun-3n-skx-x710-64b-4t2c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-4t2c-base_and_features-pdr"
   title: "VPP Throughput: ip4tun-3n-skx-x710-64b-4t2c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-4t2c-base_and_features-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
@@ -11714,13 +12876,12 @@
 ################################################################################
 
 # Packet Throughput - VPP IPv6 3n-hsw-x520
 ################################################################################
 
 # Packet Throughput - VPP IPv6 3n-hsw-x520
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip6-3n-hsw-x520-78b-1t1c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-1t1c-base-ndr"
   title: "VPP Throughput: ip6-3n-hsw-x520-78b-1t1c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-1t1c-base-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
            ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
            ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
@@ -11747,13 +12908,12 @@
     title: "ip6-3n-hsw-x520-78b-1t1c-base-ndr"
     layout: "plot-throughput"
 
     title: "ip6-3n-hsw-x520-78b-1t1c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip6-3n-hsw-x520-78b-1t1c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-1t1c-base-pdr"
   title: "VPP Throughput: ip6-3n-hsw-x520-78b-1t1c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-1t1c-base-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
            ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
            ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
@@ -11780,13 +12940,12 @@
     title: "ip6-3n-hsw-x520-78b-1t1c-base-pdr"
     layout: "plot-throughput"
 
     title: "ip6-3n-hsw-x520-78b-1t1c-base-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip6-3n-hsw-x520-78b-2t2c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-2t2c-base-ndr"
   title: "VPP Throughput: ip6-3n-hsw-x520-78b-2t2c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-2t2c-base-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
            ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
            ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
@@ -11813,13 +12972,12 @@
     title: "ip6-3n-hsw-x520-78b-2t2c-base-ndr"
     layout: "plot-throughput"
 
     title: "ip6-3n-hsw-x520-78b-2t2c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip6-3n-hsw-x520-78b-2t2c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-2t2c-base-pdr"
   title: "VPP Throughput: ip6-3n-hsw-x520-78b-2t2c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-2t2c-base-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
            ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
            ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
@@ -11847,13 +13005,12 @@
     layout: "plot-throughput"
 
 # Packet Throughput - VPP IPv6 3n-hsw-x710
     layout: "plot-throughput"
 
 # Packet Throughput - VPP IPv6 3n-hsw-x710
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip6-3n-hsw-x710-78b-1t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-1t1c-base_and_scale-ndr"
   title: "VPP Throughput: ip6-3n-hsw-x710-78b-1t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-1t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
@@ -11880,13 +13037,12 @@
     title: "ip6-3n-hsw-x710-78b-1t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
     title: "ip6-3n-hsw-x710-78b-1t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip6-3n-hsw-x710-78b-1t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-1t1c-base_and_scale-pdr"
   title: "VPP Throughput: ip6-3n-hsw-x710-78b-1t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-1t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
@@ -11913,13 +13069,12 @@
     title: "ip6-3n-hsw-x710-78b-1t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
     title: "ip6-3n-hsw-x710-78b-1t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip6-3n-hsw-x710-78b-2t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-2t2c-base_and_scale-ndr"
   title: "VPP Throughput: ip6-3n-hsw-x710-78b-2t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-2t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
@@ -11946,13 +13101,12 @@
     title: "ip6-3n-hsw-x710-78b-2t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
     title: "ip6-3n-hsw-x710-78b-2t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip6-3n-hsw-x710-78b-2t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-2t2c-base_and_scale-pdr"
   title: "VPP Throughput: ip6-3n-hsw-x710-78b-2t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-2t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
@@ -11980,13 +13134,12 @@
     layout: "plot-throughput"
 
 # Packet Throughput - VPP IPv6 3n-hsw-x710 - features
     layout: "plot-throughput"
 
 # Packet Throughput - VPP IPv6 3n-hsw-x710 - features
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip6-3n-hsw-x710-78b-1t1c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-1t1c-base_and_features-ndr"
   title: "VPP Throughput: ip6-3n-hsw-x710-78b-1t1c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-1t1c-base_and_features-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('IP6BASE' or
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('IP6BASE' or
@@ -12016,13 +13169,12 @@
     title: "ip6-3n-hsw-x710-78b-1t1c-base_and_features-ndr"
     layout: "plot-throughput"
 
     title: "ip6-3n-hsw-x710-78b-1t1c-base_and_features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip6-3n-hsw-x710-78b-2t2c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-2t2c-base_and_features-ndr"
   title: "VPP Throughput: ip6-3n-hsw-x710-78b-2t2c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-2t2c-base_and_features-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('IP6BASE' or
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('IP6BASE' or
@@ -12052,13 +13204,12 @@
     title: "ip6-3n-hsw-x710-78b-2t2c-base_and_features-ndr"
     layout: "plot-throughput"
 
     title: "ip6-3n-hsw-x710-78b-2t2c-base_and_features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip6-3n-hsw-x710-78b-1t1c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-1t1c-base_and_features-pdr"
   title: "VPP Throughput: ip6-3n-hsw-x710-78b-1t1c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-1t1c-base_and_features-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('IP6BASE' or
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('IP6BASE' or
@@ -12088,13 +13239,12 @@
     title: "ip6-3n-hsw-x710-78b-1t1c-base_and_features-pdr"
     layout: "plot-throughput"
 
     title: "ip6-3n-hsw-x710-78b-1t1c-base_and_features-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip6-3n-hsw-x710-78b-2t2c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-2t2c-base_and_features-pdr"
   title: "VPP Throughput: ip6-3n-hsw-x710-78b-2t2c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-2t2c-base_and_features-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('IP6BASE' or
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('IP6BASE' or
@@ -12125,13 +13275,12 @@
     layout: "plot-throughput"
 
 # Packet Throughput - VPP IPv6 3n-hsw-xl710
     layout: "plot-throughput"
 
 # Packet Throughput - VPP IPv6 3n-hsw-xl710
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip6-3n-hsw-xl710-78b-1t1c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-1t1c-base-ndr"
   title: "VPP Throughput: ip6-3n-hsw-xl710-78b-1t1c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-1t1c-base-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '78B' and
            ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
   filter: "'NIC_Intel-XL710' and
            '78B' and
            ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
@@ -12158,13 +13307,12 @@
     title: "ip6-3n-hsw-xl710-78b-1t1c-base-ndr"
     layout: "plot-throughput"
 
     title: "ip6-3n-hsw-xl710-78b-1t1c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip6-3n-hsw-xl710-78b-1t1c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-1t1c-base-pdr"
   title: "VPP Throughput: ip6-3n-hsw-xl710-78b-1t1c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-1t1c-base-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '78B' and
            ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
   filter: "'NIC_Intel-XL710' and
            '78B' and
            ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
@@ -12191,13 +13339,12 @@
     title: "ip6-3n-hsw-xl710-78b-1t1c-base-pdr"
     layout: "plot-throughput"
 
     title: "ip6-3n-hsw-xl710-78b-1t1c-base-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip6-3n-hsw-xl710-78b-2t2c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-2t2c-base-ndr"
   title: "VPP Throughput: ip6-3n-hsw-xl710-78b-2t2c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-2t2c-base-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '78B' and
            ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
   filter: "'NIC_Intel-XL710' and
            '78B' and
            ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
@@ -12224,13 +13371,12 @@
     title: "ip6-3n-hsw-xl710-78b-2t2c-base-ndr"
     layout: "plot-throughput"
 
     title: "ip6-3n-hsw-xl710-78b-2t2c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip6-3n-hsw-xl710-78b-2t2c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-2t2c-base-pdr"
   title: "VPP Throughput: ip6-3n-hsw-xl710-78b-2t2c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-2t2c-base-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '78B' and
            ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
   filter: "'NIC_Intel-XL710' and
            '78B' and
            ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
@@ -12258,13 +13404,12 @@
     layout: "plot-throughput"
 
 # Packet Throughput - VPP IPv6 3n-skx-x710
     layout: "plot-throughput"
 
 # Packet Throughput - VPP IPv6 3n-skx-x710
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip6-3n-skx-x710-78b-2t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-2t1c-base_and_scale-ndr"
   title: "VPP Throughput: ip6-3n-skx-x710-78b-2t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
@@ -12280,8 +13425,8 @@
   - "tags"
   sort:
   - "IP6BASE"
   - "tags"
   sort:
   - "IP6BASE"
-  - "FIB_20k"
-  - "FIB_200k"
+  - "FIB_20K"
+  - "FIB_200K"
   - "FIB_2M"
   traces:
     hoverinfo: "x+y"
   - "FIB_2M"
   traces:
     hoverinfo: "x+y"
@@ -12291,13 +13436,12 @@
     title: "ip6-3n-skx-x710-78b-2t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
     title: "ip6-3n-skx-x710-78b-2t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip6-3n-skx-x710-78b-2t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-2t1c-base_and_scale-pdr"
   title: "VPP Throughput: ip6-3n-skx-x710-78b-2t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
@@ -12313,8 +13457,8 @@
   - "tags"
   sort:
   - "IP6BASE"
   - "tags"
   sort:
   - "IP6BASE"
-  - "FIB_20k"
-  - "FIB_200k"
+  - "FIB_20K"
+  - "FIB_200K"
   - "FIB_2M"
   traces:
     hoverinfo: "x+y"
   - "FIB_2M"
   traces:
     hoverinfo: "x+y"
@@ -12324,13 +13468,12 @@
     title: "ip6-3n-skx-x710-78b-2t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
     title: "ip6-3n-skx-x710-78b-2t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip6-3n-skx-x710-78b-4t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-4t2c-base_and_scale-ndr"
   title: "VPP Throughput: ip6-3n-skx-x710-78b-4t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
@@ -12346,8 +13489,8 @@
   - "tags"
   sort:
   - "IP6BASE"
   - "tags"
   sort:
   - "IP6BASE"
-  - "FIB_20k"
-  - "FIB_200k"
+  - "FIB_20K"
+  - "FIB_200K"
   - "FIB_2M"
   traces:
     hoverinfo: "x+y"
   - "FIB_2M"
   traces:
     hoverinfo: "x+y"
@@ -12357,13 +13500,12 @@
     title: "ip6-3n-skx-x710-78b-4t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
     title: "ip6-3n-skx-x710-78b-4t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip6-3n-skx-x710-78b-4t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-4t2c-base_and_scale-pdr"
   title: "VPP Throughput: ip6-3n-skx-x710-78b-4t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
@@ -12379,8 +13521,8 @@
   - "tags"
   sort:
   - "IP6BASE"
   - "tags"
   sort:
   - "IP6BASE"
-  - "FIB_20k"
-  - "FIB_200k"
+  - "FIB_20K"
+  - "FIB_200K"
   - "FIB_2M"
   traces:
     hoverinfo: "x+y"
   - "FIB_2M"
   traces:
     hoverinfo: "x+y"
@@ -12391,13 +13533,12 @@
     layout: "plot-throughput"
 
 # Packet Throughput - VPP IPv6 3n-skx-x710 - features
     layout: "plot-throughput"
 
 # Packet Throughput - VPP IPv6 3n-skx-x710 - features
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip6-3n-skx-x710-78b-2t1c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-2t1c-base_and_features-ndr"
   title: "VPP Throughput: ip6-3n-skx-x710-78b-2t1c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-2t1c-base_and_features-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('IP6BASE' or
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('IP6BASE' or
@@ -12427,13 +13568,12 @@
     title: "ip6-3n-skx-x710-78b-2t1c-base_and_features-ndr"
     layout: "plot-throughput"
 
     title: "ip6-3n-skx-x710-78b-2t1c-base_and_features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip6-3n-skx-x710-78b-4t2c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-4t2c-base_and_features-ndr"
   title: "VPP Throughput: ip6-3n-skx-x710-78b-4t2c-base_and_features-ndr"
   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-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('IP6BASE' or
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('IP6BASE' or
@@ -12463,13 +13603,12 @@
     title: "ip6-3n-skx-x710-78b-4t2c-base_and_features-ndr"
     layout: "plot-throughput"
 
     title: "ip6-3n-skx-x710-78b-4t2c-base_and_features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip6-3n-skx-x710-78b-2t1c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-2t1c-base_and_features-pdr"
   title: "VPP Throughput: ip6-3n-skx-x710-78b-2t1c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-2t1c-base_and_features-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('IP6BASE' or
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('IP6BASE' or
@@ -12499,13 +13638,12 @@
     title: "ip6-3n-skx-x710-78b-2t1c-base_and_features-pdr"
     layout: "plot-throughput"
 
     title: "ip6-3n-skx-x710-78b-2t1c-base_and_features-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip6-3n-skx-x710-78b-4t2c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-4t2c-base_and_features-pdr"
   title: "VPP Throughput: ip6-3n-skx-x710-78b-4t2c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-4t2c-base_and_features-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('IP6BASE' or
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('IP6BASE' or
@@ -12535,17 +13673,16 @@
     title: "ip6-3n-skx-x710-78b-4t2c-base_and_features-pdr"
     layout: "plot-throughput"
 
     title: "ip6-3n-skx-x710-78b-4t2c-base_and_features-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - VPP IPv6 2n-skx-x710
--
-  type: "plot"
-  title: "VPP Throughput: ip6-2n-skx-x710-78b-2t1c-base_and_scale-ndr"
+# Packet Throughput - VPP IPv6 3n-skx-xxv710
+- type: "plot"
+  title: "VPP Throughput: ip6-3n-skx-xxv710-78b-2t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-xxv710-78b-2t1c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '78B' and
            '78B' and
-           ('IP6BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            '2T1C' and
            'IP6FWD' and
            'NDRPDR' and
            '2T1C' and
            'IP6FWD' and
@@ -12558,27 +13695,26 @@
   - "tags"
   sort:
   - "IP6BASE"
   - "tags"
   sort:
   - "IP6BASE"
-  - "FIB_20k"
-  - "FIB_200k"
+  - "FIB_20K"
+  - "FIB_200K"
   - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-2n-skx-x710-78b-2t1c-base_and_scale-ndr"
+    title: "ip6-3n-skx-xxv710-78b-2t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip6-2n-skx-x710-78b-2t1c-base_and_scale-pdr"
+- type: "plot"
+  title: "VPP Throughput: ip6-3n-skx-xxv710-78b-2t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-xxv710-78b-2t1c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '78B' and
            '78B' and
-           ('IP6BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            '2T1C' and
            'IP6FWD' and
            'NDRPDR' and
            '2T1C' and
            'IP6FWD' and
@@ -12591,27 +13727,26 @@
   - "tags"
   sort:
   - "IP6BASE"
   - "tags"
   sort:
   - "IP6BASE"
-  - "FIB_20k"
-  - "FIB_200k"
+  - "FIB_20K"
+  - "FIB_200K"
   - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-2n-skx-x710-78b-2t1c-base_and_scale-pdr"
+    title: "ip6-3n-skx-xxv710-78b-2t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip6-2n-skx-x710-78b-4t2c-base_and_scale-ndr"
+- type: "plot"
+  title: "VPP Throughput: ip6-3n-skx-xxv710-78b-4t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-xxv710-78b-4t2c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '78B' and
            '78B' and
-           ('IP6BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            '4T2C' and
            'IP6FWD' and
            'NDRPDR' and
            '4T2C' and
            'IP6FWD' and
@@ -12624,27 +13759,26 @@
   - "tags"
   sort:
   - "IP6BASE"
   - "tags"
   sort:
   - "IP6BASE"
-  - "FIB_20k"
-  - "FIB_200k"
+  - "FIB_20K"
+  - "FIB_200K"
   - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-2n-skx-x710-78b-4t2c-base_and_scale-ndr"
+    title: "ip6-3n-skx-xxv710-78b-4t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip6-2n-skx-x710-78b-4t2c-base_and_scale-pdr"
+- type: "plot"
+  title: "VPP Throughput: ip6-3n-skx-xxv710-78b-4t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-xxv710-78b-4t2c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '78B' and
            '78B' and
-           ('IP6BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            '4T2C' and
            'IP6FWD' and
            'NDRPDR' and
            '4T2C' and
            'IP6FWD' and
@@ -12657,28 +13791,27 @@
   - "tags"
   sort:
   - "IP6BASE"
   - "tags"
   sort:
   - "IP6BASE"
-  - "FIB_20k"
-  - "FIB_200k"
+  - "FIB_20K"
+  - "FIB_200K"
   - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-2n-skx-x710-78b-4t2c-base_and_scale-pdr"
+    title: "ip6-3n-skx-xxv710-78b-4t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
-# Packet Throughput - VPP IPv6 2n-skx-xxv710
--
-  type: "plot"
-  title: "VPP Throughput: ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr"
+# Packet Throughput - VPP IPv6 2n-skx-x710
+- type: "plot"
+  title: "VPP Throughput: ip6-2n-skx-x710-78b-2t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-2t1c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  filter: "'NIC_Intel-X710' and
            '78B' and
            '78B' and
-           ('IP6BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            '2T1C' and
            'IP6FWD' and
            'NDRPDR' and
            '2T1C' and
            'IP6FWD' and
@@ -12691,27 +13824,26 @@
   - "tags"
   sort:
   - "IP6BASE"
   - "tags"
   sort:
   - "IP6BASE"
-  - "FIB_20k"
-  - "FIB_200k"
+  - "FIB_20K"
+  - "FIB_200K"
   - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr"
+    title: "ip6-2n-skx-x710-78b-2t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-pdr"
+- type: "plot"
+  title: "VPP Throughput: ip6-2n-skx-x710-78b-2t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-2t1c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  filter: "'NIC_Intel-X710' and
            '78B' and
            '78B' and
-           ('IP6BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            '2T1C' and
            'IP6FWD' and
            'NDRPDR' and
            '2T1C' and
            'IP6FWD' and
@@ -12724,27 +13856,26 @@
   - "tags"
   sort:
   - "IP6BASE"
   - "tags"
   sort:
   - "IP6BASE"
-  - "FIB_20k"
-  - "FIB_200k"
+  - "FIB_20K"
+  - "FIB_200K"
   - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-pdr"
+    title: "ip6-2n-skx-x710-78b-2t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr"
+- type: "plot"
+  title: "VPP Throughput: ip6-2n-skx-x710-78b-4t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-4t2c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  filter: "'NIC_Intel-X710' and
            '78B' and
            '78B' and
-           ('IP6BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            '4T2C' and
            'IP6FWD' and
            'NDRPDR' and
            '4T2C' and
            'IP6FWD' and
@@ -12757,27 +13888,26 @@
   - "tags"
   sort:
   - "IP6BASE"
   - "tags"
   sort:
   - "IP6BASE"
-  - "FIB_20k"
-  - "FIB_200k"
+  - "FIB_20K"
+  - "FIB_200K"
   - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr"
+    title: "ip6-2n-skx-x710-78b-4t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-pdr"
+- type: "plot"
+  title: "VPP Throughput: ip6-2n-skx-x710-78b-4t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-4t2c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  filter: "'NIC_Intel-X710' and
            '78B' and
            '78B' and
-           ('IP6BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            '4T2C' and
            'IP6FWD' and
            'NDRPDR' and
            '4T2C' and
            'IP6FWD' and
@@ -12790,30 +13920,29 @@
   - "tags"
   sort:
   - "IP6BASE"
   - "tags"
   sort:
   - "IP6BASE"
-  - "FIB_20k"
-  - "FIB_200k"
+  - "FIB_20K"
+  - "FIB_200K"
   - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-pdr"
+    title: "ip6-2n-skx-x710-78b-4t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
-# Packet Throughput - VPP IPv6 2n-dnv-x553 base
--
-  type: "plot"
-  title: "VPP Throughput: ip6-2n-dnv-x553-78b-1t1c-base-ndr"
+# Packet Throughput - VPP IPv6 2n-skx-xxv710
+- type: "plot"
+  title: "VPP Throughput: ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-dnv-x553-78b-1t1c-base-ndr"
-  data: "intel-dnv-vpp"
-  filter: "'NIC_Intel-X553' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '78B' and
            '78B' and
-           'IP6BASE' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            'NDRPDR' and
-           '1T1C' and
+           '2T1C' and
            'IP6FWD' and
            not 'SRv6' and
            not 'IPSEC' and
            'IP6FWD' and
            not 'SRv6' and
            not 'IPSEC' and
@@ -12824,26 +13953,28 @@
   - "tags"
   sort:
   - "IP6BASE"
   - "tags"
   sort:
   - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-2n-dnv-x553-78b-1t1c-base-ndr"
+    title: "ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip6-2n-dnv-x553-78b-1t1c-base-pdr"
+- type: "plot"
+  title: "VPP Throughput: ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-dnv-x553-78b-1t1c-base-pdr"
-  data: "intel-dnv-vpp"
-  filter: "'NIC_Intel-X553' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '78B' and
            '78B' and
-           'IP6BASE' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            'NDRPDR' and
-           '1T1C' and
+           '2T1C' and
            'IP6FWD' and
            not 'SRv6' and
            not 'IPSEC' and
            'IP6FWD' and
            not 'SRv6' and
            not 'IPSEC' and
@@ -12854,26 +13985,28 @@
   - "tags"
   sort:
   - "IP6BASE"
   - "tags"
   sort:
   - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-2n-dnv-x553-78b-1t1c-base-pdr"
+    title: "ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip6-2n-dnv-x553-78b-2t2c-base-ndr"
+- type: "plot"
+  title: "VPP Throughput: ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-dnv-x553-78b-2t2c-base-ndr"
-  data: "intel-dnv-vpp"
-  filter: "'NIC_Intel-X553' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '78B' and
            '78B' and
-           'IP6BASE' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            'NDRPDR' and
-           '2T2C' and
+           '4T2C' and
            'IP6FWD' and
            not 'SRv6' and
            not 'IPSEC' and
            'IP6FWD' and
            not 'SRv6' and
            not 'IPSEC' and
@@ -12884,26 +14017,28 @@
   - "tags"
   sort:
   - "IP6BASE"
   - "tags"
   sort:
   - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-2n-dnv-x553-78b-2t2c-base-ndr"
+    title: "ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: ip6-2n-dnv-x553-78b-2t2c-base-pdr"
+- type: "plot"
+  title: "VPP Throughput: ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-dnv-x553-78b-2t2c-base-pdr"
-  data: "intel-dnv-vpp"
-  filter: "'NIC_Intel-X553' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '78B' and
            '78B' and
-           'IP6BASE' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            'NDRPDR' and
-           '2T2C' and
+           '4T2C' and
            'IP6FWD' and
            not 'SRv6' and
            not 'IPSEC' and
            'IP6FWD' and
            not 'SRv6' and
            not 'IPSEC' and
@@ -12914,24 +14049,143 @@
   - "tags"
   sort:
   - "IP6BASE"
   - "tags"
   sort:
   - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-2n-dnv-x553-78b-2t2c-base-pdr"
+    title: "ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
+## Packet Throughput - VPP IPv6 2n-dnv-x553 base
+#- type: "plot"
+#  title: "VPP Throughput: ip6-2n-dnv-x553-78b-1t1c-base-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip6-2n-dnv-x553-78b-1t1c-base-ndr"
+#  data: "intel-dnv-vpp"
+#  filter: "'NIC_Intel-X553' and
+#           '78B' and
+#           'IP6BASE' and
+#           'NDRPDR' and
+#           '1T1C' and
+#           'IP6FWD' and
+#           not 'SRv6' and
+#           not 'IPSEC' and
+#           not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "IP6BASE"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "ip6-2n-dnv-x553-78b-1t1c-base-ndr"
+#    layout: "plot-throughput"
+#
+#- type: "plot"
+#  title: "VPP Throughput: ip6-2n-dnv-x553-78b-1t1c-base-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip6-2n-dnv-x553-78b-1t1c-base-pdr"
+#  data: "intel-dnv-vpp"
+#  filter: "'NIC_Intel-X553' and
+#           '78B' and
+#           'IP6BASE' and
+#           'NDRPDR' and
+#           '1T1C' and
+#           'IP6FWD' and
+#           not 'SRv6' and
+#           not 'IPSEC' and
+#           not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "IP6BASE"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "ip6-2n-dnv-x553-78b-1t1c-base-pdr"
+#    layout: "plot-throughput"
+#
+#- type: "plot"
+#  title: "VPP Throughput: ip6-2n-dnv-x553-78b-2t2c-base-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip6-2n-dnv-x553-78b-2t2c-base-ndr"
+#  data: "intel-dnv-vpp"
+#  filter: "'NIC_Intel-X553' and
+#           '78B' and
+#           'IP6BASE' and
+#           'NDRPDR' and
+#           '2T2C' and
+#           'IP6FWD' and
+#           not 'SRv6' and
+#           not 'IPSEC' and
+#           not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "IP6BASE"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "ip6-2n-dnv-x553-78b-2t2c-base-ndr"
+#    layout: "plot-throughput"
+#
+#- type: "plot"
+#  title: "VPP Throughput: ip6-2n-dnv-x553-78b-2t2c-base-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip6-2n-dnv-x553-78b-2t2c-base-pdr"
+#  data: "intel-dnv-vpp"
+#  filter: "'NIC_Intel-X553' and
+#           '78B' and
+#           'IP6BASE' and
+#           'NDRPDR' and
+#           '2T2C' and
+#           'IP6FWD' and
+#           not 'SRv6' and
+#           not 'IPSEC' and
+#           not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "IP6BASE"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "ip6-2n-dnv-x553-78b-2t2c-base-pdr"
+#    layout: "plot-throughput"
+
 ################################################################################
 
 # Packet Throughput - VPP IPv6 tunnels 3n-hsw-x520
 ################################################################################
 
 # Packet Throughput - VPP IPv6 tunnels 3n-hsw-x520
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip6tun-3n-hsw-x520-78b-1t1c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-1t1c-base-ndr"
   title: "VPP Throughput: ip6tun-3n-hsw-x520-78b-1t1c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-1t1c-base-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
            'ENCAP' and
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
            'ENCAP' and
@@ -12954,13 +14208,12 @@
     title: "ip6tun-3n-hsw-x520-78b-1t1c-base-ndr"
     layout: "plot-throughput"
 
     title: "ip6tun-3n-hsw-x520-78b-1t1c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip6tun-3n-hsw-x520-78b-1t1c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-1t1c-base-pdr"
   title: "VPP Throughput: ip6tun-3n-hsw-x520-78b-1t1c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-1t1c-base-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
            'ENCAP' and
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
            'ENCAP' and
@@ -12983,13 +14236,12 @@
     title: "ip6tun-3n-hsw-x520-78b-1t1c-base-pdr"
     layout: "plot-throughput"
 
     title: "ip6tun-3n-hsw-x520-78b-1t1c-base-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip6tun-3n-hsw-x520-78b-2t2c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-2t2c-base-ndr"
   title: "VPP Throughput: ip6tun-3n-hsw-x520-78b-2t2c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-2t2c-base-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
            'ENCAP' and
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
            'ENCAP' and
@@ -13012,13 +14264,12 @@
     title: "ip6tun-3n-hsw-x520-78b-2t2c-base-ndr"
     layout: "plot-throughput"
 
     title: "ip6tun-3n-hsw-x520-78b-2t2c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip6tun-3n-hsw-x520-78b-2t2c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-2t2c-base-pdr"
   title: "VPP Throughput: ip6tun-3n-hsw-x520-78b-2t2c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-2t2c-base-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
            'ENCAP' and
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
            'ENCAP' and
@@ -13044,13 +14295,12 @@
 ################################################################################
 
 # Packet Throughput - VPP IPSec 3n-hsw-xl710 base
 ################################################################################
 
 # Packet Throughput - VPP IPSec 3n-hsw-xl710 base
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-1t1c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-base-ndr"
   title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-1t1c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-base-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'IP4FWD' and
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'IP4FWD' and
@@ -13072,13 +14322,12 @@
     title: "ipsec-3n-hsw-xl710-64b-1t1c-base-ndr"
     layout: "plot-throughput"
 
     title: "ipsec-3n-hsw-xl710-64b-1t1c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-1t1c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-base-pdr"
   title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-1t1c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-base-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'IP4FWD' and
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'IP4FWD' and
@@ -13100,13 +14349,12 @@
     title: "ipsec-3n-hsw-xl710-64b-1t1c-base-pdr"
     layout: "plot-throughput"
 
     title: "ipsec-3n-hsw-xl710-64b-1t1c-base-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-2t2c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-base-ndr"
   title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-2t2c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-base-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'IP4FWD' and
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'IP4FWD' and
@@ -13128,13 +14376,12 @@
     title: "ipsec-3n-hsw-xl710-64b-2t2c-base-ndr"
     layout: "plot-throughput"
 
     title: "ipsec-3n-hsw-xl710-64b-2t2c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-2t2c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-base-pdr"
   title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-2t2c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-base-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'IP4FWD' and
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'IP4FWD' and
@@ -13157,13 +14404,12 @@
     layout: "plot-throughput"
 
 # Packet Throughput - VPP IPSec 3n-hsw-xl710 scale
     layout: "plot-throughput"
 
 # Packet Throughput - VPP IPSec 3n-hsw-xl710 scale
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-1t1c-scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-scale-ndr"
   title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-1t1c-scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'IP4FWD' and
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'IP4FWD' and
@@ -13185,13 +14431,12 @@
     title: "ipsec-3n-hsw-xl710-64b-1t1c-scale-ndr"
     layout: "plot-throughput"
 
     title: "ipsec-3n-hsw-xl710-64b-1t1c-scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-1t1c-scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-scale-pdr"
   title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-1t1c-scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'IP4FWD' and
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'IP4FWD' and
@@ -13213,13 +14458,12 @@
     title: "ipsec-3n-hsw-xl710-64b-1t1c-scale-pdr"
     layout: "plot-throughput"
 
     title: "ipsec-3n-hsw-xl710-64b-1t1c-scale-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-2t2c-scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-scale-ndr"
   title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-2t2c-scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'IP4FWD' and
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'IP4FWD' and
@@ -13241,13 +14485,12 @@
     title: "ipsec-3n-hsw-xl710-64b-2t2c-scale-ndr"
     layout: "plot-throughput"
 
     title: "ipsec-3n-hsw-xl710-64b-2t2c-scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-2t2c-scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-scale-pdr"
   title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-2t2c-scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'IP4FWD' and
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'IP4FWD' and
@@ -13270,13 +14513,12 @@
     layout: "plot-throughput"
 
 # Packet Throughput - VPP IPSec 3n-hsw-xl710 SW
     layout: "plot-throughput"
 
 # Packet Throughput - VPP IPSec 3n-hsw-xl710 SW
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-1t1c-sw-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-sw-ndr"
   title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-1t1c-sw-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-sw-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'IP4FWD' and
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'IP4FWD' and
@@ -13297,13 +14539,12 @@
     title: "ipsec-3n-hsw-xl710-64b-1t1c-sw-ndr"
     layout: "plot-throughput"
 
     title: "ipsec-3n-hsw-xl710-64b-1t1c-sw-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-1t1c-sw-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-sw-pdr"
   title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-1t1c-sw-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-sw-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'IP4FWD' and
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'IP4FWD' and
@@ -13324,13 +14565,12 @@
     title: "ipsec-3n-hsw-xl710-64b-1t1c-sw-pdr"
     layout: "plot-throughput"
 
     title: "ipsec-3n-hsw-xl710-64b-1t1c-sw-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-2t2c-sw-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-sw-ndr"
   title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-2t2c-sw-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-sw-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'IP4FWD' and
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'IP4FWD' and
@@ -13351,13 +14591,12 @@
     title: "ipsec-3n-hsw-xl710-64b-2t2c-sw-ndr"
     layout: "plot-throughput"
 
     title: "ipsec-3n-hsw-xl710-64b-2t2c-sw-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-2t2c-sw-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-sw-pdr"
   title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-2t2c-sw-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-sw-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'IP4FWD' and
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'IP4FWD' and
@@ -13381,13 +14620,12 @@
 ################################################################################
 
 # Packet Throughput - VPP SRv6 3n-hsw-x520
 ################################################################################
 
 # Packet Throughput - VPP SRv6 3n-hsw-x520
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: srv6-3n-hsw-x520-78b-1t1c-features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-1t1c-features-ndr"
   title: "VPP Throughput: srv6-3n-hsw-x520-78b-1t1c-features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-1t1c-features-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
            'FEATURE' and
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
            'FEATURE' and
@@ -13407,13 +14645,12 @@
     title: "srv6-3n-hsw-x520-78b-1t1c-features-ndr"
     layout: "plot-throughput"
 
     title: "srv6-3n-hsw-x520-78b-1t1c-features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: srv6-3n-hsw-x520-78b-1t1c-features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-1t1c-features-pdr"
   title: "VPP Throughput: srv6-3n-hsw-x520-78b-1t1c-features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-1t1c-features-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
            'FEATURE' and
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
            'FEATURE' and
@@ -13433,13 +14670,12 @@
     title: "srv6-3n-hsw-x520-78b-1t1c-features-pdr"
     layout: "plot-throughput"
 
     title: "srv6-3n-hsw-x520-78b-1t1c-features-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: srv6-3n-hsw-x520-78b-2t2c-features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-2t2c-features-ndr"
   title: "VPP Throughput: srv6-3n-hsw-x520-78b-2t2c-features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-2t2c-features-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
            'FEATURE' and
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
            'FEATURE' and
@@ -13459,13 +14695,12 @@
     title: "srv6-3n-hsw-x520-78b-2t2c-features-ndr"
     layout: "plot-throughput"
 
     title: "srv6-3n-hsw-x520-78b-2t2c-features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: srv6-3n-hsw-x520-78b-2t2c-features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-2t2c-features-pdr"
   title: "VPP Throughput: srv6-3n-hsw-x520-78b-2t2c-features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-2t2c-features-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
            'FEATURE' and
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
            'FEATURE' and
@@ -13488,13 +14723,12 @@
 ################################################################################
 
 # Packet Throughput - VPP vhost ip4 3n-hsw-x520
 ################################################################################
 
 # Packet Throughput - VPP vhost ip4 3n-hsw-x520
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
   title: "VPP Throughput: vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
@@ -13520,13 +14754,12 @@
     title: "vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
     title: "vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
   title: "VPP Throughput: vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
@@ -13552,13 +14785,12 @@
     title: "vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
     title: "vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
   title: "VPP Throughput: vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
@@ -13584,13 +14816,12 @@
     title: "vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
     title: "vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
   title: "VPP Throughput: vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
@@ -13617,13 +14848,12 @@
     layout: "plot-throughput"
 
 # Packet Throughput - VPP vhost l2sw 3n-hsw-x520 - base
     layout: "plot-throughput"
 
 # Packet Throughput - VPP vhost l2sw 3n-hsw-x520 - base
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
   title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
@@ -13654,13 +14884,12 @@
     title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
     layout: "plot-throughput"
 
     title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_features-pdr"
   title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_features-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
@@ -13691,13 +14920,12 @@
     title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_features-pdr"
     layout: "plot-throughput"
 
     title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_features-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
   title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
@@ -13728,13 +14956,12 @@
     title: "vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
     layout: "plot-throughput"
 
     title: "vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_features-pdr"
   title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_features-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
@@ -13766,13 +14993,12 @@
     layout: "plot-throughput"
 
 # Packet Throughput - VPP vhost l2sw 3n-hsw-x520 - base vm
     layout: "plot-throughput"
 
 # Packet Throughput - VPP vhost l2sw 3n-hsw-x520 - base vm
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-ndr"
   title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
@@ -13802,13 +15028,12 @@
     title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-ndr"
     layout: "plot-throughput"
 
     title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-pdr"
   title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
@@ -13838,13 +15063,12 @@
     title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-pdr"
     layout: "plot-throughput"
 
     title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-ndr"
   title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
@@ -13874,13 +15098,12 @@
     title: "vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-ndr"
     layout: "plot-throughput"
 
     title: "vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-pdr"
   title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
@@ -13911,13 +15134,12 @@
     layout: "plot-throughput"
 
 # Packet Throughput - VPP vhost ip4 3n-hsw-x710
     layout: "plot-throughput"
 
 # Packet Throughput - VPP vhost ip4 3n-hsw-x710
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
   title: "VPP Throughput: vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -13943,13 +15165,12 @@
     title: "vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
     title: "vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
   title: "VPP Throughput: vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -13975,13 +15196,12 @@
     title: "vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
     title: "vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
   title: "VPP Throughput: vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -14007,13 +15227,12 @@
     title: "vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
     title: "vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
   title: "VPP Throughput: vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -14040,13 +15259,12 @@
     layout: "plot-throughput"
 
 # Packet Throughput - VPP vhost l2sw 3n-hsw-x710 - base
     layout: "plot-throughput"
 
 # Packet Throughput - VPP vhost l2sw 3n-hsw-x710 - base
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
   title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -14077,13 +15295,12 @@
     title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
     layout: "plot-throughput"
 
     title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-pdr"
   title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -14114,13 +15331,12 @@
     title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-pdr"
     layout: "plot-throughput"
 
     title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-ndr"
   title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -14151,13 +15367,12 @@
     title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-ndr"
     layout: "plot-throughput"
 
     title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-pdr"
   title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -14189,13 +15404,12 @@
     layout: "plot-throughput"
 
 # Packet Throughput - VPP vhost l2sw 3n-hsw-x710 - base vm
     layout: "plot-throughput"
 
 # Packet Throughput - VPP vhost l2sw 3n-hsw-x710 - base vm
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-vm-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-vm-ndr"
   title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-vm-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-vm-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -14226,13 +15440,12 @@
     title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-vm-ndr"
     layout: "plot-throughput"
 
     title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-vm-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-vm-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-vm-pdr"
   title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-vm-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-vm-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -14263,13 +15476,12 @@
     title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-vm-pdr"
     layout: "plot-throughput"
 
     title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-vm-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-vm-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-vm-ndr"
   title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-vm-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-vm-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -14300,13 +15512,12 @@
     title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-vm-ndr"
     layout: "plot-throughput"
 
     title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-vm-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-vm-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-vm-pdr"
   title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-vm-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-vm-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -14338,13 +15549,12 @@
     layout: "plot-throughput"
 
 # Packet Throughput - VPP vhost ip4 3n-skx-x710
     layout: "plot-throughput"
 
 # Packet Throughput - VPP vhost ip4 3n-skx-x710
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
   title: "VPP Throughput: vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -14369,13 +15579,12 @@
     title: "vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
     title: "vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
   title: "VPP Throughput: vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -14400,13 +15609,12 @@
     title: "vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
     title: "vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
   title: "VPP Throughput: vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -14431,13 +15639,12 @@
     title: "vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
     title: "vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
   title: "VPP Throughput: vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -14463,13 +15670,12 @@
     layout: "plot-throughput"
 
 # Packet Throughput - VPP vhost l2sw 3n-skx-x710 - base
     layout: "plot-throughput"
 
 # Packet Throughput - VPP vhost l2sw 3n-skx-x710 - base
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-ndr"
   title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -14500,13 +15706,12 @@
     title: "vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-ndr"
     layout: "plot-throughput"
 
     title: "vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-pdr"
   title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -14537,13 +15742,12 @@
     title: "vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-pdr"
     layout: "plot-throughput"
 
     title: "vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-ndr"
   title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -14574,13 +15778,12 @@
     title: "vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-ndr"
     layout: "plot-throughput"
 
     title: "vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-pdr"
   title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -14612,13 +15815,12 @@
     layout: "plot-throughput"
 
 # Packet Throughput - VPP vhost l2sw 3n-skx-x710 - base vm
     layout: "plot-throughput"
 
 # Packet Throughput - VPP vhost l2sw 3n-skx-x710 - base vm
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-vm-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-vm-ndr"
   title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-vm-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-vm-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -14649,13 +15851,12 @@
     title: "vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-vm-ndr"
     layout: "plot-throughput"
 
     title: "vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-vm-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-vm-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-vm-pdr"
   title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-vm-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-vm-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -14686,13 +15887,12 @@
     title: "vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-vm-pdr"
     layout: "plot-throughput"
 
     title: "vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-vm-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-vm-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-vm-ndr"
   title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-vm-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-vm-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -14723,13 +15923,12 @@
     title: "vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-vm-ndr"
     layout: "plot-throughput"
 
     title: "vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-vm-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-vm-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-vm-pdr"
   title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-vm-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-vm-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -14761,13 +15960,12 @@
     layout: "plot-throughput"
 
 # Packet Throughput - VPP vhost ip4 2n-skx-x710
     layout: "plot-throughput"
 
 # Packet Throughput - VPP vhost ip4 2n-skx-x710
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: vhost-ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
   title: "VPP Throughput: vhost-ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -14794,13 +15992,12 @@
     title: "vhost-ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
     title: "vhost-ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: vhost-ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
   title: "VPP Throughput: vhost-ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -14827,13 +16024,12 @@
     title: "vhost-ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
     title: "vhost-ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: vhost-ip4-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
   title: "VPP Throughput: vhost-ip4-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -14860,13 +16056,12 @@
     title: "vhost-ip4-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
     title: "vhost-ip4-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: vhost-ip4-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
   title: "VPP Throughput: vhost-ip4-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -14894,13 +16089,12 @@
     layout: "plot-throughput"
 
 # Packet Throughput - VPP vhost l2sw 2n-skx-x710 - base
     layout: "plot-throughput"
 
 # Packet Throughput - VPP vhost l2sw 2n-skx-x710 - base
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_features-ndr"
   title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_features-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -14930,13 +16124,12 @@
     title: "vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_features-ndr"
     layout: "plot-throughput"
 
     title: "vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_features-pdr"
   title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_features-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -14966,13 +16159,12 @@
     title: "vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_features-pdr"
     layout: "plot-throughput"
 
     title: "vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_features-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_features-ndr"
   title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_features-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -15002,13 +16194,12 @@
     title: "vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_features-ndr"
     layout: "plot-throughput"
 
     title: "vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_features-pdr"
   title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_features-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -15039,13 +16230,12 @@
     layout: "plot-throughput"
 
 # Packet Throughput - VPP vhost l2sw 2n-skx-x710 - base vm
     layout: "plot-throughput"
 
 # Packet Throughput - VPP vhost l2sw 2n-skx-x710 - base vm
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-2t1c-base-vm-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-2t1c-base-vm-ndr"
   title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-2t1c-base-vm-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-2t1c-base-vm-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -15075,13 +16265,12 @@
     title: "vhost-l2sw-2n-skx-x710-64b-2t1c-base-vm-ndr"
     layout: "plot-throughput"
 
     title: "vhost-l2sw-2n-skx-x710-64b-2t1c-base-vm-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-2t1c-base-vm-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-2t1c-base-vm-pdr"
   title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-2t1c-base-vm-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-2t1c-base-vm-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -15111,49 +16300,12 @@
     title: "vhost-l2sw-2n-skx-x710-64b-2t1c-base-vm-pdr"
     layout: "plot-throughput"
 
     title: "vhost-l2sw-2n-skx-x710-64b-2t1c-base-vm-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-4t2c-base-vm-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-4t2c-base-vm-ndr"
   title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-4t2c-base-vm-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-4t2c-base-vm-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '4T2C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'CFS_OPT' and
-           not 'VXLAN' and
-           not 'NF_DENSITY' and
-           not 'DOT1Q' and
-           not 'IP4FWD'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-2n-skx-x710-64b-4t2c-base-vm-ndr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-4t2c-base-vm-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-4t2c-base-vm-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -15174,436 +16326,458 @@
 #  - "1VM"
 #  - "L2XCFWD"
 #  - "1VM"
 #  - "1VM"
 #  - "L2XCFWD"
 #  - "1VM"
-#  - "L2BDMACLRN"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-2n-skx-x710-64b-4t2c-base-vm-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP vhost ip4 2n-skx-xxv710
--
-  type: "plot"
-  title: "VPP Throughput: vhost-ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           '2T1C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'CFS_OPT' and
-           not 'DOT1Q'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "1VM"
-  - "2VM"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: vhost-ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           '4T2C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'CFS_OPT' and
-           not 'DOT1Q'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "1VM"
-  - "2VM"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: vhost-ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           '2T1C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'CFS_OPT' and
-           not 'DOT1Q'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "1VM"
-  - "2VM"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: vhost-ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           '4T2C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'CFS_OPT' and
-           not 'DOT1Q'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "1VM"
-  - "2VM"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP vhost l2sw 2n-skx-xxv710 - base
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_features-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           'BASE' and
-           '2T1C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_features-ndr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_features-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_features-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           'BASE' and
-           '2T1C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_features-pdr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_features-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           'BASE' and
-           '4T2C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
+#  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_features-ndr"
+    title: "vhost-l2sw-2n-skx-x710-64b-4t2c-base-vm-ndr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_features-pdr"
+- type: "plot"
+  title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-4t2c-base-vm-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_features-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-4t2c-base-vm-pdr"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
            ('ETH' or 'DOT1Q') and
            '64B' and
            'NDRPDR' and
            ('ETH' or 'DOT1Q') and
-           'BASE' and
            '4T2C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            '4T2C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
+           not 'CFS_OPT' and
            not 'VXLAN' and
            not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
+           not 'NF_DENSITY' and
+           not 'DOT1Q' and
+           not 'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
 #  sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
 #  sort:
-#  - "not CFS_OPT"
+#  - "1VM"
 #  - "L2XCFWD"
 #  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
+#  - "1VM"
+#  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_features-pdr"
+    title: "vhost-l2sw-2n-skx-x710-64b-4t2c-base-vm-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
-# Packet Throughput - VPP vhost l2sw 2n-skx-xxv710 - base vm
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-vm-ndr"
+# Packet Throughput - VPP vhost ip4 2n-skx-xxv710
+- type: "plot"
+  title: "VPP Throughput: vhost-ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-vm-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
+           'ETH' and
+           'IP4FWD' and
            '2T1C' and
            '2T1C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            'VHOST_1024' and
-           not 'CFS_OPT' and
            not 'VXLAN' and
            not 'VXLAN' and
-           not 'DOT1Q' and
-           not 'IP4FWD'"
+           not 'CFS_OPT' and
+           not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
+  sort:
+  - "1VM"
+  - "2VM"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-vm-ndr"
+    title: "vhost-ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-vm-pdr"
+- type: "plot"
+  title: "VPP Throughput: vhost-ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-vm-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '2T1C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
+           'ETH' and
+           'IP4FWD' and
+           '4T2C' and
            'VHOST_1024' and
            'VHOST_1024' and
-           not 'CFS_OPT' and
            not 'VXLAN' and
            not 'VXLAN' and
-           not 'DOT1Q' and
-           not 'IP4FWD'"
+           not 'CFS_OPT' and
+           not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
+  sort:
+  - "1VM"
+  - "2VM"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-vm-pdr"
+    title: "vhost-ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-ndr"
+- type: "plot"
+  title: "VPP Throughput: vhost-ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '4T2C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
+           'ETH' and
+           'IP4FWD' and
+           '2T1C' and
            'VHOST_1024' and
            'VHOST_1024' and
-           not 'CFS_OPT' and
            not 'VXLAN' and
            not 'VXLAN' and
-           not 'DOT1Q' and
-           not 'IP4FWD'"
+           not 'CFS_OPT' and
+           not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
+  sort:
+  - "1VM"
+  - "2VM"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-ndr"
+    title: "vhost-ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-pdr"
+- type: "plot"
+  title: "VPP Throughput: vhost-ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
+           'ETH' and
+           'IP4FWD' and
            '4T2C' and
            '4T2C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            'VHOST_1024' and
-           not 'CFS_OPT' and
            not 'VXLAN' and
            not 'VXLAN' and
-           not 'DOT1Q' and
-           not 'IP4FWD'"
+           not 'CFS_OPT' and
+           not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
+  sort:
+  - "1VM"
+  - "2VM"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-pdr"
+    title: "vhost-ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
+## Packet Throughput - VPP vhost l2sw 2n-skx-xxv710 - base
+#- type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_features-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_features-ndr"
+#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+#  filter: "'NIC_Intel-XXV710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           'BASE' and
+#           '2T1C' and
+#           ('L2BDMACLRN' or 'L2XCFWD') and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "not CFS_OPT"
+##  - "L2XCFWD"
+##  - "not CFS_OPT"
+##  - "CFS_OPT"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_features-ndr"
+#    layout: "plot-throughput"
+#
+#- type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_features-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_features-pdr"
+#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+#  filter: "'NIC_Intel-XXV710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           'BASE' and
+#           '2T1C' and
+#           ('L2BDMACLRN' or 'L2XCFWD') and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "not CFS_OPT"
+##  - "L2XCFWD"
+##  - "not CFS_OPT"
+##  - "CFS_OPT"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_features-pdr"
+#    layout: "plot-throughput"
+#
+#- type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_features-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_features-ndr"
+#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+#  filter: "'NIC_Intel-XXV710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           'BASE' and
+#           '4T2C' and
+#           ('L2BDMACLRN' or 'L2XCFWD') and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "not CFS_OPT"
+##  - "L2XCFWD"
+##  - "not CFS_OPT"
+##  - "CFS_OPT"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_features-ndr"
+#    layout: "plot-throughput"
+#
+#- type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_features-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_features-pdr"
+#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+#  filter: "'NIC_Intel-XXV710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           'BASE' and
+#           '4T2C' and
+#           ('L2BDMACLRN' or 'L2XCFWD') and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "not CFS_OPT"
+##  - "L2XCFWD"
+##  - "not CFS_OPT"
+##  - "CFS_OPT"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_features-pdr"
+#    layout: "plot-throughput"
+#
+## Packet Throughput - VPP vhost l2sw 2n-skx-xxv710 - base vm
+#- type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-vm-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-vm-ndr"
+#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+#  filter: "'NIC_Intel-XXV710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           '2T1C' and
+#           ('L2BDMACLRN' or 'L2XCFWD') and
+#           'VHOST_1024' and
+#           not 'CFS_OPT' and
+#           not 'VXLAN' and
+#           not 'DOT1Q' and
+#           not 'IP4FWD'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "1VM"
+##  - "L2XCFWD"
+##  - "1VM"
+##  - "L2BDMACLRN"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-vm-ndr"
+#    layout: "plot-throughput"
+#
+#- type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-vm-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-vm-pdr"
+#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+#  filter: "'NIC_Intel-XXV710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           '2T1C' and
+#           ('L2BDMACLRN' or 'L2XCFWD') and
+#           'VHOST_1024' and
+#           not 'CFS_OPT' and
+#           not 'VXLAN' and
+#           not 'DOT1Q' and
+#           not 'IP4FWD'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "1VM"
+##  - "L2XCFWD"
+##  - "1VM"
+##  - "L2BDMACLRN"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-vm-pdr"
+#    layout: "plot-throughput"
+#
+#- type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-ndr"
+#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+#  filter: "'NIC_Intel-XXV710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           '4T2C' and
+#           ('L2BDMACLRN' or 'L2XCFWD') and
+#           'VHOST_1024' and
+#           not 'CFS_OPT' and
+#           not 'VXLAN' and
+#           not 'DOT1Q' and
+#           not 'IP4FWD'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "1VM"
+##  - "L2XCFWD"
+##  - "1VM"
+##  - "L2BDMACLRN"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-ndr"
+#    layout: "plot-throughput"
+#
+#- type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-pdr"
+#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+#  filter: "'NIC_Intel-XXV710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           '4T2C' and
+#           ('L2BDMACLRN' or 'L2XCFWD') and
+#           'VHOST_1024' and
+#           not 'CFS_OPT' and
+#           not 'VXLAN' and
+#           not 'DOT1Q' and
+#           not 'IP4FWD'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "1VM"
+##  - "L2XCFWD"
+##  - "1VM"
+##  - "L2BDMACLRN"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-pdr"
+#    layout: "plot-throughput"
+
 ################################################################################
 
 # Packet Throughput - VPP VTS 3n-hsw-x520
 ################################################################################
 
 # Packet Throughput - VPP VTS 3n-hsw-x520
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: vts-3n-hsw-x520-114b-1t1c-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-114b-1t1c-ndr"
   title: "VPP Throughput: vts-3n-hsw-x520-114b-1t1c-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-114b-1t1c-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '114B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X520-DA2' and
            '114B' and
            'NDRPDR' and
@@ -15621,13 +16795,12 @@
     title: "vts-3n-hsw-x520-114b-1t1c-ndr"
     layout: "plot-throughput"
 
     title: "vts-3n-hsw-x520-114b-1t1c-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: vts-3n-hsw-x520-114b-2t2c-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-114b-2t2c-ndr"
   title: "VPP Throughput: vts-3n-hsw-x520-114b-2t2c-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-114b-2t2c-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '114B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X520-DA2' and
            '114B' and
            'NDRPDR' and
@@ -15645,13 +16818,12 @@
     title: "vts-3n-hsw-x520-114b-2t2c-ndr"
     layout: "plot-throughput"
 
     title: "vts-3n-hsw-x520-114b-2t2c-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: vts-3n-hsw-x520-114b-1t1c-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-114b-1t1c-pdr"
   title: "VPP Throughput: vts-3n-hsw-x520-114b-1t1c-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-114b-1t1c-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '114B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X520-DA2' and
            '114B' and
            'NDRPDR' and
@@ -15669,13 +16841,12 @@
     title: "vts-3n-hsw-x520-114b-1t1c-pdr"
     layout: "plot-throughput"
 
     title: "vts-3n-hsw-x520-114b-1t1c-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: vts-3n-hsw-x520-114b-2t2c-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-114b-2t2c-pdr"
   title: "VPP Throughput: vts-3n-hsw-x520-114b-2t2c-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-114b-2t2c-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '114B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X520-DA2' and
            '114B' and
            'NDRPDR' and
@@ -15696,8 +16867,7 @@
 ################################################################################
 
 # Packet Throughput - DPDK l3fwd 3n-hsw-x520
 ################################################################################
 
 # Packet Throughput - DPDK l3fwd 3n-hsw-x520
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: l3fwd-3n-hsw-x520-64b-1t1c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   title: "DPDK Throughput: l3fwd-3n-hsw-x520-64b-1t1c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -15721,8 +16891,7 @@
     title: "l3fwd-3n-hsw-x520-64b-1t1c-base-ndr"
     layout: "plot-throughput"
 
     title: "l3fwd-3n-hsw-x520-64b-1t1c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: l3fwd-3n-hsw-x520-64b-2t2c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   title: "DPDK Throughput: l3fwd-3n-hsw-x520-64b-2t2c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -15746,8 +16915,7 @@
     title: "l3fwd-3n-hsw-x520-64b-2t2c-base-ndr"
     layout: "plot-throughput"
 
     title: "l3fwd-3n-hsw-x520-64b-2t2c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: l3fwd-3n-hsw-x520-64b-1t1c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   title: "DPDK Throughput: l3fwd-3n-hsw-x520-64b-1t1c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -15771,8 +16939,7 @@
     title: "l3fwd-3n-hsw-x520-64b-1t1c-base-pdr"
     layout: "plot-throughput"
 
     title: "l3fwd-3n-hsw-x520-64b-1t1c-base-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: l3fwd-3n-hsw-x520-64b-2t2c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   title: "DPDK Throughput: l3fwd-3n-hsw-x520-64b-2t2c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -15797,8 +16964,7 @@
     layout: "plot-throughput"
 
 # Packet Throughput - DPDK l3fwd 3n-hsw-x710
     layout: "plot-throughput"
 
 # Packet Throughput - DPDK l3fwd 3n-hsw-x710
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: l3fwd-3n-hsw-x710-64b-1t1c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   title: "DPDK Throughput: l3fwd-3n-hsw-x710-64b-1t1c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -15822,8 +16988,7 @@
     title: "l3fwd-3n-hsw-x710-64b-1t1c-base-ndr"
     layout: "plot-throughput"
 
     title: "l3fwd-3n-hsw-x710-64b-1t1c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: l3fwd-3n-hsw-x710-64b-2t2c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   title: "DPDK Throughput: l3fwd-3n-hsw-x710-64b-2t2c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -15847,8 +17012,7 @@
     title: "l3fwd-3n-hsw-x710-64b-2t2c-base-ndr"
     layout: "plot-throughput"
 
     title: "l3fwd-3n-hsw-x710-64b-2t2c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: l3fwd-3n-hsw-x710-64b-1t1c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   title: "DPDK Throughput: l3fwd-3n-hsw-x710-64b-1t1c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -15872,8 +17036,7 @@
     title: "l3fwd-3n-hsw-x710-64b-1t1c-base-pdr"
     layout: "plot-throughput"
 
     title: "l3fwd-3n-hsw-x710-64b-1t1c-base-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: l3fwd-3n-hsw-x710-64b-2t2c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   title: "DPDK Throughput: l3fwd-3n-hsw-x710-64b-2t2c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -15898,8 +17061,7 @@
     layout: "plot-throughput"
 
 # Packet Throughput - DPDK l3fwd 3n-hsw-xl710
     layout: "plot-throughput"
 
 # Packet Throughput - DPDK l3fwd 3n-hsw-xl710
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: l3fwd-3n-hsw-xl710-64b-1t1c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   title: "DPDK Throughput: l3fwd-3n-hsw-xl710-64b-1t1c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -15923,8 +17085,7 @@
     title: "l3fwd-3n-hsw-xl710-64b-1t1c-base-ndr"
     layout: "plot-throughput"
 
     title: "l3fwd-3n-hsw-xl710-64b-1t1c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: l3fwd-3n-hsw-xl710-64b-2t2c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   title: "DPDK Throughput: l3fwd-3n-hsw-xl710-64b-2t2c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -15948,8 +17109,7 @@
     title: "l3fwd-3n-hsw-xl710-64b-2t2c-base-ndr"
     layout: "plot-throughput"
 
     title: "l3fwd-3n-hsw-xl710-64b-2t2c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: l3fwd-3n-hsw-xl710-64b-1t1c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   title: "DPDK Throughput: l3fwd-3n-hsw-xl710-64b-1t1c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -15973,8 +17133,7 @@
     title: "l3fwd-3n-hsw-xl710-64b-1t1c-base-pdr"
     layout: "plot-throughput"
 
     title: "l3fwd-3n-hsw-xl710-64b-1t1c-base-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: l3fwd-3n-hsw-xl710-64b-2t2c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   title: "DPDK Throughput: l3fwd-3n-hsw-xl710-64b-2t2c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -15999,8 +17158,7 @@
     layout: "plot-throughput"
 
 # Packet Throughput - DPDK l3fwd 3n-skx-x710
     layout: "plot-throughput"
 
 # Packet Throughput - DPDK l3fwd 3n-skx-x710
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: l3fwd-3n-skx-x710-64b-2t1c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   title: "DPDK Throughput: l3fwd-3n-skx-x710-64b-2t1c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -16024,8 +17182,7 @@
     title: "l3fwd-3n-skx-x710-64b-2t1c-base-ndr"
     layout: "plot-throughput"
 
     title: "l3fwd-3n-skx-x710-64b-2t1c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: l3fwd-3n-skx-x710-64b-4t2c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   title: "DPDK Throughput: l3fwd-3n-skx-x710-64b-4t2c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -16049,8 +17206,7 @@
     title: "l3fwd-3n-skx-x710-64b-4t2c-base-ndr"
     layout: "plot-throughput"
 
     title: "l3fwd-3n-skx-x710-64b-4t2c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: l3fwd-3n-skx-x710-64b-2t1c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   title: "DPDK Throughput: l3fwd-3n-skx-x710-64b-2t1c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -16074,8 +17230,7 @@
     title: "l3fwd-3n-skx-x710-64b-2t1c-base-pdr"
     layout: "plot-throughput"
 
     title: "l3fwd-3n-skx-x710-64b-2t1c-base-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: l3fwd-3n-skx-x710-64b-4t2c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   title: "DPDK Throughput: l3fwd-3n-skx-x710-64b-4t2c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -16100,8 +17255,7 @@
     layout: "plot-throughput"
 
 # Packet Throughput - DPDK l3fwd 3n-skx-xxv710
     layout: "plot-throughput"
 
 # Packet Throughput - DPDK l3fwd 3n-skx-xxv710
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: l3fwd-3n-skx-xxv710-64b-2t1c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   title: "DPDK Throughput: l3fwd-3n-skx-xxv710-64b-2t1c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -16125,8 +17279,7 @@
     title: "l3fwd-3n-skx-xxv710-64b-2t1c-base-ndr"
     layout: "plot-throughput"
 
     title: "l3fwd-3n-skx-xxv710-64b-2t1c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: l3fwd-3n-skx-xxv710-64b-4t2c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   title: "DPDK Throughput: l3fwd-3n-skx-xxv710-64b-4t2c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -16150,8 +17303,7 @@
     title: "l3fwd-3n-skx-xxv710-64b-4t2c-base-ndr"
     layout: "plot-throughput"
 
     title: "l3fwd-3n-skx-xxv710-64b-4t2c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: l3fwd-3n-skx-xxv710-64b-2t1c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   title: "DPDK Throughput: l3fwd-3n-skx-xxv710-64b-2t1c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -16175,8 +17327,7 @@
     title: "l3fwd-3n-skx-xxv710-64b-2t1c-base-pdr"
     layout: "plot-throughput"
 
     title: "l3fwd-3n-skx-xxv710-64b-2t1c-base-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: l3fwd-3n-skx-xxv710-64b-4t2c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   title: "DPDK Throughput: l3fwd-3n-skx-xxv710-64b-4t2c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -16201,8 +17352,7 @@
     layout: "plot-throughput"
 
 # Packet Throughput - DPDK l3fwd 2n-skx-x710
     layout: "plot-throughput"
 
 # Packet Throughput - DPDK l3fwd 2n-skx-x710
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: l3fwd-2n-skx-x710-64b-2t1c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   title: "DPDK Throughput: l3fwd-2n-skx-x710-64b-2t1c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -16226,8 +17376,7 @@
     title: "l3fwd-2n-skx-x710-64b-2t1c-base-ndr"
     layout: "plot-throughput"
 
     title: "l3fwd-2n-skx-x710-64b-2t1c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: l3fwd-2n-skx-x710-64b-4t2c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   title: "DPDK Throughput: l3fwd-2n-skx-x710-64b-4t2c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -16251,8 +17400,7 @@
     title: "l3fwd-2n-skx-x710-64b-4t2c-base-ndr"
     layout: "plot-throughput"
 
     title: "l3fwd-2n-skx-x710-64b-4t2c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: l3fwd-2n-skx-x710-64b-2t1c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   title: "DPDK Throughput: l3fwd-2n-skx-x710-64b-2t1c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -16276,8 +17424,7 @@
     title: "l3fwd-2n-skx-x710-64b-2t1c-base-pdr"
     layout: "plot-throughput"
 
     title: "l3fwd-2n-skx-x710-64b-2t1c-base-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: l3fwd-2n-skx-x710-64b-4t2c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   title: "DPDK Throughput: l3fwd-2n-skx-x710-64b-4t2c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -16302,8 +17449,7 @@
     layout: "plot-throughput"
 
 # Packet Throughput - DPDK l3fwd 2n-skx-xxv710
     layout: "plot-throughput"
 
 # Packet Throughput - DPDK l3fwd 2n-skx-xxv710
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: l3fwd-2n-skx-xxv710-64b-2t1c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   title: "DPDK Throughput: l3fwd-2n-skx-xxv710-64b-2t1c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -16327,8 +17473,7 @@
     title: "l3fwd-2n-skx-xxv710-64b-2t1c-base-ndr"
     layout: "plot-throughput"
 
     title: "l3fwd-2n-skx-xxv710-64b-2t1c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: l3fwd-2n-skx-xxv710-64b-4t2c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   title: "DPDK Throughput: l3fwd-2n-skx-xxv710-64b-4t2c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -16352,8 +17497,7 @@
     title: "l3fwd-2n-skx-xxv710-64b-4t2c-base-ndr"
     layout: "plot-throughput"
 
     title: "l3fwd-2n-skx-xxv710-64b-4t2c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: l3fwd-2n-skx-xxv710-64b-2t1c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   title: "DPDK Throughput: l3fwd-2n-skx-xxv710-64b-2t1c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -16377,8 +17521,7 @@
     title: "l3fwd-2n-skx-xxv710-64b-2t1c-base-pdr"
     layout: "plot-throughput"
 
     title: "l3fwd-2n-skx-xxv710-64b-2t1c-base-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: l3fwd-2n-skx-xxv710-64b-4t2c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   title: "DPDK Throughput: l3fwd-2n-skx-xxv710-64b-4t2c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -16405,8 +17548,7 @@
 ################################################################################
 
 # Packet Throughput - DPDK testpmd 3n-hsw-x520
 ################################################################################
 
 # Packet Throughput - DPDK testpmd 3n-hsw-x520
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: testpmd-3n-hsw-x520-64b-1t1c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   title: "DPDK Throughput: testpmd-3n-hsw-x520-64b-1t1c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -16430,8 +17572,7 @@
     title: "testpmd-3n-hsw-x520-64b-1t1c-base-ndr"
     layout: "plot-throughput"
 
     title: "testpmd-3n-hsw-x520-64b-1t1c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: testpmd-3n-hsw-x520-64b-2t2c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   title: "DPDK Throughput: testpmd-3n-hsw-x520-64b-2t2c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -16455,8 +17596,7 @@
     title: "testpmd-3n-hsw-x520-64b-2t2c-base-ndr"
     layout: "plot-throughput"
 
     title: "testpmd-3n-hsw-x520-64b-2t2c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: testpmd-3n-hsw-x520-64b-1t1c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   title: "DPDK Throughput: testpmd-3n-hsw-x520-64b-1t1c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -16480,8 +17620,7 @@
     title: "testpmd-3n-hsw-x520-64b-1t1c-base-pdr"
     layout: "plot-throughput"
 
     title: "testpmd-3n-hsw-x520-64b-1t1c-base-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: testpmd-3n-hsw-x520-64b-2t2c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   title: "DPDK Throughput: testpmd-3n-hsw-x520-64b-2t2c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -16506,8 +17645,7 @@
     layout: "plot-throughput"
 
 # Packet Throughput - DPDK testpmd 3n-hsw-x710
     layout: "plot-throughput"
 
 # Packet Throughput - DPDK testpmd 3n-hsw-x710
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: testpmd-3n-hsw-x710-64b-1t1c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   title: "DPDK Throughput: testpmd-3n-hsw-x710-64b-1t1c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -16531,8 +17669,7 @@
     title: "testpmd-3n-hsw-x710-64b-1t1c-base-ndr"
     layout: "plot-throughput"
 
     title: "testpmd-3n-hsw-x710-64b-1t1c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: testpmd-3n-hsw-x710-64b-2t2c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   title: "DPDK Throughput: testpmd-3n-hsw-x710-64b-2t2c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -16556,8 +17693,7 @@
     title: "testpmd-3n-hsw-x710-64b-2t2c-base-ndr"
     layout: "plot-throughput"
 
     title: "testpmd-3n-hsw-x710-64b-2t2c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: testpmd-3n-hsw-x710-64b-1t1c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   title: "DPDK Throughput: testpmd-3n-hsw-x710-64b-1t1c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -16581,8 +17717,7 @@
     title: "testpmd-3n-hsw-x710-64b-1t1c-base-pdr"
     layout: "plot-throughput"
 
     title: "testpmd-3n-hsw-x710-64b-1t1c-base-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: testpmd-3n-hsw-x710-64b-2t2c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   title: "DPDK Throughput: testpmd-3n-hsw-x710-64b-2t2c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -16607,8 +17742,7 @@
     layout: "plot-throughput"
 
 # Packet Throughput - DPDK testpmd 3n-hsw-xl710
     layout: "plot-throughput"
 
 # Packet Throughput - DPDK testpmd 3n-hsw-xl710
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: testpmd-3n-hsw-xl710-64b-1t1c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   title: "DPDK Throughput: testpmd-3n-hsw-xl710-64b-1t1c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -16632,8 +17766,7 @@
     title: "testpmd-3n-hsw-xl710-64b-1t1c-base-ndr"
     layout: "plot-throughput"
 
     title: "testpmd-3n-hsw-xl710-64b-1t1c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: testpmd-3n-hsw-xl710-64b-2t2c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   title: "DPDK Throughput: testpmd-3n-hsw-xl710-64b-2t2c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -16657,8 +17790,7 @@
     title: "testpmd-3n-hsw-xl710-64b-2t2c-base-ndr"
     layout: "plot-throughput"
 
     title: "testpmd-3n-hsw-xl710-64b-2t2c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: testpmd-3n-hsw-xl710-64b-1t1c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   title: "DPDK Throughput: testpmd-3n-hsw-xl710-64b-1t1c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -16682,8 +17814,7 @@
     title: "testpmd-3n-hsw-xl710-64b-1t1c-base-pdr"
     layout: "plot-throughput"
 
     title: "testpmd-3n-hsw-xl710-64b-1t1c-base-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: testpmd-3n-hsw-xl710-64b-2t2c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   title: "DPDK Throughput: testpmd-3n-hsw-xl710-64b-2t2c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -16708,8 +17839,7 @@
     layout: "plot-throughput"
 
 # Packet Throughput - DPDK testpmd 3n-skx-x710
     layout: "plot-throughput"
 
 # Packet Throughput - DPDK testpmd 3n-skx-x710
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: testpmd-3n-skx-x710-64b-2t1c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   title: "DPDK Throughput: testpmd-3n-skx-x710-64b-2t1c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -16733,8 +17863,7 @@
     title: "testpmd-3n-skx-x710-64b-2t1c-base-ndr"
     layout: "plot-throughput"
 
     title: "testpmd-3n-skx-x710-64b-2t1c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: testpmd-3n-skx-x710-64b-4t2c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   title: "DPDK Throughput: testpmd-3n-skx-x710-64b-4t2c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -16758,8 +17887,7 @@
     title: "testpmd-3n-skx-x710-64b-4t2c-base-ndr"
     layout: "plot-throughput"
 
     title: "testpmd-3n-skx-x710-64b-4t2c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: testpmd-3n-skx-x710-64b-2t1c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   title: "DPDK Throughput: testpmd-3n-skx-x710-64b-2t1c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -16783,8 +17911,7 @@
     title: "testpmd-3n-skx-x710-64b-2t1c-base-pdr"
     layout: "plot-throughput"
 
     title: "testpmd-3n-skx-x710-64b-2t1c-base-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: testpmd-3n-skx-x710-64b-4t2c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   title: "DPDK Throughput: testpmd-3n-skx-x710-64b-4t2c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -16809,8 +17936,7 @@
     layout: "plot-throughput"
 
 # Packet Throughput - DPDK testpmd 3n-skx-xxv710
     layout: "plot-throughput"
 
 # Packet Throughput - DPDK testpmd 3n-skx-xxv710
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: testpmd-3n-skx-xxv710-64b-2t1c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   title: "DPDK Throughput: testpmd-3n-skx-xxv710-64b-2t1c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -16834,8 +17960,7 @@
     title: "testpmd-3n-skx-xxv710-64b-2t1c-base-ndr"
     layout: "plot-throughput"
 
     title: "testpmd-3n-skx-xxv710-64b-2t1c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: testpmd-3n-skx-xxv710-64b-4t2c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   title: "DPDK Throughput: testpmd-3n-skx-xxv710-64b-4t2c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -16859,8 +17984,7 @@
     title: "testpmd-3n-skx-xxv710-64b-4t2c-base-ndr"
     layout: "plot-throughput"
 
     title: "testpmd-3n-skx-xxv710-64b-4t2c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: testpmd-3n-skx-xxv710-64b-2t1c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   title: "DPDK Throughput: testpmd-3n-skx-xxv710-64b-2t1c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -16884,8 +18008,7 @@
     title: "testpmd-3n-skx-xxv710-64b-2t1c-base-pdr"
     layout: "plot-throughput"
 
     title: "testpmd-3n-skx-xxv710-64b-2t1c-base-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: testpmd-3n-skx-xxv710-64b-4t2c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   title: "DPDK Throughput: testpmd-3n-skx-xxv710-64b-4t2c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -16910,8 +18033,7 @@
     layout: "plot-throughput"
 
 # Packet Throughput - DPDK testpmd 2n-skx-x710
     layout: "plot-throughput"
 
 # Packet Throughput - DPDK testpmd 2n-skx-x710
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: testpmd-2n-skx-x710-64b-2t1c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   title: "DPDK Throughput: testpmd-2n-skx-x710-64b-2t1c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -16935,8 +18057,7 @@
     title: "testpmd-2n-skx-x710-64b-2t1c-base-ndr"
     layout: "plot-throughput"
 
     title: "testpmd-2n-skx-x710-64b-2t1c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: testpmd-2n-skx-x710-64b-4t2c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   title: "DPDK Throughput: testpmd-2n-skx-x710-64b-4t2c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -16960,8 +18081,7 @@
     title: "testpmd-2n-skx-x710-64b-4t2c-base-ndr"
     layout: "plot-throughput"
 
     title: "testpmd-2n-skx-x710-64b-4t2c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: testpmd-2n-skx-x710-64b-2t1c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   title: "DPDK Throughput: testpmd-2n-skx-x710-64b-2t1c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -16985,8 +18105,7 @@
     title: "testpmd-2n-skx-x710-64b-2t1c-base-pdr"
     layout: "plot-throughput"
 
     title: "testpmd-2n-skx-x710-64b-2t1c-base-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: testpmd-2n-skx-x710-64b-4t2c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   title: "DPDK Throughput: testpmd-2n-skx-x710-64b-4t2c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -17011,8 +18130,7 @@
     layout: "plot-throughput"
 
 # Packet Throughput - DPDK testpmd 2n-skx-xxv710
     layout: "plot-throughput"
 
 # Packet Throughput - DPDK testpmd 2n-skx-xxv710
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: testpmd-2n-skx-xxv710-64b-2t1c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   title: "DPDK Throughput: testpmd-2n-skx-xxv710-64b-2t1c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -17036,8 +18154,7 @@
     title: "testpmd-2n-skx-xxv710-64b-2t1c-base-ndr"
     layout: "plot-throughput"
 
     title: "testpmd-2n-skx-xxv710-64b-2t1c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: testpmd-2n-skx-xxv710-64b-4t2c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   title: "DPDK Throughput: testpmd-2n-skx-xxv710-64b-4t2c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -17061,8 +18178,7 @@
     title: "testpmd-2n-skx-xxv710-64b-4t2c-base-ndr"
     layout: "plot-throughput"
 
     title: "testpmd-2n-skx-xxv710-64b-4t2c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: testpmd-2n-skx-xxv710-64b-2t1c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   title: "DPDK Throughput: testpmd-2n-skx-xxv710-64b-2t1c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -17086,8 +18202,7 @@
     title: "testpmd-2n-skx-xxv710-64b-2t1c-base-pdr"
     layout: "plot-throughput"
 
     title: "testpmd-2n-skx-xxv710-64b-2t1c-base-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Throughput: testpmd-2n-skx-xxv710-64b-4t2c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   title: "DPDK Throughput: testpmd-2n-skx-xxv710-64b-4t2c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -17114,13 +18229,12 @@
 ################################################################################
 
 # Packet Latency - VPP L2 3n-hsw-x520 base and scale
 ################################################################################
 
 # Packet Latency - VPP L2 3n-hsw-x520 base and scale
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
   title: "VPP Latency: l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -17145,13 +18259,12 @@
     title: "l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
     layout: "plot-latency"
 
     title: "l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
   title: "VPP Latency: l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -17177,13 +18290,12 @@
     layout: "plot-latency"
 
 # Packet Latency - VPP L2 3n-hsw-x520 features
     layout: "plot-latency"
 
 # Packet Latency - VPP L2 3n-hsw-x520 features
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: l2sw-3n-hsw-x520-64b-1t1c-features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-1t1c-features-ndr-lat"
   title: "VPP Latency: l2sw-3n-hsw-x520-64b-1t1c-features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-1t1c-features-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
@@ -17205,13 +18317,12 @@
     title: "l2sw-3n-hsw-x520-64b-1t1c-features-ndr"
     layout: "plot-latency"
 
     title: "l2sw-3n-hsw-x520-64b-1t1c-features-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: l2sw-3n-hsw-x520-64b-2t2c-features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-2t2c-features-ndr-lat"
   title: "VPP Latency: l2sw-3n-hsw-x520-64b-2t2c-features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-2t2c-features-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
@@ -17233,14 +18344,170 @@
     title: "l2sw-3n-hsw-x520-64b-2t2c-features-ndr"
     layout: "plot-latency"
 
     title: "l2sw-3n-hsw-x520-64b-2t2c-features-ndr"
     layout: "plot-latency"
 
+# Packet Latency - VPP L2 3n-hsw-x520 features-iacl
+- type: "plot"
+  title: "VPP Latency: l2sw-3n-hsw-x520-64b-1t1c-features-iacl-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-1t1c-features-iacl-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           'NDRPDR' and
+           '1T1C' and
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'IACL' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
+           not 'MACIP' and
+           not 'VHOST' and
+           not 'MEMIF'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  layout:
+    title: "l2sw-3n-hsw-x520-64b-1t1c-features-iacl-ndr"
+    layout: "plot-latency"
+
+- type: "plot"
+  title: "VPP Latency: l2sw-3n-hsw-x520-64b-2t2c-features-iacl-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-2t2c-features-iacl-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           'NDRPDR' and
+           '2T2C' and
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'IACL' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
+           not 'MACIP' and
+           not 'VHOST' and
+           not 'MEMIF'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  layout:
+    title: "l2sw-3n-hsw-x520-64b-2t2c-features-iacl-ndr"
+    layout: "plot-latency"
+
+# Packet Latency - VPP L2 3n-hsw-x520 features-oacl
+- type: "plot"
+  title: "VPP Latency: l2sw-3n-hsw-x520-64b-1t1c-features-oacl-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-1t1c-features-oacl-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           'NDRPDR' and
+           '1T1C' and
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'OACL' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
+           not 'MACIP' and
+           not 'VHOST' and
+           not 'MEMIF'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  layout:
+    title: "l2sw-3n-hsw-x520-64b-1t1c-features-oacl-ndr"
+    layout: "plot-latency"
+
+- type: "plot"
+  title: "VPP Latency: l2sw-3n-hsw-x520-64b-2t2c-features-oacl-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-2t2c-features-oacl-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           'NDRPDR' and
+           '2T2C' and
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'OACL' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
+           not 'MACIP' and
+           not 'VHOST' and
+           not 'MEMIF'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  layout:
+    title: "l2sw-3n-hsw-x520-64b-2t2c-features-oacl-ndr"
+    layout: "plot-latency"
+
+# Packet Latency - VPP L2 3n-hsw-x520 features-macip
+- type: "plot"
+  title: "VPP Latency: l2sw-3n-hsw-x520-64b-1t1c-features-macip-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-1t1c-features-macip-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           'NDRPDR' and
+           '1T1C' and
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'MACIP' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
+           not 'VHOST' and
+           not 'MEMIF'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  layout:
+    title: "l2sw-3n-hsw-x520-64b-1t1c-features-macip-ndr"
+    layout: "plot-latency"
+
+- type: "plot"
+  title: "VPP Latency: l2sw-3n-hsw-x520-64b-2t2c-features-macip-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-2t2c-features-macip-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           'NDRPDR' and
+           '2T2C' and
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'MACIP' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
+           not 'VHOST' and
+           not 'MEMIF'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  layout:
+    title: "l2sw-3n-hsw-x520-64b-2t2c-features-macip-ndr"
+    layout: "plot-latency"
+
 # Packet Latency - VPP L2 3n-hsw-x710 base and scale
 # Packet Latency - VPP L2 3n-hsw-x710 base and scale
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
   title: "VPP Latency: l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -17265,13 +18532,12 @@
     title: "l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
     layout: "plot-latency"
 
     title: "l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
   title: "VPP Latency: l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -17297,13 +18563,12 @@
     layout: "plot-latency"
 
 # Packet Latency - VPP L2 3n-hsw-x710 features
     layout: "plot-latency"
 
 # Packet Latency - VPP L2 3n-hsw-x710 features
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: l2sw-3n-hsw-x710-64b-1t1c-features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-1t1c-features-ndr-lat"
   title: "VPP Latency: l2sw-3n-hsw-x710-64b-1t1c-features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-1t1c-features-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -17311,58 +18576,109 @@
            (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
            not 'ACL' and
            not 'VHOST' and
            (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
            not 'ACL' and
            not 'VHOST' and
-           not 'L2OVRLAY' and
+           not 'L2OVRLAY' and
+           not 'MEMIF'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "L2XCBASE"    # l2xcbase
+  - "L2BDBASE"    # l2bdbase
+  - "L2XCFWD"     # dot1q-l2xcbase
+  - "L2BDMACLRN"  # dot1q-l2bdbase
+  layout:
+    title: "l2sw-3n-hsw-x710-64b-1t1c-features-ndr"
+    layout: "plot-latency"
+
+- type: "plot"
+  title: "VPP Latency: l2sw-3n-hsw-x710-64b-2t2c-features-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-2t2c-features-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'NDRPDR' and
+           '2T2C' and
+           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
+           not 'ACL' and
+           not 'VHOST' and
+           not 'L2OVRLAY' and
+           not 'MEMIF'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "L2XCBASE"    # l2xcbase
+  - "L2BDBASE"    # l2bdbase
+  - "L2XCFWD"     # dot1q-l2xcbase
+  - "L2BDMACLRN"  # dot1q-l2bdbase
+  layout:
+    title: "l2sw-3n-hsw-x710-64b-2t2c-features-ndr"
+    layout: "plot-latency"
+
+# Packet Latency - VPP L2 3n-hsw-x710 features-iacl
+- type: "plot"
+  title: "VPP Latency: l2sw-3n-hsw-x710-64b-1t1c-features-iacl-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-1t1c-features-iacl-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'NDRPDR' and
+           '1T1C' and
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'IACL' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
+           not 'MACIP' and
+           not 'VHOST' and
            not 'MEMIF'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
            not 'MEMIF'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "L2XCBASE"    # l2xcbase
-  - "L2BDBASE"    # l2bdbase
-  - "L2XCFWD"     # dot1q-l2xcbase
-  - "L2BDMACLRN"  # dot1q-l2bdbase
   layout:
   layout:
-    title: "l2sw-3n-hsw-x710-64b-1t1c-features-ndr"
+    title: "l2sw-3n-hsw-x710-64b-1t1c-features-iacl-ndr"
     layout: "plot-latency"
 
     layout: "plot-latency"
 
--
-  type: "plot"
-  title: "VPP Latency: l2sw-3n-hsw-x710-64b-2t2c-features-ndr-lat"
+- type: "plot"
+  title: "VPP Latency: l2sw-3n-hsw-x710-64b-2t2c-features-iacl-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-2t2c-features-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-2t2c-features-iacl-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
            '2T2C' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
            '2T2C' and
-           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
-           not 'ACL' and
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'IACL' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
+           not 'MACIP' and
            not 'VHOST' and
            not 'VHOST' and
-           not 'L2OVRLAY' and
            not 'MEMIF'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
            not 'MEMIF'"
   parameters:
   - "latency"
   - "parent"
   - "tags"
-  sort:
-  - "L2XCBASE"    # l2xcbase
-  - "L2BDBASE"    # l2bdbase
-  - "L2XCFWD"     # dot1q-l2xcbase
-  - "L2BDMACLRN"  # dot1q-l2bdbase
   layout:
   layout:
-    title: "l2sw-3n-hsw-x710-64b-2t2c-features-ndr"
+    title: "l2sw-3n-hsw-x710-64b-2t2c-features-iacl-ndr"
     layout: "plot-latency"
 
 # Packet Latency - VPP L2 3n-hsw-xl710 base and scale
     layout: "plot-latency"
 
 # Packet Latency - VPP L2 3n-hsw-xl710 base and scale
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: l2sw-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
   title: "VPP Latency: l2sw-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'BASE' and
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'BASE' and
@@ -17384,13 +18700,12 @@
     title: "l2sw-3n-hsw-xl710-64b-1t1c-base-ndr"
     layout: "plot-latency"
 
     title: "l2sw-3n-hsw-xl710-64b-1t1c-base-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: l2sw-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
   title: "VPP Latency: l2sw-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'BASE' and
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'BASE' and
@@ -17413,13 +18728,12 @@
     layout: "plot-latency"
 
 # Packet Latency - VPP L2 3n-skx-x710 base and scale
     layout: "plot-latency"
 
 # Packet Latency - VPP L2 3n-skx-x710 base and scale
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
   title: "VPP Latency: l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -17445,13 +18759,12 @@
     title: "l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
     layout: "plot-latency"
 
     title: "l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
   title: "VPP Latency: l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -17478,13 +18791,12 @@
     layout: "plot-latency"
 
 # Packet Latency - VPP L2 3n-skx-x710 features
     layout: "plot-latency"
 
 # Packet Latency - VPP L2 3n-skx-x710 features
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: l2sw-3n-skx-x710-64b-2t1c-features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-2t1c-features-ndr-lat"
   title: "VPP Latency: l2sw-3n-skx-x710-64b-2t1c-features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-2t1c-features-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -17508,13 +18820,12 @@
     title: "l2sw-3n-skx-x710-64b-2t1c-features-ndr"
     layout: "plot-latency"
 
     title: "l2sw-3n-skx-x710-64b-2t1c-features-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: l2sw-3n-skx-x710-64b-4t2c-features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-4t2c-features-ndr-lat"
   title: "VPP Latency: l2sw-3n-skx-x710-64b-4t2c-features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-4t2c-features-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -17538,14 +18849,66 @@
     title: "l2sw-3n-skx-x710-64b-4t2c-features-ndr"
     layout: "plot-latency"
 
     title: "l2sw-3n-skx-x710-64b-4t2c-features-ndr"
     layout: "plot-latency"
 
-# Packet Latency - VPP L2 3n-skx-xxv710 base and scale
--
-  type: "plot"
+# Packet Latency - VPP L2 3n-skx-x710 features-iacl
+- type: "plot"
+  title: "VPP Latency: l2sw-3n-skx-x710-64b-2t1c-features-iacl-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-2t1c-features-iacl-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'NDRPDR' and
+           '2T1C' and
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'IACL' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
+           not 'MACIP' and
+           not 'VHOST' and
+           not 'MEMIF'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  layout:
+    title: "l2sw-3n-skx-x710-64b-2t1c-features-iacl-ndr"
+    layout: "plot-latency"
+
+- type: "plot"
+  title: "VPP Latency: l2sw-3n-skx-x710-64b-4t2c-features-iacl-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-4t2c-features-iacl-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'NDRPDR' and
+           '4T2C' and
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'IACL' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
+           not 'MACIP' and
+           not 'VHOST' and
+           not 'MEMIF'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  layout:
+    title: "l2sw-3n-skx-x710-64b-4t2c-features-iacl-ndr"
+    layout: "plot-latency"
+
+# Packet Latency - VPP L2 3n-skx-xxv710 base
+- type: "plot"
   title: "VPP Latency: l2sw-3n-skx-xxv710-64b-2t1c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-2t1c-base-ndr-lat"
   title: "VPP Latency: l2sw-3n-skx-xxv710-64b-2t1c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-2t1c-base-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('BASE' or 'SCALE') and
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -17568,13 +18931,12 @@
     title: "l2sw-3n-skx-xxv710-64b-2t1c-base-ndr"
     layout: "plot-latency"
 
     title: "l2sw-3n-skx-xxv710-64b-2t1c-base-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: l2sw-3n-skx-xxv710-64b-4t2c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-4t2c-base-ndr-lat"
   title: "VPP Latency: l2sw-3n-skx-xxv710-64b-4t2c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-4t2c-base-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('BASE' or 'SCALE') and
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -17598,13 +18960,12 @@
     layout: "plot-latency"
 
 # Packet Latency - VPP L2 2n-skx-x710 base and scale
     layout: "plot-latency"
 
 # Packet Latency - VPP L2 2n-skx-x710 base and scale
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
   title: "VPP Latency: l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ETH' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ETH' and
@@ -17629,13 +18990,12 @@
     title: "l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
     layout: "plot-latency"
 
     title: "l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
   title: "VPP Latency: l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -17661,13 +19021,12 @@
     layout: "plot-latency"
 
 # Packet Latency - VPP L2 2n-skx-xxv710 base and scale
     layout: "plot-latency"
 
 # Packet Latency - VPP L2 2n-skx-xxv710 base and scale
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
   title: "VPP Latency: l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('BASE' or 'SCALE') and
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -17692,13 +19051,12 @@
     title: "l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
     layout: "plot-latency"
 
     title: "l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
   title: "VPP Latency: l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('BASE' or 'SCALE') and
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -17726,13 +19084,12 @@
 ################################################################################
 
 # Packet Latency - VPP Container Memif 3n-hsw-x520
 ################################################################################
 
 # Packet Latency - VPP Container Memif 3n-hsw-x520
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: memif-3n-hsw-x520-64b-1t1c-base_and_features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-1t1c-base_and_features-ndr-lat"
   title: "VPP Latency: memif-3n-hsw-x520-64b-1t1c-base_and_features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-1t1c-base_and_features-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -17757,13 +19114,12 @@
     title: "memif-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
     layout: "plot-latency"
 
     title: "memif-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: memif-3n-hsw-x520-64b-2t2c-base_and_features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-2t2c-base_and_features-ndr-lat"
   title: "VPP Latency: memif-3n-hsw-x520-64b-2t2c-base_and_features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-2t2c-base_and_features-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -17789,13 +19145,12 @@
     layout: "plot-latency"
 
 # Packet Latency - VPP Container Memif 3n-hsw-x710
     layout: "plot-latency"
 
 # Packet Latency - VPP Container Memif 3n-hsw-x710
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: memif-3n-hsw-x710-64b-1t1c-base_and_features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-1t1c-base_and_features-ndr-lat"
   title: "VPP Latency: memif-3n-hsw-x710-64b-1t1c-base_and_features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-1t1c-base_and_features-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -17820,13 +19175,12 @@
     title: "memif-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
     layout: "plot-latency"
 
     title: "memif-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: memif-3n-hsw-x710-64b-2t2c-base_and_features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-2t2c-base_and_features-ndr-lat"
   title: "VPP Latency: memif-3n-hsw-x710-64b-2t2c-base_and_features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-2t2c-base_and_features-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -17852,13 +19206,12 @@
     layout: "plot-latency"
 
 # Packet Latency - VPP Container Memif 3n-hsw-xl710
     layout: "plot-latency"
 
 # Packet Latency - VPP Container Memif 3n-hsw-xl710
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: memif-3n-hsw-xl710-64b-1t1c-base_and_features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-1t1c-base_and_features-ndr-lat"
   title: "VPP Latency: memif-3n-hsw-xl710-64b-1t1c-base_and_features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-1t1c-base_and_features-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            ('BASE' or 'SCALE') and
   filter: "'NIC_Intel-XL710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -17883,13 +19236,12 @@
     title: "memif-3n-hsw-xl710-64b-1t1c-base_and_features-ndr"
     layout: "plot-latency"
 
     title: "memif-3n-hsw-xl710-64b-1t1c-base_and_features-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: memif-3n-hsw-xl710-64b-2t2c-base_and_features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-2t2c-base_and_features-ndr-lat"
   title: "VPP Latency: memif-3n-hsw-xl710-64b-2t2c-base_and_features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-2t2c-base_and_features-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            ('BASE' or 'SCALE') and
   filter: "'NIC_Intel-XL710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -17915,13 +19267,12 @@
     layout: "plot-latency"
 
 # Packet Latency - VPP Container Memif 3n-skx-x710
     layout: "plot-latency"
 
 # Packet Latency - VPP Container Memif 3n-skx-x710
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: memif-3n-skx-x710-64b-2t1c-base_and_features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-2t1c-base_and_features-ndr-lat"
   title: "VPP Latency: memif-3n-skx-x710-64b-2t1c-base_and_features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-2t1c-base_and_features-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -17946,13 +19297,12 @@
     title: "memif-3n-skx-x710-64b-2t1c-base_and_features-ndr"
     layout: "plot-latency"
 
     title: "memif-3n-skx-x710-64b-2t1c-base_and_features-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: memif-3n-skx-x710-64b-4t2c-base_and_features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-4t2c-base_and_features-ndr-lat"
   title: "VPP Latency: memif-3n-skx-x710-64b-4t2c-base_and_features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-4t2c-base_and_features-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -17978,13 +19328,12 @@
     layout: "plot-latency"
 
 # Packet Latency - VPP Container Memif 2n-skx-x710
     layout: "plot-latency"
 
 # Packet Latency - VPP Container Memif 2n-skx-x710
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: memif-2n-skx-x710-64b-2t1c-base_and_features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-2t1c-base_and_features-ndr-lat"
   title: "VPP Latency: memif-2n-skx-x710-64b-2t1c-base_and_features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-2t1c-base_and_features-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -18010,13 +19359,12 @@
     title: "memif-2n-skx-x710-64b-2t1c-base_and_features-ndr"
     layout: "plot-latency"
 
     title: "memif-2n-skx-x710-64b-2t1c-base_and_features-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: memif-2n-skx-x710-64b-4t2c-base_and_features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-4t2c-base_and_features-ndr-lat"
   title: "VPP Latency: memif-2n-skx-x710-64b-4t2c-base_and_features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-4t2c-base_and_features-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -18033,337 +19381,326 @@
   sort:
   - "L2XCFWD"
   - "L2XCFWD"
   sort:
   - "L2XCFWD"
   - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
-  layout:
-    title: "memif-2n-skx-x710-64b-4t2c-base_and_features-ndr"
-    layout: "plot-latency"
-
-# Packet Latency - VPP Container Memif 2n-skx-xxv710
--
-  type: "plot"
-  title: "VPP Latency: memif-2n-skx-xxv710-64b-2t1c-base_and_features-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-xxv710-64b-2t1c-base_and_features-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
-  layout:
-    title: "memif-2n-skx-xxv710-64b-2t1c-base_and_features-ndr"
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: memif-2n-skx-xxv710-64b-4t2c-base_and_features-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-xxv710-64b-4t2c-base_and_features-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
-  layout:
-    title: "memif-2n-skx-xxv710-64b-4t2c-base_and_features-ndr"
-    layout: "plot-latency"
-
-################################################################################
-
-# Packet Latency - VPP Container Memif 3n-hsw-x520 - l2xc
--
-  type: "plot"
-  title: "VPP Latency: k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-ndr-lat"
-  data: "plot-ligato-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '1T1C' and
-           'L2XCFWD' and
-           not 'VHOST' and
-           not 'NF_DENSITY' and
-           'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
-  layout:
-    title: "k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-ndr"
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-ndr-lat"
-  data: "plot-ligato-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '2T2C' and
-           'L2XCFWD' and
-           not 'VHOST' and
-           not 'NF_DENSITY' and
-           'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
-  layout:
-    title: "k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-ndr"
-    layout: "plot-latency"
-
-# Packet Latency - VPP Container Memif 3n-hsw-x520 - l2bd
--
-  type: "plot"
-  title: "VPP Latency: k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-ndr-lat"
-  data: "plot-ligato-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN') and
-           not 'VHOST' and
-           not 'NF_DENSITY' and
-           'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
-  layout:
-    title: "k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-ndr"
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-ndr-lat"
-  data: "plot-ligato-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN') and
-           not 'VHOST' and
-           not 'NF_DENSITY' and
-           'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
-  layout:
-    title: "k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-ndr"
-    layout: "plot-latency"
-
-# Packet Latency - VPP Container Memif 3n-hsw-x710 - l2xc
--
-  type: "plot"
-  title: "VPP Latency: k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-ndr-lat"
-  data: "plot-ligato-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '1T1C' and
-           'L2XCFWD' and
-           not 'VHOST' and
-           not 'NF_DENSITY' and
-           'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
-  layout:
-    title: "k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-ndr"
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-ndr-lat"
-  data: "plot-ligato-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '2T2C' and
-           'L2XCFWD' and
-           not 'VHOST' and
-           not 'NF_DENSITY' and
-           'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
-  layout:
-    title: "k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-ndr"
-    layout: "plot-latency"
-
-# Packet Latency - VPP Container Memif 3n-hsw-x710 - l2bd
--
-  type: "plot"
-  title: "VPP Latency: k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-ndr-lat"
-  data: "plot-ligato-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN') and
-           not 'VHOST' and
-           not 'NF_DENSITY' and
-           'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
-  layout:
-    title: "k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-ndr"
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-ndr-lat"
-  data: "plot-ligato-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN') and
-           not 'VHOST' and
-           not 'NF_DENSITY' and
-           'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "IP4FWD"
   layout:
   layout:
-    title: "k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-ndr"
+    title: "memif-2n-skx-x710-64b-4t2c-base_and_features-ndr"
     layout: "plot-latency"
 
     layout: "plot-latency"
 
+## Packet Latency - VPP Container Memif 2n-skx-xxv710
+#- type: "plot"
+#  title: "VPP Latency: memif-2n-skx-xxv710-64b-2t1c-base_and_features-ndr-lat"
+#  algorithm: "plot_latency_error_bars"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-xxv710-64b-2t1c-base_and_features-ndr-lat"
+#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+#  filter: "'NIC_Intel-XXV710' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
+#           'NDRPDR' and
+#           '2T1C' and
+#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
+#           not 'VHOST' and
+#           'MEMIF'"
+#  parameters:
+#  - "latency"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "L2XCFWD"
+#  - "L2XCFWD"
+#  - "L2XCFWD"
+#  - "L2BDMACLRN"
+#  - "L2BDMACLRN"
+#  - "L2BDMACLRN"
+#  - "IP4FWD"
+#  layout:
+#    title: "memif-2n-skx-xxv710-64b-2t1c-base_and_features-ndr"
+#    layout: "plot-latency"
+#
+#- type: "plot"
+#  title: "VPP Latency: memif-2n-skx-xxv710-64b-4t2c-base_and_features-ndr-lat"
+#  algorithm: "plot_latency_error_bars"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-xxv710-64b-4t2c-base_and_features-ndr-lat"
+#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+#  filter: "'NIC_Intel-XXV710' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
+#           'NDRPDR' and
+#           '4T2C' and
+#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
+#           not 'VHOST' and
+#           'MEMIF'"
+#  parameters:
+#  - "latency"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "L2XCFWD"
+#  - "L2XCFWD"
+#  - "L2XCFWD"
+#  - "L2BDMACLRN"
+#  - "L2BDMACLRN"
+#  - "L2BDMACLRN"
+#  - "IP4FWD"
+#  layout:
+#    title: "memif-2n-skx-xxv710-64b-4t2c-base_and_features-ndr"
+#    layout: "plot-latency"
+
+################################################################################
+
+## Packet Latency - VPP Container Memif 3n-hsw-x520 - l2xc
+#- type: "plot"
+#  title: "VPP Latency: k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-ndr-lat"
+#  algorithm: "plot_latency_error_bars"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-ndr-lat"
+#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X520-DA2' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
+#           'NDRPDR' and
+#           '1T1C' and
+#           'L2XCFWD' and
+#           not 'VHOST' and
+#           not 'NF_DENSITY' and
+#           'MEMIF'"
+#  parameters:
+#  - "latency"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "1VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  layout:
+#    title: "k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-ndr"
+#    layout: "plot-latency"
+#
+#- type: "plot"
+#  title: "VPP Latency: k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-ndr-lat"
+#  algorithm: "plot_latency_error_bars"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-ndr-lat"
+#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X520-DA2' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
+#           'NDRPDR' and
+#           '2T2C' and
+#           'L2XCFWD' and
+#           not 'VHOST' and
+#           not 'NF_DENSITY' and
+#           'MEMIF'"
+#  parameters:
+#  - "latency"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "1VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  layout:
+#    title: "k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-ndr"
+#    layout: "plot-latency"
+#
+## Packet Latency - VPP Container Memif 3n-hsw-x520 - l2bd
+#- type: "plot"
+#  title: "VPP Latency: k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-ndr-lat"
+#  algorithm: "plot_latency_error_bars"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-ndr-lat"
+#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X520-DA2' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
+#           'NDRPDR' and
+#           '1T1C' and
+#           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+#           not 'VHOST' and
+#           not 'NF_DENSITY' and
+#           'MEMIF'"
+#  parameters:
+#  - "latency"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "1VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  layout:
+#    title: "k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-ndr"
+#    layout: "plot-latency"
+#
+#- type: "plot"
+#  title: "VPP Latency: k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-ndr-lat"
+#  algorithm: "plot_latency_error_bars"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-ndr-lat"
+#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X520-DA2' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
+#           'NDRPDR' and
+#           '2T2C' and
+#           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+#           not 'VHOST' and
+#           not 'NF_DENSITY' and
+#           'MEMIF'"
+#  parameters:
+#  - "latency"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "1VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  layout:
+#    title: "k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-ndr"
+#    layout: "plot-latency"
+#
+## Packet Latency - VPP Container Memif 3n-hsw-x710 - l2xc
+#- type: "plot"
+#  title: "VPP Latency: k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-ndr-lat"
+#  algorithm: "plot_latency_error_bars"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-ndr-lat"
+#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
+#           'NDRPDR' and
+#           '1T1C' and
+#           'L2XCFWD' and
+#           not 'VHOST' and
+#           not 'NF_DENSITY' and
+#           'MEMIF'"
+#  parameters:
+#  - "latency"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "1VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  layout:
+#    title: "k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-ndr"
+#    layout: "plot-latency"
+#
+#- type: "plot"
+#  title: "VPP Latency: k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-ndr-lat"
+#  algorithm: "plot_latency_error_bars"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-ndr-lat"
+#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
+#           'NDRPDR' and
+#           '2T2C' and
+#           'L2XCFWD' and
+#           not 'VHOST' and
+#           not 'NF_DENSITY' and
+#           'MEMIF'"
+#  parameters:
+#  - "latency"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "1VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  layout:
+#    title: "k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-ndr"
+#    layout: "plot-latency"
+#
+## Packet Latency - VPP Container Memif 3n-hsw-x710 - l2bd
+#- type: "plot"
+#  title: "VPP Latency: k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-ndr-lat"
+#  algorithm: "plot_latency_error_bars"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-ndr-lat"
+#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
+#           'NDRPDR' and
+#           '1T1C' and
+#           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+#           not 'VHOST' and
+#           not 'NF_DENSITY' and
+#           'MEMIF'"
+#  parameters:
+#  - "latency"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "1VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  layout:
+#    title: "k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-ndr"
+#    layout: "plot-latency"
+#
+#- type: "plot"
+#  title: "VPP Latency: k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-ndr-lat"
+#  algorithm: "plot_latency_error_bars"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-ndr-lat"
+#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
+#           'NDRPDR' and
+#           '2T2C' and
+#           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+#           not 'VHOST' and
+#           not 'NF_DENSITY' and
+#           'MEMIF'"
+#  parameters:
+#  - "latency"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "1VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  layout:
+#    title: "k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-ndr"
+#    layout: "plot-latency"
+
 ################################################################################
 
 # Packet Latency - VPP IPv4 3n-hsw-x520 base and scale
 ################################################################################
 
 # Packet Latency - VPP IPv4 3n-hsw-x520 base and scale
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
   title: "VPP Latency: ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            '1T1C' and
            'IP4FWD' and
            'NDRPDR' and
            '1T1C' and
            'IP4FWD' and
@@ -18377,23 +19714,22 @@
   sort:
   - "DOT1Q"
   - "IP4BASE"
   sort:
   - "DOT1Q"
   - "IP4BASE"
-  - "FIB_20k"
-  - "FIB_200k"
+  - "FIB_20K"
+  - "FIB_200K"
   - "FIB_2M"
   layout:
     title: "ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
     layout: "plot-latency"
 
   - "FIB_2M"
   layout:
     title: "ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
   title: "VPP Latency: ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            '2T2C' and
            'IP4FWD' and
            'NDRPDR' and
            '2T2C' and
            'IP4FWD' and
@@ -18407,28 +19743,27 @@
   sort:
   - "DOT1Q"
   - "IP4BASE"
   sort:
   - "DOT1Q"
   - "IP4BASE"
-  - "FIB_20k"
-  - "FIB_200k"
+  - "FIB_20K"
+  - "FIB_200K"
   - "FIB_2M"
   layout:
     title: "ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
     layout: "plot-latency"
 
 # Packet Latency - VPP IPv4 3n-hsw-x520 features
   - "FIB_2M"
   layout:
     title: "ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
     layout: "plot-latency"
 
 # Packet Latency - VPP IPv4 3n-hsw-x520 features
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: ip4-3n-hsw-x520-64b-1t1c-features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-ndr-lat"
   title: "VPP Latency: ip4-3n-hsw-x520-64b-1t1c-features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('IP4BASE' or
             'POLICE_MARK' or
             'COPWHLIST' or
             ('NAT44' and 'BASE') or
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('IP4BASE' or
             'POLICE_MARK' or
             'COPWHLIST' or
             ('NAT44' and 'BASE') or
-            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
+            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
            'NDRPDR' and
            '1T1C' and
            'IP4FWD' and
            'NDRPDR' and
            '1T1C' and
            'IP4FWD' and
@@ -18450,20 +19785,19 @@
     title: "ip4-3n-hsw-x520-64b-1t1c-features-ndr"
     layout: "plot-latency"
 
     title: "ip4-3n-hsw-x520-64b-1t1c-features-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: ip4-3n-hsw-x520-64b-2t2c-features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-ndr-lat"
   title: "VPP Latency: ip4-3n-hsw-x520-64b-2t2c-features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('IP4BASE' or
             'POLICE_MARK' or
             'COPWHLIST' or
             ('NAT44' and 'BASE') or
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('IP4BASE' or
             'POLICE_MARK' or
             'COPWHLIST' or
             ('NAT44' and 'BASE') or
-            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
+            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
            'NDRPDR' and
            '2T2C' and
            'IP4FWD' and
            'NDRPDR' and
            '2T2C' and
            'IP4FWD' and
@@ -18486,13 +19820,12 @@
     layout: "plot-latency"
 
 # Packet Latency - VPP IPv4 3n-hsw-x520 features nat44
     layout: "plot-latency"
 
 # Packet Latency - VPP IPv4 3n-hsw-x520 features nat44
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: ip4-3n-hsw-x520-64b-1t1c-features-nat44-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-nat44-ndr-lat"
   title: "VPP Latency: ip4-3n-hsw-x520-64b-1t1c-features-nat44-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-nat44-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
@@ -18517,13 +19850,12 @@
     title: "ip4-3n-hsw-x520-64b-1t1c-features-nat44-ndr"
     layout: "plot-latency"
 
     title: "ip4-3n-hsw-x520-64b-1t1c-features-nat44-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: ip4-3n-hsw-x520-64b-2t2c-features-nat44-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-nat44-ndr-lat"
   title: "VPP Latency: ip4-3n-hsw-x520-64b-2t2c-features-nat44-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-nat44-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
@@ -18549,19 +19881,18 @@
     layout: "plot-latency"
 
 # Packet Latency - VPP IPv4 3n-hsw-x520 features iacl
     layout: "plot-latency"
 
 # Packet Latency - VPP IPv4 3n-hsw-x520 features iacl
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: ip4-3n-hsw-x520-64b-1t1c-features-iacl-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-iacl-ndr-lat"
   title: "VPP Latency: ip4-3n-hsw-x520-64b-1t1c-features-iacl-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-iacl-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
            '1T1C' and
            'IP4FWD' and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
            '1T1C' and
            'IP4FWD' and
-           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
+           (('IACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
            not 'IPSEC' and
            not 'DOT1Q' and
            not 'VHOST'"
            not 'IPSEC' and
            not 'DOT1Q' and
            not 'VHOST'"
@@ -18579,19 +19910,18 @@
     title: "ip4-3n-hsw-x520-64b-1t1c-features-iacl-ndr"
     layout: "plot-latency"
 
     title: "ip4-3n-hsw-x520-64b-1t1c-features-iacl-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: ip4-3n-hsw-x520-64b-2t2c-features-iacl-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-iacl-ndr-lat"
   title: "VPP Latency: ip4-3n-hsw-x520-64b-2t2c-features-iacl-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-iacl-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
            '2T2C' and
            'IP4FWD' and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
            '2T2C' and
            'IP4FWD' and
-           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
+           (('IACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
            not 'IPSEC' and
            not 'DOT1Q' and
            not 'VHOST'"
            not 'IPSEC' and
            not 'DOT1Q' and
            not 'VHOST'"
@@ -18610,19 +19940,18 @@
     layout: "plot-latency"
 
 # Packet Latency - VPP IPv4 3n-hsw-x520 features oacl
     layout: "plot-latency"
 
 # Packet Latency - VPP IPv4 3n-hsw-x520 features oacl
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: ip4-3n-hsw-x520-64b-1t1c-features-oacl-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-oacl-ndr-lat"
   title: "VPP Latency: ip4-3n-hsw-x520-64b-1t1c-features-oacl-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-oacl-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
            '1T1C' and
            'IP4FWD' and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
            '1T1C' and
            'IP4FWD' and
-           ('OACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
+           (('OACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
            not 'IPSEC' and
            not 'DOT1Q' and
            not 'VHOST'"
            not 'IPSEC' and
            not 'DOT1Q' and
            not 'VHOST'"
@@ -18640,19 +19969,18 @@
     title: "ip4-3n-hsw-x520-64b-1t1c-features-oacl-ndr"
     layout: "plot-latency"
 
     title: "ip4-3n-hsw-x520-64b-1t1c-features-oacl-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: ip4-3n-hsw-x520-64b-2t2c-features-oacl-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-oacl-ndr-lat"
   title: "VPP Latency: ip4-3n-hsw-x520-64b-2t2c-features-oacl-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-oacl-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
            '2T2C' and
            'IP4FWD' and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
            '2T2C' and
            'IP4FWD' and
-           ('OACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
+           (('OACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
            not 'IPSEC' and
            not 'DOT1Q' and
            not 'VHOST'"
            not 'IPSEC' and
            not 'DOT1Q' and
            not 'VHOST'"
@@ -18671,13 +19999,12 @@
     layout: "plot-latency"
 
 # Packet Latency - VPP IPv4 3n-hsw-x710 base and scale
     layout: "plot-latency"
 
 # Packet Latency - VPP IPv4 3n-hsw-x710 base and scale
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
   title: "VPP Latency: ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
@@ -18700,13 +20027,12 @@
     title: "ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
     layout: "plot-latency"
 
     title: "ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
   title: "VPP Latency: ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
@@ -18730,20 +20056,19 @@
     layout: "plot-latency"
 
 # Packet Latency - VPP IPv4 3n-hsw-x710 features
     layout: "plot-latency"
 
 # Packet Latency - VPP IPv4 3n-hsw-x710 features
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: ip4-3n-hsw-x710-64b-1t1c-features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-ndr-lat"
   title: "VPP Latency: ip4-3n-hsw-x710-64b-1t1c-features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or
             'POLICE_MARK' or
             'COPWHLIST' or
             ('NAT44' and 'BASE') or
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or
             'POLICE_MARK' or
             'COPWHLIST' or
             ('NAT44' and 'BASE') or
-            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
+            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
            'NDRPDR' and
            '1T1C' and
            'IP4FWD' and
            'NDRPDR' and
            '1T1C' and
            'IP4FWD' and
@@ -18765,20 +20090,19 @@
     title: "ip4-3n-hsw-x710-64b-1t1c-features-ndr"
     layout: "plot-latency"
 
     title: "ip4-3n-hsw-x710-64b-1t1c-features-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: ip4-3n-hsw-x710-64b-2t2c-features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-ndr-lat"
   title: "VPP Latency: ip4-3n-hsw-x710-64b-2t2c-features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or
             'POLICE_MARK' or
             'COPWHLIST' or
             ('NAT44' and 'BASE') or
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or
             'POLICE_MARK' or
             'COPWHLIST' or
             ('NAT44' and 'BASE') or
-            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
+            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
            'NDRPDR' and
            '2T2C' and
            'IP4FWD' and
            'NDRPDR' and
            '2T2C' and
            'IP4FWD' and
@@ -18801,13 +20125,12 @@
     layout: "plot-latency"
 
 # Packet Latency - VPP IPv4 3n-hsw-x710 features nat44
     layout: "plot-latency"
 
 # Packet Latency - VPP IPv4 3n-hsw-x710 features nat44
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: ip4-3n-hsw-x710-64b-1t1c-features-nat44-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-nat44-ndr-lat"
   title: "VPP Latency: ip4-3n-hsw-x710-64b-1t1c-features-nat44-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-nat44-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -18831,13 +20154,12 @@
     title: "ip4-3n-hsw-x710-64b-1t1c-features-nat44-ndr"
     layout: "plot-latency"
 
     title: "ip4-3n-hsw-x710-64b-1t1c-features-nat44-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: ip4-3n-hsw-x710-64b-2t2c-features-nat44-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-nat44-ndr-lat"
   title: "VPP Latency: ip4-3n-hsw-x710-64b-2t2c-features-nat44-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-nat44-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -18862,19 +20184,18 @@
     layout: "plot-latency"
 
 # Packet Latency - VPP IPv4 3n-hsw-x710 features iacl
     layout: "plot-latency"
 
 # Packet Latency - VPP IPv4 3n-hsw-x710 features iacl
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: ip4-3n-hsw-x710-64b-1t1c-features-iacl-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-iacl-ndr-lat"
   title: "VPP Latency: ip4-3n-hsw-x710-64b-1t1c-features-iacl-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-iacl-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
            '1T1C' and
            'IP4FWD' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
            '1T1C' and
            'IP4FWD' and
-           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
+           ('IACL' and ('ACL10' or 'ACL50') and '10K_FLOWS' or 'IP4BASE') and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -18891,19 +20212,18 @@
     title: "ip4-3n-hsw-x710-64b-1t1c-features-iacl-ndr"
     layout: "plot-latency"
 
     title: "ip4-3n-hsw-x710-64b-1t1c-features-iacl-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   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"
   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"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
            '2T2C' and
            'IP4FWD' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
            '2T2C' and
            'IP4FWD' and
-           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
+           ('IACL' and ('ACL10' or 'ACL50') and '10K_FLOWS' or 'IP4BASE') and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -18921,13 +20241,12 @@
     layout: "plot-latency"
 
 # Packet Latency - VPP IPv4 3n-hsw-xl710 base and scale
     layout: "plot-latency"
 
 # Packet Latency - VPP IPv4 3n-hsw-xl710 base and scale
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: ip4-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
   title: "VPP Latency: ip4-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
   filter: "'NIC_Intel-XL710' and
            '64B' and
            ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
@@ -18949,13 +20268,12 @@
     title: "ip4-3n-hsw-xl710-64b-1t1c-base-ndr"
     layout: "plot-latency"
 
     title: "ip4-3n-hsw-xl710-64b-1t1c-base-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: ip4-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
   title: "VPP Latency: ip4-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
   filter: "'NIC_Intel-XL710' and
            '64B' and
            ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
@@ -18978,13 +20296,12 @@
     layout: "plot-latency"
 
 # Packet Latency - VPP IPv4 3n-skx-x710 base and scale
     layout: "plot-latency"
 
 # Packet Latency - VPP IPv4 3n-skx-x710 base and scale
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
   title: "VPP Latency: ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
@@ -19007,13 +20324,12 @@
     title: "ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
     layout: "plot-latency"
 
     title: "ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
   title: "VPP Latency: ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
@@ -19037,20 +20353,19 @@
     layout: "plot-latency"
 
 # Packet Latency - VPP IPv4 3n-skx-x710 features oacl
     layout: "plot-latency"
 
 # Packet Latency - VPP IPv4 3n-skx-x710 features oacl
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: ip4-3n-skx-x710-64b-2t1c-features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-ndr-lat"
   title: "VPP Latency: ip4-3n-skx-x710-64b-2t1c-features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or
             'POLICE_MARK' or
             'COPWHLIST' or
             ('NAT44' and 'BASE') or
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or
             'POLICE_MARK' or
             'COPWHLIST' or
             ('NAT44' and 'BASE') or
-            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
+            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
            'NDRPDR' and
            '2T1C' and
            'IP4FWD' and
            'NDRPDR' and
            '2T1C' and
            'IP4FWD' and
@@ -19072,20 +20387,19 @@
     title: "ip4-3n-skx-x710-64b-2t1c-features-ndr"
     layout: "plot-latency"
 
     title: "ip4-3n-skx-x710-64b-2t1c-features-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: ip4-3n-skx-x710-64b-4t2c-features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-ndr-lat"
   title: "VPP Latency: ip4-3n-skx-x710-64b-4t2c-features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or
             'POLICE_MARK' or
             'COPWHLIST' or
             ('NAT44' and 'BASE') or
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or
             'POLICE_MARK' or
             'COPWHLIST' or
             ('NAT44' and 'BASE') or
-            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
+            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
            'NDRPDR' and
            '4T2C' and
            'IP4FWD' and
            'NDRPDR' and
            '4T2C' and
            'IP4FWD' and
@@ -19108,13 +20422,12 @@
     layout: "plot-latency"
 
 # Packet Latency - VPP IPv4 3n-skx-x710 features nat44
     layout: "plot-latency"
 
 # Packet Latency - VPP IPv4 3n-skx-x710 features nat44
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: ip4-3n-skx-x710-64b-2t1c-features-nat44-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-nat44-ndr-lat"
   title: "VPP Latency: ip4-3n-skx-x710-64b-2t1c-features-nat44-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-nat44-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -19138,13 +20451,12 @@
     title: "ip4-3n-skx-x710-64b-2t1c-features-nat44-ndr"
     layout: "plot-latency"
 
     title: "ip4-3n-skx-x710-64b-2t1c-features-nat44-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: ip4-3n-skx-x710-64b-4t2c-features-nat44-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-nat44-ndr-lat"
   title: "VPP Latency: ip4-3n-skx-x710-64b-4t2c-features-nat44-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-nat44-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -19169,19 +20481,18 @@
     layout: "plot-latency"
 
 # Packet Latency - VPP IPv4 3n-skx-x710 features iacl
     layout: "plot-latency"
 
 # Packet Latency - VPP IPv4 3n-skx-x710 features iacl
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: ip4-3n-skx-x710-64b-2t1c-features-iacl-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-iacl-ndr-lat"
   title: "VPP Latency: ip4-3n-skx-x710-64b-2t1c-features-iacl-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-iacl-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
            '2T1C' and
            'IP4FWD' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
            '2T1C' and
            'IP4FWD' and
-           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
+           ('IACL' and ('ACL10' or 'ACL50') and '10K_FLOWS' or 'IP4BASE') and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -19198,20 +20509,19 @@
     title: "ip4-3n-skx-x710-64b-2t1c-features-iacl-ndr"
     layout: "plot-latency"
 
     title: "ip4-3n-skx-x710-64b-2t1c-features-iacl-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: ip4-3n-skx-x710-64b-4t2c-features-iacl-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-iacl-ndr-lat"
   title: "VPP Latency: ip4-3n-skx-x710-64b-4t2c-features-iacl-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-iacl-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
            '4T2C' and
            'IP4FWD' and
            'IACL' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
            '4T2C' and
            'IP4FWD' and
            'IACL' and
-           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
+           ('IACL' and ('ACL10' or 'ACL50') and '10K_FLOWS' or 'IP4BASE') and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -19229,16 +20539,15 @@
     layout: "plot-latency"
 
 # Packet Latency - VPP IPv4 2n-skx-x710 base and scale
     layout: "plot-latency"
 
 # Packet Latency - VPP IPv4 2n-skx-x710 base and scale
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
   title: "VPP Latency: ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
   filter: "'NIC_Intel-X710' and
            '64B' and
-           ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            '2T1C' and
            'IP4FWD' and
            'NDRPDR' and
            '2T1C' and
            'IP4FWD' and
@@ -19251,23 +20560,22 @@
   - "tags"
   sort:
   - "IP4BASE"
   - "tags"
   sort:
   - "IP4BASE"
-  - "FIB_20k"
-  - "FIB_200k"
+  - "FIB_20K"
+  - "FIB_200K"
   - "FIB_2M"
   layout:
     title: "ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
     layout: "plot-latency"
 
   - "FIB_2M"
   layout:
     title: "ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
   title: "VPP Latency: ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
   filter: "'NIC_Intel-X710' and
            '64B' and
-           ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            '4T2C' and
            'IP4FWD' and
            'NDRPDR' and
            '4T2C' and
            'IP4FWD' and
@@ -19280,24 +20588,82 @@
   - "tags"
   sort:
   - "IP4BASE"
   - "tags"
   sort:
   - "IP4BASE"
-  - "FIB_20k"
-  - "FIB_200k"
+  - "FIB_20K"
+  - "FIB_200K"
   - "FIB_2M"
   layout:
     title: "ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
     layout: "plot-latency"
 
   - "FIB_2M"
   layout:
     title: "ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
     layout: "plot-latency"
 
+# Packet Latency - VPP IPv4 2n-skx-x710 base and scale
+- type: "plot"
+  title: "VPP Latency: ip4-2n-skx-x710-64b-2t1c-features-iacl-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-2t1c-features-iacl-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           (('IACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
+           'NDRPDR' and
+           '2T1C' and
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'DOT1Q' and
+           not 'VHOST'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
+  layout:
+    title: "ip4-2n-skx-x710-64b-2t1c-features-iacl-ndr"
+    layout: "plot-latency"
+
+- type: "plot"
+  title: "VPP Latency: ip4-2n-skx-x710-64b-4t2c-features-iacl-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-4t2c-features-iacl-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           (('IACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
+           'NDRPDR' and
+           '4T2C' and
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'DOT1Q' and
+           not 'VHOST'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
+  layout:
+    title: "ip4-2n-skx-x710-64b-4t2c-features-iacl-ndr"
+    layout: "plot-latency"
+
 # Packet Latency - VPP IPv4 2n-skx-xxv710 base and scale
 # Packet Latency - VPP IPv4 2n-skx-xxv710 base and scale
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
   title: "VPP Latency: ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
   filter: "'NIC_Intel-XXV710' and
            '64B' and
-           ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            '2T1C' and
            'IP4FWD' and
            'NDRPDR' and
            '2T1C' and
            'IP4FWD' and
@@ -19310,23 +20676,22 @@
   - "tags"
   sort:
   - "IP4BASE"
   - "tags"
   sort:
   - "IP4BASE"
-  - "FIB_20k"
-  - "FIB_200k"
+  - "FIB_20K"
+  - "FIB_200K"
   - "FIB_2M"
   layout:
     title: "ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
     layout: "plot-latency"
 
   - "FIB_2M"
   layout:
     title: "ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
   title: "VPP Latency: ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
   filter: "'NIC_Intel-XXV710' and
            '64B' and
-           ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            '4T2C' and
            'IP4FWD' and
            'NDRPDR' and
            '4T2C' and
            'IP4FWD' and
@@ -19339,8 +20704,8 @@
   - "tags"
   sort:
   - "IP4BASE"
   - "tags"
   sort:
   - "IP4BASE"
-  - "FIB_20k"
-  - "FIB_200k"
+  - "FIB_20K"
+  - "FIB_200K"
   - "FIB_2M"
   layout:
     title: "ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
   - "FIB_2M"
   layout:
     title: "ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
@@ -19349,13 +20714,12 @@
 ################################################################################
 
 # Packet Latency - VPP Ipv4 tunnels 3n-hsw-x520 - features
 ################################################################################
 
 # Packet Latency - VPP Ipv4 tunnels 3n-hsw-x520 - features
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: ip4tun-3n-hsw-x520-64b-1t1c-base_and_features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-1t1c-base_and_features-ndr-lat"
   title: "VPP Latency: ip4tun-3n-hsw-x520-64b-1t1c-base_and_features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-1t1c-base_and_features-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'ENCAP' and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'ENCAP' and
@@ -19378,13 +20742,12 @@
     title: "ip4tun-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
     layout: "plot-latency"
 
     title: "ip4tun-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: ip4tun-3n-hsw-x520-64b-2t2c-base_and_features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-2t2c-base_and_features-ndr-lat"
   title: "VPP Latency: ip4tun-3n-hsw-x520-64b-2t2c-base_and_features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-2t2c-base_and_features-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'ENCAP' and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'ENCAP' and
@@ -19408,13 +20771,12 @@
     layout: "plot-latency"
 
 # Packet Latency - VPP Ipv4 tunnels 3n-hsw-x710
     layout: "plot-latency"
 
 # Packet Latency - VPP Ipv4 tunnels 3n-hsw-x710
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
   title: "VPP Latency: ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
@@ -19438,13 +20800,12 @@
     title: "ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
     layout: "plot-latency"
 
     title: "ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
   title: "VPP Latency: ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
@@ -19469,13 +20830,12 @@
     layout: "plot-latency"
 
 # Packet Latency - VPP Ipv4 tunnels 3n-hsw-x710 - features
     layout: "plot-latency"
 
 # Packet Latency - VPP Ipv4 tunnels 3n-hsw-x710 - features
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-ndr-lat"
   title: "VPP Latency: ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
@@ -19498,13 +20858,12 @@
     title: "ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
     layout: "plot-latency"
 
     title: "ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: ip4tun-3n-hsw-x710-64b-2t2c-base_and_features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-2t2c-base_and_features-ndr-lat"
   title: "VPP Latency: ip4tun-3n-hsw-x710-64b-2t2c-base_and_features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-2t2c-base_and_features-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
@@ -19528,13 +20887,12 @@
     layout: "plot-latency"
 
 # Packet Latency - VPP Ipv4 tunnels 3n-skx-x710
     layout: "plot-latency"
 
 # Packet Latency - VPP Ipv4 tunnels 3n-skx-x710
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
   title: "VPP Latency: ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
@@ -19558,13 +20916,12 @@
     title: "ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
     layout: "plot-latency"
 
     title: "ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
   title: "VPP Latency: ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
@@ -19589,13 +20946,12 @@
     layout: "plot-latency"
 
 # Packet Latency - VPP Ipv4 tunnels 3n-skx-x710 - features
     layout: "plot-latency"
 
 # Packet Latency - VPP Ipv4 tunnels 3n-skx-x710 - features
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: ip4tun-3n-skx-x710-64b-2t1c-base_and_features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-2t1c-base_and_features-ndr-lat"
   title: "VPP Latency: ip4tun-3n-skx-x710-64b-2t1c-base_and_features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-2t1c-base_and_features-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
@@ -19618,13 +20974,12 @@
     title: "ip4tun-3n-skx-x710-64b-2t1c-base_and_features-ndr"
     layout: "plot-latency"
 
     title: "ip4tun-3n-skx-x710-64b-2t1c-base_and_features-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: ip4tun-3n-skx-x710-64b-4t2c-base_and_features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-4t2c-base_and_features-ndr-lat"
   title: "VPP Latency: ip4tun-3n-skx-x710-64b-4t2c-base_and_features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-4t2c-base_and_features-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
@@ -19650,13 +21005,12 @@
 ################################################################################
 
 # Packet Latency - VPP IPv6 3n-hsw-x520
 ################################################################################
 
 # Packet Latency - VPP IPv6 3n-hsw-x520
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: ip6-3n-hsw-x520-78b-1t1c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-1t1c-base-ndr-lat"
   title: "VPP Latency: ip6-3n-hsw-x520-78b-1t1c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-1t1c-base-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
            ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
            ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
@@ -19679,13 +21033,12 @@
     title: "ip6-3n-hsw-x520-78b-1t1c-base-ndr"
     layout: "plot-latency"
 
     title: "ip6-3n-hsw-x520-78b-1t1c-base-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: ip6-3n-hsw-x520-78b-2t2c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-2t2c-base-ndr-lat"
   title: "VPP Latency: ip6-3n-hsw-x520-78b-2t2c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-2t2c-base-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
            ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
            ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
@@ -19709,13 +21062,12 @@
     layout: "plot-latency"
 
 # Packet Latency - VPP IPv6 3n-hsw-x710
     layout: "plot-latency"
 
 # Packet Latency - VPP IPv6 3n-hsw-x710
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: ip6-3n-hsw-x710-78b-1t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-1t1c-base_and_scale-ndr-lat"
   title: "VPP Latency: ip6-3n-hsw-x710-78b-1t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-1t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
@@ -19738,13 +21090,12 @@
     title: "ip6-3n-hsw-x710-78b-1t1c-base_and_scale-ndr"
     layout: "plot-latency"
 
     title: "ip6-3n-hsw-x710-78b-1t1c-base_and_scale-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: ip6-3n-hsw-x710-78b-2t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-2t2c-base_and_scale-ndr-lat"
   title: "VPP Latency: ip6-3n-hsw-x710-78b-2t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-2t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
@@ -19768,13 +21119,12 @@
     layout: "plot-latency"
 
 # Packet Latency - VPP IPv6 3n-hsw-xl710
     layout: "plot-latency"
 
 # Packet Latency - VPP IPv6 3n-hsw-xl710
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: ip6-3n-hsw-xl710-78b-1t1c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-1t1c-base-ndr-lat"
   title: "VPP Latency: ip6-3n-hsw-xl710-78b-1t1c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-1t1c-base-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '78B' and
            ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
   filter: "'NIC_Intel-XL710' and
            '78B' and
            ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
@@ -19797,13 +21147,12 @@
     title: "ip6-3n-hsw-xl710-78b-1t1c-base-ndr"
     layout: "plot-latency"
 
     title: "ip6-3n-hsw-xl710-78b-1t1c-base-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: ip6-3n-hsw-xl710-78b-2t2c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-2t2c-base-ndr-lat"
   title: "VPP Latency: ip6-3n-hsw-xl710-78b-2t2c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-2t2c-base-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '78B' and
            ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
   filter: "'NIC_Intel-XL710' and
            '78B' and
            ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
@@ -19827,13 +21176,12 @@
     layout: "plot-latency"
 
 # Packet Latency - VPP IPv6 3n-skx-x710
     layout: "plot-latency"
 
 # Packet Latency - VPP IPv6 3n-skx-x710
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: ip6-3n-skx-x710-78b-2t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-2t1c-base_and_scale-ndr-lat"
   title: "VPP Latency: ip6-3n-skx-x710-78b-2t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-2t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
@@ -19856,13 +21204,12 @@
     title: "ip6-3n-skx-x710-78b-2t1c-base_and_scale-ndr"
     layout: "plot-latency"
 
     title: "ip6-3n-skx-x710-78b-2t1c-base_and_scale-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: ip6-3n-skx-x710-78b-4t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-4t2c-base_and_scale-ndr-lat"
   title: "VPP Latency: ip6-3n-skx-x710-78b-4t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-4t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
@@ -19885,17 +21232,73 @@
     title: "ip6-3n-skx-x710-78b-4t2c-base_and_scale-ndr"
     layout: "plot-latency"
 
     title: "ip6-3n-skx-x710-78b-4t2c-base_and_scale-ndr"
     layout: "plot-latency"
 
+# Packet Latency - VPP IPv6 3n-skx-xxv710
+- type: "plot"
+  title: "VPP Latency: ip6-3n-skx-xxv710-78b-2t1c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-xxv710-78b-2t1c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-XXV710' and
+           '78B' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           'NDRPDR' and
+           '2T1C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
+  layout:
+    title: "ip6-3n-skx-xxv710-78b-2t1c-base_and_scale-ndr"
+    layout: "plot-latency"
+
+- type: "plot"
+  title: "VPP Latency: ip6-3n-skx-xxv710-78b-4t2c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-xxv710-78b-4t2c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-XXV710' and
+           '78B' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           'NDRPDR' and
+           '4T2C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
+  layout:
+    title: "ip6-3n-skx-xxv710-78b-4t2c-base_and_scale-ndr"
+    layout: "plot-latency"
+
 # Packet Latency - VPP IPv6 2n-skx-x710
 # Packet Latency - VPP IPv6 2n-skx-x710
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: ip6-2n-skx-x710-78b-2t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-2t1c-base_and_scale-ndr-lat"
   title: "VPP Latency: ip6-2n-skx-x710-78b-2t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-2t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '78B' and
   filter: "'NIC_Intel-X710' and
            '78B' and
-           ('IP6BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            '2T1C' and
            'IP6FWD' and
            'NDRPDR' and
            '2T1C' and
            'IP6FWD' and
@@ -19908,23 +21311,22 @@
   - "tags"
   sort:
   - "IP6BASE"
   - "tags"
   sort:
   - "IP6BASE"
-  - "FIB_20k"
-  - "FIB_200k"
+  - "FIB_20K"
+  - "FIB_200K"
   - "FIB_2M"
   layout:
     title: "ip6-2n-skx-x710-78b-2t1c-base_and_scale-ndr"
     layout: "plot-latency"
 
   - "FIB_2M"
   layout:
     title: "ip6-2n-skx-x710-78b-2t1c-base_and_scale-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: ip6-2n-skx-x710-78b-4t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-4t2c-base_and_scale-ndr-lat"
   title: "VPP Latency: ip6-2n-skx-x710-78b-4t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-4t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '78B' and
   filter: "'NIC_Intel-X710' and
            '78B' and
-           ('IP6BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            '4T2C' and
            'IP6FWD' and
            'NDRPDR' and
            '4T2C' and
            'IP6FWD' and
@@ -19937,24 +21339,23 @@
   - "tags"
   sort:
   - "IP6BASE"
   - "tags"
   sort:
   - "IP6BASE"
-  - "FIB_20k"
-  - "FIB_200k"
+  - "FIB_20K"
+  - "FIB_200K"
   - "FIB_2M"
   layout:
     title: "ip6-2n-skx-x710-78b-4t2c-base_and_scale-ndr"
     layout: "plot-latency"
 
 # Packet Latency - VPP IPv6 2n-skx-xxv710
   - "FIB_2M"
   layout:
     title: "ip6-2n-skx-x710-78b-4t2c-base_and_scale-ndr"
     layout: "plot-latency"
 
 # Packet Latency - VPP IPv6 2n-skx-xxv710
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr-lat"
   title: "VPP Latency: ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '78B' and
   filter: "'NIC_Intel-XXV710' and
            '78B' and
-           ('IP6BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            '2T1C' and
            'IP6FWD' and
            'NDRPDR' and
            '2T1C' and
            'IP6FWD' and
@@ -19967,20 +21368,19 @@
   - "tags"
   sort:
   - "IP6BASE"
   - "tags"
   sort:
   - "IP6BASE"
-  - "FIB_20k"
-  - "FIB_200k"
+  - "FIB_20K"
+  - "FIB_200K"
   - "FIB_2M"
   layout:
     title: "ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr"
     layout: "plot-latency"
 
   - "FIB_2M"
   layout:
     title: "ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr-lat"
   title: "VPP Latency: ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '78B' and
            ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
   filter: "'NIC_Intel-XXV710' and
            '78B' and
            ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
@@ -19996,8 +21396,8 @@
   - "tags"
   sort:
   - "IP6BASE"
   - "tags"
   sort:
   - "IP6BASE"
-  - "FIB_20k"
-  - "FIB_200k"
+  - "FIB_20K"
+  - "FIB_200K"
   - "FIB_2M"
   layout:
     title: "ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr"
   - "FIB_2M"
   layout:
     title: "ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr"
@@ -20006,13 +21406,12 @@
 ################################################################################
 
 # Packet Latency - VPP IPv6 tunnels 3n-hsw-x520
 ################################################################################
 
 # Packet Latency - VPP IPv6 tunnels 3n-hsw-x520
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: ip6tun-3n-hsw-x520-78b-1t1c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-1t1c-base-ndr-lat"
   title: "VPP Latency: ip6tun-3n-hsw-x520-78b-1t1c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-1t1c-base-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
            'ENCAP' and
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
            'ENCAP' and
@@ -20031,13 +21430,12 @@
     title: "ip6tun-3n-hsw-x520-78b-1t1c-base-ndr"
     layout: "plot-latency"
 
     title: "ip6tun-3n-hsw-x520-78b-1t1c-base-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: ip6tun-3n-hsw-x520-78b-2t2c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-2t2c-base-ndr-lat"
   title: "VPP Latency: ip6tun-3n-hsw-x520-78b-2t2c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-2t2c-base-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
            'ENCAP' and
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
            'ENCAP' and
@@ -20059,13 +21457,12 @@
 ################################################################################
 
 # Packet Latency - VPP IPSec 3n-hsw-xl710 base
 ################################################################################
 
 # Packet Latency - VPP IPSec 3n-hsw-xl710 base
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: ipsec-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
   title: "VPP Latency: ipsec-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'IP4FWD' and
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'IP4FWD' and
@@ -20083,13 +21480,12 @@
     title: "ipsec-3n-hsw-xl710-64b-1t1c-base-ndr"
     layout: "plot-latency"
 
     title: "ipsec-3n-hsw-xl710-64b-1t1c-base-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: ipsec-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
   title: "VPP Latency: ipsec-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'IP4FWD' and
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'IP4FWD' and
@@ -20108,13 +21504,12 @@
     layout: "plot-latency"
 
 # Packet Latency - VPP IPSec 3n-hsw-xl710 scale
     layout: "plot-latency"
 
 # Packet Latency - VPP IPSec 3n-hsw-xl710 scale
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: ipsec-3n-hsw-xl710-64b-1t1c-scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-scale-ndr-lat"
   title: "VPP Latency: ipsec-3n-hsw-xl710-64b-1t1c-scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'IP4FWD' and
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'IP4FWD' and
@@ -20132,13 +21527,12 @@
     title: "ipsec-3n-hsw-xl710-64b-1t1c-scale-ndr"
     layout: "plot-latency"
 
     title: "ipsec-3n-hsw-xl710-64b-1t1c-scale-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: ipsec-3n-hsw-xl710-64b-2t2c-scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-scale-ndr-lat"
   title: "VPP Latency: ipsec-3n-hsw-xl710-64b-2t2c-scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'IP4FWD' and
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'IP4FWD' and
@@ -20157,13 +21551,12 @@
     layout: "plot-latency"
 
 # Packet Latency - VPP IPSec 3n-hsw-xl710 sw
     layout: "plot-latency"
 
 # Packet Latency - VPP IPSec 3n-hsw-xl710 sw
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: ipsec-3n-hsw-xl710-64b-1t1c-sw-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-sw-ndr-lat"
   title: "VPP Latency: ipsec-3n-hsw-xl710-64b-1t1c-sw-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-sw-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'IP4FWD' and
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'IP4FWD' and
@@ -20180,13 +21573,12 @@
     title: "ipsec-3n-hsw-xl710-64b-1t1c-sw-ndr"
     layout: "plot-latency"
 
     title: "ipsec-3n-hsw-xl710-64b-1t1c-sw-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: ipsec-3n-hsw-xl710-64b-2t2c-sw-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-sw-ndr-lat"
   title: "VPP Latency: ipsec-3n-hsw-xl710-64b-2t2c-sw-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-sw-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'IP4FWD' and
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'IP4FWD' and
@@ -20206,13 +21598,12 @@
 ################################################################################
 
 # Packet Latency - VPP SRv6 3n-hsw-x520
 ################################################################################
 
 # Packet Latency - VPP SRv6 3n-hsw-x520
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: srv6-3n-hsw-x520-78b-1t1c-features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-1t1c-features-ndr-lat"
   title: "VPP Latency: srv6-3n-hsw-x520-78b-1t1c-features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-1t1c-features-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
            'FEATURE' and
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
            'FEATURE' and
@@ -20228,13 +21619,12 @@
     title: "srv6-3n-hsw-x520-78b-1t1c-features-ndr"
     layout: "plot-latency"
 
     title: "srv6-3n-hsw-x520-78b-1t1c-features-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: srv6-3n-hsw-x520-78b-2t2c-features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-2t2c-features-ndr-lat"
   title: "VPP Latency: srv6-3n-hsw-x520-78b-2t2c-features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-2t2c-features-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
            'FEATURE' and
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
            'FEATURE' and
@@ -20253,13 +21643,12 @@
 ################################################################################
 
 # Packet Latency - VPP vhost ip4 3n-hsw-x520
 ################################################################################
 
 # Packet Latency - VPP vhost ip4 3n-hsw-x520
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
   title: "VPP Latency: vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
@@ -20281,13 +21670,12 @@
     title: "vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
     layout: "plot-latency"
 
     title: "vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
   title: "VPP Latency: vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
@@ -20310,13 +21698,12 @@
     layout: "plot-latency"
 
 # Packet Latency - VPP vhost l2sw 3n-hsw-x520 - base
     layout: "plot-latency"
 
 # Packet Latency - VPP vhost l2sw 3n-hsw-x520 - base
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_features-ndr-lat"
   title: "VPP Latency: vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_features-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
@@ -20343,13 +21730,12 @@
     title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
     layout: "plot-latency"
 
     title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_features-ndr-lat"
   title: "VPP Latency: vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_features-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
@@ -20377,13 +21763,12 @@
     layout: "plot-latency"
 
 # Packet Latency - VPP vhost l2sw 3n-hsw-x520 - base vm
     layout: "plot-latency"
 
 # Packet Latency - VPP vhost l2sw 3n-hsw-x520 - base vm
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-ndr-lat"
   title: "VPP Latency: vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
@@ -20409,13 +21794,12 @@
     title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-ndr"
     layout: "plot-latency"
 
     title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-ndr-lat"
   title: "VPP Latency: vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
@@ -20442,13 +21826,12 @@
     layout: "plot-latency"
 
 # Packet Latency - VPP vhost ip4 3n-hsw-x710
     layout: "plot-latency"
 
 # Packet Latency - VPP vhost ip4 3n-hsw-x710
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
   title: "VPP Latency: vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -20470,13 +21853,12 @@
     title: "vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
     layout: "plot-latency"
 
     title: "vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
   title: "VPP Latency: vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -20499,13 +21881,12 @@
     layout: "plot-latency"
 
 # Packet Latency - VPP vhost l2sw 3n-hsw-x710 - base
     layout: "plot-latency"
 
 # Packet Latency - VPP vhost l2sw 3n-hsw-x710 - base
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-ndr-lat"
   title: "VPP Latency: vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -20532,13 +21913,12 @@
     title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
     layout: "plot-latency"
 
     title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-ndr-lat"
   title: "VPP Latency: vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -20566,13 +21946,12 @@
     layout: "plot-latency"
 
 # Packet Latency - VPP vhost l2sw 3n-hsw-x710 - base vm
     layout: "plot-latency"
 
 # Packet Latency - VPP vhost l2sw 3n-hsw-x710 - base vm
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-vm-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-vm-ndr-lat"
   title: "VPP Latency: vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-vm-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-vm-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -20599,13 +21978,12 @@
     title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-vm-ndr"
     layout: "plot-latency"
 
     title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-vm-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-vm-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-vm-ndr-lat"
   title: "VPP Latency: vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-vm-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-vm-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -20633,13 +22011,12 @@
     layout: "plot-latency"
 
 # Packet Latency - VPP vhost ip4 3n-skx-x710
     layout: "plot-latency"
 
 # Packet Latency - VPP vhost ip4 3n-skx-x710
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
   title: "VPP Latency: vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -20660,13 +22037,12 @@
     title: "vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
     layout: "plot-latency"
 
     title: "vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
   title: "VPP Latency: vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -20688,13 +22064,12 @@
     layout: "plot-latency"
 
 # Packet Latency - VPP vhost l2sw 3n-skx-x710 - base
     layout: "plot-latency"
 
 # Packet Latency - VPP vhost l2sw 3n-skx-x710 - base
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-ndr-lat"
   title: "VPP Latency: vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -20721,13 +22096,12 @@
     title: "vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-ndr"
     layout: "plot-latency"
 
     title: "vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-ndr-lat"
   title: "VPP Latency: vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -20755,13 +22129,12 @@
     layout: "plot-latency"
 
 # Packet Latency - VPP vhost l2sw 3n-skx-x710 - base vm
     layout: "plot-latency"
 
 # Packet Latency - VPP vhost l2sw 3n-skx-x710 - base vm
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-vm-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-vm-ndr-lat"
   title: "VPP Latency: vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-vm-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-vm-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -20788,13 +22161,12 @@
     title: "vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-vm-ndr"
     layout: "plot-latency"
 
     title: "vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-vm-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-vm-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-vm-ndr-lat"
   title: "VPP Latency: vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-vm-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-vm-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -20822,13 +22194,12 @@
     layout: "plot-latency"
 
 # Packet Latency - VPP vhost ip4 2n-skx-x710
     layout: "plot-latency"
 
 # Packet Latency - VPP vhost ip4 2n-skx-x710
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: vhost-ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
   title: "VPP Latency: vhost-ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -20851,13 +22222,12 @@
     title: "vhost-ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
     layout: "plot-latency"
 
     title: "vhost-ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: vhost-ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
   title: "VPP Latency: vhost-ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -20881,13 +22251,12 @@
     layout: "plot-latency"
 
 # Packet Latency - VPP vhost l2sw 2n-skx-x710 - base
     layout: "plot-latency"
 
 # Packet Latency - VPP vhost l2sw 2n-skx-x710 - base
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_features-ndr-lat"
   title: "VPP Latency: vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_features-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -20913,13 +22282,12 @@
     title: "vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_features-ndr"
     layout: "plot-latency"
 
     title: "vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_features-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_features-ndr-lat"
   title: "VPP Latency: vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_features-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_features-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -20946,13 +22314,12 @@
     layout: "plot-latency"
 
 # Packet Latency - VPP vhost l2sw 2n-skx-x710 - base vm
     layout: "plot-latency"
 
 # Packet Latency - VPP vhost l2sw 2n-skx-x710 - base vm
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: vhost-l2sw-2n-skx-x710-64b-2t1c-base-vm-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-2t1c-base-vm-ndr-lat"
   title: "VPP Latency: vhost-l2sw-2n-skx-x710-64b-2t1c-base-vm-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-2t1c-base-vm-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -20978,13 +22345,12 @@
     title: "vhost-l2sw-2n-skx-x710-64b-2t1c-base-vm-ndr"
     layout: "plot-latency"
 
     title: "vhost-l2sw-2n-skx-x710-64b-2t1c-base-vm-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: vhost-l2sw-2n-skx-x710-64b-4t2c-base-vm-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-4t2c-base-vm-ndr-lat"
   title: "VPP Latency: vhost-l2sw-2n-skx-x710-64b-4t2c-base-vm-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-4t2c-base-vm-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -21011,13 +22377,12 @@
     layout: "plot-latency"
 
 # Packet Latency - VPP vhost ip4 2n-skx-xxv710
     layout: "plot-latency"
 
 # Packet Latency - VPP vhost ip4 2n-skx-xxv710
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: vhost-ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
   title: "VPP Latency: vhost-ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'NDRPDR' and
@@ -21040,13 +22405,12 @@
     title: "vhost-ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
     layout: "plot-latency"
 
     title: "vhost-ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: vhost-ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
   title: "VPP Latency: vhost-ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'NDRPDR' and
@@ -21069,142 +22433,137 @@
     title: "vhost-ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
     layout: "plot-latency"
 
     title: "vhost-ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
     layout: "plot-latency"
 
-# Packet Latency - VPP vhost l2sw 2n-skx-xxv710 - base
--
-  type: "plot"
-  title: "VPP Latency: vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_features-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_features-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           'BASE' and
-           '2T1C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
-  layout:
-    title: "vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_features-ndr"
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_features-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_features-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           'BASE' and
-           '4T2C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
-  layout:
-    title: "vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_features-ndr"
-    layout: "plot-latency"
-
-# Packet Latency - VPP vhost l2sw 2n-skx-xxv710 - base vm
--
-  type: "plot"
-  title: "VPP Latency: vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-vm-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-vm-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '2T1C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'CFS_OPT' and
-           not 'VXLAN' and
-           not 'DOT1Q' and
-           not 'IP4FWD'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
-  layout:
-    title: "vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-vm-ndr"
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '4T2C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'CFS_OPT' and
-           not 'VXLAN' and
-           not 'DOT1Q' and
-           not 'IP4FWD'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
-  layout:
-    title: "vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-ndr"
-    layout: "plot-latency"
-
+## Packet Latency - VPP vhost l2sw 2n-skx-xxv710 - base
+#- type: "plot"
+#  title: "VPP Latency: vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_features-ndr-lat"
+#  algorithm: "plot_latency_error_bars"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_features-ndr-lat"
+#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+#  filter: "'NIC_Intel-XXV710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           'BASE' and
+#           '2T1C' and
+#           ('L2BDMACLRN' or 'L2XCFWD') and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "latency"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "not CFS_OPT"
+##  - "L2XCFWD"
+##  - "not CFS_OPT"
+##  - "CFS_OPT"
+#  layout:
+#    title: "vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_features-ndr"
+#    layout: "plot-latency"
+#
+#- type: "plot"
+#  title: "VPP Latency: vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_features-ndr-lat"
+#  algorithm: "plot_latency_error_bars"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_features-ndr-lat"
+#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+#  filter: "'NIC_Intel-XXV710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           'BASE' and
+#           '4T2C' and
+#           ('L2BDMACLRN' or 'L2XCFWD') and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "latency"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "not CFS_OPT"
+##  - "L2XCFWD"
+##  - "not CFS_OPT"
+##  - "CFS_OPT"
+#  layout:
+#    title: "vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_features-ndr"
+#    layout: "plot-latency"
+#
+## Packet Latency - VPP vhost l2sw 2n-skx-xxv710 - base vm
+#- type: "plot"
+#  title: "VPP Latency: vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-vm-ndr-lat"
+#  algorithm: "plot_latency_error_bars"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-vm-ndr-lat"
+#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+#  filter: "'NIC_Intel-XXV710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           '2T1C' and
+#           ('L2BDMACLRN' or 'L2XCFWD') and
+#           'VHOST_1024' and
+#           not 'CFS_OPT' and
+#           not 'VXLAN' and
+#           not 'DOT1Q' and
+#           not 'IP4FWD'"
+#  parameters:
+#  - "latency"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "1VM"
+##  - "L2XCFWD"
+##  - "1VM"
+##  - "L2BDMACLRN"
+#  layout:
+#    title: "vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-vm-ndr"
+#    layout: "plot-latency"
+#
+#- type: "plot"
+#  title: "VPP Latency: vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-ndr-lat"
+#  algorithm: "plot_latency_error_bars"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-ndr-lat"
+#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+#  filter: "'NIC_Intel-XXV710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           '4T2C' and
+#           ('L2BDMACLRN' or 'L2XCFWD') and
+#           'VHOST_1024' and
+#           not 'CFS_OPT' and
+#           not 'VXLAN' and
+#           not 'DOT1Q' and
+#           not 'IP4FWD'"
+#  parameters:
+#  - "latency"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "1VM"
+##  - "L2XCFWD"
+##  - "1VM"
+##  - "L2BDMACLRN"
+#  layout:
+#    title: "vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-ndr"
+#    layout: "plot-latency"
+
 ################################################################################
 
 # Packet Latency - VPP VTS 3n-hsw-x520
 ################################################################################
 
 # Packet Latency - VPP VTS 3n-hsw-x520
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: vts-3n-hsw-x520-114b-1t1c-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-114b-1t1c-ndr-lat"
   title: "VPP Latency: vts-3n-hsw-x520-114b-1t1c-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-114b-1t1c-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '114B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X520-DA2' and
            '114B' and
            'NDRPDR' and
@@ -21218,13 +22577,12 @@
     title: "vts-3n-hsw-x520-114b-1t1c-ndr"
     layout: "plot-latency"
 
     title: "vts-3n-hsw-x520-114b-1t1c-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Latency: vts-3n-hsw-x520-114b-2t2c-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-114b-2t2c-ndr-lat"
   title: "VPP Latency: vts-3n-hsw-x520-114b-2t2c-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-114b-2t2c-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '114B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X520-DA2' and
            '114B' and
            'NDRPDR' and
@@ -21241,8 +22599,7 @@
 ################################################################################
 
 # Packet Latency - DPDK l3fwd 3n-hsw-x520
 ################################################################################
 
 # Packet Latency - DPDK l3fwd 3n-hsw-x520
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Latency: l3fwd-3n-hsw-x520-64b-1t1c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   title: "DPDK Latency: l3fwd-3n-hsw-x520-64b-1t1c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
@@ -21262,8 +22619,7 @@
     title: "l3fwd-3n-hsw-x520-64b-1t1c-base-ndr"
     layout: "plot-latency"
 
     title: "l3fwd-3n-hsw-x520-64b-1t1c-base-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Latency: l3fwd-3n-hsw-x520-64b-2t2c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   title: "DPDK Latency: l3fwd-3n-hsw-x520-64b-2t2c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
@@ -21284,8 +22640,7 @@
     layout: "plot-latency"
 
 # Packet Latency - DPDK l3fwd 3n-hsw-x710
     layout: "plot-latency"
 
 # Packet Latency - DPDK l3fwd 3n-hsw-x710
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Latency: l3fwd-3n-hsw-x710-64b-1t1c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   title: "DPDK Latency: l3fwd-3n-hsw-x710-64b-1t1c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
@@ -21305,8 +22660,7 @@
     title: "l3fwd-3n-hsw-x710-64b-1t1c-base-ndr"
     layout: "plot-latency"
 
     title: "l3fwd-3n-hsw-x710-64b-1t1c-base-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Latency: l3fwd-3n-hsw-x710-64b-2t2c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   title: "DPDK Latency: l3fwd-3n-hsw-x710-64b-2t2c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
@@ -21327,8 +22681,7 @@
     layout: "plot-latency"
 
 # Packet Latency - DPDK l3fwd 3n-hsw-xl710
     layout: "plot-latency"
 
 # Packet Latency - DPDK l3fwd 3n-hsw-xl710
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Latency: l3fwd-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   title: "DPDK Latency: l3fwd-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
@@ -21348,8 +22701,7 @@
     title: "l3fwd-3n-hsw-xl710-64b-1t1c-base-ndr"
     layout: "plot-latency"
 
     title: "l3fwd-3n-hsw-xl710-64b-1t1c-base-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Latency: l3fwd-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   title: "DPDK Latency: l3fwd-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
@@ -21370,8 +22722,7 @@
     layout: "plot-latency"
 
 # Packet Latency - DPDK l3fwd 3n-skx-x710
     layout: "plot-latency"
 
 # Packet Latency - DPDK l3fwd 3n-skx-x710
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Latency: l3fwd-3n-skx-x710-64b-2t1c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   title: "DPDK Latency: l3fwd-3n-skx-x710-64b-2t1c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
@@ -21391,8 +22742,7 @@
     title: "l3fwd-3n-skx-x710-64b-2t1c-base-ndr"
     layout: "plot-latency"
 
     title: "l3fwd-3n-skx-x710-64b-2t1c-base-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Latency: l3fwd-3n-skx-x710-64b-4t2c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   title: "DPDK Latency: l3fwd-3n-skx-x710-64b-4t2c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
@@ -21413,8 +22763,7 @@
     layout: "plot-latency"
 
 # Packet Latency - DPDK l3fwd 3n-skx-xxv710
     layout: "plot-latency"
 
 # Packet Latency - DPDK l3fwd 3n-skx-xxv710
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Latency: l3fwd-3n-skx-xxv710-64b-2t1c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   title: "DPDK Latency: l3fwd-3n-skx-xxv710-64b-2t1c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
@@ -21434,8 +22783,7 @@
     title: "l3fwd-3n-skx-xxv710-64b-2t1c-base-ndr"
     layout: "plot-latency"
 
     title: "l3fwd-3n-skx-xxv710-64b-2t1c-base-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Latency: l3fwd-3n-skx-xxv710-64b-4t2c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   title: "DPDK Latency: l3fwd-3n-skx-xxv710-64b-4t2c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
@@ -21456,8 +22804,7 @@
     layout: "plot-latency"
 
 # Packet Latency - DPDK l3fwd 2n-skx-x710
     layout: "plot-latency"
 
 # Packet Latency - DPDK l3fwd 2n-skx-x710
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Latency: l3fwd-2n-skx-x710-64b-2t1c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   title: "DPDK Latency: l3fwd-2n-skx-x710-64b-2t1c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
@@ -21477,8 +22824,7 @@
     title: "l3fwd-2n-skx-x710-64b-2t1c-base-ndr"
     layout: "plot-latency"
 
     title: "l3fwd-2n-skx-x710-64b-2t1c-base-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Latency: l3fwd-2n-skx-x710-64b-4t2c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   title: "DPDK Latency: l3fwd-2n-skx-x710-64b-4t2c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
@@ -21499,8 +22845,7 @@
     layout: "plot-latency"
 
 # Packet Latency - DPDK l3fwd 2n-skx-xxv710
     layout: "plot-latency"
 
 # Packet Latency - DPDK l3fwd 2n-skx-xxv710
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Latency: l3fwd-2n-skx-xxv710-64b-2t1c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   title: "DPDK Latency: l3fwd-2n-skx-xxv710-64b-2t1c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
@@ -21520,8 +22865,7 @@
     title: "l3fwd-2n-skx-xxv710-64b-2t1c-base-ndr"
     layout: "plot-latency"
 
     title: "l3fwd-2n-skx-xxv710-64b-2t1c-base-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Latency: l3fwd-2n-skx-xxv710-64b-4t2c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   title: "DPDK Latency: l3fwd-2n-skx-xxv710-64b-4t2c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
@@ -21544,8 +22888,7 @@
 ################################################################################
 
 # Packet Latency - DPDK testpmd 3n-hsw-x520
 ################################################################################
 
 # Packet Latency - DPDK testpmd 3n-hsw-x520
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Latency: testpmd-3n-hsw-x520-64b-1t1c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   title: "DPDK Latency: testpmd-3n-hsw-x520-64b-1t1c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
@@ -21565,8 +22908,7 @@
     title: "testpmd-3n-hsw-x520-64b-1t1c-base-ndr"
     layout: "plot-latency"
 
     title: "testpmd-3n-hsw-x520-64b-1t1c-base-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Latency: testpmd-3n-hsw-x520-64b-2t2c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   title: "DPDK Latency: testpmd-3n-hsw-x520-64b-2t2c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
@@ -21587,8 +22929,7 @@
     layout: "plot-latency"
 
 # Packet Latency - DPDK testpmd 3n-hsw-x710
     layout: "plot-latency"
 
 # Packet Latency - DPDK testpmd 3n-hsw-x710
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Latency: testpmd-3n-hsw-x710-64b-1t1c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   title: "DPDK Latency: testpmd-3n-hsw-x710-64b-1t1c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
@@ -21608,8 +22949,7 @@
     title: "testpmd-3n-hsw-x710-64b-1t1c-base-ndr"
     layout: "plot-latency"
 
     title: "testpmd-3n-hsw-x710-64b-1t1c-base-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Latency: testpmd-3n-hsw-x710-64b-2t2c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   title: "DPDK Latency: testpmd-3n-hsw-x710-64b-2t2c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
@@ -21630,8 +22970,7 @@
     layout: "plot-latency"
 
 # Packet Latency - DPDK testpmd 3n-hsw-xl710
     layout: "plot-latency"
 
 # Packet Latency - DPDK testpmd 3n-hsw-xl710
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Latency: testpmd-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   title: "DPDK Latency: testpmd-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
@@ -21651,8 +22990,7 @@
     title: "testpmd-3n-hsw-xl710-64b-1t1c-base-ndr"
     layout: "plot-latency"
 
     title: "testpmd-3n-hsw-xl710-64b-1t1c-base-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Latency: testpmd-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   title: "DPDK Latency: testpmd-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
@@ -21673,8 +23011,7 @@
     layout: "plot-latency"
 
 # Packet Latency - DPDK testpmd 3n-skx-x710
     layout: "plot-latency"
 
 # Packet Latency - DPDK testpmd 3n-skx-x710
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Latency: testpmd-3n-skx-x710-64b-2t1c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   title: "DPDK Latency: testpmd-3n-skx-x710-64b-2t1c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
@@ -21694,8 +23031,7 @@
     title: "testpmd-3n-skx-x710-64b-2t1c-base-ndr"
     layout: "plot-latency"
 
     title: "testpmd-3n-skx-x710-64b-2t1c-base-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Latency: testpmd-3n-skx-x710-64b-4t2c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   title: "DPDK Latency: testpmd-3n-skx-x710-64b-4t2c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
@@ -21716,8 +23052,7 @@
     layout: "plot-latency"
 
 # Packet Latency - DPDK testpmd 3n-skx-xxv710
     layout: "plot-latency"
 
 # Packet Latency - DPDK testpmd 3n-skx-xxv710
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Latency: testpmd-3n-skx-xxv710-64b-2t1c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   title: "DPDK Latency: testpmd-3n-skx-xxv710-64b-2t1c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
@@ -21737,8 +23072,7 @@
     title: "testpmd-3n-skx-xxv710-64b-2t1c-base-ndr"
     layout: "plot-latency"
 
     title: "testpmd-3n-skx-xxv710-64b-2t1c-base-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Latency: testpmd-3n-skx-xxv710-64b-4t2c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   title: "DPDK Latency: testpmd-3n-skx-xxv710-64b-4t2c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
@@ -21759,8 +23093,7 @@
     layout: "plot-latency"
 
 # Packet Latency - DPDK testpmd 2n-skx-x710
     layout: "plot-latency"
 
 # Packet Latency - DPDK testpmd 2n-skx-x710
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Latency: testpmd-2n-skx-x710-64b-2t1c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   title: "DPDK Latency: testpmd-2n-skx-x710-64b-2t1c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
@@ -21780,8 +23113,7 @@
     title: "testpmd-2n-skx-x710-64b-2t1c-base-ndr"
     layout: "plot-latency"
 
     title: "testpmd-2n-skx-x710-64b-2t1c-base-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Latency: testpmd-2n-skx-x710-64b-4t2c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   title: "DPDK Latency: testpmd-2n-skx-x710-64b-4t2c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
@@ -21802,8 +23134,7 @@
     layout: "plot-latency"
 
 # Packet Latency - DPDK testpmd 2n-skx-xxv710
     layout: "plot-latency"
 
 # Packet Latency - DPDK testpmd 2n-skx-xxv710
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Latency: testpmd-2n-skx-xxv710-64b-2t1c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   title: "DPDK Latency: testpmd-2n-skx-xxv710-64b-2t1c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
@@ -21823,8 +23154,7 @@
     title: "testpmd-2n-skx-xxv710-64b-2t1c-base-ndr"
     layout: "plot-latency"
 
     title: "testpmd-2n-skx-xxv710-64b-2t1c-base-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- type: "plot"
   title: "DPDK Latency: testpmd-2n-skx-xxv710-64b-4t2c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   title: "DPDK Latency: testpmd-2n-skx-xxv710-64b-4t2c-base-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
@@ -21847,13 +23177,12 @@
 ################################################################################
 
 # Speedup - VPP Container Memif 3n-hsw-x520
 ################################################################################
 
 # Speedup - VPP Container Memif 3n-hsw-x520
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: memif-3n-hsw-x520-64b-base_and_features-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-base_and_features-ndr-tsa"
   title: "Speedup: memif-3n-hsw-x520-64b-base_and_features-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-base_and_features-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -21877,13 +23206,12 @@
     title: "memif-3n-hsw-x520-64b-base_and_features-ndr"
     layout: "plot-throughput-speedup-analysis"
 
     title: "memif-3n-hsw-x520-64b-base_and_features-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: memif-3n-hsw-x520-64b-base_and_features-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-base_and_features-pdr-tsa"
   title: "Speedup: memif-3n-hsw-x520-64b-base_and_features-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-base_and_features-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -21908,13 +23236,12 @@
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP Container Memif 3n-hsw-x710
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP Container Memif 3n-hsw-x710
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: memif-3n-hsw-x710-64b-base_and_features-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-base_and_features-ndr-tsa"
   title: "Speedup: memif-3n-hsw-x710-64b-base_and_features-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-base_and_features-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -21938,13 +23265,12 @@
     title: "memif-3n-hsw-x710-64b-base_and_features-ndr"
     layout: "plot-throughput-speedup-analysis"
 
     title: "memif-3n-hsw-x710-64b-base_and_features-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: memif-3n-hsw-x710-64b-base_and_features-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-base_and_features-pdr-tsa"
   title: "Speedup: memif-3n-hsw-x710-64b-base_and_features-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-base_and_features-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -21969,13 +23295,12 @@
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP Container Memif 3n-hsw-xl710
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP Container Memif 3n-hsw-xl710
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: memif-3n-hsw-xl710-64b-base_and_features-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-base_and_features-ndr-tsa"
   title: "Speedup: memif-3n-hsw-xl710-64b-base_and_features-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-base_and_features-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            ('BASE' or 'SCALE') and
   filter: "'NIC_Intel-XL710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -21999,13 +23324,12 @@
     title: "memif-3n-hsw-xl710-64b-base_and_features-ndr"
     layout: "plot-throughput-speedup-analysis"
 
     title: "memif-3n-hsw-xl710-64b-base_and_features-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: memif-3n-hsw-xl710-64b-base_and_features-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-base_and_features-pdr-tsa"
   title: "Speedup: memif-3n-hsw-xl710-64b-base_and_features-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-base_and_features-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            ('BASE' or 'SCALE') and
   filter: "'NIC_Intel-XL710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -22030,13 +23354,12 @@
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP Container Memif 3n-skx-x710
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP Container Memif 3n-skx-x710
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: memif-3n-skx-x710-64b-base_and_features-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-base_and_features-ndr-tsa"
   title: "Speedup: memif-3n-skx-x710-64b-base_and_features-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-base_and_features-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -22060,13 +23383,12 @@
     title: "memif-3n-skx-x710-64b-base_and_features-ndr"
     layout: "plot-throughput-speedup-analysis"
 
     title: "memif-3n-skx-x710-64b-base_and_features-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: memif-3n-skx-x710-64b-base_and_features-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-base_and_features-pdr-tsa"
   title: "Speedup: memif-3n-skx-x710-64b-base_and_features-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-base_and_features-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -22091,13 +23413,12 @@
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP Container Memif 2n-skx-x710
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP Container Memif 2n-skx-x710
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: memif-2n-skx-x710-64b-base_and_features-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-base_and_features-ndr-tsa"
   title: "Speedup: memif-2n-skx-x710-64b-base_and_features-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-base_and_features-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -22122,13 +23443,12 @@
     title: "memif-2n-skx-x710-64b-base_and_features-ndr"
     layout: "plot-throughput-speedup-analysis"
 
     title: "memif-2n-skx-x710-64b-base_and_features-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: memif-2n-skx-x710-64b-base_and_features-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-base_and_features-pdr-tsa"
   title: "Speedup: memif-2n-skx-x710-64b-base_and_features-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-base_and_features-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -22153,318 +23473,307 @@
     title: "memif-2n-skx-x710-64b-base_and_features-pdr"
     layout: "plot-throughput-speedup-analysis"
 
     title: "memif-2n-skx-x710-64b-base_and_features-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP Container Memif 2n-skx-xxv710
--
-  type: "plot"
-  title: "Speedup: memif-2n-skx-xxv710-64b-base_and_features-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-xxv710-64b-base_and_features-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
-  layout:
-    title: "memif-2n-skx-xxv710-64b-base_and_features-ndr"
-    layout: "plot-throughput-speedup-analysis"
-
--
-  type: "plot"
-  title: "Speedup: memif-2n-skx-xxv710-64b-base_and_features-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-xxv710-64b-base_and_features-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
-  layout:
-    title: "memif-2n-skx-xxv710-64b-base_and_features-pdr"
-    layout: "plot-throughput-speedup-analysis"
+## Speedup - VPP Container Memif 2n-skx-xxv710
+#- type: "plot"
+#  title: "Speedup: memif-2n-skx-xxv710-64b-base_and_features-ndr-tsa"
+#  algorithm: "plot_throughput_speedup_analysis"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-xxv710-64b-base_and_features-ndr-tsa"
+#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+#  filter: "'NIC_Intel-XXV710' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
+#           'NDRPDR' and
+#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
+#           not 'VHOST' and
+#           'MEMIF'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "L2XCFWD"
+#  - "L2XCFWD"
+#  - "L2XCFWD"
+#  - "L2BDMACLRN"
+#  - "L2BDMACLRN"
+#  - "L2BDMACLRN"
+#  - "IP4FWD"
+#  layout:
+#    title: "memif-2n-skx-xxv710-64b-base_and_features-ndr"
+#    layout: "plot-throughput-speedup-analysis"
+#
+#- type: "plot"
+#  title: "Speedup: memif-2n-skx-xxv710-64b-base_and_features-pdr-tsa"
+#  algorithm: "plot_throughput_speedup_analysis"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-xxv710-64b-base_and_features-pdr-tsa"
+#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+#  filter: "'NIC_Intel-XXV710' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
+#           'NDRPDR' and
+#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
+#           not 'VHOST' and
+#           'MEMIF'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "L2XCFWD"
+#  - "L2XCFWD"
+#  - "L2XCFWD"
+#  - "L2BDMACLRN"
+#  - "L2BDMACLRN"
+#  - "L2BDMACLRN"
+#  - "IP4FWD"
+#  layout:
+#    title: "memif-2n-skx-xxv710-64b-base_and_features-pdr"
+#    layout: "plot-throughput-speedup-analysis"
 
 ################################################################################
 
 
 ################################################################################
 
-# Speedup - VPP Container k8s memif 3n-hsw-x520 - l2xc
--
-  type: "plot"
-  title: "Speedup: k8s-memif-3n-hsw-x520-64b-base_and_scale-l2xc-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-base_and_scale-l2xc-ndr-tsa"
-  data: "plot-ligato-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'L2XCFWD' and
-           not 'VHOST' and
-           not 'NF_DENSITY' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
-  layout:
-    title: "k8s-memif-3n-hsw-x520-64b-base_and_scale-ndr-l2xc"
-    layout: "plot-throughput-speedup-analysis"
-
--
-  type: "plot"
-  title: "Speedup: k8s-memif-3n-hsw-x520-64b-base_and_scale-l2xc-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-base_and_scale-l2xc-pdr-tsa"
-  data: "plot-ligato-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'L2XCFWD' and
-           not 'VHOST' and
-           not 'NF_DENSITY' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
-  layout:
-    title: "k8s-memif-3n-hsw-x520-64b-base_and_scale-l2xc-pdr"
-    layout: "plot-throughput-speedup-analysis"
-
-# Speedup - VPP Container k8s memif 3n-hsw-x520 - l2bd
--
-  type: "plot"
-  title: "Speedup: k8s-memif-3n-hsw-x520-64b-base_and_scale-l2bd-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-base_and_scale-l2bd-ndr-tsa"
-  data: "plot-ligato-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN') and
-           not 'VHOST' and
-           not 'NF_DENSITY' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
-  layout:
-    title: "k8s-memif-3n-hsw-x520-64b-base_and_scale-ndr-l2bd"
-    layout: "plot-throughput-speedup-analysis"
-
--
-  type: "plot"
-  title: "Speedup: k8s-memif-3n-hsw-x520-64b-base_and_scale-l2bd-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-base_and_scale-l2bd-pdr-tsa"
-  data: "plot-ligato-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN') and
-           not 'VHOST' and
-           not 'NF_DENSITY' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
-  layout:
-    title: "k8s-memif-3n-hsw-x520-64b-base_and_scale-l2bd-pdr"
-    layout: "plot-throughput-speedup-analysis"
-
-# Speedup - VPP Container Memif 3n-hsw-x710 - l2xc
--
-  type: "plot"
-  title: "Speedup: k8s-memif-3n-hsw-x710-64b-base_and_scale-l2xc-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-base_and_scale-l2xc-ndr-tsa"
-  data: "plot-ligato-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'L2XCFWD' and
-           not 'VHOST' and
-           not 'NF_DENSITY' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
-  layout:
-    title: "k8s-memif-3n-hsw-x710-64b-base_and_scale-l2xc-ndr"
-    layout: "plot-throughput-speedup-analysis"
-
--
-  type: "plot"
-  title: "Speedup: k8s-memif-3n-hsw-x710-64b-base_and_scale-l2xc-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-base_and_scale-l2xc-pdr-tsa"
-  data: "plot-ligato-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'L2XCFWD' and
-           not 'VHOST' and
-           not 'NF_DENSITY' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
-  layout:
-    title: "k8s-memif-3n-hsw-x710-64b-base_and_scale-l2xc-pdr"
-    layout: "plot-throughput-speedup-analysis"
-
-# Speedup - VPP Container Memif 3n-hsw-x710 - l2bd
--
-  type: "plot"
-  title: "Speedup: k8s-memif-3n-hsw-x710-64b-base_and_scale-l2bd-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-base_and_scale-l2bd-ndr-tsa"
-  data: "plot-ligato-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN') and
-           not 'VHOST' and
-           not 'NF_DENSITY' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
-  layout:
-    title: "k8s-memif-3n-hsw-x710-64b-base_and_scale-l2bd-ndr"
-    layout: "plot-throughput-speedup-analysis"
-
--
-  type: "plot"
-  title: "Speedup: k8s-memif-3n-hsw-x710-64b-base_and_scale-l2bd-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-base_and_scale-l2bd-pdr-tsa"
-  data: "plot-ligato-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN') and
-           not 'VHOST' and
-           not 'NF_DENSITY' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
-  layout:
-    title: "k8s-memif-3n-hsw-x710-64b-base_and_scale-l2bd-pdr"
-    layout: "plot-throughput-speedup-analysis"
+## Speedup - VPP Container k8s memif 3n-hsw-x520 - l2xc
+#- type: "plot"
+#  title: "Speedup: k8s-memif-3n-hsw-x520-64b-base_and_scale-l2xc-ndr-tsa"
+#  algorithm: "plot_throughput_speedup_analysis"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-base_and_scale-l2xc-ndr-tsa"
+#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X520-DA2' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
+#           'NDRPDR' and
+#           'L2XCFWD' and
+#           not 'VHOST' and
+#           not 'NF_DENSITY' and
+#           'MEMIF'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "1VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  layout:
+#    title: "k8s-memif-3n-hsw-x520-64b-base_and_scale-ndr-l2xc"
+#    layout: "plot-throughput-speedup-analysis"
+#
+#- type: "plot"
+#  title: "Speedup: k8s-memif-3n-hsw-x520-64b-base_and_scale-l2xc-pdr-tsa"
+#  algorithm: "plot_throughput_speedup_analysis"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-base_and_scale-l2xc-pdr-tsa"
+#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X520-DA2' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
+#           'NDRPDR' and
+#           'L2XCFWD' and
+#           not 'VHOST' and
+#           not 'NF_DENSITY' and
+#           'MEMIF'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "1VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  layout:
+#    title: "k8s-memif-3n-hsw-x520-64b-base_and_scale-l2xc-pdr"
+#    layout: "plot-throughput-speedup-analysis"
+#
+## Speedup - VPP Container k8s memif 3n-hsw-x520 - l2bd
+#- type: "plot"
+#  title: "Speedup: k8s-memif-3n-hsw-x520-64b-base_and_scale-l2bd-ndr-tsa"
+#  algorithm: "plot_throughput_speedup_analysis"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-base_and_scale-l2bd-ndr-tsa"
+#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X520-DA2' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
+#           'NDRPDR' and
+#           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+#           not 'VHOST' and
+#           not 'NF_DENSITY' and
+#           'MEMIF'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "1VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  layout:
+#    title: "k8s-memif-3n-hsw-x520-64b-base_and_scale-ndr-l2bd"
+#    layout: "plot-throughput-speedup-analysis"
+#
+#- type: "plot"
+#  title: "Speedup: k8s-memif-3n-hsw-x520-64b-base_and_scale-l2bd-pdr-tsa"
+#  algorithm: "plot_throughput_speedup_analysis"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-base_and_scale-l2bd-pdr-tsa"
+#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X520-DA2' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
+#           'NDRPDR' and
+#           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+#           not 'VHOST' and
+#           not 'NF_DENSITY' and
+#           'MEMIF'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "1VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  layout:
+#    title: "k8s-memif-3n-hsw-x520-64b-base_and_scale-l2bd-pdr"
+#    layout: "plot-throughput-speedup-analysis"
+#
+## Speedup - VPP Container Memif 3n-hsw-x710 - l2xc
+#- type: "plot"
+#  title: "Speedup: k8s-memif-3n-hsw-x710-64b-base_and_scale-l2xc-ndr-tsa"
+#  algorithm: "plot_throughput_speedup_analysis"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-base_and_scale-l2xc-ndr-tsa"
+#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
+#           'NDRPDR' and
+#           'L2XCFWD' and
+#           not 'VHOST' and
+#           not 'NF_DENSITY' and
+#           'MEMIF'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "1VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  layout:
+#    title: "k8s-memif-3n-hsw-x710-64b-base_and_scale-l2xc-ndr"
+#    layout: "plot-throughput-speedup-analysis"
+#
+#- type: "plot"
+#  title: "Speedup: k8s-memif-3n-hsw-x710-64b-base_and_scale-l2xc-pdr-tsa"
+#  algorithm: "plot_throughput_speedup_analysis"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-base_and_scale-l2xc-pdr-tsa"
+#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
+#           'NDRPDR' and
+#           'L2XCFWD' and
+#           not 'VHOST' and
+#           not 'NF_DENSITY' and
+#           'MEMIF'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "1VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  layout:
+#    title: "k8s-memif-3n-hsw-x710-64b-base_and_scale-l2xc-pdr"
+#    layout: "plot-throughput-speedup-analysis"
+#
+## Speedup - VPP Container Memif 3n-hsw-x710 - l2bd
+#- type: "plot"
+#  title: "Speedup: k8s-memif-3n-hsw-x710-64b-base_and_scale-l2bd-ndr-tsa"
+#  algorithm: "plot_throughput_speedup_analysis"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-base_and_scale-l2bd-ndr-tsa"
+#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
+#           'NDRPDR' and
+#           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+#           not 'VHOST' and
+#           not 'NF_DENSITY' and
+#           'MEMIF'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "1VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  layout:
+#    title: "k8s-memif-3n-hsw-x710-64b-base_and_scale-l2bd-ndr"
+#    layout: "plot-throughput-speedup-analysis"
+#
+#- type: "plot"
+#  title: "Speedup: k8s-memif-3n-hsw-x710-64b-base_and_scale-l2bd-pdr-tsa"
+#  algorithm: "plot_throughput_speedup_analysis"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-base_and_scale-l2bd-pdr-tsa"
+#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
+#           'NDRPDR' and
+#           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+#           not 'VHOST' and
+#           not 'NF_DENSITY' and
+#           'MEMIF'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "1VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  layout:
+#    title: "k8s-memif-3n-hsw-x710-64b-base_and_scale-l2bd-pdr"
+#    layout: "plot-throughput-speedup-analysis"
 
 ################################################################################
 
 # Speedup - VPP IPv4 3n-hsw-x520 base and scale
 
 ################################################################################
 
 # Speedup - VPP IPv4 3n-hsw-x520 base and scale
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: ip4-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
   title: "Speedup: ip4-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            'IP4FWD' and
            not 'IPSEC' and
            'NDRPDR' and
            'IP4FWD' and
            not 'IPSEC' and
@@ -22477,23 +23786,22 @@
   sort:
   - "DOT1Q"
   - "IP4BASE"
   sort:
   - "DOT1Q"
   - "IP4BASE"
-  - "FIB_20k"
-  - "FIB_200k"
+  - "FIB_20K"
+  - "FIB_200K"
   - "FIB_2M"
   layout:
     title: "ip4-3n-hsw-x520-64b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
   - "FIB_2M"
   layout:
     title: "ip4-3n-hsw-x520-64b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: ip4-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
   title: "Speedup: ip4-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            'IP4FWD' and
            not 'IPSEC' and
            'NDRPDR' and
            'IP4FWD' and
            not 'IPSEC' and
@@ -22506,28 +23814,27 @@
   sort:
   - "DOT1Q"
   - "IP4BASE"
   sort:
   - "DOT1Q"
   - "IP4BASE"
-  - "FIB_20k"
-  - "FIB_200k"
+  - "FIB_20K"
+  - "FIB_200K"
   - "FIB_2M"
   layout:
     title: "ip4-3n-hsw-x520-64b-base_and_scale-pdr"
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP IPv4 3n-hsw-x520 features
   - "FIB_2M"
   layout:
     title: "ip4-3n-hsw-x520-64b-base_and_scale-pdr"
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP IPv4 3n-hsw-x520 features
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: ip4-3n-hsw-x520-64b-features-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-features-ndr-tsa"
   title: "Speedup: ip4-3n-hsw-x520-64b-features-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-features-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('IP4BASE' or
             'POLICE_MARK' or
             'COPWHLIST' or
             ('NAT44' and 'BASE') or
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('IP4BASE' or
             'POLICE_MARK' or
             'COPWHLIST' or
             ('NAT44' and 'BASE') or
-            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
+            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
            'NDRPDR' and
            'IP4FWD' and
            not 'IPSEC' and
            'NDRPDR' and
            'IP4FWD' and
            not 'IPSEC' and
@@ -22548,20 +23855,19 @@
     title: "ip4-3n-hsw-x520-64b-features-ndr"
     layout: "plot-throughput-speedup-analysis"
 
     title: "ip4-3n-hsw-x520-64b-features-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: ip4-3n-hsw-x520-64b-features-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-features-pdr-tsa"
   title: "Speedup: ip4-3n-hsw-x520-64b-features-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-features-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('IP4BASE' or
             'POLICE_MARK' or
             'COPWHLIST' or
             ('NAT44' and 'BASE') or
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('IP4BASE' or
             'POLICE_MARK' or
             'COPWHLIST' or
             ('NAT44' and 'BASE') or
-            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
+            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
            'NDRPDR' and
            'IP4FWD' and
            not 'IPSEC' and
            'NDRPDR' and
            'IP4FWD' and
            not 'IPSEC' and
@@ -22583,13 +23889,12 @@
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP IPv4 3n-hsw-x520 features nat44
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP IPv4 3n-hsw-x520 features nat44
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: ip4-3n-hsw-x520-64b-features-nat44-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-features-nat44-ndr-tsa"
   title: "Speedup: ip4-3n-hsw-x520-64b-features-nat44-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-features-nat44-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
@@ -22613,13 +23918,12 @@
     title: "ip4-3n-hsw-x520-64b-features-nat44-ndr"
     layout: "plot-throughput-speedup-analysis"
 
     title: "ip4-3n-hsw-x520-64b-features-nat44-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: ip4-3n-hsw-x520-64b-features-nat44-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-features-nat44-pdr-tsa"
   title: "Speedup: ip4-3n-hsw-x520-64b-features-nat44-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-features-nat44-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
@@ -22644,18 +23948,17 @@
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP IPv4 3n-hsw-x520 features iacl
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP IPv4 3n-hsw-x520 features iacl
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: ip4-3n-hsw-x520-64b-features-iacl-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-features-iacl-ndr-tsa"
   title: "Speedup: ip4-3n-hsw-x520-64b-features-iacl-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-features-iacl-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
            'IP4FWD' and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
            'IP4FWD' and
-           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
+           (('IACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
            not 'IPSEC' and
            not 'DOT1Q' and
            not 'VHOST'"
            not 'IPSEC' and
            not 'DOT1Q' and
            not 'VHOST'"
@@ -22673,18 +23976,17 @@
     title: "ip4-3n-hsw-x520-64b-features-iacl-ndr"
     layout: "plot-throughput-speedup-analysis"
 
     title: "ip4-3n-hsw-x520-64b-features-iacl-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: ip4-3n-hsw-x520-64b-features-iacl-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-features-iacl-pdr-tsa"
   title: "Speedup: ip4-3n-hsw-x520-64b-features-iacl-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-features-iacl-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
            'IP4FWD' and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
            'IP4FWD' and
-           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
+           (('IACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
            not 'IPSEC' and
            not 'DOT1Q' and
            not 'VHOST'"
            not 'IPSEC' and
            not 'DOT1Q' and
            not 'VHOST'"
@@ -22703,18 +24005,17 @@
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP IPv4 3n-hsw-x520 features oacl
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP IPv4 3n-hsw-x520 features oacl
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: ip4-3n-hsw-x520-64b-features-oacl-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-features-oacl-ndr-tsa"
   title: "Speedup: ip4-3n-hsw-x520-64b-features-oacl-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-features-oacl-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
            'IP4FWD' and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
            'IP4FWD' and
-           ('OACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
+           (('OACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
            not 'IPSEC' and
            not 'DOT1Q' and
            not 'VHOST'"
            not 'IPSEC' and
            not 'DOT1Q' and
            not 'VHOST'"
@@ -22732,18 +24033,17 @@
     title: "ip4-3n-hsw-x520-64b-features-oacl-ndr"
     layout: "plot-throughput-speedup-analysis"
 
     title: "ip4-3n-hsw-x520-64b-features-oacl-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: ip4-3n-hsw-x520-64b-features-oacl-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-features-oacl-pdr-tsa"
   title: "Speedup: ip4-3n-hsw-x520-64b-features-oacl-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-features-oacl-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
            'IP4FWD' and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
            'IP4FWD' and
-           ('OACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
+           (('OACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
            not 'IPSEC' and
            not 'DOT1Q' and
            not 'VHOST'"
            not 'IPSEC' and
            not 'DOT1Q' and
            not 'VHOST'"
@@ -22762,13 +24062,12 @@
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP IPv4 3n-hsw-x710 base and scale
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP IPv4 3n-hsw-x710 base and scale
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: ip4-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
   title: "Speedup: ip4-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
@@ -22790,13 +24089,12 @@
     title: "ip4-3n-hsw-x710-64b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
     title: "ip4-3n-hsw-x710-64b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: ip4-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
   title: "Speedup: ip4-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
@@ -22819,20 +24117,19 @@
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP IPv4 3n-hsw-x710 features
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP IPv4 3n-hsw-x710 features
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: ip4-3n-hsw-x710-64b-features-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-features-ndr-tsa"
   title: "Speedup: ip4-3n-hsw-x710-64b-features-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-features-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or
             'POLICE_MARK' or
             'COPWHLIST' or
             ('NAT44' and 'BASE') or
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or
             'POLICE_MARK' or
             'COPWHLIST' or
             ('NAT44' and 'BASE') or
-            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
+            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
            'NDRPDR' and
            'IP4FWD' and
            not 'IPSEC' and
            'NDRPDR' and
            'IP4FWD' and
            not 'IPSEC' and
@@ -22853,20 +24150,19 @@
     title: "ip4-3n-hsw-x710-64b-features-ndr"
     layout: "plot-throughput-speedup-analysis"
 
     title: "ip4-3n-hsw-x710-64b-features-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: ip4-3n-hsw-x710-64b-features-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-features-pdr-tsa"
   title: "Speedup: ip4-3n-hsw-x710-64b-features-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-features-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or
             'POLICE_MARK' or
             'COPWHLIST' or
             ('NAT44' and 'BASE') or
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or
             'POLICE_MARK' or
             'COPWHLIST' or
             ('NAT44' and 'BASE') or
-            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
+            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
            'NDRPDR' and
            'IP4FWD' and
            not 'IPSEC' and
            'NDRPDR' and
            'IP4FWD' and
            not 'IPSEC' and
@@ -22888,13 +24184,12 @@
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP IPv4 3n-hsw-x710 features nat44
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP IPv4 3n-hsw-x710 features nat44
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: ip4-3n-hsw-x710-64b-features-nat44-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-features-nat44-ndr-tsa"
   title: "Speedup: ip4-3n-hsw-x710-64b-features-nat44-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-features-nat44-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -22917,13 +24212,12 @@
     title: "ip4-3n-hsw-x710-64b-features-nat44-ndr"
     layout: "plot-throughput-speedup-analysis"
 
     title: "ip4-3n-hsw-x710-64b-features-nat44-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: ip4-3n-hsw-x710-64b-features-nat44-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-features-nat44-pdr-tsa"
   title: "Speedup: ip4-3n-hsw-x710-64b-features-nat44-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-features-nat44-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -22947,18 +24241,17 @@
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP IPv4 3n-hsw-x710 features iacl
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP IPv4 3n-hsw-x710 features iacl
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: ip4-3n-hsw-x710-64b-features-iacl-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-features-iacl-ndr-tsa"
   title: "Speedup: ip4-3n-hsw-x710-64b-features-iacl-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-features-iacl-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
            'IP4FWD' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
            'IP4FWD' and
-           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
+           (('IACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -22975,18 +24268,17 @@
     title: "ip4-3n-hsw-x710-64b-features-iacl-ndr"
     layout: "plot-throughput-speedup-analysis"
 
     title: "ip4-3n-hsw-x710-64b-features-iacl-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: ip4-3n-hsw-x710-64b-features-iacl-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-features-iacl-pdr-tsa"
   title: "Speedup: ip4-3n-hsw-x710-64b-features-iacl-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-features-iacl-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
            'IP4FWD' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
            'IP4FWD' and
-           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
+           (('IACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -23004,13 +24296,12 @@
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP IPv4 3n-hsw-xl710 base and scale
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP IPv4 3n-hsw-xl710 base and scale
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: ip4-3n-hsw-xl710-64b-base-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-base-ndr-tsa"
   title: "Speedup: ip4-3n-hsw-xl710-64b-base-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-base-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
   filter: "'NIC_Intel-XL710' and
            '64B' and
            ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
@@ -23031,13 +24322,12 @@
     title: "ip4-3n-hsw-xl710-64b-base-ndr"
     layout: "plot-throughput-speedup-analysis"
 
     title: "ip4-3n-hsw-xl710-64b-base-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: ip4-3n-hsw-xl710-64b-base-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-base-pdr-tsa"
   title: "Speedup: ip4-3n-hsw-xl710-64b-base-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-base-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
   filter: "'NIC_Intel-XL710' and
            '64B' and
            ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
@@ -23059,13 +24349,12 @@
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP IPv4 3n-skx-x710 base and scale
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP IPv4 3n-skx-x710 base and scale
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: ip4-3n-skx-x710-64b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-base_and_scale-ndr-tsa"
   title: "Speedup: ip4-3n-skx-x710-64b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
@@ -23087,13 +24376,12 @@
     title: "ip4-3n-skx-x710-64b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
     title: "ip4-3n-skx-x710-64b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: ip4-3n-skx-x710-64b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-base_and_scale-pdr-tsa"
   title: "Speedup: ip4-3n-skx-x710-64b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
@@ -23116,20 +24404,19 @@
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP IPv4 3n-skx-x710 features
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP IPv4 3n-skx-x710 features
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: ip4-3n-skx-x710-64b-features-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-features-ndr-tsa"
   title: "Speedup: ip4-3n-skx-x710-64b-features-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-features-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or
             'POLICE_MARK' or
             'COPWHLIST' or
             ('NAT44' and 'BASE') or
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or
             'POLICE_MARK' or
             'COPWHLIST' or
             ('NAT44' and 'BASE') or
-            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
+            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
            'NDRPDR' and
            'IP4FWD' and
            not 'IPSEC' and
            'NDRPDR' and
            'IP4FWD' and
            not 'IPSEC' and
@@ -23150,20 +24437,19 @@
     title: "ip4-3n-skx-x710-64b-features-ndr"
     layout: "plot-throughput-speedup-analysis"
 
     title: "ip4-3n-skx-x710-64b-features-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: ip4-3n-skx-x710-64b-features-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-features-pdr-tsa"
   title: "Speedup: ip4-3n-skx-x710-64b-features-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-features-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or
             'POLICE_MARK' or
             'COPWHLIST' or
             ('NAT44' and 'BASE') or
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or
             'POLICE_MARK' or
             'COPWHLIST' or
             ('NAT44' and 'BASE') or
-            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
+            ('ACL_STATELESS' and 'ACL10' and '10K_FLOWS')) and
            'NDRPDR' and
            'IP4FWD' and
            not 'IPSEC' and
            'NDRPDR' and
            'IP4FWD' and
            not 'IPSEC' and
@@ -23185,13 +24471,12 @@
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP IPv4 3n-skx-x710 features nat44
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP IPv4 3n-skx-x710 features nat44
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: ip4-3n-skx-x710-64b-features-nat44-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-features-nat44-ndr-tsa"
   title: "Speedup: ip4-3n-skx-x710-64b-features-nat44-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-features-nat44-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -23214,13 +24499,12 @@
     title: "ip4-3n-skx-x710-64b-features-nat44-ndr"
     layout: "plot-throughput-speedup-analysis"
 
     title: "ip4-3n-skx-x710-64b-features-nat44-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: ip4-3n-skx-x710-64b-features-nat44-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-features-nat44-pdr-tsa"
   title: "Speedup: ip4-3n-skx-x710-64b-features-nat44-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-features-nat44-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -23244,18 +24528,17 @@
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP IPv4 3n-skx-x710 features iacl
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP IPv4 3n-skx-x710 features iacl
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: ip4-3n-skx-x710-64b-features-iacl-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-features-iacl-ndr-tsa"
   title: "Speedup: ip4-3n-skx-x710-64b-features-iacl-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-features-iacl-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
            'IP4FWD' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
            'IP4FWD' and
-           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
+           (('IACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -23272,18 +24555,17 @@
     title: "ip4-3n-skx-x710-64b-features-iacl-ndr"
     layout: "plot-throughput-speedup-analysis"
 
     title: "ip4-3n-skx-x710-64b-features-iacl-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: ip4-3n-skx-x710-64b-features-iacl-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-features-iacl-pdr-tsa"
   title: "Speedup: ip4-3n-skx-x710-64b-features-iacl-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-features-iacl-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
            'IP4FWD' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
            'IP4FWD' and
-           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
+           (('IACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -23297,77 +24579,74 @@
   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   layout:
   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   layout:
-    title: "ip4-3n-skx-x710-64b-features-iacl-pdr"
-    layout: "plot-throughput-speedup-analysis"
-
-# Speedup - VPP IPv4 3n-skx-x710 features oacl
--
-  type: "plot"
-  title: "Speedup: ip4-3n-skx-x710-64b-features-oacl-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-features-oacl-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
-  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-skx-x710-64b-features-oacl-ndr"
-    layout: "plot-throughput-speedup-analysis"
-
--
-  type: "plot"
-  title: "Speedup: ip4-3n-skx-x710-64b-features-oacl-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-features-oacl-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
-  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-skx-x710-64b-features-oacl-pdr"
+    title: "ip4-3n-skx-x710-64b-features-iacl-pdr"
     layout: "plot-throughput-speedup-analysis"
 
     layout: "plot-throughput-speedup-analysis"
 
+## Speedup - VPP IPv4 3n-skx-x710 features oacl
+#- type: "plot"
+#  title: "Speedup: ip4-3n-skx-x710-64b-features-oacl-ndr-tsa"
+#  algorithm: "plot_throughput_speedup_analysis"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-features-oacl-ndr-tsa"
+#  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+#  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-skx-x710-64b-features-oacl-ndr"
+#    layout: "plot-throughput-speedup-analysis"
+#
+#- type: "plot"
+#  title: "Speedup: ip4-3n-skx-x710-64b-features-oacl-pdr-tsa"
+#  algorithm: "plot_throughput_speedup_analysis"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-features-oacl-pdr-tsa"
+#  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+#  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-skx-x710-64b-features-oacl-pdr"
+#    layout: "plot-throughput-speedup-analysis"
+
 # Speedup - VPP IPv4 2n-skx-x710 base and scale
 # Speedup - VPP IPv4 2n-skx-x710 base and scale
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: ip4-2n-skx-x710-64b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-base_and_scale-ndr-tsa"
   title: "Speedup: ip4-2n-skx-x710-64b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
   filter: "'NIC_Intel-X710' and
            '64B' and
-           ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            'IP4FWD' and
            not 'IPSEC' and
            'NDRPDR' and
            'IP4FWD' and
            not 'IPSEC' and
@@ -23379,23 +24658,22 @@
   - "tags"
   sort:
   - "IP4BASE"
   - "tags"
   sort:
   - "IP4BASE"
-  - "FIB_20k"
-  - "FIB_200k"
+  - "FIB_20K"
+  - "FIB_200K"
   - "FIB_2M"
   layout:
     title: "ip4-2n-skx-x710-64b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
   - "FIB_2M"
   layout:
     title: "ip4-2n-skx-x710-64b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: ip4-2n-skx-x710-64b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-base_and_scale-pdr-tsa"
   title: "Speedup: ip4-2n-skx-x710-64b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
   filter: "'NIC_Intel-X710' and
            '64B' and
-           ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            'IP4FWD' and
            not 'IPSEC' and
            'NDRPDR' and
            'IP4FWD' and
            not 'IPSEC' and
@@ -23407,28 +24685,26 @@
   - "tags"
   sort:
   - "IP4BASE"
   - "tags"
   sort:
   - "IP4BASE"
-  - "FIB_20k"
-  - "FIB_200k"
+  - "FIB_20K"
+  - "FIB_200K"
   - "FIB_2M"
   layout:
     title: "ip4-2n-skx-x710-64b-base_and_scale-pdr"
     layout: "plot-throughput-speedup-analysis"
 
   - "FIB_2M"
   layout:
     title: "ip4-2n-skx-x710-64b-base_and_scale-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP IPv4 2n-skx-xxv710 base and scale
--
-  type: "plot"
-  title: "Speedup: ip4-2n-skx-xxv710-64b-base_and_scale-ndr-tsa"
+# Speedup - VPP IPv4 2n-skx-x710 features iacl
+- type: "plot"
+  title: "Speedup: ip4-2n-skx-x710-64b-features-iacl-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-features-iacl-ndr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            '64B' and
-           ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
            'NDRPDR' and
            'IP4FWD' and
            'NDRPDR' and
            'IP4FWD' and
+           (('IACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
            not 'IPSEC' and
            not 'IPSEC' and
-           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "throughput"
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -23436,27 +24712,26 @@
   - "tags"
   sort:
   - "IP4BASE"
   - "tags"
   sort:
   - "IP4BASE"
-  - "FIB_20k"
-  - "FIB_200k"
-  - "FIB_2M"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
   layout:
   layout:
-    title: "ip4-2n-skx-xxv710-64b-base_and_scale-ndr"
+    title: "ip4-2n-skx-x710-64b-features-iacl-ndr"
     layout: "plot-throughput-speedup-analysis"
 
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
-  title: "Speedup: ip4-2n-skx-xxv710-64b-base_and_scale-pdr-tsa"
+- type: "plot"
+  title: "Speedup: ip4-2n-skx-x710-64b-features-iacl-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-features-iacl-pdr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            '64B' and
-           ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
            'NDRPDR' and
            'IP4FWD' and
            'NDRPDR' and
            'IP4FWD' and
+           (('IACL' and ('ACL1' or 'ACL50') and ('10K_FLOWS' or '10k_FLOWS')) or 'IP4BASE') and
            not 'IPSEC' and
            not 'IPSEC' and
-           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "throughput"
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -23464,27 +24739,28 @@
   - "tags"
   sort:
   - "IP4BASE"
   - "tags"
   sort:
   - "IP4BASE"
-  - "FIB_20k"
-  - "FIB_200k"
-  - "FIB_2M"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
   layout:
   layout:
-    title: "ip4-2n-skx-xxv710-64b-base_and_scale-pdr"
+    title: "ip4-2n-skx-x710-64b-features-iacl-pdr"
     layout: "plot-throughput-speedup-analysis"
 
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP IPv4 2n-dnv-x553 base
--
-  type: "plot"
-  title: "Speedup: ip4-2n-dnv-x553-64b-base-ndr-tsa"
+# Speedup - VPP IPv4 2n-skx-xxv710 base and scale
+- type: "plot"
+  title: "Speedup: ip4-2n-skx-xxv710-64b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-dnv-x553-64b-base-ndr-tsa"
-  data: "intel-dnv-vpp"
-  filter: "'NIC_Intel-X553' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-base_and_scale-ndr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
            '64B' and
-           'IP4BASE' and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            'IP4FWD' and
            not 'IPSEC' and
            'NDRPDR' and
            'IP4FWD' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "throughput"
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -23492,23 +24768,26 @@
   - "tags"
   sort:
   - "IP4BASE"
   - "tags"
   sort:
   - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   layout:
   layout:
-    title: "ip4-2n-dnv-x553-64b-base-ndr"
+    title: "ip4-2n-skx-xxv710-64b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
-  title: "Speedup: ip4-2n-dnv-x553-64b-base-pdr-tsa"
+- type: "plot"
+  title: "Speedup: ip4-2n-skx-xxv710-64b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-dnv-x553-64b-base-pdr-tsa"
-  data: "intel-dnv-vpp"
-  filter: "'NIC_Intel-X553' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-base_and_scale-pdr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
            '64B' and
-           'IP4BASE' and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            'IP4FWD' and
            not 'IPSEC' and
            'NDRPDR' and
            'IP4FWD' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "throughput"
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -23516,20 +24795,69 @@
   - "tags"
   sort:
   - "IP4BASE"
   - "tags"
   sort:
   - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   layout:
   layout:
-    title: "ip4-2n-dnv-x553-64b-base-pdr"
+    title: "ip4-2n-skx-xxv710-64b-base_and_scale-pdr"
     layout: "plot-throughput-speedup-analysis"
 
     layout: "plot-throughput-speedup-analysis"
 
+## Speedup - VPP IPv4 2n-dnv-x553 base
+#- type: "plot"
+#  title: "Speedup: ip4-2n-dnv-x553-64b-base-ndr-tsa"
+#  algorithm: "plot_throughput_speedup_analysis"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip4-2n-dnv-x553-64b-base-ndr-tsa"
+#  data: "intel-dnv-vpp"
+#  filter: "'NIC_Intel-X553' and
+#           '64B' and
+#           'IP4BASE' and
+#           'NDRPDR' and
+#           'IP4FWD' and
+#           not 'IPSEC' and
+#           not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "IP4BASE"
+#  layout:
+#    title: "ip4-2n-dnv-x553-64b-base-ndr"
+#    layout: "plot-throughput-speedup-analysis"
+#
+#- type: "plot"
+#  title: "Speedup: ip4-2n-dnv-x553-64b-base-pdr-tsa"
+#  algorithm: "plot_throughput_speedup_analysis"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip4-2n-dnv-x553-64b-base-pdr-tsa"
+#  data: "intel-dnv-vpp"
+#  filter: "'NIC_Intel-X553' and
+#           '64B' and
+#           'IP4BASE' and
+#           'NDRPDR' and
+#           'IP4FWD' and
+#           not 'IPSEC' and
+#           not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "IP4BASE"
+#  layout:
+#    title: "ip4-2n-dnv-x553-64b-base-pdr"
+#    layout: "plot-throughput-speedup-analysis"
+
 ################################################################################
 
 # Speedup - VPP IPv4 Tunnels 3n-hsw-x520 - features
 ################################################################################
 
 # Speedup - VPP IPv4 Tunnels 3n-hsw-x520 - features
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: ip4tun-3n-hsw-x520-64b-base_and_features-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-base_and_features-ndr-tsa"
   title: "Speedup: ip4tun-3n-hsw-x520-64b-base_and_features-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-base_and_features-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'ENCAP' and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'ENCAP' and
@@ -23551,13 +24879,12 @@
     title: "ip4tun-3n-hsw-x520-64b-base_and_features-ndr"
     layout: "plot-throughput-speedup-analysis"
 
     title: "ip4tun-3n-hsw-x520-64b-base_and_features-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: ip4tun-3n-hsw-x520-64b-base_and_features-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-base_and_features-pdr-tsa"
   title: "Speedup: ip4tun-3n-hsw-x520-64b-base_and_features-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-base_and_features-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'ENCAP' and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'ENCAP' and
@@ -23580,13 +24907,12 @@
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP IPv4 Tunnels 3n-hsw-x710
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP IPv4 Tunnels 3n-hsw-x710
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: ip4tun-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
   title: "Speedup: ip4tun-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
@@ -23609,13 +24935,12 @@
     title: "ip4tun-3n-hsw-x710-64b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
     title: "ip4tun-3n-hsw-x710-64b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: ip4tun-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
   title: "Speedup: ip4tun-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
@@ -23639,13 +24964,12 @@
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP IPv4 Tunnels 3n-hsw-x710 - features
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP IPv4 Tunnels 3n-hsw-x710 - features
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: ip4tun-3n-hsw-x710-64b-base_and_features-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-base_and_features-ndr-tsa"
   title: "Speedup: ip4tun-3n-hsw-x710-64b-base_and_features-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-base_and_features-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
@@ -23667,13 +24991,12 @@
     title: "ip4tun-3n-hsw-x710-64b-base_and_features-ndr"
     layout: "plot-throughput-speedup-analysis"
 
     title: "ip4tun-3n-hsw-x710-64b-base_and_features-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: ip4tun-3n-hsw-x710-64b-base_and_features-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-base_and_features-pdr-tsa"
   title: "Speedup: ip4tun-3n-hsw-x710-64b-base_and_features-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-base_and_features-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
@@ -23696,13 +25019,12 @@
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP IPv4 Tunnels 3n-skx-x710
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP IPv4 Tunnels 3n-skx-x710
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: ip4tun-3n-skx-x710-64b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-base_and_scale-ndr-tsa"
   title: "Speedup: ip4tun-3n-skx-x710-64b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
@@ -23725,13 +25047,12 @@
     title: "ip4tun-3n-skx-x710-64b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
     title: "ip4tun-3n-skx-x710-64b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: ip4tun-3n-skx-x710-64b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-base_and_scale-pdr-tsa"
   title: "Speedup: ip4tun-3n-skx-x710-64b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
@@ -23755,13 +25076,12 @@
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP IPv4 Tunnels 3n-skx-x710 - features
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP IPv4 Tunnels 3n-skx-x710 - features
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: ip4tun-3n-skx-x710-64b-base_and_features-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-base_and_features-ndr-tsa"
   title: "Speedup: ip4tun-3n-skx-x710-64b-base_and_features-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-base_and_features-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
@@ -23783,13 +25103,12 @@
     title: "ip4tun-3n-skx-x710-64b-base_and_features-ndr"
     layout: "plot-throughput-speedup-analysis"
 
     title: "ip4tun-3n-skx-x710-64b-base_and_features-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: ip4tun-3n-skx-x710-64b-base_and_features-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-base_and_features-pdr-tsa"
   title: "Speedup: ip4tun-3n-skx-x710-64b-base_and_features-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-base_and_features-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
@@ -23814,13 +25133,12 @@
 ################################################################################
 
 # Speedup - VPP IPv6 3n-hsw-x520
 ################################################################################
 
 # Speedup - VPP IPv6 3n-hsw-x520
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: ip6-3n-hsw-x520-78b-base-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-base-ndr-tsa"
   title: "Speedup: ip6-3n-hsw-x520-78b-base-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-base-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
            ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
            ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
@@ -23842,13 +25160,12 @@
     title: "ip6-3n-hsw-x520-78b-base-ndr"
     layout: "plot-throughput-speedup-analysis"
 
     title: "ip6-3n-hsw-x520-78b-base-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: ip6-3n-hsw-x520-78b-base-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-base-pdr-tsa"
   title: "Speedup: ip6-3n-hsw-x520-78b-base-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-base-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
            ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
            ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
@@ -23871,13 +25188,12 @@
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP IPv6 3n-hsw-x710
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP IPv6 3n-hsw-x710
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: ip6-3n-hsw-x710-78b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-base_and_scale-ndr-tsa"
   title: "Speedup: ip6-3n-hsw-x710-78b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
@@ -23899,13 +25215,12 @@
     title: "ip6-3n-hsw-x710-78b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
     title: "ip6-3n-hsw-x710-78b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: ip6-3n-hsw-x710-78b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-base_and_scale-pdr-tsa"
   title: "Speedup: ip6-3n-hsw-x710-78b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
@@ -23928,13 +25243,12 @@
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP IPv6 3n-hsw-x710 features
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP IPv6 3n-hsw-x710 features
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: ip6-3n-hsw-x710-78b-base_and_features-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-base_and_features-ndr-tsa"
   title: "Speedup: ip6-3n-hsw-x710-78b-base_and_features-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-base_and_features-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('IP6BASE' or
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('IP6BASE' or
@@ -23959,13 +25273,12 @@
     title: "ip6-3n-hsw-x710-78b-base_and_features-ndr"
     layout: "plot-throughput-speedup-analysis"
 
     title: "ip6-3n-hsw-x710-78b-base_and_features-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: ip6-3n-hsw-x710-78b-base_and_features-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-base_and_features-pdr-tsa"
   title: "Speedup: ip6-3n-hsw-x710-78b-base_and_features-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-base_and_features-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('IP6BASE' or
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('IP6BASE' or
@@ -23991,13 +25304,12 @@
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP IPv6 3n-hsw-xl710
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP IPv6 3n-hsw-xl710
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: ip6-3n-hsw-xl710-78b-base-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-base-ndr-tsa"
   title: "Speedup: ip6-3n-hsw-xl710-78b-base-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-base-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '78B' and
            ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
   filter: "'NIC_Intel-XL710' and
            '78B' and
            ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
@@ -24019,13 +25331,12 @@
     title: "ip6-3n-hsw-xl710-78b-base-ndr"
     layout: "plot-throughput-speedup-analysis"
 
     title: "ip6-3n-hsw-xl710-78b-base-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: ip6-3n-hsw-xl710-78b-base-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-base-pdr-tsa"
   title: "Speedup: ip6-3n-hsw-xl710-78b-base-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-base-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '78B' and
            ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
   filter: "'NIC_Intel-XL710' and
            '78B' and
            ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
@@ -24048,13 +25359,12 @@
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP IPv6 3n-skx-x710
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP IPv6 3n-skx-x710
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: ip6-3n-skx-x710-78b-base_and_scale-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"
   title: "Speedup: ip6-3n-skx-x710-78b-base_and_scale-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"
-  data: "plot-throughput-speedup-analysis-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
@@ -24076,13 +25386,12 @@
     title: "ip6-3n-skx-x710-78b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
     title: "ip6-3n-skx-x710-78b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: ip6-3n-skx-x710-78b-base_and_scale-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"
   title: "Speedup: ip6-3n-skx-x710-78b-base_and_scale-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"
-  data: "plot-throughput-speedup-analysis-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
@@ -24105,13 +25414,12 @@
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP IPv6 3n-skx-x710 features
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP IPv6 3n-skx-x710 features
--
-  type: "plot"
+- type: "plot"
   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_features-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_features-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('IP6BASE' or
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('IP6BASE' or
@@ -24136,13 +25444,12 @@
     title: "ip6-3n-skx-x710-78b-base_and_features-ndr"
     layout: "plot-throughput-speedup-analysis"
 
     title: "ip6-3n-skx-x710-78b-base_and_features-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- type: "plot"
   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_features-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_features-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('IP6BASE' or
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('IP6BASE' or
@@ -24167,17 +25474,16 @@
     title: "ip6-3n-skx-x710-78b-base_and_features-pdr"
     layout: "plot-throughput-speedup-analysis"
 
     title: "ip6-3n-skx-x710-78b-base_and_features-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP IPv6 2n-skx-x710
--
-  type: "plot"
-  title: "Speedup: ip6-2n-skx-x710-78b-base_and_scale-ndr-tsa"
+# Speedup - VPP IPv6 3n-skx-xxv710
+- type: "plot"
+  title: "Speedup: ip6-3n-skx-xxv710-78b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-xxv710-78b-base_and_scale-ndr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '78B' and
            '78B' and
-           ('IP6BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            'IP6FWD' and
            not 'SRv6' and
            'NDRPDR' and
            'IP6FWD' and
            not 'SRv6' and
@@ -24189,23 +25495,22 @@
   - "tags"
   sort:
   - "IP6BASE"
   - "tags"
   sort:
   - "IP6BASE"
-  - "FIB_20k"
-  - "FIB_200k"
+  - "FIB_20K"
+  - "FIB_200K"
   - "FIB_2M"
   layout:
   - "FIB_2M"
   layout:
-    title: "ip6-2n-skx-x710-78b-base_and_scale-ndr"
+    title: "ip6-3n-skx-xxv710-78b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
-  title: "Speedup: ip6-2n-skx-x710-78b-base_and_scale-pdr-tsa"
+- type: "plot"
+  title: "Speedup: ip6-3n-skx-xxv710-78b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-xxv710-78b-base_and_scale-pdr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '78B' and
            '78B' and
-           ('IP6BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            'IP6FWD' and
            not 'SRv6' and
            'NDRPDR' and
            'IP6FWD' and
            not 'SRv6' and
@@ -24217,24 +25522,23 @@
   - "tags"
   sort:
   - "IP6BASE"
   - "tags"
   sort:
   - "IP6BASE"
-  - "FIB_20k"
-  - "FIB_200k"
+  - "FIB_20K"
+  - "FIB_200K"
   - "FIB_2M"
   layout:
   - "FIB_2M"
   layout:
-    title: "ip6-2n-skx-x710-78b-base_and_scale-pdr"
+    title: "ip6-3n-skx-xxv710-78b-base_and_scale-pdr"
     layout: "plot-throughput-speedup-analysis"
 
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP IPv6 2n-skx-xxv710
--
-  type: "plot"
-  title: "Speedup: ip6-2n-skx-xxv710-78b-base_and_scale-ndr-tsa"
+# Speedup - VPP IPv6 2n-skx-x710
+- type: "plot"
+  title: "Speedup: ip6-2n-skx-x710-78b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-base_and_scale-ndr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  filter: "'NIC_Intel-X710' and
            '78B' and
            '78B' and
-           ('IP6BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            'IP6FWD' and
            not 'SRv6' and
            'NDRPDR' and
            'IP6FWD' and
            not 'SRv6' and
@@ -24246,23 +25550,22 @@
   - "tags"
   sort:
   - "IP6BASE"
   - "tags"
   sort:
   - "IP6BASE"
-  - "FIB_20k"
-  - "FIB_200k"
+  - "FIB_20K"
+  - "FIB_200K"
   - "FIB_2M"
   layout:
   - "FIB_2M"
   layout:
-    title: "ip6-2n-skx-xxv710-78b-base_and_scale-ndr"
+    title: "ip6-2n-skx-x710-78b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
-  title: "Speedup: ip6-2n-skx-xxv710-78b-base_and_scale-pdr-tsa"
+- type: "plot"
+  title: "Speedup: ip6-2n-skx-x710-78b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-base_and_scale-pdr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  filter: "'NIC_Intel-X710' and
            '78B' and
            '78B' and
-           ('IP6BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            'IP6FWD' and
            not 'SRv6' and
            'NDRPDR' and
            'IP6FWD' and
            not 'SRv6' and
@@ -24274,24 +25577,23 @@
   - "tags"
   sort:
   - "IP6BASE"
   - "tags"
   sort:
   - "IP6BASE"
-  - "FIB_20k"
-  - "FIB_200k"
+  - "FIB_20K"
+  - "FIB_200K"
   - "FIB_2M"
   layout:
   - "FIB_2M"
   layout:
-    title: "ip6-2n-skx-xxv710-78b-base_and_scale-pdr"
+    title: "ip6-2n-skx-x710-78b-base_and_scale-pdr"
     layout: "plot-throughput-speedup-analysis"
 
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP IPv6 2n-dnv-x553 base
--
-  type: "plot"
-  title: "Speedup: ip6-2n-dnv-x553-78b-base-ndr-tsa"
+# Speedup - VPP IPv6 2n-skx-xxv710
+- type: "plot"
+  title: "Speedup: ip6-2n-skx-xxv710-78b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-dnv-x553-78b-base-ndr-tsa"
-  data: "intel-dnv-vpp"
-  filter: "'NIC_Intel-X553' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-base_and_scale-ndr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '78B' and
            '78B' and
-           'IP6BASE' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            'IP6FWD' and
            not 'SRv6' and
            'NDRPDR' and
            'IP6FWD' and
            not 'SRv6' and
@@ -24303,20 +25605,22 @@
   - "tags"
   sort:
   - "IP6BASE"
   - "tags"
   sort:
   - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   layout:
   layout:
-    title: "ip6-2n-dnv-x553-78b-base-ndr"
+    title: "ip6-2n-skx-xxv710-78b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
-  title: "Speedup: ip6-2n-dnv-x553-78b-base-pdr-tsa"
+- type: "plot"
+  title: "Speedup: ip6-2n-skx-xxv710-78b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-dnv-x553-78b-base-pdr-tsa"
-  data: "intel-dnv-vpp"
-  filter: "'NIC_Intel-X553' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-base_and_scale-pdr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '78B' and
            '78B' and
-           'IP6BASE' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            'IP6FWD' and
            not 'SRv6' and
            'NDRPDR' and
            'IP6FWD' and
            not 'SRv6' and
@@ -24328,20 +25632,71 @@
   - "tags"
   sort:
   - "IP6BASE"
   - "tags"
   sort:
   - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   layout:
   layout:
-    title: "ip6-2n-dnv-x553-78b-base-pdr"
+    title: "ip6-2n-skx-xxv710-78b-base_and_scale-pdr"
     layout: "plot-throughput-speedup-analysis"
 
     layout: "plot-throughput-speedup-analysis"
 
+## Speedup - VPP IPv6 2n-dnv-x553 base
+#- type: "plot"
+#  title: "Speedup: ip6-2n-dnv-x553-78b-base-ndr-tsa"
+#  algorithm: "plot_throughput_speedup_analysis"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip6-2n-dnv-x553-78b-base-ndr-tsa"
+#  data: "intel-dnv-vpp"
+#  filter: "'NIC_Intel-X553' and
+#           '78B' and
+#           'IP6BASE' and
+#           'NDRPDR' and
+#           'IP6FWD' and
+#           not 'SRv6' and
+#           not 'IPSEC' and
+#           not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "IP6BASE"
+#  layout:
+#    title: "ip6-2n-dnv-x553-78b-base-ndr"
+#    layout: "plot-throughput-speedup-analysis"
+#
+#- type: "plot"
+#  title: "Speedup: ip6-2n-dnv-x553-78b-base-pdr-tsa"
+#  algorithm: "plot_throughput_speedup_analysis"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip6-2n-dnv-x553-78b-base-pdr-tsa"
+#  data: "intel-dnv-vpp"
+#  filter: "'NIC_Intel-X553' and
+#           '78B' and
+#           'IP6BASE' and
+#           'NDRPDR' and
+#           'IP6FWD' and
+#           not 'SRv6' and
+#           not 'IPSEC' and
+#           not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "IP6BASE"
+#  layout:
+#    title: "ip6-2n-dnv-x553-78b-base-pdr"
+#    layout: "plot-throughput-speedup-analysis"
+
 ################################################################################
 
 # Speedup - VPP IPv6 tunnels 3n-hsw-x520
 ################################################################################
 
 # Speedup - VPP IPv6 tunnels 3n-hsw-x520
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: ip6tun-3n-hsw-x520-78b-base-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-base-ndr-tsa"
   title: "Speedup: ip6tun-3n-hsw-x520-78b-base-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-base-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
            'ENCAP' and
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
            'ENCAP' and
@@ -24359,13 +25714,12 @@
     title: "ip6tun-3n-hsw-x520-78b-base-ndr"
     layout: "plot-throughput-speedup-analysis"
 
     title: "ip6tun-3n-hsw-x520-78b-base-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: ip6tun-3n-hsw-x520-78b-base-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-base-pdr-tsa"
   title: "Speedup: ip6tun-3n-hsw-x520-78b-base-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-base-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
            'ENCAP' and
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
            'ENCAP' and
@@ -24386,13 +25740,12 @@
 ################################################################################
 
 # Speedup - VPP IPSec 3n-hsw-xl710 base
 ################################################################################
 
 # Speedup - VPP IPSec 3n-hsw-xl710 base
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: ipsec-3n-hsw-xl710-64b-base-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-base-ndr-tsa"
   title: "Speedup: ipsec-3n-hsw-xl710-64b-base-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-base-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'IP4FWD' and
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'IP4FWD' and
@@ -24409,13 +25762,12 @@
     title: "ipsec-3n-hsw-xl710-64b-base-ndr"
     layout: "plot-throughput-speedup-analysis"
 
     title: "ipsec-3n-hsw-xl710-64b-base-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: ipsec-3n-hsw-xl710-64b-base-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-base-pdr-tsa"
   title: "Speedup: ipsec-3n-hsw-xl710-64b-base-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-base-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'IP4FWD' and
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'IP4FWD' and
@@ -24433,13 +25785,12 @@
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP IPSec 3n-hsw-xl710 scale
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP IPSec 3n-hsw-xl710 scale
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: ipsec-3n-hsw-xl710-64b-scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-scale-ndr-tsa"
   title: "Speedup: ipsec-3n-hsw-xl710-64b-scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'IP4FWD' and
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'IP4FWD' and
@@ -24456,13 +25807,12 @@
     title: "ipsec-3n-hsw-xl710-64b-scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
     title: "ipsec-3n-hsw-xl710-64b-scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: ipsec-3n-hsw-xl710-64b-scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-scale-pdr-tsa"
   title: "Speedup: ipsec-3n-hsw-xl710-64b-scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'IP4FWD' and
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'IP4FWD' and
@@ -24480,13 +25830,12 @@
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP IPSec 3n-hsw-xl710 sw
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP IPSec 3n-hsw-xl710 sw
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: ipsec-3n-hsw-xl710-64b-sw-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-sw-ndr-tsa"
   title: "Speedup: ipsec-3n-hsw-xl710-64b-sw-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-sw-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'IP4FWD' and
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'IP4FWD' and
@@ -24502,13 +25851,12 @@
     title: "ipsec-3n-hsw-xl710-64b-sw-ndr"
     layout: "plot-throughput-speedup-analysis"
 
     title: "ipsec-3n-hsw-xl710-64b-sw-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: ipsec-3n-hsw-xl710-64b-sw-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-sw-pdr-tsa"
   title: "Speedup: ipsec-3n-hsw-xl710-64b-sw-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-sw-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'IP4FWD' and
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'IP4FWD' and
@@ -24527,13 +25875,12 @@
 ################################################################################
 
 # Speedup - VPP SRv6 3n-hsw-x520
 ################################################################################
 
 # Speedup - VPP SRv6 3n-hsw-x520
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: srv6-3n-hsw-x520-78b-features-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-features-ndr-tsa"
   title: "Speedup: srv6-3n-hsw-x520-78b-features-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-features-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
            'FEATURE' and
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
            'FEATURE' and
@@ -24548,13 +25895,12 @@
     title: "srv6-3n-hsw-x520-78b-features-ndr"
     layout: "plot-throughput-speedup-analysis"
 
     title: "srv6-3n-hsw-x520-78b-features-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: srv6-3n-hsw-x520-78b-features-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-features-pdr-tsa"
   title: "Speedup: srv6-3n-hsw-x520-78b-features-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-features-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
            'FEATURE' and
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
            'FEATURE' and
@@ -24572,13 +25918,12 @@
 ################################################################################
 
 # Speedup - VPP L2 3n-hsw-x520 base and scale
 ################################################################################
 
 # Speedup - VPP L2 3n-hsw-x520 base and scale
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: l2sw-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
   title: "Speedup: l2sw-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -24602,13 +25947,12 @@
     title: "l2sw-3n-hsw-x520-64b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
     title: "l2sw-3n-hsw-x520-64b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: l2sw-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
   title: "Speedup: l2sw-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -24629,72 +25973,271 @@
   - "FIB_100K"
   - "FIB_1M"
   layout:
   - "FIB_100K"
   - "FIB_1M"
   layout:
-    title: "l2sw-3n-hsw-x520-64b-base_and_scale-pdr"
+    title: "l2sw-3n-hsw-x520-64b-base_and_scale-pdr"
+    layout: "plot-throughput-speedup-analysis"
+
+# Speedup - VPP L2 3n-hsw-x520 features
+- type: "plot"
+  title: "Speedup: l2sw-3n-hsw-x520-64b-features-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-features-ndr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           'NDRPDR' and
+           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
+           not 'ACL' and
+           not 'VHOST' and
+           not 'MEMIF'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  sort:
+  - "L2XCBASE"    # l2xcbase
+  - "L2BDBASE"    # l2bdbase
+  - "L2XCFWD"     # dot1q-l2xcbase
+  - "L2BDMACLRN"  # dot1q-l2bdbase
+  layout:
+    title: "l2sw-3n-hsw-x520-64b-features-ndr"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: l2sw-3n-hsw-x520-64b-features-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-features-pdr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           'NDRPDR' and
+           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
+           not 'ACL' and
+           not 'VHOST' and
+           not 'MEMIF'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  sort:
+  - "L2XCBASE"    # l2xcbase
+  - "L2BDBASE"    # l2bdbase
+  - "L2XCFWD"     # dot1q-l2xcbase
+  - "L2BDMACLRN"  # dot1q-l2bdbase
+  layout:
+    title: "l2sw-3n-hsw-x520-64b-features-pdr"
+    layout: "plot-throughput-speedup-analysis"
+
+# Speedup - VPP L2 3n-hsw-x520 features-iacl
+- type: "plot"
+  title: "Speedup: l2sw-3n-hsw-x520-64b-features-iacl-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-features-iacl-ndr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           'NDRPDR' and
+           '64B' and
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'IACL' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
+           not 'MACIP' and
+           not 'VHOST' and
+           not 'MEMIF'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  layout:
+    title: "l2sw-3n-hsw-x520-64b-features-iacl-ndr"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: l2sw-3n-hsw-x520-64b-features-iacl-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-features-iacl-pdr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           'NDRPDR' and
+           '64B' and
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'IACL' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
+           not 'MACIP' and
+           not 'VHOST' and
+           not 'MEMIF'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  layout:
+    title: "l2sw-3n-hsw-x520-64b-features-iacl-pdr"
+    layout: "plot-throughput-speedup-analysis"
+
+# Speedup - VPP L2 3n-hsw-x520 features-oacl
+- type: "plot"
+  title: "Speedup: l2sw-3n-hsw-x520-64b-features-oacl-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-features-oacl-ndr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           'NDRPDR' and
+           '64B' and
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'OACL' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
+           not 'MACIP' and
+           not 'VHOST' and
+           not 'MEMIF'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  layout:
+    title: "l2sw-3n-hsw-x520-64b-features-oacl-ndr"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: l2sw-3n-hsw-x520-64b-features-oacl-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-features-oacl-pdr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           'NDRPDR' and
+           '64B' and
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'OACL' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
+           not 'MACIP' and
+           not 'VHOST' and
+           not 'MEMIF'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  layout:
+    title: "l2sw-3n-hsw-x520-64b-features-oacl-pdr"
+    layout: "plot-throughput-speedup-analysis"
+
+# Speedup - VPP L2 3n-hsw-x520 features-oacl
+- type: "plot"
+  title: "Speedup: l2sw-3n-hsw-x520-64b-features-oacl-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-features-oacl-ndr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           'NDRPDR' and
+           '64B' and
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'OACL' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
+           not 'MACIP' and
+           not 'VHOST' and
+           not 'MEMIF'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  layout:
+    title: "l2sw-3n-hsw-x520-64b-features-oacl-ndr"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: l2sw-3n-hsw-x520-64b-features-oacl-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-features-oacl-pdr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           'NDRPDR' and
+           '64B' and
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'OACL' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
+           not 'MACIP' and
+           not 'VHOST' and
+           not 'MEMIF'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  layout:
+    title: "l2sw-3n-hsw-x520-64b-features-oacl-pdr"
     layout: "plot-throughput-speedup-analysis"
 
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP L2 3n-hsw-x520 features
--
-  type: "plot"
-  title: "Speedup: l2sw-3n-hsw-x520-64b-features-ndr-tsa"
+# Speedup - VPP L2 3n-hsw-x520 features-macip
+- type: "plot"
+  title: "Speedup: l2sw-3n-hsw-x520-64b-features-macip-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-features-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-features-macip-ndr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
   filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
            'NDRPDR' and
            'NDRPDR' and
-           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
-           not 'ACL' and
+           '64B' and
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'MACIP' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "L2XCBASE"    # l2xcbase
-  - "L2BDBASE"    # l2bdbase
-  - "L2XCFWD"     # dot1q-l2xcbase
-  - "L2BDMACLRN"  # dot1q-l2bdbase
   layout:
   layout:
-    title: "l2sw-3n-hsw-x520-64b-features-ndr"
+    title: "l2sw-3n-hsw-x520-64b-features-macip-ndr"
     layout: "plot-throughput-speedup-analysis"
 
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
-  title: "Speedup: l2sw-3n-hsw-x520-64b-features-pdr-tsa"
+- type: "plot"
+  title: "Speedup: l2sw-3n-hsw-x520-64b-features-macip-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-features-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-features-macip-pdr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
   filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
            'NDRPDR' and
            'NDRPDR' and
-           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
-           not 'ACL' and
+           '64B' and
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'MACIP' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "L2XCBASE"    # l2xcbase
-  - "L2BDBASE"    # l2bdbase
-  - "L2XCFWD"     # dot1q-l2xcbase
-  - "L2BDMACLRN"  # dot1q-l2bdbase
   layout:
   layout:
-    title: "l2sw-3n-hsw-x520-64b-features-pdr"
+    title: "l2sw-3n-hsw-x520-64b-features-macip-pdr"
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP L2 3n-hsw-x710 base and scale
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP L2 3n-hsw-x710 base and scale
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: l2sw-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
   title: "Speedup: l2sw-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -24719,13 +26262,12 @@
     title: "l2sw-3n-hsw-x710-64b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
     title: "l2sw-3n-hsw-x710-64b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: l2sw-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
   title: "Speedup: l2sw-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -24751,13 +26293,12 @@
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP L2 3n-hsw-x710 features
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP L2 3n-hsw-x710 features
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: l2sw-3n-hsw-x710-64b-features-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-features-ndr-tsa"
   title: "Speedup: l2sw-3n-hsw-x710-64b-features-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-features-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -24779,13 +26320,12 @@
     title: "l2sw-3n-hsw-x710-64b-features-ndr"
     layout: "plot-throughput-speedup-analysis"
 
     title: "l2sw-3n-hsw-x710-64b-features-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: l2sw-3n-hsw-x710-64b-features-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-features-pdr-tsa"
   title: "Speedup: l2sw-3n-hsw-x710-64b-features-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-features-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -24807,14 +26347,64 @@
     title: "l2sw-3n-hsw-x710-64b-features-pdr"
     layout: "plot-throughput-speedup-analysis"
 
     title: "l2sw-3n-hsw-x710-64b-features-pdr"
     layout: "plot-throughput-speedup-analysis"
 
+# Speedup - VPP L2 3n-hsw-x710 features-iacl
+- type: "plot"
+  title: "Speedup: l2sw-3n-hsw-x710-64b-features-iacl-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-features-iacl-ndr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-X710' and
+           'NDRPDR' and
+           '64B' and
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'IACL' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
+           not 'MACIP' and
+           not 'VHOST' and
+           not 'MEMIF'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  layout:
+    title: "l2sw-3n-hsw-x710-64b-features-iacl-ndr"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: l2sw-3n-hsw-x710-64b-features-iacl-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-features-iacl-pdr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-X710' and
+           'NDRPDR' and
+           '64B' and
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'IACL' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
+           not 'MACIP' and
+           not 'VHOST' and
+           not 'MEMIF'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  layout:
+    title: "l2sw-3n-hsw-x710-64b-features-iacl-pdr"
+    layout: "plot-throughput-speedup-analysis"
+
 # Speedup - VPP L2 3n-hsw-xl710 base and scale
 # Speedup - VPP L2 3n-hsw-xl710 base and scale
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: l2sw-3n-hsw-xl710-64b-base-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-xl710-64b-base-ndr-tsa"
   title: "Speedup: l2sw-3n-hsw-xl710-64b-base-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-xl710-64b-base-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'BASE' and
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'BASE' and
@@ -24835,13 +26425,12 @@
     title: "l2sw-3n-hsw-xl710-64b-base-ndr"
     layout: "plot-throughput-speedup-analysis"
 
     title: "l2sw-3n-hsw-xl710-64b-base-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: l2sw-3n-hsw-xl710-64b-base-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-xl710-64b-base-pdr-tsa"
   title: "Speedup: l2sw-3n-hsw-xl710-64b-base-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-xl710-64b-base-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'BASE' and
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'BASE' and
@@ -24863,13 +26452,12 @@
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP L2 3n-skx-x710 base and scale
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP L2 3n-skx-x710 base and scale
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: l2sw-3n-skx-x710-64b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-base_and_scale-ndr-tsa"
   title: "Speedup: l2sw-3n-skx-x710-64b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -24894,13 +26482,12 @@
     title: "l2sw-3n-skx-x710-64b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
     title: "l2sw-3n-skx-x710-64b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: l2sw-3n-skx-x710-64b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-base_and_scale-pdr-tsa"
   title: "Speedup: l2sw-3n-skx-x710-64b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -24926,13 +26513,12 @@
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP L2 3n-skx-x710 features
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP L2 3n-skx-x710 features
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: l2sw-3n-skx-x710-64b-features-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-features-ndr-tsa"
   title: "Speedup: l2sw-3n-skx-x710-64b-features-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-features-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -24955,13 +26541,12 @@
     title: "l2sw-3n-skx-x710-64b-features-ndr"
     layout: "plot-throughput-speedup-analysis"
 
     title: "l2sw-3n-skx-x710-64b-features-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: l2sw-3n-skx-x710-64b-features-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-features-pdr-tsa"
   title: "Speedup: l2sw-3n-skx-x710-64b-features-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-features-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -24984,71 +26569,121 @@
     title: "l2sw-3n-skx-x710-64b-features-pdr"
     layout: "plot-throughput-speedup-analysis"
 
     title: "l2sw-3n-skx-x710-64b-features-pdr"
     layout: "plot-throughput-speedup-analysis"
 
+# Speedup - VPP L2 3n-skx-x710 features-iacl
+- type: "plot"
+  title: "Speedup: l2sw-3n-skx-x710-64b-features-iacl-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-features-iacl-ndr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           'NDRPDR' and
+           '64B' and
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'IACL' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
+           not 'MACIP' and
+           not 'VHOST' and
+           not 'MEMIF'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  layout:
+    title: "l2sw-3n-skx-x710-64b-features-iacl-ndr"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: l2sw-3n-skx-x710-64b-features-iacl-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-features-iacl-pdr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           'NDRPDR' and
+           '64B' and
+           'FEATURE' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'IACL' and
+           ('ACL1' or 'ACL50') and
+           ('10K_FLOWS' or '10k_FLOWS') and
+           not 'MACIP' and
+           not 'VHOST' and
+           not 'MEMIF'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  layout:
+    title: "l2sw-3n-skx-x710-64b-features-iacl-pdr"
+    layout: "plot-throughput-speedup-analysis"
+
 # Speedup - VPP L2 3n-skx-xxv710 base and scale
 # Speedup - VPP L2 3n-skx-xxv710 base and scale
--
-  type: "plot"
-  title: "Speedup: l2sw-3n-skx-xxv710-64b-base-ndr-tsa"
+- type: "plot"
+  title: "Speedup: l2sw-3n-skx-xxv710-64b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-base-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-base_and_scale-ndr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            'ETH' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            'ETH' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'DRV_AVF' and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "L2BDMACLRN"
+#  sort:
+#  - "L2PATCH"
+#  - "L2PATCH"
+#  - "L2XCBASE"
+#  - "L2BDMACLRN"
   layout:
   layout:
-    title: "l2sw-3n-skx-xxv710-64b-base-ndr"
+    title: "l2sw-3n-skx-xxv710-64b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
-  title: "Speedup: l2sw-3n-skx-xxv710-64b-base-pdr-tsa"
+- type: "plot"
+  title: "Speedup: l2sw-3n-skx-xxv710-64b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-base-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-base_and_scale-pdr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            'ETH' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            'ETH' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'DRV_AVF' and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "L2BDMACLRN"
+#  sort:
+#  - "L2PATCH"
+#  - "L2PATCH"
+#  - "L2XCBASE"
+#  - "L2BDMACLRN"
   layout:
   layout:
-    title: "l2sw-3n-skx-xxv710-64b-base-pdr"
+    title: "l2sw-3n-skx-xxv710-64b-base_and_scale-pdr"
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP L2 2n-skx-x710 base and scale
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP L2 2n-skx-x710 base and scale
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: l2sw-2n-skx-x710-64b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-x710-64b-base_and_scale-ndr-tsa"
   title: "Speedup: l2sw-2n-skx-x710-64b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-x710-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -25072,13 +26707,12 @@
     title: "l2sw-2n-skx-x710-64b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
     title: "l2sw-2n-skx-x710-64b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: l2sw-2n-skx-x710-64b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-x710-64b-base_and_scale-pdr-tsa"
   title: "Speedup: l2sw-2n-skx-x710-64b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-x710-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -25103,13 +26737,12 @@
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP L2 2n-skx-xxv710 base and scale
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP L2 2n-skx-xxv710 base and scale
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: l2sw-2n-skx-xxv710-64b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-xxv710-64b-base_and_scale-ndr-tsa"
   title: "Speedup: l2sw-2n-skx-xxv710-64b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-xxv710-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('BASE' or 'SCALE') and
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -25133,13 +26766,12 @@
     title: "l2sw-2n-skx-xxv710-64b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
     title: "l2sw-2n-skx-xxv710-64b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: l2sw-2n-skx-xxv710-64b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-xxv710-64b-base_and_scale-pdr-tsa"
   title: "Speedup: l2sw-2n-skx-xxv710-64b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-xxv710-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('BASE' or 'SCALE') and
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -25163,71 +26795,68 @@
     title: "l2sw-2n-skx-xxv710-64b-base_and_scale-pdr"
     layout: "plot-throughput-speedup-analysis"
 
     title: "l2sw-2n-skx-xxv710-64b-base_and_scale-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP L2 2n-dnv-x553 base
--
-  type: "plot"
-  title: "Speedup: l2sw-2n-dnv-x553-64b-base-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-dnv-x553-64b-base-ndr-tsa"
-  data: "intel-dnv-vpp"
-  filter: "'NIC_Intel-X553' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'ETH' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCBASE"
-  - "L2BDMACLRN"
-  - "L2PATCH"
-  layout:
-    title: "l2sw-2n-dnv-x553-64b-base-ndr"
-    layout: "plot-throughput-speedup-analysis"
-
--
-  type: "plot"
-  title: "Speedup: l2sw-2n-dnv-x553-64b-base-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-dnv-x553-64b-base-pdr-tsa"
-  data: "intel-dnv-vpp"
-  filter: "'NIC_Intel-X553' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'ETH' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCBASE"
-  - "L2BDMACLRN"
-  - "L2PATCH"
-  layout:
-    title: "l2sw-2n-dnv-x553-64b-base-pdr"
-    layout: "plot-throughput-speedup-analysis"
+## Speedup - VPP L2 2n-dnv-x553 base
+#- type: "plot"
+#  title: "Speedup: l2sw-2n-dnv-x553-64b-base-ndr-tsa"
+#  algorithm: "plot_throughput_speedup_analysis"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-dnv-x553-64b-base-ndr-tsa"
+#  data: "intel-dnv-vpp"
+#  filter: "'NIC_Intel-X553' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
+#           'NDRPDR' and
+#           'ETH' and
+#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+#           not 'VHOST' and
+#           not 'MEMIF'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "L2XCBASE"
+#  - "L2BDMACLRN"
+#  - "L2PATCH"
+#  layout:
+#    title: "l2sw-2n-dnv-x553-64b-base-ndr"
+#    layout: "plot-throughput-speedup-analysis"
+#
+#- type: "plot"
+#  title: "Speedup: l2sw-2n-dnv-x553-64b-base-pdr-tsa"
+#  algorithm: "plot_throughput_speedup_analysis"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-dnv-x553-64b-base-pdr-tsa"
+#  data: "intel-dnv-vpp"
+#  filter: "'NIC_Intel-X553' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
+#           'NDRPDR' and
+#           'ETH' and
+#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+#           not 'VHOST' and
+#           not 'MEMIF'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "L2XCBASE"
+#  - "L2BDMACLRN"
+#  - "L2PATCH"
+#  layout:
+#    title: "l2sw-2n-dnv-x553-64b-base-pdr"
+#    layout: "plot-throughput-speedup-analysis"
 
 ################################################################################
 
 # Packet Speedup - VPP vhost ip4 3n-hsw-x520
 
 ################################################################################
 
 # Packet Speedup - VPP vhost ip4 3n-hsw-x520
--
-  type: "plot"
+- type: "plot"
   title: "VPP Speedup: vhost-ip4-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
   title: "VPP Speedup: vhost-ip4-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
@@ -25248,13 +26877,12 @@
     title: "vhost-ip4-3n-hsw-x520-64b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
     title: "vhost-ip4-3n-hsw-x520-64b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Speedup: vhost-ip4-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
   title: "VPP Speedup: vhost-ip4-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
@@ -25276,13 +26904,12 @@
     layout: "plot-throughput-speedup-analysis"
 
 # Packet Speedup - VPP vhost l2sw 3n-hsw-x520 - base
     layout: "plot-throughput-speedup-analysis"
 
 # Packet Speedup - VPP vhost l2sw 3n-hsw-x520 - base
--
-  type: "plot"
+- type: "plot"
   title: "VPP Speedup: vhost-l2sw-3n-hsw-x520-64b-base_and_features-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-base_and_features-ndr-tsa"
   title: "VPP Speedup: vhost-l2sw-3n-hsw-x520-64b-base_and_features-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-base_and_features-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
@@ -25308,13 +26935,12 @@
     title: "vhost-l2sw-3n-hsw-x520-64b-base_and_features-ndr"
     layout: "plot-throughput-speedup-analysis"
 
     title: "vhost-l2sw-3n-hsw-x520-64b-base_and_features-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Speedup: vhost-l2sw-3n-hsw-x520-64b-base_and_features-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-base_and_features-pdr-tsa"
   title: "VPP Speedup: vhost-l2sw-3n-hsw-x520-64b-base_and_features-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-base_and_features-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
@@ -25341,13 +26967,12 @@
     layout: "plot-throughput-speedup-analysis"
 
 # Packet Speedup - VPP vhost l2sw 3n-hsw-x520 - base vm
     layout: "plot-throughput-speedup-analysis"
 
 # Packet Speedup - VPP vhost l2sw 3n-hsw-x520 - base vm
--
-  type: "plot"
+- type: "plot"
   title: "VPP Speedup: vhost-l2sw-3n-hsw-x520-64b-base-vm-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-base-vm-ndr-tsa"
   title: "VPP Speedup: vhost-l2sw-3n-hsw-x520-64b-base-vm-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-base-vm-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
@@ -25372,13 +26997,12 @@
     title: "vhost-l2sw-3n-hsw-x520-64b-base-vm-ndr"
     layout: "plot-throughput-speedup-analysis"
 
     title: "vhost-l2sw-3n-hsw-x520-64b-base-vm-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Speedup: vhost-l2sw-3n-hsw-x520-64b-base-vm-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-base-vm-pdr-tsa"
   title: "VPP Speedup: vhost-l2sw-3n-hsw-x520-64b-base-vm-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-base-vm-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
@@ -25404,13 +27028,12 @@
     layout: "plot-throughput-speedup-analysis"
 
 # Packet Speedup - VPP vhost ip4 3n-hsw-x710
     layout: "plot-throughput-speedup-analysis"
 
 # Packet Speedup - VPP vhost ip4 3n-hsw-x710
--
-  type: "plot"
+- type: "plot"
   title: "VPP Speedup: vhost-ip4-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
   title: "VPP Speedup: vhost-ip4-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -25431,13 +27054,12 @@
     title: "vhost-ip4-3n-hsw-x710-64b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
     title: "vhost-ip4-3n-hsw-x710-64b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Speedup: vhost-ip4-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
   title: "VPP Speedup: vhost-ip4-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -25459,13 +27081,12 @@
     layout: "plot-throughput-speedup-analysis"
 
 # Packet Speedup - VPP vhost l2sw 3n-hsw-x710 - base
     layout: "plot-throughput-speedup-analysis"
 
 # Packet Speedup - VPP vhost l2sw 3n-hsw-x710 - base
--
-  type: "plot"
+- type: "plot"
   title: "VPP Speedup: vhost-l2sw-3n-hsw-x710-64b-base_and_features-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-base_and_features-ndr-tsa"
   title: "VPP Speedup: vhost-l2sw-3n-hsw-x710-64b-base_and_features-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-base_and_features-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -25491,13 +27112,12 @@
     title: "vhost-l2sw-3n-hsw-x710-64b-base_and_features-ndr"
     layout: "plot-throughput-speedup-analysis"
 
     title: "vhost-l2sw-3n-hsw-x710-64b-base_and_features-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Speedup: vhost-l2sw-3n-hsw-x710-64b-base_and_features-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-base_and_features-pdr-tsa"
   title: "VPP Speedup: vhost-l2sw-3n-hsw-x710-64b-base_and_features-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-base_and_features-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -25524,13 +27144,12 @@
     layout: "plot-throughput-speedup-analysis"
 
 # Packet Speedup - VPP vhost l2sw 3n-hsw-x710 - base vm
     layout: "plot-throughput-speedup-analysis"
 
 # Packet Speedup - VPP vhost l2sw 3n-hsw-x710 - base vm
--
-  type: "plot"
+- type: "plot"
   title: "VPP Speedup: vhost-l2sw-3n-hsw-x710-64b-base_and_features-vm-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-base_and_features-vm-ndr-tsa"
   title: "VPP Speedup: vhost-l2sw-3n-hsw-x710-64b-base_and_features-vm-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-base_and_features-vm-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -25556,13 +27175,12 @@
     title: "vhost-l2sw-3n-hsw-x710-64b-base_and_features-vm-ndr"
     layout: "plot-throughput-speedup-analysis"
 
     title: "vhost-l2sw-3n-hsw-x710-64b-base_and_features-vm-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Speedup: vhost-l2sw-3n-hsw-x710-64b-base_and_features-vm-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-base_and_features-vm-pdr-tsa"
   title: "VPP Speedup: vhost-l2sw-3n-hsw-x710-64b-base_and_features-vm-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-base_and_features-vm-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -25589,13 +27207,12 @@
     layout: "plot-throughput-speedup-analysis"
 
 # Packet Speedup - VPP vhost ip4 3n-skx-x710
     layout: "plot-throughput-speedup-analysis"
 
 # Packet Speedup - VPP vhost ip4 3n-skx-x710
--
-  type: "plot"
+- type: "plot"
   title: "VPP Speedup: vhost-ip4-3n-skx-x710-64b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-skx-x710-64b-base_and_scale-ndr-tsa"
   title: "VPP Speedup: vhost-ip4-3n-skx-x710-64b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-skx-x710-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -25615,13 +27232,12 @@
     title: "vhost-ip4-3n-skx-x710-64b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
     title: "vhost-ip4-3n-skx-x710-64b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Speedup: vhost-ip4-3n-skx-x710-64b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-skx-x710-64b-base_and_scale-pdr-tsa"
   title: "VPP Speedup: vhost-ip4-3n-skx-x710-64b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-skx-x710-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -25642,13 +27258,12 @@
     layout: "plot-throughput-speedup-analysis"
 
 # Packet Speedup - VPP vhost ip4 2n-skx-x710
     layout: "plot-throughput-speedup-analysis"
 
 # Packet Speedup - VPP vhost ip4 2n-skx-x710
--
-  type: "plot"
+- type: "plot"
   title: "VPP Speedup: vhost-ip4-2n-skx-x710-64b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-x710-64b-base_and_scale-ndr-tsa"
   title: "VPP Speedup: vhost-ip4-2n-skx-x710-64b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-x710-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -25670,13 +27285,12 @@
     title: "vhost-ip4-2n-skx-x710-64b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
     title: "vhost-ip4-2n-skx-x710-64b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Speedup: vhost-ip4-2n-skx-x710-64b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-x710-64b-base_and_scale-pdr-tsa"
   title: "VPP Speedup: vhost-ip4-2n-skx-x710-64b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-x710-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -25699,13 +27313,12 @@
     layout: "plot-throughput-speedup-analysis"
 
 # Packet Speedup - VPP vhost l2sw 2n-skx-x710 - base
     layout: "plot-throughput-speedup-analysis"
 
 # Packet Speedup - VPP vhost l2sw 2n-skx-x710 - base
--
-  type: "plot"
+- type: "plot"
   title: "VPP Speedup: vhost-l2sw-2n-skx-x710-64b-base_and_features-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-base_and_features-ndr-tsa"
   title: "VPP Speedup: vhost-l2sw-2n-skx-x710-64b-base_and_features-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-base_and_features-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -25730,13 +27343,12 @@
     title: "vhost-l2sw-2n-skx-x710-64b-base_and_features-ndr"
     layout: "plot-throughput-speedup-analysis"
 
     title: "vhost-l2sw-2n-skx-x710-64b-base_and_features-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Speedup: vhost-l2sw-2n-skx-x710-64b-base_and_features-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-base_and_features-pdr-tsa"
   title: "VPP Speedup: vhost-l2sw-2n-skx-x710-64b-base_and_features-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-base_and_features-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -25762,13 +27374,12 @@
     layout: "plot-throughput-speedup-analysis"
 
 # Packet Speedup - VPP vhost l2sw 2n-skx-x710 - base vm
     layout: "plot-throughput-speedup-analysis"
 
 # Packet Speedup - VPP vhost l2sw 2n-skx-x710 - base vm
--
-  type: "plot"
+- type: "plot"
   title: "VPP Speedup: vhost-l2sw-2n-skx-x710-64b-base-vm-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-base-vm-ndr-tsa"
   title: "VPP Speedup: vhost-l2sw-2n-skx-x710-64b-base-vm-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-base-vm-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -25793,13 +27404,12 @@
     title: "vhost-l2sw-2n-skx-x710-64b-base-vm-ndr"
     layout: "plot-throughput-speedup-analysis"
 
     title: "vhost-l2sw-2n-skx-x710-64b-base-vm-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Speedup: vhost-l2sw-2n-skx-x710-64b-base-vm-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-base-vm-pdr-tsa"
   title: "VPP Speedup: vhost-l2sw-2n-skx-x710-64b-base-vm-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-base-vm-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -25825,13 +27435,12 @@
     layout: "plot-throughput-speedup-analysis"
 
 # Packet Speedup - VPP vhost ip4 2n-skx-xxv710
     layout: "plot-throughput-speedup-analysis"
 
 # Packet Speedup - VPP vhost ip4 2n-skx-xxv710
--
-  type: "plot"
+- type: "plot"
   title: "VPP Speedup: vhost-ip4-2n-skx-xxv710-64b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-xxv710-64b-base_and_scale-ndr-tsa"
   title: "VPP Speedup: vhost-ip4-2n-skx-xxv710-64b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-xxv710-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'NDRPDR' and
@@ -25853,13 +27462,12 @@
     title: "vhost-ip4-2n-skx-xxv710-64b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
     title: "vhost-ip4-2n-skx-xxv710-64b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Speedup: vhost-ip4-2n-skx-xxv710-64b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-xxv710-64b-base_and_scale-pdr-tsa"
   title: "VPP Speedup: vhost-ip4-2n-skx-xxv710-64b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-xxv710-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'NDRPDR' and
@@ -25881,138 +27489,133 @@
     title: "vhost-ip4-2n-skx-xxv710-64b-base_and_scale-pdr"
     layout: "plot-throughput-speedup-analysis"
 
     title: "vhost-ip4-2n-skx-xxv710-64b-base_and_scale-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-# Packet Speedup - VPP vhost l2sw 2n-skx-xxv710 - base
--
-  type: "plot"
-  title: "VPP Speedup: vhost-l2sw-2n-skx-xxv710-64b-base_and_features-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-base_and_features-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           'BASE' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
-  layout:
-    title: "vhost-l2sw-2n-skx-xxv710-64b-base_and_features-ndr"
-    layout: "plot-throughput-speedup-analysis"
-
--
-  type: "plot"
-  title: "VPP Speedup: vhost-l2sw-2n-skx-xxv710-64b-base_and_features-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-base_and_features-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           'BASE' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
-  layout:
-    title: "vhost-l2sw-2n-skx-xxv710-64b-base_and_features-pdr"
-    layout: "plot-throughput-speedup-analysis"
-
-# Packet Speedup - VPP vhost l2sw 2n-skx-xxv710 - base vm
--
-  type: "plot"
-  title: "VPP Speedup: vhost-l2sw-2n-skx-xxv710-64b-base-vm-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-base-vm-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'CFS_OPT' and
-           not 'VXLAN' and
-           not 'DOT1Q' and
-           not 'IP4FWD'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
-  layout:
-    title: "vhost-l2sw-2n-skx-xxv710-64b-base-vm-ndr"
-    layout: "plot-throughput-speedup-analysis"
-
--
-  type: "plot"
-  title: "VPP Speedup: vhost-l2sw-2n-skx-xxv710-64b-base-vm-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-base-vm-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'CFS_OPT' and
-           not 'VXLAN' and
-           not 'DOT1Q' and
-           not 'IP4FWD'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
-  layout:
-    title: "vhost-l2sw-2n-skx-xxv710-64b-base-vm-pdr"
-    layout: "plot-throughput-speedup-analysis"
+## Packet Speedup - VPP vhost l2sw 2n-skx-xxv710 - base
+#- type: "plot"
+#  title: "VPP Speedup: vhost-l2sw-2n-skx-xxv710-64b-base_and_features-ndr-tsa"
+#  algorithm: "plot_throughput_speedup_analysis"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-base_and_features-ndr-tsa"
+#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+#  filter: "'NIC_Intel-XXV710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           'BASE' and
+#           ('L2BDMACLRN' or 'L2XCFWD') and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "not CFS_OPT"
+##  - "L2XCFWD"
+##  - "not CFS_OPT"
+##  - "CFS_OPT"
+#  layout:
+#    title: "vhost-l2sw-2n-skx-xxv710-64b-base_and_features-ndr"
+#    layout: "plot-throughput-speedup-analysis"
+#
+#- type: "plot"
+#  title: "VPP Speedup: vhost-l2sw-2n-skx-xxv710-64b-base_and_features-pdr-tsa"
+#  algorithm: "plot_throughput_speedup_analysis"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-base_and_features-pdr-tsa"
+#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+#  filter: "'NIC_Intel-XXV710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           'BASE' and
+#           ('L2BDMACLRN' or 'L2XCFWD') and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "not CFS_OPT"
+##  - "L2XCFWD"
+##  - "not CFS_OPT"
+##  - "CFS_OPT"
+#  layout:
+#    title: "vhost-l2sw-2n-skx-xxv710-64b-base_and_features-pdr"
+#    layout: "plot-throughput-speedup-analysis"
+#
+## Packet Speedup - VPP vhost l2sw 2n-skx-xxv710 - base vm
+#- type: "plot"
+#  title: "VPP Speedup: vhost-l2sw-2n-skx-xxv710-64b-base-vm-ndr-tsa"
+#  algorithm: "plot_throughput_speedup_analysis"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-base-vm-ndr-tsa"
+#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+#  filter: "'NIC_Intel-XXV710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           ('L2BDMACLRN' or 'L2XCFWD') and
+#           'VHOST_1024' and
+#           not 'CFS_OPT' and
+#           not 'VXLAN' and
+#           not 'DOT1Q' and
+#           not 'IP4FWD'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "1VM"
+##  - "L2XCFWD"
+##  - "1VM"
+##  - "L2BDMACLRN"
+#  layout:
+#    title: "vhost-l2sw-2n-skx-xxv710-64b-base-vm-ndr"
+#    layout: "plot-throughput-speedup-analysis"
+#
+#- type: "plot"
+#  title: "VPP Speedup: vhost-l2sw-2n-skx-xxv710-64b-base-vm-pdr-tsa"
+#  algorithm: "plot_throughput_speedup_analysis"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-base-vm-pdr-tsa"
+#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+#  filter: "'NIC_Intel-XXV710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           ('L2BDMACLRN' or 'L2XCFWD') and
+#           'VHOST_1024' and
+#           not 'CFS_OPT' and
+#           not 'VXLAN' and
+#           not 'DOT1Q' and
+#           not 'IP4FWD'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "1VM"
+##  - "L2XCFWD"
+##  - "1VM"
+##  - "L2BDMACLRN"
+#  layout:
+#    title: "vhost-l2sw-2n-skx-xxv710-64b-base-vm-pdr"
+#    layout: "plot-throughput-speedup-analysis"
 
 ################################################################################
 
 # Speedup - VPP vts 3n-hsw-x520
 
 ################################################################################
 
 # Speedup - VPP vts 3n-hsw-x520
--
-  type: "plot"
+- type: "plot"
   title: "VPP Speedup: vts-3n-hsw-x520-114b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-114b-base_and_scale-ndr-tsa"
   title: "VPP Speedup: vts-3n-hsw-x520-114b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-114b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '114B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X520-DA2' and
            '114B' and
            'NDRPDR' and
@@ -26025,13 +27628,12 @@
     title: "vts-3n-hsw-x520-114b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
     title: "vts-3n-hsw-x520-114b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Speedup: vts-3n-hsw-x520-114b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-114b-base_and_scale-pdr-tsa"
   title: "VPP Speedup: vts-3n-hsw-x520-114b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-114b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '114B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X520-DA2' and
            '114B' and
            'NDRPDR' and
Integration tests