Code Review / csit.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Report: Static content
[csit.git] / resources / tools / presentation / specification.yaml
diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml
index 661f666..3e02af0 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:
@@ -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"
-    URL[VIRL,DNV]: "http://10.30.51.28/download/denverton/1810/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"
@@ -103,8 +102,7 @@
   - "DIR[BUILD,HTML]"
   - "DIR[BUILD,LATEX]"
 
--
-  type: "configuration"
+- type: "configuration"
 
   limits:
     nic:
@@ -131,30 +129,9 @@
 
     # 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
-
-    plot-throughput-speedup-analysis-3n-hsw:
+    plot-vpp-throughput-lat-tsa-3n-hsw:
+      # TODO: Replace with 1904 data
+      # csit-vpp-perf-verify-1904-3n-hsw:
       csit-vpp-perf-verify-1901-3n-hsw:
         - 10  # NDRPDR sel
         - 19  # NDRPDR sel
@@ -178,8 +155,8 @@
         - 71  # NDRPDR LB
 
     plot-vpp-http-server-performance:
-      # TODO: Replace with new data
-      # csit-vpp-perf-verify-1901-3n-hsw:
+      # TODO: Replace with 1904 data
+      # csit-vpp-perf-verify-1904-3n-hsw:
       csit-vpp-perf-verify-1810-3n-hsw:
         - 28  # WRK
         - 29  # WRK
@@ -192,20 +169,9 @@
         - 36  # WRK
         - 37  # WRK
 
-    plot-ligato-throughput-latency-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-ligato-throughput-speedup-analysis-3n-hsw:
+    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
@@ -219,6 +185,8 @@
         - 18  # NDRPDR sel
 
     plot-dpdk-throughput-latency-3n-hsw:
+      # TODO: Replace with 1904 data
+      # csit-dpdk-perf-verify-1904-3n-hsw:
       csit-dpdk-perf-verify-1901-3n-hsw:
         - 13  # NDRPDR sel
         - 14  # NDRPDR sel
@@ -233,25 +201,9 @@
 
     # 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
-
-    plot-throughput-speedup-analysis-3n-skx:
+    plot-vpp-throughput-lat-tsa-3n-skx:
+      # TODO: Replace with 1904 data
+      # csit-vpp-perf-verify-1904-3n-skx:
       csit-vpp-perf-verify-1901-3n-skx:
         - 18  # NDRPDR sel
         - 19  # NDRPDR sel
@@ -268,8 +220,15 @@
         - 58  # NDRPDR LB
         - 59  # NDRPDR LB
         - 60  # NDRPDR LB
+        - 63  # NDRPDR LB
+        - 64  # NDRPDR LB
+        - 65  # NDRPDR LB
+        - 66  # NDRPDR LB
+        - 67  # NDRPDR LB
 
     plot-dpdk-throughput-latency-3n-skx:
+      # TODO: Replace with 1904 data
+      # csit-dpdk-perf-verify-1904-3n-skx:
       csit-dpdk-perf-verify-1901-3n-skx:
         - 3   # NDRPDR sel
         - 5   # NDRPDR sel
@@ -284,20 +243,9 @@
 
     # 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
-
-    plot-throughput-speedup-analysis-2n-skx:
+    plot-vpp-throughput-lat-tsa-2n-skx:
+      # TODO: Replace with 1904 data
+      # csit-vpp-perf-verify-1904-2n-skx:
       csit-vpp-perf-verify-1901-2n-skx:
         - 5   # NDRPDR sel
         - 12  # NDRPDR sel
@@ -311,11 +259,14 @@
         - 43  # NDRPDR sel
 
     plot-vpp-soak-2n-skx:
+      # TODO: Replace with 1904 data
+      # csit-vpp-perf-verify-1904-2n-skx:
       csit-vpp-perf-verify-1901-2n-skx:
         - 45  # SOAK sel
 
     plot-vpp-nfv-2n-skx:
-      # TODO: Add new data
+      # TODO: Replace with 1904 data
+      # csit-vpp-perf-verify-1904-2n-skx:
       csit-vpp-perf-verify-1901-2n-skx:
         - 28  # NFV NDRPDR
         - 29  # NFV NDRPDR
@@ -324,7 +275,8 @@
         - 46  # NFV NDRPDR
 
     plot-vpp-nfv-2n-skx-mrr:
-      # TODO: Add new data
+      # TODO: Replace with 1904 data
+      # csit-vpp-perf-verify-1904-2n-skx:
       csit-vpp-perf-verify-1901-2n-skx:
         - 24  # NFV MRR
         - 26  # NFV MRR
@@ -333,6 +285,8 @@
         - 37  # NFV MRR
 
     plot-dpdk-throughput-latency-2n-skx:
+      # TODO: Replace with 1904 data
+      # csit-dpdk-perf-verify-1904-2n-skx:
       csit-dpdk-perf-verify-1901-2n-skx:
         - 12  # NDRPDR sel
         - 13  # NDRPDR sel
@@ -349,8 +303,9 @@
 
     # Denverton:
     intel-dnv-vpp:
-      # Not used
-      intel-dnv-vpp-release-1810:
+      # TODO: Replace with 1904 data
+      # intel-dnv-vpp-release-1904:
+      intel-dnv-vpp-release-1901:
         - 1
 
     ###########################################################################
@@ -359,6 +314,8 @@
     # NIC Comparisons
 
     vpp-nic-comparison-3n-hsw:
+      # TODO: Replace with 1904 data
+      # csit-vpp-perf-verify-1904-3n-hsw:
       csit-vpp-perf-verify-1901-3n-hsw:
         - 10  # NDRPDR sel
         - 19  # NDRPDR sel
@@ -382,6 +339,8 @@
         - 71  # NDRPDR LB
 
     vpp-nic-comparison-3n-skx:
+      # TODO: Replace with 1904 data
+      # csit-vpp-perf-verify-1904-3n-skx:
       csit-vpp-perf-verify-1901-3n-skx:
         - 18  # NDRPDR sel
         - 19  # NDRPDR sel
@@ -398,8 +357,15 @@
         - 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-nic-comparison-2n-skx:
+      # TODO: Replace with 1904 data
+      # csit-vpp-perf-verify-1904-2n-skx:
       csit-vpp-perf-verify-1901-2n-skx:
         - 5   # NDRPDR sel
         - 12  # NDRPDR sel
@@ -413,20 +379,28 @@
         - 43  # NDRPDR sel
 
     vpp-nic-comparison-3n-hsw-mrr:
+      # TODO: Replace with 1904 data
+      # csit-vpp-perf-verify-1904-3n-hsw:
       csit-vpp-perf-verify-1901-3n-hsw:
         - 35  # MRR sel
 
     vpp-nic-comparison-3n-skx-mrr:
+      # TODO: Replace with 1904 data
+      # csit-vpp-perf-verify-1904-3n-skx:
       csit-vpp-perf-verify-1901-3n-skx:
         - 32  # MRR sel
 
     vpp-nic-comparison-2n-skx-mrr:
+      # TODO: Replace with 1904 data
+      # csit-vpp-perf-verify-1904-2n-skx:
       csit-vpp-perf-verify-1901-2n-skx:
         - 22  # MRR sel
 
     # Results
 
     vpp-perf-results-3n-hsw:
+      # TODO: Replace with 1904 data
+      # csit-vpp-perf-verify-1904-3n-hsw:
       csit-vpp-perf-verify-1901-3n-hsw:
         - 38  # NDRPDR full
         - 43  # NDRPDR full
@@ -434,6 +408,8 @@
         - 49  # NDRPDR full
 
     vpp-perf-results-3n-skx:
+      # TODO: Replace with 1904 data
+      # csit-vpp-perf-verify-1904-3n-skx:
       csit-vpp-perf-verify-1901-3n-skx:
         - 37  # NDRPDR full
         - 39  # NDRPDR full
@@ -441,6 +417,8 @@
         - 49  # NDRPDR full
 
     vpp-perf-results-2n-skx:
+      # TODO: Replace with 1904 data
+      # csit-vpp-perf-verify-1904-2n-skx:
       csit-vpp-perf-verify-1901-2n-skx:
         - 25  # NDRPDR full
         - 30  # NDRPDR full
@@ -448,59 +426,83 @@
         - 44  # NDRPDR full
 
     vpp-mrr-results-3n-hsw:
+      # TODO: Replace with 1904 data
+      # csit-vpp-perf-verify-1904-3n-hsw:
       csit-vpp-perf-verify-1901-3n-hsw:
         - 35  # MRR sel
 
     vpp-mrr-results-3n-skx:
+      # TODO: Replace with 1904 data
+      # csit-vpp-perf-verify-1904-3n-skx:
       csit-vpp-perf-verify-1901-3n-skx:
         - 32  # MRR sel
 
     vpp-mrr-results-2n-skx:
+      # TODO: Replace with 1904 data
+      # csit-vpp-perf-verify-1904-2n-skx:
       csit-vpp-perf-verify-1901-2n-skx:
         - 22  # MRR sel
 
     vpp-func-results-ubuntu:
+      # TODO: Replace with 1904 data
+      # csit-vpp-functional-1904-ubuntu1604-virl:
       csit-vpp-functional-1901-ubuntu1604-virl:
-        - 48
+        - 173
 
     vpp-func-results-centos:
+      # TODO: Replace with 1904 data
+      # csit-vpp-functional-1904-centos7-virl:
       csit-vpp-functional-1901-centos7-virl:
-        - 50
+        - 175
 
     vpp-device-results-ubuntu:
+      # TODO: Replace with 1904 data
+      # csit-vpp-device-1904-ubuntu1804-1n-skx:
       csit-vpp-device-1901-ubuntu1804-1n-skx:
-        - 49
+        - 175
 
     # 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:
+      # TODO: Replace with 1904 data
+      # csit-dpdk-perf-verify-1904-3n-hsw:
       csit-dpdk-perf-verify-1901-3n-hsw:
         - 20  # NDRPDR sel
 
     dpdk-perf-results-3n-skx:
+      # TODO: Replace with 1904 data
+      # csit-dpdk-perf-verify-1904-3n-skx:
       csit-dpdk-perf-verify-1901-3n-skx:
         - 13  # NDRPDR sel
 
     dpdk-perf-results-2n-skx:
+      # TODO: Replace with 1904 data
+      # csit-dpdk-perf-verify-1904-2n-skx:
       csit-dpdk-perf-verify-1901-2n-skx:
         - 21  # NDRPDR sel
 
     # HoneyComb Functional
     hc-func-results:
+      # TODO: Replace with 1904 data
+      # csit-hc2vpp-verify-func-1904-ubuntu1604:
       csit-hc2vpp-verify-func-1901-ubuntu1604:
         - 3
 
-    # 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:
+      # TODO: Replace with 1904 data
+      # csit-dmm-functional-1904-ubuntu1604-virl:
       csit-dmm-functional-1901-ubuntu1604-virl:
         - 2
 
@@ -509,22 +511,23 @@
 
     # 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:
-      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
@@ -536,7 +539,31 @@
         - 39  # NDRPDR sel
         - 41  # NDRPDR sel
         - 42  # NDRPDR sel
+    vpp-performance-changes-3n-hsw-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
     vpp-performance-changes-3n-hsw-cmp:
+      # TODO: Replace with 1904 data
+      # csit-vpp-perf-verify-1904-3n-hsw
       csit-vpp-perf-verify-1901-3n-hsw:
         - 10  # NDRPDR sel
         - 19  # NDRPDR sel
@@ -564,18 +591,6 @@
       - "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
@@ -587,7 +602,31 @@
         - 21  # NDRPDR sel
         - 22  # NDRPDR sel
         - 25  # NDRPDR sel
+    vpp-performance-changes-3n-skx-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
     vpp-performance-changes-3n-skx-cmp:
+      # TODO: Replace with 1904 data
+      # csit-vpp-perf-verify-1904-3n-skx:
       csit-vpp-perf-verify-1901-3n-skx:
         - 18  # NDRPDR sel
         - 19  # NDRPDR sel
@@ -604,24 +643,17 @@
         - 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:
       - "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
@@ -633,7 +665,21 @@
         - 23  # NDRPDR sel
         - 24  # NDRPDR sel
         - 27  # NDRPDR sel
+    vpp-performance-changes-2n-skx-ref:
+      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
     vpp-performance-changes-2n-skx-cmp:
+      # TODO: Replace with 1904 data
+      # csit-vpp-perf-verify-1904-2n-skx:
       csit-vpp-perf-verify-1901-2n-skx:
         - 5   # NDRPDR sel
         - 12  # NDRPDR sel
@@ -651,20 +697,14 @@
       - "vpp-performance-changes-2n-skx-cmp"
 
     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
+    vpp-performance-changes-3n-hsw-mrr-ref:
+      csit-vpp-perf-verify-1901-3n-hsw:
+        - 35  # MRR sel
     vpp-performance-changes-3n-hsw-mrr-cmp:
+      # TODO: Replace with 1904 data
+      # csit-vpp-perf-verify-1904-3n-hsw:
       csit-vpp-perf-verify-1901-3n-hsw:
         - 35  # MRR sel
     vpp-performance-changes-3n-hsw-mrr:
@@ -673,24 +713,17 @@
       - "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
+    vpp-performance-changes-3n-skx-mrr-ref:
+      csit-vpp-perf-verify-1901-3n-skx:
+        - 32  # MRR sel
     vpp-performance-changes-3n-skx-mrr-cmp:
+      # TODO: Replace with 1904 data
+      # csit-vpp-perf-verify-1904-3n-skx:
       csit-vpp-perf-verify-1901-3n-skx:
         - 32  # MRR sel
     vpp-performance-changes-3n-skx-mrr:
@@ -699,24 +732,17 @@
       - "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
+    vpp-performance-changes-2n-skx-mrr-ref:
+      csit-vpp-perf-verify-1901-2n-skx:
+        - 22  # MRR sel
     vpp-performance-changes-2n-skx-mrr-cmp:
+      # TODO: Replace with 1904 data
+      # csit-vpp-perf-verify-1904-2n-skx:
       csit-vpp-perf-verify-1901-2n-skx:
         - 22  # MRR sel
     vpp-performance-changes-2n-skx-mrr:
@@ -725,18 +751,6 @@
       - "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
@@ -748,7 +762,21 @@
         - 8   # NDRPDR sel
         - 9   # NDRPDR sel
         - 10  # NDRPDR sel
+    dpdk-performance-changes-3n-hsw-ref:
+      csit-dpdk-perf-verify-1901-3n-hsw:
+        - 13  # NDRPDR sel
+        - 14  # NDRPDR sel
+        - 16  # NDRPDR sel
+        - 17  # NDRPDR sel
+        - 18  # NDRPDR sel
+        - 19  # NDRPDR sel
+        - 20  # NDRPDR sel
+        - 21  # NDRPDR sel
+        - 22  # NDRPDR sel
+        - 23  # NDRPDR sel
     dpdk-performance-changes-3n-hsw-cmp:
+      # TODO: Replace with 1904 data
+      # csit-dpdk-perf-verify-1904-3n-hsw:
       csit-dpdk-perf-verify-1901-3n-hsw:
         - 13  # NDRPDR sel
         - 14  # NDRPDR sel
@@ -766,10 +794,9 @@
       - "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
+        - 4   # NDRPDR sel
         - 6   # NDRPDR sel
         - 7   # NDRPDR sel
         - 8   # NDRPDR sel
@@ -777,10 +804,11 @@
         - 10  # NDRPDR sel
         - 11  # NDRPDR sel
         - 12  # NDRPDR sel
+        - 13  # NDRPDR sel
     dpdk-performance-changes-3n-skx-ref:
-      csit-dpdk-perf-verify-1810-3n-skx:
+      csit-dpdk-perf-verify-1901-3n-skx:
         - 3   # NDRPDR sel
-        - 4   # NDRPDR sel
+        - 5   # NDRPDR sel
         - 6   # NDRPDR sel
         - 7   # NDRPDR sel
         - 8   # NDRPDR sel
@@ -790,6 +818,8 @@
         - 12  # NDRPDR sel
         - 13  # NDRPDR sel
     dpdk-performance-changes-3n-skx-cmp:
+      # TODO: Replace with 1904 data
+      # csit-dpdk-perf-verify-1904-3n-skx:
       csit-dpdk-perf-verify-1901-3n-skx:
         - 3   # NDRPDR sel
         - 5   # NDRPDR sel
@@ -806,7 +836,7 @@
       - "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
@@ -818,7 +848,21 @@
         - 11  # NDRPDR sel
         - 12  # NDRPDR sel
         - 13  # NDRPDR sel
+    dpdk-performance-changes-2n-skx-ref:
+      csit-dpdk-perf-verify-1901-2n-skx:
+        - 12  # NDRPDR sel
+        - 13  # NDRPDR sel
+        - 14  # NDRPDR sel
+        - 15  # NDRPDR sel
+        - 16  # NDRPDR sel
+        - 17  # NDRPDR sel
+        - 18  # NDRPDR sel
+        - 19  # NDRPDR sel
+        - 20  # NDRPDR sel
+        - 21  # NDRPDR sel
     dpdk-performance-changes-2n-skx-cmp:
+      # TODO: Replace with 1904 data
+      # csit-dpdk-perf-verify-1904-2n-skx:
       csit-dpdk-perf-verify-1901-2n-skx:
         - 12  # NDRPDR sel
         - 13  # NDRPDR sel
@@ -831,12 +875,15 @@
         - 20  # NDRPDR sel
         - 21  # NDRPDR sel
     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:
+      # TODO: Replace with 1904 data
+      # csit-vpp-perf-verify-1904-3n-hsw:
       csit-vpp-perf-verify-1901-3n-hsw:
         - 10  # NDRPDR sel
         - 19  # NDRPDR sel
@@ -859,6 +906,8 @@
         - 70  # NDRPDR LB
         - 71  # NDRPDR LB
     vpp-compare-testbeds-cmp:
+      # TODO: Replace with 1904 data
+      # csit-vpp-perf-verify-1904-3n-skx:
       csit-vpp-perf-verify-1901-3n-skx:
         - 18  # NDRPDR sel
         - 19  # NDRPDR sel
@@ -875,14 +924,23 @@
         - 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-compare-testbeds:
       - "vpp-compare-testbeds-ref"
       - "vpp-compare-testbeds-cmp"
 
     vpp-compare-testbeds-mrr-ref:
+      # TODO: Replace with 1904 data
+      # csit-vpp-perf-verify-1904-3n-hsw:
       csit-vpp-perf-verify-1901-3n-hsw:
         - 35  # MRR sel
     vpp-compare-testbeds-mrr-cmp:
+      # TODO: Replace with 1904 data
+      # csit-vpp-perf-verify-1904-3n-skx:
       csit-vpp-perf-verify-1901-3n-skx:
         - 32  # MRR sel
     vpp-compare-testbeds-mrr:
@@ -890,6 +948,8 @@
       - "vpp-compare-testbeds-mrr-cmp"
 
     dpdk-compare-testbeds-ref:
+      # TODO: Replace with 1904 data
+      # csit-dpdk-perf-verify-1904-3n-hsw:
       csit-dpdk-perf-verify-1901-3n-hsw:
         - 13  # NDRPDR sel
         - 14  # NDRPDR sel
@@ -902,6 +962,8 @@
         - 22  # NDRPDR sel
         - 23  # NDRPDR sel
     dpdk-compare-testbeds-cmp:
+      # TODO: Replace with 1904 data
+      # csit-dpdk-perf-verify-1904-3n-skx:
       csit-dpdk-perf-verify-1901-3n-skx:
         - 3   # NDRPDR sel
         - 5   # NDRPDR sel
@@ -920,6 +982,8 @@
     # Compare topologies
 
     vpp-compare-topologies-ref:
+      # TODO: Replace with 1904 data
+      # csit-vpp-perf-verify-1904-3n-skx:
       csit-vpp-perf-verify-1901-3n-skx:
         - 18  # NDRPDR sel
         - 19  # NDRPDR sel
@@ -931,7 +995,19 @@
         - 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-compare-topologies-cmp:
+      # TODO: Replace with 1904 data
+      # csit-vpp-perf-verify-1904-2n-skx:
       csit-vpp-perf-verify-1901-2n-skx:
         - 5   # NDRPDR sel
         - 12  # NDRPDR sel
@@ -948,9 +1024,13 @@
       - "vpp-compare-topologies-cmp"
 
     vpp-compare-topologies-mrr-ref:
+      # TODO: Replace with 1904 data
+      # csit-vpp-perf-verify-1904-3n-skx:
       csit-vpp-perf-verify-1901-3n-skx:
         - 32  # MRR sel
     vpp-compare-topologies-mrr-cmp:
+      # TODO: Replace with 1904 data
+      # csit-vpp-perf-verify-1904-2n-skx:
       csit-vpp-perf-verify-1901-2n-skx:
         - 22  # MRR sel
     vpp-compare-topologies-mrr:
@@ -958,6 +1038,8 @@
       - "vpp-compare-topologies-mrr-cmp"
 
     dpdk-compare-topologies-ref:
+      # TODO: Replace with 1904 data
+      # csit-dpdk-perf-verify-1904-3n-skx:
       csit-dpdk-perf-verify-1901-3n-skx:
         - 3   # NDRPDR sel
         - 5   # NDRPDR sel
@@ -970,6 +1052,8 @@
         - 12  # NDRPDR sel
         - 13  # NDRPDR sel
     dpdk-compare-topologies-cmp:
