CSIT-1211: Add 2n/3n-skx to detailed results

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

diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml
index 4bbf1b4..cdc3ef5 100644 (file)
--- a/resources/tools/presentation/specification.yaml
+++ b/resources/tools/presentation/specification.yaml
@@ -27,12 +27,19 @@
 
     # Detailed test results
     DIR[DTR]: "{DIR[WORKING,SRC]}/detailed_test_results"
-    DIR[DTR,PERF,DPDK]: "{DIR[DTR]}/dpdk_performance_results"
-    DIR[DTR,PERF,VPP]: "{DIR[DTR]}/vpp_performance_results"
-    DIR[DTR,MRR,VPP]: "{DIR[DTR]}/vpp_mrr_results"
-    DIR[DTR,PERF,COT]: "{DIR[DTR]}/cot_performance_results"
-    DIR[DTR,PERF,HC]: "{DIR[DTR]}/honeycomb_performance_results"
-    DIR[DTR,FUNC,VPP]: "{DIR[DTR]}/vpp_functional_results"
+    DIR[DTR,PERF,DPDK,3N,HSW]: "{DIR[DTR]}/dpdk_performance_results_3n_hsw"
+    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,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"
+    DIR[DTR,MRR,VPP,3N,HSW]: "{DIR[DTR]}/vpp_mrr_results_3n_hsw"
+    DIR[DTR,MRR,VPP,3N,SKX]: "{DIR[DTR]}/vpp_mrr_results_3n_skx"
+    DIR[DTR,MRR,VPP,2N,SKX]: "{DIR[DTR]}/vpp_mrr_results_2n_skx"
+    DIR[DTR,PERF,COT,3N,HSW]: "{DIR[DTR]}/cot_performance_results_3n_hsw"
+    DIR[DTR,PERF,COT,3N,SKX]: "{DIR[DTR]}/cot_performance_results_3n_skx"
+    DIR[DTR,PERF,COT,2N,SKX]: "{DIR[DTR]}/cot_performance_results_2n_skx"
+    DIR[DTR,FUNC,VPP,UBUNTU]: "{DIR[DTR]}/vpp_functional_results_ubuntu"
     DIR[DTR,FUNC,VPP,CENTOS]: "{DIR[DTR]}/vpp_functional_results_centos"
     DIR[DTR,FUNC,HC]: "{DIR[DTR]}/honeycomb_functional_results"
     DIR[DTR,FUNC,NSHSFC]: "{DIR[DTR]}/nshsfc_functional_results"
@@ -240,27 +247,57 @@
       - 12  # sel
       - 13  # sel
       - 14  # sel
-    vpp-perf-results:
+    vpp-perf-results-3n-hsw:
       csit-vpp-perf-1804-all:
       - 19  # full
       - 20  # full
       - 25  # full
       - 49  # full
-    vpp-func-results:
+    vpp-perf-results-3n-skx:
+      csit-vpp-perf-1804-all:
+      - 19  # full
+      - 20  # full
+      - 25  # full
+      - 49  # full
+    vpp-perf-results-2n-skx:
+      csit-vpp-perf-1804-all:
+      - 19  # full
+      - 20  # full
+      - 25  # full
+      - 49  # full
+    vpp-func-results-ubuntu:
       csit-vpp-functional-1804-ubuntu1604-virl:
       - 229
     vpp-func-results-centos:
       csit-vpp-functional-1804-centos7-virl:
       - 238
-    vpp-mrr-results:
+    vpp-mrr-results-3n-hsw:
       csit-vpp-perf-check-1804:
       - 5   # mrr - full
-    ligato-perf-results:
+    vpp-mrr-results-3n-skx:
+      csit-vpp-perf-check-1804:
+      - 5   # mrr - full
+    vpp-mrr-results-2n-skx:
+      csit-vpp-perf-check-1804:
+      - 5   # mrr - full
+    ligato-perf-results-3n-hsw:
       csit-ligato-perf-1804-all:
       - 4  # full
-    dpdk-perf-results:
-      csit-dpdk-perf-1804-all:
-      - 13
+    ligato-perf-results-3n-skx:
+      csit-ligato-perf-1804-all:
+      - 4  # full
+    ligato-perf-results-2n-skx:
+      csit-ligato-perf-1804-all:
+      - 4  # full
+    dpdk-perf-results-3n-hsw:
+      csit-dpdk-perf-verify-1807-3n-hsw:
+      - 2
+    dpdk-perf-results-3n-skx:
+      csit-dpdk-perf-verify-1807-3n-skx:
+      - 3
+    dpdk-perf-results-2n-skx:
+      csit-dpdk-perf-verify-1807-2n-skx:
+      - 9
     hc-func-results:
       csit-hc2vpp-verify-func-1804-ubuntu1604:
       - 3
@@ -316,41 +353,25 @@
       - 31  # sel
       - 35  # sel
     plot-dpdk-throughput-latency-3n-hsw:
-      csit-dpdk-perf-1804-all:
-      - 4
-      - 5
-      - 6
-      - 7
-      - 8
-      - 9
-      - 10
-      - 11
-      - 12
-      - 13
+      csit-dpdk-perf-verify-1807-3n-hsw:
+      - 1
+      - 2
     plot-dpdk-throughput-latency-3n-skx:
-      csit-dpdk-perf-1804-all:
-      - 4
-      - 5
-      - 6
-      - 7
-      - 8
-      - 9
-      - 10
-      - 11
-      - 12
-      - 13
+      csit-dpdk-perf-verify-1807-3n-skx:
+      - 1
+      - 2
+      - 3
     plot-dpdk-throughput-latency-2n-skx:
-      csit-dpdk-perf-1804-all:
+      csit-dpdk-perf-verify-1807-2n-skx:
+      - 1
+      - 2
+      - 3
       - 4
       - 5
       - 6
       - 7
       - 8
       - 9
-      - 10
-      - 11
-      - 12
-      - 13
     plot-ligato-throughput-latency-3n-hsw:
       csit-ligato-perf-1804-all:
       - 5   # sel
@@ -717,17 +738,23 @@
     - 12  # sel
     - 13  # sel
     - 14  # sel
-    csit-dpdk-perf-1804-all:
+    csit-dpdk-perf-verify-1807-3n-hsw:
+    - 1
+    - 2
+    csit-dpdk-perf-verify-1807-3n-skx:
+    - 1
+    - 2
+    - 3
+    csit-dpdk-perf-verify-1807-2n-skx:
+    - 1
+    - 2
+    - 3
     - 4
     - 5
     - 6
     - 7
     - 8
     - 9
-    - 10
-    - 11
-    - 12
-    - 13
     csit-vpp-functional-1804-ubuntu1604-virl:
     - 229
     csit-vpp-functional-1804-centos7-virl:
@@ -752,10 +779,9 @@
 
 -
   type: "table"
-  title: "VPP Performance Changes"
+  title: "VPP Performance Changes 1t1c pdr"
   algorithm: "table_performance_comparison"
-  output-file-ext: ".csv"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-1t1c-pdr"
   history:
     -
       title: "rls1710"
@@ -802,22 +828,192 @@
       - 31  # sel
       - 35  # sel
   data: "vpp-performance-changes"
-  filter: "all"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'1T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
   - "name"
   - "parent"
   - "throughput"
-  # Number of the best and the worst tests presented in the table. Use 0 (zero)
-  # to present all tests.
-  nr-of-tests-shown: 20
-  outlier-const: 1.5
 
 -
   type: "table"
-  title: "VPP Performance Changes - MRR"
-  algorithm: "table_performance_comparison_mrr"
-  output-file-ext: ".csv"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-mrr"
+  title: "VPP Performance Changes 2t2c pdr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2t2c-pdr"
+  history:
+    -
+      title: "rls1710"
+      data:
+        csit-vpp-perf-1710-all:
+        - 11
+        - 12
+        - 13
+        - 14
+        - 15
+        - 16
+        - 17
+        - 18
+        - 19
+        - 20
+  reference:
+    title: "rls1801"
+    data:
+      csit-vpp-perf-1801-all:
+      - 124  # sel
+      - 127  # sel
+      - 128  # sel
+      - 141  # sel
+      - 142  # sel
+      - 143  # sel
+      - 145  # sel
+      - 146  # sel
+      - 162  # sel
+      - 163  # sel
+      - 167  # sel
+      - 172  # sel acl only
+  compare:
+    title: "rls1804"
+    data:
+      csit-vpp-perf-1804-all:
+      - 21  # sel
+      - 22  # sel
+      - 23  # sel
+      - 24  # sel
+      - 27  # sel
+      - 28  # sel
+      - 29  # sel
+      - 30  # sel
+      - 31  # sel
+      - 35  # sel
+  data: "vpp-performance-changes"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+
+-
+  type: "table"
+  title: "VPP Performance Changes 1t1c ndr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-1t1c-ndr"
+  history:
+    -
+      title: "rls1710"
+      data:
+        csit-vpp-perf-1710-all:
+        - 11
+        - 12
+        - 13
+        - 14
+        - 15
+        - 16
+        - 17
+        - 18
+        - 19
+        - 20
+  reference:
+    title: "rls1801"
+    data:
+      csit-vpp-perf-1801-all:
+      - 124  # sel
+      - 127  # sel
+      - 128  # sel
+      - 141  # sel
+      - 142  # sel
+      - 143  # sel
+      - 145  # sel
+      - 146  # sel
+      - 162  # sel
+      - 163  # sel
+      - 167  # sel
+      - 172  # sel acl only
+  compare:
+    title: "rls1804"
+    data:
+      csit-vpp-perf-1804-all:
+      - 21  # sel
+      - 22  # sel
+      - 23  # sel
+      - 24  # sel
+      - 27  # sel
+      - 28  # sel
+      - 29  # sel
+      - 30  # sel
+      - 31  # sel
+      - 35  # sel
+  data: "vpp-performance-changes"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'1T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+
+-
+  type: "table"
+  title: "VPP Performance Changes 2t2c ndr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2t2c-ndr"
+  history:
+    -
+      title: "rls1710"
+      data:
+        csit-vpp-perf-1710-all:
+        - 11
+        - 12
+        - 13
+        - 14
+        - 15
+        - 16
+        - 17
+        - 18
+        - 19
+        - 20
+  reference:
+    title: "rls1801"
+    data:
+      csit-vpp-perf-1801-all:
+      - 124  # sel
+      - 127  # sel
+      - 128  # sel
+      - 141  # sel
+      - 142  # sel
+      - 143  # sel
+      - 145  # sel
+      - 146  # sel
+      - 162  # sel
+      - 163  # sel
+      - 167  # sel
+      - 172  # sel acl only
+  compare:
+    title: "rls1804"
+    data:
+      csit-vpp-perf-1804-all:
+      - 21  # sel
+      - 22  # sel
+      - 23  # sel
+      - 24  # sel
+      - 27  # sel
+      - 28  # sel
+      - 29  # sel
+      - 30  # sel
+      - 31  # sel
+      - 35  # sel
+  data: "vpp-performance-changes"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+
+-
+  type: "table"
+  title: "VPP Performance Changes - 1t1c MRR"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-1t1c-mrr"
   reference:
     title: "Release 1801"
     data:
@@ -847,22 +1043,151 @@
       - 21  # mrr - sel
       - 22  # mrr - sel
   data: "vpp-performance-changes-mrr"
