Report: Disable pdf

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

diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml
index d6ebdc8..6f4fbd8 100644 (file)
--- a/resources/tools/presentation/specification.yaml
+++ b/resources/tools/presentation/specification.yaml
@@ -30,6 +30,9 @@
     DIR[DTR,PERF,DPDK,3N,SKX]: "{DIR[DTR]}/dpdk_performance_results_3n_skx"
     DIR[DTR,PERF,DPDK,2N,SKX]: "{DIR[DTR]}/dpdk_performance_results_2n_skx"
     DIR[DTR,PERF,DPDK,2N,CLX]: "{DIR[DTR]}/dpdk_performance_results_2n_clx"
+    DIR[DTR,PERF,DPDK,2N,DNV]: "{DIR[DTR]}/dpdk_performance_results_2n_dnv"
+    DIR[DTR,PERF,DPDK,3N,DNV]: "{DIR[DTR]}/dpdk_performance_results_3n_dnv"
+    DIR[DTR,PERF,DPDK,3N,TSH]: "{DIR[DTR]}/dpdk_performance_results_3n_tsh"
     DIR[DTR,PERF,VPP,3N,HSW]: "{DIR[DTR]}/vpp_performance_results_3n_hsw"
     DIR[DTR,PERF,VPP,3N,SKX]: "{DIR[DTR]}/vpp_performance_results_3n_skx"
     DIR[DTR,PERF,VPP,2N,SKX]: "{DIR[DTR]}/vpp_performance_results_2n_skx"
@@ -78,6 +81,7 @@
 
     # Latencies:
     DIR[LAT,VPP]: "{DIR[WORKING,SRC]}/vpp_performance_tests/hdrh_packet_latency_by_percentile_graphs"
+    DIR[LAT,DPDK]: "{DIR[WORKING,SRC]}/dpdk_performance_tests/hdrh_packet_latency_by_percentile_graphs"
 
     # .css patch file to fix tables generated by Sphinx
     DIR[CSS_PATCH_FILE]: "{DIR[STATIC]}/theme_overrides.css"
@@ -192,10 +196,12 @@
         - 29  # NDRPDR sel
         - 30  # NDRPDR sel
         - 31  # NDRPDR sel
+        - 32  # NDRPDR sel
+        - 34  # NDRPDR sel
 
     plot-vpp-hdrh-lat-3n-hsw:
       csit-vpp-perf-verify-2001-3n-hsw:
-        - 21  # NDRPDR sel
+        - 22  # NDRPDR sel
 
     plot-vpp-nfv-3n-hsw-ndrpdr:
       csit-vpp-perf-verify-2001-3n-hsw:
@@ -207,6 +213,8 @@
         - 29  # NDRPDR sel
         - 30  # NDRPDR sel
         - 31  # NDRPDR sel
+        - 32  # NDRPDR sel
+        - 34  # NDRPDR sel
 
     plot-vpp-nfv-3n-hsw-mrr:
       csit-vpp-perf-verify-2001-3n-hsw:
@@ -230,11 +238,14 @@
         - 18  # NDRPDR sel
         - 19  # NDRPDR sel
         - 20  # NDRPDR sel
+        - 21  # NDRPDR sel
         - 22  # NDRPDR sel
+        - 23  # NDRPDR sel
+        - 24  # NDRPDR sel
 
     plot-dpdk-hdrh-lat-3n-hsw:
       csit-dpdk-perf-verify-2001-3n-hsw:
-        - 13  # NDRPDR sel
+        - 16  # NDRPDR sel
 
     # 3n-skx
 
@@ -415,6 +426,20 @@
 
     plot-vpp-hdrh-lat-3n-tsh:
       csit-vpp-perf-verify-2001-3n-tsh:
+        - 4   # NDRPDR sel
+
+    plot-dpdk-throughput-latency-3n-tsh:
+      csit-dpdk-perf-verify-2001-3n-tsh:
+        - 3   # NDRPDR sel
+        - 4   # NDRPDR sel
+        - 5   # NDRPDR sel
+        - 9   # NDRPDR sel
+        - 10  # NDRPDR sel
+        - 11  # NDRPDR sel
+        - 12  # NDRPDR sel
+
+    plot-dpdk-hdrh-lat-3n-tsh:
+      csit-dpdk-perf-verify-2001-3n-tsh:
         - 3   # NDRPDR sel
 
     # 3n-dnv
@@ -432,6 +457,19 @@
         - 17  # NDRPDR sel
         - 18  # NDRPDR sel
 
+    plot-dpdk-throughput-latency-3n-dnv:
+      csit-dpdk-perf-verify-2001-3n-dnv:
+        - 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
+        - 22  # NDRPDR sel
+
     # 2n-dnv
 
     plot-vpp-throughput-lat-tsa-2n-dnv:
@@ -447,6 +485,19 @@
         - 13  # NDRPDR sel
         - 16  # NDRPDR sel
 
+    plot-dpdk-throughput-latency-2n-dnv:
+      csit-dpdk-perf-verify-2001-2n-dnv:
+        - 9   # NDRPDR sel
+        - 10  # 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
+
     ###########################################################################
     # Simple tables (only one data set):
 
@@ -486,6 +537,8 @@
         - 18  # NDRPDR full
         - 20  # NDRPDR full
         - 28  # NDRPDR full
+        - 35  # NDRPDR full
+        - 46  # NDRPDR full
 
     vpp-perf-results-3n-skx:
       # TODO: Replace
@@ -509,16 +562,23 @@
 
     vpp-perf-results-3n-dnv:
       csit-vpp-perf-verify-2001-3n-dnv:
-        - 13  # NDRPDR full
-        - 15  # NDRPDR full
         - 19  # NDRPDR full
         - 20  # NDRPDR full
         - 21  # NDRPDR full
+        - 22  # NDRPDR full
+        - 23  # NDRPDR full
+        - 24  # NDRPDR full
+        - 25  # NDRPDR full
+        - 26  # NDRPDR full
 
     vpp-perf-results-2n-dnv:
       csit-vpp-perf-verify-2001-2n-dnv:
         - 21  # NDRPDR full
         - 22  # NDRPDR full
+        - 25  # NDRPDR full
+        - 26  # NDRPDR full
+        - 27  # NDRPDR full
+        - 28  # NDRPDR full
 
     vpp-mrr-results-3n-hsw:
       csit-vpp-perf-verify-2001-3n-hsw:
@@ -562,7 +622,8 @@
 
     dpdk-perf-results-3n-hsw:
       csit-dpdk-perf-verify-2001-3n-hsw:
-        - 13  # NDRPDR sel
+        - 25  # NDRPDR full
+        - 26  # NDRPDR full
 
     dpdk-perf-results-3n-skx:
       csit-dpdk-perf-verify-2001-3n-skx:
@@ -576,6 +637,18 @@
       csit-dpdk-perf-verify-2001-2n-clx:
         - 1   # NDRPDR sel
 
+    dpdk-perf-results-2n-dnv:
+      csit-dpdk-perf-verify-2001-2n-dnv:
+        - 16  # NDRPDR sel
+
+    dpdk-perf-results-3n-dnv:
+      csit-dpdk-perf-verify-2001-3n-dnv:
+        - 12  # NDRPDR sel
+
+    dpdk-perf-results-3n-tsh:
+      csit-dpdk-perf-verify-2001-3n-tsh:
+        - 3   # NDRPDR sel
+
 ###########################################################################
     # Tables (more than one data set)
 
@@ -615,6 +688,8 @@
         - 29  # NDRPDR sel
         - 30  # NDRPDR sel
         - 31  # NDRPDR sel
+        - 32  # NDRPDR sel
+        - 34  # NDRPDR sel
     vpp-performance-changes-3n-hsw:
       - "vpp-performance-changes-3n-hsw-h1"
       - "vpp-performance-changes-3n-hsw-ref"
@@ -941,7 +1016,10 @@
         - 18  # NDRPDR sel
         - 19  # NDRPDR sel
         - 20  # NDRPDR sel
+        - 21  # NDRPDR sel
         - 22  # NDRPDR sel
+        - 23  # NDRPDR sel
+        - 24  # NDRPDR sel
     dpdk-performance-changes-3n-hsw:
       - "dpdk-performance-changes-3n-hsw-h1"
       - "dpdk-performance-changes-3n-hsw-ref"
@@ -1051,6 +1129,8 @@
         - 29  # NDRPDR sel
         - 30  # NDRPDR sel
         - 31  # NDRPDR sel
+        - 32  # NDRPDR sel
+        - 34  # NDRPDR sel
     vpp-compare-testbeds-cmp:
       # TODO: Add the data
       csit-vpp-perf-verify-2001-3n-skx:
@@ -1125,7 +1205,10 @@
         - 18  # NDRPDR sel
         - 19  # NDRPDR sel
         - 20  # NDRPDR sel
+        - 21  # NDRPDR sel
         - 22  # NDRPDR sel
+        - 23  # NDRPDR sel
+        - 24  # NDRPDR sel
     dpdk-compare-testbeds-cmp:
       csit-dpdk-perf-verify-2001-3n-skx:
         - 1   # NDRPDR sel
@@ -1891,10 +1974,14 @@
       - 29  # NDRPDR sel
       - 30  # NDRPDR sel
       - 31  # NDRPDR sel
+      - 32  # NDRPDR sel
+      - 34  # NDRPDR sel
       - 17  # MRR sel
       - 18  # NDRPDR full
       - 20  # NDRPDR full
       - 28  # NDRPDR full
+      - 35  # NDRPDR full
+      - 46  # NDRPDR full
 
 #    csit-vpp-perf-verify-1904-3n-skx:
 #      - 7   # MRR sel
@@ -2041,11 +2128,14 @@
       - 17  # NDRPDR sel
       - 18  # NDRPDR sel
       - 11  # MRR sel
-      - 13  # NDRPDR full
-      - 15  # NDRPDR full
       - 19  # NDRPDR full
       - 20  # NDRPDR full
       - 21  # NDRPDR full
+      - 22  # NDRPDR full
+      - 23  # NDRPDR full
+      - 24  # NDRPDR full
+      - 25  # NDRPDR full
+      - 26  # NDRPDR full
 
     csit-vpp-perf-verify-1908-2n-dnv:
       - 1   # NDRPDR sel
@@ -2073,6 +2163,10 @@
       - 12  # MRR sel
       - 21  # NDRPDR full
       - 22  # NDRPDR full
+      - 25  # NDRPDR full
+      - 26  # NDRPDR full
+      - 27  # NDRPDR full
+      - 28  # NDRPDR full
 
     csit-dpdk-perf-verify-1904-3n-hsw:
       - 2   # NDRPDR sel