+      # TODO: Replace with 1904 data
+      # csit-dpdk-perf-verify-1904-2n-skx:
       csit-dpdk-perf-verify-1901-2n-skx:
         - 12  # NDRPDR sel
         - 13  # NDRPDR sel
@@ -1374,13 +1458,11 @@
       hoverlabel:
         namelength: -1
 
--
-  type: "static"
+- type: "static"
   src-path: "{DIR[RST]}"
   dst-path: "{DIR[WORKING,SRC]}"
 
--
-  type: "input"
+- type: "input"
   general:
     file-name: "robot-plugin.zip"
     file-format: ".zip"
@@ -1388,34 +1470,16 @@
     extract: "robot-plugin/output.xml"
 
   builds:
+    # TODO: Add 1904 data
+#    intel-dnv-vpp-release-1904:
+#      - 1
+
+    intel-dnv-vpp-release-1901:
+      - 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
       - 20  # NDRPDR full
@@ -1468,30 +1532,10 @@
       - 69  # NDRPDR LB
       - 70  # NDRPDR LB
       - 71  # NDRPDR LB
-    csit-vpp-perf-verify-1807-3n-skx:
-      - 31  # MRR full
-      - 28  # MRR sel
-      - 32  # MRR sel
-      - 36  # MRR sel
-      - 42  # MRR sel
-      - 47  # MRR sel
-      - 48  # MRR sel
-      - 51  # MRR sel
-      - 52  # MRR sel
-      - 53  # MRR sel
-      - 54  # MRR sel
-      - 40  # NDRPDR full 1
-      - 41  # NDRPDR full 2
-      - 33  # NDRPDR sel
-      - 35  # NDRPDR sel
-      - 37  # NDRPDR sel
-      - 38  # NDRPDR sel
-      - 39  # NDRPDR sel
-      - 43  # NDRPDR sel
-      - 44  # NDRPDR sel
-      - 49  # NDRPDR sel
-      - 50  # NDRPDR sel
-      - 56  # NDRPDR sel
+    # TODO: Add 1904 Data
+#    csit-vpp-perf-verify-1904-3n-hsw:
+#      -
+
     csit-vpp-perf-verify-1810-3n-skx:
       - 9   # MRR sel
       - 11  # MRR sel
@@ -1530,29 +1574,15 @@
       - 58  # NDRPDR LB
       - 59  # NDRPDR LB
       - 60  # NDRPDR LB
-    csit-vpp-perf-verify-1807-2n-skx:
-      - 27  # MRR full
-      - 31  # MRR sel
-      - 33  # MRR sel
-      - 37  # MRR sel
-      - 38  # MRR sel
-      - 41  # MRR sel
-      - 43  # MRR sel
-      - 44  # MRR sel
-      - 45  # MRR sel
-      - 46  # MRR sel
-      - 47  # MRR sel
-      - 32  # NDRPDR full
-      - 26  # NDRPDR sel
-      - 28  # NDRPDR sel
-      - 29  # NDRPDR sel
-      - 30  # NDRPDR sel
-      - 34  # NDRPDR sel
-      - 35  # NDRPDR sel
-      - 36  # NDRPDR sel
-      - 39  # NDRPDR sel
-      - 40  # NDRPDR sel
-      - 42  # NDRPDR sel
+      - 63  # NDRPDR LB
+      - 64  # NDRPDR LB
+      - 65  # NDRPDR LB
+      - 66  # NDRPDR LB
+      - 67  # NDRPDR LB
+    # TODO: Add 1904 data
+#    csit-vpp-perf-verify-1904-3n-skx:
+#      -
+
     csit-vpp-perf-verify-1810-2n-skx:
       - 8   # MRR sel
       - 10  # MRR sel
@@ -1597,7 +1627,11 @@
       - 39  # NFV NDRPDR
       - 46  # NFV NDRPDR
       - 45  # SOAK
-    # TODO: Add new data
+    # TODO: Add 1904 data
+#    csit-vpp-perf-verify-1901-2n-skx:
+#      -
+
+    # TODO: Remove
     csit-ligato-perf-verify-1901-3n-hsw:
       - 10  # NDRPDR full
       - 8   # NDRPDR sel
@@ -1610,17 +1644,10 @@
       - 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
+    # TODO: Add 1904 data
+#    csit-ligato-perf-verify-1904-3n-hsw:
+#      -
+
     csit-dpdk-perf-verify-1810-3n-hsw:
       - 1   # NDRPDR sel
       - 2   # NDRPDR sel
@@ -1643,17 +1670,10 @@
       - 21  # NDRPDR sel
       - 22  # NDRPDR sel
       - 23  # NDRPDR sel
-    csit-dpdk-perf-verify-1807-3n-skx:
-      - 1   # NDRPDR sel
-      - 2   # NDRPDR sel
-      - 3   # NDRPDR sel
-      - 6   # NDRPDR sel
-      - 7   # NDRPDR sel
-      - 8   # NDRPDR sel
-      - 9   # NDRPDR sel
-      - 10  # NDRPDR sel
-      - 11  # NDRPDR sel
-      - 12  # NDRPDR sel
+    # TODO: Add 1904 data
+#    csit-dpdk-perf-verify-1904-3n-hsw:
+#      -
+
     csit-dpdk-perf-verify-1810-3n-skx:
       - 3   # NDRPDR sel
       - 4   # NDRPDR sel
@@ -1676,6 +1696,10 @@
       - 11  # NDRPDR sel
       - 12  # NDRPDR sel
       - 13  # NDRPDR sel
+    # TODO: Add 1904 data
+#    csit-dpdk-perf-verify-1901-3n-skx:
+#      -
+
     csit-dpdk-perf-verify-1810-2n-skx:
       - 3   # NDRPDR sel
       - 4   # NDRPDR sel
@@ -1698,36 +1722,53 @@
       - 19  # NDRPDR sel
       - 20  # NDRPDR sel
       - 21  # NDRPDR sel
+    # TODO: Add 1904 data
+#    csit-dpdk-perf-verify-1904-2n-skx:
+#      -
+
     csit-vpp-functional-1901-ubuntu1604-virl:
-      - 48
+      - 173
+    # TODO: Add 1904 data
+#    csit-vpp-functional-1904-ubuntu1604-virl:
+#      -
     csit-vpp-functional-1901-centos7-virl:
-      - 50
+      - 175
+    # TODO: Add 1904 data
+#    csit-vpp-functional-1904-centos7-virl:
+#      -
     csit-vpp-device-1901-ubuntu1804-1n-skx:
-      - 49
-    # Not used
-    csit-nsh_sfc-verify-func-1810-ubuntu1604-virl:
-      - 1
+      - 175
+    # TODO: Add 1904 data
+#    csit-vpp-device-1901-ubuntu1804-1n-skx:
+#      -
+#    # Not used
+#    csit-nsh_sfc-verify-func-1810-ubuntu1604-virl:
+#      - 1
     csit-dmm-functional-1901-ubuntu1604-virl:
       - 2
+    # TODO: Add 1904 data
+#    csit-dmm-functional-1904-ubuntu1604-virl:
+#      -
     csit-hc2vpp-verify-func-1901-ubuntu1604:
       - 3
+    # TODO: Add 1904 data
+#    csit-hc2vpp-verify-func-1904-ubuntu1604:
+#      -
 
--
-  type: "output"
+- type: "output"
   output: "report"
   format:
     html:
     - full
-    pdf:
-    - minimal
+#    pdf:
+#    - minimal
 
 ################################################################################
 ###                               T A B L E S                                ###
 ################################################################################
 
 # 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"
@@ -1747,8 +1788,7 @@
   - "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"
@@ -1768,8 +1808,7 @@
   - "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"
@@ -1789,8 +1828,7 @@
   - "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"
@@ -1810,8 +1848,7 @@
   - "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"
@@ -1831,8 +1868,7 @@
   - "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"
@@ -1852,8 +1888,7 @@
   - "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"
@@ -1873,8 +1908,7 @@
   - "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"
@@ -1894,8 +1928,7 @@
   - "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"
@@ -1915,8 +1948,7 @@
   - "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"
@@ -1936,8 +1968,7 @@
   - "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"
@@ -1957,8 +1988,7 @@
   - "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"
@@ -1978,8 +2008,7 @@
   - "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"
@@ -1999,8 +2028,7 @@
   - "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"
@@ -2020,8 +2048,7 @@
   - "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"
@@ -2041,8 +2068,7 @@
   - "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"
@@ -2062,8 +2088,7 @@
   - "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"
@@ -2083,8 +2108,7 @@
   - "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"
@@ -2104,8 +2128,7 @@
   - "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"
@@ -2125,8 +2148,7 @@
   - "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"
@@ -2146,8 +2168,7 @@
   - "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"
@@ -2169,21 +2190,173 @@
 ################################################################################
 # 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
--
-  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: "rls1807"
+    - title: "rls1810"
       data: "vpp-performance-changes-3n-hsw-h1"
   reference:
-    title: "rls1810"
+    title: "rls1901"
     data: "vpp-performance-changes-3n-hsw-ref"
   compare:
-    title: "rls1901"
+    title: "rls1904"
     data: "vpp-performance-changes-3n-hsw-cmp"
   data: "vpp-performance-changes-3n-hsw"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
@@ -2194,20 +2367,18 @@
   - "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: "rls1807"
+    - title: "rls1810"
       data: "vpp-performance-changes-3n-hsw-h1"
   reference:
-    title: "rls1810"
+    title: "rls1901"
     data: "vpp-performance-changes-3n-hsw-ref"
   compare:
-    title: "rls1901"
+    title: "rls1904"
     data: "vpp-performance-changes-3n-hsw-cmp"
   data: "vpp-performance-changes-3n-hsw"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
@@ -2218,20 +2389,18 @@
   - "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: "rls1807"
+    - title: "rls1810"
       data: "vpp-performance-changes-3n-hsw-h1"
   reference:
-    title: "rls1810"
+    title: "rls1901"
     data: "vpp-performance-changes-3n-hsw-ref"
   compare:
-    title: "rls1901"
+    title: "rls1904"
     data: "vpp-performance-changes-3n-hsw-cmp"
   data: "vpp-performance-changes-3n-hsw"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
@@ -2242,20 +2411,18 @@
   - "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: "rls1807"
+    - title: "rls1810"
       data: "vpp-performance-changes-3n-hsw-h1"
   reference:
-    title: "rls1810"
+    title: "rls1901"
     data: "vpp-performance-changes-3n-hsw-ref"
   compare:
-    title: "rls1901"
+    title: "rls1904"
     data: "vpp-performance-changes-3n-hsw-cmp"
   data: "vpp-performance-changes-3n-hsw"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
@@ -2266,20 +2433,18 @@
   - "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: "rls1807"
+    - title: "rls1810"
       data: "vpp-performance-changes-3n-skx-h1"
   reference:
-    title: "rls1810"
+    title: "rls1901"
     data: "vpp-performance-changes-3n-skx-ref"
   compare:
-    title: "rls1901"
+    title: "rls1904"
     data: "vpp-performance-changes-3n-skx-cmp"
   data: "vpp-performance-changes-3n-skx"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
@@ -2290,20 +2455,18 @@
   - "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: "rls1807"
+    - title: "rls1810"
       data: "vpp-performance-changes-3n-skx-h1"
   reference:
-    title: "rls1810"
+    title: "rls1901"
     data: "vpp-performance-changes-3n-skx-ref"
   compare:
-    title: "rls1901"
+    title: "rls1904"
     data: "vpp-performance-changes-3n-skx-cmp"
   data: "vpp-performance-changes-3n-skx"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
@@ -2314,20 +2477,18 @@
   - "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: "rls1807"
+    - title: "rls1810"
       data: "vpp-performance-changes-3n-skx-h1"
   reference:
-    title: "rls1810"
+    title: "rls1901"
     data: "vpp-performance-changes-3n-skx-ref"
   compare:
-    title: "rls1901"
+    title: "rls1904"
     data: "vpp-performance-changes-3n-skx-cmp"
   data: "vpp-performance-changes-3n-skx"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
@@ -2338,20 +2499,18 @@
   - "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: "rls1807"
+    - title: "rls1810"
       data: "vpp-performance-changes-3n-skx-h1"
   reference:
-    title: "rls1810"
+    title: "rls1901"
     data: "vpp-performance-changes-3n-skx-ref"
   compare:
-    title: "rls1901"
+    title: "rls1904"
     data: "vpp-performance-changes-3n-skx-cmp"
   data: "vpp-performance-changes-3n-skx"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
@@ -2362,20 +2521,18 @@
   - "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: "rls1807"
+    - title: "rls1810"
       data: "vpp-performance-changes-2n-skx-h1"
   reference:
-    title: "rls1810"
+    title: "rls1901"
     data: "vpp-performance-changes-2n-skx-ref"
   compare:
-    title: "rls1901"
+    title: "rls1904"
     data: "vpp-performance-changes-2n-skx-cmp"
   data: "vpp-performance-changes-2n-skx"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
@@ -2386,19 +2543,18 @@
   - "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: "rls1807"
+    - title: "rls1810"
       data: "vpp-performance-changes-2n-skx-h1"
   reference:
-    title: "rls1810"
+    title: "rls1901"
     data: "vpp-performance-changes-2n-skx-ref"
   compare:
-    title: "rls1901"
+    title: "rls1904"
     data: "vpp-performance-changes-2n-skx-cmp"
   data: "vpp-performance-changes-2n-skx"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
@@ -2409,19 +2565,18 @@
   - "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: "rls1807"
+    - title: "rls1810"
       data: "vpp-performance-changes-2n-skx-h1"
   reference:
-    title: "rls1810"
+    title: "rls1901"
     data: "vpp-performance-changes-2n-skx-ref"
   compare:
-    title: "rls1901"
+    title: "rls1904"
     data: "vpp-performance-changes-2n-skx-cmp"
   data: "vpp-performance-changes-2n-skx"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
@@ -2432,19 +2587,18 @@
   - "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: "rls1807"
+    - title: "rls1810"
       data: "vpp-performance-changes-2n-skx-h1"
   reference:
-    title: "rls1810"
+    title: "rls1901"
     data: "vpp-performance-changes-2n-skx-ref"
   compare:
-    title: "rls1901"
+    title: "rls1904"
     data: "vpp-performance-changes-2n-skx-cmp"
   data: "vpp-performance-changes-2n-skx"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
@@ -2455,8 +2609,7 @@
   - "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"
@@ -2475,8 +2628,7 @@
   - "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"
@@ -2495,8 +2647,7 @@
   - "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"
@@ -2515,8 +2666,7 @@
   - "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"
@@ -2535,8 +2685,7 @@
   - "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"
@@ -2555,8 +2704,7 @@
   - "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"
@@ -2575,8 +2723,7 @@
   - "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"
@@ -2595,8 +2742,7 @@
   - "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"
@@ -2615,20 +2761,18 @@
   - "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: "rls1807"
+    - title: "rls1810"
       data: "vpp-performance-changes-3n-hsw-mrr-h1"
   reference:
-    title: "rls1810"
+    title: "rls1901"
     data: "vpp-performance-changes-3n-hsw-mrr-ref"
   compare:
-    title: "rls1901"
+    title: "rls1904"
     data: "vpp-performance-changes-3n-hsw-mrr-cmp"
   data: "vpp-performance-changes-3n-hsw-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
@@ -2639,20 +2783,18 @@
   - "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: "rls1807"
+    - title: "rls1810"
       data: "vpp-performance-changes-3n-hsw-mrr-h1"
   reference:
-    title: "rls1810"
+    title: "rls1901"
     data: "vpp-performance-changes-3n-hsw-mrr-ref"
   compare:
-    title: "rls1901"
+    title: "rls1904"
     data: "vpp-performance-changes-3n-hsw-mrr-cmp"
   data: "vpp-performance-changes-3n-hsw-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
@@ -2663,20 +2805,18 @@
   - "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: "rls1807"
+    - title: "rls1810"
       data: "vpp-performance-changes-3n-hsw-mrr-h1"
   reference:
-    title: "rls1810"
+    title: "rls1901"
     data: "vpp-performance-changes-3n-hsw-mrr-ref"
   compare:
-    title: "rls1901"
+    title: "rls1904"
     data: "vpp-performance-changes-3n-hsw-mrr-cmp"
   data: "vpp-performance-changes-3n-hsw-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
@@ -2687,20 +2827,18 @@
   - "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: "rls1807"
+    - title: "rls1810"
       data: "vpp-performance-changes-3n-skx-mrr-h1"
   reference:
-    title: "rls1810"
+    title: "rls1901"
     data: "vpp-performance-changes-3n-skx-mrr-ref"
   compare:
-    title: "rls1901"
+    title: "rls1904"
     data: "vpp-performance-changes-3n-skx-mrr-cmp"
   data: "vpp-performance-changes-3n-skx-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
@@ -2711,20 +2849,18 @@
   - "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: "rls1807"
+    - title: "rls1810"
       data: "vpp-performance-changes-3n-skx-mrr-h1"
   reference:
-    title: "rls1810"
+    title: "rls1901"
     data: "vpp-performance-changes-3n-skx-mrr-ref"
   compare:
-    title: "rls1901"
+    title: "rls1904"
     data: "vpp-performance-changes-3n-skx-mrr-cmp"
   data: "vpp-performance-changes-3n-skx-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
@@ -2735,20 +2871,18 @@
   - "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: "rls1807"
+    - title: "rls1810"
       data: "vpp-performance-changes-3n-skx-mrr-h1"
   reference:
-    title: "rls1810"
+    title: "rls1901"
     data: "vpp-performance-changes-3n-skx-mrr-ref"
   compare:
-    title: "rls1901"
+    title: "rls1904"
     data: "vpp-performance-changes-3n-skx-mrr-cmp"
   data: "vpp-performance-changes-3n-skx-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
@@ -2759,20 +2893,18 @@
   - "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: "rls1807"
+    - title: "rls1810"
       data: "vpp-performance-changes-2n-skx-mrr-h1"
   reference:
-    title: "rls1810"
+    title: "rls1901"
     data: "vpp-performance-changes-2n-skx-mrr-ref"
   compare:
-    title: "rls1901"
+    title: "rls1904"
     data: "vpp-performance-changes-2n-skx-mrr-cmp"
   data: "vpp-performance-changes-2n-skx-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
@@ -2783,20 +2915,18 @@
   - "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: "rls1807"
+    - title: "rls1810"
       data: "vpp-performance-changes-2n-skx-mrr-h1"
   reference:
-    title: "rls1810"
+    title: "rls1901"
     data: "vpp-performance-changes-2n-skx-mrr-ref"
   compare:
-    title: "rls1901"
+    title: "rls1904"
     data: "vpp-performance-changes-2n-skx-mrr-cmp"
   data: "vpp-performance-changes-2n-skx-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
@@ -2807,20 +2937,18 @@
   - "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: "rls1807"
+    - title: "rls1810"
       data: "vpp-performance-changes-2n-skx-mrr-h1"
   reference:
-    title: "rls1810"
+    title: "rls1901"
     data: "vpp-performance-changes-2n-skx-mrr-ref"
   compare:
-    title: "rls1901"
+    title: "rls1904"
     data: "vpp-performance-changes-2n-skx-mrr-cmp"
   data: "vpp-performance-changes-2n-skx-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
@@ -2831,8 +2959,7 @@
   - "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"
@@ -2851,8 +2978,7 @@
   - "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"
@@ -2871,8 +2997,7 @@
   - "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"
@@ -2891,8 +3016,7 @@
   - "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"
@@ -2911,8 +3035,7 @@
   - "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"
@@ -2931,8 +3054,7 @@
   - "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"
@@ -2951,18 +3073,15 @@
   - "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: "Name"
+  - title: "Name"
     data: "data name"
-  -
-    title: "Status"
+  - title: "Status"
     data: "data msg"
   rows: "generated"
   data: "vpp-perf-results-3n-hsw"
@@ -2973,18 +3092,15 @@
   - "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: "Name"
+  - title: "Name"
     data: "data name"
-  -
-    title: "Status"
+  - title: "Status"
     data: "data msg"
   rows: "generated"
   data: "vpp-perf-results-3n-skx"
@@ -2995,18 +3111,15 @@
   - "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: "Name"
+  - title: "Name"
     data: "data name"
-  -
-    title: "Status"
+  - title: "Status"
     data: "data msg"
   rows: "generated"
   data: "vpp-perf-results-2n-skx"
@@ -3017,18 +3130,15 @@
   - "msg"
 
 # Detailed Test Results - VPP Performance Results 2n-dnv
--
-  type: "table"
+- 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"
+  - title: "Name"
     data: "data name"
-  -
-    title: "Status"
+  - title: "Status"
     data: "data msg"
   rows: "generated"
   data: "intel-dnv-vpp"
@@ -3039,106 +3149,91 @@
   - "msg"
 
 # 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: "Name"
+  - title: "Name"
     data: "data name"
-  -
-    title: "VPP API Test (VAT) Commands History - Commands Used Per Test Case"
-    data: "data vat-history"
+  - title: "VPP API Test Commands History - Commands Used Per Test Case"
+    data: "data conf-history"
   rows: "generated"
   data: "vpp-perf-results-3n-hsw"
   filter: "not 'NDRCHK' and not 'PDRCHK'"
   parameters:
   - "parent"
   - "name"
-  - "vat-history"
+  - "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: "Name"
+  - title: "Name"
     data: "data name"