-  filter: "all"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'1T1C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "result"
+
+-
+  type: "table"
+  title: "VPP Performance Changes - 2t2c MRR"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2t2c-mrr"
+  reference:
+    title: "Release 1801"
+    data:
+      csit-vpp-perf-check-1801:
+      - 3
+      - 4
+      - 5
+      - 6
+      - 7
+      - 8
+      - 9
+      - 11
+      - 12
+      - 13
+  compare:
+    title: "Release 1804"
+    data:
+      csit-vpp-perf-check-1804:
+      - 6   # mrr - sel
+      - 13  # mrr - sel
+      - 14  # mrr - sel
+      - 15  # mrr - sel
+      - 16  # mrr - sel
+      - 17  # mrr - sel
+      - 19  # mrr - sel
+      - 20  # mrr - sel
+      - 21  # mrr - sel
+      - 22  # mrr - sel
+  data: "vpp-performance-changes-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T2C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "result"
+
+-
+  type: "table"
+  title: "VPP Performance Changes - 4t4c MRR"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-4t4c-mrr"
+  reference:
+    title: "Release 1801"
+    data:
+      csit-vpp-perf-check-1801:
+      - 3
+      - 4
+      - 5
+      - 6
+      - 7
+      - 8
+      - 9
+      - 11
+      - 12
+      - 13
+  compare:
+    title: "Release 1804"
+    data:
+      csit-vpp-perf-check-1804:
+      - 6   # mrr - sel
+      - 13  # mrr - sel
+      - 14  # mrr - sel
+      - 15  # mrr - sel
+      - 16  # mrr - sel
+      - 17  # mrr - sel
+      - 19  # mrr - sel
+      - 20  # mrr - sel
+      - 21  # mrr - sel
+      - 22  # mrr - sel
+  data: "vpp-performance-changes-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T4C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "result"
+
+-
+  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"
+    data: "data name"
+  -
+    title: "Documentation"
+    data: "data doc"
+  -
+    title: "Status"
+    data: "data msg"
+  rows: "generated"
+  data: "vpp-perf-results-3n-hsw"
+  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  parameters:
+  - "name"
+  - "parent"
+  - "doc"
+  - "msg"
+
+-
+  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"
+    data: "data name"
+  -
+    title: "Documentation"
+    data: "data doc"
+  -
+    title: "Status"
+    data: "data msg"
+  rows: "generated"
+  data: "vpp-perf-results-3n-skx"
+  filter: "not 'NDRCHK' and not 'PDRCHK'"
   parameters:
   - "name"
   - "parent"
-  - "result"
-  # Number of the best and the worst tests presented in the table. Use 0 (zero)
-  # to present all tests.
-  nr-of-tests-shown: 20
-  outlier-const: 1.5
+  - "doc"
+  - "msg"
 
 -
   type: "table"
-  title: "Detailed Test Results - VPP Performance Results"
+  title: "Detailed Test Results - VPP Performance Results 2n-skx"
   algorithm: "table_merged_details"
   output-file-ext: ".csv"
-  output-file: "{DIR[DTR,PERF,VPP]}/vpp_performance_results"
+  output-file: "{DIR[DTR,PERF,VPP,2N,SKX]}/vpp_performance_results_2n_skx"
   columns:
   -
     title: "Name"
@@ -874,15 +1199,13 @@
     title: "Status"
     data: "data msg"
   rows: "generated"
-  data:
-    "vpp-perf-results"
+  data: "vpp-perf-results-2n-skx"
   filter: "not 'NDRCHK' and not 'PDRCHK'"
   parameters:
   - "name"
   - "parent"
   - "doc"
   - "msg"
-
 -
   type: "table"
   title: "Test configuration - VPP Performance Test Configs"
@@ -898,7 +1221,7 @@
     data: "data vat-history"
   rows: "generated"
   data:
-    "vpp-perf-results"
+    "vpp-perf-results-3n-hsw"
   filter: "not 'NDRCHK' and not 'PDRCHK'"
   parameters:
   - "parent"
@@ -920,7 +1243,7 @@
     data: "data show-run"
   rows: "generated"
   data:
-    "vpp-perf-results"
+    "vpp-perf-results-3n-hsw"
   filter: "not 'NDRCHK' and not 'PDRCHK'"
   parameters:
   - "parent"
@@ -929,10 +1252,10 @@
 
 -
   type: "table"
-  title: "Detailed Test Results - VPP MRR Results"
+  title: "Detailed Test Results - VPP MRR Results 3n-hsw"
   algorithm: "table_details"
   output-file-ext: ".csv"
-  output-file: "{DIR[DTR,MRR,VPP]}/vpp_mrr_results"
+  output-file: "{DIR[DTR,MRR,VPP,3N,HSW]}/vpp_mrr_results_3n_hsw"
   columns:
   -
     title: "Name"
@@ -944,8 +1267,57 @@
     title: "Status"
     data: "data msg"
   rows: "generated"
-  data:
-    "vpp-mrr-results"
+  data: "vpp-mrr-results-3n-hsw"
+  filter: "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "doc"
+  - "msg"
+
+-
+  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"
+    data: "data name"
+  -
+    title: "Documentation"
+    data: "data doc"
+  -
+    title: "Status"
+    data: "data msg"
+  rows: "generated"
+  data: "vpp-mrr-results-3n-skx"
+  filter: "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "doc"
+  - "msg"
+
+-
+  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"
+    data: "data name"
+  -
+    title: "Documentation"
+    data: "data doc"
+  -
+    title: "Status"
+    data: "data msg"
+  rows: "generated"
+  data: "vpp-mrr-results-2n-skx"
   filter: "'MRR'"
   parameters:
   - "name"
@@ -968,7 +1340,7 @@
     data: "data vat-history"
   rows: "generated"
   data:
-    "vpp-mrr-results"
+    "vpp-mrr-results-3n-hsw"
   filter: "'MRR'"
   parameters:
   - "parent"
@@ -977,10 +1349,10 @@
 
 -
   type: "table"
-  title: "Detailed Test Results - VPP Functional Results"
+  title: "Detailed Test Results - VPP Functional Results - Ubuntu"
   algorithm: "table_details"
   output-file-ext: ".csv"
-  output-file: "{DIR[DTR,FUNC,VPP]}/vpp_functional_results"
+  output-file: "{DIR[DTR,FUNC,VPP,UBUNTU]}/vpp_functional_results_ubuntu"
   columns:
   -
     title: "Name"
@@ -992,8 +1364,7 @@
     title: "Status"
     data: "data status"
   rows: "generated"
-  data:
-    "vpp-func-results"
+  data: "vpp-func-results-ubuntu"
   filter: "all"
   parameters:
   - "name"
@@ -1029,7 +1400,7 @@
 
 -
   type: "table"
-  title: "Test configuration - VPP Functional Test Configs"
+  title: "Test configuration - VPP Functional Test Configs - Ubuntu"
   algorithm: "table_details"
   output-file-ext: ".csv"
   output-file: "{DIR[DTC,FUNC,VPP]}/vpp_functional_configuration"
@@ -1041,8 +1412,7 @@
     title: "VPP API Test (VAT) Commands History - Commands Used Per Test Case"
     data: "data vat-history"
   rows: "generated"
-  data:
-    "vpp-func-results"
+  data: "vpp-func-results-ubuntu"
   filter: "all"
   parameters:
   - "parent"
@@ -1073,10 +1443,10 @@
 
 -
   type: "table"
-  title: "Detailed Test Results - Container Orchestrated Topologies Performance Results"
+  title: "Detailed Test Results - Container Orchestrated Topologies Performance Results 3n-hsw"
   algorithm: "table_details"
   output-file-ext: ".csv"
-  output-file: "{DIR[DTR,PERF,COT]}/cot_performance_results"
+  output-file: "{DIR[DTR,PERF,COT,3N,HSW]}/cot_performance_results_3n_hsw"
   columns:
   -
     title: "Name"
@@ -1088,8 +1458,7 @@
     title: "Status"
     data: "data msg"
   rows: "generated"
-  data:
-    "ligato-perf-results"
+  data: "ligato-perf-results-3n-hsw"
   filter: "all"
   parameters:
   - "name"
@@ -1099,10 +1468,10 @@
 
 -
   type: "table"
-  title: "Detailed Test Results - DPDK Performance Results"
+  title: "Detailed Test Results - Container Orchestrated Topologies Performance Results 3n-skx"
   algorithm: "table_details"
   output-file-ext: ".csv"
-  output-file: "{DIR[DTR,PERF,DPDK]}/dpdk_performance_results"
+  output-file: "{DIR[DTR,PERF,COT,3N,SKX]}/cot_performance_results_3n_skx"
   columns:
   -
     title: "Name"
@@ -1114,8 +1483,32 @@
     title: "Status"
     data: "data msg"
   rows: "generated"
-  data:
-    "dpdk-perf-results"
+  data: "ligato-perf-results-3n-skx"
+  filter: "all"
+  parameters:
+  - "name"
+  - "parent"
+  - "doc"
+  - "msg"
+
+-
+  type: "table"
+  title: "Detailed Test Results - Container Orchestrated Topologies Performance Results 2n-skx"
+  algorithm: "table_details"
+  output-file-ext: ".csv"
+  output-file: "{DIR[DTR,PERF,COT,2N,SKX]}/cot_performance_results_2n_skx"
+  columns:
+  -
+    title: "Name"
+    data: "data name"
+  -
+    title: "Documentation"
+    data: "data doc"
+  -
+    title: "Status"
+    data: "data msg"
+  rows: "generated"
+  data: "ligato-perf-results-2n-skx"
   filter: "all"
   parameters:
   - "name"
@@ -1123,6 +1516,69 @@
   - "doc"
   - "msg"
 
+-
+  type: "table"
+  title: "Detailed Test Results - DPDK Performance Results 3n-hsw"
+  algorithm: "table_details"
+  output-file-ext: ".csv"
+  output-file: "{DIR[DTR,PERF,DPDK,3N,HSW]}/dpdk_performance_results_3n_hsw"
+  columns:
+  -
+    title: "Name"
+    data: "data name"
+  -
+    title: "Status"
+    data: "data msg"
+  rows: "generated"
+  data: "dpdk-perf-results-3n-hsw"
+  filter: "all"
+  parameters:
+  - "name"
+  - "parent"
+  - "msg"
+
+-
+  type: "table"
+  title: "Detailed Test Results - DPDK Performance Results 3n-skx"
+  algorithm: "table_details"
+  output-file-ext: ".csv"
+  output-file: "{DIR[DTR,PERF,DPDK,3N,SKX]}/dpdk_performance_results_3n_skx"
+  columns:
+  -
+    title: "Name"
+    data: "data name"
+  -
+    title: "Status"
+    data: "data msg"
+  rows: "generated"
+  data: "dpdk-perf-results-3n-skx"
+  filter: "all"
+  parameters:
+  - "name"
+  - "parent"
+  - "msg"
+
+-
+  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"
+    data: "data name"
+  -
+    title: "Status"
+    data: "data msg"
+  rows: "generated"
+  data: "dpdk-perf-results-2n-skx"
+  filter: "all"
+  parameters:
+  - "name"
+  - "parent"
+  - "msg"
+
 -
   type: "table"
   title: "Detailed Test Results - Honeycomb Functional Results"
@@ -1181,79 +1637,141 @@
 
 -
   type: "file"
-  title: "VPP Performance Results"
-  algorithm: "file_merged_test_results"
+  title: "VPP Performance Results 3n-hsw"
+  algorithm: "file_test_results"
   output-file-ext: ".rst"