@@ -2113,7 +2207,12 @@
       - 18  # NDRPDR sel
       - 19  # NDRPDR sel
       - 20  # NDRPDR sel
+      - 21  # NDRPDR sel
       - 22  # NDRPDR sel
+      - 23  # NDRPDR sel
+      - 24  # NDRPDR sel
+      - 25  # NDRPDR full
+      - 26  # NDRPDR full
 
 #    csit-dpdk-perf-verify-1904-3n-skx:
 #      - 2   # NDRPDR sel
@@ -2205,6 +2304,39 @@
 #      - 9   # NDRPDR sel
 #      - 10  # NDRPDR sel
 
+    csit-dpdk-perf-verify-2001-2n-dnv:
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
+      - 11  # NDRPDR sel
+      - 12  # NDRPDR sel
+      - 13  # NDRPDR sel
+      - 14  # NDRPDR sel
+      - 15  # NDRPDR sel
+      - 16  # NDRPDR sel
+      - 17  # NDRPDR sel
+      - 18  # NDRPDR sel
+
+    csit-dpdk-perf-verify-2001-3n-dnv:
+      - 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
+      - 22  # NDRPDR sel
+
+    csit-dpdk-perf-verify-2001-3n-tsh:
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 5   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
+      - 11  # NDRPDR sel
+      - 12  # NDRPDR sel
+
     csit-vpp-device-2001-ubuntu1804-1n-skx:
       - 57
 
@@ -2213,7 +2345,6 @@
   format:
     html:
     - full
-# TODO: Enable for release runs:
 #    pdf:
 #    - minimal
 
@@ -4013,9 +4144,9 @@
   output-file-ext: ".csv"
   output-file: "{DIR[DTR,PERF,VPP,3N,HSW]}/vpp_performance_results_3n_hsw"
   columns:
-  - title: "Name"
+  - title: " |prein| Test Name |preout| "
     data: "data name"
-  - title: "Status"
+  - title: " |prein| Throughput: |br| 1. Mpps Gbps (NDR) |br| 2. Mpps Gbps (PDR) |br| |br| Two sets of Uni-Dir Latency Percentiles in uSec at %PDR load: |br| 3. P50 P90 P99    P50 P90 P99 (10% PDR) |br| 4. P50 P90 P99    P50 P90 P99 (50% PDR) |br| 5. P50 P90 P99    P50 P90 P99 (90% PDR) |preout| "
     data: "data msg"
   rows: "generated"
   data: "vpp-perf-results-3n-hsw"
@@ -4032,9 +4163,9 @@
 #  output-file-ext: ".csv"
 #  output-file: "{DIR[DTR,PERF,VPP,3N,SKX]}/vpp_performance_results_3n_skx"
 #  columns:
-#  - title: "Name"
+#  - title: " |prein| Test Name |preout| "
 #    data: "data name"
-#  - title: "Status"
+#  - title: " |prein| Throughput: |br| 1. Mpps Gbps (NDR) |br| 2. Mpps Gbps (PDR) |br| |br| Two sets of Uni-Dir Latency Percentiles in uSec at %PDR load: |br| 3. P50 P90 P99    P50 P90 P99 (10% PDR) |br| 4. P50 P90 P99    P50 P90 P99 (50% PDR) |br| 5. P50 P90 P99    P50 P90 P99 (90% PDR) |preout| "
 #    data: "data msg"
 #  rows: "generated"
 #  data: "vpp-perf-results-3n-skx"
@@ -4051,9 +4182,9 @@
 #  output-file-ext: ".csv"
 #  output-file: "{DIR[DTR,PERF,VPP,2N,SKX]}/vpp_performance_results_2n_skx"
 #  columns:
-#  - title: "Name"
+#  - title: " |prein| Test Name |preout| "
 #    data: "data name"
-#  - title: "Status"
+#  - title: " |prein| Throughput: |br| 1. Mpps Gbps (NDR) |br| 2. Mpps Gbps (PDR) |br| |br| Two sets of Uni-Dir Latency Percentiles in uSec at %PDR load: |br| 3. P50 P90 P99    P50 P90 P99 (10% PDR) |br| 4. P50 P90 P99    P50 P90 P99 (50% PDR) |br| 5. P50 P90 P99    P50 P90 P99 (90% PDR) |preout| "
 #    data: "data msg"
 #  rows: "generated"
 #  data: "vpp-perf-results-2n-skx"
@@ -4070,9 +4201,9 @@
 #  output-file-ext: ".csv"
 #  output-file: "{DIR[DTR,PERF,VPP,2N,CLX]}/vpp_performance_results_2n_clx"
 #  columns:
-#  - title: "Name"
+#  - title: " |prein| Test Name |preout| "
 #    data: "data name"
-#  - title: "Status"
+#  - title: " |prein| Throughput: |br| 1. Mpps Gbps (NDR) |br| 2. Mpps Gbps (PDR) |br| |br| Two sets of Uni-Dir Latency Percentiles in uSec at %PDR load: |br| 3. P50 P90 P99    P50 P90 P99 (10% PDR) |br| 4. P50 P90 P99    P50 P90 P99 (50% PDR) |br| 5. P50 P90 P99    P50 P90 P99 (90% PDR) |preout| "
 #    data: "data msg"
 #  rows: "generated"
 #  data: "vpp-perf-results-2n-clx"
@@ -4089,9 +4220,9 @@
   output-file-ext: ".csv"
   output-file: "{DIR[DTR,PERF,VPP,3N,TSH]}/vpp_performance_results_3n_tsh"
   columns:
-  - title: "Name"
+  - title: " |prein| Test Name |preout| "
     data: "data name"
-  - title: "Status"
+  - title: " |prein| Throughput: |br| 1. Mpps Gbps (NDR) |br| 2. Mpps Gbps (PDR) |br| |br| Two sets of Uni-Dir Latency Percentiles in uSec at %PDR load: |br| 3. P50 P90 P99    P50 P90 P99 (10% PDR) |br| 4. P50 P90 P99    P50 P90 P99 (50% PDR) |br| 5. P50 P90 P99    P50 P90 P99 (90% PDR) |preout| "
     data: "data msg"
   rows: "generated"
   data: "vpp-perf-results-3n-tsh"
@@ -4104,13 +4235,13 @@
 # Detailed Test Results - VPP Performance Results 3n-dnv
 - type: "table"
   title: "Detailed Test Results - VPP Performance Results 3n-dnv"
-  algorithm: "table_details"
+  algorithm: "table_merged_details"
   output-file-ext: ".csv"
   output-file: "{DIR[DTR,PERF,VPP,3N,DNV]}/vpp_performance_results_3n_dnv"
   columns:
-  - title: "Name"
+  - title: " |prein| Test Name |preout| "
     data: "data name"
-  - title: "Status"
+  - title: " |prein| Throughput: |br| 1. Mpps Gbps (NDR) |br| 2. Mpps Gbps (PDR) |br| |br| Two sets of Uni-Dir Latency Percentiles in uSec at %PDR load: |br| 3. P50 P90 P99    P50 P90 P99 (10% PDR) |br| 4. P50 P90 P99    P50 P90 P99 (50% PDR) |br| 5. P50 P90 P99    P50 P90 P99 (90% PDR) |preout| "
     data: "data msg"
   rows: "generated"
   data: "vpp-perf-results-3n-dnv"
@@ -4123,13 +4254,13 @@
 # Detailed Test Results - VPP Performance Results 2n-dnv
 - type: "table"
   title: "Detailed Test Results - VPP Performance Results 2n-dnv"
-  algorithm: "table_details"
+  algorithm: "table_merged_details"
   output-file-ext: ".csv"
   output-file: "{DIR[DTR,PERF,VPP,2N,DNV]}/vpp_performance_results_2n_dnv"
   columns:
-  - title: "Name"
+  - title: " |prein| Test Name |preout| "
     data: "data name"
-  - title: "Status"
+  - title: " |prein| Throughput: |br| 1. Mpps Gbps (NDR) |br| 2. Mpps Gbps (PDR) |br| |br| Two sets of Uni-Dir Latency Percentiles in uSec at %PDR load: |br| 3. P50 P90 P99    P50 P90 P99 (10% PDR) |br| 4. P50 P90 P99    P50 P90 P99 (50% PDR) |br| 5. P50 P90 P99    P50 P90 P99 (90% PDR) |preout| "
     data: "data msg"
   rows: "generated"
   data: "vpp-perf-results-2n-dnv"
@@ -4237,7 +4368,7 @@
 # Test configuration - VPP Performance Test Configs 3n-dnv
 - type: "table"
   title: "Test configuration - VPP Performance Test Configs 3n-dnv"
-  algorithm: "table_details"
+  algorithm: "table_merged_details"
   output-file-ext: ".csv"
   output-file: "{DIR[DTC,PERF,VPP,3N,DNV]}/vpp_test_configuration_3n_dnv"
   columns:
@@ -4256,7 +4387,7 @@
 # Test configuration - VPP Performance Test Configs 2n-dnv
 - type: "table"
   title: "Test configuration - VPP Performance Test Configs 2n-dnv"
-  algorithm: "table_details"
+  algorithm: "table_merged_details"
   output-file-ext: ".csv"
   output-file: "{DIR[DTC,PERF,VPP,2N,DNV]}/vpp_test_configuration_2n_dnv"
   columns:
@@ -4335,9 +4466,9 @@
   output-file-ext: ".csv"
   output-file: "{DIR[DTR,MRR,VPP,3N,HSW]}/vpp_mrr_results_3n_hsw"
   columns:
-  - title: "Name"
+  - title: " |prein| Test Name |preout| "
     data: "data name"
-  - title: "Status"
+  - title: " |prein| Maximum Receive Rate trial [Mpps] |preout| "
     data: "data msg"
   rows: "generated"
   data: "vpp-mrr-results-3n-hsw"
@@ -4354,9 +4485,9 @@
 #  output-file-ext: ".csv"
 #  output-file: "{DIR[DTR,MRR,VPP,3N,SKX]}/vpp_mrr_results_3n_skx"
 #  columns:
-#  - title: "Name"
+#  - title: " |prein| Test Name |preout| "
 #    data: "data name"
-#  - title: "Status"
+#  - title: " |prein| Maximum Receive Rate trial [Mpps] |preout| "
 #    data: "data msg"
 #  rows: "generated"
 #  data: "vpp-mrr-results-3n-skx"
@@ -4373,9 +4504,9 @@
 #  output-file-ext: ".csv"
 #  output-file: "{DIR[DTR,MRR,VPP,2N,SKX]}/vpp_mrr_results_2n_skx"
 #  columns:
-#  - title: "Name"
+#  - title: " |prein| Test Name |preout| "
 #    data: "data name"