-  -
-    title: "VPP API Test (VAT) Commands History - Commands Used Per Test Case"
-    data: "data vat-history"
+  - title: "VPP API Test Commands History - Commands Used Per Test Case"
+    data: "data conf-history"
   rows: "generated"
   data: "vpp-perf-results-3n-skx"
   filter: "not 'NDRCHK' and not 'PDRCHK'"
   parameters:
   - "parent"
   - "name"
-  - "vat-history"
+  - "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: "Name"
+  - title: "Name"
     data: "data name"
-  -
-    title: "VPP API Test (VAT) Commands History - Commands Used Per Test Case"
-    data: "data vat-history"
+  - title: "VPP API Test Commands History - Commands Used Per Test Case"
+    data: "data conf-history"
   rows: "generated"
   data: "vpp-perf-results-2n-skx"
   filter: "not 'NDRCHK' and not 'PDRCHK'"
   parameters:
   - "parent"
   - "name"
-  - "vat-history"
+  - "conf-history"
 
 # Test configuration - VPP Performance Test Configs 2n-dnv
--
-  type: "table"
+- 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"
+  - title: "Name"
     data: "data name"
-  -
-    title: "VPP API Test (VAT) Commands History - Commands Used Per Test Case"
-    data: "data vat-history"
+  - 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"
-  - "vat-history"
+  - "conf-history"
 
 # 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: "Name"
+  - title: "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"
@@ -3149,18 +3244,15 @@
   - "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: "Name"
+  - title: "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"
@@ -3171,18 +3263,15 @@
   - "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: "Name"
+  - title: "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"
@@ -3193,18 +3282,15 @@
   - "show-run"
 
 # Test Operational Data - VPP Performance Operational Data 2n-dnv
--
-  type: "table"
+- 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"
+  - title: "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: "intel-dnv-vpp"
@@ -3215,18 +3301,15 @@
   - "show-run"
 
 # 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: "Name"
+  - title: "Name"
     data: "data name"
-  -
-    title: "Status"
+  - title: "Status"
     data: "data msg"
   rows: "generated"
   data: "vpp-mrr-results-3n-hsw"
@@ -3237,18 +3320,15 @@
   - "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: "Name"
+  - title: "Name"
     data: "data name"
-  -
-    title: "Status"
+  - title: "Status"
     data: "data msg"
   rows: "generated"
   data: "vpp-mrr-results-3n-skx"
@@ -3259,18 +3339,15 @@
   - "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: "Name"
+  - title: "Name"
     data: "data name"
-  -
-    title: "Status"
+  - title: "Status"
     data: "data msg"
   rows: "generated"
   data: "vpp-mrr-results-2n-skx"
@@ -3281,18 +3358,15 @@
   - "msg"
 
 # Detailed Test Results - VPP MRR Results 2n-dnv
--
-  type: "table"
+- 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"
+  - title: "Name"
     data: "data name"
-  -
-    title: "Status"
+  - title: "Status"
     data: "data msg"
   rows: "generated"
   data: "intel-dnv-vpp"
@@ -3303,109 +3377,93 @@
   - "msg"
 
 # 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: "Name"
+  - title: "Name"
     data: "data name"
-  -
-    title: "VPP API Test (VAT) Commands History - Commands Used Per Test Case"
-    data: "data vat-history"
+  - title: "VPP API Test Commands History - Commands Used Per Test Case"
+    data: "data conf-history"
   rows: "generated"
   data: "vpp-mrr-results-3n-hsw"
   filter: "'MRR'"
   parameters:
   - "parent"
   - "name"
-  - "vat-history"
+  - "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: "Name"
+  - title: "Name"
     data: "data name"
-  -
-    title: "VPP API Test (VAT) Commands History - Commands Used Per Test Case"
-    data: "data vat-history"
+  - title: "VPP API Test Commands History - Commands Used Per Test Case"
+    data: "data conf-history"
   rows: "generated"
   data: "vpp-mrr-results-3n-skx"
   filter: "'MRR'"
   parameters:
   - "parent"
   - "name"
-  - "vat-history"
+  - "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: "Name"
+  - title: "Name"
     data: "data name"
-  -
-    title: "VPP API Test (VAT) Commands History - Commands Used Per Test Case"
-    data: "data vat-history"
+  - title: "VPP API Test Commands History - Commands Used Per Test Case"
+    data: "data conf-history"
   rows: "generated"
   data: "vpp-mrr-results-2n-skx"
   filter: "'MRR'"
   parameters:
   - "parent"
   - "name"
-  - "vat-history"
+  - "conf-history"
 
 # Test configuration - VPP MRR Test Configs 2n-dnv
--
-  type: "table"
+- 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"
+  - title: "Name"
     data: "data name"
-  -
-    title: "VPP API Test (VAT) Commands History - Commands Used Per Test Case"
-    data: "data vat-history"
+  - 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"
-  - "vat-history"
+  - "conf-history"
 
 # 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: "Name"
+  - title: "Name"
     data: "data name"
-  -
-    title: "Documentation"
+  - title: "Documentation"
     data: "data doc"
-  -
-    title: "Status"
+  - title: "Status"
     data: "data status"
   rows: "generated"
   data: "vpp-func-results-ubuntu"
@@ -3417,18 +3475,15 @@
   - "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: "Name"
+  - title: "Name"
     data: "data name"
-  -
-    title: "Documentation"
+  - title: "Documentation"
     data: "data doc"
   -
     title: "Status"
@@ -3444,62 +3499,53 @@
   - "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: "Name"
+  - title: "Name"
     data: "data name"
-  -
-    title: "VPP API Test (VAT) Commands History - Commands Used Per Test Case"
-    data: "data vat-history"
+  - title: "VPP API Test Commands History - Commands Used Per Test Case"
+    data: "data conf-history"
   rows: "generated"
   data: "vpp-func-results-ubuntu"
   filter: "all"
   parameters:
   - "parent"
   - "name"
-  - "vat-history"
+  - "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: "Name"
+  - title: "Name"
     data: "data name"
-  -
-    title: "VPP API Test (VAT) Commands History - Commands Used Per Test Case"
-    data: "data vat-history"
+  - title: "VPP API Test Commands History - Commands Used Per Test Case"
+    data: "data conf-history"
   rows: "generated"
   data: "vpp-func-results-centos"
   filter: "all"
   parameters:
   - "parent"
   - "name"
-  - "vat-history"
+  - "conf-history"
 
 # Detailed Test Results - Container Orchestrated Topologies Performance Results 3n-hsw
--
-  type: "table"
+- 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"
+  - title: "Name"
     data: "data name"
-  -
-    title: "Status"
+  - title: "Status"
     data: "data msg"
   rows: "generated"
   data: "ligato-perf-results-3n-hsw"
@@ -3510,21 +3556,17 @@
   - "msg"
 
 # 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: "Name"
+  - title: "Name"
     data: "data name"
-  -
-    title: "Documentation"
+  - title: "Documentation"
     data: "data doc"
-  -
-    title: "Status"
+  - title: "Status"
     data: "data status"
   rows: "generated"
   data: "vpp-device-results-ubuntu"
@@ -3536,44 +3578,39 @@
   - "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: "Name"
+  - title: "Name"
     data: "data name"
-  -
-    title: "VPP API Test (VAT) Commands History - Commands Used Per Test Case"
-    data: "data vat-history"
+  - title: "VPP API Test Commands History - Commands Used Per Test Case"
+    data: "data conf-history"
   rows: "generated"
   data: "vpp-device-results-ubuntu"
   filter: "all"
   parameters:
   - "parent"
   - "name"
-  - "vat-history"
+  - "conf-history"
 
 ################################################################################
 
 # 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: "rls1807"
+    - title: "rls1810"
       data: "dpdk-performance-changes-3n-hsw-h1"
   reference:
-    title: "rls1810"
+    title: "rls1901"
     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"
@@ -3584,20 +3621,18 @@
   - "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: "rls1807"
+    - title: "rls1810"
       data: "dpdk-performance-changes-3n-hsw-h1"
   reference:
-    title: "rls1810"
+    title: "rls1901"
     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"
@@ -3608,20 +3643,18 @@
   - "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: "rls1807"
+    - title: "rls1810"
       data: "dpdk-performance-changes-3n-hsw-h1"
   reference:
-    title: "rls1810"
+    title: "rls1901"
     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"
@@ -3632,20 +3665,18 @@
   - "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: "rls1807"
+    - title: "rls1810"
       data: "dpdk-performance-changes-3n-hsw-h1"
   reference:
-    title: "rls1810"
+    title: "rls1901"
     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"
@@ -3656,20 +3687,18 @@
   - "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: "rls1807"
+    - title: "rls1810"
       data: "dpdk-performance-changes-3n-skx-h1"
   reference:
-    title: "rls1810"
+    title: "rls1901"
     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"
@@ -3680,20 +3709,18 @@
   - "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: "rls1807"
+    - title: "rls1810"
       data: "dpdk-performance-changes-3n-skx-h1"
   reference:
-    title: "rls1810"
+    title: "rls1901"
     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"
@@ -3704,20 +3731,18 @@
   - "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: "rls1807"
+    - title: "rls1810"
       data: "dpdk-performance-changes-3n-skx-h1"
   reference:
-    title: "rls1810"
+    title: "rls1901"
     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"
@@ -3728,20 +3753,18 @@
   - "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: "rls1807"
+    - title: "rls1810"
       data: "dpdk-performance-changes-3n-skx-h1"
   reference:
-    title: "rls1810"
+    title: "rls1901"
     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"
@@ -3752,8 +3775,7 @@
   - "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"
@@ -3772,8 +3794,7 @@
   - "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"
@@ -3792,8 +3813,7 @@
   - "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"
@@ -3812,8 +3832,7 @@
   - "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"
@@ -3832,16 +3851,18 @@
   - "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"
+  history:
+    - title: "rls1810"
+      data: "dpdk-performance-changes-2n-skx-h1"
   reference:
-    title: "rls1810"
+    title: "rls1901"
     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"
@@ -3852,16 +3873,18 @@
   - "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"
+  history:
+    - title: "rls1810"
+      data: "dpdk-performance-changes-2n-skx-h1"
   reference:
-    title: "rls1810"
+    title: "rls1901"
     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"
@@ -3872,16 +3895,18 @@
   - "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"
+  history:
+    - title: "rls1810"
+      data: "dpdk-performance-changes-2n-skx-h1"
   reference:
-    title: "rls1810"
+    title: "rls1901"
     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"
@@ -3892,16 +3917,18 @@
   - "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"
+  history:
+    - title: "rls1810"
+      data: "dpdk-performance-changes-2n-skx-h1"
   reference:
-    title: "rls1810"
+    title: "rls1901"
     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"
@@ -3912,18 +3939,15 @@
   - "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: "Name"
+  - title: "Name"
     data: "data name"
-  -
-    title: "Status"
+  - title: "Status"
     data: "data msg"
   rows: "generated"
   data: "dpdk-perf-results-3n-hsw"
@@ -3934,18 +3958,15 @@
   - "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: "Name"
+  - title: "Name"
     data: "data name"
-  -
-    title: "Status"
+  - title: "Status"
     data: "data msg"
   rows: "generated"
   data: "dpdk-perf-results-3n-skx"
@@ -3956,18 +3977,15 @@
   - "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: "Name"
+  - title: "Name"
     data: "data name"
-  -
-    title: "Status"
+  - title: "Status"
     data: "data msg"
   rows: "generated"
   data: "dpdk-perf-results-2n-skx"
@@ -3979,21 +3997,17 @@
 
 ################################################################################
 # 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: "Name"
+  - title: "Name"
     data: "data name"
-  -
-    title: "Documentation"
+  - title: "Documentation"
     data: "data doc"
-  -
-    title: "Status"
+  - title: "Status"
     data: "data status"
   rows: "generated"
   data:
@@ -4007,49 +4021,45 @@
 
 ################################################################################
 # 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
--
-  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: "Name"
+  - title: "Name"
     data: "data name"
-  -
-    title: "Documentation"
+  - title: "Documentation"
     data: "data doc"
-  -
-    title: "Status"
+  - title: "Status"
     data: "data status"
   rows: "generated"
   data:
@@ -4066,8 +4076,7 @@
 ################################################################################
 
 # VPP Performance Results 3n-hsw
--
-  type: "file"
+- type: "file"
   title: "VPP Performance Results 3n-hsw"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
@@ -4084,8 +4093,7 @@
   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"
@@ -4102,8 +4110,7 @@
   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"
@@ -4120,8 +4127,7 @@
   data-start-level: 3
 
 # VPP Performance Results 2n-dnv
--
-  type: "file"
+- type: "file"
   title: "VPP Performance Results 2n-dnv"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
@@ -4138,8 +4144,7 @@
   data-start-level: 3
 
 # VPP Performance Configuration 3n-hsw
--
-  type: "file"
+- type: "file"
   title: "VPP Performance Configuration 3n-hsw"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
@@ -4156,8 +4161,7 @@
   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"
@@ -4174,8 +4178,7 @@
   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"
@@ -4192,8 +4195,7 @@
   data-start-level: 3
 
 # VPP Performance Configuration 2n-dnv
--
-  type: "file"
+- type: "file"
   title: "VPP Performance Configuration 2n-dnv"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
@@ -4210,8 +4212,7 @@
   data-start-level: 3
 
 # 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"
@@ -4228,8 +4229,7 @@
   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"
@@ -4246,8 +4246,7 @@
   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"
@@ -4264,8 +4263,7 @@
   data-start-level: 3
 
 # VPP Performance Operational Data 2n-dnv
--
-  type: "file"
+- type: "file"
   title: "VPP Performance Operational Data 2n-dnv"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
@@ -4282,8 +4280,7 @@
   data-start-level: 3
 
 # VPP MRR Results 3n-hsw
--
-  type: "file"
+- type: "file"
   title: "VPP MRR Results 3n-hsw"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
@@ -4300,8 +4297,7 @@
   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"
@@ -4318,8 +4314,7 @@
   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"
@@ -4336,8 +4331,7 @@
   data-start-level: 3
 
 # VPP MRR Results 2n-dnv
--
-  type: "file"
+- type: "file"
   title: "VPP MRR Results 2n-dnv"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
@@ -4354,8 +4348,7 @@
   data-start-level: 3
 
 # VPP MRR Configuration 3n-hsw
--
-  type: "file"
+- type: "file"
   title: "VPP MRR Configuration 3n-hsw"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
@@ -4372,8 +4365,7 @@
   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"
@@ -4390,8 +4382,7 @@
   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"
@@ -4408,8 +4399,7 @@
   data-start-level: 3
 
 # VPP MRR Configuration 2n-dnv
--
-  type: "file"
+- type: "file"
   title: "VPP MRR Configuration 2n-dnv"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
@@ -4426,8 +4416,7 @@
   data-start-level: 3
 
 # VPP Functional Results - Ubuntu
--
-  type: "file"
+- type: "file"
   title: "VPP Functional Results - Ubuntu"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
@@ -4444,8 +4433,7 @@
   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"
@@ -4463,8 +4451,7 @@
   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"
@@ -4481,8 +4468,7 @@
   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"
@@ -4500,8 +4486,7 @@
   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"
@@ -4518,8 +4503,7 @@
   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"
@@ -4536,8 +4520,7 @@
   data-start-level: 2
 
 # Container Orchestrated Performance Results 3n-hsw
--
-  type: "file"
+- type: "file"
   title: "Container Orchestrated Performance Results 3n-hsw"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
@@ -4554,8 +4537,7 @@
   data-start-level: 3
 
 # DPDK Performance Results 3n-hsw
--
-  type: "file"
+- type: "file"
   title: "DPDK Performance Results 3n-hsw"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
@@ -4572,8 +4554,7 @@
   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"
@@ -4590,8 +4571,7 @@
   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"
@@ -4608,8 +4588,7 @@
   data-start-level: 3
 
 # Honeycomb Functional Results
--
-  type: "file"
+- type: "file"
   title: "Honeycomb Functional Results"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
@@ -4627,27 +4606,26 @@
   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
--
-  type: "file"
+- type: "file"
   title: "DMM Functional Results"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
@@ -4669,8 +4647,7 @@
 ################################################################################
 
 # Soak test - 30min Soak Test (PLRsearch), boxes
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: 30min Soak Test (PLRsearch) boxes"
   algorithm: "plot_soak_boxes"
   output-file-type: ".html"
@@ -4693,8 +4670,7 @@
     layout: "plot-soak-throughput"
 
 # Soak test - example, not used
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: 30min Soak Test (PLRsearch) bars"
   algorithm: "plot_soak_bars"
   output-file-type: ".html"
@@ -4719,8 +4695,7 @@
 ################################################################################
 # Plots - NF Density - VSC
 
--
-  type: "plot"
+- type: "plot"
   title: "Packet Throughput: 64B-1c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-mrr"
   algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
@@ -4745,8 +4720,7 @@
     title: "<b>Throughput:</b> eth-l2bd-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-mrr"
     layout: "plot-service-density"
 
--
-  type: "plot"
+- type: "plot"
   title: "Packet Throughput: 64B-2c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-mrr"
   algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
@@ -4771,8 +4745,7 @@
     title: "<b>Throughput:</b> eth-l2bd-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-mrr"
     layout: "plot-service-density"
 
--
-  type: "plot"
+- type: "plot"
   title: "Packet Throughput: IMIX-1c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-mrr"
   algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
@@ -4797,8 +4770,7 @@
     title: "<b>Throughput:</b> eth-l2bd-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-mrr"
     layout: "plot-service-density"
 
--
-  type: "plot"
+- type: "plot"
   title: "Packet Throughput: IMIX-2c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-mrr"
   algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
@@ -4823,8 +4795,7 @@
     title: "<b>Throughput:</b> eth-l2bd-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-mrr"
     layout: "plot-service-density"
 
--
-  type: "plot"
+- type: "plot"
   title: "Packet Throughput: 64B-1c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-ndr"
   algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
@@ -4849,8 +4820,7 @@
     title: "<b>Throughput:</b> eth-l2bd-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-ndr"
     layout: "plot-service-density"
 
--
-  type: "plot"
+- type: "plot"
   title: "Packet Throughput: 64B-2c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-ndr"
   algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
@@ -4875,8 +4845,7 @@
     title: "<b>Throughput:</b> eth-l2bd-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-ndr"
     layout: "plot-service-density"
 
--
-  type: "plot"
+- type: "plot"
   title: "Packet Throughput: IMIX-1c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-ndr"
   algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
@@ -4901,8 +4870,7 @@
     title: "<b>Throughput:</b> eth-l2bd-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-ndr"
     layout: "plot-service-density"
 
--
-  type: "plot"
+- type: "plot"
   title: "Packet Throughput: IMIX-2c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-ndr"
   algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
@@ -4927,8 +4895,7 @@
     title: "<b>Throughput:</b> eth-l2bd-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-ndr"
     layout: "plot-service-density"
 
--
-  type: "plot"
+- type: "plot"
   title: "Packet Throughput: 64B-1c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-pdr"
   algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
@@ -4953,8 +4920,7 @@
     title: "<b>Throughput:</b> eth-l2bd-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-pdr"
     layout: "plot-service-density"
 
--
-  type: "plot"
+- type: "plot"
   title: "Packet Throughput: 64B-2c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-pdr"
   algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
@@ -4979,8 +4945,7 @@
     title: "<b>Throughput:</b> eth-l2bd-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-pdr"
     layout: "plot-service-density"
 
--
-  type: "plot"
+- type: "plot"
   title: "Packet Throughput: IMIX-1c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-pdr"
   algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
@@ -5005,8 +4970,7 @@
     title: "<b>Throughput:</b> eth-l2bd-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-pdr"
     layout: "plot-service-density"
 
--
-  type: "plot"
+- type: "plot"
   title: "Packet Throughput: IMIX-2c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-pdr"
   algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
@@ -5034,8 +4998,7 @@
 ################################################################################
 # Plots - NF Density - CSC
 
--
-  type: "plot"
+- type: "plot"
   title: "Packet Throughput: 64B-1c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-mrr"
   algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
@@ -5060,8 +5023,7 @@
     title: "<b>Throughput:</b> eth-l2bd-{2XY}memif-{Y}chain-{XY}drc-vppip4-mrr"
     layout: "plot-service-density"
 
--
-  type: "plot"
+- type: "plot"
   title: "Packet Throughput: 64B-2c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-mrr"
   algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
@@ -5086,8 +5048,7 @@
     title: "<b>Throughput:</b> eth-l2bd-{2XY}memif-{Y}chain-{XY}drc-vppip4-mrr"
     layout: "plot-service-density"
 
--
-  type: "plot"
+- type: "plot"
   title: "Packet Throughput: IMIX-1c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-mrr"
   algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
@@ -5112,8 +5073,7 @@
     title: "<b>Throughput:</b> eth-l2bd-{2XY}memif-{Y}chain-{XY}drc-vppip4-mrr"
     layout: "plot-service-density"
 
--
-  type: "plot"
+- type: "plot"
   title: "Packet Throughput: IMIX-2c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-mrr"
   algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
@@ -5138,8 +5098,7 @@
     title: "<b>Throughput:</b> eth-l2bd-{2XY}memif-{Y}chain-{XY}drc-vppip4-mrr"
     layout: "plot-service-density"
 
--
-  type: "plot"
+- type: "plot"
   title: "Packet Throughput: 64B-1c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-ndr"
   algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
@@ -5164,8 +5123,7 @@
     title: "<b>Throughput:</b> eth-l2bd-{2XY}memif-{Y}chain-{XY}drc-vppip4-ndr"
     layout: "plot-service-density"
 