-  output-file: "{DIR[DTR,PERF,VPP]}/vpp_performance_results"
+  output-file: "{DIR[DTR,PERF,VPP,3N,HSW]}/vpp_performance_results_3n_hsw"
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
-  dir-tables: "{DIR[DTR,PERF,VPP]}"
-  data:
-    "vpp-perf-results"
+  dir-tables: "{DIR[DTR,PERF,VPP,3N,HSW]}"
+  data: "vpp-perf-results-3n-hsw"
+  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  parameters:
+  - "name"
+  - "doc"
+  - "level"
+  - "parent"
+  data-start-level: 3
+
+-
+  type: "file"
+  title: "VPP Performance Results 3n-skx"
+  algorithm: "file_test_results"
+  output-file-ext: ".rst"
+  output-file: "{DIR[DTR,PERF,VPP,3N,SKX]}/vpp_performance_results_3n_skx"
+  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
+  dir-tables: "{DIR[DTR,PERF,VPP,3N,SKX]}"
+  data: "vpp-perf-results-3n-skx"
+  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  parameters:
+  - "name"
+  - "doc"
+  - "level"
+  - "parent"
+  data-start-level: 3
+
+-
+  type: "file"
+  title: "VPP Performance Results 2n-skx"
+  algorithm: "file_test_results"
+  output-file-ext: ".rst"
+  output-file: "{DIR[DTR,PERF,VPP,2N,SKX]}/vpp_performance_results_2n_skx"
+  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
+  dir-tables: "{DIR[DTR,PERF,VPP,2N,SKX]}"
+  data: "vpp-perf-results-2n-skx"
   filter: "not 'NDRCHK' and not 'PDRCHK'"
   parameters:
   - "name"
   - "doc"
   - "level"
   - "parent"
-  data-start-level: 3  # 0, 1, 2, ...
-  chapters-start-level: 2  # 0, 1, 2, ...
+  data-start-level: 3
 
 -
   type: "file"
   title: "VPP Performance Configuration"
-  algorithm: "file_merged_test_results"
+  algorithm: "file_test_results"
   output-file-ext: ".rst"
   output-file: "{DIR[DTC,PERF,VPP]}/vpp_performance_configuration"
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
   dir-tables: "{DIR[DTC,PERF,VPP]}"
   data:
-    "vpp-perf-results"
+    "vpp-perf-results-3n-hsw"
   filter: "not 'NDRCHK' and not 'PDRCHK'"
   parameters:
   - "name"
   - "doc"
   - "level"
   - "parent"
-  data-start-level: 3  # 0, 1, 2, ...
-  chapters-start-level: 2  # 0, 1, 2, ...
+  data-start-level: 3
 
 -
   type: "file"
   title: "VPP Performance Operational Data"
-  algorithm: "file_merged_test_results"
+  algorithm: "file_test_results"
   output-file-ext: ".rst"
   output-file: "{DIR[DTO,PERF,VPP]}/vpp_performance_operational_data"
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
   dir-tables: "{DIR[DTO,PERF,VPP]}"
   data:
-    "vpp-perf-results"
+    "vpp-perf-results-3n-hsw"
   filter: "not 'NDRCHK' and not 'PDRCHK'"
   parameters:
   - "name"
   - "doc"
   - "level"
   - "parent"
-  data-start-level: 3  # 0, 1, 2, ...
-  chapters-start-level: 2  # 0, 1, 2, ...
+  data-start-level: 3
 
 -
   type: "file"
-  title: "VPP MRR Results"
+  title: "VPP MRR Results 3n-hsw"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
-  output-file: "{DIR[DTR,MRR,VPP]}/vpp_mrr_results"
+  output-file: "{DIR[DTR,MRR,VPP,3N,HSW]}/vpp_mrr_results_3n_hsw"
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
-  dir-tables: "{DIR[DTR,MRR,VPP]}"
-  data:
-    "vpp-mrr-results"
+  dir-tables: "{DIR[DTR,MRR,VPP,3N,HSW]}"
+  data: "vpp-mrr-results-3n-hsw"
   filter: "'MRR'"
   parameters:
   - "name"
   - "doc"
   - "level"
   - "parent"
-  data-start-level: 2  # 0, 1, 2, ...
-  chapters-start-level: 2  # 0, 1, 2, ...
+  data-start-level: 3
+
+-
+  type: "file"
+  title: "VPP MRR Results 3n-skx"
+  algorithm: "file_test_results"
+  output-file-ext: ".rst"
+  output-file: "{DIR[DTR,MRR,VPP,3N,SKX]}/vpp_mrr_results_3n_skx"
+  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
+  dir-tables: "{DIR[DTR,MRR,VPP,3N,SKX]}"
+  data: "vpp-mrr-results-3n-skx"
+  filter: "'MRR'"
+  parameters:
+  - "name"
+  - "doc"
+  - "level"
+  - "parent"
+  data-start-level: 3
+
+-
+  type: "file"
+  title: "VPP MRR Results 2n-skx"
+  algorithm: "file_test_results"
+  output-file-ext: ".rst"
+  output-file: "{DIR[DTR,MRR,VPP,2N,SKX]}/vpp_mrr_results_2n_skx"
+  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
+  dir-tables: "{DIR[DTR,MRR,VPP,2N,SKX]}"
+  data: "vpp-mrr-results-2n-skx"
+  filter: "all"
+  parameters:
+  - "name"
+  - "doc"
+  - "level"
+  - "parent"
+  data-start-level: 3
 
 -
   type: "file"
@@ -1264,33 +1782,31 @@
   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]}"
   data:
-    "vpp-mrr-results"
+    "vpp-mrr-results-3n-hsw"
   filter: "'MRR'"
   parameters:
   - "name"
   - "doc"
   - "level"
   - "parent"
-  data-start-level: 2  # 0, 1, 2, ...
-  chapters-start-level: 2  # 0, 1, 2, ...
+  data-start-level: 3
 
 -
   type: "file"
-  title: "VPP Functional Results"
+  title: "VPP Functional Results - Ubuntu"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
-  output-file: "{DIR[DTR,FUNC,VPP]}/vpp_functional_results"
+  output-file: "{DIR[DTR,FUNC,VPP,UBUNTU]}/vpp_functional_results_ubuntu"
   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,VPP]}"
-  data:
-    "vpp-func-results"
+  dir-tables: "{DIR[DTR,FUNC,VPP,UBUNTU]}"
+  data: "vpp-func-results-ubuntu"
   filter: "all"
   parameters:
   - "name"
   - "doc"
   - "level"
-  data-start-level: 3  # 0, 1, 2, ...
-  chapters-start-level: 2  # 0, 1, 2, ...
+  - "parent"
+  data-start-level: 3
 
 -
   type: "file"
@@ -1307,26 +1823,26 @@
   - "name"
   - "doc"
   - "level"
-  data-start-level: 3  # 0, 1, 2, ...
-  chapters-start-level: 2  # 0, 1, 2, ...
+  - "parent"
+  data-start-level: 3
 
 -
   type: "file"
-  title: "VPP Functional Configuration"
+  title: "VPP Functional Configuration - Ubuntu"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
   output-file: "{DIR[DTC,FUNC,VPP]}/vpp_functional_configuration"
   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,FUNC,VPP]}"
   data:
-    "vpp-func-results"
+    "vpp-func-results-ubuntu"
   filter: "all"
   parameters:
   - "name"
   - "doc"
   - "level"
-  data-start-level: 3  # 0, 1, 2, ...
-  chapters-start-level: 2  # 0, 1, 2, ...
+  - "parent"
+  data-start-level: 3
 
 -
   type: "file"
@@ -1343,46 +1859,110 @@
   - "name"
   - "doc"
   - "level"
-  data-start-level: 3  # 0, 1, 2, ...
-  chapters-start-level: 2  # 0, 1, 2, ...
+  - "parent"
+  data-start-level: 3
 
 -
   type: "file"
-  title: "Container Orchestrated Performance Results"
+  title: "Container Orchestrated Performance Results 3n-hsw"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
-  output-file: "{DIR[DTR,PERF,COT]}/cot_performance_results"
+  output-file: "{DIR[DTR,PERF,COT,3N,HSW]}/cot_performance_results_3n_hsw"
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
-  dir-tables: "{DIR[DTR,PERF,COT]}"
-  data:
-    "ligato-perf-results"
+  dir-tables: "{DIR[DTR,PERF,COT,3N,HSW]}"
+  data: "ligato-perf-results-3n-hsw"
   filter: "all"
   parameters:
   - "name"
   - "doc"
   - "level"
-  data-start-level: 2  # 0, 1, 2, ...
-  chapters-start-level: 2  # 0, 1, 2, ...
+  - "parent"
+  data-start-level: 3
 
 -
   type: "file"
-  title: "DPDK Performance Results"
+  title: "Container Orchestrated Performance Results 3n-skx"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
-  output-file: "{DIR[DTR,PERF,DPDK]}/dpdk_performance_results"
+  output-file: "{DIR[DTR,PERF,COT,3N,SKX]}/cot_performance_results_3n_skx"
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
-  dir-tables: "{DIR[DTR,PERF,DPDK]}"
-  data:
-    "dpdk-perf-results"
+  dir-tables: "{DIR[DTR,PERF,COT,3N,SKX]}"
+  data: "ligato-perf-results-3n-skx"
   filter: "all"
   parameters:
   - "name"
   - "doc"
   - "level"
-  chapters:
-  - "suites"
-  data-start-level: 2  # 0, 1, 2, ...
-  chapters-start-level: 2  # 0, 1, 2, ...
+  - "parent"
+  data-start-level: 3
+
+-
+  type: "file"
+  title: "Container Orchestrated Performance Results 2n-skx"
+  algorithm: "file_test_results"
+  output-file-ext: ".rst"
+  output-file: "{DIR[DTR,PERF,COT,2N,SKX]}/cot_performance_results_2n_skx"
+  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
+  dir-tables: "{DIR[DTR,PERF,COT,2N,SKX]}"
+  data: "ligato-perf-results-2n-skx"
+  filter: "all"
+  parameters:
+  - "name"
+  - "doc"
+  - "level"
+  - "parent"
+  data-start-level: 2
+
+-
+  type: "file"
+  title: "DPDK Performance Results 3n-hsw"
+  algorithm: "file_test_results"
+  output-file-ext: ".rst"
+  output-file: "{DIR[DTR,PERF,DPDK,3N,HSW]}/dpdk_performance_results_3n_hsw"
+  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
+  dir-tables: "{DIR[DTR,PERF,DPDK,3N,HSW]}"
+  data: "dpdk-perf-results-3n-hsw"
+  filter: "all"
+  parameters:
+  - "name"
+  - "doc"
+  - "level"
+  - "parent"
+  data-start-level: 3
+
+-
+  type: "file"
+  title: "DPDK Performance Results 3n-skx"
+  algorithm: "file_test_results"
+  output-file-ext: ".rst"
+  output-file: "{DIR[DTR,PERF,DPDK,3N,SKX]}/dpdk_performance_results_3n_skx"
+  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
+  dir-tables: "{DIR[DTR,PERF,DPDK,3N,SKX]}"
+  data: "dpdk-perf-results-3n-skx"
+  filter: "all"
+  parameters:
+  - "name"
+  - "doc"
+  - "level"
+  - "parent"
+  data-start-level: 3
+
+-
+  type: "file"
+  title: "DPDK Performance Results 2n-skx"
+  algorithm: "file_test_results"
+  output-file-ext: ".rst"
+  output-file: "{DIR[DTR,PERF,DPDK,2N,SKX]}/dpdk_performance_results_2n_skx"
+  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
+  dir-tables: "{DIR[DTR,PERF,DPDK,2N,SKX]}"
+  data: "dpdk-perf-results-2n-skx"
+  filter: "all"
+  parameters:
+  - "name"
+  - "doc"
+  - "level"
+  - "parent"
+  data-start-level: 3
 
 -
   type: "file"