-#  - title: "Status"
+#  - title: " |prein| Maximum Receive Rate trial [Mpps] |preout| "
 #    data: "data msg"
 #  rows: "generated"
 #  data: "vpp-mrr-results-2n-skx"
@@ -4392,9 +4523,9 @@
 #  output-file-ext: ".csv"
 #  output-file: "{DIR[DTR,MRR,VPP,2N,CLX]}/vpp_mrr_results_2n_clx"
 #  columns:
-#  - title: "Name"
+#  - title: " |prein| Test Name |preout| "
 #    data: "data name"
-#  - title: "Status"
+#  - title: " |prein| Maximum Receive Rate trial [Mpps] |preout| "
 #    data: "data msg"
 #  rows: "generated"
 #  data: "vpp-mrr-results-2n-clx"
@@ -4404,24 +4535,24 @@
 #  - "parent"
 #  - "msg"
 
-# Detailed Test Results - VPP MRR Results 3n-tsh
-- type: "table"
-  title: "Detailed Test Results - VPP MRR Results 3n-tsh"
-  algorithm: "table_details"
-  output-file-ext: ".csv"
-  output-file: "{DIR[DTR,MRR,VPP,3N,TSH]}/vpp_mrr_results_3n_tsh"
-  columns:
-  - title: "Name"
-    data: "data name"
-  - title: "Status"
-    data: "data msg"
-  rows: "generated"
-  data: "vpp-mrr-results-3n-tsh"
-  filter: "'MRR'"
-  parameters:
-  - "name"
-  - "parent"
-  - "msg"
+## Detailed Test Results - VPP MRR Results 3n-tsh
+#- type: "table"
+#  title: "Detailed Test Results - VPP MRR Results 3n-tsh"
+#  algorithm: "table_details"
+#  output-file-ext: ".csv"
+#  output-file: "{DIR[DTR,MRR,VPP,3N,TSH]}/vpp_mrr_results_3n_tsh"
+#  columns:
+#  - title: " |prein| Test Name |preout| "
+#    data: "data name"
+#  - title: " |prein| Maximum Receive Rate trial [Mpps] |preout| "
+#    data: "data msg"
+#  rows: "generated"
+#  data: "vpp-mrr-results-3n-tsh"
+#  filter: "'MRR'"
+#  parameters:
+#  - "name"
+#  - "parent"
+#  - "msg"
 
 # Detailed Test Results - VPP MRR Results 3n-dnv
 - type: "table"
@@ -4430,9 +4561,9 @@
   output-file-ext: ".csv"
   output-file: "{DIR[DTR,MRR,VPP,3N,DNV]}/vpp_mrr_results_3n_dnv"
   columns:
-  - title: "Name"
+  - title: " |prein| Test Name |preout| "
     data: "data name"
-  - title: "Status"
+  - title: " |prein| Maximum Receive Rate trial [Mpps] |preout| "
     data: "data msg"
   rows: "generated"
   data: "vpp-mrr-results-3n-dnv"
@@ -4449,9 +4580,9 @@
   output-file-ext: ".csv"
   output-file: "{DIR[DTR,MRR,VPP,2N,DNV]}/vpp_mrr_results_2n_dnv"
   columns:
-  - title: "Name"
+  - title: " |prein| Test Name |preout| "
     data: "data name"
-  - title: "Status"
+  - title: " |prein| Maximum Receive Rate trial [Mpps] |preout| "
     data: "data msg"
   rows: "generated"
   data: "vpp-mrr-results-2n-dnv"
@@ -4537,24 +4668,24 @@
 #  - "name"
 #  - "conf-history"
 
-# Test configuration - VPP MRR Test Configs 3n-tsh
-- type: "table"
-  title: "Test configuration - VPP MRR Test Configs 3n-tsh"
-  algorithm: "table_details"
-  output-file-ext: ".csv"
-  output-file: "{DIR[DTC,MRR,VPP,3N,TSH]}/vpp_mrr_configuration_3n_tsh"
-  columns:
-  - title: "Name"
-    data: "data name"
-  - title: "VPP API Test Commands History - Commands Used Per Test Case"
-    data: "data conf-history"
-  rows: "generated"
-  data: "vpp-mrr-results-3n-tsh"
-  filter: "'MRR'"
-  parameters:
-  - "parent"
-  - "name"
-  - "conf-history"
+## Test configuration - VPP MRR Test Configs 3n-tsh
+#- type: "table"
+#  title: "Test configuration - VPP MRR Test Configs 3n-tsh"
+#  algorithm: "table_details"
+#  output-file-ext: ".csv"
+#  output-file: "{DIR[DTC,MRR,VPP,3N,TSH]}/vpp_mrr_configuration_3n_tsh"
+#  columns:
+#  - title: "Name"
+#    data: "data name"
+#  - title: "VPP API Test Commands History - Commands Used Per Test Case"
+#    data: "data conf-history"
+#  rows: "generated"
+#  data: "vpp-mrr-results-3n-tsh"
+#  filter: "'MRR'"
+#  parameters:
+#  - "parent"
+#  - "name"
+#  - "conf-history"
 
 # Test configuration - VPP MRR Test Configs 3n-dnv
 - type: "table"
@@ -4601,10 +4732,8 @@
   output-file-ext: ".csv"
   output-file: "{DIR[DTR,FUNC,VPP,DEVICE,UBUNTU]}/vpp_device_results_ubuntu"
   columns:
-  - title: "Name"
+  - title: " |prein| Test Name |preout| "
     data: "data name"
-  - title: "Documentation"
-    data: "data doc"
   - title: "Status"
     data: "data status"
   rows: "generated"
@@ -5018,13 +5147,13 @@
 # Detailed Test Results - DPDK Performance Results 3n-hsw
 - type: "table"
   title: "Detailed Test Results - DPDK Performance Results 3n-hsw"
-  algorithm: "table_details"
+  algorithm: "table_merged_details"
   output-file-ext: ".csv"
   output-file: "{DIR[DTR,PERF,DPDK,3N,HSW]}/dpdk_performance_results_3n_hsw"
   columns:
-  - title: "Name"
+  - title: " |prein| Test Name |preout| "
     data: "data name"
-  - title: "Status"
+  - title: " |prein| Throughput: |br| 1. Mpps Gbps (NDR) |br| 2. Mpps Gbps (PDR) |br| |br| Two sets of Uni-Dir Latency Percentiles in uSec at %PDR load: |br| 3. P50 P90 P99    P50 P90 P99 (10% PDR) |br| 4. P50 P90 P99    P50 P90 P99 (50% PDR) |br| 5. P50 P90 P99    P50 P90 P99 (90% PDR) |preout| "
     data: "data msg"
   rows: "generated"
   data: "dpdk-perf-results-3n-hsw"
@@ -5041,9 +5170,9 @@
 #  output-file-ext: ".csv"
 #  output-file: "{DIR[DTR,PERF,DPDK,3N,SKX]}/dpdk_performance_results_3n_skx"
 #  columns:
-#  - title: "Name"
+#  - title: " |prein| Test Name |preout| "
 #    data: "data name"
-#  - title: "Status"
+#  - title: " |prein| Throughput: |br| 1. Mpps Gbps (NDR) |br| 2. Mpps Gbps (PDR) |br| |br| Two sets of Uni-Dir Latency Percentiles in uSec at %PDR load: |br| 3. P50 P90 P99    P50 P90 P99 (10% PDR) |br| 4. P50 P90 P99    P50 P90 P99 (50% PDR) |br| 5. P50 P90 P99    P50 P90 P99 (90% PDR) |preout| "
 #    data: "data msg"
 #  rows: "generated"
 #  data: "dpdk-perf-results-3n-skx"
@@ -5060,9 +5189,9 @@
 #  output-file-ext: ".csv"
 #  output-file: "{DIR[DTR,PERF,DPDK,2N,SKX]}/dpdk_performance_results_2n_skx"
 #  columns:
-#  - title: "Name"
+#  - title: " |prein| Test Name |preout| "
 #    data: "data name"
-#  - title: "Status"
+#  - title: " |prein| Throughput: |br| 1. Mpps Gbps (NDR) |br| 2. Mpps Gbps (PDR) |br| |br| Two sets of Uni-Dir Latency Percentiles in uSec at %PDR load: |br| 3. P50 P90 P99    P50 P90 P99 (10% PDR) |br| 4. P50 P90 P99    P50 P90 P99 (50% PDR) |br| 5. P50 P90 P99    P50 P90 P99 (90% PDR) |preout| "
 #    data: "data msg"
 #  rows: "generated"
 #  data: "dpdk-perf-results-2n-skx"
@@ -5079,9 +5208,9 @@
 #  output-file-ext: ".csv"
 #  output-file: "{DIR[DTR,PERF,DPDK,2N,CLX]}/dpdk_performance_results_2n_clx"
 #  columns:
-#  - title: "Name"
+#  - title: " |prein| Test Name |preout| "
 #    data: "data name"
-#  - title: "Status"
+#  - title: " |prein| Throughput: |br| 1. Mpps Gbps (NDR) |br| 2. Mpps Gbps (PDR) |br| |br| Two sets of Uni-Dir Latency Percentiles in uSec at %PDR load: |br| 3. P50 P90 P99    P50 P90 P99 (10% PDR) |br| 4. P50 P90 P99    P50 P90 P99 (50% PDR) |br| 5. P50 P90 P99    P50 P90 P99 (90% PDR) |preout| "
 #    data: "data msg"
 #  rows: "generated"
 #  data: "dpdk-perf-results-2n-clx"
@@ -5091,6 +5220,63 @@
 #  - "parent"
 #  - "msg"
 