--
-  type: "plot"
+- type: "plot"
   title: "Packet Throughput: 64B-2c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-ndr"
   algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
@@ -5190,8 +5148,7 @@
     title: "<b>Throughput:</b> eth-l2bd-{2XY}memif-{Y}chain-{XY}drc-vppip4-ndr"
     layout: "plot-service-density"
 
--
-  type: "plot"
+- type: "plot"
   title: "Packet Throughput: IMIX-1c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-ndr"
   algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
@@ -5216,8 +5173,7 @@
     title: "<b>Throughput:</b> eth-l2bd-{2XY}memif-{Y}chain-{XY}drc-vppip4-ndr"
     layout: "plot-service-density"
 
--
-  type: "plot"
+- type: "plot"
   title: "Packet Throughput: IMIX-2c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-ndr"
   algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
@@ -5242,8 +5198,7 @@
     title: "<b>Throughput:</b> eth-l2bd-{2XY}memif-{Y}chain-{XY}drc-vppip4-ndr"
     layout: "plot-service-density"
 
--
-  type: "plot"
+- type: "plot"
   title: "Packet Throughput: 64B-1c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-pdr"
   algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
@@ -5268,8 +5223,7 @@
     title: "<b>Throughput:</b> eth-l2bd-{2XY}memif-{Y}chain-{XY}drc-vppip4-pdr"
     layout: "plot-service-density"
 
--
-  type: "plot"
+- type: "plot"
   title: "Packet Throughput: 64B-2c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-pdr"
   algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
@@ -5294,8 +5248,7 @@
     title: "<b>Throughput:</b> eth-l2bd-{2XY}memif-{Y}chain-{XY}drc-vppip4-pdr"
     layout: "plot-service-density"
 
--
-  type: "plot"
+- type: "plot"
   title: "Packet Throughput: IMIX-1c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-pdr"
   algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
@@ -5320,8 +5273,7 @@
     title: "<b>Throughput:</b> eth-l2bd-{2XY}memif-{Y}chain-{XY}drc-vppip4-pdr"
     layout: "plot-service-density"
 
--
-  type: "plot"
+- type: "plot"
   title: "Packet Throughput: IMIX-2c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-pdr"
   algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
@@ -5349,8 +5301,7 @@
 ################################################################################
 # Plots - NF Density - CSP
 
--
-  type: "plot"
+- type: "plot"
   title: "Packet Throughput: 64B-1c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-mrr"
   algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
@@ -5375,8 +5326,7 @@
     title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-mrr"
     layout: "plot-service-density"
 
--
-  type: "plot"
+- type: "plot"
   title: "Packet Throughput: 64B-2c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-mrr"
   algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
@@ -5401,8 +5351,7 @@
     title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-mrr"
     layout: "plot-service-density"
 
--
-  type: "plot"
+- type: "plot"
   title: "Packet Throughput: IMIX-1c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-mrr"
   algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
@@ -5427,8 +5376,7 @@
     title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-mrr"
     layout: "plot-service-density"
 
--
-  type: "plot"
+- type: "plot"
   title: "Packet Throughput: IMIX-2c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-mrr"
   algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
@@ -5453,8 +5401,7 @@
     title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-mrr"
     layout: "plot-service-density"
 
--
-  type: "plot"
+- type: "plot"
   title: "Packet Throughput: 64B-1c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-ndr"
   algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
@@ -5479,8 +5426,7 @@
     title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-ndr"
     layout: "plot-service-density"
 
--
-  type: "plot"
+- type: "plot"
   title: "Packet Throughput: 64B-2c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-ndr"
   algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
@@ -5505,8 +5451,7 @@
     title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-ndr"
     layout: "plot-service-density"
 
--
-  type: "plot"
+- type: "plot"
   title: "Packet Throughput: IMIX-1c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-ndr"
   algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
@@ -5531,8 +5476,7 @@
     title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-ndr"
     layout: "plot-service-density"
 
--
-  type: "plot"
+- type: "plot"
   title: "Packet Throughput: IMIX-2c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-ndr"
   algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
@@ -5557,8 +5501,7 @@
     title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-ndr"
     layout: "plot-service-density"
 
--
-  type: "plot"
+- type: "plot"
   title: "Packet Throughput: 64B-1c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-pdr"
   algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
@@ -5583,8 +5526,7 @@
     title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-pdr"
     layout: "plot-service-density"
 
--
-  type: "plot"
+- type: "plot"
   title: "Packet Throughput: 64B-2c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-pdr"
   algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
@@ -5609,8 +5551,7 @@
     title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-pdr"
     layout: "plot-service-density"
 
--
-  type: "plot"
+- type: "plot"
   title: "Packet Throughput: IMIX-1c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-pdr"
   algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
@@ -5635,8 +5576,7 @@
     title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-pdr"
     layout: "plot-service-density"
 
--
-  type: "plot"
+- type: "plot"
   title: "Packet Throughput: IMIX-2c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-pdr"
   algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
@@ -5663,8 +5603,7 @@
 
 ################################################################################
 # Plots VPP HTTP Server Performance
--
-  type: "plot"
+- type: "plot"
   title: "VPP HTTP Server Performance"
   algorithm: "plot_http_server_performance_box"
   output-file-type: ".html"
@@ -5686,8 +5625,7 @@
     layout:
       "plot-cps"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP HTTP Server Performance"
   algorithm: "plot_http_server_performance_box"
   output-file-type: ".html"
@@ -5710,13 +5648,12 @@
 ################################################################################
 
 # 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"
-  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
@@ -5745,13 +5682,12 @@
     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"
-  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
@@ -5780,13 +5716,12 @@
     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"
-  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
@@ -5815,13 +5750,12 @@
     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"
-  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
@@ -5851,13 +5785,12 @@
     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"
-  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
@@ -5883,13 +5816,12 @@
     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"
-  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
@@ -5915,13 +5847,12 @@
     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"
-  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
@@ -5947,13 +5878,12 @@
     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"
-  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
@@ -5980,13 +5910,12 @@
     layout: "plot-throughput"
 
 # Packet Throughput - VPP L2 3n-hsw-x710 base and scale
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
   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"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -6015,13 +5944,12 @@
     title: "l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
   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"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -6050,13 +5978,12 @@
     title: "l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
   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"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -6085,13 +6012,12 @@
     title: "l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
   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"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -6121,13 +6047,12 @@
     layout: "plot-throughput"
 
 # Packet Throughput - VPP L2 3n-hsw-x710 features
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: l2sw-3n-hsw-x710-64b-1t1c-features-ndr"
   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"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -6154,13 +6079,12 @@
     title: "l2sw-3n-hsw-x710-64b-1t1c-features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: l2sw-3n-hsw-x710-64b-1t1c-features-pdr"
   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"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -6187,13 +6111,12 @@
     title: "l2sw-3n-hsw-x710-64b-1t1c-features-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: l2sw-3n-hsw-x710-64b-2t2c-features-ndr"
   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"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -6220,13 +6143,12 @@
     title: "l2sw-3n-hsw-x710-64b-2t2c-features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: l2sw-3n-hsw-x710-64b-2t2c-features-pdr"
   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"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -6254,13 +6176,12 @@
     layout: "plot-throughput"
 
 # Packet Throughput - VPP L2 3n-hsw-xl710 base and scale
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: l2sw-3n-hsw-xl710-64b-1t1c-base-ndr"
   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"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'BASE' and
@@ -6286,13 +6207,12 @@
     title: "l2sw-3n-hsw-xl710-64b-1t1c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: l2sw-3n-hsw-xl710-64b-1t1c-base-pdr"
   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"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'BASE' and
@@ -6318,13 +6238,12 @@
     title: "l2sw-3n-hsw-xl710-64b-1t1c-base-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: l2sw-3n-hsw-xl710-64b-2t2c-base-ndr"
   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"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'BASE' and
@@ -6350,13 +6269,12 @@
     title: "l2sw-3n-hsw-xl710-64b-2t2c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: l2sw-3n-hsw-xl710-64b-2t2c-base-pdr"
   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"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'BASE' and
@@ -6383,13 +6301,12 @@
     layout: "plot-throughput"
 
 # Packet Throughput - VPP L2 3n-skx-x710 base and scale
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
   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"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -6419,13 +6336,12 @@
     title: "l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: l2sw-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
   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"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -6455,13 +6371,12 @@
     title: "l2sw-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
   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"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -6491,13 +6406,12 @@
     title: "l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: l2sw-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
   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"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -6528,13 +6442,12 @@
     layout: "plot-throughput"
 
 # Packet Throughput - VPP L2 3n-skx-x710 features
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: l2sw-3n-skx-x710-64b-2t1c-features-ndr"
   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"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -6562,13 +6475,12 @@
     title: "l2sw-3n-skx-x710-64b-2t1c-features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: l2sw-3n-skx-x710-64b-2t1c-features-pdr"
   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"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -6596,13 +6508,12 @@
     title: "l2sw-3n-skx-x710-64b-2t1c-features-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: l2sw-3n-skx-x710-64b-4t2c-features-ndr"
   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"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -6630,13 +6541,12 @@
     title: "l2sw-3n-skx-x710-64b-4t2c-features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: l2sw-3n-skx-x710-64b-4t2c-features-pdr"
   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"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -6665,13 +6575,12 @@
     layout: "plot-throughput"
 
 # Packet Throughput - VPP L2 3n-skx-xxv710 base and scale
--
-  type: "plot"
+- 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"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -6698,13 +6607,12 @@
     title: "l2sw-3n-skx-xxv710-64b-2t1c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- 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"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -6731,13 +6639,12 @@
     title: "l2sw-3n-skx-xxv710-64b-2t1c-base-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- 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"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -6764,13 +6671,12 @@
     title: "l2sw-3n-skx-xxv710-64b-4t2c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- 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"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -6798,13 +6704,12 @@
     layout: "plot-throughput"
 
 # Packet Throughput - VPP L2 2n-skx-x710 base and scale
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
   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"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -6833,13 +6738,12 @@
     title: "l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: l2sw-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
   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"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -6868,13 +6772,12 @@
     title: "l2sw-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
   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"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -6903,13 +6806,12 @@
     title: "l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: l2sw-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
   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"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -6939,13 +6841,12 @@
     layout: "plot-throughput"
 
 # Packet Throughput - VPP L2 2n-skx-xxv710 base and scale
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
   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"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -6974,13 +6875,12 @@
     title: "l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
   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"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -7009,13 +6909,12 @@
     title: "l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
   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"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -7044,13 +6943,12 @@
     title: "l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
   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"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -7080,8 +6978,7 @@
     layout: "plot-throughput"
 
 # Packet Throughput - VPP L2 2n-dnv-x553 base
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: l2sw-2n-dnv-x553-64b-1t1c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -7112,8 +7009,7 @@
     title: "l2sw-2n-dnv-x553-64b-1t1c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: l2sw-2n-dnv-x553-64b-1t1c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -7144,8 +7040,7 @@
     title: "l2sw-2n-dnv-x553-64b-1t1c-base-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: l2sw-2n-dnv-x553-64b-2t2c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -7176,8 +7071,7 @@
     title: "l2sw-2n-dnv-x553-64b-2t2c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: l2sw-2n-dnv-x553-64b-2t2c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -7211,13 +7105,12 @@
 ################################################################################
 
 # Packet Throughput - VPP Container Memif 3n-hsw-x520
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: memif-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
   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"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -7246,13 +7139,12 @@
     title: "memif-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: memif-3n-hsw-x520-64b-1t1c-base_and_features-pdr"
   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"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -7281,13 +7173,12 @@
     title: "memif-3n-hsw-x520-64b-1t1c-base_and_features-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: memif-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
   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"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -7316,13 +7207,12 @@
     title: "memif-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: memif-3n-hsw-x520-64b-2t2c-base_and_features-pdr"
   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"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -7352,13 +7242,12 @@
     layout: "plot-throughput"
 
 # Packet Throughput - VPP Container Memif 3n-hsw-x710
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: memif-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
   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"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -7387,13 +7276,12 @@
     title: "memif-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: memif-3n-hsw-x710-64b-1t1c-base_and_features-pdr"
   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"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -7422,13 +7310,12 @@
     title: "memif-3n-hsw-x710-64b-1t1c-base_and_features-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: memif-3n-hsw-x710-64b-2t2c-base_and_features-ndr"
   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"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -7457,13 +7344,12 @@
     title: "memif-3n-hsw-x710-64b-2t2c-base_and_features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: memif-3n-hsw-x710-64b-2t2c-base_and_features-pdr"
   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"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -7493,13 +7379,12 @@
     layout: "plot-throughput"
 
 # Packet Throughput - VPP Container Memif 3n-hsw-xl710
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: memif-3n-hsw-xl710-64b-1t1c-base_and_features-ndr"
   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"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -7528,13 +7413,12 @@
     title: "memif-3n-hsw-xl710-64b-1t1c-base_and_features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: memif-3n-hsw-xl710-64b-1t1c-base_and_features-pdr"
   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"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -7563,13 +7447,12 @@
     title: "memif-3n-hsw-xl710-64b-1t1c-base_and_features-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: memif-3n-hsw-xl710-64b-2t2c-base_and_features-ndr"
   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"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -7598,13 +7481,12 @@
     title: "memif-3n-hsw-xl710-64b-2t2c-base_and_features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: memif-3n-hsw-xl710-64b-2t2c-base_and_features-pdr"
   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"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -7634,13 +7516,12 @@
     layout: "plot-throughput"
 
 # Packet Throughput - VPP Container Memif 3n-skx-x710
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: memif-3n-skx-x710-64b-2t1c-base_and_features-ndr"
   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"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -7669,13 +7550,12 @@
     title: "memif-3n-skx-x710-64b-2t1c-base_and_features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: memif-3n-skx-x710-64b-2t1c-base_and_features-pdr"
   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"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -7704,13 +7584,12 @@
     title: "memif-3n-skx-x710-64b-2t1c-base_and_features-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: memif-3n-skx-x710-64b-4t2c-base_and_features-ndr"
   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"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -7739,13 +7618,12 @@
     title: "memif-3n-skx-x710-64b-4t2c-base_and_features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: memif-3n-skx-x710-64b-4t2c-base_and_features-pdr"
   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"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -7775,13 +7653,12 @@
     layout: "plot-throughput"
 
 # Packet Throughput - VPP Container Memif 2n-skx-x710
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: memif-2n-skx-x710-64b-2t1c-base_and_features-ndr"
   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"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -7811,13 +7688,12 @@
     title: "memif-2n-skx-x710-64b-2t1c-base_and_features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: memif-2n-skx-x710-64b-2t1c-base_and_features-pdr"
   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"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -7847,13 +7723,12 @@
     title: "memif-2n-skx-x710-64b-2t1c-base_and_features-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: memif-2n-skx-x710-64b-4t2c-base_and_features-ndr"
   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"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -7883,13 +7758,12 @@
     title: "memif-2n-skx-x710-64b-4t2c-base_and_features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: memif-2n-skx-x710-64b-4t2c-base_and_features-pdr"
   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"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -7920,13 +7794,12 @@
     layout: "plot-throughput"
 
 # Packet Throughput - VPP Container Memif 2n-skx-xxv710
--
-  type: "plot"
+- 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-latency-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -7955,13 +7828,12 @@
     title: "memif-2n-skx-xxv710-64b-2t1c-base_and_features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- 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-latency-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -7990,13 +7862,12 @@
     title: "memif-2n-skx-xxv710-64b-2t1c-base_and_features-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- 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-latency-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -8025,13 +7896,12 @@
     title: "memif-2n-skx-xxv710-64b-4t2c-base_and_features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- 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-latency-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -8063,13 +7933,12 @@
 ################################################################################
 
 # Packet Throughput - VPP Container Orchestrated Memif 3n-hsw-x520 l2xc
--
-  type: "plot"
+- 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-latency-3n-hsw"
+  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -8097,13 +7966,12 @@
     title: "k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- 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-latency-3n-hsw"
+  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -8131,13 +7999,12 @@
     title: "k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- 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-latency-3n-hsw"
+  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -8165,13 +8032,12 @@
     title: "k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- 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-latency-3n-hsw"
+  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -8200,13 +8066,12 @@
     layout: "plot-throughput"
 
 # Packet Throughput - VPP Container Orchestrated Memif 3n-hsw-x520 l2bd
--
-  type: "plot"
+- 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-latency-3n-hsw"
+  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -8234,13 +8099,12 @@
     title: "k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- 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-latency-3n-hsw"
+  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -8268,13 +8132,12 @@
     title: "k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- 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-latency-3n-hsw"
+  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -8302,13 +8165,12 @@
     title: "k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- 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-latency-3n-hsw"
+  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -8337,13 +8199,12 @@
     layout: "plot-throughput"
 
 # Packet Throughput - VPP Container Orchestrated Memif 3n-hsw-x710 l2xc
--
-  type: "plot"
+- 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-latency-3n-hsw"
+  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -8371,13 +8232,12 @@
     title: "k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- 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-latency-3n-hsw"
+  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -8405,13 +8265,12 @@
     title: "k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- 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-latency-3n-hsw"
+  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -8439,13 +8298,12 @@
     title: "k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- 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-latency-3n-hsw"
+  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -8474,13 +8332,12 @@
     layout: "plot-throughput"
 
 # Packet Throughput - VPP Container Orchestrated Memif 3n-hsw-x710 l2bd
--
-  type: "plot"
+- 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-latency-3n-hsw"
+  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -8508,13 +8365,12 @@
     title: "k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- 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-latency-3n-hsw"
+  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -8542,13 +8398,12 @@
     title: "k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- 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-latency-3n-hsw"
+  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -8576,13 +8431,12 @@
     title: "k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- 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-latency-3n-hsw"
+  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -8613,13 +8467,12 @@
 ################################################################################
 
 # 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"
-  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 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
@@ -8646,13 +8499,12 @@
     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"
-  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 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
@@ -8679,13 +8531,12 @@
     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"
-  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 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
@@ -8712,13 +8563,12 @@
     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"
-  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 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
@@ -8746,13 +8596,12 @@
     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"
-  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
@@ -8785,13 +8634,12 @@
     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"
-  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
@@ -8824,13 +8672,12 @@
     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"
-  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
@@ -8863,13 +8710,12 @@
     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"
-  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
@@ -8903,13 +8749,12 @@
     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"
-  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
@@ -8938,13 +8783,12 @@
     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"
-  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
@@ -8973,13 +8817,12 @@
     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"
-  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
@@ -9008,13 +8851,12 @@
     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"
-  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
@@ -9044,13 +8886,12 @@
     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"
-  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
@@ -9078,13 +8919,12 @@
     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"
-  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
@@ -9112,13 +8952,12 @@
     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"
-  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
@@ -9146,13 +8985,12 @@
     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"
-  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
@@ -9181,13 +9019,12 @@
     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"
-  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
@@ -9215,13 +9052,12 @@
     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"
-  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
@@ -9249,13 +9085,12 @@
     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"
-  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
@@ -9283,13 +9118,12 @@
     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"
-  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
@@ -9318,13 +9152,12 @@
     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"
-  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
@@ -9351,13 +9184,12 @@
     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"
-  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
@@ -9384,13 +9216,12 @@
     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"
-  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
@@ -9417,13 +9248,12 @@
     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"
-  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
@@ -9451,13 +9281,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or
@@ -9490,13 +9319,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or
@@ -9529,13 +9357,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or
@@ -9568,13 +9395,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or
@@ -9608,13 +9434,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -9642,13 +9467,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -9676,13 +9500,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -9710,13 +9533,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -9745,13 +9567,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -9778,13 +9599,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -9811,13 +9631,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -9844,13 +9663,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -9877,147 +9695,13 @@
     title: "ip4-3n-skx-x710-64b-4t2c-features-iacl-pdr"
     layout: "plot-throughput"
 
-## Packet Throughput - VPP IPv4 3n-hsw-x710 features oacl
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-oacl-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-oacl-ndr"
-#  data: "plot-vpp-throughput-latency-3n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           '2T1C' and
-#           'IP4FWD' and
-#           'OACL' and
-#           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4-3n-skx-x710-64b-2t1c-features-oacl-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-oacl-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-oacl-pdr"
-#  data: "plot-vpp-throughput-latency-3n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           '2T1C' and
-#           'IP4FWD' and
-#           'OACL' and
-#           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4-3n-skx-x710-64b-2t1c-features-oacl-pdr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-oacl-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-oacl-ndr"
-#  data: "plot-vpp-throughput-latency-3n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           '4T2C' and
-#           'IP4FWD' and
-#           'OACL' and
-#           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4-3n-skx-x710-64b-4t2c-features-oacl-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-oacl-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-oacl-pdr"
-#  data: "plot-vpp-throughput-latency-3n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           '4T2C' and
-#           'IP4FWD' and
-#           'OACL' and
-#           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4-3n-skx-x710-64b-4t2c-features-oacl-pdr"
-#    layout: "plot-throughput"
-
 # Packet Throughput - VPP IPv4 3n-hsw-xl710 base and scale
--
-  type: "plot"
+- 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"
-  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
@@ -10043,13 +9727,12 @@
     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"
-  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
@@ -10075,13 +9758,12 @@
     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"
-  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
@@ -10107,13 +9789,12 @@
     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"
-  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
@@ -10140,13 +9821,12 @@
     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"
-  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
@@ -10173,13 +9853,12 @@
     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"