@@ -1399,10 +1979,8 @@
   - "name"
   - "doc"
   - "level"
-  chapters:
-  - "suites"
-  data-start-level: 3  # 0, 1, 2, ...
-  chapters-start-level: 2  # 0, 1, 2, ...
+  - "parent"
+  data-start-level: 3
 
 -
   type: "file"
@@ -1419,10 +1997,8 @@
   - "name"
   - "doc"
   - "level"
-  chapters:
-  - "suites"
-  data-start-level: 2  # 0, 1, 2, ...
-  chapters-start-level: 2  # 0, 1, 2, ...
+  - "parent"
+  data-start-level: 3
 
 ################################################################################
 ###                                P L O T S                                 ###
@@ -7996,13 +8572,13 @@
 
 ################################################################################
 
-# Packet Throughput - VPP vhost l2sw 3n-hsw-x520
+# Packet Throughput - VPP vhost ip4 3n-hsw-x520
 -
   type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
+  title: "VPP Throughput: vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and 
@@ -8023,10 +8599,10 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
+  title: "VPP Throughput: vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and 
@@ -8047,10 +8623,10 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
+  title: "VPP Throughput: vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and 
@@ -8071,10 +8647,10 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
+  title: "VPP Throughput: vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and 
@@ -8093,13 +8669,13 @@
     title: ""  # No title
     layout: "plot-throughput"
 
-# Packet Throughput - VPP vhost ip4 3n-hsw-x520
+# Packet Throughput - VPP vhost l2sw 3n-hsw-x520
 -
   type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
+  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-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
+  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 
@@ -8123,10 +8699,10 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
+  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-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
+  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 
@@ -8150,10 +8726,10 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
+  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-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
+  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 
@@ -8177,10 +8753,10 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
+  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-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
+  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 
@@ -8202,13 +8778,13 @@
     title: ""  # No title
     layout: "plot-throughput"
 
-# Packet Throughput - VPP vhost l2sw 3n-hsw-x710
+# Packet Throughput - VPP vhost ip4 3n-hsw-x710
 -
   type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
+  title: "VPP Throughput: vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and 
@@ -8229,10 +8805,10 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+  title: "VPP Throughput: vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and 
@@ -8253,10 +8829,10 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
+  title: "VPP Throughput: vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and 
@@ -8277,10 +8853,10 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
+  title: "VPP Throughput: vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and 
@@ -8299,13 +8875,13 @@
     title: ""  # No title
     layout: "plot-throughput"
 
-# Packet Throughput - VPP vhost ip4 3n-hsw-x710
+# Packet Throughput - VPP vhost l2sw 3n-hsw-x710
 -
   type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
+  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-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
+  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 
@@ -8329,10 +8905,10 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+  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-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+  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 
@@ -8356,10 +8932,10 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
+  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-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
+  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 
@@ -8383,10 +8959,10 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
+  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-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
+  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 
@@ -8408,13 +8984,13 @@
     title: ""  # No title
     layout: "plot-throughput"
 
-# Packet Throughput - VPP vhost l2sw 3n-hsw-xl710
+# Packet Throughput - VPP vhost ip4 3n-hsw-xl710
 -
   type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
+  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-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
+  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 
@@ -8435,10 +9011,10 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
+  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-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
+  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 
@@ -8459,10 +9035,10 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
+  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-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
+  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 
@@ -8483,10 +9059,10 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
+  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-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
+  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 
@@ -8505,13 +9081,13 @@
     title: ""  # No title
     layout: "plot-throughput"
 
-# Packet Throughput - VPP vhost ip4 3n-hsw-xl710
+# Packet Throughput - VPP vhost l2sw 3n-hsw-xl710
 -
   type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
+  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-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
+  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 
@@ -8535,10 +9111,10 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
+  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-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
+  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 
@@ -8562,10 +9138,10 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
+  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-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
+  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 
@@ -8589,10 +9165,10 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
+  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-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
+  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 
@@ -8722,7 +9298,7 @@
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'BASE' and
-           'NDRDISC' and
+           'NDRPDR' and
            '1T1C' and
            'IP4FWD'"
   parameters:
@@ -8746,7 +9322,7 @@
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'BASE' and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T2C' and
            'IP4FWD'"
   parameters:
@@ -8770,7 +9346,7 @@
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'BASE' and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            '1T1C' and
            'IP4FWD'"
   parameters:
@@ -8794,7 +9370,7 @@
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'BASE' and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            '2T2C' and
            'IP4FWD'"
   parameters:
@@ -8819,7 +9395,7 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'BASE' and
-           'NDRDISC' and
+           'NDRPDR' and
            '1T1C' and
            'IP4FWD'"
   parameters:
@@ -8843,7 +9419,7 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'BASE' and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T2C' and
            'IP4FWD'"
   parameters:
@@ -8867,7 +9443,7 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'BASE' and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            '1T1C' and
            'IP4FWD'"
   parameters:
@@ -8891,7 +9467,7 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'BASE' and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            '2T2C' and
            'IP4FWD'"
   parameters:
@@ -8916,7 +9492,7 @@
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'BASE' and
-           'NDRDISC' and
+           'NDRPDR' and
            '1T1C' and
            'IP4FWD'"
   parameters:
@@ -8940,7 +9516,7 @@
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'BASE' and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T2C' and
            'IP4FWD'"
   parameters:
@@ -8964,7 +9540,7 @@
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'BASE' and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            '1T1C' and
            'IP4FWD'"
   parameters:
@@ -8988,7 +9564,7 @@
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'BASE' and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            '2T2C' and
            'IP4FWD'"
   parameters:
@@ -9013,7 +9589,7 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'BASE' and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T1C' and
            'IP4FWD'"
   parameters:
@@ -9037,7 +9613,7 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'BASE' and
-           'NDRDISC' and
+           'NDRPDR' and
            '4T2C' and
            'IP4FWD'"
   parameters:
@@ -9061,7 +9637,7 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'BASE' and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            '2T1C' and
            'IP4FWD'"
   parameters:
@@ -9085,7 +9661,7 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'BASE' and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            '4T2C' and
            'IP4FWD'"
   parameters:
@@ -9110,7 +9686,7 @@
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'BASE' and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T1C' and
            'IP4FWD'"
   parameters:
@@ -9134,7 +9710,7 @@
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'BASE' and
-           'NDRDISC' and
+           'NDRPDR' and
            '4T2C' and
            'IP4FWD'"
   parameters:
@@ -9158,7 +9734,7 @@
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'BASE' and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            '2T1C' and
            'IP4FWD'"
   parameters:
@@ -9182,7 +9758,7 @@
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'BASE' and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            '4T2C' and
            'IP4FWD'"
   parameters:
@@ -9207,7 +9783,7 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'BASE' and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T1C' and
            'IP4FWD'"
   parameters:
@@ -9231,7 +9807,7 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'BASE' and
-           'NDRDISC' and
+           'NDRPDR' and
            '4T2C' and
            'IP4FWD'"
   parameters:
@@ -9255,7 +9831,7 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'BASE' and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            '2T1C' and
            'IP4FWD'"
   parameters:
@@ -9279,7 +9855,7 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'BASE' and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            '4T2C' and
            'IP4FWD'"
   parameters:
@@ -9304,7 +9880,7 @@
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'BASE' and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T1C' and
            'IP4FWD'"
   parameters:
@@ -9328,7 +9904,7 @@
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'BASE' and
-           'NDRDISC' and
+           'NDRPDR' and
            '4T2C' and
            'IP4FWD'"
   parameters:
@@ -9352,7 +9928,7 @@
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'BASE' and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            '2T1C' and
            'IP4FWD'"
   parameters:
@@ -9376,7 +9952,7 @@
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'BASE' and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            '4T2C' and
            'IP4FWD'"
   parameters:
@@ -9403,7 +9979,7 @@
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'BASE' and
-           'NDRDISC' and
+           'NDRPDR' and
            '1T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
   parameters:
@@ -9427,7 +10003,7 @@
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'BASE' and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
   parameters:
@@ -9451,7 +10027,7 @@
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'BASE' and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            '1T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
   parameters:
@@ -9475,7 +10051,7 @@
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'BASE' and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            '2T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
   parameters:
@@ -9500,7 +10076,7 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'BASE' and
-           'NDRDISC' and
+           'NDRPDR' and
            '1T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
   parameters:
@@ -9524,7 +10100,7 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'BASE' and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
   parameters:
@@ -9548,7 +10124,7 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'BASE' and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            '1T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
   parameters:
@@ -9572,7 +10148,7 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'BASE' and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            '2T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
   parameters:
@@ -9597,7 +10173,7 @@
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'BASE' and
-           'NDRDISC' and
+           'NDRPDR' and
            '1T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
   parameters:
@@ -9621,7 +10197,7 @@
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'BASE' and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
   parameters:
@@ -9645,7 +10221,7 @@
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'BASE' and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            '1T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
   parameters:
@@ -9669,7 +10245,7 @@
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'BASE' and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            '2T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
   parameters:
@@ -9694,7 +10270,7 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'BASE' and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
   parameters:
@@ -9718,7 +10294,7 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'BASE' and
-           'NDRDISC' and
+           'NDRPDR' and
            '4T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
   parameters:
@@ -9742,7 +10318,7 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'BASE' and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            '2T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
   parameters:
@@ -9766,7 +10342,7 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'BASE' and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            '4T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
   parameters:
@@ -9791,7 +10367,7 @@
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'BASE' and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
   parameters:
@@ -9815,7 +10391,7 @@
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'BASE' and
-           'NDRDISC' and
+           'NDRPDR' and
            '4T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
   parameters:
@@ -9839,7 +10415,7 @@
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'BASE' and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            '4T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
   parameters:
@@ -9863,7 +10439,7 @@
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'BASE' and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            '4T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
   parameters:
@@ -9888,7 +10464,7 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'BASE' and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
   parameters:
@@ -9912,7 +10488,7 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'BASE' and
-           'NDRDISC' and
+           'NDRPDR' and
            '4T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
   parameters:
@@ -9936,7 +10512,7 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'BASE' and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            '2T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
   parameters:
@@ -9960,7 +10536,7 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            'BASE' and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            '4T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
   parameters:
@@ -9985,7 +10561,7 @@
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'BASE' and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
   parameters:
@@ -10009,7 +10585,7 @@
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'BASE' and
-           'NDRDISC' and
+           'NDRPDR' and
            '4T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
   parameters:
@@ -10033,7 +10609,7 @@
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'BASE' and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            '2T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
   parameters:
@@ -10057,7 +10633,7 @@
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'BASE' and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            '4T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
   parameters:
@@ -10083,10 +10659,10 @@
 # Packet Latency - VPP L2 3n-hsw-x520
 -
   type: "plot"