+# Detailed Test Results - DPDK Performance Results 2n-dnv
+- type: "table"
+  title: "Detailed Test Results - DPDK Performance Results 2n-dnv"
+  algorithm: "table_details"
+  output-file-ext: ".csv"
+  output-file: "{DIR[DTR,PERF,DPDK,2N,DNV]}/dpdk_performance_results_2n_dnv"
+  columns:
+  - title: " |prein| Test Name |preout| "
+    data: "data name"
+  - title: " |prein| Throughput: |br| 1. Mpps Gbps (NDR) |br| 2. Mpps Gbps (PDR) |br| |br| Two sets of Uni-Dir Latency Percentiles in uSec at %PDR load: |br| 3. P50 P90 P99    P50 P90 P99 (10% PDR) |br| 4. P50 P90 P99    P50 P90 P99 (50% PDR) |br| 5. P50 P90 P99    P50 P90 P99 (90% PDR) |preout| "
+    data: "data msg"
+  rows: "generated"
+  data: "dpdk-perf-results-2n-dnv"
+  filter: "all"
+  parameters:
+  - "name"
+  - "parent"
+  - "msg"
+
+# Detailed Test Results - DPDK Performance Results 3n-dnv
+- type: "table"
+  title: "Detailed Test Results - DPDK Performance Results 3n-dnv"
+  algorithm: "table_details"
+  output-file-ext: ".csv"
+  output-file: "{DIR[DTR,PERF,DPDK,3N,DNV]}/dpdk_performance_results_3n_dnv"
+  columns:
+  - title: " |prein| Test Name |preout| "
+    data: "data name"
+  - title: " |prein| Throughput: |br| 1. Mpps Gbps (NDR) |br| 2. Mpps Gbps (PDR) |br| |br| Two sets of Uni-Dir Latency Percentiles in uSec at %PDR load: |br| 3. P50 P90 P99    P50 P90 P99 (10% PDR) |br| 4. P50 P90 P99    P50 P90 P99 (50% PDR) |br| 5. P50 P90 P99    P50 P90 P99 (90% PDR) |preout| "
+    data: "data msg"
+  rows: "generated"
+  data: "dpdk-perf-results-3n-dnv"
+  filter: "all"
+  parameters:
+  - "name"
+  - "parent"
+  - "msg"
+
+# Detailed Test Results - DPDK Performance Results 3n-tsh
+- type: "table"
+  title: "Detailed Test Results - DPDK Performance Results 3n-tsh"
+  algorithm: "table_details"
+  output-file-ext: ".csv"
+  output-file: "{DIR[DTR,PERF,DPDK,3N,TSH]}/dpdk_performance_results_3n_tsh"
+  columns:
+  - title: " |prein| Test Name |preout| "
+    data: "data name"
+  - title: " |prein| Throughput: |br| 1. Mpps Gbps (NDR) |br| 2. Mpps Gbps (PDR) |br| |br| Two sets of Uni-Dir Latency Percentiles in uSec at %PDR load: |br| 3. P50 P90 P99    P50 P90 P99 (10% PDR) |br| 4. P50 P90 P99    P50 P90 P99 (50% PDR) |br| 5. P50 P90 P99    P50 P90 P99 (90% PDR) |preout| "
+    data: "data msg"
+  rows: "generated"
+  data: "dpdk-perf-results-3n-tsh"
+  filter: "all"
+  parameters:
+  - "name"
+  - "parent"
+  - "msg"
+
 ################################################################################
 ###                                F I L E S                                 ###
 ################################################################################
@@ -5478,22 +5664,22 @@
 #  - "parent"
 #  data-start-level: 3
 
-# VPP MRR Results 3n-tsh
-- type: "file"
-  title: "VPP MRR Results 3n-tsh"
-  algorithm: "file_test_results"
-  output-file-ext: ".rst"
-  output-file: "{DIR[DTR,MRR,VPP,3N,TSH]}/vpp_mrr_results_3n_tsh"
-  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
-  dir-tables: "{DIR[DTR,MRR,VPP,3N,TSH]}"
-  data: "vpp-mrr-results-3n-tsh"
-  filter: "'MRR'"
-  parameters:
-  - "name"
-  - "doc"
-  - "level"
-  - "parent"
-  data-start-level: 3
+## VPP MRR Results 3n-tsh
+#- type: "file"
+#  title: "VPP MRR Results 3n-tsh"
+#  algorithm: "file_test_results"
+#  output-file-ext: ".rst"
+#  output-file: "{DIR[DTR,MRR,VPP,3N,TSH]}/vpp_mrr_results_3n_tsh"
+#  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
+#  dir-tables: "{DIR[DTR,MRR,VPP,3N,TSH]}"
+#  data: "vpp-mrr-results-3n-tsh"
+#  filter: "'MRR'"
+#  parameters:
+#  - "name"
+#  - "doc"
+#  - "level"
+#  - "parent"
+#  data-start-level: 3
 
 # VPP MRR Results 3n-dnv
 - type: "file"
@@ -5597,22 +5783,22 @@
 #  - "parent"
 #  data-start-level: 3
 
-# VPP MRR Configuration 3n-tsh
-- type: "file"
-  title: "VPP MRR Configuration 3n-tsh"
-  algorithm: "file_test_results"
-  output-file-ext: ".rst"
-  output-file: "{DIR[DTC,MRR,VPP,3N,TSH]}/vpp_mrr_configuration_3n_tsh"
-  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
-  dir-tables: "{DIR[DTC,MRR,VPP,3N,TSH]}"
-  data: "vpp-mrr-results-3n-tsh"
-  filter: "'MRR'"
-  parameters:
-  - "name"
-  - "doc"
-  - "level"
-  - "parent"
-  data-start-level: 3
+## VPP MRR Configuration 3n-tsh
+#- type: "file"
+#  title: "VPP MRR Configuration 3n-tsh"
+#  algorithm: "file_test_results"
+#  output-file-ext: ".rst"
+#  output-file: "{DIR[DTC,MRR,VPP,3N,TSH]}/vpp_mrr_configuration_3n_tsh"
+#  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
+#  dir-tables: "{DIR[DTC,MRR,VPP,3N,TSH]}"
+#  data: "vpp-mrr-results-3n-tsh"
+#  filter: "'MRR'"
+#  parameters:
+#  - "name"
+#  - "doc"
+#  - "level"
+#  - "parent"
+#  data-start-level: 3
 
 # VPP MRR Configuration 3n-dnv
 - type: "file"
@@ -5663,7 +5849,7 @@
   - "doc"
   - "level"
   - "parent"
-  data-start-level: 2
+  data-start-level: 3
 
 # VPP Device Configuration - Ubuntu
 - type: "file"
@@ -5680,7 +5866,7 @@
   - "doc"
   - "level"
   - "parent"
-  data-start-level: 2
+  data-start-level: 3
 
 # DPDK Performance Results 3n-hsw
 - type: "file"
@@ -5733,15 +5919,66 @@
 #  - "parent"
 #  data-start-level: 3
 
-# DPDK Performance Results 2n-clx
+## DPDK Performance Results 2n-clx
+#- type: "file"
+#  title: "DPDK Performance Results 2n-clx"
+#  algorithm: "file_test_results"
+#  output-file-ext: ".rst"
+#  output-file: "{DIR[DTR,PERF,DPDK,2N,CLX]}/dpdk_performance_results_2n_clx"
+#  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
+#  dir-tables: "{DIR[DTR,PERF,DPDK,2N,CLX]}"
+#  data: "dpdk-perf-results-2n-clx"
+#  filter: "all"
+#  parameters:
+#  - "name"
+#  - "doc"
+#  - "level"
+#  - "parent"
+#  data-start-level: 3
+
+# DPDK Performance Results 2n-dnv
+- type: "file"
+  title: "DPDK Performance Results 2n-dnv"
+  algorithm: "file_test_results"
+  output-file-ext: ".rst"
+  output-file: "{DIR[DTR,PERF,DPDK,2N,DNV]}/dpdk_performance_results_2n_dnv"
+  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
+  dir-tables: "{DIR[DTR,PERF,DPDK,2N,DNV]}"
+  data: "dpdk-perf-results-2n-dnv"
+  filter: "all"
+  parameters:
+  - "name"
+  - "doc"
+  - "level"
+  - "parent"
+  data-start-level: 3
+
+# DPDK Performance Results 3n-dnv
+- type: "file"
+  title: "DPDK Performance Results 3n-dnv"
+  algorithm: "file_test_results"
+  output-file-ext: ".rst"
+  output-file: "{DIR[DTR,PERF,DPDK,3N,DNV]}/dpdk_performance_results_3n_dnv"
+  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
+  dir-tables: "{DIR[DTR,PERF,DPDK,3N,DNV]}"
+  data: "dpdk-perf-results-3n-dnv"
+  filter: "all"
+  parameters:
+  - "name"
+  - "doc"
+  - "level"
+  - "parent"
+  data-start-level: 3
+
+# DPDK Performance Results 3n-tsh
 - type: "file"
-  title: "DPDK Performance Results 2n-clx"
+  title: "DPDK Performance Results 3n-tsh"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
-  output-file: "{DIR[DTR,PERF,DPDK,2N,CLX]}/dpdk_performance_results_2n_clx"
+  output-file: "{DIR[DTR,PERF,DPDK,3N,TSH]}/dpdk_performance_results_3n_tsh"
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
-  dir-tables: "{DIR[DTR,PERF,DPDK,2N,CLX]}"
-  data: "dpdk-perf-results-2n-clx"
+  dir-tables: "{DIR[DTR,PERF,DPDK,3N,TSH]}"
+  data: "dpdk-perf-results-3n-tsh"
   filter: "all"
   parameters:
   - "name"
@@ -11228,11 +11465,11 @@
   data: "plot-vpp-throughput-lat-tsa-3n-tsh"
   include:
     - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-1t1c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-1t1c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+#    - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-1t1c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
     - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-1t1c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-1t1c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+#    - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-1t1c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
     - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-1t1c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-1t1c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+#    - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-1t1c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
   layout:
     title: "3n-tsh-x520-imix-1t1c-ipsec-ip4routing-base-scale-sw-ixgbe-ndr"
     layout: "plot-throughput"
@@ -11244,11 +11481,11 @@
   data: "plot-vpp-throughput-lat-tsa-3n-tsh"
   include:
     - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-1t1c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-1t1c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+#    - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-1t1c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
     - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-1t1c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-1t1c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+#    - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-1t1c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
     - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-1t1c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-1t1c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+#    - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-1t1c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
   layout:
     title: "3n-tsh-x520-imix-1t1c-ipsec-ip4routing-base-scale-sw-ixgbe-pdr"
     layout: "plot-throughput"
@@ -11923,31 +12160,31 @@
     title: "3n-tsh-x520-78b-1t1c-srv6-ip6routing-base-ixgbe-pdr"
     layout: "plot-throughput"
 