-  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
@@ -10206,13 +9885,12 @@
     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"
-  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
@@ -10239,13 +9917,12 @@
     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"
-  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
@@ -10273,13 +9950,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or
@@ -10312,13 +9988,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or
@@ -10351,13 +10026,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or
@@ -10390,13 +10064,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or
@@ -10430,13 +10103,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -10464,13 +10136,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -10498,13 +10169,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -10532,13 +10202,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -10567,13 +10236,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -10600,13 +10268,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -10633,13 +10300,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -10666,13 +10332,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -10699,147 +10364,13 @@
     title: "ip4-3n-hsw-x710-64b-2t2c-features-iacl-pdr"
     layout: "plot-throughput"
 
-## Packet Throughput - VPP IPv4 3n-skx-x710 features oacl
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-features-oacl-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-oacl-ndr"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'IP4FWD' and
-#           'OACL' and
-#           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4-3n-hsw-x710-64b-1t1c-features-oacl-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-features-oacl-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-oacl-pdr"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'IP4FWD' and
-#           'OACL' and
-#           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4-3n-hsw-x710-64b-1t1c-features-oacl-pdr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-features-oacl-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-oacl-ndr"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'IP4FWD' and
-#           'OACL' and
-#           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4-3n-hsw-x710-64b-2t2c-features-oacl-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-features-oacl-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-oacl-pdr"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'IP4FWD' and
-#           'OACL' and
-#           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4-3n-hsw-x710-64b-2t2c-features-oacl-pdr"
-#    layout: "plot-throughput"
-
 # Packet Throughput - VPP IPv4 2n-skx-x710 base and scale
--
-  type: "plot"
+- 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"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
@@ -10866,13 +10397,12 @@
     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"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
@@ -10899,13 +10429,12 @@
     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"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
@@ -10932,13 +10461,12 @@
     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"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
@@ -10966,13 +10494,12 @@
     layout: "plot-throughput"
 
 # Packet Throughput - VPP IPv4 2n-skx-xxv710 base and scale
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
   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"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
@@ -10999,13 +10526,12 @@
     title: "ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
   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"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
@@ -11032,13 +10558,12 @@
     title: "ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
   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"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
@@ -11065,13 +10590,12 @@
     title: "ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
   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"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
@@ -11099,8 +10623,7 @@
     layout: "plot-throughput"
 
 # Packet Throughput - VPP IPv4 2n-dnv-x553 base and scale
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip4-2n-dnv-x553-64b-1t1c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -11128,8 +10651,7 @@
     title: "ip4-2n-dnv-x553-64b-1t1c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip4-2n-dnv-x553-64b-1t1c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -11157,8 +10679,7 @@
     title: "ip4-2n-dnv-x553-64b-1t1c-base-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip4-2n-dnv-x553-64b-2t2c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -11186,8 +10707,7 @@
     title: "ip4-2n-dnv-x553-64b-2t2c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip4-2n-dnv-x553-64b-2t2c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -11217,147 +10737,13 @@
 
 ################################################################################
 
-## Packet Throughput - VPP IPv4 tunnels 3n-hsw-x520 base and scale
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'ENCAP' and
-#           'NDRPDR' and
-#           '1T1C' and
-#           ('VXLAN' or 'LISP') and
-#           not 'VHOST' and
-#           not 'IPSECHW'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "not DOT1Q"
-#  - "VXLAN_1"
-#  - "VXLAN_10"
-#  - "VXLAN_100"
-#  - "VXLAN_1000"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'ENCAP' and
-#           'NDRPDR' and
-#           '1T1C' and
-#           ('VXLAN' or 'LISP') and
-#           not 'VHOST' and
-#           not 'IPSECHW'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "not DOT1Q"
-#  - "VXLAN_1"
-#  - "VXLAN_10"
-#  - "VXLAN_100"
-#  - "VXLAN_1000"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'ENCAP' and
-#           'NDRPDR' and
-#           '2T2C' and
-#           ('VXLAN' or 'LISP') and
-#           not 'VHOST' and
-#           not 'IPSECHW'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "not DOT1Q"
-#  - "VXLAN_1"
-#  - "VXLAN_10"
-#  - "VXLAN_100"
-#  - "VXLAN_1000"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'ENCAP' and
-#           'NDRPDR' and
-#           '2T2C' and
-#           ('VXLAN' or 'LISP') and
-#           not 'VHOST' and
-#           not 'IPSECHW'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "not DOT1Q"
-#  - "VXLAN_1"
-#  - "VXLAN_10"
-#  - "VXLAN_100"
-#  - "VXLAN_1000"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
-#    layout: "plot-throughput"
-
 # Packet Throughput - VPP IPv4 tunnels 3n-hsw-x520 - features
--
-  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"
-  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
@@ -11384,13 +10770,12 @@
     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"
-  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
@@ -11417,13 +10802,12 @@
     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"
-  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
@@ -11450,13 +10834,12 @@
     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"
-  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
@@ -11484,13 +10867,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
@@ -11518,13 +10900,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
@@ -11552,13 +10933,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
@@ -11586,13 +10966,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
@@ -11621,13 +11000,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
@@ -11654,13 +11032,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
@@ -11687,13 +11064,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
@@ -11720,13 +11096,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
@@ -11754,13 +11129,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
@@ -11788,13 +11162,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
@@ -11822,13 +11195,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
@@ -11856,13 +11228,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
@@ -11891,13 +11262,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
@@ -11924,13 +11294,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
@@ -11957,13 +11326,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
@@ -11990,13 +11358,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
@@ -12026,13 +11393,12 @@
 ################################################################################
 
 # 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"
-  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
@@ -12059,13 +11425,12 @@
     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"
-  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
@@ -12092,13 +11457,12 @@
     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"
-  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
@@ -12125,13 +11489,12 @@
     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"
-  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
@@ -12158,159 +11521,13 @@
     title: "ip6-3n-hsw-x520-78b-2t2c-base-pdr"
     layout: "plot-throughput"
 
-## Packet Throughput - VPP IPv6 3n-hsw-x520 - features
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip6-3n-hsw-x520-78b-1t1c-base_and_features-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-1t1c-base_and_features-ndr"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '78B' and
-#           ('IP6BASE' or
-#            'POLICE_MARK' or
-#            'COPWHLIST' or
-#            'IACLDST') and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'IP6FWD' and
-#           not 'SRv6' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP6BASE"
-#  - "POLICE_MARK"
-#  - "COPWHLIST"
-#  - "IACLDST"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip6-3n-hsw-x520-78b-1t1c-base_and_features-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip6-3n-hsw-x520-78b-2t2c-base_and_features-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-2t2c-base_and_features-ndr"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '78B' and
-#           ('IP6BASE' or
-#            'POLICE_MARK' or
-#            'COPWHLIST' or
-#            'IACLDST') and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'IP6FWD' and
-#           not 'SRv6' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP6BASE"
-#  - "POLICE_MARK"
-#  - "COPWHLIST"
-#  - "IACLDST"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip6-3n-hsw-x520-78b-2t2c-base_and_features-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip6-3n-hsw-x520-78b-1t1c-base_and_features-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-1t1c-base_and_features-pdr"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '78B' and
-#           ('IP6BASE' or
-#            'POLICE_MARK' or
-#            'COPWHLIST' or
-#            'IACLDST') and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'IP6FWD' and
-#           not 'SRv6' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP6BASE"
-#  - "POLICE_MARK"
-#  - "COPWHLIST"
-#  - "IACLDST"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip6-3n-hsw-x520-78b-1t1c-base_and_features-pdr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip6-3n-hsw-x520-78b-2t2c-base_and_features-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-2t2c-base_and_features-pdr"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '78B' and
-#           ('IP6BASE' or
-#            'POLICE_MARK' or
-#            'COPWHLIST' or
-#            'IACLDST') and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'IP6FWD' and
-#           not 'SRv6' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP6BASE"
-#  - "POLICE_MARK"
-#  - "COPWHLIST"
-#  - "IACLDST"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip6-3n-hsw-x520-78b-2t2c-base_and_features-pdr"
-#    layout: "plot-throughput"
-
 # Packet Throughput - VPP IPv6 3n-hsw-x710
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip6-3n-hsw-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
@@ -12337,13 +11554,12 @@
     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"
-  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
@@ -12370,13 +11586,12 @@
     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"
-  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
@@ -12403,13 +11618,12 @@
     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"