-  title: "VPP Latency: l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/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
@@ -10107,10 +10683,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/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
@@ -10131,10 +10707,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: l2sw-3n-hsw-x520-64b-1t1c-features-ndr-lat50"
+  title: "VPP Latency: l2sw-3n-hsw-x520-64b-1t1c-features-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-1t1c-features-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-1t1c-features-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
@@ -10156,10 +10732,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: l2sw-3n-hsw-x520-64b-2t2c-features-ndr-lat50"
+  title: "VPP Latency: l2sw-3n-hsw-x520-64b-2t2c-features-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-2t2c-features-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-2t2c-features-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
@@ -10182,10 +10758,10 @@
 # Packet Latency - VPP L2 3n-hsw-x710
 -
   type: "plot"
-  title: "VPP Latency: l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/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
@@ -10206,10 +10782,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/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
@@ -10230,10 +10806,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: l2sw-3n-hsw-x710-64b-1t1c-features-ndr-lat50"
+  title: "VPP Latency: l2sw-3n-hsw-x710-64b-1t1c-features-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-1t1c-features-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-1t1c-features-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
@@ -10255,10 +10831,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: l2sw-3n-hsw-x710-64b-2t2c-features-ndr-lat50"
+  title: "VPP Latency: l2sw-3n-hsw-x710-64b-2t2c-features-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-2t2c-features-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-2t2c-features-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
@@ -10281,10 +10857,10 @@
 # Packet Latency - VPP L2 3n-hsw-xl710
 -
   type: "plot"
-  title: "VPP Latency: l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/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
@@ -10305,10 +10881,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/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
@@ -10330,10 +10906,10 @@
 # Packet Latency - VPP L2 3n-skx-x710
 -
   type: "plot"
-  title: "VPP Latency: l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/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
@@ -10354,10 +10930,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/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
@@ -10378,10 +10954,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: l2sw-3n-skx-x710-64b-2t1c-features-ndr-lat50"
+  title: "VPP Latency: l2sw-3n-skx-x710-64b-2t1c-features-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-2t1c-features-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-2t1c-features-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
@@ -10403,10 +10979,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: l2sw-3n-skx-x710-64b-4t2c-features-ndr-lat50"
+  title: "VPP Latency: l2sw-3n-skx-x710-64b-4t2c-features-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-4t2c-features-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-4t2c-features-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
@@ -10429,10 +11005,10 @@
 # Packet Latency - VPP L2 3n-skx-xxv710
 -
   type: "plot"
-  title: "VPP Latency: l2sw-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: l2sw-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
@@ -10453,10 +11029,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: l2sw-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: l2sw-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
@@ -10477,10 +11053,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: l2sw-3n-skx-xxv710-64b-2t1c-features-ndr-lat50"
+  title: "VPP Latency: l2sw-3n-skx-xxv710-64b-2t1c-features-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-2t1c-features-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-2t1c-features-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
@@ -10502,10 +11078,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: l2sw-3n-skx-xxv710-64b-4t2c-features-ndr-lat50"
+  title: "VPP Latency: l2sw-3n-skx-xxv710-64b-4t2c-features-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-4t2c-features-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-4t2c-features-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
@@ -10528,10 +11104,10 @@
 # Packet Latency - VPP L2 2n-skx-x710
 -
   type: "plot"
-  title: "VPP Latency: l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/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
@@ -10552,10 +11128,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/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
@@ -10576,10 +11152,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: l2sw-2n-skx-x710-64b-2t1c-features-ndr-lat50"
+  title: "VPP Latency: l2sw-2n-skx-x710-64b-2t1c-features-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-x710-64b-2t1c-features-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-x710-64b-2t1c-features-ndr-lat"
   data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
@@ -10601,10 +11177,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: l2sw-2n-skx-x710-64b-4t2c-features-ndr-lat50"
+  title: "VPP Latency: l2sw-2n-skx-x710-64b-4t2c-features-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-x710-64b-4t2c-features-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-x710-64b-4t2c-features-ndr-lat"
   data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
@@ -10627,10 +11203,10 @@
 # Packet Latency - VPP L2 2n-skx-xxv710
 -
   type: "plot"
-  title: "VPP Latency: l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/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
@@ -10651,10 +11227,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/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
@@ -10675,10 +11251,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: l2sw-2n-skx-xxv710-64b-2t1c-features-ndr-lat50"
+  title: "VPP Latency: l2sw-2n-skx-xxv710-64b-2t1c-features-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-xxv710-64b-2t1c-features-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-xxv710-64b-2t1c-features-ndr-lat"
   data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
@@ -10700,10 +11276,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: l2sw-2n-skx-xxv710-64b-4t2c-features-ndr-lat50"
+  title: "VPP Latency: l2sw-2n-skx-xxv710-64b-4t2c-features-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-xxv710-64b-4t2c-features-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-xxv710-64b-4t2c-features-ndr-lat"
   data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
@@ -10728,10 +11304,10 @@
 # Packet Latency - VPP Container Memif 3n-hsw-x520
 -
   type: "plot"
-  title: "VPP Latency: memif-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: memif-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/memif-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
@@ -10752,10 +11328,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: memif-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: memif-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/memif-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
@@ -10777,10 +11353,10 @@
 # Packet Latency - VPP Container Memif 3n-hsw-x710
 -
   type: "plot"
-  title: "VPP Latency: memif-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: memif-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
@@ -10801,10 +11377,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: memif-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: memif-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
@@ -10826,10 +11402,10 @@
 # Packet Latency - VPP Container Memif 3n-hsw-xl710
 -
   type: "plot"
-  title: "VPP Latency: memif-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: memif-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
@@ -10850,10 +11426,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: memif-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: memif-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
@@ -10875,10 +11451,10 @@
 # Packet Latency - VPP Container Memif 3n-skx-x710
 -
   type: "plot"
-  title: "VPP Latency: memif-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: memif-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
@@ -10899,10 +11475,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: memif-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: memif-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
@@ -10924,10 +11500,10 @@
 # Packet Latency - VPP Container Memif 3n-skx-xxv710
 -
   type: "plot"
-  title: "VPP Latency: memif-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: memif-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
@@ -10948,10 +11524,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: memif-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: memif-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
@@ -10973,10 +11549,10 @@
 # Packet Latency - VPP Container Memif 2n-skx-x710
 -
   type: "plot"
-  title: "VPP Latency: memif-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: memif-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
@@ -10997,10 +11573,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: memif-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: memif-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
@@ -11022,10 +11598,10 @@
 # Packet Latency - VPP Container Memif 2n-skx-xxv710
 -
   type: "plot"
-  title: "VPP Latency: memif-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: memif-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
@@ -11046,10 +11622,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: memif-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: memif-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
@@ -11073,10 +11649,10 @@
 # Packet Latency - VPP Container Memif 3n-hsw-x520
 -
   type: "plot"
-  title: "VPP Latency: k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
   data: "plot-ligato-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
@@ -11097,10 +11673,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
   data: "plot-ligato-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
@@ -11122,10 +11698,10 @@
 # Packet Latency - VPP Container Memif 3n-hsw-x710
 -
   type: "plot"
-  title: "VPP Latency: k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
   data: "plot-ligato-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
@@ -11146,10 +11722,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
   data: "plot-ligato-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
@@ -11171,10 +11747,10 @@
 # Packet Latency - VPP Container Memif 3n-skx-x710
 -
   type: "plot"
-  title: "VPP Latency: k8s-memif-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: k8s-memif-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
   data: "plot-ligato-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
@@ -11195,10 +11771,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: k8s-memif-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: k8s-memif-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
   data: "plot-ligato-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
@@ -11220,10 +11796,10 @@
 # Packet Latency - VPP Container Memif 3n-skx-xxv710
 -
   type: "plot"
-  title: "VPP Latency: k8s-memif-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: k8s-memif-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
   data: "plot-ligato-throughput-latency-3n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
@@ -11244,10 +11820,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: k8s-memif-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: k8s-memif-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
   data: "plot-ligato-throughput-latency-3n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
@@ -11269,10 +11845,10 @@
 # Packet Latency - VPP Container Memif 2n-skx-x710
 -
   type: "plot"
-  title: "VPP Latency: k8s-memif-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: k8s-memif-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/k8s-memif-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
   data: "plot-ligato-throughput-latency-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
@@ -11293,10 +11869,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: k8s-memif-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: k8s-memif-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/k8s-memif-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
   data: "plot-ligato-throughput-latency-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
@@ -11318,10 +11894,10 @@
 # Packet Latency - VPP Container Memif 2n-skx-xxv710
 -
   type: "plot"
-  title: "VPP Latency: k8s-memif-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: k8s-memif-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/k8s-memif-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
   data: "plot-ligato-throughput-latency-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
@@ -11342,10 +11918,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: k8s-memif-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: k8s-memif-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/k8s-memif-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
   data: "plot-ligato-throughput-latency-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
@@ -11369,10 +11945,10 @@
 # Packet Latency - VPP IPv4 3n-hsw-x520
 -
   type: "plot"
-  title: "VPP Latency: ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/ip4-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
@@ -11393,10 +11969,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/ip4-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
@@ -11417,10 +11993,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: ip4-3n-hsw-x520-64b-1t1c-features-ndr-lat50"
+  title: "VPP Latency: ip4-3n-hsw-x520-64b-1t1c-features-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
@@ -11442,10 +12018,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: ip4-3n-hsw-x520-64b-2t2c-features-ndr-lat50"
+  title: "VPP Latency: ip4-3n-hsw-x520-64b-2t2c-features-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
@@ -11468,10 +12044,10 @@
 # Packet Latency - VPP IPv4 3n-hsw-x710
 -
   type: "plot"
-  title: "VPP Latency: ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
@@ -11492,10 +12068,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
@@ -11516,10 +12092,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: ip4-3n-hsw-x710-64b-1t1c-features-ndr-lat50"
+  title: "VPP Latency: ip4-3n-hsw-x710-64b-1t1c-features-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
@@ -11541,10 +12117,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: ip4-3n-hsw-x710-64b-2t2c-features-ndr-lat50"
+  title: "VPP Latency: ip4-3n-hsw-x710-64b-2t2c-features-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
@@ -11567,10 +12143,10 @@
 # Packet Latency - VPP IPv4 3n-hsw-xl710
 -
   type: "plot"
-  title: "VPP Latency: ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/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
@@ -11591,10 +12167,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/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
@@ -11616,10 +12192,10 @@
 # Packet Latency - VPP IPv4 3n-skx-x710
 -
   type: "plot"
-  title: "VPP Latency: ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
@@ -11640,10 +12216,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
@@ -11664,10 +12240,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: ip4-3n-skx-x710-64b-2t1c-features-ndr-lat50"
+  title: "VPP Latency: ip4-3n-skx-x710-64b-2t1c-features-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
@@ -11689,10 +12265,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: ip4-3n-skx-x710-64b-4t2c-features-ndr-lat50"
+  title: "VPP Latency: ip4-3n-skx-x710-64b-4t2c-features-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
@@ -11715,10 +12291,10 @@
 # Packet Latency - VPP IPv4 3n-skx-xxv710
 -
   type: "plot"