-- type: "plot"
-  title: "Throughput: 3n-dnv-x553-78b-1t1c-srv6-ip6routing-base-ixgbe-ndr"
-  algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-dnv-x553-78b-1t1c-srv6-ip6routing-base-ixgbe-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-dnv"
-  include:
-    - "Tests.Vpp.Perf.Srv6.10Ge2P1X553-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-Ndrpdr.78B-1t1c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr"
-    - "Tests.Vpp.Perf.Srv6.10Ge2P1X553-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Ndrpdr.78B-1t1c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr"
-    - "Tests.Vpp.Perf.Srv6.10Ge2P1X553-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Nodecaps-Ndrpdr.78B-1t1c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr"
-  layout:
-    title: "3n-dnv-x553-78b-1t1c-srv6-ip6routing-base-ixgbe-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Throughput: 3n-dnv-x553-78b-1t1c-srv6-ip6routing-base-ixgbe-pdr"
-  algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-dnv-x553-78b-1t1c-srv6-ip6routing-base-ixgbe-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-dnv"
-  include:
-    - "Tests.Vpp.Perf.Srv6.10Ge2P1X553-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-Ndrpdr.78B-1t1c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr"
-    - "Tests.Vpp.Perf.Srv6.10Ge2P1X553-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Ndrpdr.78B-1t1c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr"
-    - "Tests.Vpp.Perf.Srv6.10Ge2P1X553-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Nodecaps-Ndrpdr.78B-1t1c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr"
-  layout:
-    title: "3n-dnv-x553-78b-1t1c-srv6-ip6routing-base-ixgbe-pdr"
-    layout: "plot-throughput"
+#- type: "plot"
+#  title: "Throughput: 3n-dnv-x553-78b-1t1c-srv6-ip6routing-base-ixgbe-ndr"
+#  algorithm: "plot_perf_box_name"
+#  output-file: "{DIR[STATIC,VPP]}/3n-dnv-x553-78b-1t1c-srv6-ip6routing-base-ixgbe-ndr"
+#  data: "plot-vpp-throughput-lat-tsa-3n-dnv"
+#  include:
+#    - "Tests.Vpp.Perf.Srv6.10Ge2P1X553-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-Ndrpdr.78B-1t1c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr"
+#    - "Tests.Vpp.Perf.Srv6.10Ge2P1X553-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Ndrpdr.78B-1t1c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr"
+#    - "Tests.Vpp.Perf.Srv6.10Ge2P1X553-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Nodecaps-Ndrpdr.78B-1t1c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr"
+#  layout:
+#    title: "3n-dnv-x553-78b-1t1c-srv6-ip6routing-base-ixgbe-ndr"
+#    layout: "plot-throughput"
+#
+#- type: "plot"
+#  title: "Throughput: 3n-dnv-x553-78b-1t1c-srv6-ip6routing-base-ixgbe-pdr"
+#  algorithm: "plot_perf_box_name"
+#  output-file: "{DIR[STATIC,VPP]}/3n-dnv-x553-78b-1t1c-srv6-ip6routing-base-ixgbe-pdr"
+#  data: "plot-vpp-throughput-lat-tsa-3n-dnv"
+#  include:
+#    - "Tests.Vpp.Perf.Srv6.10Ge2P1X553-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-Ndrpdr.78B-1t1c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr"
+#    - "Tests.Vpp.Perf.Srv6.10Ge2P1X553-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Ndrpdr.78B-1t1c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr"
+#    - "Tests.Vpp.Perf.Srv6.10Ge2P1X553-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Nodecaps-Ndrpdr.78B-1t1c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr"
+#  layout:
+#    title: "3n-dnv-x553-78b-1t1c-srv6-ip6routing-base-ixgbe-pdr"
+#    layout: "plot-throughput"
 
 #- type: "plot"
 #  title: "Throughput: 2n-skx-xxv710-64b-2t1c-vhost-base-dpdk-ndr"
@@ -12242,66 +12479,96 @@
 #    layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 3n-tsh-x520-64b-1t1c-vhost-base-ixgbe-ndr"
+  title: "Throughput: 3n-tsh-x520-64b-1t1c-vhost-base-ixgbe-vppl2xc-ndr"
   algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-tsh-x520-64b-1t1c-vhost-base-ixgbe-ndr"
+  output-file: "{DIR[STATIC,VPP]}/3n-tsh-x520-64b-1t1c-vhost-base-ixgbe-vppl2xc-ndr"
   data: "plot-vpp-throughput-lat-tsa-3n-tsh"
   include:
-    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-vppl2xc-Ndrpdr.64B-1t1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-vppl2xc-Ndrpdr.64B-1t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-vppl2xc-Ndrpdr.64B-1t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-vppl2xc-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-vppl2xc-Ndrpdr.64B-1t1c-ethip4-ip4base-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
   layout:
-    title: "3n-tsh-x520-64b-1t1c-vhost-base-ixgbe-ndr"
+    title: "3n-tsh-x520-64b-1t1c-vhost-base-ixgbe-vppl2xc-ndr"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 3n-tsh-x520-64b-1t1c-vhost-base-ixgbe-pdr"
+  title: "Throughput: 3n-tsh-x520-64b-1t1c-vhost-base-ixgbe-vppl2xc-pdr"
   algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-tsh-x520-64b-1t1c-vhost-base-ixgbe-pdr"
+  output-file: "{DIR[STATIC,VPP]}/3n-tsh-x520-64b-1t1c-vhost-base-ixgbe-vppl2xc-pdr"
   data: "plot-vpp-throughput-lat-tsa-3n-tsh"
   include:
-    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-vppl2xc-Ndrpdr.64B-1t1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-vppl2xc-Ndrpdr.64B-1t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-vppl2xc-Ndrpdr.64B-1t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-vppl2xc-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-vppl2xc-Ndrpdr.64B-1t1c-ethip4-ip4base-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
   layout:
-    title: "3n-tsh-x520-64b-1t1c-vhost-base-ixgbe-pdr"
+    title: "3n-tsh-x520-64b-1t1c-vhost-base-ixgbe-vppl2xc-pdr"
     layout: "plot-throughput"
 
-- type: "plot"
-  title: "Throughput: 3n-tsh-x520-64b-1t1c-link-bonding-vhost-base-ixgbe-ndr"
-  algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-tsh-x520-64b-1t1c-link-bonding-vhost-base-ixgbe-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-tsh"
-  include:
-    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-1Lbvpplacp-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-1Lbvpplacp-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-  layout:
-    title: "3n-tsh-x520-64b-1t1c-link-bonding-vhost-base-ixgbe-ndr"
-    layout: "plot-throughput"
+#- type: "plot"
+#  title: "Throughput: 3n-tsh-x520-64b-1t1c-vhost-base-ixgbe-ndr"
+#  algorithm: "plot_perf_box_name"
+#  output-file: "{DIR[STATIC,VPP]}/3n-tsh-x520-64b-1t1c-vhost-base-ixgbe-ndr"
+#  data: "plot-vpp-throughput-lat-tsa-3n-tsh"
+#  include:
+#    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+#    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+#    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+#    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+#    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr"
+#  layout:
+#    title: "3n-tsh-x520-64b-1t1c-vhost-base-ixgbe-ndr"
+#    layout: "plot-throughput"
+#
+#- type: "plot"
+#  title: "Throughput: 3n-tsh-x520-64b-1t1c-vhost-base-ixgbe-pdr"
+#  algorithm: "plot_perf_box_name"
+#  output-file: "{DIR[STATIC,VPP]}/3n-tsh-x520-64b-1t1c-vhost-base-ixgbe-pdr"
+#  data: "plot-vpp-throughput-lat-tsa-3n-tsh"
+#  include:
+#    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+#    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+#    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+#    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+#    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr"
+#  layout:
+#    title: "3n-tsh-x520-64b-1t1c-vhost-base-ixgbe-pdr"
+#    layout: "plot-throughput"
 
-- type: "plot"
-  title: "Throughput: 3n-tsh-x520-64b-1t1c-link-bonding-vhost-base-ixgbe-pdr"
-  algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-tsh-x520-64b-1t1c-link-bonding-vhost-base-ixgbe-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-tsh"
-  include:
-    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-1Lbvpplacp-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-1Lbvpplacp-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-  layout:
-    title: "3n-tsh-x520-64b-1t1c-link-bonding-vhost-base-ixgbe-pdr"
-    layout: "plot-throughput"
+#- type: "plot"
+#  title: "Throughput: 3n-tsh-x520-64b-1t1c-link-bonding-vhost-base-ixgbe-ndr"
+#  algorithm: "plot_perf_box_name"
+#  output-file: "{DIR[STATIC,VPP]}/3n-tsh-x520-64b-1t1c-link-bonding-vhost-base-ixgbe-ndr"
+#  data: "plot-vpp-throughput-lat-tsa-3n-tsh"
+#  include:
+#    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-1Lbvpplacp-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+#    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+#    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+#    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-1Lbvpplacp-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+#    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+#    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+#  layout:
+#    title: "3n-tsh-x520-64b-1t1c-link-bonding-vhost-base-ixgbe-ndr"
+#    layout: "plot-throughput"
+#
+#- type: "plot"
+#  title: "Throughput: 3n-tsh-x520-64b-1t1c-link-bonding-vhost-base-ixgbe-pdr"
+#  algorithm: "plot_perf_box_name"
+#  output-file: "{DIR[STATIC,VPP]}/3n-tsh-x520-64b-1t1c-link-bonding-vhost-base-ixgbe-pdr"
+#  data: "plot-vpp-throughput-lat-tsa-3n-tsh"
+#  include:
+#    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-1Lbvpplacp-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+#    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+#    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+#    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-1Lbvpplacp-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+#    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+#    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+#  layout:
+#    title: "3n-tsh-x520-64b-1t1c-link-bonding-vhost-base-ixgbe-pdr"
+#    layout: "plot-throughput"
 
 #- type: "plot"
 #  title: "Throughput: 2n-skx-xxv710-114b-2t1c-vts-l2switching-base-dpdk-ndr"
@@ -13926,66 +14193,96 @@
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 3n-tsh-x520-64b-vhost-base-ixgbe-ndr-tsa"
+  title: "Speedup: 3n-tsh-x520-64b-vhost-base-ixgbe-vppl2xc-ndr-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-tsh-x520-64b-vhost-base-ixgbe-ndr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/3n-tsh-x520-64b-vhost-base-ixgbe-vppl2xc-ndr-tsa"
   data: "plot-vpp-throughput-lat-tsa-3n-tsh"
   include:
-    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-vppl2xc-Ndrpdr.64B-.t.c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-vppl2xc-Ndrpdr.64B-.t.c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-vppl2xc-Ndrpdr.64B-.t.c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-vppl2xc-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-vppl2xc-Ndrpdr.64B-.t.c-ethip4-ip4base-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
   layout:
-    title: "3n-tsh-x520-64b-vhost-base-ixgbe-ndr"
+    title: "3n-tsh-x520-64b-vhost-base-ixgbe-vppl2xc-ndr"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 3n-tsh-x520-64b-vhost-base-ixgbe-pdr-tsa"
+  title: "Speedup: 3n-tsh-x520-64b-vhost-base-ixgbe-vppl2xc-pdr-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-tsh-x520-64b-vhost-base-ixgbe-pdr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/3n-tsh-x520-64b-vhost-base-ixgbe-vppl2xc-pdr-tsa"
   data: "plot-vpp-throughput-lat-tsa-3n-tsh"
   include:
-    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-vppl2xc-Ndrpdr.64B-.t.c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-vppl2xc-Ndrpdr.64B-.t.c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-vppl2xc-Ndrpdr.64B-.t.c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-vppl2xc-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-vppl2xc-Ndrpdr.64B-.t.c-ethip4-ip4base-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
   layout:
-    title: "3n-tsh-x520-64b-vhost-base-ixgbe-pdr"
+    title: "3n-tsh-x520-64b-vhost-base-ixgbe-vppl2xc-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-- type: "plot"
-  title: "Speedup: 3n-tsh-x520-64b-link-bonding-vhost-base-ixgbe-ndr-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-tsh-x520-64b-link-bonding-vhost-base-ixgbe-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-tsh"
-  include:
-    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-1Lbvpplacp-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-1Lbvpplacp-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-  layout:
-    title: "3n-tsh-x520-64b-link-bonding-vhost-base-ixgbe-ndr"
-    layout: "plot-throughput-speedup-analysis"
+#- type: "plot"
+#  title: "Speedup: 3n-tsh-x520-64b-vhost-base-ixgbe-ndr-tsa"
+#  algorithm: "plot_tsa_name"
+#  output-file: "{DIR[STATIC,VPP]}/3n-tsh-x520-64b-vhost-base-ixgbe-ndr-tsa"
+#  data: "plot-vpp-throughput-lat-tsa-3n-tsh"
+#  include:
+#    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+#    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+#    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+#    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+#    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr"
+#  layout:
+#    title: "3n-tsh-x520-64b-vhost-base-ixgbe-ndr"
+#    layout: "plot-throughput-speedup-analysis"
+#
+#- type: "plot"
+#  title: "Speedup: 3n-tsh-x520-64b-vhost-base-ixgbe-pdr-tsa"
+#  algorithm: "plot_tsa_name"
+#  output-file: "{DIR[STATIC,VPP]}/3n-tsh-x520-64b-vhost-base-ixgbe-pdr-tsa"
+#  data: "plot-vpp-throughput-lat-tsa-3n-tsh"
+#  include:
+#    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+#    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+#    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+#    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+#    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr"
+#  layout:
+#    title: "3n-tsh-x520-64b-vhost-base-ixgbe-pdr"
+#    layout: "plot-throughput-speedup-analysis"
 
-- type: "plot"
-  title: "Speedup: 3n-tsh-x520-64b-link-bonding-vhost-base-ixgbe-pdr-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-tsh-x520-64b-link-bonding-vhost-base-ixgbe-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-tsh"
-  include:
-    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-1Lbvpplacp-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-1Lbvpplacp-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-  layout:
-    title: "3n-tsh-x520-64b-link-bonding-vhost-base-ixgbe-pdr"
-    layout: "plot-throughput-speedup-analysis"
+#- type: "plot"
+#  title: "Speedup: 3n-tsh-x520-64b-link-bonding-vhost-base-ixgbe-ndr-tsa"
+#  algorithm: "plot_tsa_name"
+#  output-file: "{DIR[STATIC,VPP]}/3n-tsh-x520-64b-link-bonding-vhost-base-ixgbe-ndr-tsa"
+#  data: "plot-vpp-throughput-lat-tsa-3n-tsh"
+#  include:
+#    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-1Lbvpplacp-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+#    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+#    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+#    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-1Lbvpplacp-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+#    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+#    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+#  layout:
+#    title: "3n-tsh-x520-64b-link-bonding-vhost-base-ixgbe-ndr"
+#    layout: "plot-throughput-speedup-analysis"
+#
+#- type: "plot"
+#  title: "Speedup: 3n-tsh-x520-64b-link-bonding-vhost-base-ixgbe-pdr-tsa"
+#  algorithm: "plot_tsa_name"
+#  output-file: "{DIR[STATIC,VPP]}/3n-tsh-x520-64b-link-bonding-vhost-base-ixgbe-pdr-tsa"
+#  data: "plot-vpp-throughput-lat-tsa-3n-tsh"
+#  include:
+#    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-1Lbvpplacp-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+#    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+#    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+#    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-1Lbvpplacp-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+#    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+#    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+#  layout:
+#    title: "3n-tsh-x520-64b-link-bonding-vhost-base-ixgbe-pdr"
+#    layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
   title: "Speedup: 2n-dnv-x553-64b-ip4routing-base-scale-ixgbe-ndr-tsa"
@@ -14383,31 +14680,31 @@
     title: "3n-dnv-x553-64b-features-l2switching-base-ixgbe-pdr-tsa"
     layout: "plot-throughput-speedup-analysis"
 
-- type: "plot"
-  title: "Speedup: 3n-dnv-x553-78b-srv6-ip6routing-base-ixgbe-ndr-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-dnv-x553-78b-srv6-ip6routing-base-ixgbe-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-dnv"
-  include:
-    - "Tests.Vpp.Perf.Srv6.10Ge2P1X553-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-Ndrpdr.78B-.t.c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr"
-    - "Tests.Vpp.Perf.Srv6.10Ge2P1X553-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Ndrpdr.78B-.t.c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr"
-    - "Tests.Vpp.Perf.Srv6.10Ge2P1X553-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Nodecaps-Ndrpdr.78B-.t.c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr"
-  layout:
-    title: "3n-dnv-x553-78b-srv6-ip6routing-base-ixgbe-ndr-tsa"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: 3n-dnv-x553-78b-srv6-ip6routing-base-ixgbe-pdr-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-dnv-x553-78b-srv6-ip6routing-base-ixgbe-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-dnv"
-  include:
-    - "Tests.Vpp.Perf.Srv6.10Ge2P1X553-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-Ndrpdr.78B-.t.c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr"
-    - "Tests.Vpp.Perf.Srv6.10Ge2P1X553-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Ndrpdr.78B-.t.c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr"
-    - "Tests.Vpp.Perf.Srv6.10Ge2P1X553-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Nodecaps-Ndrpdr.78B-.t.c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr"
-  layout:
-    title: "3n-dnv-x553-78b-srv6-ip6routing-base-ixgbe-pdr-tsa"
-    layout: "plot-throughput-speedup-analysis"
+#- type: "plot"
+#  title: "Speedup: 3n-dnv-x553-78b-srv6-ip6routing-base-ixgbe-ndr-tsa"
+#  algorithm: "plot_tsa_name"
+#  output-file: "{DIR[STATIC,VPP]}/3n-dnv-x553-78b-srv6-ip6routing-base-ixgbe-ndr-tsa"
+#  data: "plot-vpp-throughput-lat-tsa-3n-dnv"
+#  include:
+#    - "Tests.Vpp.Perf.Srv6.10Ge2P1X553-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-Ndrpdr.78B-.t.c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr"
+#    - "Tests.Vpp.Perf.Srv6.10Ge2P1X553-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Ndrpdr.78B-.t.c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr"
+#    - "Tests.Vpp.Perf.Srv6.10Ge2P1X553-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Nodecaps-Ndrpdr.78B-.t.c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr"
+#  layout:
+#    title: "3n-dnv-x553-78b-srv6-ip6routing-base-ixgbe-ndr-tsa"
+#    layout: "plot-throughput-speedup-analysis"
+#
+#- type: "plot"
+#  title: "Speedup: 3n-dnv-x553-78b-srv6-ip6routing-base-ixgbe-pdr-tsa"
+#  algorithm: "plot_tsa_name"
+#  output-file: "{DIR[STATIC,VPP]}/3n-dnv-x553-78b-srv6-ip6routing-base-ixgbe-pdr-tsa"
+#  data: "plot-vpp-throughput-lat-tsa-3n-dnv"
+#  include:
+#    - "Tests.Vpp.Perf.Srv6.10Ge2P1X553-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-Ndrpdr.78B-.t.c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr"
+#    - "Tests.Vpp.Perf.Srv6.10Ge2P1X553-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Ndrpdr.78B-.t.c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr"
+#    - "Tests.Vpp.Perf.Srv6.10Ge2P1X553-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Nodecaps-Ndrpdr.78B-.t.c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr"
+#  layout:
+#    title: "3n-dnv-x553-78b-srv6-ip6routing-base-ixgbe-pdr-tsa"
+#    layout: "plot-throughput-speedup-analysis"
 
 ################################################################################
 
@@ -14713,6 +15010,156 @@
     title: "3n-hsw-x710-64b-2t2c-base-pdr"
     layout: "plot-throughput"
 