-  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
@@ -12437,13 +11651,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('IP6BASE' or
@@ -12473,13 +11686,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('IP6BASE' or
@@ -12509,13 +11721,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('IP6BASE' or
@@ -12545,13 +11756,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('IP6BASE' or
@@ -12582,13 +11792,12 @@
     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"
-  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
@@ -12615,13 +11824,12 @@
     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"
-  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
@@ -12648,13 +11856,12 @@
     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"
-  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
@@ -12681,13 +11888,12 @@
     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"
-  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
@@ -12715,13 +11921,12 @@
     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"
-  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
@@ -12748,13 +11953,12 @@
     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"
-  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
@@ -12781,13 +11985,12 @@
     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"
-  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
@@ -12814,13 +12017,12 @@
     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"
-  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
@@ -12848,13 +12050,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('IP6BASE' or
@@ -12884,13 +12085,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('IP6BASE' or
@@ -12920,13 +12120,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('IP6BASE' or
@@ -12956,13 +12155,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('IP6BASE' or
@@ -12993,13 +12191,12 @@
     layout: "plot-throughput"
 
 # Packet Throughput - VPP IPv6 2n-skx-x710
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip6-2n-skx-x710-78b-2t1c-base_and_scale-ndr"
   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"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('IP6BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
@@ -13026,13 +12223,12 @@
     title: "ip6-2n-skx-x710-78b-2t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip6-2n-skx-x710-78b-2t1c-base_and_scale-pdr"
   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"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('IP6BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
@@ -13059,13 +12255,12 @@
     title: "ip6-2n-skx-x710-78b-2t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip6-2n-skx-x710-78b-4t2c-base_and_scale-ndr"
   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"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('IP6BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
@@ -13092,13 +12287,12 @@
     title: "ip6-2n-skx-x710-78b-4t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip6-2n-skx-x710-78b-4t2c-base_and_scale-pdr"
   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"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('IP6BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
@@ -13126,13 +12320,12 @@
     layout: "plot-throughput"
 
 # Packet Throughput - VPP IPv6 2n-skx-xxv710
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr"
   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"
+  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
@@ -13159,13 +12352,12 @@
     title: "ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-pdr"
   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"
+  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
@@ -13192,13 +12384,12 @@
     title: "ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr"
   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"
+  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
@@ -13225,13 +12416,12 @@
     title: "ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-pdr"
   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"
+  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
@@ -13259,8 +12449,7 @@
     layout: "plot-throughput"
 
 # Packet Throughput - VPP IPv6 2n-dnv-x553 base
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip6-2n-dnv-x553-78b-1t1c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -13289,8 +12478,7 @@
     title: "ip6-2n-dnv-x553-78b-1t1c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip6-2n-dnv-x553-78b-1t1c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -13319,8 +12507,7 @@
     title: "ip6-2n-dnv-x553-78b-1t1c-base-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip6-2n-dnv-x553-78b-2t2c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -13349,8 +12536,7 @@
     title: "ip6-2n-dnv-x553-78b-2t2c-base-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: ip6-2n-dnv-x553-78b-2t2c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
@@ -13382,13 +12568,12 @@
 ################################################################################
 
 # 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"
-  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
@@ -13411,13 +12596,12 @@
     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"
-  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
@@ -13440,13 +12624,12 @@
     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"
-  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
@@ -13469,13 +12652,12 @@
     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"
-  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
@@ -13501,13 +12683,12 @@
 ################################################################################
 
 # 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"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'IP4FWD' and
@@ -13529,13 +12710,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'IP4FWD' and
@@ -13557,13 +12737,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'IP4FWD' and
@@ -13585,13 +12764,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'IP4FWD' and
@@ -13614,13 +12792,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'IP4FWD' and
@@ -13642,13 +12819,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'IP4FWD' and
@@ -13670,13 +12846,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'IP4FWD' and
@@ -13698,13 +12873,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'IP4FWD' and
@@ -13727,13 +12901,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'IP4FWD' and
@@ -13754,13 +12927,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'IP4FWD' and
@@ -13781,13 +12953,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'IP4FWD' and
@@ -13808,13 +12979,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'IP4FWD' and
@@ -13838,13 +13008,12 @@
 ################################################################################
 
 # 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"
-  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
@@ -13864,13 +13033,12 @@
     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"
-  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
@@ -13890,13 +13058,12 @@
     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"
-  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
@@ -13916,13 +13083,12 @@
     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"
-  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
@@ -13945,13 +13111,12 @@
 ################################################################################
 
 # 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"
-  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
@@ -13977,13 +13142,12 @@
     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"
-  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
@@ -14009,13 +13173,12 @@
     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"
-  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
@@ -14041,13 +13204,12 @@
     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"
-  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
@@ -14073,155 +13235,13 @@
     title: "vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
-## Packet Throughput - VPP vhost l2sw 3n-hsw-x520
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '1T1C' and
-#           'L2BDMACLRN' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "VM"  # "not CFS_OPT"
-##  - "CFS_OPT"
-##  - "FIB_10K"
-##  - "FIB_100K"
-##  - "FIB_1M"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '2T2C' and
-#           'L2BDMACLRN' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "VM"  # "not CFS_OPT"
-##  - "CFS_OPT"
-##  - "FIB_10K"
-##  - "FIB_100K"
-##  - "FIB_1M"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '1T1C' and
-#           'L2BDMACLRN' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "VM"  # "not CFS_OPT"
-##  - "CFS_OPT"
-##  - "FIB_10K"
-##  - "FIB_100K"
-##  - "FIB_1M"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '2T2C' and
-#           'L2BDMACLRN' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "VM"  # "not CFS_OPT"
-##  - "CFS_OPT"
-##  - "FIB_10K"
-##  - "FIB_100K"
-##  - "FIB_1M"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
-#    layout: "plot-throughput"
-
 # Packet Throughput - VPP vhost l2sw 3n-hsw-x520 - base
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_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
@@ -14252,13 +13272,12 @@
     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"
-  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
@@ -14289,13 +13308,12 @@
     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"
-  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
@@ -14326,13 +13344,12 @@
     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"
-  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
@@ -14364,13 +13381,12 @@
     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"
-  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
@@ -14400,13 +13416,12 @@
     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"
-  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
@@ -14436,13 +13451,12 @@
     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"
-  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
@@ -14472,13 +13486,12 @@
     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"
-  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
@@ -14509,13 +13522,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -14541,13 +13553,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -14573,13 +13584,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -14605,13 +13615,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -14637,155 +13646,13 @@
     title: "vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
-## Packet Throughput - VPP vhost l2sw 3n-hsw-x710
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '1T1C' and
-#           'L2BDMACLRN' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "VM"  # "not CFS_OPT"
-##  - "CFS_OPT"
-##  - "FIB_10K"
-##  - "FIB_100K"
-##  - "FIB_1M"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '2T2C' and
-#           'L2BDMACLRN' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "VM"  # "not CFS_OPT"
-##  - "CFS_OPT"
-##  - "FIB_10K"
-##  - "FIB_100K"
-##  - "FIB_1M"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '1T1C' and
-#           'L2BDMACLRN' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "VM"  # "not CFS_OPT"
-##  - "CFS_OPT"
-##  - "FIB_10K"
-##  - "FIB_100K"
-##  - "FIB_1M"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '2T2C' and
-#           'L2BDMACLRN' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "VM"  # "not CFS_OPT"
-##  - "CFS_OPT"
-##  - "FIB_10K"
-##  - "FIB_100K"
-##  - "FIB_1M"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
-#    layout: "plot-throughput"
-
 # Packet Throughput - VPP vhost l2sw 3n-hsw-x710 - base
--
-  type: "plot"
+- type: "plot"
   title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_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
@@ -14816,13 +13683,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -14853,13 +13719,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -14890,13 +13755,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -14928,13 +13792,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -14965,13 +13828,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -15002,13 +13864,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -15039,13 +13900,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -15076,562 +13936,13 @@
     title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-vm-pdr"
     layout: "plot-throughput"
 
-## Packet Throughput - VPP vhost ip4 3n-hsw-xl710
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '64B' and
-#           'NDRPDR' and
-#           'ETH' and
-#           'IP4FWD' and
-#           '1T1C' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'DOT1Q'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "1VM"
-#  - "2VM"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '64B' and
-#           'NDRPDR' and
-#           'ETH' and
-#           'IP4FWD' and
-#           '2T2C' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'DOT1Q'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "1VM"
-#  - "2VM"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '64B' and
-#           'NDRPDR' and
-#           'ETH' and
-#           'IP4FWD' and
-#           '1T1C' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'DOT1Q'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "1VM"
-#  - "2VM"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '64B' and
-#           'NDRPDR' and
-#           'ETH' and
-#           'IP4FWD' and
-#           '2T2C' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'DOT1Q'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "1VM"
-#  - "2VM"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
-#    layout: "plot-throughput"
-#
-## Packet Throughput - VPP vhost l2sw 3n-hsw-xl710
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '1T1C' and
-#           'L2BDMACLRN' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "VM"  # "not CFS_OPT"
-##  - "CFS_OPT"
-##  - "FIB_10K"
-##  - "FIB_100K"
-##  - "FIB_1M"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '2T2C' and
-#           'L2BDMACLRN' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "VM"  # "not CFS_OPT"
-##  - "CFS_OPT"
-##  - "FIB_10K"
-##  - "FIB_100K"
-##  - "FIB_1M"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '1T1C' and
-#           'L2BDMACLRN' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "VM"  # "not CFS_OPT"
-##  - "CFS_OPT"
-##  - "FIB_10K"
-##  - "FIB_100K"
-##  - "FIB_1M"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '2T2C' and
-#           'L2BDMACLRN' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "VM"  # "not CFS_OPT"
-##  - "CFS_OPT"
-##  - "FIB_10K"
-##  - "FIB_100K"
-##  - "FIB_1M"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
-#    layout: "plot-throughput"
-
-## Packet Throughput - VPP vhost l2sw 3n-hsw-xl710 - base
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-ndr"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           'BASE' and
-#           '1T1C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "not CFS_OPT"
-##  - "L2XCFWD"
-##  - "not CFS_OPT"
-##  - "CFS_OPT"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-pdr"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           'BASE' and
-#           '1T1C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "not CFS_OPT"
-##  - "L2XCFWD"
-##  - "not CFS_OPT"
-##  - "CFS_OPT"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-pdr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-ndr"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           'BASE' and
-#           '2T2C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "not CFS_OPT"
-##  - "L2XCFWD"
-##  - "not CFS_OPT"
-##  - "CFS_OPT"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-pdr"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           'BASE' and
-#           '2T2C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "not CFS_OPT"
-##  - "L2XCFWD"
-##  - "not CFS_OPT"
-##  - "CFS_OPT"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-pdr"
-#    layout: "plot-throughput"
-#
-## Packet Throughput - VPP vhost l2sw 3n-hsw-xl710 - base vm
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-vm-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-vm-ndr"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '1T1C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'CFS_OPT' and
-#           not 'VXLAN' and
-#           not 'IP4FWD'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "1VM"
-##  - "L2XCFWD"
-##  - "1VM"
-##  - "L2BDMACLRN"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-vm-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-vm-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-vm-pdr"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '1T1C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'CFS_OPT' and
-#           not 'VXLAN' and
-#           not 'IP4FWD'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "1VM"
-##  - "L2XCFWD"
-##  - "1VM"
-##  - "L2BDMACLRN"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-vm-pdr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-vm-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-vm-ndr"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '2T2C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'CFS_OPT' and
-#           not 'VXLAN' and
-#           not 'IP4FWD'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "1VM"
-##  - "L2XCFWD"
-##  - "1VM"
-##  - "L2BDMACLRN"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-vm-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-vm-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-vm-pdr"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '2T2C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'CFS_OPT' and
-#           not 'VXLAN' and
-#           not 'IP4FWD'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "1VM"
-##  - "L2XCFWD"
-##  - "1VM"
-##  - "L2BDMACLRN"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-vm-pdr"
-#    layout: "plot-throughput"
-
 # Packet Throughput - VPP vhost ip4 3n-skx-x710
--
-  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"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -15656,13 +13967,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -15687,13 +13997,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -15718,13 +14027,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -15749,155 +14057,13 @@
     title: "vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
-## Packet Throughput - VPP vhost l2sw 3n-skx-x710
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
-#  data: "plot-vpp-throughput-latency-3n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '2T1C' and
-#           'L2BDMACLRN' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "VM"  # "not CFS_OPT"
-##  - "CFS_OPT"
-##  - "FIB_10K"
-##  - "FIB_100K"
-##  - "FIB_1M"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
-#  data: "plot-vpp-throughput-latency-3n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '4T2C' and
-#           'L2BDMACLRN' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "VM"  # "not CFS_OPT"
-##  - "CFS_OPT"
-##  - "FIB_10K"
-##  - "FIB_100K"
-##  - "FIB_1M"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
-#  data: "plot-vpp-throughput-latency-3n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '2T1C' and
-#           'L2BDMACLRN' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "VM"  # "not CFS_OPT"
-##  - "CFS_OPT"
-##  - "FIB_10K"
-##  - "FIB_100K"
-##  - "FIB_1M"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
-#  data: "plot-vpp-throughput-latency-3n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '4T2C' and
-#           'L2BDMACLRN' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "VM"  # "not CFS_OPT"
-##  - "CFS_OPT"
-##  - "FIB_10K"
-##  - "FIB_100K"
-##  - "FIB_1M"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
-#    layout: "plot-throughput"
-
 # Packet Throughput - VPP vhost l2sw 3n-skx-x710 - 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"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -15908,8 +14074,7 @@
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not '2VM' and
-           not 'LBOND'"
+           not '2VM'"
   parameters:
   - "throughput"
   - "parent"
@@ -15917,6 +14082,8 @@
   sort:
   - "L2BDMACLRN"
   - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
   - "L2XCFWD"
   - "L2XCFWD"
   traces:
@@ -15927,13 +14094,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -15944,8 +14110,7 @@
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not '2VM' and
-           not 'LBOND'"
+           not '2VM'"
   parameters:
   - "throughput"
   - "parent"
@@ -15953,6 +14118,8 @@
   sort:
   - "L2BDMACLRN"
   - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
   - "L2XCFWD"
   - "L2XCFWD"
   traces:
@@ -15963,13 +14130,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -15980,8 +14146,7 @@
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not '2VM' and
-           not 'LBOND'"
+           not '2VM'"
   parameters:
   - "throughput"
   - "parent"
@@ -15989,6 +14154,8 @@
   sort:
   - "L2BDMACLRN"
   - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
   - "L2XCFWD"
   - "L2XCFWD"
   traces:
@@ -15999,13 +14166,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -16016,8 +14182,7 @@
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not '2VM' and
-           not 'LBOND'"
+           not '2VM'"
   parameters:
   - "throughput"
   - "parent"
@@ -16025,6 +14190,8 @@
   sort:
   - "L2BDMACLRN"
   - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
   - "L2XCFWD"
   - "L2XCFWD"
   traces:
@@ -16036,13 +14203,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -16073,13 +14239,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -16110,13 +14275,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -16147,13 +14311,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -16185,13 +14348,12 @@
     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"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -16218,13 +14380,12 @@
     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"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -16251,13 +14412,12 @@
     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"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -16284,13 +14444,12 @@
     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"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -16317,159 +14476,13 @@
     title: "vhost-ip4-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
-## Packet Throughput - VPP vhost l2sw 2n-skx-x710
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
-#  data: "plot-vpp-throughput-latency-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '2T1C' and
-#           'L2BDMACLRN' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'NF_DENSITY' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "VM"  # "not CFS_OPT"
-##  - "CFS_OPT"
-##  - "FIB_10K"
-##  - "FIB_100K"
-##  - "FIB_1M"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
-#  data: "plot-vpp-throughput-latency-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '4T2C' and
-#           'L2BDMACLRN' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'NF_DENSITY' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "VM"  # "not CFS_OPT"
-##  - "CFS_OPT"
-##  - "FIB_10K"
-##  - "FIB_100K"
-##  - "FIB_1M"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
-#  data: "plot-vpp-throughput-latency-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '2T1C' and
-#           'L2BDMACLRN' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'NF_DENSITY' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "VM"  # "not CFS_OPT"
-##  - "CFS_OPT"
-##  - "FIB_10K"
-##  - "FIB_100K"
-##  - "FIB_1M"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
-#  data: "plot-vpp-throughput-latency-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '4T2C' and
-#           'L2BDMACLRN' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'NF_DENSITY' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "VM"  # "not CFS_OPT"
-##  - "CFS_OPT"
-##  - "FIB_10K"
-##  - "FIB_100K"
-##  - "FIB_1M"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
-#    layout: "plot-throughput"
-
 # Packet Throughput - VPP vhost l2sw 2n-skx-x710 - 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"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -16499,13 +14512,12 @@
     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"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -16535,13 +14547,12 @@
     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"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -16571,13 +14582,12 @@
     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"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -16608,13 +14618,12 @@
     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"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -16644,13 +14653,12 @@
     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"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -16680,13 +14688,12 @@
     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"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -16716,13 +14723,12 @@
     title: "vhost-l2sw-2n-skx-x710-64b-4t2c-base-vm-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- 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
@@ -16753,13 +14759,12 @@
     layout: "plot-throughput"
 
 # Packet Throughput - VPP vhost ip4 2n-skx-xxv710
--
-  type: "plot"
+- 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"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'NDRPDR' and
@@ -16785,13 +14790,12 @@
     title: "vhost-ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- 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"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'NDRPDR' and
@@ -16817,13 +14821,12 @@
     title: "vhost-ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- 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"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'NDRPDR' and
@@ -16849,13 +14852,12 @@
     title: "vhost-ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- 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"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'NDRPDR' and
@@ -16881,155 +14883,13 @@
     title: "vhost-ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
-## Packet Throughput - VPP vhost l2sw 2n-skx-xxv710
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
-#  data: "plot-vpp-throughput-latency-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '2T1C' and
-#           'L2BDMACLRN' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "VM"  # "not CFS_OPT"
-##  - "CFS_OPT"
-##  - "FIB_10K"
-##  - "FIB_100K"
-##  - "FIB_1M"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
-#  data: "plot-vpp-throughput-latency-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '4T2C' and
-#           'L2BDMACLRN' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "VM"  # "not CFS_OPT"
-##  - "CFS_OPT"
-##  - "FIB_10K"
-##  - "FIB_100K"
-##  - "FIB_1M"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
-#  data: "plot-vpp-throughput-latency-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '2T1C' and
-#           'L2BDMACLRN' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "VM"  # "not CFS_OPT"
-##  - "CFS_OPT"
-##  - "FIB_10K"
-##  - "FIB_100K"
-##  - "FIB_1M"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
-#  data: "plot-vpp-throughput-latency-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '4T2C' and
-#           'L2BDMACLRN' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "VM"  # "not CFS_OPT"
-##  - "CFS_OPT"
-##  - "FIB_10K"
-##  - "FIB_100K"
-##  - "FIB_1M"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
-#    layout: "plot-throughput"
-
 # Packet Throughput - VPP vhost l2sw 2n-skx-xxv710 - base
--
-  type: "plot"
+- 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"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'NDRPDR' and
@@ -17058,13 +14918,12 @@
     title: "vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- 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"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'NDRPDR' and
@@ -17093,13 +14952,12 @@
     title: "vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_features-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- 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"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'NDRPDR' and
@@ -17128,13 +14986,12 @@
     title: "vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_features-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- 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-latency-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'NDRPDR' and
@@ -17164,13 +15021,12 @@
     layout: "plot-throughput"
 
 # Packet Throughput - VPP vhost l2sw 2n-skx-xxv710 - base vm
--
-  type: "plot"
+- 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-latency-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'NDRPDR' and
@@ -17199,13 +15055,12 @@
     title: "vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-vm-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- 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-latency-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'NDRPDR' and
@@ -17234,13 +15089,12 @@
     title: "vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-vm-pdr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- 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-latency-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'NDRPDR' and
@@ -17269,13 +15123,12 @@
     title: "vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-ndr"
     layout: "plot-throughput"
 
--
-  type: "plot"
+- 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-latency-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'NDRPDR' and
@@ -17307,13 +15160,12 @@
 ################################################################################
 
 # 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"
-  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
@@ -17331,13 +15183,12 @@
     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"
-  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
@@ -17355,13 +15206,12 @@
     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"
-  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
@@ -17379,13 +15229,12 @@
     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"
-  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
@@ -17406,8 +15255,7 @@
 ################################################################################
 
 # 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"
@@ -17431,8 +15279,7 @@
     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"
@@ -17456,8 +15303,7 @@
     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"
@@ -17481,8 +15327,7 @@
     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"
@@ -17507,8 +15352,7 @@
     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"
@@ -17532,8 +15376,7 @@
     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"
@@ -17557,8 +15400,7 @@
     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"
@@ -17582,8 +15424,7 @@
     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"
@@ -17608,8 +15449,7 @@
     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"
@@ -17633,8 +15473,7 @@
     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"
@@ -17658,8 +15497,7 @@
     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"
@@ -17683,8 +15521,7 @@
     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"
@@ -17709,8 +15546,7 @@
     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"
@@ -17734,8 +15570,7 @@
     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"
@@ -17759,8 +15594,7 @@
     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"
@@ -17784,8 +15618,7 @@
     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"
@@ -17810,8 +15643,7 @@
     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"
@@ -17835,8 +15667,7 @@
     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"
@@ -17860,8 +15691,7 @@
     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"
@@ -17885,8 +15715,7 @@
     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"
@@ -17911,8 +15740,7 @@
     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"
@@ -17936,8 +15764,7 @@
     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"
@@ -17961,8 +15788,7 @@
     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"
@@ -17986,8 +15812,7 @@
     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"
@@ -18012,8 +15837,7 @@
     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"
@@ -18037,8 +15861,7 @@
     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"
@@ -18062,8 +15885,7 @@
     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"
@@ -18087,8 +15909,7 @@
     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"
@@ -18115,8 +15936,7 @@
 ################################################################################
 
 # 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"
@@ -18140,8 +15960,7 @@
     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"
@@ -18165,8 +15984,7 @@
     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"
@@ -18190,8 +16008,7 @@
     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"
@@ -18216,8 +16033,7 @@
     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"
@@ -18241,8 +16057,7 @@
     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"
@@ -18266,8 +16081,7 @@
     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"
@@ -18291,8 +16105,7 @@
     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"
@@ -18317,8 +16130,7 @@
     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"
@@ -18342,8 +16154,7 @@
     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"
@@ -18367,8 +16178,7 @@
     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"
@@ -18392,8 +16202,7 @@
     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"
@@ -18418,8 +16227,7 @@
     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"
@@ -18443,8 +16251,7 @@
     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"
@@ -18468,8 +16275,7 @@
     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"
@@ -18493,8 +16299,7 @@
     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"
@@ -18519,8 +16324,7 @@
     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"
@@ -18544,8 +16348,7 @@
     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"
@@ -18569,8 +16372,7 @@
     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"
@@ -18594,8 +16396,7 @@
     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"
@@ -18620,8 +16421,7 @@
     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"
@@ -18645,8 +16445,7 @@
     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"
@@ -18670,8 +16469,7 @@
     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"
@@ -18695,8 +16493,7 @@
     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"
@@ -18721,8 +16518,7 @@
     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"
@@ -18746,8 +16542,7 @@
     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"
@@ -18771,8 +16566,7 @@
     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"
@@ -18796,8 +16590,7 @@
     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"
@@ -18824,13 +16617,12 @@
 ################################################################################
 
 # 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"
-  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
@@ -18855,13 +16647,12 @@
     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"
-  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
@@ -18887,13 +16678,12 @@
     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"
-  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
@@ -18915,13 +16705,12 @@
     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"
-  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
@@ -18944,13 +16733,12 @@
     layout: "plot-latency"
 
 # 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"
-  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
@@ -18975,13 +16763,12 @@
     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"
-  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
@@ -19007,13 +16794,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -19036,13 +16822,12 @@
     title: "l2sw-3n-hsw-x710-64b-1t1c-features-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- 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-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -19066,13 +16851,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'BASE' and
@@ -19094,13 +16878,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'BASE' and
@@ -19123,13 +16906,12 @@
     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"
-  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
@@ -19155,13 +16937,12 @@
     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"
-  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
@@ -19188,13 +16969,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -19218,13 +16998,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -19249,13 +17028,12 @@
     layout: "plot-latency"
 
 # Packet Latency - VPP L2 3n-skx-xxv710 base and scale
--
-  type: "plot"
+- 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"
-  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
@@ -19278,13 +17056,12 @@
     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"
-  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
@@ -19308,13 +17085,12 @@
     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"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ETH' and
@@ -19339,13 +17115,12 @@
     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"
-  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
@@ -19371,13 +17146,12 @@
     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"
-  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
@@ -19402,13 +17176,12 @@
     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"
-  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
@@ -19436,13 +17209,12 @@
 ################################################################################
 
 # 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"
-  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
@@ -19467,13 +17239,12 @@
     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"
-  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
@@ -19499,13 +17270,12 @@
     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"
-  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
@@ -19530,13 +17300,12 @@
     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"
-  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
@@ -19562,13 +17331,12 @@
     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"
-  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
@@ -19593,13 +17361,12 @@
     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"
-  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
@@ -19625,13 +17392,12 @@
     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"
-  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
@@ -19656,13 +17422,12 @@
     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"
-  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
@@ -19688,13 +17453,12 @@
     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"
-  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
@@ -19720,13 +17484,12 @@
     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"
-  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
@@ -19753,13 +17516,12 @@
     layout: "plot-latency"
 
 # Packet Latency - VPP Container Memif 2n-skx-xxv710
--
-  type: "plot"
+- 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"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -19784,13 +17546,12 @@
     title: "memif-2n-skx-xxv710-64b-2t1c-base_and_features-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- 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"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -19818,13 +17579,12 @@
 ################################################################################
 
 # Packet Latency - VPP Container Memif 3n-hsw-x520 - l2xc
--
-  type: "plot"
+- 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"
+  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -19848,13 +17608,12 @@
     title: "k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- 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"
+  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -19879,13 +17638,12 @@
     layout: "plot-latency"
 
 # Packet Latency - VPP Container Memif 3n-hsw-x520 - l2bd
--
-  type: "plot"
+- 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"
+  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -19909,13 +17667,12 @@
     title: "k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- 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"
+  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -19940,13 +17697,12 @@
     layout: "plot-latency"
 
 # Packet Latency - VPP Container Memif 3n-hsw-x710 - l2xc
--
-  type: "plot"
+- 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"
+  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -19970,13 +17726,12 @@
     title: "k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- 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"
+  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -20001,13 +17756,12 @@
     layout: "plot-latency"
 
 # Packet Latency - VPP Container Memif 3n-hsw-x710 - l2bd
--
-  type: "plot"
+- 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"
+  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -20031,13 +17785,12 @@
     title: "k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- 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"
+  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -20064,13 +17817,12 @@
 ################################################################################
 
 # 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"
-  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 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
@@ -20094,13 +17846,12 @@
     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"
-  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 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
@@ -20125,13 +17876,12 @@
     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"
-  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
@@ -20160,13 +17910,12 @@
     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"
-  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
@@ -20196,13 +17945,12 @@
     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"
-  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
@@ -20227,13 +17975,12 @@
     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"
-  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
@@ -20259,13 +18006,12 @@
     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"
-  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
@@ -20289,13 +18035,12 @@
     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"
-  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
@@ -20320,13 +18065,12 @@
     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"
-  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
@@ -20350,13 +18094,12 @@
     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"
-  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
@@ -20381,13 +18124,12 @@
     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"
-  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
@@ -20410,13 +18152,12 @@
     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"
-  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
@@ -20440,13 +18181,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or
@@ -20475,13 +18215,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or
@@ -20511,13 +18250,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -20541,13 +18279,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -20572,13 +18309,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -20601,13 +18337,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -20630,73 +18365,13 @@
     title: "ip4-3n-hsw-x710-64b-2t2c-features-iacl-ndr"
     layout: "plot-latency"
 
-## Packet Latency - VPP IPv4 3n-hsw-x710 features oacl
-#-
-#  type: "plot"
-#  title: "VPP Latency: ip4-3n-hsw-x710-64b-1t1c-features-oacl-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-oacl-ndr-lat"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           '1T1C' and
-#           'IP4FWD' and
-#           'OACL' and
-#           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  layout:
-#    title: "ip4-3n-hsw-x710-64b-1t1c-features-oacl-ndr"
-#    layout: "plot-latency"
-#
-#-
-#  type: "plot"
-#  title: "VPP Latency: ip4-3n-hsw-x710-64b-2t2c-features-oacl-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-oacl-ndr-lat"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           '2T2C' and
-#           'IP4FWD' and
-#           'OACL' and
-#           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  layout:
-#    title: "ip4-3n-hsw-x710-64b-2t2c-features-oacl-ndr"
-#    layout: "plot-latency"
-
 # Packet Latency - VPP IPv4 3n-hsw-xl710 base and scale
--
-  type: "plot"
+- 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"
-  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
@@ -20718,13 +18393,12 @@
     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"
-  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
@@ -20747,13 +18421,12 @@
     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"
-  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
@@ -20776,13 +18449,12 @@
     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"
-  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
@@ -20806,13 +18478,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or
@@ -20841,13 +18512,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or
@@ -20877,13 +18547,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -20907,13 +18576,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -20938,13 +18606,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -20967,13 +18634,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -20997,73 +18663,13 @@
     title: "ip4-3n-skx-x710-64b-4t2c-features-iacl-ndr"
     layout: "plot-latency"
 
-## Packet Latency - VPP IPv4 3n-skx-x710 features oacl
-#-
-#  type: "plot"
-#  title: "VPP Latency: ip4-3n-skx-x710-64b-2t1c-features-oacl-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-oacl-ndr-lat"
-#  data: "plot-vpp-throughput-latency-3n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           '2T1C' and
-#           'IP4FWD' and
-#           'OACL' and
-#           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  layout:
-#    title: "ip4-3n-skx-x710-64b-2t1c-features-oacl-ndr"
-#    layout: "plot-latency"
-#
-#-
-#  type: "plot"
-#  title: "VPP Latency: ip4-3n-skx-x710-64b-4t2c-features-oacl-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-ndr-oacl-lat"
-#  data: "plot-vpp-throughput-latency-3n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           '4T2C' and
-#           'IP4FWD' and
-#           'OACL' and
-#           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  layout:
-#    title: "ip4-3n-skx-x710-64b-4t2c-features-oacl-ndr"
-#    layout: "plot-latency"
-
 # Packet Latency - VPP IPv4 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"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
@@ -21086,13 +18692,12 @@
     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"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
@@ -21116,13 +18721,12 @@
     layout: "plot-latency"
 
 # 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"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
@@ -21145,13 +18749,12 @@
     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"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
@@ -21176,73 +18779,13 @@
 
 ################################################################################
 
-## Packet Latency - VPP Ipv4 tunnels 3n-hsw-x520
-#-
-#  type: "plot"
-#  title: "VPP Latency: ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'ENCAP' and
-#           'NDRPDR' and
-#           '1T1C' and
-#           ('VXLAN' or 'LISP') and
-#           not 'VHOST' and
-#           not 'IPSECHW'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "not DOT1Q"
-#  - "VXLAN_1"
-#  - "VXLAN_10"
-#  - "VXLAN_100"
-#  - "VXLAN_1000"
-#  layout:
-#    title: "ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
-#    layout: "plot-latency"
-#
-#-
-#  type: "plot"
-#  title: "VPP Latency: ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'ENCAP' and
-#           'NDRPDR' and
-#           '2T2C' and
-#           ('VXLAN' or 'LISP') and
-#           not 'VHOST' and
-#           not 'IPSECHW'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "not DOT1Q"
-#  - "VXLAN_1"
-#  - "VXLAN_10"
-#  - "VXLAN_100"
-#  - "VXLAN_1000"
-#  layout:
-#    title: "ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
-#    layout: "plot-latency"
-
 # Packet Latency - VPP Ipv4 tunnels 3n-hsw-x520 - features
--
-  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"
-  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
@@ -21265,13 +18808,12 @@
     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"
-  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
@@ -21295,13 +18837,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
@@ -21325,13 +18866,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
@@ -21356,13 +18896,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
@@ -21385,13 +18924,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
@@ -21415,13 +18953,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
@@ -21445,13 +18982,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
@@ -21476,13 +19012,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
@@ -21505,13 +19040,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
@@ -21537,13 +19071,12 @@
 ################################################################################
 
 # 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"
-  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
@@ -21566,13 +19099,12 @@
     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"
-  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
@@ -21596,13 +19128,12 @@
     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"
-  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
@@ -21625,13 +19156,12 @@
     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"
-  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
@@ -21655,13 +19185,12 @@
     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"
-  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
@@ -21684,13 +19213,12 @@
     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"
-  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
@@ -21714,13 +19242,12 @@
     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"
-  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
@@ -21743,13 +19270,12 @@
     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"
-  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
@@ -21773,13 +19299,12 @@
     layout: "plot-latency"
 
 # 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"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('IP6BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
@@ -21802,13 +19327,12 @@
     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"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('IP6BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
@@ -21832,13 +19356,12 @@
     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"
-  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
@@ -21861,13 +19384,12 @@
     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"
-  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
@@ -21893,13 +19415,12 @@
 ################################################################################
 
 # 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"
-  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
@@ -21918,13 +19439,12 @@
     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"
-  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
@@ -21946,13 +19466,12 @@
 ################################################################################
 
 # 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"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'IP4FWD' and
@@ -21970,13 +19489,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'IP4FWD' and
@@ -21995,13 +19513,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'IP4FWD' and
@@ -22019,13 +19536,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'IP4FWD' and
@@ -22044,13 +19560,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'IP4FWD' and
@@ -22067,13 +19582,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'IP4FWD' and
@@ -22093,13 +19607,12 @@
 ################################################################################
 
 # 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"
-  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
@@ -22115,13 +19628,12 @@
     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"
-  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
@@ -22140,13 +19652,12 @@
 ################################################################################
 
 # 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"
-  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
@@ -22168,13 +19679,12 @@
     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"
-  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
@@ -22196,77 +19706,13 @@
     title: "vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
     layout: "plot-latency"
 
-## Packet Latency - VPP vhost l2sw 3n-hsw-x520
-#-
-#  type: "plot"
-#  title: "VPP Latency: vhost-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]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '1T1C' and
-#           'L2BDMACLRN' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "VM"  # "not CFS_OPT"
-##  - "CFS_OPT"
-##  - "FIB_10K"
-##  - "FIB_100K"
-##  - "FIB_1M"
-#  layout:
-#    title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
-#    layout: "plot-latency"
-#
-#-
-#  type: "plot"
-#  title: "VPP Latency: vhost-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]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '2T2C' and
-#           'L2BDMACLRN' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "VM"  # "not CFS_OPT"
-##  - "CFS_OPT"
-##  - "FIB_10K"
-##  - "FIB_100K"
-##  - "FIB_1M"
-#  layout:
-#    title: "vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
-#    layout: "plot-latency"
-
 # 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"
-  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
@@ -22293,13 +19739,12 @@
     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"
-  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
@@ -22327,13 +19772,12 @@
     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"
-  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
@@ -22359,13 +19803,12 @@
     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"
-  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
@@ -22392,13 +19835,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -22420,13 +19862,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -22448,77 +19889,13 @@
     title: "vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
     layout: "plot-latency"
 
-## Packet Latency - VPP vhost l2sw 3n-hsw-x710
-#-
-#  type: "plot"
-#  title: "VPP Latency: vhost-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]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '1T1C' and
-#           'L2BDMACLRN' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "VM"  # "not CFS_OPT"
-##  - "CFS_OPT"
-##  - "FIB_10K"
-##  - "FIB_100K"
-##  - "FIB_1M"
-#  layout:
-#    title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
-#    layout: "plot-latency"
-#
-#-
-#  type: "plot"
-#  title: "VPP Latency: vhost-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]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '2T2C' and
-#           'L2BDMACLRN' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "VM"  # "not CFS_OPT"
-##  - "CFS_OPT"
-##  - "FIB_10K"
-##  - "FIB_100K"
-##  - "FIB_1M"
-#  layout:
-#    title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
-#    layout: "plot-latency"
-
 # 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"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -22545,13 +19922,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -22579,13 +19955,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -22612,13 +19987,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -22645,258 +20019,13 @@
     title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-vm-ndr"
     layout: "plot-latency"
 
-## Packet Latency - VPP vhost ip4 3n-hsw-xl710
-#-
-#  type: "plot"
-#  title: "VPP Latency: vhost-ip4-3n-hsw-xl710-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-xl710-64b-1t1c-base_and_scale-ndr-lat"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '64B' and
-#           'NDRPDR' and
-#           'ETH' and
-#           'IP4FWD' and
-#           '1T1C' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'DOT1Q'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "1VM"
-#  - "2VM"
-#  layout:
-#    title: "vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
-#    layout: "plot-latency"
-#
-#-
-#  type: "plot"
-#  title: "VPP Latency: vhost-ip4-3n-hsw-xl710-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-xl710-64b-2t2c-base_and_scale-ndr-lat"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '64B' and
-#           'NDRPDR' and
-#           'ETH' and
-#           'IP4FWD' and
-#           '2T2C' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'DOT1Q'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "1VM"
-#  - "2VM"
-#  layout:
-#    title: "vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
-#    layout: "plot-latency"
-#
-## Packet Latency - VPP vhost l2sw 3n-hsw-xl710
-#-
-#  type: "plot"
-#  title: "VPP Latency: vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '1T1C' and
-#           'L2BDMACLRN' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "VM"  # "not CFS_OPT"
-##  - "CFS_OPT"
-##  - "FIB_10K"
-##  - "FIB_100K"
-##  - "FIB_1M"
-#  layout:
-#    title: "vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
-#    layout: "plot-latency"
-#
-#-
-#  type: "plot"
-#  title: "VPP Latency: vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '2T2C' and
-#           'L2BDMACLRN' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "VM"  # "not CFS_OPT"
-##  - "CFS_OPT"
-##  - "FIB_10K"
-##  - "FIB_100K"
-##  - "FIB_1M"
-#  layout:
-#    title: "vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
-#    layout: "plot-latency"
-#
-## Packet Latency - VPP vhost l2sw 3n-hsw-xl710 - base
-#-
-#  type: "plot"
-#  title: "VPP Latency: vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           'BASE' and
-#           '1T1C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "not CFS_OPT"
-##  - "L2XCFWD"
-##  - "not CFS_OPT"
-##  - "CFS_OPT"
-#  layout:
-#    title: "vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-ndr"
-#    layout: "plot-latency"
-#
-#-
-#  type: "plot"
-#  title: "VPP Latency: vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           'BASE' and
-#           '2T2C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "not CFS_OPT"
-##  - "L2XCFWD"
-##  - "not CFS_OPT"
-##  - "CFS_OPT"
-#  layout:
-#    title: "vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-ndr"
-#    layout: "plot-latency"
-#
-## Packet Latency - VPP vhost l2sw 3n-hsw-xl710 - base vm
-#-
-#  type: "plot"
-#  title: "VPP Latency: vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-vm-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-vm-ndr-lat"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '1T1C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'CFS_OPT' and
-#           not 'VXLAN' and
-#           not 'IP4FWD'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "1VM"
-##  - "L2XCFWD"
-##  - "1VM"
-##  - "L2BDMACLRN"
-#  layout:
-#    title: "vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-vm-ndr"
-#    layout: "plot-latency"
-#
-#-
-#  type: "plot"
-#  title: "VPP Latency: vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-vm-ndr-lat"
-#  algorithm: "plot_latency_error_bars"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-vm-ndr-lat"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '2T2C' and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'CFS_OPT' and
-#           not 'VXLAN' and
-#           not 'IP4FWD'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "1VM"
-##  - "L2XCFWD"
-##  - "1VM"
-##  - "L2BDMACLRN"
-#  layout:
-#    title: "vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-vm-ndr"
-#    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"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -22917,13 +20046,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -22944,77 +20072,13 @@
     title: "vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
     layout: "plot-latency"
 
-## Packet Latency - VPP vhost l2sw 3n-skx-x710
-#-
-#  type: "plot"
-#  title: "VPP Latency: vhost-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]}/vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
-#  data: "plot-vpp-throughput-latency-3n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '2T1C' and
-#           'L2BDMACLRN' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "VM"  # "not CFS_OPT"
-##  - "CFS_OPT"
-##  - "FIB_10K"
-##  - "FIB_100K"
-##  - "FIB_1M"
-#  layout:
-#    title: "vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
-#    layout: "plot-latency"
-#
-#-
-#  type: "plot"
-#  title: "VPP Latency: vhost-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]}/vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
-#  data: "plot-vpp-throughput-latency-3n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '4T2C' and
-#           'L2BDMACLRN' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "VM"  # "not CFS_OPT"
-##  - "CFS_OPT"
-##  - "FIB_10K"
-##  - "FIB_100K"
-##  - "FIB_1M"
-#  layout:
-#    title: "vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
-#    layout: "plot-latency"
-
 # 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"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -23025,8 +20089,7 @@
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not '2VM' and
-           not 'LBOND'"
+           not '2VM'"
   parameters:
   - "latency"
   - "parent"
@@ -23034,19 +20097,20 @@
   sort:
   - "L2BDMACLRN"
   - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
   - "L2XCFWD"
   - "L2XCFWD"
   layout:
     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"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -23057,8 +20121,7 @@
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not '2VM' and
-           not 'LBOND'"
+           not '2VM'"
   parameters:
   - "latency"
   - "parent"
@@ -23066,6 +20129,8 @@
   sort:
   - "L2BDMACLRN"
   - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
   - "L2XCFWD"
   - "L2XCFWD"
   layout:
@@ -23073,13 +20138,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -23106,13 +20170,12 @@
     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"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -23140,13 +20203,12 @@
     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"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -23169,13 +20231,12 @@
     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"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -23198,79 +20259,13 @@
     title: "vhost-ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
     layout: "plot-latency"
 
-## Packet Latency - VPP vhost l2sw 2n-skx-x710
-#-
-#  type: "plot"
-#  title: "VPP Latency: vhost-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]}/vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
-#  data: "plot-vpp-throughput-latency-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '2T1C' and
-#           'L2BDMACLRN' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not 'NF_DENSITY' and
-#           not '2VM'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "VM"  # "not CFS_OPT"
-##  - "CFS_OPT"
-##  - "FIB_10K"
-##  - "FIB_100K"
-##  - "FIB_1M"
-#  layout:
-#    title: "vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
-#    layout: "plot-latency"
-#
-#-
-#  type: "plot"
-#  title: "VPP Latency: vhost-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]}/vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
-#  data: "plot-vpp-throughput-latency-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           '4T2C' and
-#           'L2BDMACLRN' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'NF_DENSITY' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "VM"  # "not CFS_OPT"
-##  - "CFS_OPT"
-##  - "FIB_10K"
-##  - "FIB_100K"
-##  - "FIB_1M"
-#  layout:
-#    title: "vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
-#    layout: "plot-latency"
-
 # 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"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -23296,13 +20291,12 @@
     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"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -23329,13 +20323,12 @@
     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"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -23361,13 +20354,12 @@
     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"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -23394,13 +20386,12 @@
     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"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'NDRPDR' and
@@ -23423,13 +20414,12 @@
     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"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'NDRPDR' and
@@ -23452,77 +20442,13 @@
     title: "vhost-ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
     layout: "plot-latency"
 
-## Packet Latency - VPP vhost l2sw 2n-skx-xxv710
-#-
-#  type: "plot"
-#  title: "VPP Latency: vhost-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]}/vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-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' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "VM"  # "not CFS_OPT"
-##  - "CFS_OPT"
-##  - "FIB_10K"
-##  - "FIB_100K"
-##  - "FIB_1M"
-#  layout:
-#    title: "vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
-#    layout: "plot-latency"
-#
-#-
-#  type: "plot"
-#  title: "VPP Latency: vhost-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]}/vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-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' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "VM"  # "not CFS_OPT"
-##  - "CFS_OPT"
-##  - "FIB_10K"
-##  - "FIB_100K"
-##  - "FIB_1M"
-#  layout:
-#    title: "vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
-#    layout: "plot-latency"
-
 # Packet Latency - VPP vhost l2sw 2n-skx-xxv710 - base
--
-  type: "plot"
+- 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"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'NDRPDR' and
@@ -23547,13 +20473,12 @@
     title: "vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_features-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- 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"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'NDRPDR' and
@@ -23579,13 +20504,12 @@
     layout: "plot-latency"
 
 # Packet Latency - VPP vhost l2sw 2n-skx-xxv710 - base vm
--
-  type: "plot"
+- 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"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'NDRPDR' and
@@ -23610,13 +20534,12 @@
     title: "vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-vm-ndr"
     layout: "plot-latency"
 
--
-  type: "plot"
+- 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"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'NDRPDR' and
@@ -23644,13 +20567,12 @@
 ################################################################################
 
 # 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"
-  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
@@ -23664,13 +20586,12 @@
     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"
-  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
@@ -23687,8 +20608,7 @@
 ################################################################################
 
 # 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"
@@ -23708,8 +20628,7 @@
     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"
@@ -23730,8 +20649,7 @@
     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"
@@ -23751,8 +20669,7 @@
     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"
@@ -23773,8 +20690,7 @@
     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"
@@ -23794,8 +20710,7 @@
     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"
@@ -23816,8 +20731,7 @@
     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"
@@ -23837,8 +20751,7 @@
     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"
@@ -23859,8 +20772,7 @@
     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"
@@ -23880,8 +20792,7 @@
     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"
@@ -23902,8 +20813,7 @@
     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"
@@ -23923,8 +20833,7 @@
     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"
@@ -23945,8 +20854,7 @@
     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"
@@ -23966,8 +20874,7 @@
     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"
@@ -23990,8 +20897,7 @@
 ################################################################################
 
 # 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"
@@ -24011,8 +20917,7 @@
     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"
@@ -24033,8 +20938,7 @@
     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"
@@ -24054,8 +20958,7 @@
     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"
@@ -24076,8 +20979,7 @@
     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"
@@ -24097,8 +20999,7 @@
     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"
@@ -24119,8 +21020,7 @@
     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"
@@ -24140,8 +21040,7 @@
     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"
@@ -24162,8 +21061,7 @@
     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"
@@ -24183,8 +21081,7 @@
     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"
@@ -24205,8 +21102,7 @@
     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"
@@ -24226,8 +21122,7 @@
     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"
@@ -24248,8 +21143,7 @@
     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"
@@ -24269,8 +21163,7 @@
     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"
@@ -24293,13 +21186,12 @@
 ################################################################################
 
 # 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"
-  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
@@ -24323,13 +21215,12 @@
     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"
-  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
@@ -24354,13 +21245,12 @@
     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"
-  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
@@ -24384,13 +21274,12 @@
     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"
-  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
@@ -24415,13 +21304,12 @@
     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"
-  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
@@ -24445,13 +21333,12 @@
     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"
-  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
@@ -24476,13 +21363,12 @@
     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"
-  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
@@ -24506,13 +21392,12 @@
     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"
-  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
@@ -24537,13 +21422,12 @@
     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"
-  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
@@ -24568,13 +21452,12 @@
     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"
-  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
@@ -24600,13 +21483,12 @@
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP Container Memif 2n-skx-xxv710
--
-  type: "plot"
+- 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"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -24630,13 +21512,12 @@
     title: "memif-2n-skx-xxv710-64b-base_and_features-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- 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"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -24663,13 +21544,12 @@
 ################################################################################
 
 # Speedup - VPP Container k8s memif 3n-hsw-x520 - l2xc
--
-  type: "plot"
+- 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"
+  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -24692,13 +21572,12 @@
     title: "k8s-memif-3n-hsw-x520-64b-base_and_scale-ndr-l2xc"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- 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"
+  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -24722,13 +21601,12 @@
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP Container k8s memif 3n-hsw-x520 - l2bd
--
-  type: "plot"
+- 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"
+  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -24751,13 +21629,12 @@
     title: "k8s-memif-3n-hsw-x520-64b-base_and_scale-ndr-l2bd"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- 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"
+  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -24781,13 +21658,12 @@
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP Container Memif 3n-hsw-x710 - l2xc
--
-  type: "plot"
+- 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"
+  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -24810,13 +21686,12 @@
     title: "k8s-memif-3n-hsw-x710-64b-base_and_scale-l2xc-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- 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"
+  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -24840,13 +21715,12 @@
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP Container Memif 3n-hsw-x710 - l2bd
--
-  type: "plot"
+- 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"
+  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -24869,13 +21743,12 @@
     title: "k8s-memif-3n-hsw-x710-64b-base_and_scale-l2bd-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- 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"
+  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -24901,13 +21774,12 @@
 ################################################################################
 
 # 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"
-  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 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
@@ -24930,13 +21802,12 @@
     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"
-  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 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
@@ -24960,13 +21831,12 @@
     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"
-  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
@@ -24994,13 +21864,12 @@
     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"
-  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
@@ -25029,13 +21898,12 @@
     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"
-  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
@@ -25059,13 +21927,12 @@
     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"
-  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
@@ -25090,13 +21957,12 @@
     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"
-  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
@@ -25119,13 +21985,12 @@
     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"
-  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
@@ -25149,13 +22014,12 @@
     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"
-  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
@@ -25178,13 +22042,12 @@
     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"
-  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
@@ -25208,13 +22071,12 @@
     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"
-  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
@@ -25236,13 +22098,12 @@
     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"
-  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
@@ -25265,13 +22126,12 @@
     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"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or
@@ -25299,13 +22159,12 @@
     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"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or
@@ -25334,13 +22193,12 @@
     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"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -25363,13 +22221,12 @@
     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"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -25393,13 +22250,12 @@
     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"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -25421,13 +22277,12 @@
     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"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -25449,71 +22304,13 @@
     title: "ip4-3n-hsw-x710-64b-features-iacl-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-## Speedup - VPP IPv4 3n-hsw-x710 features oacl
-#-
-#  type: "plot"
-#  title: "Speedup: ip4-3n-hsw-x710-64b-features-oacl-ndr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-features-oacl-ndr-tsa"
-#  data: "plot-throughput-speedup-analysis-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           'IP4FWD' and
-#           'OACL' and
-#           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  layout:
-#    title: "ip4-3n-hsw-x710-64b-features-oacl-ndr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#-
-#  type: "plot"
-#  title: "Speedup: ip4-3n-hsw-x710-64b-features-oacl-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-features-oacl-pdr-tsa"
-#  data: "plot-throughput-speedup-analysis-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           'IP4FWD' and
-#           'OACL' and
-#           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  layout:
-#    title: "ip4-3n-hsw-x710-64b-features-oacl-pdr"
-#    layout: "plot-throughput-speedup-analysis"
-
 # Speedup - VPP IPv4 3n-hsw-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"
-  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
@@ -25534,13 +22331,12 @@
     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"
-  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
@@ -25562,13 +22358,12 @@
     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"
-  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
@@ -25590,13 +22385,12 @@
     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"
-  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
@@ -25619,13 +22413,12 @@
     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"
-  data: "plot-throughput-speedup-analysis-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or
@@ -25653,13 +22446,12 @@
     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"
-  data: "plot-throughput-speedup-analysis-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or
@@ -25688,13 +22480,12 @@
     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"
-  data: "plot-throughput-speedup-analysis-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -25717,13 +22508,12 @@
     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"
-  data: "plot-throughput-speedup-analysis-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -25747,13 +22537,12 @@
     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"
-  data: "plot-throughput-speedup-analysis-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -25775,13 +22564,12 @@
     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"
-  data: "plot-throughput-speedup-analysis-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -25804,13 +22592,12 @@
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP IPv4 3n-skx-x710 features oacl
--
-  type: "plot"
+- 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"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -25832,13 +22619,12 @@
     title: "ip4-3n-skx-x710-64b-features-oacl-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- 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"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -25861,13 +22647,12 @@
     layout: "plot-throughput-speedup-analysis"
 
 # 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"
-  data: "plot-throughput-speedup-analysis-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
@@ -25889,13 +22674,12 @@
     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"
-  data: "plot-throughput-speedup-analysis-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
@@ -25918,13 +22702,12 @@
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP IPv4 2n-skx-xxv710 base and scale
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: ip4-2n-skx-xxv710-64b-base_and_scale-ndr-tsa"
   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"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
@@ -25946,13 +22729,12 @@
     title: "ip4-2n-skx-xxv710-64b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: ip4-2n-skx-xxv710-64b-base_and_scale-pdr-tsa"
   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"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
@@ -25975,8 +22757,7 @@
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP IPv4 2n-dnv-x553 base
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: ip4-2n-dnv-x553-64b-base-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
@@ -25999,8 +22780,7 @@
     title: "ip4-2n-dnv-x553-64b-base-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: ip4-2n-dnv-x553-64b-base-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
@@ -26025,71 +22805,13 @@
 
 ################################################################################
 
-## Speedup - VPP IPv4 Tunnels 3n-hsw-x520
-#-
-#  type: "plot"
-#  title: "Speedup: ip4tun-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
-#  data: "plot-throughput-speedup-analysis-3n-hsw"
-#  filter: "'NIC_Intel-X520_DA2' and
-#           '64B' and
-#           'ENCAP' and
-#           'NDRPDR' and
-#           ('VXLAN' or 'LISP') and
-#           not 'VHOST' and
-#           not 'IPSECHW'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "not DOT1Q"
-#  - "VXLAN_1"
-#  - "VXLAN_10"
-#  - "VXLAN_100"
-#  - "VXLAN_1000"
-#  layout:
-#    title: "ip4tun-3n-hsw-x520-64b-base_and_scale-ndr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#-
-#  type: "plot"
-#  title: "Speedup: ip4tun-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
-#  data: "plot-throughput-speedup-analysis-3n-hsw"
-#  filter: "'NIC_Intel-X520_DA2' and
-#           '64B' and
-#           'ENCAP' and
-#           'NDRPDR' and
-#           ('VXLAN' or 'LISP') and
-#           not 'VHOST' and
-#           not 'IPSECHW'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "not DOT1Q"
-#  - "VXLAN_1"
-#  - "VXLAN_10"
-#  - "VXLAN_100"
-#  - "VXLAN_1000"
-#  layout:
-#    title: "ip4tun-3n-hsw-x520-64b-base_and_scale-pdr"
-#    layout: "plot-throughput-speedup-analysis"
-
 # Speedup - VPP IPv4 Tunnels 3n-hsw-x520 - features
--
-  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"
-  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
@@ -26111,13 +22833,12 @@
     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"
-  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
@@ -26140,13 +22861,12 @@
     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"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
@@ -26169,13 +22889,12 @@
     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"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
@@ -26199,13 +22918,12 @@
     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"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
@@ -26227,13 +22945,12 @@
     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"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
@@ -26256,13 +22973,12 @@
     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"
-  data: "plot-throughput-speedup-analysis-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
@@ -26285,13 +23001,12 @@
     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"
-  data: "plot-throughput-speedup-analysis-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
@@ -26315,13 +23030,12 @@
     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"
-  data: "plot-throughput-speedup-analysis-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
@@ -26343,13 +23057,12 @@
     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"
-  data: "plot-throughput-speedup-analysis-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
@@ -26374,13 +23087,12 @@
 ################################################################################
 
 # 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"
-  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
@@ -26402,13 +23114,12 @@
     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"
-  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
@@ -26430,77 +23141,13 @@
     title: "ip6-3n-hsw-x520-78b-base-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-## Speedup - VPP IPv6 3n-hsw-x520 features
-#-
-#  type: "plot"
-#  title: "Speedup: ip6-3n-hsw-x520-78b-base_and_features-ndr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-base_and_features-ndr-tsa"
-#  data: "plot-throughput-speedup-analysis-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '78B' and
-#           ('IP6BASE' or
-#            'POLICE_MARK' or
-#            'COPWHLIST' or
-#            'IACLDST') and
-#           'NDRPDR' and
-#           'IP6FWD' and
-#           not 'SRv6' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP6BASE"
-#  - "POLICE_MARK"
-#  - "COPWHLIST"
-#  - "IACLDST"
-#  layout:
-#    title: "ip6-3n-hsw-x520-78b-base_and_features-ndr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#-
-#  type: "plot"
-#  title: "Speedup: ip6-3n-hsw-x520-78b-base_and_features-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-base_and_features-pdr-tsa"
-#  data: "plot-throughput-speedup-analysis-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '78B' and
-#           ('IP6BASE' or
-#            'POLICE_MARK' or
-#            'COPWHLIST' or
-#            'IACLDST') and
-#           'NDRPDR' and
-#           'IP6FWD' and
-#           not 'SRv6' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "IP6BASE"
-#  - "POLICE_MARK"
-#  - "COPWHLIST"
-#  - "IACLDST"
-#  layout:
-#    title: "ip6-3n-hsw-x520-78b-base_and_features-pdr"
-#    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"
-  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
@@ -26522,13 +23169,12 @@
     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"
-  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
@@ -26551,13 +23197,12 @@
     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"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('IP6BASE' or
@@ -26582,13 +23227,12 @@
     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"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('IP6BASE' or
@@ -26614,13 +23258,12 @@
     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"
-  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
@@ -26642,13 +23285,12 @@
     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"
-  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
@@ -26671,13 +23313,12 @@
     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"
-  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
@@ -26699,13 +23340,12 @@
     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"
-  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
@@ -26728,13 +23368,12 @@
     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"
-  data: "plot-throughput-speedup-analysis-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('IP6BASE' or
@@ -26759,13 +23398,12 @@
     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"
-  data: "plot-throughput-speedup-analysis-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('IP6BASE' or
@@ -26791,13 +23429,12 @@
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP IPv6 2n-skx-x710
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: ip6-2n-skx-x710-78b-base_and_scale-ndr-tsa"
   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"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('IP6BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
@@ -26819,13 +23456,12 @@
     title: "ip6-2n-skx-x710-78b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: ip6-2n-skx-x710-78b-base_and_scale-pdr-tsa"
   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"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('IP6BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
@@ -26848,13 +23484,12 @@
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP IPv6 2n-skx-xxv710
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: ip6-2n-skx-xxv710-78b-base_and_scale-ndr-tsa"
   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"
+  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
@@ -26876,13 +23511,12 @@
     title: "ip6-2n-skx-xxv710-78b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: ip6-2n-skx-xxv710-78b-base_and_scale-pdr-tsa"
   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"
+  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
@@ -26905,8 +23539,7 @@
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP IPv6 2n-dnv-x553 base
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: ip6-2n-dnv-x553-78b-base-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
@@ -26930,8 +23563,7 @@
     title: "ip6-2n-dnv-x553-78b-base-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: ip6-2n-dnv-x553-78b-base-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
@@ -26958,13 +23590,12 @@
 ################################################################################
 
 # 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"
-  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
@@ -26982,13 +23613,12 @@
     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"
-  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
@@ -27009,13 +23639,12 @@
 ################################################################################
 
 # 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"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'IP4FWD' and
@@ -27032,13 +23661,12 @@
     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"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'IP4FWD' and
@@ -27056,13 +23684,12 @@
     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"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'IP4FWD' and
@@ -27079,13 +23706,12 @@
     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"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'IP4FWD' and
@@ -27103,13 +23729,12 @@
     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"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'IP4FWD' and
@@ -27125,13 +23750,12 @@
     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"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'IP4FWD' and
@@ -27150,13 +23774,12 @@
 ################################################################################
 
 # 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"
-  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
@@ -27171,13 +23794,12 @@
     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"
-  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
@@ -27195,13 +23817,12 @@
 ################################################################################
 
 # 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"
-  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
@@ -27225,13 +23846,12 @@
     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"
-  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
@@ -27256,13 +23876,12 @@
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP L2 3n-hsw-x520 features
--
-  type: "plot"
+- 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-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
@@ -27283,13 +23902,12 @@
     title: "l2sw-3n-hsw-x520-64b-features-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- 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-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
@@ -27311,13 +23929,12 @@
     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"
-  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
@@ -27342,13 +23959,12 @@
     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"
-  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
@@ -27374,13 +23990,12 @@
     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"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -27402,13 +24017,12 @@
     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"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -27431,13 +24045,12 @@
     layout: "plot-throughput-speedup-analysis"
 
 # 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"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'BASE' and
@@ -27458,13 +24071,12 @@
     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"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'BASE' and
@@ -27486,13 +24098,12 @@
     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"
-  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
@@ -27517,13 +24128,12 @@
     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"
-  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
@@ -27549,13 +24159,12 @@
     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"
-  data: "plot-throughput-speedup-analysis-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -27578,13 +24187,12 @@
     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"
-  data: "plot-throughput-speedup-analysis-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -27608,13 +24216,12 @@
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP L2 3n-skx-xxv710 base and scale
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: l2sw-3n-skx-xxv710-64b-base-ndr-tsa"
   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"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -27636,13 +24243,12 @@
     title: "l2sw-3n-skx-xxv710-64b-base-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: l2sw-3n-skx-xxv710-64b-base-pdr-tsa"
   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"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -27665,13 +24271,12 @@
     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"
-  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
@@ -27695,13 +24300,12 @@
     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"
-  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
@@ -27726,13 +24330,12 @@
     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"
-  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
@@ -27756,13 +24359,12 @@
     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"
-  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
@@ -27787,8 +24389,7 @@
     layout: "plot-throughput-speedup-analysis"
 
 # Speedup - VPP L2 2n-dnv-x553 base
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: l2sw-2n-dnv-x553-64b-base-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
@@ -27814,8 +24415,7 @@
     title: "l2sw-2n-dnv-x553-64b-base-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- type: "plot"
   title: "Speedup: l2sw-2n-dnv-x553-64b-base-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
@@ -27844,13 +24444,12 @@
 ################################################################################
 
 # 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"
-  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
@@ -27871,13 +24470,12 @@
     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"
-  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
@@ -27898,74 +24496,13 @@
     title: "vhost-ip4-3n-hsw-x520-64b-base_and_scale-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-## Packet Speedup - VPP vhost l2sw 3n-hsw-x520
-#-
-#  type: "plot"
-#  title: "VPP Speedup: vhost-l2sw-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
-#  data: "plot-throughput-speedup-analysis-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "VM"  # "not CFS_OPT"
-##  - "CFS_OPT"
-##  - "FIB_10K"
-##  - "FIB_100K"
-##  - "FIB_1M"
-#  layout:
-#    title: "vhost-l2sw-3n-hsw-x520-64b-base_and_scale-ndr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#-
-#  type: "plot"
-#  title: "VPP Speedup: vhost-l2sw-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
-#  data: "plot-throughput-speedup-analysis-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           'L2BDMACLRN' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "VM"  # "not CFS_OPT"
-##  - "CFS_OPT"
-##  - "FIB_10K"
-##  - "FIB_100K"
-##  - "FIB_1M"
-#  layout:
-#    title: "vhost-l2sw-3n-hsw-x520-64b-base_and_scale-pdr"
-#    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"
-  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
@@ -27991,13 +24528,12 @@
     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"
-  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
@@ -28024,13 +24560,12 @@
     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"
-  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
@@ -28055,13 +24590,12 @@
     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"
-  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
@@ -28087,13 +24621,12 @@
     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"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -28114,13 +24647,12 @@
     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"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -28141,75 +24673,13 @@
     title: "vhost-ip4-3n-hsw-x710-64b-base_and_scale-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-## Packet Speedup - VPP vhost l2sw 3n-hsw-x710
-#-
-#  type: "plot"
-#  title: "VPP Speedup: vhost-l2sw-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
-#  data: "plot-throughput-speedup-analysis-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           'L2BDMACLRN' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "VM"  # "not CFS_OPT"
-##  - "CFS_OPT"
-##  - "FIB_10K"
-##  - "FIB_100K"
-##  - "FIB_1M"
-#  layout:
-#    title: "vhost-l2sw-3n-hsw-x710-64b-base_and_scale-ndr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#-
-#  type: "plot"
-#  title: "VPP Speedup: vhost-l2sw-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
-#  data: "plot-throughput-speedup-analysis-3n-hsw"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           'L2BDMACLRN' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "VM"  # "not CFS_OPT"
-##  - "CFS_OPT"
-##  - "FIB_10K"
-##  - "FIB_100K"
-##  - "FIB_1M"
-#  layout:
-#    title: "vhost-l2sw-3n-hsw-x710-64b-base_and_scale-pdr"
-#    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"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -28235,13 +24705,12 @@
     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"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -28268,13 +24737,12 @@
     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"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -28300,13 +24768,12 @@
     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"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -28332,250 +24799,13 @@
     title: "vhost-l2sw-3n-hsw-x710-64b-base_and_features-vm-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-## Packet Speedup - VPP vhost ip4 3n-hsw-xl710
-#-
-#  type: "plot"
-#  title: "VPP Speedup: vhost-ip4-3n-hsw-xl710-64b-base_and_scale-ndr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-xl710-64b-base_and_scale-ndr-tsa"
-#  data: "plot-throughput-speedup-analysis-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '64B' and
-#           'NDRPDR' and
-#           'ETH' and
-#           'IP4FWD' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'DOT1Q'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "1VM"
-#  - "2VM"
-#  layout:
-#    title: "vhost-ip4-3n-hsw-xl710-64b-base_and_scale-ndr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#-
-#  type: "plot"
-#  title: "VPP Speedup: vhost-ip4-3n-hsw-xl710-64b-base_and_scale-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-xl710-64b-base_and_scale-pdr-tsa"
-#  data: "plot-throughput-speedup-analysis-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '64B' and
-#           'NDRPDR' and
-#           'ETH' and
-#           'IP4FWD' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'DOT1Q'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "1VM"
-#  - "2VM"
-#  layout:
-#    title: "vhost-ip4-3n-hsw-xl710-64b-base_and_scale-pdr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-## Packet Speedup - VPP vhost l2sw 3n-hsw-xl710
-#-
-#  type: "plot"
-#  title: "VPP Speedup: vhost-l2sw-3n-hsw-xl710-64b-base_and_scale-ndr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-base_and_scale-ndr-tsa"
-#  data: "plot-throughput-speedup-analysis-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           'L2BDMACLRN' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "VM"  # "not CFS_OPT"
-##  - "CFS_OPT"
-##  - "FIB_10K"
-##  - "FIB_100K"
-##  - "FIB_1M"
-#  layout:
-#    title: "vhost-l2sw-3n-hsw-xl710-64b-base_and_scale-ndr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#-
-#  type: "plot"
-#  title: "VPP Speedup: vhost-l2sw-3n-hsw-xl710-64b-base_and_scale-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-base_and_scale-pdr-tsa"
-#  data: "plot-throughput-speedup-analysis-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           'L2BDMACLRN' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "VM"  # "not CFS_OPT"
-##  - "CFS_OPT"
-##  - "FIB_10K"
-##  - "FIB_100K"
-##  - "FIB_1M"
-#  layout:
-#    title: "vhost-l2sw-3n-hsw-xl710-64b-base_and_scale-pdr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-## Packet Speedup - VPP vhost l2sw 3n-hsw-xl710 - base
-#-
-#  type: "plot"
-#  title: "VPP Speedup: vhost-l2sw-3n-hsw-xl710-64b-base-ndr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-base-ndr-tsa"
-#  data: "plot-throughput-speedup-analysis-3n-hsw"
-#  filter: "'NIC_Intel-XL710' 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-3n-hsw-xl710-64b-base-ndr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#-
-#  type: "plot"
-#  title: "VPP Speedup: vhost-l2sw-3n-hsw-xl710-64b-base-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-base-pdr-tsa"
-#  data: "plot-throughput-speedup-analysis-3n-hsw"
-#  filter: "'NIC_Intel-XL710' 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-3n-hsw-xl710-64b-base-pdr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-## Packet Speedup - VPP vhost l2sw 3n-hsw-xl710 - base vm
-#-
-#  type: "plot"
-#  title: "VPP Speedup: vhost-l2sw-3n-hsw-xl710-64b-base-vm-ndr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-base-vm-ndr-tsa"
-#  data: "plot-throughput-speedup-analysis-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'CFS_OPT' and
-#           not 'VXLAN' and
-#           not 'IP4FWD'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "1VM"
-##  - "L2XCFWD"
-##  - "1VM"
-##  - "L2BDMACLRN"
-#  layout:
-#    title: "vhost-l2sw-3n-hsw-xl710-64b-base-vm-ndr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#-
-#  type: "plot"
-#  title: "VPP Speedup: vhost-l2sw-3n-hsw-xl710-64b-base-vm-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-base-vm-pdr-tsa"
-#  data: "plot-throughput-speedup-analysis-3n-hsw"
-#  filter: "'NIC_Intel-XL710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'CFS_OPT' and
-#           not 'VXLAN' and
-#           not 'IP4FWD'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "1VM"
-##  - "L2XCFWD"
-##  - "1VM"
-##  - "L2BDMACLRN"
-#  layout:
-#    title: "vhost-l2sw-3n-hsw-xl710-64b-base-vm-pdr"
-#    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"
-  data: "plot-throughput-speedup-analysis-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -28595,13 +24825,12 @@
     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"
-  data: "plot-throughput-speedup-analysis-3n-skx"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -28621,203 +24850,13 @@
     title: "vhost-ip4-3n-skx-x710-64b-base_and_scale-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-## Packet Speedup - VPP vhost l2sw 3n-skx-x710
-#-
-#  type: "plot"
-#  title: "VPP Speedup: vhost-l2sw-3n-skx-x710-64b-base_and_scale-ndr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-base_and_scale-ndr-tsa"
-#  data: "plot-throughput-speedup-analysis-3n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           'L2BDMACLRN' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "VM"  # "not CFS_OPT"
-##  - "CFS_OPT"
-##  - "FIB_10K"
-##  - "FIB_100K"
-##  - "FIB_1M"
-#  layout:
-#    title: "vhost-l2sw-3n-skx-x710-64b-base_and_scale-ndr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#-
-#  type: "plot"
-#  title: "VPP Speedup: vhost-l2sw-3n-skx-x710-64b-base_and_scale-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-base_and_scale-pdr-tsa"
-#  data: "plot-throughput-speedup-analysis-3n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           'L2BDMACLRN' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "VM"  # "not CFS_OPT"
-##  - "CFS_OPT"
-##  - "FIB_10K"
-##  - "FIB_100K"
-##  - "FIB_1M"
-#  layout:
-#    title: "vhost-l2sw-3n-skx-x710-64b-base_and_scale-pdr"
-#    layout: "plot-throughput-speedup-analysis"
-
-## Packet Speedup - VPP vhost l2sw 3n-skx-x710 - base
-#-
-#  type: "plot"
-#  title: "VPP Speedup: vhost-l2sw-3n-skx-x710-64b-base_and_features-ndr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-base_and_features-ndr-tsa"
-#  data: "plot-throughput-speedup-analysis-3n-skx"
-#  filter: "'NIC_Intel-X710' 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' and
-#           not 'LBOND'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  layout:
-#    title: "vhost-l2sw-3n-skx-x710-64b-base_and_features-ndr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#-
-#  type: "plot"
-#  title: "VPP Speedup: vhost-l2sw-3n-skx-x710-64b-base_and_features-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-base_and_features-pdr-tsa"
-#  data: "plot-throughput-speedup-analysis-3n-skx"
-#  filter: "'NIC_Intel-X710' 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' and
-#           not 'LBOND'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  layout:
-#    title: "vhost-l2sw-3n-skx-x710-64b-base_and_features-pdr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-## Packet Speedup - VPP vhost l2sw 3n-skx-x710 - base vm
-#-
-#  type: "plot"
-#  title: "VPP Speedup: vhost-l2sw-3n-skx-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-skx-x710-64b-base_and_features-vm-ndr-tsa"
-#  data: "plot-throughput-speedup-analysis-3n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'CFS_OPT' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not 'LBOND'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  layout:
-#    title: "vhost-l2sw-3n-skx-x710-64b-base_and_features-vm-ndr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#-
-#  type: "plot"
-#  title: "VPP Speedup: vhost-l2sw-3n-skx-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-skx-x710-64b-base_and_features-vm-pdr-tsa"
-#  data: "plot-throughput-speedup-analysis-3n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           ('L2BDMACLRN' or 'L2XCFWD') and
-#           'VHOST_1024' and
-#           not 'CFS_OPT' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not 'LBOND'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  layout:
-#    title: "vhost-l2sw-3n-skx-x710-64b-base_and_features-vm-pdr"
-#    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"
-  data: "plot-throughput-speedup-analysis-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -28839,13 +24878,12 @@
     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"
-  data: "plot-throughput-speedup-analysis-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -28867,77 +24905,13 @@
     title: "vhost-ip4-2n-skx-x710-64b-base_and_scale-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-## Packet Speedup - VPP vhost l2sw 2n-skx-x710
-#-
-#  type: "plot"
-#  title: "VPP Speedup: vhost-l2sw-2n-skx-x710-64b-base_and_scale-ndr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-base_and_scale-ndr-tsa"
-#  data: "plot-throughput-speedup-analysis-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           'L2BDMACLRN' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'NF_DENSITY' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "VM"  # "not CFS_OPT"
-##  - "CFS_OPT"
-##  - "FIB_10K"
-##  - "FIB_100K"
-##  - "FIB_1M"
-#  layout:
-#    title: "vhost-l2sw-2n-skx-x710-64b-base_and_scale-ndr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#-
-#  type: "plot"
-#  title: "VPP Speedup: vhost-l2sw-2n-skx-x710-64b-base_and_scale-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-base_and_scale-pdr-tsa"
-#  data: "plot-throughput-speedup-analysis-2n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           'L2BDMACLRN' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'NF_DENSITY' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "VM"  # "not CFS_OPT"
-##  - "CFS_OPT"
-##  - "FIB_10K"
-##  - "FIB_100K"
-##  - "FIB_1M"
-#  layout:
-#    title: "vhost-l2sw-2n-skx-x710-64b-base_and_scale-pdr"
-#    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"
-  data: "plot-throughput-speedup-analysis-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -28962,13 +24936,12 @@
     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"
-  data: "plot-throughput-speedup-analysis-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -28994,13 +24967,12 @@
     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"
-  data: "plot-throughput-speedup-analysis-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -29025,13 +24997,12 @@
     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"
-  data: "plot-throughput-speedup-analysis-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
@@ -29057,13 +25028,12 @@
     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"
-  data: "plot-throughput-speedup-analysis-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'NDRPDR' and
@@ -29085,13 +25055,12 @@
     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"
-  data: "plot-throughput-speedup-analysis-2n-skx"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'NDRPDR' and
@@ -29113,75 +25082,13 @@
     title: "vhost-ip4-2n-skx-xxv710-64b-base_and_scale-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-## Packet Speedup - VPP vhost l2sw 2n-skx-xxv710
-#-
-#  type: "plot"
-#  title: "VPP Speedup: vhost-l2sw-2n-skx-xxv710-64b-base_and_scale-ndr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-base_and_scale-ndr-tsa"
-#  data: "plot-throughput-speedup-analysis-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           'L2BDMACLRN' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "VM"  # "not CFS_OPT"
-##  - "CFS_OPT"
-##  - "FIB_10K"
-##  - "FIB_100K"
-##  - "FIB_1M"
-#  layout:
-#    title: "vhost-l2sw-2n-skx-xxv710-64b-base_and_scale-ndr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#-
-#  type: "plot"
-#  title: "VPP Speedup: vhost-l2sw-2n-skx-xxv710-64b-base_and_scale-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-base_and_scale-pdr-tsa"
-#  data: "plot-throughput-speedup-analysis-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           'NDRPDR' and
-#           ('ETH' or 'DOT1Q') and
-#           'L2BDMACLRN' and
-#           'VHOST_1024' and
-#           not 'VXLAN' and
-#           not 'IP4FWD' and
-#           not '2VM'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-##  sort:
-##  - "VM"  # "not CFS_OPT"
-##  - "CFS_OPT"
-##  - "FIB_10K"
-##  - "FIB_100K"
-##  - "FIB_1M"
-#  layout:
-#    title: "vhost-l2sw-2n-skx-xxv710-64b-base_and_scale-pdr"
-#    layout: "plot-throughput-speedup-analysis"
-
 # Packet Speedup - VPP vhost l2sw 2n-skx-xxv710 - base
--
-  type: "plot"
+- 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"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'NDRPDR' and
@@ -29205,13 +25112,12 @@
     title: "vhost-l2sw-2n-skx-xxv710-64b-base_and_features-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- 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"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'NDRPDR' and
@@ -29236,13 +25142,12 @@
     layout: "plot-throughput-speedup-analysis"
 
 # Packet Speedup - VPP vhost l2sw 2n-skx-xxv710 - base vm
--
-  type: "plot"
+- 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"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'NDRPDR' and
@@ -29266,13 +25171,12 @@
     title: "vhost-l2sw-2n-skx-xxv710-64b-base-vm-ndr"
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
+- 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"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'NDRPDR' and
@@ -29299,13 +25203,12 @@
 ################################################################################
 
 # 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"
-  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
@@ -29318,13 +25221,12 @@
     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"
-  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
Integration tests