-  title: "VPP Latency: ip4-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: ip4-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
@@ -11739,10 +12315,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: ip4-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: ip4-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
@@ -11763,10 +12339,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: ip4-3n-skx-xxv710-64b-2t1c-features-ndr-lat50"
+  title: "VPP Latency: ip4-3n-skx-xxv710-64b-2t1c-features-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-xxv710-64b-2t1c-features-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-xxv710-64b-2t1c-features-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
@@ -11788,10 +12364,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: ip4-3n-skx-xxv710-64b-4t2c-features-ndr-lat50"
+  title: "VPP Latency: ip4-3n-skx-xxv710-64b-4t2c-features-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-xxv710-64b-4t2c-features-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-xxv710-64b-4t2c-features-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
@@ -11814,10 +12390,10 @@
 # Packet Latency - VPP IPv4 2n-skx-x710
 -
   type: "plot"
-  title: "VPP Latency: ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
@@ -11838,10 +12414,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
@@ -11862,10 +12438,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: ip4-2n-skx-x710-64b-2t1c-features-ndr-lat50"
+  title: "VPP Latency: ip4-2n-skx-x710-64b-2t1c-features-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-2t1c-features-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-2t1c-features-ndr-lat"
   data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
@@ -11887,10 +12463,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: ip4-2n-skx-x710-64b-4t2c-features-ndr-lat50"
+  title: "VPP Latency: ip4-2n-skx-x710-64b-4t2c-features-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-4t2c-features-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-4t2c-features-ndr-lat"
   data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
@@ -11913,10 +12489,10 @@
 # Packet Latency - VPP IPv4 2n-skx-xxv710
 -
   type: "plot"
-  title: "VPP Latency: ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
@@ -11937,10 +12513,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
@@ -11961,10 +12537,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: ip4-2n-skx-xxv710-64b-2t1c-features-ndr-lat50"
+  title: "VPP Latency: ip4-2n-skx-xxv710-64b-2t1c-features-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-2t1c-features-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-2t1c-features-ndr-lat"
   data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
@@ -11986,10 +12562,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: ip4-2n-skx-xxv710-64b-4t2c-features-ndr-lat50"
+  title: "VPP Latency: ip4-2n-skx-xxv710-64b-4t2c-features-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-4t2c-features-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-4t2c-features-ndr-lat"
   data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
@@ -12014,10 +12590,10 @@
 # Packet Latency - VPP Ipv4 tunnels 3n-hsw-x520
 -
   type: "plot"
-  title: "VPP Latency: ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat50"
+  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
@@ -12038,10 +12614,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat50"
+  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
@@ -12063,10 +12639,10 @@
 # Packet Latency - VPP Ipv4 tunnels 3n-hsw-x710
 -
   type: "plot"
-  title: "VPP Latency: ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
@@ -12087,10 +12663,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
@@ -12112,10 +12688,10 @@
 # Packet Latency - VPP Ipv4 tunnels 3n-skx-x710
 -
   type: "plot"
-  title: "VPP Latency: ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
@@ -12136,10 +12712,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
@@ -12161,10 +12737,10 @@
 # Packet Latency - VPP Ipv4 tunnels 3n-skx-xxv710
 -
   type: "plot"
-  title: "VPP Latency: ip4tun-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: ip4tun-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
@@ -12185,10 +12761,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: ip4tun-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: ip4tun-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
@@ -12210,10 +12786,10 @@
 # Packet Latency - VPP Ipv4 tunnels 2n-skx-x710
 -
   type: "plot"
-  title: "VPP Latency: ip4tun-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: ip4tun-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
@@ -12234,10 +12810,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: ip4tun-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: ip4tun-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
@@ -12260,10 +12836,10 @@
 # Packet Latency - VPP Ipv4 tunnels 2n-skx-xxv710
 -
   type: "plot"
-  title: "VPP Latency: ip4tun-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: ip4tun-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
@@ -12284,10 +12860,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: ip4tun-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: ip4tun-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
@@ -12311,10 +12887,10 @@
 # Packet Latency - VPP IPv6 3n-hsw-x520
 -
   type: "plot"
-  title: "VPP Latency: ip6-3n-hsw-x520-78b-1t1c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: ip6-3n-hsw-x520-78b-1t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-1t1c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-1t1c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
@@ -12336,10 +12912,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: ip6-3n-hsw-x520-78b-2t2c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: ip6-3n-hsw-x520-78b-2t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-2t2c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-2t2c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
@@ -12361,10 +12937,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: ip6-3n-hsw-x520-78b-1t1c-features-ndr-lat50"
+  title: "VPP Latency: ip6-3n-hsw-x520-78b-1t1c-features-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-1t1c-features-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-1t1c-features-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
@@ -12387,10 +12963,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: ip6-3n-hsw-x520-78b-2t2c-features-ndr-lat50"
+  title: "VPP Latency: ip6-3n-hsw-x520-78b-2t2c-features-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-2t2c-features-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-2t2c-features-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
@@ -12414,10 +12990,10 @@
 # Packet Latency - VPP IPv6 3n-hsw-x710
 -
   type: "plot"
-  title: "VPP Latency: ip6-3n-hsw-x710-78b-1t1c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: ip6-3n-hsw-x710-78b-1t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-1t1c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-1t1c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '78B' and
@@ -12439,10 +13015,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: ip6-3n-hsw-x710-78b-2t2c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: ip6-3n-hsw-x710-78b-2t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-2t2c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-2t2c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '78B' and
@@ -12464,10 +13040,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: ip6-3n-hsw-x710-78b-1t1c-features-ndr-lat50"
+  title: "VPP Latency: ip6-3n-hsw-x710-78b-1t1c-features-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-1t1c-features-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-1t1c-features-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '78B' and
@@ -12490,10 +13066,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: ip6-3n-hsw-x710-78b-2t2c-features-ndr-lat50"
+  title: "VPP Latency: ip6-3n-hsw-x710-78b-2t2c-features-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-2t2c-features-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-2t2c-features-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '78B' and
@@ -12517,10 +13093,10 @@
 # Packet Latency - VPP IPv6 3n-hsw-xl710
 -
   type: "plot"
-  title: "VPP Latency: ip6-3n-hsw-xl710-78b-1t1c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: ip6-3n-hsw-xl710-78b-1t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-1t1c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-1t1c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '78B' and
@@ -12542,10 +13118,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: ip6-3n-hsw-xl710-78b-2t2c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: ip6-3n-hsw-xl710-78b-2t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-2t2c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-2t2c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '78B' and
@@ -12568,10 +13144,10 @@
 # Packet Latency - VPP IPv6 3n-skx-x710
 -
   type: "plot"
-  title: "VPP Latency: ip6-3n-skx-x710-78b-2t1c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: ip6-3n-skx-x710-78b-2t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-2t1c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-2t1c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '78B' and
@@ -12593,10 +13169,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: ip6-3n-skx-x710-78b-4t2c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: ip6-3n-skx-x710-78b-4t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-4t2c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-4t2c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '78B' and
@@ -12618,10 +13194,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: ip6-3n-skx-x710-78b-2t1c-features-ndr-lat50"
+  title: "VPP Latency: ip6-3n-skx-x710-78b-2t1c-features-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-2t1c-features-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-2t1c-features-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '78B' and
@@ -12644,10 +13220,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: ip6-3n-skx-x710-78b-4t2c-features-ndr-lat50"
+  title: "VPP Latency: ip6-3n-skx-x710-78b-4t2c-features-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-4t2c-features-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-4t2c-features-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '78B' and
@@ -12671,10 +13247,10 @@
 # Packet Latency - VPP IPv6 3n-skx-xxv710
 -
   type: "plot"
-  title: "VPP Latency: ip6-3n-skx-xxv710-78b-2t1c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: ip6-3n-skx-xxv710-78b-2t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-xxv710-78b-2t1c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-xxv710-78b-2t1c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-XXV710' and
            '78B' and
@@ -12696,10 +13272,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: ip6-3n-skx-xxv710-78b-4t2c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: ip6-3n-skx-xxv710-78b-4t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-xxv710-78b-4t2c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-xxv710-78b-4t2c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-XXV710' and
            '78B' and
@@ -12721,10 +13297,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: ip6-3n-skx-xxv710-78b-2t1c-features-ndr-lat50"
+  title: "VPP Latency: ip6-3n-skx-xxv710-78b-2t1c-features-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-xxv710-78b-2t1c-features-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-xxv710-78b-2t1c-features-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-XXV710' and
            '78B' and
@@ -12747,10 +13323,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: ip6-3n-skx-xxv710-78b-4t2c-features-ndr-lat50"
+  title: "VPP Latency: ip6-3n-skx-xxv710-78b-4t2c-features-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-xxv710-78b-4t2c-features-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-xxv710-78b-4t2c-features-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-XXV710' and
            '78B' and
@@ -12774,10 +13350,10 @@
 # Packet Latency - VPP IPv6 2n-skx-x710
 -
   type: "plot"
-  title: "VPP Latency: ip6-2n-skx-x710-78b-2t1c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: ip6-2n-skx-x710-78b-2t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-2t1c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-2t1c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-X710' and
            '78B' and
@@ -12799,10 +13375,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: ip6-2n-skx-x710-78b-4t2c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: ip6-2n-skx-x710-78b-4t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-4t2c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-4t2c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-X710' and
            '78B' and
@@ -12824,10 +13400,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: ip6-2n-skx-x710-78b-2t1c-features-ndr-lat50"
+  title: "VPP Latency: ip6-2n-skx-x710-78b-2t1c-features-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-2t1c-features-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-2t1c-features-ndr-lat"
   data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-X710' and
            '78B' and
@@ -12850,10 +13426,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: ip6-2n-skx-x710-78b-4t2c-features-ndr-lat50"
+  title: "VPP Latency: ip6-2n-skx-x710-78b-4t2c-features-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-4t2c-features-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-4t2c-features-ndr-lat"
   data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-X710' and
            '78B' and
@@ -12877,10 +13453,10 @@
 # Packet Latency - VPP IPv6 2n-skx-xxv710
 -
   type: "plot"
-  title: "VPP Latency: ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '78B' and
@@ -12902,10 +13478,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '78B' and
@@ -12927,10 +13503,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: ip6-2n-skx-xxv710-78b-2t1c-features-ndr-lat50"
+  title: "VPP Latency: ip6-2n-skx-xxv710-78b-2t1c-features-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-2t1c-features-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-2t1c-features-ndr-lat"
   data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '78B' and
@@ -12953,10 +13529,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: ip6-2n-skx-xxv710-78b-4t2c-features-ndr-lat50"
+  title: "VPP Latency: ip6-2n-skx-xxv710-78b-4t2c-features-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-4t2c-features-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-4t2c-features-ndr-lat"
   data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '78B' and
@@ -12982,10 +13558,10 @@
 # Packet Latency - VPP IPv6 tunnels 3n-hsw-x520
 -
   type: "plot"
-  title: "VPP Latency: ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
@@ -12995,7 +13571,7 @@
            ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   traces:
     boxmean: False
@@ -13005,10 +13581,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: ip6tun-3n-hsw-x520-78b-2t2c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: ip6tun-3n-hsw-x520-78b-2t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-2t2c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-2t2c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
@@ -13018,7 +13594,7 @@
            ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   traces:
     boxmean: False
@@ -13031,10 +13607,10 @@
 # Packet Latency - VPP IPSec 3n-hsw-xl710
 -
   type: "plot"
-  title: "VPP Latency: ipsec-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: ipsec-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
@@ -13055,10 +13631,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: ipsec-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: ipsec-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
@@ -13082,10 +13658,10 @@
 # Packet Latency - VPP SRv6 3n-hsw-x520
 -
   type: "plot"