+# 2n-dnv-x553
+
+- type: "plot"
+  title: "DPDK Throughput: 2n-dnv-x553-64b-1t1c-base-ndr"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,DPDK]}/2n-dnv-x553-64b-1t1c-base-ndr"
+  data: "plot-dpdk-throughput-latency-2n-dnv"
+  include:
+    - "tests.dpdk.perf.2N1L-10Ge2P1X553-eth-l2xcbase-testpmd-ndrpdr.64b-1t1c-eth-l2xcbase-testpmd-ndrpdr"
+    - "tests.dpdk.perf.2N1L-10Ge2P1X553-ethip4-ip4base-l3fwd-ndrpdr.64b-1t1c-ethip4-ip4base-l3fwd-ndrpdr"
+  layout:
+    title: "2n-dnv-x553-64b-1t1c-base-ndr"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "DPDK Throughput: 2n-dnv-x553-64b-2t2c-base-ndr"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,DPDK]}/2n-dnv-x553-64b-2t2c-base-ndr"
+  data: "plot-dpdk-throughput-latency-2n-dnv"
+  include:
+    - "tests.dpdk.perf.2N1L-10Ge2P1X553-eth-l2xcbase-testpmd-ndrpdr.64b-2t2c-eth-l2xcbase-testpmd-ndrpdr"
+    - "tests.dpdk.perf.2N1L-10Ge2P1X553-ethip4-ip4base-l3fwd-ndrpdr.64b-2t2c-ethip4-ip4base-l3fwd-ndrpdr"
+  layout:
+    title: "2n-dnv-x553-64b-2t2c-base-ndr"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "DPDK Throughput: 2n-dnv-x553-64b-1t1c-base-pdr"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,DPDK]}/2n-dnv-x553-64b-1t1c-base-pdr"
+  data: "plot-dpdk-throughput-latency-2n-dnv"
+  include:
+    - "tests.dpdk.perf.2N1L-10Ge2P1X553-eth-l2xcbase-testpmd-ndrpdr.64b-1t1c-eth-l2xcbase-testpmd-ndrpdr"
+    - "tests.dpdk.perf.2N1L-10Ge2P1X553-ethip4-ip4base-l3fwd-ndrpdr.64b-1t1c-ethip4-ip4base-l3fwd-ndrpdr"
+  layout:
+    title: "2n-dnv-x553-64b-1t1c-base-pdr"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "DPDK Throughput: 2n-dnv-x553-64b-2t2c-base-pdr"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,DPDK]}/2n-dnv-x553-64b-2t2c-base-pdr"
+  data: "plot-dpdk-throughput-latency-2n-dnv"
+  include:
+    - "tests.dpdk.perf.2N1L-10Ge2P1X553-eth-l2xcbase-testpmd-ndrpdr.64b-2t2c-eth-l2xcbase-testpmd-ndrpdr"
+    - "tests.dpdk.perf.2N1L-10Ge2P1X553-ethip4-ip4base-l3fwd-ndrpdr.64b-2t2c-ethip4-ip4base-l3fwd-ndrpdr"
+  layout:
+    title: "2n-dnv-x553-64b-2t2c-base-pdr"
+    layout: "plot-throughput"
+
+# 3n-dnv-x553
+
+- type: "plot"
+  title: "DPDK Throughput: 3n-dnv-x553-64b-1t1c-base-ndr"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,DPDK]}/3n-dnv-x553-64b-1t1c-base-ndr"
+  data: "plot-dpdk-throughput-latency-3n-dnv"
+  include:
+    - "tests.dpdk.perf.10Ge2P1X553-eth-l2xcbase-testpmd-ndrpdr.64b-1t1c-eth-l2xcbase-testpmd-ndrpdr"
+    - "tests.dpdk.perf.10Ge2P1X553-ethip4-ip4base-l3fwd-ndrpdr.64b-1t1c-ethip4-ip4base-l3fwd-ndrpdr"
+  layout:
+    title: "3n-dnv-x553-64b-1t1c-base-ndr"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "DPDK Throughput: 3n-dnv-x553-64b-2t2c-base-ndr"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,DPDK]}/3n-dnv-x553-64b-2t2c-base-ndr"
+  data: "plot-dpdk-throughput-latency-3n-dnv"
+  include:
+    - "tests.dpdk.perf.10Ge2P1X553-eth-l2xcbase-testpmd-ndrpdr.64b-2t2c-eth-l2xcbase-testpmd-ndrpdr"
+    - "tests.dpdk.perf.10Ge2P1X553-ethip4-ip4base-l3fwd-ndrpdr.64b-2t2c-ethip4-ip4base-l3fwd-ndrpdr"
+  layout:
+    title: "3n-dnv-x553-64b-2t2c-base-ndr"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "DPDK Throughput: 3n-dnv-x553-64b-1t1c-base-pdr"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,DPDK]}/3n-dnv-x553-64b-1t1c-base-pdr"
+  data: "plot-dpdk-throughput-latency-3n-dnv"
+  include:
+    - "tests.dpdk.perf.10Ge2P1X553-eth-l2xcbase-testpmd-ndrpdr.64b-1t1c-eth-l2xcbase-testpmd-ndrpdr"
+    - "tests.dpdk.perf.10Ge2P1X553-ethip4-ip4base-l3fwd-ndrpdr.64b-1t1c-ethip4-ip4base-l3fwd-ndrpdr"
+  layout:
+    title: "3n-dnv-x553-64b-1t1c-base-pdr"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "DPDK Throughput: 3n-dnv-x553-64b-2t2c-base-pdr"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,DPDK]}/3n-dnv-x553-64b-2t2c-base-pdr"
+  data: "plot-dpdk-throughput-latency-3n-dnv"
+  include:
+    - "tests.dpdk.perf.10Ge2P1X553-eth-l2xcbase-testpmd-ndrpdr.64b-2t2c-eth-l2xcbase-testpmd-ndrpdr"
+    - "tests.dpdk.perf.10Ge2P1X553-ethip4-ip4base-l3fwd-ndrpdr.64b-2t2c-ethip4-ip4base-l3fwd-ndrpdr"
+  layout:
+    title: "3n-dnv-x553-64b-2t2c-base-pdr"
+    layout: "plot-throughput"
+
+# 3n-tsh-x520
+
+- type: "plot"
+  title: "DPDK Throughput: 3n-tsh-x520-64b-1t1c-base-ndr"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,DPDK]}/3n-tsh-x520-64b-1t1c-base-ndr"
+  data: "plot-dpdk-throughput-latency-3n-tsh"
+  include:
+    - "tests.dpdk.perf.10ge2p1x520-eth-l2xcbase-testpmd-ndrpdr.64b-1t1c-eth-l2xcbase-testpmd-ndrpdr"
+    - "tests.dpdk.perf.10ge2p1x520-ethip4-ip4base-l3fwd-ndrpdr.64b-1t1c-ethip4-ip4base-l3fwd-ndrpdr"
+  layout:
+    title: "3n-tsh-x520-64b-1t1c-base-ndr"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "DPDK Throughput: 3n-tsh-x520-64b-2t2c-base-ndr"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,DPDK]}/3n-tsh-x520-64b-2t2c-base-ndr"
+  data: "plot-dpdk-throughput-latency-3n-tsh"
+  include:
+    - "tests.dpdk.perf.10ge2p1x520-eth-l2xcbase-testpmd-ndrpdr.64b-2t2c-eth-l2xcbase-testpmd-ndrpdr"
+    - "tests.dpdk.perf.10ge2p1x520-ethip4-ip4base-l3fwd-ndrpdr.64b-2t2c-ethip4-ip4base-l3fwd-ndrpdr"
+  layout:
+    title: "3n-tsh-x520-64b-2t2c-base-ndr"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "DPDK Throughput: 3n-tsh-x520-64b-1t1c-base-pdr"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,DPDK]}/3n-tsh-x520-64b-1t1c-base-pdr"
+  data: "plot-dpdk-throughput-latency-3n-tsh"
+  include:
+    - "tests.dpdk.perf.10ge2p1x520-eth-l2xcbase-testpmd-ndrpdr.64b-1t1c-eth-l2xcbase-testpmd-ndrpdr"
+    - "tests.dpdk.perf.10ge2p1x520-ethip4-ip4base-l3fwd-ndrpdr.64b-1t1c-ethip4-ip4base-l3fwd-ndrpdr"
+  layout:
+    title: "3n-tsh-x520-64b-1t1c-base-pdr"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "DPDK Throughput: 3n-tsh-x520-64b-2t2c-base-pdr"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,DPDK]}/3n-tsh-x520-64b-2t2c-base-pdr"
+  data: "plot-dpdk-throughput-latency-3n-tsh"
+  include:
+    - "tests.dpdk.perf.10ge2p1x520-eth-l2xcbase-testpmd-ndrpdr.64b-2t2c-eth-l2xcbase-testpmd-ndrpdr"
+    - "tests.dpdk.perf.10ge2p1x520-ethip4-ip4base-l3fwd-ndrpdr.64b-2t2c-ethip4-ip4base-l3fwd-ndrpdr"
+  layout:
+    title: "3n-tsh-x520-64b-2t2c-base-pdr"
+    layout: "plot-throughput"
+
 ################################################################################
 ###   2n-clx                                                                 ###
 ################################################################################
@@ -16009,103 +16456,103 @@
 
 # 2n-clx-xxv710
 