-  title: "VPP Latency: srv6-3n-hsw-x520-78b-1t1c-features-ndr-lat50"
+  title: "VPP Latency: srv6-3n-hsw-x520-78b-1t1c-features-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-1t1c-features-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-1t1c-features-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and 
@@ -13105,10 +13681,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: srv6-3n-hsw-x520-78b-2t2c-features-ndr-lat50"
+  title: "VPP Latency: srv6-3n-hsw-x520-78b-2t2c-features-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-2t2c-features-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-2t2c-features-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and 
@@ -13128,13 +13704,13 @@
 
 ################################################################################
 
-# Packet Latency - VPP vhost l2sw 3n-hsw-x520
+# Packet Latency - VPP vhost ip4 3n-hsw-x520
 -
   type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-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 
@@ -13153,10 +13729,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-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 
@@ -13173,13 +13749,13 @@
     title: ""  # No title
     layout: "plot-latency"
 
-# Packet Latency - VPP vhost ip4 3n-hsw-x520
+# Packet Latency - VPP vhost l2sw 3n-hsw-x520
 -
   type: "plot"
-  title: "VPP Latency: vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat50"
+  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 
@@ -13201,10 +13777,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat50"
+  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 
@@ -13224,13 +13800,13 @@
     title: ""  # No title
     layout: "plot-latency"
 
-# Packet Latency - VPP vhost l2sw 3n-hsw-x710
+# Packet Latency - VPP vhost ip4 3n-hsw-x710
 -
   type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and 
@@ -13249,10 +13825,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and 
@@ -13269,13 +13845,13 @@
     title: ""  # No title
     layout: "plot-latency"
 
-# Packet Latency - VPP vhost ip4 3n-hsw-x710
+# Packet Latency - VPP vhost l2sw 3n-hsw-x710
 -
   type: "plot"
-  title: "VPP Latency: vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat50"
+  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 
@@ -13297,10 +13873,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat50"
+  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 
@@ -13320,13 +13896,13 @@
     title: ""  # No title
     layout: "plot-latency"
 
-# Packet Latency - VPP vhost l2sw 3n-hsw-xl710
+# Packet Latency - VPP vhost ip4 3n-hsw-xl710
 -
   type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat50"
+  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 
@@ -13345,10 +13921,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/ip4-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 
@@ -13365,13 +13941,13 @@
     title: ""  # No title
     layout: "plot-latency"
 
-# Packet Latency - VPP vhost ip4 3n-hsw-xl710
+# Packet Latency - VPP vhost l2sw 3n-hsw-xl710
 -
   type: "plot"
-  title: "VPP Latency: vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat50"
+  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 
@@ -13393,10 +13969,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat50"
+  title: "VPP Latency: vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat50"
+  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 
@@ -13417,13 +13993,14 @@
     layout: "plot-latency"
 
 ################################################################################
+
 # Packet Latency - VPP VTS 3n-hsw-x520
 -
   type: "plot"
-  title: "VPP Latency: vts-3n-hsw-x520-64b-1t1c-ndr-lat50"
+  title: "VPP Latency: vts-3n-hsw-x520-64b-1t1c-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-64b-1t1c-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-64b-1t1c-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
@@ -13441,10 +14018,10 @@
 
 -
   type: "plot"
-  title: "VPP Latency: vts-3n-hsw-x520-64b-2t2c-ndr-lat50"
+  title: "VPP Latency: vts-3n-hsw-x520-64b-2t2c-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-64b-2t2c-ndr-lat50"
+  output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-64b-2t2c-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
@@ -13465,15 +14042,15 @@
 # Packet Latency - DPDK l3fwd 3n-hsw-x520
 -
   type: "plot"
-  title: "DPDK Latency: l3fwd-3n-hsw-x520-64b-1t1c-base-ndr-lat50"
+  title: "DPDK Latency: l3fwd-3n-hsw-x520-64b-1t1c-base-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x520-64b-1t1c-base-ndr-lat50"
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x520-64b-1t1c-base-ndr-lat"
   data: "plot-dpdk-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'BASE' and
-           'NDRDISC' and
+           'NDRPDR' and
            '1T1C' and
            'IP4FWD'"
   parameters:
@@ -13489,15 +14066,15 @@
 
 -
   type: "plot"
-  title: "DPDK Latency: l3fwd-3n-hsw-x520-64b-2t2c-base-ndr-lat50"
+  title: "DPDK Latency: l3fwd-3n-hsw-x520-64b-2t2c-base-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x520-64b-2t2c-base-ndr-lat50"
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x520-64b-2t2c-base-ndr-lat"
   data: "plot-dpdk-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'BASE' and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T2C' and
            'IP4FWD'"
   parameters:
@@ -13514,15 +14091,15 @@
 # Packet Latency - DPDK l3fwd 3n-hsw-x710
 -
   type: "plot"
-  title: "DPDK Latency: l3fwd-3n-hsw-x710-64b-1t1c-base-ndr-lat50"
+  title: "DPDK Latency: l3fwd-3n-hsw-x710-64b-1t1c-base-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x710-64b-1t1c-base-ndr-lat50"
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x710-64b-1t1c-base-ndr-lat"
   data: "plot-dpdk-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'BASE' and
-           'NDRDISC' and
+           'NDRPDR' and
            '1T1C' and
            'IP4FWD'"
   parameters:
@@ -13538,15 +14115,15 @@
 
 -
   type: "plot"
-  title: "DPDK Latency: l3fwd-3n-hsw-x710-64b-2t2c-base-ndr-lat50"
+  title: "DPDK Latency: l3fwd-3n-hsw-x710-64b-2t2c-base-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x710-64b-2t2c-base-ndr-lat50"
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x710-64b-2t2c-base-ndr-lat"
   data: "plot-dpdk-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'BASE' and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T2C' and
            'IP4FWD'"
   parameters:
@@ -13563,15 +14140,15 @@
 # Packet Latency - DPDK l3fwd 3n-hsw-xl710
 -
   type: "plot"
-  title: "DPDK Latency: l3fwd-3n-hsw-xl710-64b-1t1c-base-ndr-lat50"
+  title: "DPDK Latency: l3fwd-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-xl710-64b-1t1c-base-ndr-lat50"
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
   data: "plot-dpdk-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'BASE' and
-           'NDRDISC' and
+           'NDRPDR' and
            '1T1C' and
            'IP4FWD'"
   parameters:
@@ -13587,15 +14164,15 @@
 
 -
   type: "plot"
-  title: "DPDK Latency: l3fwd-3n-hsw-xl710-64b-2t2c-base-ndr-lat50"
+  title: "DPDK Latency: l3fwd-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-xl710-64b-2t2c-base-ndr-lat50"
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
   data: "plot-dpdk-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'BASE' and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T2C' and
            'IP4FWD'"
   parameters:
@@ -13612,15 +14189,15 @@
 # Packet Latency - DPDK l3fwd 3n-skx-x710
 -
   type: "plot"
-  title: "DPDK Latency: l3fwd-3n-skx-x710-64b-2t1c-base-ndr-lat50"
+  title: "DPDK Latency: l3fwd-3n-skx-x710-64b-2t1c-base-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-skx-x710-64b-2t1c-base-ndr-lat50"
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-skx-x710-64b-2t1c-base-ndr-lat"
   data: "plot-dpdk-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'BASE' and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T1C' and
            'IP4FWD'"
   parameters:
@@ -13636,15 +14213,15 @@
 
 -
   type: "plot"
-  title: "DPDK Latency: l3fwd-3n-skx-x710-64b-4t2c-base-ndr-lat50"
+  title: "DPDK Latency: l3fwd-3n-skx-x710-64b-4t2c-base-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-skx-x710-64b-4t2c-base-ndr-lat50"
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-skx-x710-64b-4t2c-base-ndr-lat"
   data: "plot-dpdk-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'BASE' and
-           'NDRDISC' and
+           'NDRPDR' and
            '4T2C' and
            'IP4FWD'"
   parameters:
@@ -13661,15 +14238,15 @@
 # Packet Latency - DPDK l3fwd 3n-skx-xxv710
 -
   type: "plot"
-  title: "DPDK Latency: l3fwd-3n-skx-xxv710-64b-2t1c-base-ndr-lat50"
+  title: "DPDK Latency: l3fwd-3n-skx-xxv710-64b-2t1c-base-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-skx-xxv710-64b-2t1c-base-ndr-lat50"
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-skx-xxv710-64b-2t1c-base-ndr-lat"
   data: "plot-dpdk-throughput-latency-3n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'BASE' and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T1C' and
            'IP4FWD'"
   parameters:
@@ -13685,15 +14262,15 @@
 
 -
   type: "plot"
-  title: "DPDK Latency: l3fwd-3n-skx-xxv710-64b-4t2c-base-ndr-lat50"
+  title: "DPDK Latency: l3fwd-3n-skx-xxv710-64b-4t2c-base-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-skx-xxv710-64b-4t2c-base-ndr-lat50"
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-skx-xxv710-64b-4t2c-base-ndr-lat"
   data: "plot-dpdk-throughput-latency-3n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'BASE' and
-           'NDRDISC' and
+           'NDRPDR' and
            '4T2C' and
            'IP4FWD'"
   parameters:
@@ -13710,15 +14287,15 @@
 # Packet Latency - DPDK l3fwd 2n-skx-x710
 -
   type: "plot"
-  title: "DPDK Latency: l3fwd-2n-skx-x710-64b-2t1c-base-ndr-lat50"
+  title: "DPDK Latency: l3fwd-2n-skx-x710-64b-2t1c-base-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-2n-skx-x710-64b-2t1c-base-ndr-lat50"
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-2n-skx-x710-64b-2t1c-base-ndr-lat"
   data: "plot-dpdk-throughput-latency-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'BASE' and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T1C' and
            'IP4FWD'"
   parameters:
@@ -13734,15 +14311,15 @@
 
 -
   type: "plot"
-  title: "DPDK Latency: l3fwd-2n-skx-x710-64b-4t2c-base-ndr-lat50"
+  title: "DPDK Latency: l3fwd-2n-skx-x710-64b-4t2c-base-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-2n-skx-x710-64b-4t2c-base-ndr-lat50"
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-2n-skx-x710-64b-4t2c-base-ndr-lat"
   data: "plot-dpdk-throughput-latency-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'BASE' and
-           'NDRDISC' and
+           'NDRPDR' and
            '4T2C' and
            'IP4FWD'"
   parameters:
@@ -13759,15 +14336,15 @@
 # Packet Latency - DPDK l3fwd 2n-skx-xxv710
 -
   type: "plot"
-  title: "DPDK Latency: l3fwd-2n-skx-xxv710-64b-2t1c-base-ndr-lat50"
+  title: "DPDK Latency: l3fwd-2n-skx-xxv710-64b-2t1c-base-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-2n-skx-xxv710-64b-2t1c-base-ndr-lat50"
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-2n-skx-xxv710-64b-2t1c-base-ndr-lat"
   data: "plot-dpdk-throughput-latency-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'BASE' and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T1C' and
            'IP4FWD'"
   parameters:
@@ -13783,15 +14360,15 @@
 
 -
   type: "plot"
-  title: "DPDK Latency: l3fwd-2n-skx-xxv710-64b-4t2c-base-ndr-lat50"
+  title: "DPDK Latency: l3fwd-2n-skx-xxv710-64b-4t2c-base-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-2n-skx-xxv710-64b-4t2c-base-ndr-lat50"
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-2n-skx-xxv710-64b-4t2c-base-ndr-lat"
   data: "plot-dpdk-throughput-latency-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'BASE' and