-- type: "plot"
-  title: "DPDK Throughput: 2n-clx-xxv710-64b-2t1c-base-ndr"
-  algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,DPDK]}/2n-clx-xxv710-64b-2t1c-base-ndr"
-  data: "plot-dpdk-throughput-latency-2n-clx"
-  include:
-    - "tests.dpdk.perf.2n1l-25ge2p1xxv710-eth-l2xcbase-testpmd-ndrpdr.64b-2t1c-eth-l2xcbase-testpmd-ndrpdr"
-    - "tests.dpdk.perf.2n1l-25ge2p1xxv710-ethip4-ip4base-l3fwd-ndrpdr.64b-2t1c-ethip4-ip4base-l3fwd-ndrpdr"
-  layout:
-    title: "2n-clx-xxv710-64b-2t1c-base-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "DPDK Throughput: 2n-clx-xxv710-64b-4t2c-base-ndr"
-  algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,DPDK]}/2n-clx-xxv710-64b-4t2c-base-ndr"
-  data: "plot-dpdk-throughput-latency-2n-clx"
-  include:
-    - "tests.dpdk.perf.2n1l-25ge2p1xxv710-eth-l2xcbase-testpmd-ndrpdr.64b-4t2c-eth-l2xcbase-testpmd-ndrpdr"
-    - "tests.dpdk.perf.2n1l-25ge2p1xxv710-ethip4-ip4base-l3fwd-ndrpdr.64b-4t2c-ethip4-ip4base-l3fwd-ndrpdr"
-  layout:
-    title: "2n-clx-xxv710-64b-4t2c-base-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "DPDK Throughput: 2n-clx-xxv710-64b-2t1c-base-pdr"
-  algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,DPDK]}/2n-clx-xxv710-64b-2t1c-base-pdr"
-  data: "plot-dpdk-throughput-latency-2n-clx"
-  include:
-    - "tests.dpdk.perf.2n1l-25ge2p1xxv710-eth-l2xcbase-testpmd-ndrpdr.64b-2t1c-eth-l2xcbase-testpmd-ndrpdr"
-    - "tests.dpdk.perf.2n1l-25ge2p1xxv710-ethip4-ip4base-l3fwd-ndrpdr.64b-2t1c-ethip4-ip4base-l3fwd-ndrpdr"
-  layout:
-    title: "2n-clx-xxv710-64b-2t1c-base-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "DPDK Throughput: 2n-clx-xxv710-64b-4t2c-base-pdr"
-  algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,DPDK]}/2n-clx-xxv710-64b-4t2c-base-pdr"
-  data: "plot-dpdk-throughput-latency-2n-clx"
-  include:
-    - "tests.dpdk.perf.2n1l-25ge2p1xxv710-eth-l2xcbase-testpmd-ndrpdr.64b-4t2c-eth-l2xcbase-testpmd-ndrpdr"
-    - "tests.dpdk.perf.2n1l-25ge2p1xxv710-ethip4-ip4base-l3fwd-ndrpdr.64b-4t2c-ethip4-ip4base-l3fwd-ndrpdr"
-  layout:
-    title: "2n-clx-xxv710-64b-4t2c-base-pdr"
-    layout: "plot-throughput"
-
-# 2n-clx-x710
-
-- type: "plot"
-  title: "DPDK Throughput: 2n-clx-x710-64b-2t1c-base-ndr"
-  algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,DPDK]}/2n-clx-x710-64b-2t1c-base-ndr"
-  data: "plot-dpdk-throughput-latency-2n-clx"
-  include:
-    - "tests.dpdk.perf.2n1l-10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.64b-2t1c-eth-l2xcbase-testpmd-ndrpdr"
-    - "tests.dpdk.perf.2n1l-10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.64b-2t1c-ethip4-ip4base-l3fwd-ndrpdr"
-  layout:
-    title: "2n-clx-x710-64b-2t1c-base-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "DPDK Throughput: 2n-clx-x710-64b-4t2c-base-ndr"
-  algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,DPDK]}/2n-clx-x710-64b-4t2c-base-ndr"
-  data: "plot-dpdk-throughput-latency-2n-clx"
-  include:
-    - "tests.dpdk.perf.2n1l-10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.64b-4t2c-eth-l2xcbase-testpmd-ndrpdr"
-    - "tests.dpdk.perf.2n1l-10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.64b-4t2c-ethip4-ip4base-l3fwd-ndrpdr"
-  layout:
-    title: "2n-clx-x710-64b-4t2c-base-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "DPDK Throughput: 2n-clx-x710-64b-2t1c-base-pdr"
-  algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,DPDK]}/2n-clx-x710-64b-2t1c-base-pdr"
-  data: "plot-dpdk-throughput-latency-2n-clx"
-  include:
-    - "tests.dpdk.perf.2n1l-10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.64b-2t1c-eth-l2xcbase-testpmd-ndrpdr"
-    - "tests.dpdk.perf.2n1l-10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.64b-2t1c-ethip4-ip4base-l3fwd-ndrpdr"
-  layout:
-    title: "2n-clx-x710-64b-2t1c-base-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "DPDK Throughput: 2n-clx-x710-64b-4t2c-base-pdr"
-  algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,DPDK]}/2n-clx-x710-64b-4t2c-base-pdr"
-  data: "plot-dpdk-throughput-latency-2n-clx"
-  include:
-    - "tests.dpdk.perf.2n1l-10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.64b-4t2c-eth-l2xcbase-testpmd-ndrpdr"
-    - "tests.dpdk.perf.2n1l-10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.64b-4t2c-ethip4-ip4base-l3fwd-ndrpdr"
-  layout:
-    title: "2n-clx-x710-64b-4t2c-base-pdr"
-    layout: "plot-throughput"
+#- type: "plot"
+#  title: "DPDK Throughput: 2n-clx-xxv710-64b-2t1c-base-ndr"
+#  algorithm: "plot_perf_box_name"
+#  output-file: "{DIR[STATIC,DPDK]}/2n-clx-xxv710-64b-2t1c-base-ndr"
+#  data: "plot-dpdk-throughput-latency-2n-clx"
+#  include:
+#    - "tests.dpdk.perf.2n1l-25ge2p1xxv710-eth-l2xcbase-testpmd-ndrpdr.64b-2t1c-eth-l2xcbase-testpmd-ndrpdr"
+#    - "tests.dpdk.perf.2n1l-25ge2p1xxv710-ethip4-ip4base-l3fwd-ndrpdr.64b-2t1c-ethip4-ip4base-l3fwd-ndrpdr"
+#  layout:
+#    title: "2n-clx-xxv710-64b-2t1c-base-ndr"
+#    layout: "plot-throughput"
+#
+#- type: "plot"
+#  title: "DPDK Throughput: 2n-clx-xxv710-64b-4t2c-base-ndr"
+#  algorithm: "plot_perf_box_name"
+#  output-file: "{DIR[STATIC,DPDK]}/2n-clx-xxv710-64b-4t2c-base-ndr"
+#  data: "plot-dpdk-throughput-latency-2n-clx"
+#  include:
+#    - "tests.dpdk.perf.2n1l-25ge2p1xxv710-eth-l2xcbase-testpmd-ndrpdr.64b-4t2c-eth-l2xcbase-testpmd-ndrpdr"
+#    - "tests.dpdk.perf.2n1l-25ge2p1xxv710-ethip4-ip4base-l3fwd-ndrpdr.64b-4t2c-ethip4-ip4base-l3fwd-ndrpdr"
+#  layout:
+#    title: "2n-clx-xxv710-64b-4t2c-base-ndr"
+#    layout: "plot-throughput"
+#
+#- type: "plot"
+#  title: "DPDK Throughput: 2n-clx-xxv710-64b-2t1c-base-pdr"
+#  algorithm: "plot_perf_box_name"
+#  output-file: "{DIR[STATIC,DPDK]}/2n-clx-xxv710-64b-2t1c-base-pdr"
+#  data: "plot-dpdk-throughput-latency-2n-clx"
+#  include:
+#    - "tests.dpdk.perf.2n1l-25ge2p1xxv710-eth-l2xcbase-testpmd-ndrpdr.64b-2t1c-eth-l2xcbase-testpmd-ndrpdr"
+#    - "tests.dpdk.perf.2n1l-25ge2p1xxv710-ethip4-ip4base-l3fwd-ndrpdr.64b-2t1c-ethip4-ip4base-l3fwd-ndrpdr"
+#  layout:
+#    title: "2n-clx-xxv710-64b-2t1c-base-pdr"
+#    layout: "plot-throughput"
+#
+#- type: "plot"
+#  title: "DPDK Throughput: 2n-clx-xxv710-64b-4t2c-base-pdr"
+#  algorithm: "plot_perf_box_name"
+#  output-file: "{DIR[STATIC,DPDK]}/2n-clx-xxv710-64b-4t2c-base-pdr"
+#  data: "plot-dpdk-throughput-latency-2n-clx"
+#  include:
+#    - "tests.dpdk.perf.2n1l-25ge2p1xxv710-eth-l2xcbase-testpmd-ndrpdr.64b-4t2c-eth-l2xcbase-testpmd-ndrpdr"
+#    - "tests.dpdk.perf.2n1l-25ge2p1xxv710-ethip4-ip4base-l3fwd-ndrpdr.64b-4t2c-ethip4-ip4base-l3fwd-ndrpdr"
+#  layout:
+#    title: "2n-clx-xxv710-64b-4t2c-base-pdr"
+#    layout: "plot-throughput"
+#
+## 2n-clx-x710
+#
+#- type: "plot"
+#  title: "DPDK Throughput: 2n-clx-x710-64b-2t1c-base-ndr"
+#  algorithm: "plot_perf_box_name"
+#  output-file: "{DIR[STATIC,DPDK]}/2n-clx-x710-64b-2t1c-base-ndr"
+#  data: "plot-dpdk-throughput-latency-2n-clx"
+#  include:
+#    - "tests.dpdk.perf.2n1l-10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.64b-2t1c-eth-l2xcbase-testpmd-ndrpdr"
+#    - "tests.dpdk.perf.2n1l-10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.64b-2t1c-ethip4-ip4base-l3fwd-ndrpdr"
+#  layout:
+#    title: "2n-clx-x710-64b-2t1c-base-ndr"
+#    layout: "plot-throughput"
+#
+#- type: "plot"
+#  title: "DPDK Throughput: 2n-clx-x710-64b-4t2c-base-ndr"
+#  algorithm: "plot_perf_box_name"
+#  output-file: "{DIR[STATIC,DPDK]}/2n-clx-x710-64b-4t2c-base-ndr"
+#  data: "plot-dpdk-throughput-latency-2n-clx"
+#  include:
+#    - "tests.dpdk.perf.2n1l-10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.64b-4t2c-eth-l2xcbase-testpmd-ndrpdr"
+#    - "tests.dpdk.perf.2n1l-10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.64b-4t2c-ethip4-ip4base-l3fwd-ndrpdr"
+#  layout:
+#    title: "2n-clx-x710-64b-4t2c-base-ndr"
+#    layout: "plot-throughput"
+#
+#- type: "plot"
+#  title: "DPDK Throughput: 2n-clx-x710-64b-2t1c-base-pdr"
+#  algorithm: "plot_perf_box_name"
+#  output-file: "{DIR[STATIC,DPDK]}/2n-clx-x710-64b-2t1c-base-pdr"
+#  data: "plot-dpdk-throughput-latency-2n-clx"
+#  include:
+#    - "tests.dpdk.perf.2n1l-10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.64b-2t1c-eth-l2xcbase-testpmd-ndrpdr"
+#    - "tests.dpdk.perf.2n1l-10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.64b-2t1c-ethip4-ip4base-l3fwd-ndrpdr"
+#  layout:
+#    title: "2n-clx-x710-64b-2t1c-base-pdr"
+#    layout: "plot-throughput"
+#
+#- type: "plot"
+#  title: "DPDK Throughput: 2n-clx-x710-64b-4t2c-base-pdr"
+#  algorithm: "plot_perf_box_name"
+#  output-file: "{DIR[STATIC,DPDK]}/2n-clx-x710-64b-4t2c-base-pdr"
+#  data: "plot-dpdk-throughput-latency-2n-clx"
+#  include:
+#    - "tests.dpdk.perf.2n1l-10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.64b-4t2c-eth-l2xcbase-testpmd-ndrpdr"
+#    - "tests.dpdk.perf.2n1l-10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.64b-4t2c-ethip4-ip4base-l3fwd-ndrpdr"
+#  layout:
+#    title: "2n-clx-x710-64b-4t2c-base-pdr"
+#    layout: "plot-throughput"
 
 ################################################################################
 
@@ -16163,3 +16610,25 @@
   filter: "'1T1C' and 'NIC_Intel-X520-DA2'"
   layout:
     layout: "plot-hdrh-latency-by-percentile"
+
+- type: "plot"
+  title: "Latency by percentile: DPDK 3n-hsw"
+  algorithm: "plot_hdrh_lat_by_percentile"
+  output-file: "{DIR[STATIC,DPDK]}/hdrh-lat-percentile-3n-hsw"
+  output-file-links: "{DIR[LAT,DPDK]}/3n_hsw.rst"
+  target-links: "../../_static/dpdk"
+  data: "plot-dpdk-hdrh-lat-3n-hsw"
+  filter: "'1T1C' and 'NIC_Intel-XL710'"
+  layout:
+    layout: "plot-hdrh-latency-by-percentile"
+
+- type: "plot"
+  title: "Latency by percentile: DPDK 3n-tsh"
+  algorithm: "plot_hdrh_lat_by_percentile"
+  output-file: "{DIR[STATIC,DPDK]}/hdrh-lat-percentile-3n-tsh"
+  output-file-links: "{DIR[LAT,DPDK]}/3n_tsh.rst"
+  target-links: "../../_static/dpdk"
+  data: "plot-dpdk-hdrh-lat-3n-tsh"
+  filter: "'1T1C' and 'NIC_Intel-X520-DA2'"
+  layout:
+    layout: "plot-hdrh-latency-by-percentile"