-           'NDRDISC' and
+           'NDRPDR' and
            '4T2C' and
            'IP4FWD'"
   parameters:
@@ -13810,15 +14387,15 @@
 # Packet Latency - DPDK testpmd 3n-hsw-x520
 -
   type: "plot"
-  title: "DPDK Latency: testpmd-3n-hsw-x520-64b-1t1c-base-ndr-lat50"
+  title: "DPDK Latency: testpmd-3n-hsw-x520-64b-1t1c-base-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x520-64b-1t1c-base-ndr-lat50"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x520-64b-1t1c-base-ndr-lat"
   data: "plot-dpdk-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'BASE' and
-           'NDRDISC' and
+           'NDRPDR' and
            '1T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
   parameters:
@@ -13834,15 +14411,15 @@
 
 -
   type: "plot"
-  title: "DPDK Latency: testpmd-3n-hsw-x520-64b-2t2c-base-ndr-lat50"
+  title: "DPDK Latency: testpmd-3n-hsw-x520-64b-2t2c-base-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x520-64b-2t2c-base-ndr-lat50"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x520-64b-2t2c-base-ndr-lat"
   data: "plot-dpdk-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'BASE' and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
   parameters:
@@ -13859,15 +14436,15 @@
 # Packet Latency - DPDK testpmd 3n-hsw-x710
 -
   type: "plot"
-  title: "DPDK Latency: testpmd-3n-hsw-x710-64b-1t1c-base-ndr-lat50"
+  title: "DPDK Latency: testpmd-3n-hsw-x710-64b-1t1c-base-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x710-64b-1t1c-base-ndr-lat50"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x710-64b-1t1c-base-ndr-lat"
   data: "plot-dpdk-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'BASE' and
-           'NDRDISC' and
+           'NDRPDR' and
            '1T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
   parameters:
@@ -13883,15 +14460,15 @@
 
 -
   type: "plot"
-  title: "DPDK Latency: testpmd-3n-hsw-x710-64b-2t2c-base-ndr-lat50"
+  title: "DPDK Latency: testpmd-3n-hsw-x710-64b-2t2c-base-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x710-64b-2t2c-base-ndr-lat50"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x710-64b-2t2c-base-ndr-lat"
   data: "plot-dpdk-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'BASE' and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
   parameters:
@@ -13908,15 +14485,15 @@
 # Packet Latency - DPDK testpmd 3n-hsw-xl710
 -
   type: "plot"
-  title: "DPDK Latency: testpmd-3n-hsw-xl710-64b-1t1c-base-ndr-lat50"
+  title: "DPDK Latency: testpmd-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-xl710-64b-1t1c-base-ndr-lat50"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
   data: "plot-dpdk-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'BASE' and
-           'NDRDISC' and
+           'NDRPDR' and
            '1T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
   parameters:
@@ -13932,15 +14509,15 @@
 
 -
   type: "plot"
-  title: "DPDK Latency: testpmd-3n-hsw-xl710-64b-2t2c-base-ndr-lat50"
+  title: "DPDK Latency: testpmd-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-xl710-64b-2t2c-base-ndr-lat50"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
   data: "plot-dpdk-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'BASE' and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
   parameters:
@@ -13957,15 +14534,15 @@
 # Packet Latency - DPDK testpmd 3n-skx-x710
 -
   type: "plot"
-  title: "DPDK Latency: testpmd-3n-skx-x710-64b-2t1c-base-ndr-lat50"
+  title: "DPDK Latency: testpmd-3n-skx-x710-64b-2t1c-base-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-skx-x710-64b-2t1c-base-ndr-lat50"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-skx-x710-64b-2t1c-base-ndr-lat"
   data: "plot-dpdk-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'BASE' and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
   parameters:
@@ -13981,15 +14558,15 @@
 
 -
   type: "plot"
-  title: "DPDK Latency: testpmd-3n-skx-x710-64b-4t2c-base-ndr-lat50"
+  title: "DPDK Latency: testpmd-3n-skx-x710-64b-4t2c-base-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-skx-x710-64b-4t2c-base-ndr-lat50"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-skx-x710-64b-4t2c-base-ndr-lat"
   data: "plot-dpdk-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'BASE' and
-           'NDRDISC' and
+           'NDRPDR' and
            '4T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
   parameters:
@@ -14006,15 +14583,15 @@
 # Packet Latency - DPDK testpmd 3n-skx-xxv710
 -
   type: "plot"
-  title: "DPDK Latency: testpmd-3n-skx-xxv710-64b-2t1c-base-ndr-lat50"
+  title: "DPDK Latency: testpmd-3n-skx-xxv710-64b-2t1c-base-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-skx-xxv710-64b-2t1c-base-ndr-lat50"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-skx-xxv710-64b-2t1c-base-ndr-lat"
   data: "plot-dpdk-throughput-latency-3n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'BASE' and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
   parameters:
@@ -14030,15 +14607,15 @@
 
 -
   type: "plot"
-  title: "DPDK Latency: testpmd-3n-skx-xxv710-64b-4t2c-base-ndr-lat50"
+  title: "DPDK Latency: testpmd-3n-skx-xxv710-64b-4t2c-base-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-skx-xxv710-64b-4t2c-base-ndr-lat50"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-skx-xxv710-64b-4t2c-base-ndr-lat"
   data: "plot-dpdk-throughput-latency-3n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'BASE' and
-           'NDRDISC' and
+           'NDRPDR' and
            '4T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
   parameters:
@@ -14055,15 +14632,15 @@
 # Packet Latency - DPDK testpmd 2n-skx-x710
 -
   type: "plot"
-  title: "DPDK Latency: testpmd-2n-skx-x710-64b-2t1c-base-ndr-lat50"
+  title: "DPDK Latency: testpmd-2n-skx-x710-64b-2t1c-base-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-x710-64b-2t1c-base-ndr-lat50"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-x710-64b-2t1c-base-ndr-lat"
   data: "plot-dpdk-throughput-latency-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'BASE' and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
   parameters:
@@ -14079,15 +14656,15 @@
 
 -
   type: "plot"
-  title: "DPDK Latency: testpmd-2n-skx-x710-64b-4t2c-base-ndr-lat50"
+  title: "DPDK Latency: testpmd-2n-skx-x710-64b-4t2c-base-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-x710-64b-4t2c-base-ndr-lat50"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-x710-64b-4t2c-base-ndr-lat"
   data: "plot-dpdk-throughput-latency-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'BASE' and
-           'NDRDISC' and
+           'NDRPDR' and
            '4T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
   parameters:
@@ -14104,15 +14681,15 @@
 # Packet Latency - DPDK testpmd 2n-skx-xxv710
 -
   type: "plot"
-  title: "DPDK Latency: testpmd-2n-skx-xxv710-64b-2t1c-base-ndr-lat50"
+  title: "DPDK Latency: testpmd-2n-skx-xxv710-64b-2t1c-base-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-xxv710-64b-2t1c-base-ndr-lat50"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-xxv710-64b-2t1c-base-ndr-lat"
   data: "plot-dpdk-throughput-latency-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'BASE' and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
   parameters:
@@ -14128,15 +14705,15 @@
 
 -
   type: "plot"
-  title: "DPDK Latency: testpmd-2n-skx-xxv710-64b-4t2c-base-ndr-lat50"
+  title: "DPDK Latency: testpmd-2n-skx-xxv710-64b-4t2c-base-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-xxv710-64b-4t2c-base-ndr-lat50"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-xxv710-64b-4t2c-base-ndr-lat"
   data: "plot-dpdk-throughput-latency-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'BASE' and
-           'NDRDISC' and
+           'NDRPDR' and
            '4T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
   parameters:
@@ -17058,13 +17635,13 @@
 
 ################################################################################
 
-# Speedup - VPP vhost l2sw 3n-hsw-x520
+# Speedup - VPP vhost ip4 3n-hsw-x520
 -
   type: "plot"
-  title: "VPP Speedup: vhost-l2sw-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
+  title: "VPP Speedup: vhost-ip4-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
   data: "plot-throughput-speedup-analysis-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and 
@@ -17081,10 +17658,10 @@
 
 -
   type: "plot"
-  title: "VPP Speedup: vhost-l2sw-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
+  title: "VPP Speedup: vhost-ip4-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
   data: "plot-throughput-speedup-analysis-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and 
@@ -17099,13 +17676,13 @@
     title: ""  # No title
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP vhost ip4 3n-hsw-x520
+# Speedup - VPP vhost l2sw 3n-hsw-x520
 -
   type: "plot"
-  title: "VPP Speedup: vhost-ip4-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
+  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-ip4-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
+  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 
@@ -17125,10 +17702,10 @@
 
 -
   type: "plot"
-  title: "VPP Speedup: vhost-ip4-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
+  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-ip4-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
+  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 
@@ -17146,13 +17723,13 @@
     title: ""  # No title
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP vhost l2sw 3n-hsw-x710
+# Speedup - VPP vhost ip4 3n-hsw-x710
 -
   type: "plot"
-  title: "VPP Speedup: vhost-l2sw-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
+  title: "VPP Speedup: vhost-ip4-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
   data: "plot-throughput-speedup-analysis-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and 
@@ -17169,10 +17746,10 @@
 
 -
   type: "plot"
-  title: "VPP Speedup: vhost-l2sw-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
+  title: "VPP Speedup: vhost-ip4-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
   data: "plot-throughput-speedup-analysis-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and 
@@ -17187,13 +17764,13 @@
     title: ""  # No title
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP vhost ip4 3n-hsw-x710
+# Speedup - VPP vhost l2sw 3n-hsw-x710
 -
   type: "plot"
-  title: "VPP Speedup: vhost-ip4-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
+  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-ip4-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
+  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 
@@ -17213,10 +17790,10 @@
 
 -
   type: "plot"
-  title: "VPP Speedup: vhost-ip4-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
+  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-ip4-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
+  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 
@@ -17234,13 +17811,13 @@
     title: ""  # No title
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP vhost l2sw 3n-hsw-xl710
+# Speedup - VPP vhost ip4 3n-hsw-xl710
 -
   type: "plot"
-  title: "VPP Speedup: vhost-l2sw-3n-hsw-xl710-64b-base_and_scale-ndr-tsa"
+  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-l2sw-3n-hsw-xl710-64b-base_and_scale-ndr-tsa"
+  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 
@@ -17257,10 +17834,10 @@
 
 -
   type: "plot"
-  title: "VPP Speedup: vhost-l2sw-3n-hsw-xl710-64b-base_and_scale-pdr-tsa"
+  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-l2sw-3n-hsw-xl710-64b-base_and_scale-pdr-tsa"
+  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 
@@ -17275,13 +17852,13 @@
     title: ""  # No title
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP vhost ip4 3n-hsw-xl710
+# Speedup - VPP vhost l2sw 3n-hsw-xl710
 -
   type: "plot"
-  title: "VPP Speedup: vhost-ip4-3n-hsw-xl710-64b-base_and_scale-ndr-tsa"
+  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-ip4-3n-hsw-xl710-64b-base_and_scale-ndr-tsa"
+  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 
@@ -17301,10 +17878,10 @@
 
 -
   type: "plot"
-  title: "VPP Speedup: vhost-ip4-3n-hsw-xl710-64b-base_and_scale-pdr-tsa"
+  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-ip4-3n-hsw-xl710-64b-base_and_scale-pdr-tsa"
+  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