X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fspecifications%2Freport%2Felements.yaml;h=fc7df765682312b73f2bc7f1592c84012bfaf7a2;hp=9c31080eb499e219440be9f489d7f980df4be429;hb=96a10f34794d3d7e253cbaf6fecb713396e3dc15;hpb=8d7636c5e81397f023c80396eac3490545248ae4

diff --git a/resources/tools/presentation/specifications/report/elements.yaml b/resources/tools/presentation/specifications/report/elements.yaml
index 9c31080eb4..fc7df76568 100644
--- a/resources/tools/presentation/specifications/report/elements.yaml
+++ b/resources/tools/presentation/specifications/report/elements.yaml
@@ -2,6 +2,1152 @@
 ###                               T A B L E S                                ###
 ################################################################################
 
+# Statistics: job-specs' durations
+- type: "table"
+  title: "Job Specification Duration: 2n-clx-iterative"
+  algorithm: "table_job_spec_duration"
+  output-file: "{DIR[STATIC,VPP]}/job-spec-duration-2n-clx-iter"
+  jb-type: "iterative"
+  lines:
+    - job-spec: "vpp-mrr-00"
+      data-set: "vpp-2n-clx-curr-iter-mrr"
+    - job-spec: "vpp-mlr-00"
+      data-set: "vpp-2n-clx-curr-iter-best"
+    - job-spec: "vpp-gso-mrr-00"
+      data-set: "vpp-2n-clx-curr-iter-gso"
+    - job-spec: "soak-00"
+      data-set: "vpp-2n-clx-curr-soak"
+#     - job-spec: "vsap-00"
+#       data-set: "vpp-2n-clx-curr-iter-vsap"
+    - job-spec: "nfv-density-mrr-00"
+      data-set: "vpp-2n-clx-curr-nfv-mrr"
+    - job-spec: "nfv-density-mlr-00"
+      data-set: "vpp-2n-clx-curr-nfv-ndrpdr"
+    - job-spec: "reconf-00"
+      data-set: "vpp-2n-clx-curr-nfv-reconf"
+    - job-spec: "dpdk-mlr-00"
+      data-set: "dpdk-2n-clx-curr-iter"
+
+# - type: "table"
+#   title: "Job Specification Duration: 2n-clx-coverage"
+#   algorithm: "table_job_spec_duration"
+#   output-file: "{DIR[STATIC,VPP]}/job-spec-duration-2n-clx-cov"
+#   jb-type: "coverage"
+#   data: "vpp-2n-clx-curr-cov"
+#   lines:
+#     - job-spec: "gso-00"
+#       build: "1"
+#     - job-spec: "ip4-00"
+#       build: "2"
+#     - job-spec: "ip4-01"
+#       build: "3"
+#     - job-spec: "ip4-02"
+#       build: "4"
+#     - job-spec: "ip4-03"
+#       build: "5"
+#     - job-spec: "ip4-04"
+#       build: "6"
+#     - job-spec: "ip4-05"
+#       build: "7"
+#     - job-spec: "ip4-06"
+#       build: "8"
+#     - job-spec: "ip4-07"
+#       build: "9"
+#     - job-spec: "ip4tun-00"
+#       build: "10"
+#     - job-spec: "ip6-00"
+#       build: "11"
+#     - job-spec: "ip6-01"
+#       build: "12"
+#     - job-spec: "l2-00"
+#       build: "13"
+#     - job-spec: "l2-01"
+#       build: "14"
+#     - job-spec: "lb-00"
+#       build: "15"
+#     - job-spec: "memif-00"
+#       build: "16"
+#     - job-spec: "vhost-00"
+#       build: "17"
+
+- type: "table"
+  title: "Job Specification Duration: 2n-dnv-iterative"
+  algorithm: "table_job_spec_duration"
+  output-file: "{DIR[STATIC,VPP]}/job-spec-duration-2n-dnv-iter"
+  jb-type: "iterative"
+  lines:
+    - job-spec: "vpp-mrr-00"
+      data-set: "vpp-2n-dnv-curr-iter-mrr"
+    - job-spec: "vpp-mlr-00"
+      data-set: "vpp-2n-dnv-curr-iter"
+
+# - type: "table"
+#   title: "Job Specification Duration: 2n-dnv-coverage"
+#   algorithm: "table_job_spec_duration"
+#   output-file: "{DIR[STATIC,VPP]}/job-spec-duration-2n-dnv-cov"
+#   jb-type: "coverage"
+#   data: "vpp-2n-dnv-curr-cov"
+#   lines:
+#     - job-spec: "ip4-00"
+#       build: "7"
+#     - job-spec: "ip4-01"
+#       build: "8"
+#     - job-spec: "ip6-00"
+#       build: "9"
+#     - job-spec: "ip6-01"
+#       build: "10"
+#     - job-spec: "l2-00"
+#       build: "11"
+#     - job-spec: "l2-01"
+#       build: "13"
+
+- type: "table"
+  title: "Job Specification Duration: 2n-aws-iterative"
+  algorithm: "table_job_spec_duration"
+  output-file: "{DIR[STATIC,VPP]}/job-spec-duration-2n-aws-iter"
+  jb-type: "iterative"
+  lines:
+    - job-spec: "vpp-mrr-00"
+      data-set: "vpp-2n-aws-curr-iter-mrr"
+    - job-spec: "vpp-mlr-00"
+      data-set: "vpp-2n-aws-curr-iter"
+
+# - type: "table"
+#   title: "Job Specification Duration: 2n-aws-coverage"
+#   algorithm: "table_job_spec_duration"
+#   output-file: "{DIR[STATIC,VPP]}/job-spec-duration-2n-aws-cov"
+#   jb-type: "coverage"
+#   data: "vpp-2n-aws-curr-cov"
+#   lines:
+#     - job-spec: "vpp-00"
+#       build: "1"
+
+- type: "table"
+  title: "Job Specification Duration: 3n-aws-iterative"
+  algorithm: "table_job_spec_duration"
+  output-file: "{DIR[STATIC,VPP]}/job-spec-duration-3n-aws-iter"
+  jb-type: "iterative"
+  lines:
+    - job-spec: "vpp-mrr-00"
+      data-set: "vpp-3n-aws-curr-iter-mrr"
+    - job-spec: "vpp-mlr-00"
+      data-set: "vpp-3n-aws-curr-iter"
+
+# - type: "table"
+#   title: "Job Specification Duration: 3n-aws-coverage"
+#   algorithm: "table_job_spec_duration"
+#   output-file: "{DIR[STATIC,VPP]}/job-spec-duration-3n-aws-cov"
+#   jb-type: "coverage"
+#   data: "vpp-3n-aws-curr-cov"
+#   lines:
+#     - job-spec: "vpp-00"
+#       build: "1"
+
+- type: "table"
+  title: "Job Specification Duration: 2n-skx-iterative"
+  algorithm: "table_job_spec_duration"
+  output-file: "{DIR[STATIC,VPP]}/job-spec-duration-2n-skx-iter"
+  jb-type: "iterative"
+  lines:
+    - job-spec: "vpp-mrr-00"
+      data-set: "vpp-2n-skx-curr-iter-mrr"
+    - job-spec: "vpp-mlr-00"
+      data-set: "vpp-2n-skx-curr-iter-best"
+    - job-spec: "vpp-gso-mrr-00"
+      data-set: "vpp-2n-skx-curr-gso"
+    - job-spec: "soak-00"
+      data-set: "vpp-2n-skx-curr-soak"
+    - job-spec: "nfv-density-mrr-00"
+      data-set: "vpp-2n-skx-curr-nfv-mrr"
+    - job-spec: "nfv-density-mlr-00"
+      data-set: "vpp-2n-skx-curr-nfv-ndrpdr"
+    - job-spec: "reconf-00"
+      data-set: "vpp-2n-skx-curr-nfv-reconf"
+    - job-spec: "dpdk-mlr-00"
+      data-set: "dpdk-2n-skx-curr-iter"
+    - job-spec: "trex-mlr-00"
+      data-set: "trex-2n-skx-curr-iter"
+
+# - type: "table"
+#   title: "Job Specification Duration: 2n-skx-coverage"
+#   algorithm: "table_job_spec_duration"
+#   output-file: "{DIR[STATIC,VPP]}/job-spec-duration-2n-skx-cov"
+#   jb-type: "coverage"
+#   data: "vpp-2n-skx-curr-cov"
+#   lines:
+#     - job-spec: "gso-00"
+#       build: "1"
+#     - job-spec: "ip4-00"
+#       build: "2"
+#     - job-spec: "ip4-01"
+#       build: "3"
+#     - job-spec: "ip4-02"
+#       build: "4"
+#     - job-spec: "ip4-03"
+#       build: "5"
+#     - job-spec: "ip4-04"
+#       build: "6"
+#     - job-spec: "ip4-05"
+#       build: "7"
+#     - job-spec: "ip4-06"
+#       build: "8"
+#     - job-spec: "ip4-07"
+#       build: "9"
+#     - job-spec: "ip4tun-00"
+#       build: "10"
+#     - job-spec: "ip6-00"
+#       build: "11"
+#     - job-spec: "ip6-01"
+#       build: "12"
+#     - job-spec: "l2-00"
+#       build: "13"
+#     - job-spec: "l2-01"
+#       build: "14"
+#     - job-spec: "lb-00"
+#       build: "15"
+#     - job-spec: "memif-00"
+#       build: "16"
+#     - job-spec: "vhost-00"
+#       build: "17"
+
+- type: "table"
+  title: "Job Specification Duration: 2n-tx2-iterative"
+  algorithm: "table_job_spec_duration"
+  output-file: "{DIR[STATIC,VPP]}/job-spec-duration-2n-tx2-iter"
+  jb-type: "iterative"
+  lines:
+    - job-spec: "vpp-mrr-00"
+      data-set: "vpp-2n-tx2-curr-iter-mrr"
+    - job-spec: "vpp-mlr-00"
+      data-set: "vpp-2n-tx2-curr-iter"
+
+# - type: "table"
+#   title: "Job Specification Duration: 2n-tx2-coverage"
+#   algorithm: "table_job_spec_duration"
+#   output-file: "{DIR[STATIC,VPP]}/job-spec-duration-2n-tx2-cov"
+#   jb-type: "coverage"
+#   data: "vpp-2n-tx2-curr-cov"
+#   lines:
+#     - job-spec: "ip4-00"
+#       build: "1"
+#     - job-spec: "ip4-01"
+#       build: "2"
+#     - job-spec: "ip4-02"
+#       build: "3"
+#     - job-spec: "ip4-03"
+#       build: "4"
+#     - job-spec: "ip4-04"
+#       build: "5"
+#     - job-spec: "ip4-05"
+#       build: "6"
+#     - job-spec: "ip4-06"
+#       build: "7"
+#     - job-spec: "ip6-00"
+#       build: "8"
+#     - job-spec: "ip6-01"
+#       build: "9"
+#     - job-spec: "l2-00"
+#       build: "10"
+#     - job-spec: "l2-01"
+#       build: "11"
+#     - job-spec: "l2-02"
+#       build: "12"
+#     - job-spec: "l2-03"
+#       build: "13"
+#     - job-spec: "l2-04"
+#       build: "14"
+
+- type: "table"
+  title: "Job Specification Duration: 2n-zn2-iterative"
+  algorithm: "table_job_spec_duration"
+  output-file: "{DIR[STATIC,VPP]}/job-spec-duration-2n-zn2-iter"
+  jb-type: "iterative"
+  lines:
+    - job-spec: "vpp-mrr-00"
+      data-set: "vpp-2n-zn2-curr-iter-mrr"
+    - job-spec: "vpp-mlr-00"
+      data-set: "vpp-2n-zn2-curr-iter-best"
+    - job-spec: "vpp-gso-mrr-00"
+      data-set: "vpp-2n-zn2-curr-iter-gso"
+    - job-spec: "dpdk-mlr-00"
+      data-set: "dpdk-2n-zn2-curr-iter"
+
+# - type: "table"
+#   title: "Job Specification Duration: 2n-zn2-coverage"
+#   algorithm: "table_job_spec_duration"
+#   output-file: "{DIR[STATIC,VPP]}/job-spec-duration-2n-zn2-cov"
+#   jb-type: "coverage"
+#   data: "vpp-2n-zn2-curr-cov"
+#   lines:
+#     - job-spec: "gso-00"
+#       build: "1"
+#     - job-spec: "ip4-00"
+#       build: "2"
+#     - job-spec: "ip4-01"
+#       build: "3"
+#     - job-spec: "ip4-02"
+#       build: "4"
+#     - job-spec: "ip4-03"
+#       build: "18"
+#     - job-spec: "ip4-04"
+#       build: "6"
+#     - job-spec: "ip4-05"
+#       build: "7"
+#     - job-spec: "ip4tun-00"
+#       build: "8"
+#     - job-spec: "ip6-00"
+#       build: "9"
+#     - job-spec: "ip6-01"
+#       build: "19"
+#     - job-spec: "l2-00"
+#       build: "11"
+#     - job-spec: "l2-01"
+#       build: "12"
+#     - job-spec: "lb-00"
+#       build: "13"
+#     - job-spec: "memif-00"
+#       build: "14"
+#     - job-spec: "vhost-00"
+#       build: "15"
+
+- type: "table"
+  title: "Job Specification Duration: 3n-dnv-iterative"
+  algorithm: "table_job_spec_duration"
+  output-file: "{DIR[STATIC,VPP]}/job-spec-duration-3n-dnv-iter"
+  jb-type: "iterative"
+  lines:
+    - job-spec: "vpp-mrr-00"
+      data-set: "vpp-3n-dnv-curr-iter-mrr"
+    - job-spec: "vpp-mlr-00"
+      data-set: "vpp-3n-dnv-curr-iter"
+
+# - type: "table"
+#   title: "Job Specification Duration: 3n-dnv-coverage"
+#   algorithm: "table_job_spec_duration"
+#   output-file: "{DIR[STATIC,VPP]}/job-spec-duration-3n-dnv-cov"
+#   jb-type: "coverage"
+#   data: "vpp-3n-dnv-curr-cov"
+#   lines:
+#     - job-spec: "crypto-00"
+#       build: "11"
+#     - job-spec: "crypto-01"
+#       build: "12"
+#     - job-spec: "crypto-02"
+#       build: "13"
+#     - job-spec: "ip4-00"
+#       build: "14"
+#     - job-spec: "ip4-01"
+#       build: "15"
+#     - job-spec: "ip4tun-00"
+#       build: "16"
+#     - job-spec: "ip6-00"
+#       build: "17"
+#     - job-spec: "ip6-01"
+#       build: "10"
+#     - job-spec: "l2-00"
+#       build: "20"
+#     - job-spec: "l2-01"
+#       build: "21"
+
+- type: "table"
+  title: "Job Specification Duration: 3n-skx-iterative"
+  algorithm: "table_job_spec_duration"
+  output-file: "{DIR[STATIC,VPP]}/job-spec-duration-3n-skx-iter"
+  jb-type: "iterative"
+  lines:
+    - job-spec: "vpp-mrr-00"
+      data-set: "vpp-3n-skx-curr-iter-mrr"
+    - job-spec: "vpp-mlr-00"
+      data-set: "vpp-3n-skx-curr-iter"
+    - job-spec: "hoststack-00"
+      data-set: "vpp-3n-skx-curr-iter-hoststack"
+    - job-spec: "dpdk-mlr-00"
+      data-set: "dpdk-3n-skx-curr-iter"
+#     - job-spec: "trex-mlr-00"
+#       data-set: "trex-3n-skx-curr-iter"
+
+# - type: "table"
+#   title: "Job Specification Duration: 3n-skx-coverage"
+#   algorithm: "table_job_spec_duration"
+#   output-file: "{DIR[STATIC,VPP]}/job-spec-duration-3n-skx-cov"
+#   jb-type: "coverage"
+#   data: "vpp-3n-skx-curr-cov"
+#   lines:
+#     - job-spec: "crypto-00"
+#       build: "1"
+#     - job-spec: "crypto-01"
+#       build: "3"
+#     - job-spec: "crypto-02"
+#       build: "4"
+#     - job-spec: "crypto-03"
+#       build: "36"
+#     - job-spec: "crypto-04"
+#       build: "6"
+#     - job-spec: "ip4-00"
+#       build: "7"
+#     - job-spec: "ip4-01"
+#       build: "8"
+#     - job-spec: "ip4-02"
+#       build: "9"
+#     - job-spec: "ip4-03"
+#       build: "10"
+#     - job-spec: "ip4-04"
+#       build: "11"
+#     - job-spec: "ip4-05"
+#       build: "12"
+#     - job-spec: "ip4-06"
+#       build: "13"
+#     - job-spec: "ip4-07"
+#       build: "14"
+#     - job-spec: "ip4tun-00"
+#       build: "15"
+#     - job-spec: "ip4tun-02"
+#       build: "16"
+#     - job-spec: "ip6-00"
+#       build: "17"
+#     - job-spec: "ip6-01"
+#       build: "18"
+#     - job-spec: "ip6tun-00"
+#       build: "19"
+#     - job-spec: "l2-00"
+#       build: "20"
+#     - job-spec: "l2-01"
+#       build: "21"
+#     - job-spec: "l2-02"
+#       build: "22"
+#     - job-spec: "l2-03"
+#       build: "23"
+#     - job-spec: "l2-04"
+#       build: "24"
+#     - job-spec: "l2-05"
+#       build: "25"
+#     - job-spec: "l2-06"
+#       build: "26"
+#     - job-spec: "l2-07"
+#       build: "27"
+#     - job-spec: "l2-08"
+#       build: "28"
+#     - job-spec: "l2-09"
+#       build: "29"
+#     - job-spec: "l2-10"
+#       build: "30"
+#     - job-spec: "memif-00"
+#       build: "31"
+#     - job-spec: "srv6-00"
+#       build: "32"
+#     - job-spec: "srv6-01"
+#       build: "33"
+#     - job-spec: "vhost-00"
+#       build: "34"
+#     - job-spec: "vhost-01"
+#       build: "35"
+
+- type: "table"
+  title: "Job Specification Duration: 3n-tsh-iterative"
+  algorithm: "table_job_spec_duration"
+  output-file: "{DIR[STATIC,VPP]}/job-spec-duration-3n-tsh-iter"
+  jb-type: "iterative"
+  lines:
+    - job-spec: "vpp-mrr-00"
+      data-set: "vpp-3n-tsh-curr-iter-mrr"
+    - job-spec: "vpp-mlr-00"
+      data-set: "vpp-3n-tsh-curr-iter"
+    - job-spec: "dpdk-mlr-00"
+      data-set: "dpdk-3n-tsh-curr-iter"
+
+# - type: "table"
+#   title: "Job Specification Duration: 3n-tsh-coverage"
+#   algorithm: "table_job_spec_duration"
+#   output-file: "{DIR[STATIC,VPP]}/job-spec-duration-3n-tsh-cov"
+#   jb-type: "coverage"
+#   data: "vpp-3n-tsh-curr-cov"
+#   lines:
+#     - job-spec: "ip4-00"
+#       build: "7"
+#     - job-spec: "ip4-01"
+#       build: "8"
+#     - job-spec: "ip4-02"
+#       build: "9"
+#     - job-spec: "ip4-03"
+#       build: "10"
+#     - job-spec: "ip4tun-00"
+#       build: "15"
+#     - job-spec: "ip6-00"
+#       build: "17"
+#     - job-spec: "ip6-01"
+#       build: "18"
+#     - job-spec: "l2-00"
+#       build: "20"
+#     - job-spec: "l2-01"
+#       build: "21"
+#     - job-spec: "l2-02"
+#       build: "22"
+#     - job-spec: "l2-03"
+#       build: "23"
+#     - job-spec: "l2-04"
+#       build: "24"
+#     - job-spec: "memif-00"
+#       build: "31"
+#     - job-spec: "srv6-00"
+#       build: "32"
+#     - job-spec: "srv6-01"
+#       build: "33"
+#     - job-spec: "vhost-00"
+#       build: "34"
+#     - job-spec: "vhost-01"
+#       build: "35"
+
+# VPP Latency Changes 3n-skx 2t1c
+- type: "table"
+  title: "VPP Latency Changes 3n-skx 2t1c PDR50-direction1-avg"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/latency-changes-3n-skx-xxv710-2t1c-pdr50-d1-avg"
+  include-tests: "latency-PDR50-direction1-avg"
+  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
+  columns:
+    - title: "2101.0-7"
+      data-set: "vpp-3n-skx-hist-iter-new-env"
+    - title: "2106.0-7"
+      data-set: "vpp-3n-skx-prev-iter-old-env"
+    - title: "2106.0-8"
+      data-set: "vpp-3n-skx-prev-iter-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-3n-skx-curr-iter-best"
+  comparisons:
+    - title: "2106.0-8 vs 2106.0-7"
+      reference: 2
+      compare: 3
+    - title: "2110.0-8 vs 2106.0-8"
+      reference: 3
+      compare: 4
+  legend:
+    - ''
+    - 'Test Case:            Test cases executed for: PDR throughput on 3n-skx with xxv710.'
+    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "7" for CSIT rls2106, "8" for CSIT rls2110).'
+    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - '2106.0-8 vs 2106.0-7: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2110.0-8 vs 2106.0-8: Compares VPP code current vs previous in the current CSIT environment.'
+
+# VPP Latency Changes 3n-skx 2t1c
+- type: "table"
+  title: "VPP Latency Changes 3n-skx 2t1c PDR90-direction1-avg"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/latency-changes-3n-skx-xxv710-2t1c-pdr90-d1-avg"
+  include-tests: "latency-PDR90-direction1-avg"
+  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
+  columns:
+    - title: "2101.0-7"
+      data-set: "vpp-3n-skx-hist-iter-new-env"
+    - title: "2106.0-7"
+      data-set: "vpp-3n-skx-prev-iter-old-env"
+    - title: "2106.0-8"
+      data-set: "vpp-3n-skx-prev-iter-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-3n-skx-curr-iter-best"
+  comparisons:
+    - title: "2106.0-8 vs 2106.0-7"
+      reference: 2
+      compare: 3
+    - title: "2110.0-8 vs 2106.0-8"
+      reference: 3
+      compare: 4
+  legend:
+    - ''
+    - 'Test Case:            Test cases executed for: PDR throughput on 3n-skx with xxv710.'
+    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "7" for CSIT rls2106, "8" for CSIT rls2110).'
+    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - '2106.0-8 vs 2106.0-7: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2110.0-8 vs 2106.0-8: Compares VPP code current vs previous in the current CSIT environment.'
+
+# VPP Latency Changes 3n-skx 2t1c
+- type: "table"
+  title: "VPP Latency Changes 3n-skx 2t1c PDR90-direction1-max"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/latency-changes-3n-skx-xxv710-2t1c-pdr90-d1-max"
+  include-tests: "latency-PDR90-direction1-max"
+  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
+  columns:
+    - title: "2101.0-7"
+      data-set: "vpp-3n-skx-hist-iter-new-env"
+    - title: "2106.0-7"
+      data-set: "vpp-3n-skx-prev-iter-old-env"
+    - title: "2106.0-8"
+      data-set: "vpp-3n-skx-prev-iter-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-3n-skx-curr-iter-best"
+  comparisons:
+    - title: "2106.0-8 vs 2106.0-7"
+      reference: 2
+      compare: 3
+    - title: "2110.0-8 vs 2106.0-8"
+      reference: 3
+      compare: 4
+  legend:
+    - ''
+    - 'Test Case:            Test cases executed for: PDR throughput on 3n-skx with xxv710.'
+    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "7" for CSIT rls2106, "8" for CSIT rls2110).'
+    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - '2106.0-8 vs 2106.0-7: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2110.0-8 vs 2106.0-8: Compares VPP code current vs previous in the current CSIT environment.'
+
+# VPP Latency Changes 2n-skx 2t1c
+- type: "table"
+  title: "VPP Latency Changes 2n-skx 2t1c PDR50-direction1-avg"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/latency-changes-2n-skx-xxv710-2t1c-pdr50-d1-avg"
+  include-tests: "latency-PDR50-direction1-avg"
+  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
+  columns:
+    - title: "2101.0-7"
+      data-set: "vpp-2n-skx-hist-iter-new-env"
+    - title: "2106.0-7"
+      data-set: "vpp-2n-skx-prev-iter-old-env"
+    - title: "2106.0-8"
+      data-set: "vpp-2n-skx-prev-iter-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-2n-skx-curr-iter-best"
+  comparisons:
+    - title: "2106.0-8 vs 2106.0-7"
+      reference: 2
+      compare: 3
+    - title: "2110.0-8 vs 2106.0-8"
+      reference: 3
+      compare: 4
+  legend:
+    - ''
+    - 'Test Case:            Test cases executed for: PDR throughput on 2n-skx with xxv710.'
+    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "7" for CSIT rls2106, "8" for CSIT rls2110).'
+    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - '2106.0-8 vs 2106.0-7: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2110.0-8 vs 2106.0-8: Compares VPP code current vs previous in the current CSIT environment.'
+
+# VPP Latency Changes 2n-skx 2t1c
+- type: "table"
+  title: "VPP Latency Changes 2n-skx 2t1c PDR90-direction1-avg"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/latency-changes-2n-skx-xxv710-2t1c-pdr90-d1-avg"
+  include-tests: "latency-PDR90-direction1-avg"
+  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
+  columns:
+    - title: "2101.0-7"
+      data-set: "vpp-2n-skx-hist-iter-new-env"
+    - title: "2106.0-7"
+      data-set: "vpp-2n-skx-prev-iter-old-env"
+    - title: "2106.0-8"
+      data-set: "vpp-2n-skx-prev-iter-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-2n-skx-curr-iter-best"
+  comparisons:
+    - title: "2106.0-8 vs 2106.0-7"
+      reference: 2
+      compare: 3
+    - title: "2110.0-8 vs 2106.0-8"
+      reference: 3
+      compare: 4
+  legend:
+    - ''
+    - 'Test Case:            Test cases executed for: PDR throughput on 2n-skx with xxv710.'
+    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "7" for CSIT rls2106, "8" for CSIT rls2110).'
+    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - '2106.0-8 vs 2106.0-7: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2110.0-8 vs 2106.0-8: Compares VPP code current vs previous in the current CSIT environment.'
+
+# VPP Latency Changes 2n-skx 2t1c
+- type: "table"
+  title: "VPP Latency Changes 2n-skx 2t1c PDR90-direction1-max"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/latency-changes-2n-skx-xxv710-2t1c-pdr90-d1-max"
+  include-tests: "latency-PDR90-direction1-max"
+  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
+  columns:
+    - title: "2101.0-7"
+      data-set: "vpp-2n-skx-hist-iter-new-env"
+    - title: "2106.0-7"
+      data-set: "vpp-2n-skx-prev-iter-old-env"
+    - title: "2106.0-8"
+      data-set: "vpp-2n-skx-prev-iter-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-2n-skx-curr-iter-best"
+  comparisons:
+    - title: "2106.0-8 vs 2106.0-7"
+      reference: 2
+      compare: 3
+    - title: "2110.0-8 vs 2106.0-8"
+      reference: 3
+      compare: 4
+  legend:
+    - ''
+    - 'Test Case:            Test cases executed for: PDR throughput on 2n-skx with xxv710.'
+    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "7" for CSIT rls2106, "8" for CSIT rls2110).'
+    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - '2106.0-8 vs 2106.0-7: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2110.0-8 vs 2106.0-8: Compares VPP code current vs previous in the current CSIT environment.'
+
+# VPP Latency Changes 2n-clx 2t1c
+- type: "table"
+  title: "VPP Latency Changes 2n-clx 2t1c PDR50-direction1-avg"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/latency-changes-2n-clx-xxv710-2t1c-pdr50-d1-avg"
+  include-tests: "latency-PDR50-direction1-avg"
+  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
+  columns:
+    - title: "2101.0-7"
+      data-set: "vpp-2n-clx-hist-iter-new-env"
+    - title: "2106.0-7"
+      data-set: "vpp-2n-clx-prev-iter-old-env"
+    - title: "2106.0-8"
+      data-set: "vpp-2n-clx-prev-iter-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-2n-clx-curr-iter-best"
+  comparisons:
+    - title: "2106.0-8 vs 2106.0-7"
+      reference: 2
+      compare: 3
+    - title: "2110.0-8 vs 2106.0-8"
+      reference: 3
+      compare: 4
+  legend:
+    - ''
+    - 'Test Case:            Test cases executed for: PDR throughput on 2n-clx with xxv710.'
+    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "7" for CSIT rls2106, "8" for CSIT rls2110).'
+    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - '2106.0-8 vs 2106.0-7: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2110.0-8 vs 2106.0-8: Compares VPP code current vs previous in the current CSIT environment.'
+
+# VPP Latency Changes 2n-clx 2t1c
+- type: "table"
+  title: "VPP Latency Changes 2n-clx 2t1c PDR90-direction1-avg"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/latency-changes-2n-clx-xxv710-2t1c-pdr90-d1-avg"
+  include-tests: "latency-PDR90-direction1-avg"
+  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
+  columns:
+    - title: "2101.0-7"
+      data-set: "vpp-2n-clx-hist-iter-new-env"
+    - title: "2106.0-7"
+      data-set: "vpp-2n-clx-prev-iter-old-env"
+    - title: "2106.0-8"
+      data-set: "vpp-2n-clx-prev-iter-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-2n-clx-curr-iter-best"
+  comparisons:
+    - title: "2106.0-8 vs 2106.0-7"
+      reference: 2
+      compare: 3
+    - title: "2110.0-8 vs 2106.0-8"
+      reference: 3
+      compare: 4
+  legend:
+    - ''
+    - 'Test Case:            Test cases executed for: PDR throughput on 2n-clx with xxv710.'
+    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "7" for CSIT rls2106, "8" for CSIT rls2110).'
+    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - '2106.0-8 vs 2106.0-7: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2110.0-8 vs 2106.0-8: Compares VPP code current vs previous in the current CSIT environment.'
+
+# VPP Latency Changes 2n-clx 2t1c
+- type: "table"
+  title: "VPP Latency Changes 2n-clx 2t1c PDR90-direction1-max"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/latency-changes-2n-clx-xxv710-2t1c-pdr90-d1-max"
+  include-tests: "latency-PDR90-direction1-max"
+  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
+  columns:
+    - title: "2101.0-7"
+      data-set: "vpp-2n-clx-hist-iter-new-env"
+    - title: "2106.0-7"
+      data-set: "vpp-2n-clx-prev-iter-old-env"
+    - title: "2106.0-8"
+      data-set: "vpp-2n-clx-prev-iter-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-2n-clx-curr-iter-best"
+  comparisons:
+    - title: "2106.0-8 vs 2106.0-7"
+      reference: 2
+      compare: 3
+    - title: "2110.0-8 vs 2106.0-8"
+      reference: 3
+      compare: 4
+  legend:
+    - ''
+    - 'Test Case:            Test cases executed for: PDR throughput on 2n-clx with xxv710.'
+    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "7" for CSIT rls2106, "8" for CSIT rls2110).'
+    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - '2106.0-8 vs 2106.0-7: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2110.0-8 vs 2106.0-8: Compares VPP code current vs previous in the current CSIT environment.'
+
+# VPP Latency Changes 2n-clx 2t1c
+- type: "table"
+  title: "VPP Latency Changes 2n-clx 2t1c PDR50-direction1-avg"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/latency-changes-2n-clx-cx556a-2t1c-pdr50-d1-avg"
+  include-tests: "latency-PDR50-direction1-avg"
+  filter: "'2T1C' and 'NDRPDR' and 'NIC_Mellanox-CX556A' and not 'NF_DENSITY'"
+  columns:
+    - title: "2101.0-7"
+      data-set: "vpp-2n-clx-hist-iter-new-env"
+    - title: "2106.0-7"
+      data-set: "vpp-2n-clx-prev-iter-old-env"
+    - title: "2106.0-8"
+      data-set: "vpp-2n-clx-prev-iter-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-2n-clx-curr-iter-best"
+  comparisons:
+    - title: "2106.0-8 vs 2106.0-7"
+      reference: 2
+      compare: 3
+    - title: "2110.0-8 vs 2106.0-8"
+      reference: 3
+      compare: 4
+  legend:
+    - ''
+    - 'Test Case:            Test cases executed for: PDR throughput on 2n-clx with cx556a.'
+    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "7" for CSIT rls2106, "8" for CSIT rls2110).'
+    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - '2106.0-8 vs 2106.0-7: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2110.0-8 vs 2106.0-8: Compares VPP code current vs previous in the current CSIT environment.'
+
+# VPP Latency Changes 2n-clx 2t1c
+- type: "table"
+  title: "VPP Latency Changes 2n-clx 2t1c PDR90-direction1-avg"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/latency-changes-2n-clx-cx556a-2t1c-pdr90-d1-avg"
+  include-tests: "latency-PDR90-direction1-avg"
+  filter: "'2T1C' and 'NDRPDR' and 'NIC_Mellanox-CX556A' and not 'NF_DENSITY'"
+  columns:
+    - title: "2101.0-7"
+      data-set: "vpp-2n-clx-hist-iter-new-env"
+    - title: "2106.0-7"
+      data-set: "vpp-2n-clx-prev-iter-old-env"
+    - title: "2106.0-8"
+      data-set: "vpp-2n-clx-prev-iter-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-2n-clx-curr-iter-best"
+  comparisons:
+    - title: "2106.0-8 vs 2106.0-7"
+      reference: 2
+      compare: 3
+    - title: "2110.0-8 vs 2106.0-8"
+      reference: 3
+      compare: 4
+  legend:
+    - ''
+    - 'Test Case:            Test cases executed for: PDR throughput on 2n-clx with cx556a.'
+    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "7" for CSIT rls2106, "8" for CSIT rls2110).'
+    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - '2106.0-8 vs 2106.0-7: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2110.0-8 vs 2106.0-8: Compares VPP code current vs previous in the current CSIT environment.'
+
+# VPP Latency Changes 2n-clx 2t1c
+- type: "table"
+  title: "VPP Latency Changes 2n-clx 2t1c PDR90-direction1-max"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/latency-changes-2n-clx-cx556a-2t1c-pdr90-d1-max"
+  include-tests: "latency-PDR90-direction1-max"
+  filter: "'2T1C' and 'NDRPDR' and 'NIC_Mellanox-CX556A' and not 'NF_DENSITY'"
+  columns:
+    - title: "2101.0-7"
+      data-set: "vpp-2n-clx-hist-iter-new-env"
+    - title: "2106.0-7"
+      data-set: "vpp-2n-clx-prev-iter-old-env"
+    - title: "2106.0-8"
+      data-set: "vpp-2n-clx-prev-iter-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-2n-clx-curr-iter-best"
+  comparisons:
+    - title: "2106.0-8 vs 2106.0-7"
+      reference: 2
+      compare: 3
+    - title: "2110.0-8 vs 2106.0-8"
+      reference: 3
+      compare: 4
+  legend:
+    - ''
+    - 'Test Case:            Test cases executed for: PDR throughput on 2n-clx with cx556a.'
+    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "7" for CSIT rls2106, "8" for CSIT rls2110).'
+    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - '2106.0-8 vs 2106.0-7: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2110.0-8 vs 2106.0-8: Compares VPP code current vs previous in the current CSIT environment.'
+
+# VPP Latency Changes 2n-zn2 2t1c
+- type: "table"
+  title: "VPP Latency Changes 2n-zn2 2t1c PDR50-direction1-avg"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/latency-changes-2n-zn2-xxv710-2t1c-pdr50-d1-avg"
+  include-tests: "latency-PDR50-direction1-avg"
+  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
+  columns:
+    - title: "2101.0-7"
+      data-set: "vpp-2n-zn2-hist-iter-new-env"
+    - title: "2106.0-7"
+      data-set: "vpp-2n-zn2-prev-iter-old-env"
+    - title: "2106.0-8"
+      data-set: "vpp-2n-zn2-prev-iter-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-2n-zn2-curr-iter-best"
+  comparisons:
+    - title: "2106.0-8 vs 2106.0-7"
+      reference: 2
+      compare: 3
+    - title: "2110.0-8 vs 2106.0-8"
+      reference: 3
+      compare: 4
+  legend:
+    - ''
+    - 'Test Case:            Test cases executed for: PDR throughput on 2n-zn2 with xxv710.'
+    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "7" for CSIT rls2106, "8" for CSIT rls2110).'
+    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - '2106.0-8 vs 2106.0-7: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2110.0-8 vs 2106.0-8: Compares VPP code current vs previous in the current CSIT environment.'
+
+# VPP Latency Changes 2n-zn2 2t1c
+- type: "table"
+  title: "VPP Latency Changes 2n-zn2 2t1c PDR90-direction1-avg"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/latency-changes-2n-zn2-xxv710-2t1c-pdr90-d1-avg"
+  include-tests: "latency-PDR90-direction1-avg"
+  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
+  columns:
+    - title: "2101.0-7"
+      data-set: "vpp-2n-zn2-hist-iter-new-env"
+    - title: "2106.0-7"
+      data-set: "vpp-2n-zn2-prev-iter-old-env"
+    - title: "2106.0-8"
+      data-set: "vpp-2n-zn2-prev-iter-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-2n-zn2-curr-iter-best"
+  comparisons:
+    - title: "2106.0-8 vs 2106.0-7"
+      reference: 2
+      compare: 3
+    - title: "2110.0-8 vs 2106.0-8"
+      reference: 3
+      compare: 4
+  legend:
+    - ''
+    - 'Test Case:            Test cases executed for: PDR throughput on 2n-zn2 with xxv710.'
+    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "7" for CSIT rls2106, "8" for CSIT rls2110).'
+    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - '2106.0-8 vs 2106.0-7: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2110.0-8 vs 2106.0-8: Compares VPP code current vs previous in the current CSIT environment.'
+
+# VPP Latency Changes 2n-zn2 2t1c
+- type: "table"
+  title: "VPP Latency Changes 2n-zn2 2t1c PDR90-direction1-max"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/latency-changes-2n-zn2-xxv710-2t1c-pdr90-d1-max"
+  include-tests: "latency-PDR90-direction1-max"
+  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
+  columns:
+    - title: "2101.0-7"
+      data-set: "vpp-2n-zn2-hist-iter-new-env"
+    - title: "2106.0-7"
+      data-set: "vpp-2n-zn2-prev-iter-old-env"
+    - title: "2106.0-8"
+      data-set: "vpp-2n-zn2-prev-iter-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-2n-zn2-curr-iter-best"
+  comparisons:
+    - title: "2106.0-8 vs 2106.0-7"
+      reference: 2
+      compare: 3
+    - title: "2110.0-8 vs 2106.0-8"
+      reference: 3
+      compare: 4
+  legend:
+    - ''
+    - 'Test Case:            Test cases executed for: PDR throughput on 2n-zn2 with xxv710.'
+    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "7" for CSIT rls2106, "8" for CSIT rls2110).'
+    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - '2106.0-8 vs 2106.0-7: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2110.0-8 vs 2106.0-8: Compares VPP code current vs previous in the current CSIT environment.'
+
+# VPP Latency Changes 2n-tx2 1t1c
+- type: "table"
+  title: "VPP Latency Changes 2n-tx2 1t1c PDR50-direction1-avg"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/latency-changes-2n-tx2-xl710-1t1c-pdr50-d1-avg"
+  include-tests: "latency-PDR50-direction1-avg"
+  filter: "'1T1C' and 'NDRPDR'"
+  columns:
+    - title: "2101.0-7"
+      data-set: "vpp-2n-tx2-hist-iter-new-env"
+    - title: "2106.0-7"
+      data-set: "vpp-2n-tx2-prev-iter-old-env"
+    - title: "2106.0-8"
+      data-set: "vpp-2n-tx2-prev-iter-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-2n-tx2-curr-iter-best"
+  comparisons:
+    - title: "2106.0-8 vs 2106.0-7"
+      reference: 2
+      compare: 3
+    - title: "2110.0-8 vs 2106.0-8"
+      reference: 3
+      compare: 4
+  legend:
+    - ''
+    - 'Test Case:            Test cases executed for: PDR throughput on 2n-tx2 with xl710.'
+    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "7" for CSIT rls2106, "8" for CSIT rls2110).'
+    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - '2106.0-8 vs 2106.0-7: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2110.0-8 vs 2106.0-8: Compares VPP code current vs previous in the current CSIT environment.'
+
+# VPP Latency Changes 2n-tx2 1t1c
+- type: "table"
+  title: "VPP Latency Changes 2n-tx2 1t1c PDR90-direction1-avg"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/latency-changes-2n-tx2-xl710-1t1c-pdr90-d1-avg"
+  include-tests: "latency-PDR90-direction1-avg"
+  filter: "'1T1C' and 'NDRPDR'"
+  columns:
+    - title: "2101.0-7"
+      data-set: "vpp-2n-tx2-hist-iter-new-env"
+    - title: "2106.0-7"
+      data-set: "vpp-2n-tx2-prev-iter-old-env"
+    - title: "2106.0-8"
+      data-set: "vpp-2n-tx2-prev-iter-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-2n-tx2-curr-iter-best"
+  comparisons:
+    - title: "2106.0-8 vs 2106.0-7"
+      reference: 2
+      compare: 3
+    - title: "2110.0-8 vs 2106.0-8"
+      reference: 3
+      compare: 4
+  legend:
+    - ''
+    - 'Test Case:            Test cases executed for: PDR throughput on 2n-tx2 with xl710.'
+    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "7" for CSIT rls2106, "8" for CSIT rls2110).'
+    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - '2106.0-8 vs 2106.0-7: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2110.0-8 vs 2106.0-8: Compares VPP code current vs previous in the current CSIT environment.'
+
+# VPP Latency Changes 2n-tx2 1t1c
+- type: "table"
+  title: "VPP Latency Changes 2n-tx2 1t1c PDR90-direction1-max"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/latency-changes-2n-tx2-xl710-1t1c-pdr90-d1-max"
+  include-tests: "latency-PDR90-direction1-max"
+  filter: "'1T1C' and 'NDRPDR'"
+  columns:
+    - title: "2101.0-7"
+      data-set: "vpp-2n-tx2-hist-iter-new-env"
+    - title: "2106.0-7"
+      data-set: "vpp-2n-tx2-prev-iter-old-env"
+    - title: "2106.0-8"
+      data-set: "vpp-2n-tx2-prev-iter-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-2n-tx2-curr-iter-best"
+  comparisons:
+    - title: "2106.0-8 vs 2106.0-7"
+      reference: 2
+      compare: 3
+    - title: "2110.0-8 vs 2106.0-8"
+      reference: 3
+      compare: 4
+  legend:
+    - ''
+    - 'Test Case:            Test cases executed for: PDR throughput on 2n-tx2 with xl710.'
+    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "7" for CSIT rls2106, "8" for CSIT rls2110).'
+    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - '2106.0-8 vs 2106.0-7: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2110.0-8 vs 2106.0-8: Compares VPP code current vs previous in the current CSIT environment.'
+
+# VPP Latency Changes 3n-tsh 1t1c
+- type: "table"
+  title: "VPP Latency Changes 3n-tsh 1t1c PDR50-direction1-avg"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/latency-changes-3n-tsh-x520-1t1c-pdr50-d1-avg"
+  include-tests: "latency-PDR50-direction1-avg"
+  filter: "'1T1C' and 'NDRPDR'"
+  columns:
+    - title: "2101.0-7"
+      data-set: "vpp-3n-tsh-hist-iter-new-env"
+    - title: "2106.0-7"
+      data-set: "vpp-3n-tsh-prev-iter-old-env"
+    - title: "2106.0-8"
+      data-set: "vpp-3n-tsh-prev-iter-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-3n-tsh-curr-iter-best"
+  comparisons:
+    - title: "2106.0-8 vs 2106.0-7"
+      reference: 2
+      compare: 3
+    - title: "2110.0-8 vs 2106.0-8"
+      reference: 3
+      compare: 4
+  legend:
+    - ''
+    - 'Test Case:            Test cases executed for: PDR throughput on 3n-tsh with x520.'
+    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "7" for CSIT rls2106, "8" for CSIT rls2110).'
+    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - '2106.0-8 vs 2106.0-7: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2110.0-8 vs 2106.0-8: Compares VPP code current vs previous in the current CSIT environment.'
+
+# VPP Latency Changes 3n-tsh 1t1c
+- type: "table"
+  title: "VPP Latency Changes 3n-tsh 1t1c PDR90-direction1-avg"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/latency-changes-3n-tsh-x520-1t1c-pdr90-d1-avg"
+  include-tests: "latency-PDR90-direction1-avg"
+  filter: "'1T1C' and 'NDRPDR'"
+  columns:
+    - title: "2101.0-7"
+      data-set: "vpp-3n-tsh-hist-iter-new-env"
+    - title: "2106.0-7"
+      data-set: "vpp-3n-tsh-prev-iter-old-env"
+    - title: "2106.0-8"
+      data-set: "vpp-3n-tsh-prev-iter-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-3n-tsh-curr-iter-best"
+  comparisons:
+    - title: "2106.0-8 vs 2106.0-7"
+      reference: 2
+      compare: 3
+    - title: "2110.0-8 vs 2106.0-8"
+      reference: 3
+      compare: 4
+  legend:
+    - ''
+    - 'Test Case:            Test cases executed for: PDR throughput on 3n-tsh with x520.'
+    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "7" for CSIT rls2106, "8" for CSIT rls2110).'
+    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - '2106.0-8 vs 2106.0-7: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2110.0-8 vs 2106.0-8: Compares VPP code current vs previous in the current CSIT environment.'
+
+# VPP Latency Changes 3n-tsh 1t1c
+- type: "table"
+  title: "VPP Latency Changes 3n-tsh 1t1c PDR90-direction1-max"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/latency-changes-3n-tsh-x520-1t1c-pdr90-d1-max"
+  include-tests: "latency-PDR90-direction1-max"
+  filter: "'1T1C' and 'NDRPDR'"
+  columns:
+    - title: "2101.0-7"
+      data-set: "vpp-3n-tsh-hist-iter-new-env"
+    - title: "2106.0-7"
+      data-set: "vpp-3n-tsh-prev-iter-old-env"
+    - title: "2106.0-8"
+      data-set: "vpp-3n-tsh-prev-iter-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-3n-tsh-curr-iter-best"
+  comparisons:
+    - title: "2106.0-8 vs 2106.0-7"
+      reference: 2
+      compare: 3
+    - title: "2110.0-8 vs 2106.0-8"
+      reference: 3
+      compare: 4
+  legend:
+    - ''
+    - 'Test Case:            Test cases executed for: PDR throughput on 3n-tsh with x520.'
+    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "7" for CSIT rls2106, "8" for CSIT rls2110).'
+    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - '2106.0-8 vs 2106.0-7: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2110.0-8 vs 2106.0-8: Compares VPP code current vs previous in the current CSIT environment.'
+
 # VPP Soak vs NDR - 2n-skx
 - type: "table"
   title: "VPP Soak vs NDR 2n-skx"
@@ -12,7 +1158,7 @@
     data: "vpp-soak-vs-ndr-2n-skx-ref"
   compare:
     title: "Soak"
-    data: "vpp-soak-vs-ndr-2n-skx-cmp"
+    data: "vpp-2n-skx-curr-soak"
   data: "vpp-soak-vs-ndr-2n-skx"
   include-tests: "NDR"
   filter: "('NDRPDR' or 'SOAK') and not 'NF_DENSITY'"
@@ -31,7 +1177,7 @@
     data: "vpp-soak-vs-ndr-2n-clx-ref"
   compare:
     title: "Soak"
-    data: "vpp-soak-vs-ndr-2n-clx-cmp"
+    data: "vpp-2n-clx-curr-soak"
   data: "vpp-soak-vs-ndr-2n-clx"
   include-tests: "NDR"
   filter: "('NDRPDR' or 'SOAK') and not 'NF_DENSITY'"
@@ -51,10 +1197,10 @@
   filter: "'2T1C' and 'NDRPDR' and not 'NF_DENSITY'"
   columns:
     - title: "x710"
-      data-set: "vpp-nic-comparison-3n-skx"
+      data-set: "vpp-3n-skx-curr-iter"
       tag: "NIC_Intel-X710"
     - title: "xxv710"
-      data-set: "vpp-nic-comparison-3n-skx"
+      data-set: "vpp-3n-skx-curr-iter"
       tag: "NIC_Intel-XXV710"
   comparisons:
     - title: "Diff"
@@ -74,10 +1220,10 @@
   filter: "'4T2C' and 'NDRPDR' and not 'NF_DENSITY'"
   columns:
     - title: "x710"
-      data-set: "vpp-nic-comparison-3n-skx"
+      data-set: "vpp-3n-skx-curr-iter"
       tag: "NIC_Intel-X710"
     - title: "xxv710"
-      data-set: "vpp-nic-comparison-3n-skx"
+      data-set: "vpp-3n-skx-curr-iter"
       tag: "NIC_Intel-XXV710"
   comparisons:
     - title: "Diff"
@@ -97,10 +1243,10 @@
   filter: "'2T1C' and 'NDRPDR' and not 'NF_DENSITY'"
   columns:
     - title: "x710"
-      data-set: "vpp-nic-comparison-3n-skx"
+      data-set: "vpp-3n-skx-curr-iter"
       tag: "NIC_Intel-X710"
     - title: "xxv710"
-      data-set: "vpp-nic-comparison-3n-skx"
+      data-set: "vpp-3n-skx-curr-iter"
       tag: "NIC_Intel-XXV710"
   comparisons:
     - title: "Diff"
@@ -120,10 +1266,10 @@
   filter: "'4T2C' and 'NDRPDR' and not 'NF_DENSITY'"
   columns:
     - title: "x710"
-      data-set: "vpp-nic-comparison-3n-skx"
+      data-set: "vpp-3n-skx-curr-iter"
       tag: "NIC_Intel-X710"
     - title: "xxv710"
-      data-set: "vpp-nic-comparison-3n-skx"
+      data-set: "vpp-3n-skx-curr-iter"
       tag: "NIC_Intel-XXV710"
   comparisons:
     - title: "Diff"
@@ -143,10 +1289,10 @@
   filter: "'2T1C' and 'MRR' and not 'NF_DENSITY'"
   columns:
     - title: "x710"
-      data-set: "vpp-nic-comparison-3n-skx-mrr"
+      data-set: "vpp-3n-skx-curr-iter-mrr"
       tag: "NIC_Intel-X710"
     - title: "xxv710"
-      data-set: "vpp-nic-comparison-3n-skx-mrr"
+      data-set: "vpp-3n-skx-curr-iter-mrr"
       tag: "NIC_Intel-XXV710"
   comparisons:
     - title: "Diff"
@@ -166,10 +1312,10 @@
   filter: "'4T2C' and 'MRR' and not 'NF_DENSITY'"
   columns:
     - title: "x710"
-      data-set: "vpp-nic-comparison-3n-skx-mrr"
+      data-set: "vpp-3n-skx-curr-iter-mrr"
       tag: "NIC_Intel-X710"
     - title: "xxv710"
-      data-set: "vpp-nic-comparison-3n-skx-mrr"
+      data-set: "vpp-3n-skx-curr-iter-mrr"
       tag: "NIC_Intel-XXV710"
   comparisons:
     - title: "Diff"
@@ -189,10 +1335,10 @@
   filter: "'8T4C' and 'MRR' and not 'NF_DENSITY'"
   columns:
     - title: "x710"
-      data-set: "vpp-nic-comparison-3n-skx-mrr"
+      data-set: "vpp-3n-skx-curr-iter-mrr"
       tag: "NIC_Intel-X710"
     - title: "xxv710"
-      data-set: "vpp-nic-comparison-3n-skx-mrr"
+      data-set: "vpp-3n-skx-curr-iter-mrr"
       tag: "NIC_Intel-XXV710"
   comparisons:
     - title: "Diff"
@@ -212,10 +1358,10 @@
   filter: "'2T1C' and 'NDRPDR' and not 'NF_DENSITY'"
   columns:
     - title: "x710"
-      data-set: "vpp-nic-comparison-2n-skx"
+      data-set: "vpp-2n-skx-curr-iter"
       tag: "NIC_Intel-X710"
     - title: "xxv710"
-      data-set: "vpp-nic-comparison-2n-skx"
+      data-set: "vpp-2n-skx-curr-iter"
       tag: "NIC_Intel-XXV710"
   comparisons:
     - title: "Diff"
@@ -235,10 +1381,10 @@
   filter: "'4T2C' and 'NDRPDR' and not 'NF_DENSITY'"
   columns:
     - title: "x710"
-      data-set: "vpp-nic-comparison-2n-skx"
+      data-set: "vpp-2n-skx-curr-iter"
       tag: "NIC_Intel-X710"
     - title: "xxv710"
-      data-set: "vpp-nic-comparison-2n-skx"
+      data-set: "vpp-2n-skx-curr-iter"
       tag: "NIC_Intel-XXV710"
   comparisons:
     - title: "Diff"
@@ -258,10 +1404,10 @@
   filter: "'2T1C' and 'NDRPDR' and not 'NF_DENSITY'"
   columns:
     - title: "x710"
-      data-set: "vpp-nic-comparison-2n-skx"
+      data-set: "vpp-2n-skx-curr-iter"
       tag: "NIC_Intel-X710"
     - title: "xxv710"
-      data-set: "vpp-nic-comparison-2n-skx"
+      data-set: "vpp-2n-skx-curr-iter"
       tag: "NIC_Intel-XXV710"
   comparisons:
     - title: "Diff"
@@ -281,10 +1427,10 @@
   filter: "'4T2C' and 'NDRPDR' and not 'NF_DENSITY'"
   columns:
     - title: "x710"
-      data-set: "vpp-nic-comparison-2n-skx"
+      data-set: "vpp-2n-skx-curr-iter"
       tag: "NIC_Intel-X710"
     - title: "xxv710"
-      data-set: "vpp-nic-comparison-2n-skx"
+      data-set: "vpp-2n-skx-curr-iter"
       tag: "NIC_Intel-XXV710"
   comparisons:
     - title: "Diff"
@@ -304,10 +1450,10 @@
   filter: "'2T1C' and 'MRR' and not 'NF_DENSITY'"
   columns:
     - title: "x710"
-      data-set: "vpp-nic-comparison-2n-skx-mrr"
+      data-set: "vpp-2n-skx-curr-iter-mrr"
       tag: "NIC_Intel-X710"
     - title: "xxv710"
-      data-set: "vpp-nic-comparison-2n-skx-mrr"
+      data-set: "vpp-2n-skx-curr-iter-mrr"
       tag: "NIC_Intel-XXV710"
   comparisons:
     - title: "Diff"
@@ -327,10 +1473,10 @@
   filter: "'4T2C' and 'MRR' and not 'NF_DENSITY'"
   columns:
     - title: "x710"
-      data-set: "vpp-nic-comparison-2n-skx-mrr"
+      data-set: "vpp-2n-skx-curr-iter-mrr"
       tag: "NIC_Intel-X710"
     - title: "xxv710"
-      data-set: "vpp-nic-comparison-2n-skx-mrr"
+      data-set: "vpp-2n-skx-curr-iter-mrr"
       tag: "NIC_Intel-XXV710"
   comparisons:
     - title: "Diff"
@@ -350,10 +1496,10 @@
   filter: "'8T4C' and 'MRR' and not 'NF_DENSITY'"
   columns:
     - title: "x710"
-      data-set: "vpp-nic-comparison-2n-skx-mrr"
+      data-set: "vpp-2n-skx-curr-iter-mrr"
       tag: "NIC_Intel-X710"
     - title: "xxv710"
-      data-set: "vpp-nic-comparison-2n-skx-mrr"
+      data-set: "vpp-2n-skx-curr-iter-mrr"
       tag: "NIC_Intel-XXV710"
   comparisons:
     - title: "Diff"
@@ -367,138 +1513,6 @@
 ################################################################################
 # VPP
 
-# VPP Performance Changes 3n-hsw 1t1c pdr
-- type: "table"
-  title: "VPP Performance Changes 3n-hsw 1t1c pdr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-1t1c-pdr"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'1T1C' and 'NDRPDR' and 'NIC_Intel-XL710' and not 'NF_DENSITY'"
-  columns:
-    - title: "2005.0-5"
-      data-set: "vpp-performance-changes-3n-hsw-h1"
-    - title: "2009.0-5"
-      data-set: "vpp-performance-changes-3n-hsw-ref-env-old"
-    - title: "2009.0-6"
-      data-set: "vpp-performance-changes-3n-hsw-ref-env-new"
-    - title: "2101.0-6"
-      data-set: "vpp-performance-changes-3n-hsw-cmp"
-  comparisons:
-    - title: "2009.0-6 vs 2009.0-5"
-      reference: 2
-      compare: 3
-#      rca-file: "rca/rca-3n-hsw-1t1c-pdr-rca1.yaml"
-    - title: "2101.0-6 vs 2009.0-6"
-      reference: 3
-      compare: 4
-#      rca-file: "rca/rca-3n-hsw-1t1c-pdr-rca2.yaml"
-  legend:
-    - ''
-    - 'Test Case:            Test cases executed for: PDR throughput on 3n-hsw with xl710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
-    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
-
-# VPP Performance Changes 3n-hsw 2t2c pdr
-- type: "table"
-  title: "VPP Performance Changes 3n-hsw 2t2c pdr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-2t2c-pdr"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T2C' and 'NDRPDR' and 'NIC_Intel-XL710' and not 'NF_DENSITY'"
-  columns:
-    - title: "2005.0-5"
-      data-set: "vpp-performance-changes-3n-hsw-h1"
-    - title: "2009.0-5"
-      data-set: "vpp-performance-changes-3n-hsw-ref-env-old"
-    - title: "2009.0-6"
-      data-set: "vpp-performance-changes-3n-hsw-ref-env-new"
-    - title: "2101.0-6"
-      data-set: "vpp-performance-changes-3n-hsw-cmp"
-  comparisons:
-    - title: "2009.0-6 vs 2009.0-5"
-      reference: 2
-      compare: 3
-#      rca-file: "rca/rca-3n-hsw-2t2c-pdr-rca1.yaml"
-    - title: "2101.0-6 vs 2009.0-6"
-      reference: 3
-      compare: 4
-#      rca-file: "rca/rca-3n-hsw-2t2c-pdr-rca2.yaml"
-  legend:
-    - ''
-    - 'Test Case:            Test cases executed for: PDR throughput on 3n-hsw with xl710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
-    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
-
-# VPP Performance Changes 3n-hsw 1t1c ndr
-- type: "table"
-  title: "VPP Performance Changes 3n-hsw 1t1c ndr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-1t1c-ndr"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'1T1C' and 'NDRPDR' and 'NIC_Intel-XL710' and not 'NF_DENSITY'"
-  columns:
-    - title: "2005.0-5"
-      data-set: "vpp-performance-changes-3n-hsw-h1"
-    - title: "2009.0-5"
-      data-set: "vpp-performance-changes-3n-hsw-ref-env-old"
-    - title: "2009.0-6"
-      data-set: "vpp-performance-changes-3n-hsw-ref-env-new"
-    - title: "2101.0-6"
-      data-set: "vpp-performance-changes-3n-hsw-cmp"
-  comparisons:
-    - title: "2009.0-6 vs 2009.0-5"
-      reference: 2
-      compare: 3
-#      rca-file: "rca/rca-3n-hsw-1t1c-ndr-rca1.yaml"
-    - title: "2101.0-6 vs 2009.0-6"
-      reference: 3
-      compare: 4
-#      rca-file: "rca/rca-3n-hsw-1t1c-ndr-rca2.yaml"
-  legend:
-    - ''
-    - 'Test Case:            Test cases executed for: NDR throughput on 3n-hsw with xl710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
-    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
-
-# VPP Performance Changes 3n-hsw 2t2c ndr
-- type: "table"
-  title: "VPP Performance Changes 3n-hsw 2t2c ndr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-2t2c-ndr"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T2C' and 'NDRPDR' and 'NIC_Intel-XL710' and not 'NF_DENSITY'"
-  columns:
-    - title: "2005.0-5"
-      data-set: "vpp-performance-changes-3n-hsw-h1"
-    - title: "2009.0-5"
-      data-set: "vpp-performance-changes-3n-hsw-ref-env-old"
-    - title: "2009.0-6"
-      data-set: "vpp-performance-changes-3n-hsw-ref-env-new"
-    - title: "2101.0-6"
-      data-set: "vpp-performance-changes-3n-hsw-cmp"
-  comparisons:
-    - title: "2009.0-6 vs 2009.0-5"
-      reference: 2
-      compare: 3
-#      rca-file: "rca/rca-3n-hsw-2t2c-ndr-rca1.yaml"
-    - title: "2101.0-6 vs 2009.0-6"
-      reference: 3
-      compare: 4
-#      rca-file: "rca/rca-3n-hsw-2t2c-ndr-rca2.yaml"
-  legend:
-    - ''
-    - 'Test Case:            Test cases executed for: NDR throughput on 3n-hsw with xl710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
-    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
-
 # VPP Performance Changes 3n-skx 2t1c pdr
 - type: "table"
   title: "VPP Performance Changes 3n-skx 2t1c pdr"
@@ -507,30 +1521,28 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2005.0-5"
-      data-set: "vpp-performance-changes-3n-skx-h1"
-    - title: "2009.0-5"
-      data-set: "vpp-performance-changes-3n-skx-ref-env-old"
-    - title: "2009.0-6"
-      data-set: "vpp-performance-changes-3n-skx-ref-env-new"
-    - title: "2101.0-6"
-      data-set: "vpp-performance-changes-3n-skx-cmp"
+    - title: "2101.0-7"
+      data-set: "vpp-3n-skx-hist-iter-new-env"
+    - title: "2106.0-7"
+      data-set: "vpp-3n-skx-prev-iter-old-env"
+    - title: "2106.0-8"
+      data-set: "vpp-3n-skx-prev-iter-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-3n-skx-curr-iter"
   comparisons:
-    - title: "2009.0-6 vs 2009.0-5"
+    - title: "2106.0-8 vs 2106.0-7"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-3n-skx-2t1c-pdr-rca1.yaml"
-    - title: "2101.0-6 vs 2009.0-6"
+    - title: "2110.0-8 vs 2106.0-8"
       reference: 3
       compare: 4
-#      rca-file: "rca/rca-3n-skx-2t1c-pdr-rca2.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: PDR throughput on 3n-skx with xxv710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "7" for CSIT rls2106, "8" for CSIT rls2110).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2106.0-8 vs 2106.0-7: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2110.0-8 vs 2106.0-8: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-skx 4t2c pdr
 - type: "table"
@@ -540,30 +1552,28 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2005.0-5"
-      data-set: "vpp-performance-changes-3n-skx-h1"
-    - title: "2009.0-5"
-      data-set: "vpp-performance-changes-3n-skx-ref-env-old"
-    - title: "2009.0-6"
-      data-set: "vpp-performance-changes-3n-skx-ref-env-new"
-    - title: "2101.0-6"
-      data-set: "vpp-performance-changes-3n-skx-cmp"
+    - title: "2101.0-7"
+      data-set: "vpp-3n-skx-hist-iter-new-env"
+    - title: "2106.0-7"
+      data-set: "vpp-3n-skx-prev-iter-old-env"
+    - title: "2106.0-8"
+      data-set: "vpp-3n-skx-prev-iter-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-3n-skx-curr-iter"
   comparisons:
-    - title: "2009.0-6 vs 2009.0-5"
+    - title: "2106.0-8 vs 2106.0-7"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-3n-skx-4t2c-pdr-rca1.yaml"
-    - title: "2101.0-6 vs 2009.0-6"
+    - title: "2110.0-8 vs 2106.0-8"
       reference: 3
       compare: 4
-#      rca-file: "rca/rca-3n-skx-4t2c-pdr-rca2.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: PDR throughput on 3n-skx with xxv710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "7" for CSIT rls2106, "8" for CSIT rls2110).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2106.0-8 vs 2106.0-7: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2110.0-8 vs 2106.0-8: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-skx 2t1c ndr
 - type: "table"
@@ -573,30 +1583,28 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2005.0-5"
-      data-set: "vpp-performance-changes-3n-skx-h1"
-    - title: "2009.0-5"
-      data-set: "vpp-performance-changes-3n-skx-ref-env-old"
-    - title: "2009.0-6"
-      data-set: "vpp-performance-changes-3n-skx-ref-env-new"
-    - title: "2101.0-6"
-      data-set: "vpp-performance-changes-3n-skx-cmp"
+    - title: "2101.0-7"
+      data-set: "vpp-3n-skx-hist-iter-new-env"
+    - title: "2106.0-7"
+      data-set: "vpp-3n-skx-prev-iter-old-env"
+    - title: "2106.0-8"
+      data-set: "vpp-3n-skx-prev-iter-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-3n-skx-curr-iter"
   comparisons:
-    - title: "2009.0-6 vs 2009.0-5"
+    - title: "2106.0-8 vs 2106.0-7"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-3n-skx-2t1c-ndr-rca1.yaml"
-    - title: "2101.0-6 vs 2009.0-6"
+    - title: "2110.0-8 vs 2106.0-8"
       reference: 3
       compare: 4
-#      rca-file: "rca/rca-3n-skx-2t1c-ndr-rca2.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: NDR throughput on 3n-skx with xxv710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "7" for CSIT rls2106, "8" for CSIT rls2110).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2106.0-8 vs 2106.0-7: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2110.0-8 vs 2106.0-8: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-skx 4t2c ndr
 - type: "table"
@@ -606,30 +1614,28 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2005.0-5"
-      data-set: "vpp-performance-changes-3n-skx-h1"
-    - title: "2009.0-5"
-      data-set: "vpp-performance-changes-3n-skx-ref-env-old"
-    - title: "2009.0-6"
-      data-set: "vpp-performance-changes-3n-skx-ref-env-new"
-    - title: "2101.0-6"
-      data-set: "vpp-performance-changes-3n-skx-cmp"
+    - title: "2101.0-7"
+      data-set: "vpp-3n-skx-hist-iter-new-env"
+    - title: "2106.0-7"
+      data-set: "vpp-3n-skx-prev-iter-old-env"
+    - title: "2106.0-8"
+      data-set: "vpp-3n-skx-prev-iter-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-3n-skx-curr-iter"
   comparisons:
-    - title: "2009.0-6 vs 2009.0-5"
+    - title: "2106.0-8 vs 2106.0-7"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-3n-skx-4t2c-ndr-rca1.yaml"
-    - title: "2101.0-6 vs 2009.0-6"
+    - title: "2110.0-8 vs 2106.0-8"
       reference: 3
       compare: 4
-#      rca-file: "rca/rca-3n-skx-4t2c-ndr-rca2.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: NDR throughput on 3n-skx with xxv710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "7" for CSIT rls2106, "8" for CSIT rls2110).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2106.0-8 vs 2106.0-7: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2110.0-8 vs 2106.0-8: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-skx 2t1c pdr
 - type: "table"
@@ -639,30 +1645,28 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2005.0-5"
-      data-set: "vpp-performance-changes-2n-skx-h1"
-    - title: "2009.0-5"
-      data-set: "vpp-performance-changes-2n-skx-ref-env-old"
-    - title: "2009.0-6"
-      data-set: "vpp-performance-changes-2n-skx-ref-env-new"
-    - title: "2101.0-6"
-      data-set: "vpp-performance-changes-2n-skx-cmp"
+    - title: "2101.0-7"
+      data-set: "vpp-2n-skx-hist-iter-new-env"
+    - title: "2106.0-7"
+      data-set: "vpp-2n-skx-prev-iter-old-env"
+    - title: "2106.0-8"
+      data-set: "vpp-2n-skx-prev-iter-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-2n-skx-curr-iter"
   comparisons:
-    - title: "2009.0-6 vs 2009.0-5"
+    - title: "2106.0-8 vs 2106.0-7"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-2n-skx-2t1c-pdr-rca1.yaml"
-    - title: "2101.0-6 vs 2009.0-6"
+    - title: "2110.0-8 vs 2106.0-8"
       reference: 3
       compare: 4
-#      rca-file: "rca/rca-2n-skx-2t1c-pdr-rca2.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: PDR throughput on 2n-skx with xxv710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "7" for CSIT rls2106, "8" for CSIT rls2110).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2106.0-8 vs 2106.0-7: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2110.0-8 vs 2106.0-8: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-skx 4t2c pdr
 - type: "table"
@@ -672,30 +1676,28 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2005.0-5"
-      data-set: "vpp-performance-changes-2n-skx-h1"
-    - title: "2009.0-5"
-      data-set: "vpp-performance-changes-2n-skx-ref-env-old"
-    - title: "2009.0-6"
-      data-set: "vpp-performance-changes-2n-skx-ref-env-new"
-    - title: "2101.0-6"
-      data-set: "vpp-performance-changes-2n-skx-cmp"
+    - title: "2101.0-7"
+      data-set: "vpp-2n-skx-hist-iter-new-env"
+    - title: "2106.0-7"
+      data-set: "vpp-2n-skx-prev-iter-old-env"
+    - title: "2106.0-8"
+      data-set: "vpp-2n-skx-prev-iter-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-2n-skx-curr-iter"
   comparisons:
-    - title: "2009.0-6 vs 2009.0-5"
+    - title: "2106.0-8 vs 2106.0-7"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-2n-skx-4t2c-pdr-rca1.yaml"
-    - title: "2101.0-6 vs 2009.0-6"
+    - title: "2110.0-8 vs 2106.0-8"
       reference: 3
       compare: 4
-#      rca-file: "rca/rca-2n-skx-4t2c-pdr-rca2.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: PDR throughput on 2n-skx with xxv710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "7" for CSIT rls2106, "8" for CSIT rls2110).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2106.0-8 vs 2106.0-7: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2110.0-8 vs 2106.0-8: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-skx 2t1c ndr
 - type: "table"
@@ -705,30 +1707,28 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2005.0-5"
-      data-set: "vpp-performance-changes-2n-skx-h1"
-    - title: "2009.0-5"
-      data-set: "vpp-performance-changes-2n-skx-ref-env-old"
-    - title: "2009.0-6"
-      data-set: "vpp-performance-changes-2n-skx-ref-env-new"
-    - title: "2101.0-6"
-      data-set: "vpp-performance-changes-2n-skx-cmp"
+    - title: "2101.0-7"
+      data-set: "vpp-2n-skx-hist-iter-new-env"
+    - title: "2106.0-7"
+      data-set: "vpp-2n-skx-prev-iter-old-env"
+    - title: "2106.0-8"
+      data-set: "vpp-2n-skx-prev-iter-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-2n-skx-curr-iter"
   comparisons:
-    - title: "2009.0-6 vs 2009.0-5"
+    - title: "2106.0-8 vs 2106.0-7"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-2n-skx-2t1c-ndr-rca1.yaml"
-    - title: "2101.0-6 vs 2009.0-6"
+    - title: "2110.0-8 vs 2106.0-8"
       reference: 3
       compare: 4
-#      rca-file: "rca/rca-2n-skx-2t1c-ndr-rca2.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: NDR throughput on 2n-skx with xxv710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "7" for CSIT rls2106, "8" for CSIT rls2110).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2106.0-8 vs 2106.0-7: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2110.0-8 vs 2106.0-8: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-skx 4t2c ndr
 - type: "table"
@@ -738,30 +1738,28 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2005.0-5"
-      data-set: "vpp-performance-changes-2n-skx-h1"
-    - title: "2009.0-5"
-      data-set: "vpp-performance-changes-2n-skx-ref-env-old"
-    - title: "2009.0-6"
-      data-set: "vpp-performance-changes-2n-skx-ref-env-new"
-    - title: "2101.0-6"
-      data-set: "vpp-performance-changes-2n-skx-cmp"
+    - title: "2101.0-7"
+      data-set: "vpp-2n-skx-hist-iter-new-env"
+    - title: "2106.0-7"
+      data-set: "vpp-2n-skx-prev-iter-old-env"
+    - title: "2106.0-8"
+      data-set: "vpp-2n-skx-prev-iter-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-2n-skx-curr-iter"
   comparisons:
-    - title: "2009.0-6 vs 2009.0-5"
+    - title: "2106.0-8 vs 2106.0-7"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-2n-skx-4t2c-ndr-rca1.yaml"
-    - title: "2101.0-6 vs 2009.0-6"
+    - title: "2110.0-8 vs 2106.0-8"
       reference: 3
       compare: 4
-#      rca-file: "rca/rca-2n-skx-4t2c-ndr-rca2.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: NDR throughput on 2n-skx with xxv710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "7" for CSIT rls2106, "8" for CSIT rls2110).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2106.0-8 vs 2106.0-7: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2110.0-8 vs 2106.0-8: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-xxv710 2t1c pdr
 - type: "table"
@@ -771,30 +1769,28 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2005.0-5"
-      data-set: "vpp-performance-changes-2n-clx-h1"
-    - title: "2009.0-5"
-      data-set: "vpp-performance-changes-2n-clx-ref-env-old"
-    - title: "2009.0-6"
-      data-set: "vpp-performance-changes-2n-clx-ref-env-new"
-    - title: "2101.0-6"
-      data-set: "vpp-performance-changes-2n-clx-cmp"
+    - title: "2101.0-7"
+      data-set: "vpp-2n-clx-hist-iter-new-env"
+    - title: "2106.0-7"
+      data-set: "vpp-2n-clx-prev-iter-old-env"
+    - title: "2106.0-8"
+      data-set: "vpp-2n-clx-prev-iter-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-2n-clx-curr-iter"
   comparisons:
-    - title: "2009.0-6 vs 2009.0-5"
+    - title: "2106.0-8 vs 2106.0-7"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-2n-clx-2t1c-pdr-rca1.yaml"
-    - title: "2101.0-6 vs 2009.0-6"
+    - title: "2110.0-8 vs 2106.0-8"
       reference: 3
       compare: 4
-#      rca-file: "rca/rca-2n-clx-2t1c-pdr-rca1.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: PDR throughput on 2n-clx with xxv710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "7" for CSIT rls2106, "8" for CSIT rls2110).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2106.0-8 vs 2106.0-7: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2110.0-8 vs 2106.0-8: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-xxv710 4t2c pdr
 - type: "table"
@@ -804,30 +1800,28 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2005.0-5"
-      data-set: "vpp-performance-changes-2n-clx-h1"
-    - title: "2009.0-5"
-      data-set: "vpp-performance-changes-2n-clx-ref-env-old"
-    - title: "2009.0-6"
-      data-set: "vpp-performance-changes-2n-clx-ref-env-new"
-    - title: "2101.0-6"
-      data-set: "vpp-performance-changes-2n-clx-cmp"
+    - title: "2101.0-7"
+      data-set: "vpp-2n-clx-hist-iter-new-env"
+    - title: "2106.0-7"
+      data-set: "vpp-2n-clx-prev-iter-old-env"
+    - title: "2106.0-8"
+      data-set: "vpp-2n-clx-prev-iter-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-2n-clx-curr-iter"
   comparisons:
-    - title: "2009.0-6 vs 2009.0-5"
+    - title: "2106.0-8 vs 2106.0-7"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-2n-clx-4t2c-pdr-rca1.yaml"
-    - title: "2101.0-6 vs 2009.0-6"
+    - title: "2110.0-8 vs 2106.0-8"
       reference: 3
       compare: 4
-#      rca-file: "rca/rca-2n-clx-4t2c-pdr-rca1.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: PDR throughput on 2n-clx with xxv710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "7" for CSIT rls2106, "8" for CSIT rls2110).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2106.0-8 vs 2106.0-7: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2110.0-8 vs 2106.0-8: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-xxv710 2t1c ndr
 - type: "table"
@@ -837,30 +1831,28 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2005.0-5"
-      data-set: "vpp-performance-changes-2n-clx-h1"
-    - title: "2009.0-5"
-      data-set: "vpp-performance-changes-2n-clx-ref-env-old"
-    - title: "2009.0-6"
-      data-set: "vpp-performance-changes-2n-clx-ref-env-new"
-    - title: "2101.0-6"
-      data-set: "vpp-performance-changes-2n-clx-cmp"
+    - title: "2101.0-7"
+      data-set: "vpp-2n-clx-hist-iter-new-env"
+    - title: "2106.0-7"
+      data-set: "vpp-2n-clx-prev-iter-old-env"
+    - title: "2106.0-8"
+      data-set: "vpp-2n-clx-prev-iter-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-2n-clx-curr-iter"
   comparisons:
-    - title: "2009.0-6 vs 2009.0-5"
+    - title: "2106.0-8 vs 2106.0-7"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-2n-clx-2t1c-ndr-rca1.yaml"
-    - title: "2101.0-6 vs 2009.0-6"
+    - title: "2110.0-8 vs 2106.0-8"
       reference: 3
       compare: 4
-#      rca-file: "rca/rca-2n-clx-2t1c-ndr-rca1.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: NDR throughput on 2n-clx with xxv710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "7" for CSIT rls2106, "8" for CSIT rls2110).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2106.0-8 vs 2106.0-7: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2110.0-8 vs 2106.0-8: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-xxv710 4t2c ndr
 - type: "table"
@@ -870,30 +1862,28 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2005.0-5"
-      data-set: "vpp-performance-changes-2n-clx-h1"
-    - title: "2009.0-5"
-      data-set: "vpp-performance-changes-2n-clx-ref-env-old"
-    - title: "2009.0-6"
-      data-set: "vpp-performance-changes-2n-clx-ref-env-new"
-    - title: "2101.0-6"
-      data-set: "vpp-performance-changes-2n-clx-cmp"
+    - title: "2101.0-7"
+      data-set: "vpp-2n-clx-hist-iter-new-env"
+    - title: "2106.0-7"
+      data-set: "vpp-2n-clx-prev-iter-old-env"
+    - title: "2106.0-8"
+      data-set: "vpp-2n-clx-prev-iter-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-2n-clx-curr-iter"
   comparisons:
-    - title: "2009.0-6 vs 2009.0-5"
+    - title: "2106.0-8 vs 2106.0-7"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-2n-clx-4t2c-ndr-rca1.yaml"
-    - title: "2101.0-6 vs 2009.0-6"
+    - title: "2110.0-8 vs 2106.0-8"
       reference: 3
       compare: 4
-#      rca-file: "rca/rca-2n-clx-4t2c-ndr-rca1.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: NDR throughput on 2n-clx with xxv710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "7" for CSIT rls2106, "8" for CSIT rls2110).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2106.0-8 vs 2106.0-7: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2110.0-8 vs 2106.0-8: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-cx556a 2t1c pdr
 - type: "table"
@@ -903,30 +1893,28 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Mellanox-CX556A' and not 'NF_DENSITY'"
   columns:
-    - title: "2005.0-5"
-      data-set: "vpp-performance-changes-2n-clx-h1"
-    - title: "2009.0-5"
-      data-set: "vpp-performance-changes-2n-clx-ref-env-old"
-    - title: "2009.0-6"
-      data-set: "vpp-performance-changes-2n-clx-ref-env-new"
-    - title: "2101.0-6"
-      data-set: "vpp-performance-changes-2n-clx-cmp"
+    - title: "2101.0-7"
+      data-set: "vpp-2n-clx-hist-iter-new-env"
+    - title: "2106.0-7"
+      data-set: "vpp-2n-clx-prev-iter-old-env"
+    - title: "2106.0-8"
+      data-set: "vpp-2n-clx-prev-iter-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-2n-clx-curr-iter"
   comparisons:
-    - title: "2009.0-6 vs 2009.0-5"
+    - title: "2106.0-8 vs 2106.0-7"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-2n-clx-2t1c-pdr-rca2.yaml"
-    - title: "2101.0-6 vs 2009.0-6"
+    - title: "2110.0-8 vs 2106.0-8"
       reference: 3
       compare: 4
-#      rca-file: "rca/rca-2n-clx-2t1c-pdr-rca2.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: PDR throughput on 2n-clx with cx556a.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "7" for CSIT rls2106, "8" for CSIT rls2110).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2106.0-8 vs 2106.0-7: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2110.0-8 vs 2106.0-8: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-cx556a 4t2c pdr
 - type: "table"
@@ -936,30 +1924,28 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Mellanox-CX556A' and not 'NF_DENSITY'"
   columns:
-    - title: "2005.0-5"
-      data-set: "vpp-performance-changes-2n-clx-h1"
-    - title: "2009.0-5"
-      data-set: "vpp-performance-changes-2n-clx-ref-env-old"
-    - title: "2009.0-6"
-      data-set: "vpp-performance-changes-2n-clx-ref-env-new"
-    - title: "2101.0-6"
-      data-set: "vpp-performance-changes-2n-clx-cmp"
+    - title: "2101.0-7"
+      data-set: "vpp-2n-clx-hist-iter-new-env"
+    - title: "2106.0-7"
+      data-set: "vpp-2n-clx-prev-iter-old-env"
+    - title: "2106.0-8"
+      data-set: "vpp-2n-clx-prev-iter-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-2n-clx-curr-iter"
   comparisons:
-    - title: "2009.0-6 vs 2009.0-5"
+    - title: "2106.0-8 vs 2106.0-7"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-2n-clx-4t2c-pdr-rca2.yaml"
-    - title: "2101.0-6 vs 2009.0-6"
+    - title: "2110.0-8 vs 2106.0-8"
       reference: 3
       compare: 4
-#      rca-file: "rca/rca-2n-clx-4t2c-pdr-rca2.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: PDR throughput on 2n-clx with cx556a.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "7" for CSIT rls2106, "8" for CSIT rls2110).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2106.0-8 vs 2106.0-7: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2110.0-8 vs 2106.0-8: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-cx556a 2t1c ndr
 - type: "table"
@@ -969,30 +1955,28 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Mellanox-CX556A' and not 'NF_DENSITY'"
   columns:
-    - title: "2005.0-5"
-      data-set: "vpp-performance-changes-2n-clx-h1"
-    - title: "2009.0-5"
-      data-set: "vpp-performance-changes-2n-clx-ref-env-old"
-    - title: "2009.0-6"
-      data-set: "vpp-performance-changes-2n-clx-ref-env-new"
-    - title: "2101.0-6"
-      data-set: "vpp-performance-changes-2n-clx-cmp"
+    - title: "2101.0-7"
+      data-set: "vpp-2n-clx-hist-iter-new-env"
+    - title: "2106.0-7"
+      data-set: "vpp-2n-clx-prev-iter-old-env"
+    - title: "2106.0-8"
+      data-set: "vpp-2n-clx-prev-iter-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-2n-clx-curr-iter"
   comparisons:
-    - title: "2009.0-6 vs 2009.0-5"
+    - title: "2106.0-8 vs 2106.0-7"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-2n-clx-2t1c-ndr-rca2.yaml"
-    - title: "2101.0-6 vs 2009.0-6"
+    - title: "2110.0-8 vs 2106.0-8"
       reference: 3
       compare: 4
-#      rca-file: "rca/rca-2n-clx-2t1c-ndr-rca2.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: NDR throughput on 2n-clx with cx556a.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "7" for CSIT rls2106, "8" for CSIT rls2110).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2106.0-8 vs 2106.0-7: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2110.0-8 vs 2106.0-8: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-cx556a 4t2c ndr
 - type: "table"
@@ -1002,30 +1986,28 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Mellanox-CX556A' and not 'NF_DENSITY'"
   columns:
-    - title: "2005.0-5"
-      data-set: "vpp-performance-changes-2n-clx-h1"
-    - title: "2009.0-5"
-      data-set: "vpp-performance-changes-2n-clx-ref-env-old"
-    - title: "2009.0-6"
-      data-set: "vpp-performance-changes-2n-clx-ref-env-new"
-    - title: "2101.0-6"
-      data-set: "vpp-performance-changes-2n-clx-cmp"
+    - title: "2101.0-7"
+      data-set: "vpp-2n-clx-hist-iter-new-env"
+    - title: "2106.0-7"
+      data-set: "vpp-2n-clx-prev-iter-old-env"
+    - title: "2106.0-8"
+      data-set: "vpp-2n-clx-prev-iter-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-2n-clx-curr-iter"
   comparisons:
-    - title: "2009.0-6 vs 2009.0-5"
+    - title: "2106.0-8 vs 2106.0-7"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-2n-clx-4t2c-ndr-rca2.yaml"
-    - title: "2101.0-6 vs 2009.0-6"
+    - title: "2110.0-8 vs 2106.0-8"
       reference: 3
       compare: 4
-#      rca-file: "rca/rca-2n-clx-4t2c-ndr-rca2.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: NDR throughput on 2n-clx with cx556a.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "7" for CSIT rls2106, "8" for CSIT rls2110).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2106.0-8 vs 2106.0-7: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2110.0-8 vs 2106.0-8: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-zn2-xxv710 2t1c pdr
 - type: "table"
@@ -1035,30 +2017,28 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-#     - title: "2005.0-5"
-#       data-set: "vpp-performance-changes-2n-zn2-h1"
-    - title: "2009.0-5"
-      data-set: "vpp-performance-changes-2n-zn2-ref-env-old"
-    - title: "2009.0-6"
-      data-set: "vpp-performance-changes-2n-zn2-ref-env-new"
-    - title: "2101.0-6"
-      data-set: "vpp-performance-changes-2n-zn2-cmp"
-  comparisons:
-    - title: "2009.0-6 vs 2009.0-5"
-      reference: 1  # 2
-      compare: 2  # 3
-#      rca-file: "rca/rca-2n-zn2-2t1c-pdr-rca1.yaml"
-    - title: "2101.0-6 vs 2009.0-6"
-      reference: 2  # 3
-      compare: 3  # 4
-#      rca-file: "rca/rca-2n-zn2-2t1c-pdr-rca1.yaml"
+    - title: "2101.0-7"
+      data-set: "vpp-2n-zn2-hist-iter-new-env"
+    - title: "2106.0-7"
+      data-set: "vpp-2n-zn2-prev-iter-old-env"
+    - title: "2106.0-8"
+      data-set: "vpp-2n-zn2-prev-iter-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-2n-zn2-curr-iter"
+  comparisons:
+    - title: "2106.0-8 vs 2106.0-7"
+      reference: 2
+      compare: 3
+    - title: "2110.0-8 vs 2106.0-8"
+      reference: 3
+      compare: 4
   legend:
     - ''
     - 'Test Case:            Test cases executed for: PDR throughput on 2n-zn2 with xxv710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "7" for CSIT rls2106, "8" for CSIT rls2110).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2106.0-8 vs 2106.0-7: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2110.0-8 vs 2106.0-8: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-zn2-xxv710 4t2c pdr
 - type: "table"
@@ -1068,30 +2048,28 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-#     - title: "2005.0-5"
-#       data-set: "vpp-performance-changes-2n-zn2-h1"
-    - title: "2009.0-5"
-      data-set: "vpp-performance-changes-2n-zn2-ref-env-old"
-    - title: "2009.0-6"
-      data-set: "vpp-performance-changes-2n-zn2-ref-env-new"
-    - title: "2101.0-6"
-      data-set: "vpp-performance-changes-2n-zn2-cmp"
-  comparisons:
-    - title: "2009.0-6 vs 2009.0-5"
-      reference: 1  # 2
-      compare: 2  # 3
-#      rca-file: "rca/rca-2n-zn2-4t2c-pdr-rca1.yaml"
-    - title: "2101.0-6 vs 2009.0-6"
-      reference: 2  # 3
-      compare: 3  # 4
-#      rca-file: "rca/rca-2n-zn2-4t2c-pdr-rca1.yaml"
+    - title: "2101.0-7"
+      data-set: "vpp-2n-zn2-hist-iter-new-env"
+    - title: "2106.0-7"
+      data-set: "vpp-2n-zn2-prev-iter-old-env"
+    - title: "2106.0-8"
+      data-set: "vpp-2n-zn2-prev-iter-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-2n-zn2-curr-iter"
+  comparisons:
+    - title: "2106.0-8 vs 2106.0-7"
+      reference: 2
+      compare: 3
+    - title: "2110.0-8 vs 2106.0-8"
+      reference: 3
+      compare: 4
   legend:
     - ''
     - 'Test Case:            Test cases executed for: PDR throughput on 2n-zn2 with xxv710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "7" for CSIT rls2106, "8" for CSIT rls2110).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2106.0-8 vs 2106.0-7: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2110.0-8 vs 2106.0-8: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-zn2-xxv710 2t1c ndr
 - type: "table"
@@ -1101,30 +2079,28 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-#     - title: "2005.0-5"
-#       data-set: "vpp-performance-changes-2n-zn2-h1"
-    - title: "2009.0-5"
-      data-set: "vpp-performance-changes-2n-zn2-ref-env-old"
-    - title: "2009.0-6"
-      data-set: "vpp-performance-changes-2n-zn2-ref-env-new"
-    - title: "2101.0-6"
-      data-set: "vpp-performance-changes-2n-zn2-cmp"
-  comparisons:
-    - title: "2009.0-6 vs 2009.0-5"
-      reference: 1  # 2
-      compare: 2  # 3
-#      rca-file: "rca/rca-2n-zn2-2t1c-ndr-rca1.yaml"
-    - title: "2101.0-6 vs 2009.0-6"
-      reference: 2  # 3
-      compare: 3  # 4
-#      rca-file: "rca/rca-2n-zn2-2t1c-ndr-rca1.yaml"
+    - title: "2101.0-7"
+      data-set: "vpp-2n-zn2-hist-iter-new-env"
+    - title: "2106.0-7"
+      data-set: "vpp-2n-zn2-prev-iter-old-env"
+    - title: "2106.0-8"
+      data-set: "vpp-2n-zn2-prev-iter-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-2n-zn2-curr-iter"
+  comparisons:
+    - title: "2106.0-8 vs 2106.0-7"
+      reference: 2
+      compare: 3
+    - title: "2110.0-8 vs 2106.0-8"
+      reference: 3
+      compare: 4
   legend:
     - ''
     - 'Test Case:            Test cases executed for: NDR throughput on 2n-zn2 with xxv710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "7" for CSIT rls2106, "8" for CSIT rls2110).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2106.0-8 vs 2106.0-7: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2110.0-8 vs 2106.0-8: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-zn2-xxv710 4t2c ndr
 - type: "table"
@@ -1134,30 +2110,28 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-#     - title: "2005.0-5"
-#       data-set: "vpp-performance-changes-2n-zn2-h1"
-    - title: "2009.0-5"
-      data-set: "vpp-performance-changes-2n-zn2-ref-env-old"
-    - title: "2009.0-6"
-      data-set: "vpp-performance-changes-2n-zn2-ref-env-new"
-    - title: "2101.0-6"
-      data-set: "vpp-performance-changes-2n-zn2-cmp"
-  comparisons:
-    - title: "2009.0-6 vs 2009.0-5"
-      reference: 1  # 2
-      compare: 2  # 3
-#      rca-file: "rca/rca-2n-zn2-4t2c-ndr-rca1.yaml"
-    - title: "2101.0-6 vs 2009.0-6"
-      reference: 2  # 3
-      compare: 3  # 4
-#      rca-file: "rca/rca-2n-zn2-4t2c-ndr-rca1.yaml"
+    - title: "2101.0-7"
+      data-set: "vpp-2n-zn2-hist-iter-new-env"
+    - title: "2106.0-7"
+      data-set: "vpp-2n-zn2-prev-iter-old-env"
+    - title: "2106.0-8"
+      data-set: "vpp-2n-zn2-prev-iter-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-2n-zn2-curr-iter"
+  comparisons:
+    - title: "2106.0-8 vs 2106.0-7"
+      reference: 2
+      compare: 3
+    - title: "2110.0-8 vs 2106.0-8"
+      reference: 3
+      compare: 4
   legend:
     - ''
     - 'Test Case:            Test cases executed for: NDR throughput on 2n-zn2 with xxv710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "7" for CSIT rls2106, "8" for CSIT rls2110).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2106.0-8 vs 2106.0-7: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2110.0-8 vs 2106.0-8: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-dnv 1t1c pdr
 - type: "table"
@@ -1167,28 +2141,28 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C'"
   columns:
-    - title: "2005.0-5"
-      data-set: "vpp-performance-changes-2n-dnv-h1"
-    - title: "2009.0-5"
-      data-set: "vpp-performance-changes-2n-dnv-ref-env-old"
-#     - title: "2009.0-6"
-#       data-set: "vpp-performance-changes-2n-dnv-ref-env-new"
-    - title: "2101.0-6"
-      data-set: "vpp-performance-changes-2n-dnv-cmp"
-  comparisons:
-#     - title: "2009.0-6 vs 2009.0-5"
-#       reference: 2
-#       compare: 3
-    - title: "2101.0-6 vs 2009.0-5"
+    - title: "2101.0-7"
+      data-set: "vpp-2n-dnv-hist-iter-new-env"
+    - title: "2106.0-7"
+      data-set: "vpp-2n-dnv-prev-iter-old-env"
+    - title: "2106.0-8"
+      data-set: "vpp-2n-dnv-prev-iter-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-2n-dnv-curr-iter"
+  comparisons:
+    - title: "2106.0-8 vs 2106.0-7"
       reference: 2
       compare: 3
+    - title: "2110.0-8 vs 2106.0-8"
+      reference: 3
+      compare: 4
   legend:
     - ''
     - 'Test Case:            Test cases executed for: PDR throughput on 2n-dnv with x553.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "7" for CSIT rls2106, "8" for CSIT rls2110).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-#    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2101.0-6 vs 2009.0-5: Compares VPP code current vs previous.'
+    - '2106.0-8 vs 2106.0-7: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2110.0-8 vs 2106.0-8: Compares VPP code current vs previous.'
 
 # VPP Performance Changes 2n-dnv 2t2c pdr
 - type: "table"
@@ -1198,28 +2172,28 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C'"
   columns:
-    - title: "2005.0-5"
-      data-set: "vpp-performance-changes-2n-dnv-h1"
-    - title: "2009.0-5"
-      data-set: "vpp-performance-changes-2n-dnv-ref-env-old"
-#     - title: "2009.0-6"
-#       data-set: "vpp-performance-changes-2n-dnv-ref-env-new"
-    - title: "2101.0-6"
-      data-set: "vpp-performance-changes-2n-dnv-cmp"
-  comparisons:
-#     - title: "2009.0-6 vs 2009.0-5"
-#       reference: 2
-#       compare: 3
-    - title: "2101.0-6 vs 2009.0-5"
+    - title: "2101.0-7"
+      data-set: "vpp-2n-dnv-hist-iter-new-env"
+    - title: "2106.0-7"
+      data-set: "vpp-2n-dnv-prev-iter-old-env"
+    - title: "2106.0-8"
+      data-set: "vpp-2n-dnv-prev-iter-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-2n-dnv-curr-iter"
+  comparisons:
+    - title: "2106.0-8 vs 2106.0-7"
       reference: 2
       compare: 3
+    - title: "2110.0-8 vs 2106.0-8"
+      reference: 3
+      compare: 4
   legend:
     - ''
     - 'Test Case:            Test cases executed for: PDR throughput on 2n-dnv with x553.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "7" for CSIT rls2106, "8" for CSIT rls2110).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-#    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2101.0-6 vs 2009.0-5: Compares VPP code current vs previous.'
+    - '2106.0-8 vs 2106.0-7: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2110.0-8 vs 2106.0-8: Compares VPP code current vs previous.'
 
 # VPP Performance Changes 2n-dnv 1t1c ndr
 - type: "table"
@@ -1229,28 +2203,28 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C'"
   columns:
-    - title: "2005.0-5"
-      data-set: "vpp-performance-changes-2n-dnv-h1"
-    - title: "2009.0-5"
-      data-set: "vpp-performance-changes-2n-dnv-ref-env-old"
-#     - title: "2009.0-6"
-#       data-set: "vpp-performance-changes-2n-dnv-ref-env-new"
-    - title: "2101.0-6"
-      data-set: "vpp-performance-changes-2n-dnv-cmp"
-  comparisons:
-#     - title: "2009.0-6 vs 2009.0-5"
-#       reference: 2
-#       compare: 3
-    - title: "2101.0-6 vs 2009.0-5"
+    - title: "2101.0-7"
+      data-set: "vpp-2n-dnv-hist-iter-new-env"
+    - title: "2106.0-7"
+      data-set: "vpp-2n-dnv-prev-iter-old-env"
+    - title: "2106.0-8"
+      data-set: "vpp-2n-dnv-prev-iter-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-2n-dnv-curr-iter"
+  comparisons:
+    - title: "2106.0-8 vs 2106.0-7"
       reference: 2
       compare: 3
+    - title: "2110.0-8 vs 2106.0-8"
+      reference: 3
+      compare: 4
   legend:
     - ''
-    - 'Test Case:            Test cases executed for: PDR throughput on 2n-dnv with x553.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
+    - 'Test Case:            Test cases executed for: NDR throughput on 2n-dnv with x553.'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "7" for CSIT rls2106, "8" for CSIT rls2110).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-#    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2101.0-6 vs 2009.0-5: Compares VPP code current vs previous.'
+    - '2106.0-8 vs 2106.0-7: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2110.0-8 vs 2106.0-8: Compares VPP code current vs previous.'
 
 # VPP Performance Changes 2n-dnv 2t2c ndr
 - type: "table"
@@ -1260,28 +2234,28 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C'"
   columns:
-    - title: "2005.0-5"
-      data-set: "vpp-performance-changes-2n-dnv-h1"
-    - title: "2009.0-5"
-      data-set: "vpp-performance-changes-2n-dnv-ref-env-old"
-#     - title: "2009.0-6"
-#       data-set: "vpp-performance-changes-2n-dnv-ref-env-new"
-    - title: "2101.0-6"
-      data-set: "vpp-performance-changes-2n-dnv-cmp"
-  comparisons:
-#     - title: "2009.0-6 vs 2009.0-5"
-#       reference: 2
-#       compare: 3
-    - title: "2101.0-6 vs 2009.0-5"
+    - title: "2101.0-7"
+      data-set: "vpp-2n-dnv-hist-iter-new-env"
+    - title: "2106.0-7"
+      data-set: "vpp-2n-dnv-prev-iter-old-env"
+    - title: "2106.0-8"
+      data-set: "vpp-2n-dnv-prev-iter-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-2n-dnv-curr-iter"
+  comparisons:
+    - title: "2106.0-8 vs 2106.0-7"
       reference: 2
       compare: 3
+    - title: "2110.0-8 vs 2106.0-8"
+      reference: 3
+      compare: 4
   legend:
     - ''
-    - 'Test Case:            Test cases executed for: PDR throughput on 2n-dnv with x553.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
+    - 'Test Case:            Test cases executed for: NDR throughput on 2n-dnv with x553.'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "7" for CSIT rls2106, "8" for CSIT rls2110).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-#    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2101.0-6 vs 2009.0-5: Compares VPP code current vs previous.'
+    - '2106.0-8 vs 2106.0-7: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2110.0-8 vs 2106.0-8: Compares VPP code current vs previous.'
 
 # VPP Performance Changes 3n-dnv 1t1c pdr
 - type: "table"
@@ -1291,28 +2265,28 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C'"
   columns:
-    - title: "2005.0-5"
-      data-set: "vpp-performance-changes-3n-dnv-h1"
-    - title: "2009.0-5"
-      data-set: "vpp-performance-changes-3n-dnv-ref-env-old"
-#     - title: "2009.0-6"
-#       data-set: "vpp-performance-changes-3n-dnv-ref-env-new"
-    - title: "2101.0-6"
-      data-set: "vpp-performance-changes-3n-dnv-cmp"
-  comparisons:
-#     - title: "2009.0-6 vs 2009.0-5"
-#       reference: 2
-#       compare: 3
-    - title: "2101.0-6 vs 2009.0-5"
+    - title: "2101.0-7"
+      data-set: "vpp-3n-dnv-hist-iter-new-env"
+    - title: "2106.0-7"
+      data-set: "vpp-3n-dnv-prev-iter-old-env"
+    - title: "2106.0-8"
+      data-set: "vpp-3n-dnv-prev-iter-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-3n-dnv-curr-iter"
+  comparisons:
+    - title: "2106.0-8 vs 2106.0-7"
       reference: 2
       compare: 3
+    - title: "2110.0-8 vs 2106.0-8"
+      reference: 3
+      compare: 4
   legend:
     - ''
     - 'Test Case:            Test cases executed for: PDR throughput on 3n-dnv with x553.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "7" for CSIT rls2106, "8" for CSIT rls2110).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-#    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2101.0-6 vs 2009.0-5: Compares VPP code current vs previous.'
+    - '2106.0-8 vs 2106.0-7: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2110.0-8 vs 2106.0-8: Compares VPP code current vs previous.'
 
 # VPP Performance Changes 3n-dnv 2t2c pdr
 - type: "table"
@@ -1322,28 +2296,28 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C'"
   columns:
-    - title: "2005.0-5"
-      data-set: "vpp-performance-changes-3n-dnv-h1"
-    - title: "2009.0-5"
-      data-set: "vpp-performance-changes-3n-dnv-ref-env-old"
-#     - title: "2009.0-6"
-#       data-set: "vpp-performance-changes-3n-dnv-ref-env-new"
-    - title: "2101.0-6"
-      data-set: "vpp-performance-changes-3n-dnv-cmp"
-  comparisons:
-#     - title: "2009.0-6 vs 2009.0-5"
-#       reference: 2
-#       compare: 3
-    - title: "2101.0-6 vs 2009.0-5"
+    - title: "2101.0-7"
+      data-set: "vpp-3n-dnv-hist-iter-new-env"
+    - title: "2106.0-7"
+      data-set: "vpp-3n-dnv-prev-iter-old-env"
+    - title: "2106.0-8"
+      data-set: "vpp-3n-dnv-prev-iter-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-3n-dnv-curr-iter"
+  comparisons:
+    - title: "2106.0-8 vs 2106.0-7"
       reference: 2
       compare: 3
+    - title: "2110.0-8 vs 2106.0-8"
+      reference: 3
+      compare: 4
   legend:
     - ''
     - 'Test Case:            Test cases executed for: PDR throughput on 3n-dnv with x553.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "7" for CSIT rls2106, "8" for CSIT rls2110).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-#    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2101.0-6 vs 2009.0-5: Compares VPP code current vs previous.'
+    - '2106.0-8 vs 2106.0-7: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2110.0-8 vs 2106.0-8: Compares VPP code current vs previous.'
 
 # VPP Performance Changes 3n-dnv 1t1c ndr
 - type: "table"
@@ -1353,28 +2327,28 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C'"
   columns:
-    - title: "2005.0-5"
-      data-set: "vpp-performance-changes-3n-dnv-h1"
-    - title: "2009.0-5"
-      data-set: "vpp-performance-changes-3n-dnv-ref-env-old"
-#     - title: "2009.0-6"
-#       data-set: "vpp-performance-changes-3n-dnv-ref-env-new"
-    - title: "2101.0-6"
-      data-set: "vpp-performance-changes-3n-dnv-cmp"
-  comparisons:
-#     - title: "2009.0-6 vs 2009.0-5"
-#       reference: 2
-#       compare: 3
-    - title: "2101.0-6 vs 2009.0-5"
+    - title: "2101.0-7"
+      data-set: "vpp-3n-dnv-hist-iter-new-env"
+    - title: "2106.0-7"
+      data-set: "vpp-3n-dnv-prev-iter-old-env"
+    - title: "2106.0-8"
+      data-set: "vpp-3n-dnv-prev-iter-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-3n-dnv-curr-iter"
+  comparisons:
+    - title: "2106.0-8 vs 2106.0-7"
       reference: 2
       compare: 3
+    - title: "2110.0-8 vs 2106.0-8"
+      reference: 3
+      compare: 4
   legend:
     - ''
-    - 'Test Case:            Test cases executed for: PDR throughput on 3n-dnv with x553.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
+    - 'Test Case:            Test cases executed for: NDR throughput on 3n-dnv with x553.'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "7" for CSIT rls2106, "8" for CSIT rls2110).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-#    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2101.0-6 vs 2009.0-5: Compares VPP code current vs previous.'
+    - '2106.0-8 vs 2106.0-7: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2110.0-8 vs 2106.0-8: Compares VPP code current vs previous.'
 
 # VPP Performance Changes 3n-dnv 2t2c ndr
 - type: "table"
@@ -1384,28 +2358,28 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C'"
   columns:
-    - title: "2005.0-5"
-      data-set: "vpp-performance-changes-3n-dnv-h1"
-    - title: "2009.0-5"
-      data-set: "vpp-performance-changes-3n-dnv-ref-env-old"
-#     - title: "2009.0-6"
-#       data-set: "vpp-performance-changes-3n-dnv-ref-env-new"
-    - title: "2101.0-6"
-      data-set: "vpp-performance-changes-3n-dnv-cmp"
-  comparisons:
-#     - title: "2009.0-6 vs 2009.0-5"
-#       reference: 2
-#       compare: 3
-    - title: "2101.0-6 vs 2009.0-5"
+    - title: "2101.0-7"
+      data-set: "vpp-3n-dnv-hist-iter-new-env"
+    - title: "2106.0-7"
+      data-set: "vpp-3n-dnv-prev-iter-old-env"
+    - title: "2106.0-8"
+      data-set: "vpp-3n-dnv-prev-iter-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-3n-dnv-curr-iter"
+  comparisons:
+    - title: "2106.0-8 vs 2106.0-7"
       reference: 2
       compare: 3
+    - title: "2110.0-8 vs 2106.0-8"
+      reference: 3
+      compare: 4
   legend:
     - ''
-    - 'Test Case:            Test cases executed for: PDR throughput on 3n-dnv with x553.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
+    - 'Test Case:            Test cases executed for: NDR throughput on 3n-dnv with x553.'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "7" for CSIT rls2106, "8" for CSIT rls2110).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-#    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2101.0-6 vs 2009.0-5: Compares VPP code current vs previous.'
+    - '2106.0-8 vs 2106.0-7: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2110.0-8 vs 2106.0-8: Compares VPP code current vs previous.'
 
 # VPP Performance Changes 3n-tsh 1t1c pdr
 - type: "table"
@@ -1415,30 +2389,28 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C'"
   columns:
-    - title: "2005.0-5"
-      data-set: "vpp-performance-changes-3n-tsh-h1"
-    - title: "2009.0-5"
-      data-set: "vpp-performance-changes-3n-tsh-ref-env-old"
-    - title: "2009.0-6"
-      data-set: "vpp-performance-changes-3n-tsh-ref-env-new"
-    - title: "2101.0-6"
-      data-set: "vpp-performance-changes-3n-tsh-cmp"
+    - title: "2101.0-7"
+      data-set: "vpp-3n-tsh-hist-iter-new-env"
+    - title: "2106.0-7"
+      data-set: "vpp-3n-tsh-prev-iter-old-env"
+    - title: "2106.0-8"
+      data-set: "vpp-3n-tsh-prev-iter-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-3n-tsh-curr-iter"
   comparisons:
-    - title: "2009.0-6 vs 2009.0-5"
+    - title: "2106.0-8 vs 2106.0-7"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-3n-tsh-1t1c-pdr-rca1.yaml"
-    - title: "2101.0-6 vs 2009.0-6"
+    - title: "2110.0-8 vs 2106.0-8"
       reference: 3
       compare: 4
-#      rca-file: "rca/rca-3n-tsh-1t1c-pdr-rca2.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: PDR throughput on 3n-tsh with x520.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "7" for CSIT rls2106, "8" for CSIT rls2110).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2106.0-8 vs 2106.0-7: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2110.0-8 vs 2106.0-8: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-tsh 2t2c pdr
 - type: "table"
@@ -1448,30 +2420,28 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C'"
   columns:
-    - title: "2005.0-5"
-      data-set: "vpp-performance-changes-3n-tsh-h1"
-    - title: "2009.0-5"
-      data-set: "vpp-performance-changes-3n-tsh-ref-env-old"
-    - title: "2009.0-6"
-      data-set: "vpp-performance-changes-3n-tsh-ref-env-new"
-    - title: "2101.0-6"
-      data-set: "vpp-performance-changes-3n-tsh-cmp"
+    - title: "2101.0-7"
+      data-set: "vpp-3n-tsh-hist-iter-new-env"
+    - title: "2106.0-7"
+      data-set: "vpp-3n-tsh-prev-iter-old-env"
+    - title: "2106.0-8"
+      data-set: "vpp-3n-tsh-prev-iter-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-3n-tsh-curr-iter"
   comparisons:
-    - title: "2009.0-6 vs 2009.0-5"
+    - title: "2106.0-8 vs 2106.0-7"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-3n-tsh-2t2c-pdr-rca1.yaml"
-    - title: "2101.0-6 vs 2009.0-6"
+    - title: "2110.0-8 vs 2106.0-8"
       reference: 3
       compare: 4
-#      rca-file: "rca/rca-3n-tsh-2t2c-pdr-rca2.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: PDR throughput on 3n-tsh with x520.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "7" for CSIT rls2106, "8" for CSIT rls2110).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2106.0-8 vs 2106.0-7: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2110.0-8 vs 2106.0-8: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-tsh 1t1c ndr
 - type: "table"
@@ -1481,30 +2451,28 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C'"
   columns:
-    - title: "2005.0-5"
-      data-set: "vpp-performance-changes-3n-tsh-h1"
-    - title: "2009.0-5"
-      data-set: "vpp-performance-changes-3n-tsh-ref-env-old"
-    - title: "2009.0-6"
-      data-set: "vpp-performance-changes-3n-tsh-ref-env-new"
-    - title: "2101.0-6"
-      data-set: "vpp-performance-changes-3n-tsh-cmp"
+    - title: "2101.0-7"
+      data-set: "vpp-3n-tsh-hist-iter-new-env"
+    - title: "2106.0-7"
+      data-set: "vpp-3n-tsh-prev-iter-old-env"
+    - title: "2106.0-8"
+      data-set: "vpp-3n-tsh-prev-iter-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-3n-tsh-curr-iter"
   comparisons:
-    - title: "2009.0-6 vs 2009.0-5"
+    - title: "2106.0-8 vs 2106.0-7"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-3n-tsh-1t1c-ndr-rca1.yaml"
-    - title: "2101.0-6 vs 2009.0-6"
+    - title: "2110.0-8 vs 2106.0-8"
       reference: 3
       compare: 4
-#      rca-file: "rca/rca-3n-tsh-1t1c-ndr-rca2.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: NDR throughput on 3n-tsh with x520.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "7" for CSIT rls2106, "8" for CSIT rls2110).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2106.0-8 vs 2106.0-7: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2110.0-8 vs 2106.0-8: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-tsh 2t2c ndr
 - type: "table"
@@ -1514,30 +2482,28 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C'"
   columns:
-    - title: "2005.0-5"
-      data-set: "vpp-performance-changes-3n-tsh-h1"
-    - title: "2009.0-5"
-      data-set: "vpp-performance-changes-3n-tsh-ref-env-old"
-    - title: "2009.0-6"
-      data-set: "vpp-performance-changes-3n-tsh-ref-env-new"
-    - title: "2101.0-6"
-      data-set: "vpp-performance-changes-3n-tsh-cmp"
+    - title: "2101.0-7"
+      data-set: "vpp-3n-tsh-hist-iter-new-env"
+    - title: "2106.0-7"
+      data-set: "vpp-3n-tsh-prev-iter-old-env"
+    - title: "2106.0-8"
+      data-set: "vpp-3n-tsh-prev-iter-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-3n-tsh-curr-iter"
   comparisons:
-    - title: "2009.0-6 vs 2009.0-5"
+    - title: "2106.0-8 vs 2106.0-7"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-3n-tsh-2t2c-ndr-rca1.yaml"
-    - title: "2101.0-6 vs 2009.0-6"
+    - title: "2110.0-8 vs 2106.0-8"
       reference: 3
       compare: 4
-#      rca-file: "rca/rca-3n-tsh-2t2c-ndr-rca2.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: NDR throughput on 3n-tsh with x520.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "7" for CSIT rls2106, "8" for CSIT rls2110).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2106.0-8 vs 2106.0-7: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2110.0-8 vs 2106.0-8: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-tx2 1t1c pdr
 - type: "table"
@@ -1547,28 +2513,28 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C'"
   columns:
-#     - title: "2005.0-5"
-#       data-set: "vpp-performance-changes-2n-tx2-h1"
-#     - title: "2009.0-5"
-#       data-set: "vpp-performance-changes-2n-tx2-ref-env-old"
-    - title: "2009.0-6"
-      data-set: "vpp-performance-changes-2n-tx2-ref-env-new"
-    - title: "2101.0-6"
-      data-set: "vpp-performance-changes-2n-tx2-cmp"
-  comparisons:
-#     - title: "2009.0-6 vs 2009.0-5"
-#       reference: 2
-#       compare: 3
-    - title: "2101.0-6 vs 2009.0-6"
-      reference: 1
-      compare: 2
+    - title: "2101.0-7"
+      data-set: "vpp-2n-tx2-hist-iter-new-env"
+    - title: "2106.0-7"
+      data-set: "vpp-2n-tx2-prev-iter-old-env"
+    - title: "2106.0-8"
+      data-set: "vpp-2n-tx2-prev-iter-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-2n-tx2-curr-iter"
+  comparisons:
+    - title: "2106.0-8 vs 2106.0-7"
+      reference: 2
+      compare: 3
+    - title: "2110.0-8 vs 2106.0-8"
+      reference: 3
+      compare: 4
   legend:
     - ''
     - 'Test Case:            Test cases executed for: PDR throughput on 2n-tx2 with xl710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "7" for CSIT rls2106, "8" for CSIT rls2110).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-#     - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2106.0-8 vs 2106.0-7: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2110.0-8 vs 2106.0-8: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-tx2 2t2c pdr
 - type: "table"
@@ -1578,182 +2544,90 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C'"
   columns:
-#     - title: "2005.0-5"
-#       data-set: "vpp-performance-changes-2n-tx2-h1"
-#     - title: "2009.0-5"
-#       data-set: "vpp-performance-changes-2n-tx2-ref-env-old"
-    - title: "2009.0-6"
-      data-set: "vpp-performance-changes-2n-tx2-ref-env-new"
-    - title: "2101.0-6"
-      data-set: "vpp-performance-changes-2n-tx2-cmp"
-  comparisons:
-#     - title: "2009.0-6 vs 2009.0-5"
-#       reference: 2
-#       compare: 3
-    - title: "2101.0-6 vs 2009.0-6"
-      reference: 1
-      compare: 2
+    - title: "2101.0-7"
+      data-set: "vpp-2n-tx2-hist-iter-new-env"
+    - title: "2106.0-7"
+      data-set: "vpp-2n-tx2-prev-iter-old-env"
+    - title: "2106.0-8"
+      data-set: "vpp-2n-tx2-prev-iter-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-2n-tx2-curr-iter"
+  comparisons:
+    - title: "2106.0-8 vs 2106.0-7"
+      reference: 2
+      compare: 3
+    - title: "2110.0-8 vs 2106.0-8"
+      reference: 3
+      compare: 4
   legend:
     - ''
     - 'Test Case:            Test cases executed for: PDR throughput on 2n-tx2 with xl710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "7" for CSIT rls2106, "8" for CSIT rls2110).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-#     - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2106.0-8 vs 2106.0-7: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2110.0-8 vs 2106.0-8: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-tx2 1t1c ndr
 - type: "table"
   title: "VPP Performance Changes 2n-tx2 1t1c ndr"
   algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-tx2-1t1c-pdr"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-tx2-1t1c-ndr"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C'"
   columns:
-#     - title: "2005.0-5"
-#       data-set: "vpp-performance-changes-2n-tx2-h1"
-#     - title: "2009.0-5"
-#       data-set: "vpp-performance-changes-2n-tx2-ref-env-old"
-    - title: "2009.0-6"
-      data-set: "vpp-performance-changes-2n-tx2-ref-env-new"
-    - title: "2101.0-6"
-      data-set: "vpp-performance-changes-2n-tx2-cmp"
-  comparisons:
-#     - title: "2009.0-6 vs 2009.0-5"
-#       reference: 2
-#       compare: 3
-    - title: "2101.0-6 vs 2009.0-6"
-      reference: 1
-      compare: 2
+    - title: "2101.0-7"
+      data-set: "vpp-2n-tx2-hist-iter-new-env"
+    - title: "2106.0-7"
+      data-set: "vpp-2n-tx2-prev-iter-old-env"
+    - title: "2106.0-8"
+      data-set: "vpp-2n-tx2-prev-iter-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-2n-tx2-curr-iter"
+  comparisons:
+    - title: "2106.0-8 vs 2106.0-7"
+      reference: 2
+      compare: 3
+    - title: "2110.0-8 vs 2106.0-8"
+      reference: 3
+      compare: 4
   legend:
     - ''
-    - 'Test Case:            Test cases executed for: PDR throughput on 2n-tx2 with xl710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
+    - 'Test Case:            Test cases executed for: NDR throughput on 2n-tx2 with xl710.'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "7" for CSIT rls2106, "8" for CSIT rls2110).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-#     - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2106.0-8 vs 2106.0-7: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2110.0-8 vs 2106.0-8: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-tx2 2t2c ndr
 - type: "table"
   title: "VPP Performance Changes 2n-tx2 2t2c ndr"
   algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-tx2-2t2c-pdr"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-tx2-2t2c-ndr"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C'"
   columns:
-#     - title: "2005.0-5"
-#       data-set: "vpp-performance-changes-2n-tx2-h1"
-#     - title: "2009.0-5"
-#       data-set: "vpp-performance-changes-2n-tx2-ref-env-old"
-    - title: "2009.0-6"
-      data-set: "vpp-performance-changes-2n-tx2-ref-env-new"
-    - title: "2101.0-6"
-      data-set: "vpp-performance-changes-2n-tx2-cmp"
-  comparisons:
-#     - title: "2009.0-6 vs 2009.0-5"
-#       reference: 2
-#       compare: 3
-    - title: "2101.0-6 vs 2009.0-6"
-      reference: 1
-      compare: 2
+    - title: "2101.0-7"
+      data-set: "vpp-2n-tx2-hist-iter-new-env"
+    - title: "2106.0-7"
+      data-set: "vpp-2n-tx2-prev-iter-old-env"
+    - title: "2106.0-8"
+      data-set: "vpp-2n-tx2-prev-iter-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-2n-tx2-curr-iter"
+  comparisons:
+    - title: "2106.0-8 vs 2106.0-7"
+      reference: 2
+      compare: 3
+    - title: "2110.0-8 vs 2106.0-8"
+      reference: 3
+      compare: 4
   legend:
     - ''
-    - 'Test Case:            Test cases executed for: PDR throughput on 2n-tx2 with xl710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
+    - 'Test Case:            Test cases executed for: NDR throughput on 2n-tx2 with xl710.'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "7" for CSIT rls2106, "8" for CSIT rls2110).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-#     - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
-
-# VPP Comparison Across Testbeds 3n-hsw to 3n-skx 1c ndr
-- type: "table"
-  title: "VPP Comparison Across Testbeds 3n-hsw to 3n-skx 1c ndr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-hsw-3n-skx-1c-ndr"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "('NIC_Intel-XXV710' or 'NIC_Intel-XL710') and 'NDRPDR' and '1C'"
-  columns:
-    - title: "3n-hsw xl710"
-      data-set: "vpp-compare-testbeds-ref"
-      tag: "NIC_Intel-XL710"
-    - title: "3n-skx xxv710"
-      data-set: "vpp-compare-testbeds-cmp"
-      tag: "NIC_Intel-XXV710"
-  comparisons:
-    - title: "Diff"
-      reference: 1
-      compare: 2
-  legend:
-    - ""
-    - "3n-hsw xl710, 3n-skx xxv710 - testbeds and NICs tested."
-    - "Diff - difference between 3n-hsw xl710 and 3n-skx xxv710 testbeds."
-
-# VPP Comparison Across Testbeds 3n-hsw to 3n-skx 2c ndr
-- type: "table"
-  title: "VPP Comparison Across Testbeds 3n-hsw to 3n-skx 2c ndr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-hsw-3n-skx-2c-ndr"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "('NIC_Intel-XXV710' or 'NIC_Intel-XL710') and 'NDRPDR' and '2C'"
-  columns:
-    - title: "3n-hsw xl710"
-      data-set: "vpp-compare-testbeds-ref"
-      tag: "NIC_Intel-XL710"
-    - title: "3n-skx xxv710"
-      data-set: "vpp-compare-testbeds-cmp"
-      tag: "NIC_Intel-XXV710"
-  comparisons:
-    - title: "Diff"
-      reference: 1
-      compare: 2
-  legend:
-    - ""
-    - "3n-hsw xl710, 3n-skx xxv710 - testbeds and NICs tested."
-    - "Diff - difference between 3n-hsw xl710 and 3n-skx xxv710 testbeds."
-
-# VPP Comparison Across Testbeds 3n-hsw to 3n-skx 1c pdr
-- type: "table"
-  title: "VPP Comparison Across Testbeds 3n-hsw to 3n-skx 1c pdr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-hsw-3n-skx-1c-pdr"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "('NIC_Intel-XXV710' or 'NIC_Intel-XL710') and 'NDRPDR' and '1C'"
-  columns:
-    - title: "3n-hsw xl710"
-      data-set: "vpp-compare-testbeds-ref"
-      tag: "NIC_Intel-XL710"
-    - title: "3n-skx xxv710"
-      data-set: "vpp-compare-testbeds-cmp"
-      tag: "NIC_Intel-XXV710"
-  comparisons:
-    - title: "Diff"
-      reference: 1
-      compare: 2
-  legend:
-    - ""
-    - "3n-hsw xl710, 3n-skx xxv710 - testbeds and NICs tested."
-    - "Diff - difference between 3n-hsw xl710 and 3n-skx xxv710 testbeds."
-
-# VPP Comparison Across Testbeds 3n-hsw to 3n-skx 2c pdr
-- type: "table"
-  title: "VPP Comparison Across Testbeds 3n-hsw to 3n-skx 2c pdr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-hsw-3n-skx-2c-pdr"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "('NIC_Intel-XXV710' or 'NIC_Intel-XL710') and 'NDRPDR' and '2C'"
-  columns:
-    - title: "3n-hsw xl710"
-      data-set: "vpp-compare-testbeds-ref"
-      tag: "NIC_Intel-XL710"
-    - title: "3n-skx xxv710"
-      data-set: "vpp-compare-testbeds-cmp"
-      tag: "NIC_Intel-XXV710"
-  comparisons:
-    - title: "Diff"
-      reference: 1
-      compare: 2
-  legend:
-    - ""
-    - "3n-hsw xl710, 3n-skx xxv710 - testbeds and NICs tested."
-    - "Diff - difference between 3n-hsw xl710 and 3n-skx xxv710 testbeds."
+    - '2106.0-8 vs 2106.0-7: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2110.0-8 vs 2106.0-8: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Comparison Across Testbeds 2n-skx to 2n-clx 2t1c ndr
 - type: "table"
@@ -1764,9 +2638,9 @@
   filter: "'2T1C' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2n-skx"
-      data-set: "vpp-compare-testbeds-skx-clx-ref"
+      data-set: "vpp-2n-skx-curr-iter"
     - title: "2n-clx"
-      data-set: "vpp-compare-testbeds-skx-clx-cmp"
+      data-set: "vpp-2n-clx-curr-iter"
   comparisons:
     - title: "Diff"
       reference: 1
@@ -1785,9 +2659,9 @@
   filter: "'4T2C' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2n-skx"
-      data-set: "vpp-compare-testbeds-skx-clx-ref"
+      data-set: "vpp-2n-skx-curr-iter"
     - title: "2n-clx"
-      data-set: "vpp-compare-testbeds-skx-clx-cmp"
+      data-set: "vpp-2n-clx-curr-iter"
   comparisons:
     - title: "Diff"
       reference: 1
@@ -1806,9 +2680,9 @@
   filter: "'2T1C' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2n-skx"
-      data-set: "vpp-compare-testbeds-skx-clx-ref"
+      data-set: "vpp-2n-skx-curr-iter"
     - title: "2n-clx"
-      data-set: "vpp-compare-testbeds-skx-clx-cmp"
+      data-set: "vpp-2n-clx-curr-iter"
   comparisons:
     - title: "Diff"
       reference: 1
@@ -1827,9 +2701,9 @@
   filter: "'4T2C' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2n-skx"
-      data-set: "vpp-compare-testbeds-skx-clx-ref"
+      data-set: "vpp-2n-skx-curr-iter"
     - title: "2n-clx"
-      data-set: "vpp-compare-testbeds-skx-clx-cmp"
+      data-set: "vpp-2n-clx-curr-iter"
   comparisons:
     - title: "Diff"
       reference: 1
@@ -1839,98 +2713,6 @@
     - "2n-skx, 2n-clx - testbeds and NICs tested."
     - "Diff - difference between 2n-skx and 2n-clx testbeds."
 
-# VPP Comparison Across Testbeds 3n-hsw to 2n-clx 1c ndr
-- type: "table"
-  title: "VPP Comparison Across Testbeds 3n-hsw to 2n-clx 1c ndr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-hsw-2n-clx-1c-ndr"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "('NIC_Intel-XXV710' or 'NIC_Intel-XL710') and 'NDRPDR' and '1C'"
-  columns:
-    - title: "3n-hsw xl710"
-      data-set: "vpp-compare-testbeds-hsw-clx-ref"
-      tag: "NIC_Intel-XL710"
-    - title: "2n-clx xxv710"
-      data-set: "vpp-compare-testbeds-hsw-clx-cmp"
-      tag: "NIC_Intel-XXV710"
-  comparisons:
-    - title: "Diff"
-      reference: 1
-      compare: 2
-  legend:
-    - ""
-    - "3n-hsw xl710, 2n-clx xxv710 - testbeds and NICs tested."
-    - "Diff - difference between 3n-hsw xl710 and 2n-clx xxv710 testbeds."
-
-# VPP Comparison Across Testbeds 3n-hsw to 2n-clx 2c ndr
-- type: "table"
-  title: "VPP Comparison Across Testbeds 3n-hsw to 2n-clx 2c ndr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-hsw-2n-clx-2c-ndr"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "('NIC_Intel-XXV710' or 'NIC_Intel-XL710') and 'NDRPDR' and '2C'"
-  columns:
-    - title: "3n-hsw xl710"
-      data-set: "vpp-compare-testbeds-hsw-clx-ref"
-      tag: "NIC_Intel-XL710"
-    - title: "2n-clx xxv710"
-      data-set: "vpp-compare-testbeds-hsw-clx-cmp"
-      tag: "NIC_Intel-XXV710"
-  comparisons:
-    - title: "Diff"
-      reference: 1
-      compare: 2
-  legend:
-    - ""
-    - "3n-hsw xl710, 2n-clx xxv710 - testbeds and NICs tested."
-    - "Diff - difference between 3n-hsw xl710 and 2n-clx xxv710 testbeds."
-
-# VPP Comparison Across Testbeds 3n-hsw to 2n-clx 1c pdr
-- type: "table"
-  title: "VPP Comparison Across Testbeds 3n-hsw to 2n-clx 1c pdr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-hsw-2n-clx-1c-pdr"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "('NIC_Intel-XXV710' or 'NIC_Intel-XL710') and 'NDRPDR' and '1C'"
-  columns:
-    - title: "3n-hsw xl710"
-      data-set: "vpp-compare-testbeds-hsw-clx-ref"
-      tag: "NIC_Intel-XL710"
-    - title: "2n-clx xxv710"
-      data-set: "vpp-compare-testbeds-hsw-clx-cmp"
-      tag: "NIC_Intel-XXV710"
-  comparisons:
-    - title: "Diff"
-      reference: 1
-      compare: 2
-  legend:
-    - ""
-    - "3n-hsw xl710, 2n-clx xxv710 - testbeds and NICs tested."
-    - "Diff - difference between 3n-hsw xl710 and 2n-clx xxv710 testbeds."
-
-# VPP Comparison Across Testbeds 3n-hsw to 2n-clx 2c pdr
-- type: "table"
-  title: "VPP Comparison Across Testbeds 3n-hsw to 2n-clx 2c pdr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-hsw-2n-clx-2c-pdr"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "('NIC_Intel-XXV710' or 'NIC_Intel-XL710') and 'NDRPDR' and '2C'"
-  columns:
-    - title: "3n-hsw xl710"
-      data-set: "vpp-compare-testbeds-hsw-clx-ref"
-      tag: "NIC_Intel-XL710"
-    - title: "2n-clx xxv710"
-      data-set: "vpp-compare-testbeds-hsw-clx-cmp"
-      tag: "NIC_Intel-XXV710"
-  comparisons:
-    - title: "Diff"
-      reference: 1
-      compare: 2
-  legend:
-    - ""
-    - "3n-hsw xl710, 2n-clx xxv710 - testbeds and NICs tested."
-    - "Diff - difference between 3n-hsw xl710 and 2n-clx xxv710 testbeds."
-
 # # VPP Comparison Across Testbeds 2n-clx to 2n-icx 1c ndr
 # - type: "table"
 #   title: "VPP Comparison Across Testbeds 2n-clx to 2n-icx 1c ndr"
@@ -1940,10 +2722,10 @@
 #   filter: "('NIC_Intel-XXV710' or 'NIC_Intel-E810CQ') and 'NDRPDR' and '1C'"
 #   columns:
 #     - title: "2n-clx xxv710"
-#       data-set: "vpp-compare-testbeds-clx-icx-ref"
+#       data-set: "vpp-2n-clx-curr-iter"
 #       tag: "NIC_Intel-XXV710"
 #     - title: "2n-icx e810cq"
-#       data-set: "vpp-compare-testbeds-clx-icx-cmp"
+#       data-set: "vpp-2n-icx-curr-iter"
 #       tag: "NIC_Intel-E810CQ"
 #   comparisons:
 #     - title: "Diff"
@@ -1963,10 +2745,10 @@
 #   filter: "('NIC_Intel-XXV710' or 'NIC_Intel-E810CQ') and 'NDRPDR' and '2C'"
 #   columns:
 #     - title: "2n-clx xxv710"
-#       data-set: "vpp-compare-testbeds-clx-icx-ref"
+#       data-set: "vpp-2n-clx-curr-iter"
 #       tag: "NIC_Intel-XXV710"
 #     - title: "2n-icx e810cq"
-#       data-set: "vpp-compare-testbeds-clx-icx-cmp"
+#       data-set: "vpp-2n-icx-curr-iter"
 #       tag: "NIC_Intel-E810CQ"
 #   comparisons:
 #     - title: "Diff"
@@ -1986,10 +2768,10 @@
 #   filter: "('NIC_Intel-XXV710' or 'NIC_Intel-E810CQ') and 'NDRPDR' and '1C'"
 #   columns:
 #     - title: "2n-clx xxv710"
-#       data-set: "vpp-compare-testbeds-clx-icx-ref"
+#       data-set: "vpp-2n-clx-curr-iter"
 #       tag: "NIC_Intel-XXV710"
 #     - title: "2n-icx e810cq"
-#       data-set: "vpp-compare-testbeds-clx-icx-cmp"
+#       data-set: "vpp-2n-icx-curr-iter"
 #       tag: "NIC_Intel-E810CQ"
 #   comparisons:
 #     - title: "Diff"
@@ -2009,10 +2791,10 @@
 #   filter: "('NIC_Intel-XXV710' or 'NIC_Intel-E810CQ') and 'NDRPDR' and '2C'"
 #   columns:
 #     - title: "2n-clx xxv710"
-#       data-set: "vpp-compare-testbeds-clx-icx-ref"
+#       data-set: "vpp-3n-skx-curr-iter"
 #       tag: "NIC_Intel-XXV710"
 #     - title: "2n-icx e810cq"
-#       data-set: "vpp-compare-testbeds-clx-icx-cmp"
+#       data-set: "vpp-2n-icx-curr-iter"
 #       tag: "NIC_Intel-E810CQ"
 #   comparisons:
 #     - title: "Diff"
@@ -2022,6 +2804,98 @@
 #     - ""
 #     - "2n-clx xxv710, 2n-icx e810cq - testbeds and NICs tested."
 #     - "Diff - difference between 2n-clx xxv710 and 2n-icx e810cq testbeds."
+#
+# # VPP Comparison Across Testbeds 3n-skx to 3n-icx 1c ndr
+# - type: "table"
+#   title: "VPP Comparison Across Testbeds 3n-skx to 3n-icx 1c ndr"
+#   algorithm: "table_comparison"
+#   output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-skx-3n-icx-1c-ndr"
+#   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+#   filter: "('NIC_Intel-XXV710' or 'NIC_Intel-E810CQ') and 'NDRPDR' and '1C'"
+#   columns:
+#     - title: "3n-skx xxv710"
+#       data-set: "vpp-3n-skx-curr-iter"
+#       tag: "NIC_Intel-XXV710"
+#     - title: "3n-icx e810cq"
+#       data-set: "vpp-3n-icx-curr-iter"
+#       tag: "NIC_Intel-E810CQ"
+#   comparisons:
+#     - title: "Diff"
+#       reference: 1
+#       compare: 2
+#   legend:
+#     - ""
+#     - "3n-skx xxv710, 3n-icx e810cq - testbeds and NICs tested."
+#     - "Diff - difference between 3n-skx xxv710 and 3n-icx e810cq testbeds."
+#
+# # VPP Comparison Across Testbeds 3n-skx to 3n-icx 2c ndr
+# - type: "table"
+#   title: "VPP Comparison Across Testbeds 3n-skx to 3n-icx ndr"
+#   algorithm: "table_comparison"
+#   output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-skx-3n-icx-2c-ndr"
+#   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+#   filter: "('NIC_Intel-XXV710' or 'NIC_Intel-E810CQ') and 'NDRPDR' and '2C'"
+#   columns:
+#     - title: "3n-skx xxv710"
+#       data-set: "vpp-3n-skx-curr-iter"
+#       tag: "NIC_Intel-XXV710"
+#     - title: "3n-icx e810cq"
+#       data-set: "vpp-3n-icx-curr-iter"
+#       tag: "NIC_Intel-E810CQ"
+#   comparisons:
+#     - title: "Diff"
+#       reference: 1
+#       compare: 2
+#   legend:
+#     - ""
+#     - "3n-skx xxv710, 3n-icx e810cq - testbeds and NICs tested."
+#     - "Diff - difference between 3n-skx xxv710 and 3n-icx e810cq testbeds."
+#
+# # VPP Comparison Across Testbeds 3n-skx to 3n-icx 1c pdr
+# - type: "table"
+#   title: "VPP Comparison Across Testbeds 3n-skx to 3n-icx 1c pdr"
+#   algorithm: "table_comparison"
+#   output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-skx-3n-icx-1c-pdr"
+#   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+#   filter: "('NIC_Intel-XXV710' or 'NIC_Intel-E810CQ') and 'NDRPDR' and '1C'"
+#   columns:
+#     - title: "3n-skx xxv710"
+#       data-set: "vpp-3n-skx-curr-iter"
+#       tag: "NIC_Intel-XXV710"
+#     - title: "3n-icx e810cq"
+#       data-set: "vpp-3n-icx-curr-iter"
+#       tag: "NIC_Intel-E810CQ"
+#   comparisons:
+#     - title: "Diff"
+#       reference: 1
+#       compare: 2
+#   legend:
+#     - ""
+#     - "3n-skx xxv710, 3n-icx e810cq - testbeds and NICs tested."
+#     - "Diff - difference between 3n-skx xxv710 and 3n-icx e810cq testbeds."
+#
+# # VPP Comparison Across Testbeds 3n-skx to 3n-icx 2c pdr
+# - type: "table"
+#   title: "VPP Comparison Across Testbeds 3n-skx to 3n-icx 2c pdr"
+#   algorithm: "table_comparison"
+#   output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-skx-3n-icx-2c-pdr"
+#   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+#   filter: "('NIC_Intel-XXV710' or 'NIC_Intel-E810CQ') and 'NDRPDR' and '2C'"
+#   columns:
+#     - title: "3n-skx xxv710"
+#       data-set: "vpp-3n-skx-curr-iter"
+#       tag: "NIC_Intel-XXV710"
+#     - title: "3n-icx e810cq"
+#       data-set: "vpp-3n-icx-curr-iter"
+#       tag: "NIC_Intel-E810CQ"
+#   comparisons:
+#     - title: "Diff"
+#       reference: 1
+#       compare: 2
+#   legend:
+#     - ""
+#     - "3n-skx xxv710, 3n-icx e810cq - testbeds and NICs tested."
+#     - "Diff - difference between 3n-skx xxv710 and 3n-icx e810cq testbeds."
 
 # VPP Comparison Across Topologies 3n-skx to 2n-skx 1c ndr
 - type: "table"
@@ -2032,9 +2906,9 @@
   filter: "'NDRPDR' and '1C' and 'NIC_Intel-XXV710'"
   columns:
     - title: "3n-skx"
-      data-set: "vpp-compare-topologies-ref"
+      data-set: "vpp-3n-skx-curr-iter"
     - title: "2n-skx"
-      data-set: "vpp-compare-topologies-cmp"
+      data-set: "vpp-2n-skx-curr-iter"
   comparisons:
     - title: "Diff"
       reference: 1
@@ -2053,9 +2927,9 @@
   filter: "'NDRPDR' and '2C' and 'NIC_Intel-XXV710'"
   columns:
     - title: "3n-skx"
-      data-set: "vpp-compare-topologies-ref"
+      data-set: "vpp-3n-skx-curr-iter"
     - title: "2n-skx"
-      data-set: "vpp-compare-topologies-cmp"
+      data-set: "vpp-2n-skx-curr-iter"
   comparisons:
     - title: "Diff"
       reference: 1
@@ -2074,9 +2948,9 @@
   filter: "'NDRPDR' and '1C' and 'NIC_Intel-XXV710'"
   columns:
     - title: "3n-skx"
-      data-set: "vpp-compare-topologies-ref"
+      data-set: "vpp-3n-skx-curr-iter"
     - title: "2n-skx"
-      data-set: "vpp-compare-topologies-cmp"
+      data-set: "vpp-2n-skx-curr-iter"
   comparisons:
     - title: "Diff"
       reference: 1
@@ -2095,116 +2969,17 @@
   filter: "'NDRPDR' and '2C' and 'NIC_Intel-XXV710'"
   columns:
     - title: "3n-skx"
-      data-set: "vpp-compare-topologies-ref"
+      data-set: "vpp-3n-skx-curr-iter"
     - title: "2n-skx"
-      data-set: "vpp-compare-topologies-cmp"
+      data-set: "vpp-2n-skx-curr-iter"
   comparisons:
     - title: "Diff"
       reference: 1
       compare: 2
-  legend:
-    - ""
-    - "3n-skx, 2n-skx - topologies tested."
-    - "Diff - difference between 3n-skx and 2n-skx topologies."
-
-# VPP Performance Changes 3n-hsw 1t1c mrr
-- type: "table"
-  title: "VPP Performance Changes 3n-hsw 1t1c mrr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-1t1c-mrr"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'1T1C' and 'MRR' and 'NIC_Intel-XL710' and not 'NF_DENSITY'"
-  columns:
-    - title: "2005.0-5"
-      data-set: "vpp-performance-changes-3n-hsw-mrr-h1"
-    - title: "2009.0-5"
-      data-set: "vpp-performance-changes-3n-hsw-mrr-ref-env-old"
-    - title: "2009.0-6"
-      data-set: "vpp-performance-changes-3n-hsw-mrr-ref-env-new"
-    - title: "2101.0-6"
-      data-set: "vpp-performance-changes-3n-hsw-mrr-cmp"
-  comparisons:
-    - title: "2009.0-6 vs 2009.0-5"
-      reference: 2
-      compare: 3
-#      rca-file: "rca/rca-3n-hsw-1t1c-mrr-rca1.yaml"
-    - title: "2101.0-6 vs 2009.0-6"
-      reference: 3
-      compare: 4
-#      rca-file: "rca/rca-3n-hsw-1t1c-mrr-rca2.yaml"
-  legend:
-    - ''
-    - 'Test Case:            Test cases executed for: MRR throughput on 3n-hsw with xl710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
-    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
-
-# VPP Performance Changes 3n-hsw 2t2c mrr
-- type: "table"
-  title: "VPP Performance Changes 3n-hsw 2t2c mrr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-2t2c-mrr"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T2C' and 'MRR' and 'NIC_Intel-XL710' and not 'NF_DENSITY'"
-  columns:
-    - title: "2005.0-5"
-      data-set: "vpp-performance-changes-3n-hsw-mrr-h1"
-    - title: "2009.0-5"
-      data-set: "vpp-performance-changes-3n-hsw-mrr-ref-env-old"
-    - title: "2009.0-6"
-      data-set: "vpp-performance-changes-3n-hsw-mrr-ref-env-new"
-    - title: "2101.0-6"
-      data-set: "vpp-performance-changes-3n-hsw-mrr-cmp"
-  comparisons:
-    - title: "2009.0-6 vs 2009.0-5"
-      reference: 2
-      compare: 3
-#      rca-file: "rca/rca-3n-hsw-2t2c-mrr-rca1.yaml"
-    - title: "2101.0-6 vs 2009.0-6"
-      reference: 3
-      compare: 4
-#      rca-file: "rca/rca-3n-hsw-2t2c-mrr-rca2.yaml"
-  legend:
-    - ''
-    - 'Test Case:            Test cases executed for: MRR throughput on 3n-hsw with xl710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
-    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
-
-# VPP Performance Changes 3n-hsw 4t4c mrr
-- type: "table"
-  title: "VPP Performance Changes 3n-hsw 4t4c mrr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-4t4c-mrr"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T4C' and 'MRR' and 'NIC_Intel-XL710' and not 'NF_DENSITY'"
-  columns:
-    - title: "2005.0-5"
-      data-set: "vpp-performance-changes-3n-hsw-mrr-h1"
-    - title: "2009.0-5"
-      data-set: "vpp-performance-changes-3n-hsw-mrr-ref-env-old"
-    - title: "2009.0-6"
-      data-set: "vpp-performance-changes-3n-hsw-mrr-ref-env-new"
-    - title: "2101.0-6"
-      data-set: "vpp-performance-changes-3n-hsw-mrr-cmp"
-  comparisons:
-    - title: "2009.0-6 vs 2009.0-5"
-      reference: 2
-      compare: 3
-#      rca-file: "rca/rca-3n-hsw-4t4c-mrr-rca1.yaml"
-    - title: "2101.0-6 vs 2009.0-6"
-      reference: 3
-      compare: 4
-#      rca-file: "rca/rca-3n-hsw-4t4c-mrr-rca2.yaml"
-  legend:
-    - ''
-    - 'Test Case:            Test cases executed for: MRR throughput on 3n-hsw with xl710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
-    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
+  legend:
+    - ""
+    - "3n-skx, 2n-skx - topologies tested."
+    - "Diff - difference between 3n-skx and 2n-skx topologies."
 
 # VPP Performance Changes 3n-skx 2t1c mrr
 - type: "table"
@@ -2214,30 +2989,28 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'MRR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2005.0-5"
-      data-set: "vpp-performance-changes-3n-skx-mrr-h1"
-    - title: "2009.0-5"
-      data-set: "vpp-performance-changes-3n-skx-mrr-ref-env-old"
-    - title: "2009.0-6"
-      data-set: "vpp-performance-changes-3n-skx-mrr-ref-env-new"
-    - title: "2101.0-6"
-      data-set: "vpp-performance-changes-3n-skx-mrr-cmp"
+    - title: "2101.0-7"
+      data-set: "vpp-3n-skx-hist-iter-mrr-new-env"
+    - title: "2106.0-7"
+      data-set: "vpp-3n-skx-prev-iter-mrr-old-env"
+    - title: "2106.0-8"
+      data-set: "vpp-3n-skx-prev-iter-mrr-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-3n-skx-curr-iter-mrr"
   comparisons:
-    - title: "2009.0-6 vs 2009.0-5"
+    - title: "2106.0-8 vs 2106.0-7"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-3n-skx-2t1c-mrr-rca1.yaml"
-    - title: "2101.0-6 vs 2009.0-6"
+    - title: "2110.0-8 vs 2106.0-8"
       reference: 3
       compare: 4
-#      rca-file: "rca/rca-3n-skx-2t1c-mrr-rca2.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 3n-skx with xxv710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "7" for CSIT rls2106, "8" for CSIT rls2110).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2106.0-8 vs 2106.0-7: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2110.0-8 vs 2106.0-8: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-skx 4t2c mrr
 - type: "table"
@@ -2247,30 +3020,28 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'MRR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2005.0-5"
-      data-set: "vpp-performance-changes-3n-skx-mrr-h1"
-    - title: "2009.0-5"
-      data-set: "vpp-performance-changes-3n-skx-mrr-ref-env-old"
-    - title: "2009.0-6"
-      data-set: "vpp-performance-changes-3n-skx-mrr-ref-env-new"
-    - title: "2101.0-6"
-      data-set: "vpp-performance-changes-3n-skx-mrr-cmp"
+    - title: "2101.0-7"
+      data-set: "vpp-3n-skx-hist-iter-mrr-new-env"
+    - title: "2106.0-7"
+      data-set: "vpp-3n-skx-prev-iter-mrr-old-env"
+    - title: "2106.0-8"
+      data-set: "vpp-3n-skx-prev-iter-mrr-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-3n-skx-curr-iter-mrr"
   comparisons:
-    - title: "2009.0-6 vs 2009.0-5"
+    - title: "2106.0-8 vs 2106.0-7"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-3n-skx-4t2c-mrr-rca1.yaml"
-    - title: "2101.0-6 vs 2009.0-6"
+    - title: "2110.0-8 vs 2106.0-8"
       reference: 3
       compare: 4
-#      rca-file: "rca/rca-3n-skx-4t2c-mrr-rca2.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 3n-skx with xxv710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "7" for CSIT rls2106, "8" for CSIT rls2110).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2106.0-8 vs 2106.0-7: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2110.0-8 vs 2106.0-8: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-skx 8t4c mrr
 - type: "table"
@@ -2280,30 +3051,28 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'8T4C' and 'MRR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2005.0-5"
-      data-set: "vpp-performance-changes-3n-skx-mrr-h1"
-    - title: "2009.0-5"
-      data-set: "vpp-performance-changes-3n-skx-mrr-ref-env-old"
-    - title: "2009.0-6"
-      data-set: "vpp-performance-changes-3n-skx-mrr-ref-env-new"
-    - title: "2101.0-6"
-      data-set: "vpp-performance-changes-3n-skx-mrr-cmp"
+    - title: "2101.0-7"
+      data-set: "vpp-3n-skx-hist-iter-mrr-new-env"
+    - title: "2106.0-7"
+      data-set: "vpp-3n-skx-prev-iter-mrr-old-env"
+    - title: "2106.0-8"
+      data-set: "vpp-3n-skx-prev-iter-mrr-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-3n-skx-curr-iter-mrr"
   comparisons:
-    - title: "2009.0-6 vs 2009.0-5"
+    - title: "2106.0-8 vs 2106.0-7"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-3n-skx-8t4c-mrr-rca1.yaml"
-    - title: "2101.0-6 vs 2009.0-6"
+    - title: "2110.0-8 vs 2106.0-8"
       reference: 3
       compare: 4
-#      rca-file: "rca/rca-3n-skx-8t4c-mrr-rca2.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 3n-skx with xxv710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "7" for CSIT rls2106, "8" for CSIT rls2110).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2106.0-8 vs 2106.0-7: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2110.0-8 vs 2106.0-8: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-skx 2t1c mrr
 - type: "table"
@@ -2313,30 +3082,28 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'MRR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2005.0-5"
-      data-set: "vpp-performance-changes-2n-skx-mrr-h1"
-    - title: "2009.0-5"
-      data-set: "vpp-performance-changes-2n-skx-mrr-ref-env-old"
-    - title: "2009.0-6"
-      data-set: "vpp-performance-changes-2n-skx-mrr-ref-env-new"
-    - title: "2101.0-6"
-      data-set: "vpp-performance-changes-2n-skx-mrr-cmp"
+    - title: "2101.0-7"
+      data-set: "vpp-2n-skx-hist-iter-mrr-new-env"
+    - title: "2106.0-7"
+      data-set: "vpp-2n-skx-prev-iter-mrr-old-env"
+    - title: "2106.0-8"
+      data-set: "vpp-2n-skx-prev-iter-mrr-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-2n-skx-curr-iter-mrr"
   comparisons:
-    - title: "2009.0-6 vs 2009.0-5"
+    - title: "2106.0-8 vs 2106.0-7"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-2n-skx-2t1c-mrr-rca1.yaml"
-    - title: "2101.0-6 vs 2009.0-6"
+    - title: "2110.0-8 vs 2106.0-8"
       reference: 3
       compare: 4
-#      rca-file: "rca/rca-2n-skx-2t1c-mrr-rca2.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 2n-skx with xxv710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "7" for CSIT rls2106, "8" for CSIT rls2110).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2106.0-8 vs 2106.0-7: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2110.0-8 vs 2106.0-8: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-skx 4t2c mrr
 - type: "table"
@@ -2346,30 +3113,28 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'MRR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2005.0-5"
-      data-set: "vpp-performance-changes-2n-skx-mrr-h1"
-    - title: "2009.0-5"
-      data-set: "vpp-performance-changes-2n-skx-mrr-ref-env-old"
-    - title: "2009.0-6"
-      data-set: "vpp-performance-changes-2n-skx-mrr-ref-env-new"
-    - title: "2101.0-6"
-      data-set: "vpp-performance-changes-2n-skx-mrr-cmp"
+    - title: "2101.0-7"
+      data-set: "vpp-2n-skx-hist-iter-mrr-new-env"
+    - title: "2106.0-7"
+      data-set: "vpp-2n-skx-prev-iter-mrr-old-env"
+    - title: "2106.0-8"
+      data-set: "vpp-2n-skx-prev-iter-mrr-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-2n-skx-curr-iter-mrr"
   comparisons:
-    - title: "2009.0-6 vs 2009.0-5"
+    - title: "2106.0-8 vs 2106.0-7"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-2n-skx-4t2c-mrr-rca1.yaml"
-    - title: "2101.0-6 vs 2009.0-6"
+    - title: "2110.0-8 vs 2106.0-8"
       reference: 3
       compare: 4
-#      rca-file: "rca/rca-2n-skx-4t2c-mrr-rca2.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 2n-skx with xxv710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "7" for CSIT rls2106, "8" for CSIT rls2110).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2106.0-8 vs 2106.0-7: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2110.0-8 vs 2106.0-8: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-skx 8t4c mrr
 - type: "table"
@@ -2379,30 +3144,28 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'8T4C' and 'MRR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2005.0-5"
-      data-set: "vpp-performance-changes-2n-skx-mrr-h1"
-    - title: "2009.0-5"
-      data-set: "vpp-performance-changes-2n-skx-mrr-ref-env-old"
-    - title: "2009.0-6"
-      data-set: "vpp-performance-changes-2n-skx-mrr-ref-env-new"
-    - title: "2101.0-6"
-      data-set: "vpp-performance-changes-2n-skx-mrr-cmp"
+    - title: "2101.0-7"
+      data-set: "vpp-2n-skx-hist-iter-mrr-new-env"
+    - title: "2106.0-7"
+      data-set: "vpp-2n-skx-prev-iter-mrr-old-env"
+    - title: "2106.0-8"
+      data-set: "vpp-2n-skx-prev-iter-mrr-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-2n-skx-curr-iter-mrr"
   comparisons:
-    - title: "2009.0-6 vs 2009.0-5"
+    - title: "2106.0-8 vs 2106.0-7"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-2n-skx-8t4c-mrr-rca1.yaml"
-    - title: "2101.0-6 vs 2009.0-6"
+    - title: "2110.0-8 vs 2106.0-8"
       reference: 3
       compare: 4
-#      rca-file: "rca/rca-2n-skx-8t4c-mrr-rca2.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 2n-skx with xxv710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "7" for CSIT rls2106, "8" for CSIT rls2110).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2106.0-8 vs 2106.0-7: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2110.0-8 vs 2106.0-8: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-xxv710 2t1c mrr
 - type: "table"
@@ -2412,30 +3175,28 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'MRR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2005.0-5"
-      data-set: "vpp-performance-changes-2n-clx-mrr-h1"
-    - title: "2009.0-5"
-      data-set: "vpp-performance-changes-2n-clx-mrr-ref-env-old"
-    - title: "2009.0-6"
-      data-set: "vpp-performance-changes-2n-clx-mrr-ref-env-new"
-    - title: "2101.0-6"
-      data-set: "vpp-performance-changes-2n-clx-mrr-cmp"
+    - title: "2101.0-7"
+      data-set: "vpp-2n-clx-hist-iter-mrr-new-env"
+    - title: "2106.0-7"
+      data-set: "vpp-2n-clx-prev-iter-mrr-old-env"
+    - title: "2106.0-8"
+      data-set: "vpp-2n-clx-prev-iter-mrr-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-2n-clx-curr-iter-mrr"
   comparisons:
-    - title: "2009.0-6 vs 2009.0-5"
+    - title: "2106.0-8 vs 2106.0-7"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-2n-clx-2t1c-mrr-rca1.yaml"
-    - title: "2101.0-6 vs 2009.0-6"
+    - title: "2110.0-8 vs 2106.0-8"
       reference: 3
       compare: 4
-#      rca-file: "rca/rca-2n-clx-2t1c-mrr-rca2.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 2n-clx with xxv710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "7" for CSIT rls2106, "8" for CSIT rls2110).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2106.0-8 vs 2106.0-7: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2110.0-8 vs 2106.0-8: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-xxv710 4t2c mrr
 - type: "table"
@@ -2445,30 +3206,28 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'MRR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2005.0-5"
-      data-set: "vpp-performance-changes-2n-clx-mrr-h1"
-    - title: "2009.0-5"
-      data-set: "vpp-performance-changes-2n-clx-mrr-ref-env-old"
-    - title: "2009.0-6"
-      data-set: "vpp-performance-changes-2n-clx-mrr-ref-env-new"
-    - title: "2101.0-6"
-      data-set: "vpp-performance-changes-2n-clx-mrr-cmp"
+    - title: "2101.0-7"
+      data-set: "vpp-2n-clx-hist-iter-mrr-new-env"
+    - title: "2106.0-7"
+      data-set: "vpp-2n-clx-prev-iter-mrr-old-env"
+    - title: "2106.0-8"
+      data-set: "vpp-2n-clx-prev-iter-mrr-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-2n-clx-curr-iter-mrr"
   comparisons:
-    - title: "2009.0-6 vs 2009.0-5"
+    - title: "2106.0-8 vs 2106.0-7"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-2n-clx-4t2c-mrr-rca1.yaml"
-    - title: "2101.0-6 vs 2009.0-6"
+    - title: "2110.0-8 vs 2106.0-8"
       reference: 3
       compare: 4
-#      rca-file: "rca/rca-2n-clx-4t2c-mrr-rca2.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 2n-clx with xxv710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "7" for CSIT rls2106, "8" for CSIT rls2110).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2106.0-8 vs 2106.0-7: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2110.0-8 vs 2106.0-8: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-xxv710 8t4c mrr
 - type: "table"
@@ -2478,30 +3237,28 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'8T4C' and 'MRR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2005.0-5"
-      data-set: "vpp-performance-changes-2n-clx-mrr-h1"
-    - title: "2009.0-5"
-      data-set: "vpp-performance-changes-2n-clx-mrr-ref-env-old"
-    - title: "2009.0-6"
-      data-set: "vpp-performance-changes-2n-clx-mrr-ref-env-new"
-    - title: "2101.0-6"
-      data-set: "vpp-performance-changes-2n-clx-mrr-cmp"
+    - title: "2101.0-7"
+      data-set: "vpp-2n-clx-hist-iter-mrr-new-env"
+    - title: "2106.0-7"
+      data-set: "vpp-2n-clx-prev-iter-mrr-old-env"
+    - title: "2106.0-8"
+      data-set: "vpp-2n-clx-prev-iter-mrr-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-2n-clx-curr-iter-mrr"
   comparisons:
-    - title: "2009.0-6 vs 2009.0-5"
+    - title: "2106.0-8 vs 2106.0-7"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-2n-clx-8t4c-mrr-rca1.yaml"
-    - title: "2101.0-6 vs 2009.0-6"
+    - title: "2110.0-8 vs 2106.0-8"
       reference: 3
       compare: 4
-#      rca-file: "rca/rca-2n-clx-8t4c-mrr-rca2.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 2n-clx with xxv710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "7" for CSIT rls2106, "8" for CSIT rls2110).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2106.0-8 vs 2106.0-7: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2110.0-8 vs 2106.0-8: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-cx556a 2t1c mrr
 - type: "table"
@@ -2511,30 +3268,28 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'MRR' and 'NIC_Mellanox-CX556A' and not 'NF_DENSITY'"
   columns:
-    - title: "2005.0-5"
-      data-set: "vpp-performance-changes-2n-clx-mrr-h1"
-    - title: "2009.0-5"
-      data-set: "vpp-performance-changes-2n-clx-mrr-ref-env-old"
-    - title: "2009.0-6"
-      data-set: "vpp-performance-changes-2n-clx-mrr-ref-env-new"
-    - title: "2101.0-6"
-      data-set: "vpp-performance-changes-2n-clx-mrr-cmp"
+    - title: "2101.0-7"
+      data-set: "vpp-2n-clx-hist-iter-mrr-new-env"
+    - title: "2106.0-7"
+      data-set: "vpp-2n-clx-prev-iter-mrr-old-env"
+    - title: "2106.0-8"
+      data-set: "vpp-2n-clx-prev-iter-mrr-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-2n-clx-curr-iter-mrr"
   comparisons:
-    - title: "2009.0-6 vs 2009.0-5"
+    - title: "2106.0-8 vs 2106.0-7"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-2n-clx-2t1c-mrr-rca3.yaml"
-    - title: "2101.0-6 vs 2009.0-6"
+    - title: "2110.0-8 vs 2106.0-8"
       reference: 3
       compare: 4
-#      rca-file: "rca/rca-2n-clx-2t1c-mrr-rca4.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 2n-clx with cx556a.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "7" for CSIT rls2106, "8" for CSIT rls2110).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2106.0-8 vs 2106.0-7: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2110.0-8 vs 2106.0-8: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-cx556a 4t2c mrr
 - type: "table"
@@ -2544,30 +3299,28 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'MRR' and 'NIC_Mellanox-CX556A' and not 'NF_DENSITY'"
   columns:
-    - title: "2005.0-5"
-      data-set: "vpp-performance-changes-2n-clx-mrr-h1"
-    - title: "2009.0-5"
-      data-set: "vpp-performance-changes-2n-clx-mrr-ref-env-old"
-    - title: "2009.0-6"
-      data-set: "vpp-performance-changes-2n-clx-mrr-ref-env-new"
-    - title: "2101.0-6"
-      data-set: "vpp-performance-changes-2n-clx-mrr-cmp"
+    - title: "2101.0-7"
+      data-set: "vpp-2n-clx-hist-iter-mrr-new-env"
+    - title: "2106.0-7"
+      data-set: "vpp-2n-clx-prev-iter-mrr-old-env"
+    - title: "2106.0-8"
+      data-set: "vpp-2n-clx-prev-iter-mrr-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-2n-clx-curr-iter-mrr"
   comparisons:
-    - title: "2009.0-6 vs 2009.0-5"
+    - title: "2106.0-8 vs 2106.0-7"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-2n-clx-4t2c-mrr-rca3.yaml"
-    - title: "2101.0-6 vs 2009.0-6"
+    - title: "2110.0-8 vs 2106.0-8"
       reference: 3
       compare: 4
-#      rca-file: "rca/rca-2n-clx-4t2c-mrr-rca4.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 2n-clx with cx556a.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "7" for CSIT rls2106, "8" for CSIT rls2110).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2106.0-8 vs 2106.0-7: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2110.0-8 vs 2106.0-8: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-cx556a 8t4c mrr
 - type: "table"
@@ -2577,30 +3330,28 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'8T4C' and 'MRR' and 'NIC_Mellanox-CX556A' and not 'NF_DENSITY'"
   columns:
-    - title: "2005.0-5"
-      data-set: "vpp-performance-changes-2n-clx-mrr-h1"
-    - title: "2009.0-5"
-      data-set: "vpp-performance-changes-2n-clx-mrr-ref-env-old"
-    - title: "2009.0-6"
-      data-set: "vpp-performance-changes-2n-clx-mrr-ref-env-new"
-    - title: "2101.0-6"
-      data-set: "vpp-performance-changes-2n-clx-mrr-cmp"
+    - title: "2101.0-7"
+      data-set: "vpp-2n-clx-hist-iter-mrr-new-env"
+    - title: "2106.0-7"
+      data-set: "vpp-2n-clx-prev-iter-mrr-old-env"
+    - title: "2106.0-8"
+      data-set: "vpp-2n-clx-prev-iter-mrr-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-2n-clx-curr-iter-mrr"
   comparisons:
-    - title: "2009.0-6 vs 2009.0-5"
+    - title: "2106.0-8 vs 2106.0-7"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-2n-clx-8t4c-mrr-rca3.yaml"
-    - title: "2101.0-6 vs 2009.0-6"
+    - title: "2110.0-8 vs 2106.0-8"
       reference: 3
       compare: 4
-#      rca-file: "rca/rca-2n-clx-8t4c-mrr-rca4.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 2n-clx with cx556a.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "7" for CSIT rls2106, "8" for CSIT rls2110).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2106.0-8 vs 2106.0-7: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2110.0-8 vs 2106.0-8: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-zn2-xxv710 2t1c mrr
 - type: "table"
@@ -2610,30 +3361,28 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'MRR' and 'NIC_Intel-XXV710'"
   columns:
-#     - title: "2005.0-5"
-#       data-set: "vpp-performance-changes-2n-zn2-mrr-h1"
-    - title: "2009.0-5"
-      data-set: "vpp-performance-changes-2n-zn2-mrr-ref-env-old"
-    - title: "2009.0-6"
-      data-set: "vpp-performance-changes-2n-zn2-mrr-ref-env-new"
-    - title: "2101.0-6"
-      data-set: "vpp-performance-changes-2n-zn2-mrr-cmp"
-  comparisons:
-    - title: "2009.0-6 vs 2009.0-5"
-      reference: 1  # 2
-      compare: 2  # 3
-#      rca-file: "rca/rca-2n-zn2-2t1c-mrr-rca1.yaml"
-    - title: "2101.0-6 vs 2009.0-6"
-      reference: 2  # 3
-      compare: 3  # 4
-#      rca-file: "rca/rca-2n-zn2-2t1c-mrr-rca2.yaml"
+    - title: "2101.0-7"
+      data-set: "vpp-2n-zn2-hist-iter-mrr-new-env"
+    - title: "2106.0-7"
+      data-set: "vpp-2n-zn2-prev-iter-mrr-old-env"
+    - title: "2106.0-8"
+      data-set: "vpp-2n-zn2-prev-iter-mrr-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-2n-zn2-curr-iter-mrr"
+  comparisons:
+    - title: "2106.0-8 vs 2106.0-7"
+      reference: 2
+      compare: 3
+    - title: "2110.0-8 vs 2106.0-8"
+      reference: 3
+      compare: 4
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 2n-zn2 with xxv710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "7" for CSIT rls2106, "8" for CSIT rls2110).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2106.0-8 vs 2106.0-7: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2110.0-8 vs 2106.0-8: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-zn2-xxv710 4t2c mrr
 - type: "table"
@@ -2643,30 +3392,28 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'MRR' and 'NIC_Intel-XXV710'"
   columns:
-#     - title: "2005.0-5"
-#       data-set: "vpp-performance-changes-2n-zn2-mrr-h1"
-    - title: "2009.0-5"
-      data-set: "vpp-performance-changes-2n-zn2-mrr-ref-env-old"
-    - title: "2009.0-6"
-      data-set: "vpp-performance-changes-2n-zn2-mrr-ref-env-new"
-    - title: "2101.0-6"
-      data-set: "vpp-performance-changes-2n-zn2-mrr-cmp"
-  comparisons:
-    - title: "2009.0-6 vs 2009.0-5"
-      reference: 1  # 2
-      compare: 2  # 3
-#      rca-file: "rca/rca-2n-zn2-4t2c-mrr-rca1.yaml"
-    - title: "2101.0-6 vs 2009.0-6"
-      reference: 2  # 3
-      compare: 3  # 4
-#      rca-file: "rca/rca-2n-zn2-4t2c-mrr-rca2.yaml"
+    - title: "2101.0-7"
+      data-set: "vpp-2n-zn2-hist-iter-mrr-new-env"
+    - title: "2106.0-7"
+      data-set: "vpp-2n-zn2-prev-iter-mrr-old-env"
+    - title: "2106.0-8"
+      data-set: "vpp-2n-zn2-prev-iter-mrr-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-2n-zn2-curr-iter-mrr"
+  comparisons:
+    - title: "2106.0-8 vs 2106.0-7"
+      reference: 2
+      compare: 3
+    - title: "2110.0-8 vs 2106.0-8"
+      reference: 3
+      compare: 4
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 2n-zn2 with xxv710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "7" for CSIT rls2106, "8" for CSIT rls2110).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2106.0-8 vs 2106.0-7: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2110.0-8 vs 2106.0-8: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-zn2-xxv710 8t4c mrr
 - type: "table"
@@ -2676,30 +3423,28 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'8T4C' and 'MRR' and 'NIC_Intel-XXV710'"
   columns:
-#     - title: "2005.0-5"
-#       data-set: "vpp-performance-changes-2n-zn2-mrr-h1"
-    - title: "2009.0-5"
-      data-set: "vpp-performance-changes-2n-zn2-mrr-ref-env-old"
-    - title: "2009.0-6"
-      data-set: "vpp-performance-changes-2n-zn2-mrr-ref-env-new"
-    - title: "2101.0-6"
-      data-set: "vpp-performance-changes-2n-zn2-mrr-cmp"
-  comparisons:
-    - title: "2009.0-6 vs 2009.0-5"
-      reference: 1  # 2
-      compare: 2  # 3
-#      rca-file: "rca/rca-2n-zn2-8t4c-mrr-rca1.yaml"
-    - title: "2101.0-6 vs 2009.0-6"
-      reference: 2  # 3
-      compare: 3  # 4
-#      rca-file: "rca/rca-2n-zn2-8t4c-mrr-rca2.yaml"
+    - title: "2101.0-7"
+      data-set: "vpp-2n-zn2-hist-iter-mrr-new-env"
+    - title: "2106.0-7"
+      data-set: "vpp-2n-zn2-prev-iter-mrr-old-env"
+    - title: "2106.0-8"
+      data-set: "vpp-2n-zn2-prev-iter-mrr-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-2n-zn2-curr-iter-mrr"
+  comparisons:
+    - title: "2106.0-8 vs 2106.0-7"
+      reference: 2
+      compare: 3
+    - title: "2110.0-8 vs 2106.0-8"
+      reference: 3
+      compare: 4
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 2n-zn2 with xxv710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "7" for CSIT rls2106, "8" for CSIT rls2110).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2106.0-8 vs 2106.0-7: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2110.0-8 vs 2106.0-8: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-dnv 1t1c mrr
 - type: "table"
@@ -2709,28 +3454,28 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C'"
   columns:
-    - title: "2005.0-5"
-      data-set: "vpp-performance-changes-2n-dnv-mrr-h1"
-    - title: "2009.0-5"
-      data-set: "vpp-performance-changes-2n-dnv-mrr-ref-env-old"
-#     - title: "2009.0-6"
-#       data-set: "vpp-performance-changes-2n-dnv-mrr-ref-env-new"
-    - title: "2101.0-6"
-      data-set: "vpp-performance-changes-2n-dnv-mrr-cmp"
-  comparisons:
-#     - title: "2009.0-6 vs 2009.0-5"
-#       reference: 2
-#       compare: 3
-    - title: "2101.0-6 vs 2009.0-5"
+    - title: "2101.0-7"
+      data-set: "vpp-2n-dnv-hist-iter-mrr-new-env"
+    - title: "2106.0-7"
+      data-set: "vpp-2n-dnv-prev-iter-mrr-old-env"
+    - title: "2106.0-8"
+      data-set: "vpp-2n-dnv-prev-iter-mrr-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-2n-dnv-curr-iter-mrr"
+  comparisons:
+    - title: "2106.0-8 vs 2106.0-7"
       reference: 2
       compare: 3
+    - title: "2110.0-8 vs 2106.0-8"
+      reference: 3
+      compare: 4
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 2n-dnv with x553.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "7" for CSIT rls2106, "8" for CSIT rls2110).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-#     - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2101.0-6 vs 2009.0-5: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2106.0-8 vs 2106.0-7: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2110.0-8 vs 2106.0-8: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-dnv 2t2c mrr
 - type: "table"
@@ -2740,28 +3485,28 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C'"
   columns:
-    - title: "2005.0-5"
-      data-set: "vpp-performance-changes-2n-dnv-mrr-h1"
-    - title: "2009.0-5"
-      data-set: "vpp-performance-changes-2n-dnv-mrr-ref-env-old"
-#     - title: "2009.0-6"
-#       data-set: "vpp-performance-changes-2n-dnv-mrr-ref-env-new"
-    - title: "2101.0-6"
-      data-set: "vpp-performance-changes-2n-dnv-mrr-cmp"
-  comparisons:
-#     - title: "2009.0-6 vs 2009.0-5"
-#       reference: 2
-#       compare: 3
-    - title: "2101.0-6 vs 2009.0-5"
+    - title: "2101.0-7"
+      data-set: "vpp-2n-dnv-hist-iter-mrr-new-env"
+    - title: "2106.0-7"
+      data-set: "vpp-2n-dnv-prev-iter-mrr-old-env"
+    - title: "2106.0-8"
+      data-set: "vpp-2n-dnv-prev-iter-mrr-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-2n-dnv-curr-iter-mrr"
+  comparisons:
+    - title: "2106.0-8 vs 2106.0-7"
       reference: 2
       compare: 3
+    - title: "2110.0-8 vs 2106.0-8"
+      reference: 3
+      compare: 4
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 2n-dnv with x553.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "7" for CSIT rls2106, "8" for CSIT rls2110).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-#     - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2101.0-6 vs 2009.0-5: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2106.0-8 vs 2106.0-7: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2110.0-8 vs 2106.0-8: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-dnv 4t4c mrr
 - type: "table"
@@ -2771,28 +3516,28 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'4T4C'"
   columns:
-    - title: "2005.0-5"
-      data-set: "vpp-performance-changes-2n-dnv-mrr-h1"
-    - title: "2009.0-5"
-      data-set: "vpp-performance-changes-2n-dnv-mrr-ref-env-old"
-#     - title: "2009.0-6"
-#       data-set: "vpp-performance-changes-2n-dnv-mrr-ref-env-new"
-    - title: "2101.0-6"
-      data-set: "vpp-performance-changes-2n-dnv-mrr-cmp"
-  comparisons:
-#     - title: "2009.0-6 vs 2009.0-5"
-#       reference: 2
-#       compare: 3
-    - title: "2101.0-6 vs 2009.0-5"
+    - title: "2101.0-7"
+      data-set: "vpp-2n-dnv-hist-iter-mrr-new-env"
+    - title: "2106.0-7"
+      data-set: "vpp-2n-dnv-prev-iter-mrr-old-env"
+    - title: "2106.0-8"
+      data-set: "vpp-2n-dnv-prev-iter-mrr-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-2n-dnv-curr-iter-mrr"
+  comparisons:
+    - title: "2106.0-8 vs 2106.0-7"
       reference: 2
       compare: 3
+    - title: "2110.0-8 vs 2106.0-8"
+      reference: 3
+      compare: 4
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 2n-dnv with x553.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "7" for CSIT rls2106, "8" for CSIT rls2110).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-#     - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2101.0-6 vs 2009.0-5: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2106.0-8 vs 2106.0-7: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2110.0-8 vs 2106.0-8: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-dnv 1t1c mrr
 - type: "table"
@@ -2802,28 +3547,28 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C'"
   columns:
-    - title: "2005.0-5"
-      data-set: "vpp-performance-changes-3n-dnv-mrr-h1"
-    - title: "2009.0-5"
-      data-set: "vpp-performance-changes-3n-dnv-mrr-ref-env-old"
-#     - title: "2009.0-6"
-#       data-set: "vpp-performance-changes-2n-dnv-mrr-ref-env-new"
-    - title: "2101.0-6"
-      data-set: "vpp-performance-changes-3n-dnv-mrr-cmp"
-  comparisons:
-#     - title: "2009.0-6 vs 2009.0-5"
-#       reference: 2
-#       compare: 3
-    - title: "2101.0-6 vs 2009.0-5"
+    - title: "2101.0-7"
+      data-set: "vpp-3n-dnv-hist-iter-mrr-new-env"
+    - title: "2106.0-7"
+      data-set: "vpp-3n-dnv-prev-iter-mrr-old-env"
+    - title: "2106.0-8"
+      data-set: "vpp-3n-dnv-prev-iter-mrr-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-3n-dnv-curr-iter-mrr"
+  comparisons:
+    - title: "2106.0-8 vs 2106.0-7"
       reference: 2
       compare: 3
+    - title: "2110.0-8 vs 2106.0-8"
+      reference: 3
+      compare: 4
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 3n-dnv with x553.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "7" for CSIT rls2106, "8" for CSIT rls2110).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-#     - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2101.0-6 vs 2009.0-5: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2106.0-8 vs 2106.0-7: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2110.0-8 vs 2106.0-8: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-dnv 2t2c mrr
 - type: "table"
@@ -2833,28 +3578,28 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C'"
   columns:
-    - title: "2005.0-5"
-      data-set: "vpp-performance-changes-3n-dnv-mrr-h1"
-    - title: "2009.0-5"
-      data-set: "vpp-performance-changes-3n-dnv-mrr-ref-env-old"
-#     - title: "2009.0-6"
-#       data-set: "vpp-performance-changes-2n-dnv-mrr-ref-env-new"
-    - title: "2101.0-6"
-      data-set: "vpp-performance-changes-3n-dnv-mrr-cmp"
-  comparisons:
-#     - title: "2009.0-6 vs 2009.0-5"
-#       reference: 2
-#       compare: 3
-    - title: "2101.0-6 vs 2009.0-5"
+    - title: "2101.0-7"
+      data-set: "vpp-3n-dnv-hist-iter-mrr-new-env"
+    - title: "2106.0-7"
+      data-set: "vpp-3n-dnv-prev-iter-mrr-old-env"
+    - title: "2106.0-8"
+      data-set: "vpp-3n-dnv-prev-iter-mrr-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-3n-dnv-curr-iter-mrr"
+  comparisons:
+    - title: "2106.0-8 vs 2106.0-7"
       reference: 2
       compare: 3
+    - title: "2110.0-8 vs 2106.0-8"
+      reference: 3
+      compare: 4
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 3n-dnv with x553.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "7" for CSIT rls2106, "8" for CSIT rls2110).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-#     - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2101.0-6 vs 2009.0-5: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2106.0-8 vs 2106.0-7: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2110.0-8 vs 2106.0-8: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-dnv 4t4c mrr
 - type: "table"
@@ -2864,28 +3609,28 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'4T4C'"
   columns:
-    - title: "2005.0-5"
-      data-set: "vpp-performance-changes-3n-dnv-mrr-h1"
-    - title: "2009.0-5"
-      data-set: "vpp-performance-changes-3n-dnv-mrr-ref-env-old"
-#     - title: "2009.0-6"
-#       data-set: "vpp-performance-changes-2n-dnv-mrr-ref-env-new"
-    - title: "2101.0-6"
-      data-set: "vpp-performance-changes-3n-dnv-mrr-cmp"
-  comparisons:
-#     - title: "2009.0-6 vs 2009.0-5"
-#       reference: 2
-#       compare: 3
-    - title: "2101.0-6 vs 2009.0-5"
+    - title: "2101.0-7"
+      data-set: "vpp-3n-dnv-hist-iter-mrr-new-env"
+    - title: "2106.0-7"
+      data-set: "vpp-3n-dnv-prev-iter-mrr-old-env"
+    - title: "2106.0-8"
+      data-set: "vpp-3n-dnv-prev-iter-mrr-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-3n-dnv-curr-iter-mrr"
+  comparisons:
+    - title: "2106.0-8 vs 2106.0-7"
       reference: 2
       compare: 3
+    - title: "2110.0-8 vs 2106.0-8"
+      reference: 3
+      compare: 4
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 3n-dnv with x553.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "7" for CSIT rls2106, "8" for CSIT rls2110).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-#     - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2101.0-6 vs 2009.0-5: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2106.0-8 vs 2106.0-7: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2110.0-8 vs 2106.0-8: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-tsh 1t1c mrr
 - type: "table"
@@ -2895,28 +3640,28 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C'"
   columns:
-    - title: "2005.0-5"
-      data-set: "vpp-performance-changes-3n-tsh-mrr-h1"
-    - title: "2009.0-5"
-      data-set: "vpp-performance-changes-3n-tsh-mrr-ref-env-old"
-    - title: "2009.0-6"
-      data-set: "vpp-performance-changes-3n-tsh-mrr-ref-env-new"
-    - title: "2101.0-6"
-      data-set: "vpp-performance-changes-3n-tsh-mrr-cmp"
+    - title: "2101.0-7"
+      data-set: "vpp-3n-tsh-hist-iter-mrr-new-env"
+    - title: "2106.0-7"
+      data-set: "vpp-3n-tsh-prev-iter-mrr-old-env"
+    - title: "2106.0-8"
+      data-set: "vpp-3n-tsh-prev-iter-mrr-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-3n-tsh-curr-iter-mrr"
   comparisons:
-    - title: "2009.0-6 vs 2009.0-5"
+    - title: "2106.0-8 vs 2106.0-7"
       reference: 2
       compare: 3
-    - title: "2101.0-6 vs 2009.0-6"
+    - title: "2110.0-8 vs 2106.0-8"
       reference: 3
       compare: 4
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 3n-tsh with x520.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "7" for CSIT rls2106, "8" for CSIT rls2110).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2106.0-8 vs 2106.0-7: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2110.0-8 vs 2106.0-8: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-tsh 2t2c mrr
 - type: "table"
@@ -2926,28 +3671,28 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C'"
   columns:
-    - title: "2005.0-5"
-      data-set: "vpp-performance-changes-3n-tsh-mrr-h1"
-    - title: "2009.0-5"
-      data-set: "vpp-performance-changes-3n-tsh-mrr-ref-env-old"
-    - title: "2009.0-6"
-      data-set: "vpp-performance-changes-3n-tsh-mrr-ref-env-new"
-    - title: "2101.0-6"
-      data-set: "vpp-performance-changes-3n-tsh-mrr-cmp"
+    - title: "2101.0-7"
+      data-set: "vpp-3n-tsh-hist-iter-mrr-new-env"
+    - title: "2106.0-7"
+      data-set: "vpp-3n-tsh-prev-iter-mrr-old-env"
+    - title: "2106.0-8"
+      data-set: "vpp-3n-tsh-prev-iter-mrr-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-3n-tsh-curr-iter-mrr"
   comparisons:
-    - title: "2009.0-6 vs 2009.0-5"
+    - title: "2106.0-8 vs 2106.0-7"
       reference: 2
       compare: 3
-    - title: "2101.0-6 vs 2009.0-6"
+    - title: "2110.0-8 vs 2106.0-8"
       reference: 3
       compare: 4
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 3n-tsh with x520.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "7" for CSIT rls2106, "8" for CSIT rls2110).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2106.0-8 vs 2106.0-7: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2110.0-8 vs 2106.0-8: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-tsh 4t4c mrr
 - type: "table"
@@ -2957,28 +3702,28 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'4T4C'"
   columns:
-    - title: "2005.0-5"
-      data-set: "vpp-performance-changes-3n-tsh-mrr-h1"
-    - title: "2009.0-5"
-      data-set: "vpp-performance-changes-3n-tsh-mrr-ref-env-old"
-    - title: "2009.0-6"
-      data-set: "vpp-performance-changes-3n-tsh-mrr-ref-env-new"
-    - title: "2101.0-6"
-      data-set: "vpp-performance-changes-3n-tsh-mrr-cmp"
+    - title: "2101.0-7"
+      data-set: "vpp-3n-tsh-hist-iter-mrr-new-env"
+    - title: "2106.0-7"
+      data-set: "vpp-3n-tsh-prev-iter-mrr-old-env"
+    - title: "2106.0-8"
+      data-set: "vpp-3n-tsh-prev-iter-mrr-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-3n-tsh-curr-iter-mrr"
   comparisons:
-    - title: "2009.0-6 vs 2009.0-5"
+    - title: "2106.0-8 vs 2106.0-7"
       reference: 2
       compare: 3
-    - title: "2101.0-6 vs 2009.0-6"
+    - title: "2110.0-8 vs 2106.0-8"
       reference: 3
       compare: 4
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 3n-tsh with x520.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "7" for CSIT rls2106, "8" for CSIT rls2110).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2106.0-8 vs 2106.0-7: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2110.0-8 vs 2106.0-8: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-tx2 1t1c mrr
 - type: "table"
@@ -2988,28 +3733,28 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C'"
   columns:
-#     - title: "2005.0-5"
-#       data-set: "vpp-performance-changes-2n-tx2-mrr-h1"
-#     - title: "2009.0-5"
-#       data-set: "vpp-performance-changes-2n-tx2-mrr-ref-env-old"
-    - title: "2009.0-6"
-      data-set: "vpp-performance-changes-2n-tx2-mrr-ref-env-new"
-    - title: "2101.0-6"
-      data-set: "vpp-performance-changes-2n-tx2-mrr-cmp"
-  comparisons:
-#     - title: "2009.0-6 vs 2009.0-5"
-#       reference: 2
-#       compare: 3
-    - title: "2101.0-6 vs 2009.0-6"
-      reference: 1
-      compare: 2
+    - title: "2101.0-7"
+      data-set: "vpp-2n-tx2-hist-iter-mrr-new-env"
+    - title: "2106.0-7"
+      data-set: "vpp-2n-tx2-prev-iter-mrr-old-env"
+    - title: "2106.0-8"
+      data-set: "vpp-2n-tx2-prev-iter-mrr-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-2n-tx2-curr-iter-mrr"
+  comparisons:
+    - title: "2106.0-8 vs 2106.0-7"
+      reference: 2
+      compare: 3
+    - title: "2110.0-8 vs 2106.0-8"
+      reference: 3
+      compare: 4
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 2n-tx2 with xl710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "7" for CSIT rls2106, "8" for CSIT rls2110).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-#     - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2106.0-8 vs 2106.0-7: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2110.0-8 vs 2106.0-8: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-tx2 2t2c mrr
 - type: "table"
@@ -3019,28 +3764,28 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C'"
   columns:
-#     - title: "2005.0-5"
-#       data-set: "vpp-performance-changes-2n-tx2-mrr-h1"
-#     - title: "2009.0-5"
-#       data-set: "vpp-performance-changes-2n-tx2-mrr-ref-env-old"
-    - title: "2009.0-6"
-      data-set: "vpp-performance-changes-2n-tx2-mrr-ref-env-new"
-    - title: "2101.0-6"
-      data-set: "vpp-performance-changes-2n-tx2-mrr-cmp"
-  comparisons:
-#     - title: "2009.0-6 vs 2009.0-5"
-#       reference: 2
-#       compare: 3
-    - title: "2101.0-6 vs 2009.0-6"
-      reference: 1
-      compare: 2
+    - title: "2101.0-7"
+      data-set: "vpp-2n-tx2-hist-iter-mrr-new-env"
+    - title: "2106.0-7"
+      data-set: "vpp-2n-tx2-prev-iter-mrr-old-env"
+    - title: "2106.0-8"
+      data-set: "vpp-2n-tx2-prev-iter-mrr-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-2n-tx2-curr-iter-mrr"
+  comparisons:
+    - title: "2106.0-8 vs 2106.0-7"
+      reference: 2
+      compare: 3
+    - title: "2110.0-8 vs 2106.0-8"
+      reference: 3
+      compare: 4
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 2n-tx2 with xl710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "7" for CSIT rls2106, "8" for CSIT rls2110).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-#     - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2106.0-8 vs 2106.0-7: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2110.0-8 vs 2106.0-8: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-tx2 4t4c mrr
 - type: "table"
@@ -3050,97 +3795,28 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'4T4C'"
   columns:
-#     - title: "2005.0-5"
-#       data-set: "vpp-performance-changes-2n-tx2-mrr-h1"
-#     - title: "2009.0-5"
-#       data-set: "vpp-performance-changes-2n-tx2-mrr-ref-env-old"
-    - title: "2009.0-6"
-      data-set: "vpp-performance-changes-2n-tx2-mrr-ref-env-new"
-    - title: "2101.0-6"
-      data-set: "vpp-performance-changes-2n-tx2-mrr-cmp"
-  comparisons:
-#     - title: "2009.0-6 vs 2009.0-5"
-#       reference: 2
-#       compare: 3
-    - title: "2101.0-6 vs 2009.0-6"
-      reference: 1
-      compare: 2
+    - title: "2101.0-7"
+      data-set: "vpp-2n-tx2-hist-iter-mrr-new-env"
+    - title: "2106.0-7"
+      data-set: "vpp-2n-tx2-prev-iter-mrr-old-env"
+    - title: "2106.0-8"
+      data-set: "vpp-2n-tx2-prev-iter-mrr-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-2n-tx2-curr-iter-mrr"
+  comparisons:
+    - title: "2106.0-8 vs 2106.0-7"
+      reference: 2
+      compare: 3
+    - title: "2110.0-8 vs 2106.0-8"
+      reference: 3
+      compare: 4
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 2n-tx2 with xl710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "7" for CSIT rls2106, "8" for CSIT rls2110).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-#     - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
-
-# VPP Comparison Across Testbeds 3n-hsw to 3n-skx 1c mrr
-- type: "table"
-  title: "VPP Comparison Across Testbeds 3n-hsw to 3n-skx 1c mrr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-hsw-3n-skx-1c-mrr"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "('NIC_Intel-XXV710' or 'NIC_Intel-XL710') and 'MRR' and '1C'"
-  columns:
-    - title: "3n-hsw xl710"
-      data-set: "vpp-compare-testbeds-mrr-ref"
-      tag: "NIC_Intel-XL710"
-    - title: "3n-skx xxv710"
-      data-set: "vpp-compare-testbeds-mrr-cmp"
-      tag: "NIC_Intel-XXV710"
-  comparisons:
-    - title: "Diff"
-      reference: 1
-      compare: 2
-  legend:
-    - ""
-    - "3n-hsw xl710, 3n-skx xxv710 - testbeds and NICs tested."
-    - "Diff - difference between 3n-hsw xl710 and 3n-skx xxv710 testbeds."
-
-# VPP Comparison Across Testbeds 3n-hsw to 3n-skx 2c mrr
-- type: "table"
-  title: "VPP Comparison Across Testbeds 3n-hsw to 3n-skx 2c mrr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-hsw-3n-skx-2c-mrr"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "('NIC_Intel-XXV710' or 'NIC_Intel-XL710') and 'MRR' and '2C'"
-  columns:
-    - title: "3n-hsw xl710"
-      data-set: "vpp-compare-testbeds-mrr-ref"
-      tag: "NIC_Intel-XL710"
-    - title: "3n-skx xxv710"
-      data-set: "vpp-compare-testbeds-mrr-cmp"
-      tag: "NIC_Intel-XXV710"
-  comparisons:
-    - title: "Diff"
-      reference: 1
-      compare: 2
-  legend:
-    - ""
-    - "3n-hsw xl710, 3n-skx xxv710 - testbeds and NICs tested."
-    - "Diff - difference between 3n-hsw xl710 and 3n-skx xxv710 testbeds."
-
-# VPP Comparison Across Testbeds 3n-hsw to 3n-skx 4c mrr
-- type: "table"
-  title: "VPP Comparison Across Testbeds 3n-hsw to 3n-skx 4c mrr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-hsw-3n-skx-4c-mrr"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "('NIC_Intel-XXV710' or 'NIC_Intel-XL710') and 'MRR' and '4C'"
-  columns:
-    - title: "3n-hsw xl710"
-      data-set: "vpp-compare-testbeds-mrr-ref"
-      tag: "NIC_Intel-XL710"
-    - title: "3n-skx xxv710"
-      data-set: "vpp-compare-testbeds-mrr-cmp"
-      tag: "NIC_Intel-XXV710"
-  comparisons:
-    - title: "Diff"
-      reference: 1
-      compare: 2
-  legend:
-    - ""
-    - "3n-hsw xl710, 3n-skx xxv710 - testbeds and NICs tested."
-    - "Diff - difference between 3n-hsw xl710 and 3n-skx xxv710 testbeds."
+    - '2106.0-8 vs 2106.0-7: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2110.0-8 vs 2106.0-8: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Comparison Across Testbeds 2n-skx to 2n-clx 2t1c mrr
 - type: "table"
@@ -3151,9 +3827,9 @@
   filter: "'2T1C' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2n-skx"
-      data-set: "vpp-compare-testbeds-mrr-skx-clx-ref"
+      data-set: "vpp-2n-skx-curr-iter-mrr"
     - title: "2n-clx"
-      data-set: "vpp-compare-testbeds-mrr-skx-clx-cmp"
+      data-set: "vpp-2n-clx-curr-iter-mrr"
   comparisons:
     - title: "Diff"
       reference: 1
@@ -3172,9 +3848,9 @@
   filter: "'4T2C' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2n-skx"
-      data-set: "vpp-compare-testbeds-mrr-skx-clx-ref"
+      data-set: "vpp-2n-skx-curr-iter-mrr"
     - title: "2n-clx"
-      data-set: "vpp-compare-testbeds-mrr-skx-clx-cmp"
+      data-set: "vpp-2n-clx-curr-iter-mrr"
   comparisons:
     - title: "Diff"
       reference: 1
@@ -3193,9 +3869,9 @@
   filter: "'8T4C' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2n-skx"
-      data-set: "vpp-compare-testbeds-mrr-skx-clx-ref"
+      data-set: "vpp-2n-skx-curr-iter-mrr"
     - title: "2n-clx"
-      data-set: "vpp-compare-testbeds-mrr-skx-clx-cmp"
+      data-set: "vpp-2n-clx-curr-iter-mrr"
   comparisons:
     - title: "Diff"
       reference: 1
@@ -3214,9 +3890,9 @@
   filter: "'MRR' and '1C' and 'NIC_Intel-XXV710'"
   columns:
     - title: "3n-skx"
-      data-set: "vpp-compare-topologies-mrr-ref"
+      data-set: "vpp-3n-skx-curr-iter-mrr"
     - title: "2n-skx"
-      data-set: "vpp-compare-topologies-mrr-cmp"
+      data-set: "vpp-2n-skx-curr-iter-mrr"
   comparisons:
     - title: "Diff"
       reference: 1
@@ -3235,9 +3911,9 @@
   filter: "'MRR' and '2C' and 'NIC_Intel-XXV710'"
   columns:
     - title: "3n-skx"
-      data-set: "vpp-compare-topologies-mrr-ref"
+      data-set: "vpp-3n-skx-curr-iter-mrr"
     - title: "2n-skx"
-      data-set: "vpp-compare-topologies-mrr-cmp"
+      data-set: "vpp-2n-skx-curr-iter-mrr"
   comparisons:
     - title: "Diff"
       reference: 1
@@ -3256,9 +3932,9 @@
   filter: "'MRR' and '4C' and 'NIC_Intel-XXV710'"
   columns:
     - title: "3n-skx"
-      data-set: "vpp-compare-topologies-mrr-ref"
+      data-set: "vpp-3n-skx-curr-iter-mrr"
     - title: "2n-skx"
-      data-set: "vpp-compare-topologies-mrr-cmp"
+      data-set: "vpp-2n-skx-curr-iter-mrr"
   comparisons:
     - title: "Diff"
       reference: 1
@@ -3268,75 +3944,6 @@
     - "3n-skx, 2n-skx - topologies tested."
     - "Diff - difference between 3n-skx and 2n-skx topologies."
 
-# VPP Comparison Across Testbeds 3n-hsw to 2n-clx 1c mrr
-- type: "table"
-  title: "VPP Comparison Across Testbeds 3n-hsw to 2n-clx 1c mrr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-hsw-2n-clx-1c-mrr"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "('NIC_Intel-XXV710' or 'NIC_Intel-XL710') and 'MRR' and '1C'"
-  columns:
-    - title: "3n-hsw xl710"
-      data-set: "vpp-compare-testbeds-mrr-hsw-clx-ref"
-      tag: "NIC_Intel-XL710"
-    - title: "2n-clx xxv710"
-      data-set: "vpp-compare-testbeds-mrr-hsw-clx-cmp"
-      tag: "NIC_Intel-XXV710"
-  comparisons:
-    - title: "Diff"
-      reference: 1
-      compare: 2
-  legend:
-    - ""
-    - "3n-hsw xl710, 2n-clx xxv710 - testbeds and NICs tested."
-    - "Diff - difference between 3n-hsw xl710 and 2n-clx xxv710 testbeds."
-
-# VPP Comparison Across Testbeds 3n-hsw to 2n-clx 2c mrr
-- type: "table"
-  title: "VPP Comparison Across Testbeds 3n-hsw to 2n-clx 2c mrr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-hsw-2n-clx-2c-mrr"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "('NIC_Intel-XXV710' or 'NIC_Intel-XL710') and 'MRR' and '2C'"
-  columns:
-    - title: "3n-hsw xl710"
-      data-set: "vpp-compare-testbeds-mrr-hsw-clx-ref"
-      tag: "NIC_Intel-XL710"
-    - title: "2n-clx xxv710"
-      data-set: "vpp-compare-testbeds-mrr-hsw-clx-cmp"
-      tag: "NIC_Intel-XXV710"
-  comparisons:
-    - title: "Diff"
-      reference: 1
-      compare: 2
-  legend:
-    - ""
-    - "3n-hsw xl710, 2n-clx xxv710 - testbeds and NICs tested."
-    - "Diff - difference between 3n-hsw xl710 and 2n-clx xxv710 testbeds."
-
-# VPP Comparison Across Testbeds 3n-hsw to 2n-clx 4c mrr
-- type: "table"
-  title: "VPP Comparison Across Testbeds 3n-hsw to 2n-clx 4c mrr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-hsw-2n-clx-4c-mrr"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "('NIC_Intel-XXV710' or 'NIC_Intel-XL710') and 'MRR' and '4C'"
-  columns:
-    - title: "3n-hsw xl710"
-      data-set: "vpp-compare-testbeds-mrr-hsw-clx-ref"
-      tag: "NIC_Intel-XL710"
-    - title: "2n-clx xxv710"
-      data-set: "vpp-compare-testbeds-mrr-hsw-clx-cmp"
-      tag: "NIC_Intel-XXV710"
-  comparisons:
-    - title: "Diff"
-      reference: 1
-      compare: 2
-  legend:
-    - ""
-    - "3n-hsw xl710, 2n-clx xxv710 - testbeds and NICs tested."
-    - "Diff - difference between 3n-hsw xl710 and 2n-clx xxv710 testbeds."
-
 # # VPP Comparison Across Testbeds 2n-clx to 2n-icx 1c mrr
 # - type: "table"
 #   title: "VPP Comparison Across Testbeds 2n-clx to 2n-icx 1c mrr"
@@ -3346,10 +3953,10 @@
 #   filter: "('NIC_Intel-XXV710' or 'NIC_Intel-E810CQ') and 'MRR' and '1C'"
 #   columns:
 #     - title: "2n-clx xxv710"
-#       data-set: "vpp-compare-testbeds-mrr-clx-icx-ref"
+#       data-set: "vpp-2n-clx-curr-iter-mrr"
 #       tag: "NIC_Intel-XXV710"
 #     - title: "2n-icx e810cq"
-#       data-set: "vpp-compare-testbeds-mrr-clx-icx-cmp"
+#       data-set: "vpp-2n-icx-curr-iter-mrr"
 #       tag: "NIC_Intel-E810CQ"
 #   comparisons:
 #     - title: "Diff"
@@ -3369,10 +3976,10 @@
 #   filter: "('NIC_Intel-XXV710' or 'NIC_Intel-E810CQ') and 'MRR' and '2C'"
 #   columns:
 #     - title: "2n-clx xxv710"
-#       data-set: "vpp-compare-testbeds-mrr-clx-icx-ref"
+#       data-set: "vpp-2n-clx-curr-iter-mrr"
 #       tag: "NIC_Intel-XXV710"
 #     - title: "2n-icx e810cq"
-#       data-set: "vpp-compare-testbeds-mrr-clx-icx-cmp"
+#       data-set: "vpp-2n-icx-curr-iter-mrr"
 #       tag: "NIC_Intel-E810CQ"
 #   comparisons:
 #     - title: "Diff"
@@ -3392,10 +3999,10 @@
 #   filter: "('NIC_Intel-XXV710' or 'NIC_Intel-E810CQ') and 'MRR' and '4C'"
 #   columns:
 #     - title: "2n-clx xxv710"
-#       data-set: "vpp-compare-testbeds-mrr-clx-icx-ref"
+#       data-set: "vpp-2n-clx-curr-iter-mrr"
 #       tag: "NIC_Intel-XXV710"
 #     - title: "2n-icx e810cq"
-#       data-set: "vpp-compare-testbeds-mrr-clx-icx-cmp"
+#       data-set: "vpp-2n-icx-curr-iter-mrr"
 #       tag: "NIC_Intel-E810CQ"
 #   comparisons:
 #     - title: "Diff"
@@ -3406,23 +4013,6 @@
 #     - "2n-clx xxv710, 2n-icx e810cq - testbeds and NICs tested."
 #     - "Diff - difference between 2n-clx xxv710 and 2n-icx e810cq testbeds."
 
-# Detailed Test Results - VPP Performance Results 3n-hsw
-- type: "table"
-  title: "Detailed Test Results - VPP Performance Results 3n-hsw"
-  algorithm: "table_merged_details"
-  output-file: "{DIR[DTR,PERF,VPP,3N,HSW]}/"
-  columns:
-    - title: " |prein| Test Name |preout| "
-      data: "data name"
-    - title: " |prein| Throughput: |br| 1.  Mpps       Gbps (NDR) |br| 2.  Mpps       Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, |br| one set per each direction: |br| 3.  P50  P90  P99       P50  P90  P99 (10% PDR) |br| 4.  P50  P90  P99       P50  P90  P99 (50% PDR) |br| 5.  P50  P90  P99       P50  P90  P99 (90% PDR) |preout| "
-      data: "data msg"
-  data: "vpp-perf-results-3n-hsw"
-  filter: "all"
-  parameters:
-  - "name"
-  - "parent"
-  - "msg"
-
 # Detailed Test Results - VPP Performance Results 3n-skx
 - type: "table"
   title: "Detailed Test Results - VPP Performance Results 3n-skx"
@@ -3433,7 +4023,7 @@
       data: "data name"
     - title: " |prein| Throughput: |br| 1.  Mpps       Gbps (NDR) |br| 2.  Mpps       Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, |br| one set per each direction: |br| 3.  P50  P90  P99       P50  P90  P99 (10% PDR) |br| 4.  P50  P90  P99       P50  P90  P99 (50% PDR) |br| 5.  P50  P90  P99       P50  P90  P99 (90% PDR) |preout| "
       data: "data msg"
-  data: "vpp-perf-results-3n-skx"
+  data: "vpp-3n-skx-curr-cov"
   filter: "all"
   remove-ndr: False
   parameters:
@@ -3451,7 +4041,7 @@
       data: "data name"
     - title: " |prein| Throughput: |br| 1.  Mpps       Gbps (NDR) |br| 2.  Mpps       Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, |br| one set per each direction: |br| 3.  P50  P90  P99       P50  P90  P99 (10% PDR) |br| 4.  P50  P90  P99       P50  P90  P99 (50% PDR) |br| 5.  P50  P90  P99       P50  P90  P99 (90% PDR) |preout| "
       data: "data msg"
-  data: "vpp-perf-results-2n-skx"
+  data: "vpp-2n-skx-curr-cov"
   filter: "all"
   remove-ndr: False
   parameters:
@@ -3469,7 +4059,7 @@
       data: "data name"
     - title: " |prein| Throughput: |br| 1.  Mpps       Gbps (NDR) |br| 2.  Mpps       Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, |br| one set per each direction: |br| 3.  P50  P90  P99       P50  P90  P99 (10% PDR) |br| 4.  P50  P90  P99       P50  P90  P99 (50% PDR) |br| 5.  P50  P90  P99       P50  P90  P99 (90% PDR) |preout| "
       data: "data msg"
-  data: "vpp-perf-results-2n-zn2"
+  data: "vpp-2n-zn2-curr-cov"
   filter: "all"
   remove-ndr: False
   parameters:
@@ -3487,7 +4077,7 @@
       data: "data name"
     - title: " |prein| Throughput: |br| 1.  Mpps       Gbps (NDR) |br| 2.  Mpps       Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, |br| one set per each direction: |br| 3.  P50  P90  P99       P50  P90  P99 (10% PDR) |br| 4.  P50  P90  P99       P50  P90  P99 (50% PDR) |br| 5.  P50  P90  P99       P50  P90  P99 (90% PDR) |preout| "
       data: "data msg"
-  data: "vpp-perf-results-2n-clx"
+  data: "vpp-2n-clx-curr-cov"
   filter: "all"
   parameters:
   - "name"
@@ -3504,13 +4094,14 @@
 #       data: "data name"
 #     - title: " |prein| Throughput: |br| 1.  Mpps       Gbps (NDR) |br| 2.  Mpps       Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, |br| one set per each direction: |br| 3.  P50  P90  P99       P50  P90  P99 (10% PDR) |br| 4.  P50  P90  P99       P50  P90  P99 (50% PDR) |br| 5.  P50  P90  P99       P50  P90  P99 (90% PDR) |preout| "
 #       data: "data msg"
-#   data: "vpp-perf-results-2n-icx"
+#   data: "vpp-2n-icx-curr-iter-best"
 #   filter: "'NDRPDR'"
+#   remove-ndr: True
 #   parameters:
 #   - "name"
 #   - "parent"
 #   - "msg"
-
+#
 # # Detailed Test Results - VPP Performance Results 3n-icx
 # - type: "table"
 #   title: "Detailed Test Results - VPP Performance Results 3n-icx"
@@ -3521,8 +4112,9 @@
 #       data: "data name"
 #     - title: " |prein| Throughput: |br| 1.  Mpps       Gbps (NDR) |br| 2.  Mpps       Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, |br| one set per each direction: |br| 3.  P50  P90  P99       P50  P90  P99 (10% PDR) |br| 4.  P50  P90  P99       P50  P90  P99 (50% PDR) |br| 5.  P50  P90  P99       P50  P90  P99 (90% PDR) |preout| "
 #       data: "data msg"
-#   data: "vpp-perf-results-3n-icx"
+#   data: "vpp-3n-icx-curr-iter-best"
 #   filter: "'NDRPDR'"
+#   remove-ndr: True
 #   parameters:
 #   - "name"
 #   - "parent"
@@ -3538,7 +4130,7 @@
       data: "data name"
     - title: " |prein| Throughput: |br| 1.  Mpps       Gbps (NDR) |br| 2.  Mpps       Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, |br| one set per each direction: |br| 3.  P50  P90  P99       P50  P90  P99 (10% PDR) |br| 4.  P50  P90  P99       P50  P90  P99 (50% PDR) |br| 5.  P50  P90  P99       P50  P90  P99 (90% PDR) |preout| "
       data: "data msg"
-  data: "vpp-perf-results-3n-tsh"
+  data: "vpp-3n-tsh-curr-cov"
   filter: "all"
   parameters:
   - "name"
@@ -3555,7 +4147,7 @@
       data: "data name"
     - title: " |prein| Throughput: |br| 1.  Mpps       Gbps (NDR) |br| 2.  Mpps       Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, |br| one set per each direction: |br| 3.  P50  P90  P99       P50  P90  P99 (10% PDR) |br| 4.  P50  P90  P99       P50  P90  P99 (50% PDR) |br| 5.  P50  P90  P99       P50  P90  P99 (90% PDR) |preout| "
       data: "data msg"
-  data: "vpp-perf-results-2n-tx2"
+  data: "vpp-2n-tx2-curr-cov"
   filter: "all"
   parameters:
   - "name"
@@ -3572,7 +4164,7 @@
       data: "data name"
     - title: " |prein| Throughput: |br| 1.  Mpps       Gbps (NDR) |br| 2.  Mpps       Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, |br| one set per each direction: |br| 3.  P50  P90  P99       P50  P90  P99 (10% PDR) |br| 4.  P50  P90  P99       P50  P90  P99 (50% PDR) |br| 5.  P50  P90  P99       P50  P90  P99 (90% PDR) |preout| "
       data: "data msg"
-  data: "vpp-perf-results-3n-dnv"
+  data: "vpp-3n-dnv-curr-cov"
   filter: "all"
   parameters:
   - "name"
@@ -3589,29 +4181,46 @@
       data: "data name"
     - title: " |prein| Throughput: |br| 1.  Mpps       Gbps (NDR) |br| 2.  Mpps       Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, |br| one set per each direction: |br| 3.  P50  P90  P99       P50  P90  P99 (10% PDR) |br| 4.  P50  P90  P99       P50  P90  P99 (50% PDR) |br| 5.  P50  P90  P99       P50  P90  P99 (90% PDR) |preout| "
       data: "data msg"
-  data: "vpp-perf-results-2n-dnv"
+  data: "vpp-2n-dnv-curr-cov"
   filter: "all"
   parameters:
   - "name"
   - "parent"
   - "msg"
 
-# Test configuration - VPP Performance Test Configs 3n-hsw
+# Detailed Test Results - VPP Performance Results 2n-aws
 - type: "table"
-  title: "Test configuration - VPP Performance Test Configs 3n-hsw"
+  title: "Detailed Test Results - VPP Performance Results 2n-aws"
   algorithm: "table_merged_details"
-  output-file: "{DIR[DTC,PERF,VPP,3N,HSW]}/"
+  output-file: "{DIR[DTR,PERF,VPP,2N,AWS]}/vpp_performance_results_2n_aws"
   columns:
     - title: " |prein| Test Name |preout| "
       data: "data name"
-    - title: " |prein| VPP API Test Commands History - Commands Used Per Test Case |preout| "
-      data: "data conf-history"
-  data: "vpp-perf-results-3n-hsw"
+    - title: " |prein| Throughput: |br| 1.  Mpps       Gbps (NDR) |br| 2.  Mpps       Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, |br| one set per each direction: |br| 3.  P50  P90  P99       P50  P90  P99 (10% PDR) |br| 4.  P50  P90  P99       P50  P90  P99 (50% PDR) |br| 5.  P50  P90  P99       P50  P90  P99 (90% PDR) |preout| "
+      data: "data msg"
+  data: "vpp-2n-aws-curr-cov"
   filter: "all"
   parameters:
+  - "name"
   - "parent"
+  - "msg"
+
+# Detailed Test Results - VPP Performance Results 3n-aws
+- type: "table"
+  title: "Detailed Test Results - VPP Performance Results 3n-aws"
+  algorithm: "table_merged_details"
+  output-file: "{DIR[DTR,PERF,VPP,3N,AWS]}/vpp_performance_results_3n_aws"
+  columns:
+    - title: " |prein| Test Name |preout| "
+      data: "data name"
+    - title: " |prein| Throughput: |br| 1.  Mpps       Gbps (NDR) |br| 2.  Mpps       Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, |br| one set per each direction: |br| 3.  P50  P90  P99       P50  P90  P99 (10% PDR) |br| 4.  P50  P90  P99       P50  P90  P99 (50% PDR) |br| 5.  P50  P90  P99       P50  P90  P99 (90% PDR) |preout| "
+      data: "data msg"
+  data: "vpp-3n-aws-curr-cov"
+  filter: "all"
+  parameters:
   - "name"
-  - "conf-history"
+  - "parent"
+  - "msg"
 
 # Test configuration - VPP Performance Test Configs 3n-skx
 - type: "table"
@@ -3623,7 +4232,7 @@
       data: "data name"
     - title: " |prein| VPP API Test Commands History - Commands Used Per Test Case |preout| "
       data: "data conf-history"
-  data: "vpp-perf-results-3n-skx"
+  data: "vpp-3n-skx-curr-cov"
   filter: "all"
   parameters:
   - "parent"
@@ -3640,7 +4249,7 @@
       data: "data name"
     - title: " |prein| VPP API Test Commands History - Commands Used Per Test Case |preout| "
       data: "data conf-history"
-  data: "vpp-perf-results-2n-skx"
+  data: "vpp-2n-skx-curr-cov"
   filter: "all"
   parameters:
   - "parent"
@@ -3657,7 +4266,7 @@
       data: "data name"
     - title: " |prein| VPP API Test Commands History - Commands Used Per Test Case |preout| "
       data: "data conf-history"
-  data: "vpp-perf-results-2n-zn2"
+  data: "vpp-2n-zn2-curr-cov"
   filter: "all"
   parameters:
   - "parent"
@@ -3674,7 +4283,7 @@
       data: "data name"
     - title: " |prein| VPP API Test Commands History - Commands Used Per Test Case |preout| "
       data: "data conf-history"
-  data: "vpp-perf-results-2n-clx"
+  data: "vpp-2n-clx-curr-cov"
   filter: "all"
   parameters:
   - "parent"
@@ -3691,13 +4300,14 @@
 #       data: "data name"
 #     - title: " |prein| VPP API Test Commands History - Commands Used Per Test Case |preout| "
 #       data: "data conf-history"
-#   data: "vpp-perf-results-2n-icx"
+#   data: "vpp-2n-icx-curr-iter-best"
 #   filter: "'NDRPDR'"
+#   remove-ndr: True
 #   parameters:
 #   - "parent"
 #   - "name"
 #   - "conf-history"
-
+#
 # # Test configuration - VPP Performance Test Configs 3n-icx
 # - type: "table"
 #   title: "Test configuration - VPP Performance Test Configs 3n-icx"
@@ -3708,8 +4318,9 @@
 #       data: "data name"
 #     - title: " |prein| VPP API Test Commands History - Commands Used Per Test Case |preout| "
 #       data: "data conf-history"
-#   data: "vpp-perf-results-3n-icx"
+#   data: "vpp-3n-icx-curr-iter-best"
 #   filter: "'NDRPDR'"
+#   remove-ndr: True
 #   parameters:
 #   - "parent"
 #   - "name"
@@ -3725,7 +4336,7 @@
       data: "data name"
     - title: " |prein| VPP API Test Commands History - Commands Used Per Test Case |preout| "
       data: "data conf-history"
-  data: "vpp-perf-results-3n-tsh"
+  data: "vpp-3n-tsh-curr-cov"
   filter: "all"
   parameters:
   - "parent"
@@ -3742,7 +4353,7 @@
       data: "data name"
     - title: " |prein| VPP API Test Commands History - Commands Used Per Test Case |preout| "
       data: "data conf-history"
-  data: "vpp-perf-results-2n-tx2"
+  data: "vpp-2n-tx2-curr-cov"
   filter: "all"
   parameters:
   - "parent"
@@ -3759,7 +4370,7 @@
       data: "data name"
     - title: " |prein| VPP API Test Commands History - Commands Used Per Test Case |preout| "
       data: "data conf-history"
-  data: "vpp-perf-results-3n-dnv"
+  data: "vpp-3n-dnv-curr-cov"
   filter: "all"
   parameters:
   - "parent"
@@ -3776,27 +4387,53 @@
       data: "data name"
     - title: " |prein| VPP API Test Commands History - Commands Used Per Test Case |preout| "
       data: "data conf-history"
-  data: "vpp-perf-results-2n-dnv"
+  data: "vpp-2n-dnv-curr-cov"
   filter: "all"
   parameters:
   - "parent"
   - "name"
   - "conf-history"
 
-# Test Operational Data - VPP Performance Operational Data 3n-hsw
+# Test configuration - VPP Performance Test Configs 2n-aws
 - type: "table"
-  title: "Test Operational Data - VPP Performance Operational Data 3n-hsw"
-  algorithm: "table_oper_data_html"
-  output-file: "{DIR[DTO,PERF,VPP,3N,HSW]}/"
-  data: "vpp-perf-results-3n-hsw"
+  title: "Test configuration - VPP Performance Test Configs 2n-aws"
+  algorithm: "table_merged_details"
+  output-file: "{DIR[DTC,PERF,VPP,2N,AWS]}/"
+  columns:
+    - title: " |prein| Test Name |preout| "
+      data: "data name"
+    - title: " |prein| VPP API Test Commands History - Commands Used Per Test Case |preout| "
+      data: "data conf-history"
+  data: "vpp-2n-aws-curr-cov"
+  filter: "all"
+  parameters:
+  - "parent"
+  - "name"
+  - "conf-history"
+
+# Test configuration - VPP Performance Test Configs 3n-aws
+- type: "table"
+  title: "Test configuration - VPP Performance Test Configs 3n-aws"
+  algorithm: "table_merged_details"
+  output-file: "{DIR[DTC,PERF,VPP,3N,AWS]}/"
+  columns:
+    - title: " |prein| Test Name |preout| "
+      data: "data name"
+    - title: " |prein| VPP API Test Commands History - Commands Used Per Test Case |preout| "
+      data: "data conf-history"
+  data: "vpp-3n-aws-curr-cov"
   filter: "all"
+  parameters:
+  - "parent"
+  - "name"
+  - "conf-history"
 
 # Test Operational Data - VPP Performance Operational Data 3n-skx
 - type: "table"
   title: "Test Operational Data - VPP Performance Operational Data 3n-skx"
   algorithm: "table_oper_data_html"
   output-file: "{DIR[DTO,PERF,VPP,3N,SKX]}/"
-  data: "vpp-perf-results-3n-skx"
+  data: "vpp-3n-skx-curr-cov"
   filter: "all"
 
 # Test Operational Data - VPP Performance Operational Data 2n-skx
@@ -3804,7 +4441,7 @@
   title: "Test Operational Data - VPP Performance Operational Data 2n-skx"
   algorithm: "table_oper_data_html"
   output-file: "{DIR[DTO,PERF,VPP,2N,SKX]}/"
-  data: "vpp-perf-results-2n-skx"
+  data: "vpp-2n-skx-curr-cov"
   filter: "all"
 
 # Test Operational Data - VPP Performance Operational Data 2n-zn2
@@ -3812,7 +4449,7 @@
   title: "Test Operational Data - VPP Performance Operational Data 2n-zn2"
   algorithm: "table_oper_data_html"
   output-file: "{DIR[DTO,PERF,VPP,2N,ZN2]}/"
-  data: "vpp-perf-results-2n-zn2"
+  data: "vpp-2n-zn2-curr-cov"
   filter: "all"
 
 # Test Operational Data - VPP Performance Operational Data 2n-clx
@@ -3820,7 +4457,7 @@
   title: "Test Operational Data - VPP Performance Operational Data 2n-clx"
   algorithm: "table_oper_data_html"
   output-file: "{DIR[DTO,PERF,VPP,2N,CLX]}/"
-  data: "vpp-perf-results-2n-clx"
+  data: "vpp-2n-clx-curr-cov"
   filter: "all"
 
 # # Test Operational Data - VPP Performance Operational Data 2n-icx
@@ -3828,7 +4465,7 @@
 #   title: "Test Operational Data - VPP Performance Operational Data 2n-icx"
 #   algorithm: "table_oper_data_html"
 #   output-file: "{DIR[DTO,PERF,VPP,2N,ICX]}/"
-#   data: "vpp-perf-results-2n-icx"
+#   data: "vpp-2n-icx-curr-iter-best"
 #   filter: "'NDRPDR'"
 
 # # Test Operational Data - VPP Performance Operational Data 3n-icx
@@ -3836,7 +4473,7 @@
 #   title: "Test Operational Data - VPP Performance Operational Data 3n-icx"
 #   algorithm: "table_oper_data_html"
 #   output-file: "{DIR[DTO,PERF,VPP,3N,ICX]}/"
-#   data: "vpp-perf-results-3n-icx"
+#   data: "vpp-3n-icx-curr-iter-best"
 #   filter: "'NDRPDR'"
 
 # Test Operational Data - VPP Performance Operational Data 3n-tsh
@@ -3844,7 +4481,7 @@
   title: "Test Operational Data - VPP Performance Operational Data 3n-tsh"
   algorithm: "table_oper_data_html"
   output-file: "{DIR[DTO,PERF,VPP,3N,TSH]}/"
-  data: "vpp-perf-results-3n-tsh"
+  data: "vpp-3n-tsh-curr-cov"
   filter: "all"
 
 # Test Operational Data - VPP Performance Operational Data 2n-tx2
@@ -3852,7 +4489,7 @@
   title: "Test Operational Data - VPP Performance Operational Data 2n-tx2"
   algorithm: "table_oper_data_html"
   output-file: "{DIR[DTO,PERF,VPP,2N,TX2]}/"
-  data: "vpp-perf-results-2n-tx2"
+  data: "vpp-2n-tx2-curr-cov"
   filter: "all"
 
 # Test Operational Data - VPP Performance Operational Data 3n-dnv
@@ -3860,7 +4497,7 @@
   title: "Test Operational Data - VPP Performance Operational Data 3n-dnv"
   algorithm: "table_oper_data_html"
   output-file: "{DIR[DTO,PERF,VPP,3N,DNV]}/"
-  data: "vpp-perf-results-3n-dnv"
+  data: "vpp-3n-dnv-curr-cov"
   filter: "all"
 
 # Test Operational Data - VPP Performance Operational Data 2n-dnv
@@ -3868,25 +4505,24 @@
   title: "Test Operational Data - VPP Performance Operational Data 2n-dnv"
   algorithm: "table_oper_data_html"
   output-file: "{DIR[DTO,PERF,VPP,2N,DNV]}/"
-  data: "vpp-perf-results-2n-dnv"
+  data: "vpp-2n-dnv-curr-cov"
   filter: "all"
 
-# Detailed Test Results - VPP MRR Results 3n-hsw
+# Test Operational Data - VPP Performance Operational Data 2n-aws
 - type: "table"
-  title: "Detailed Test Results - VPP MRR Results 3n-hsw"
-  algorithm: "table_merged_details"
-  output-file: "{DIR[DTR,MRR,VPP,3N,HSW]}/"
-  columns:
-    - title: " |prein| Test Name |preout| "
-      data: "data name"
-    - title: " |prein| Maximum Receive Rate trial [Mpps] |preout| "
-      data: "data msg"
-  data: "vpp-mrr-results-3n-hsw"
+  title: "Test Operational Data - VPP Performance Operational Data 2n-aws"
+  algorithm: "table_oper_data_html"
+  output-file: "{DIR[DTO,PERF,VPP,2N,AWS]}/"
+  data: "vpp-2n-aws-curr-cov"
+  filter: "all"
+
+# Test Operational Data - VPP Performance Operational Data 3n-aws
+- type: "table"
+  title: "Test Operational Data - VPP Performance Operational Data 3n-aws"
+  algorithm: "table_oper_data_html"
+  output-file: "{DIR[DTO,PERF,VPP,3N,AWS]}/"
+  data: "vpp-3n-aws-curr-cov"
   filter: "all"
-  parameters:
-  - "name"
-  - "parent"
-  - "msg"
 
 # Detailed Test Results - VPP MRR Results 3n-skx
 - type: "table"
@@ -3898,7 +4534,7 @@
       data: "data name"
     - title: " |prein| Maximum Receive Rate trial [Mpps] |preout| "
       data: "data msg"
-  data: "vpp-mrr-results-3n-skx"
+  data: "vpp-3n-skx-curr-iter-mrr"
   filter: "all"
   parameters:
   - "name"
@@ -3915,7 +4551,7 @@
       data: "data name"
     - title: " |prein| Maximum Receive Rate trial [Mpps] |preout| "
       data: "data msg"
-  data: "vpp-mrr-results-2n-skx"
+  data: "vpp-2n-skx-curr-iter-mrr"
   filter: "all"
   parameters:
   - "name"
@@ -3932,7 +4568,7 @@
       data: "data name"
     - title: " |prein| Maximum Receive Rate trial [Mpps] |preout| "
       data: "data msg"
-  data: "vpp-mrr-results-2n-zn2"
+  data: "vpp-2n-zn2-curr-iter-mrr"
   filter: "all"
   parameters:
   - "name"
@@ -3949,7 +4585,7 @@
       data: "data name"
     - title: " |prein| Maximum Receive Rate trial [Mpps] |preout| "
       data: "data msg"
-  data: "vpp-mrr-results-2n-clx"
+  data: "vpp-2n-clx-curr-iter-mrr"
   filter: "all"
   parameters:
   - "name"
@@ -3966,7 +4602,7 @@
 #       data: "data name"
 #     - title: " |prein| Maximum Receive Rate trial [Mpps] |preout| "
 #       data: "data msg"
-#   data: "vpp-mrr-results-2n-icx"
+#   data: "vpp-2n-icx-curr-iter-mrr"
 #   filter: "'MRR'"
 #   parameters:
 #   - "name"
@@ -4000,7 +4636,7 @@
       data: "data name"
     - title: " |prein| Maximum Receive Rate trial [Mpps] |preout| "
       data: "data msg"
-  data: "vpp-mrr-results-3n-tsh"
+  data: "vpp-3n-tsh-curr-iter-mrr"
   filter: "all"
   parameters:
   - "name"
@@ -4017,7 +4653,7 @@
       data: "data name"
     - title: " |prein| Maximum Receive Rate trial [Mpps] |preout| "
       data: "data msg"
-  data: "vpp-mrr-results-2n-tx2"
+  data: "vpp-2n-tx2-curr-iter-mrr"
   filter: "all"
   parameters:
   - "name"
@@ -4034,7 +4670,7 @@
       data: "data name"
     - title: " |prein| Maximum Receive Rate trial [Mpps] |preout| "
       data: "data msg"
-  data: "vpp-mrr-results-3n-dnv"
+  data: "vpp-3n-dnv-curr-iter-mrr"
   filter: "all"
   parameters:
   - "name"
@@ -4051,29 +4687,46 @@
       data: "data name"
     - title: " |prein| Maximum Receive Rate trial [Mpps] |preout| "
       data: "data msg"
-  data: "vpp-mrr-results-2n-dnv"
+  data: "vpp-2n-dnv-curr-iter-mrr"
   filter: "all"
   parameters:
   - "name"
   - "parent"
   - "msg"
 
-# Test configuration - VPP MRR Test Configs 3n-hsw
+# Detailed Test Results - VPP MRR Results 2n-aws
 - type: "table"
-  title: "Test configuration - VPP MRR Test Configs 3n-hsw"
+  title: "Detailed Test Results - VPP MRR Results 2n-aws"
   algorithm: "table_merged_details"
-  output-file: "{DIR[DTC,MRR,VPP,3N,HSW]}/"
+  output-file: "{DIR[DTR,MRR,VPP,2N,AWS]}/"
   columns:
     - title: " |prein| Test Name |preout| "
       data: "data name"
-    - title: " |prein| VPP API Test Commands History - Commands Used Per Test Case |preout| "
-      data: "data conf-history"
-  data: "vpp-mrr-results-3n-hsw"
+    - title: " |prein| Maximum Receive Rate trial [Mpps] |preout| "
+      data: "data msg"
+  data: "vpp-2n-aws-curr-iter-mrr"
   filter: "all"
   parameters:
+  - "name"
   - "parent"
+  - "msg"
+
+# Detailed Test Results - VPP MRR Results 3n-aws
+- type: "table"
+  title: "Detailed Test Results - VPP MRR Results 3n-aws"
+  algorithm: "table_merged_details"
+  output-file: "{DIR[DTR,MRR,VPP,3N,AWS]}/"
+  columns:
+    - title: " |prein| Test Name |preout| "
+      data: "data name"
+    - title: " |prein| Maximum Receive Rate trial [Mpps] |preout| "
+      data: "data msg"
+  data: "vpp-3n-aws-curr-iter-mrr"
+  filter: "all"
+  parameters:
   - "name"
-  - "conf-history"
+  - "parent"
+  - "msg"
 
 # Test configuration - VPP MRR Test Configs 3n-skx
 - type: "table"
@@ -4085,7 +4738,7 @@
       data: "data name"
     - title: " |prein| VPP API Test Commands History - Commands Used Per Test Case |preout| "
       data: "data conf-history"
-  data: "vpp-mrr-results-3n-skx"
+  data: "vpp-3n-skx-curr-iter-mrr"
   filter: "all"
   parameters:
   - "parent"
@@ -4102,7 +4755,7 @@
       data: "data name"
     - title: " |prein| VPP API Test Commands History - Commands Used Per Test Case |preout| "
       data: "data conf-history"
-  data: "vpp-mrr-results-2n-skx"
+  data: "vpp-2n-skx-curr-iter-mrr"
   filter: "all"
   parameters:
   - "parent"
@@ -4119,7 +4772,7 @@
       data: "data name"
     - title: " |prein| VPP API Test Commands History - Commands Used Per Test Case |preout| "
       data: "data conf-history"
-  data: "vpp-mrr-results-2n-zn2"
+  data: "vpp-2n-zn2-curr-iter-mrr"
   filter: "all"
   parameters:
   - "parent"
@@ -4136,7 +4789,7 @@
       data: "data name"
     - title: " |prein| VPP API Test Commands History - Commands Used Per Test Case |preout| "
       data: "data conf-history"
-  data: "vpp-mrr-results-2n-clx"
+  data: "vpp-2n-clx-curr-iter-mrr"
   filter: "all"
   parameters:
   - "parent"
@@ -4153,7 +4806,7 @@
 #       data: "data name"
 #     - title: " |prein| VPP API Test Commands History - Commands Used Per Test Case |preout| "
 #       data: "data conf-history"
-#   data: "vpp-mrr-results-2n-icx"
+#   data: "vpp-2n-icx-curr-iter-mrr"
 #   filter: "'MRR'"
 #   parameters:
 #   - "parent"
@@ -4187,7 +4840,7 @@
       data: "data name"
     - title: " |prein| VPP API Test Commands History - Commands Used Per Test Case |preout| "
       data: "data conf-history"
-  data: "vpp-mrr-results-3n-tsh"
+  data: "vpp-3n-tsh-curr-iter-mrr"
   filter: "all"
   parameters:
   - "parent"
@@ -4196,49 +4849,83 @@
 
 # Test configuration - VPP MRR Test Configs 2n-tx2
 - type: "table"
-  title: "Test configuration - VPP MRR Test Configs 2n-tx2"
+  title: "Test configuration - VPP MRR Test Configs 2n-tx2"
+  algorithm: "table_merged_details"
+  output-file: "{DIR[DTC,MRR,VPP,2N,TX2]}/"
+  columns:
+    - title: " |prein| Test Name |preout| "
+      data: "data name"
+    - title: " |prein| VPP API Test Commands History - Commands Used Per Test Case |preout| "
+      data: "data conf-history"
+  data: "vpp-2n-tx2-curr-iter-mrr"
+  filter: "all"
+  parameters:
+  - "parent"
+  - "name"
+  - "conf-history"
+
+# Test configuration - VPP MRR Test Configs 3n-dnv
+- type: "table"
+  title: "Test configuration - VPP MRR Test Configs 3n-dnv"
+  algorithm: "table_merged_details"
+  output-file: "{DIR[DTC,MRR,VPP,3N,DNV]}/"
+  columns:
+    - title: " |prein| Test Name |preout| "
+      data: "data name"
+    - title: " |prein| VPP API Test Commands History - Commands Used Per Test Case |preout| "
+      data: "data conf-history"
+  data: "vpp-3n-dnv-curr-iter-mrr"
+  filter: "all"
+  parameters:
+  - "parent"
+  - "name"
+  - "conf-history"
+
+# Test configuration - VPP MRR Test Configs 2n-dnv
+- type: "table"
+  title: "Test configuration - VPP MRR Test Configs 2n-dnv"
   algorithm: "table_merged_details"
-  output-file: "{DIR[DTC,MRR,VPP,2N,TX2]}/"
+  output-file: "{DIR[DTC,MRR,VPP,2N,DNV]}/"
   columns:
     - title: " |prein| Test Name |preout| "
       data: "data name"
     - title: " |prein| VPP API Test Commands History - Commands Used Per Test Case |preout| "
       data: "data conf-history"
-  data: "vpp-mrr-results-2n-tx2"
+  data: "vpp-2n-dnv-curr-iter-mrr"
   filter: "all"
   parameters:
   - "parent"
   - "name"
   - "conf-history"
 
-# Test configuration - VPP MRR Test Configs 3n-dnv
+# Test configuration - VPP MRR Test Configs 2n-aws
 - type: "table"
-  title: "Test configuration - VPP MRR Test Configs 3n-dnv"
+  title: "Test configuration - VPP MRR Test Configs 2n-aws"
   algorithm: "table_merged_details"
-  output-file: "{DIR[DTC,MRR,VPP,3N,DNV]}/"
+  output-file: "{DIR[DTC,MRR,VPP,2N,AWS]}/"
   columns:
     - title: " |prein| Test Name |preout| "
       data: "data name"
     - title: " |prein| VPP API Test Commands History - Commands Used Per Test Case |preout| "
       data: "data conf-history"
-  data: "vpp-mrr-results-3n-dnv"
+  data: "vpp-2n-aws-curr-iter-mrr"
   filter: "all"
   parameters:
   - "parent"
   - "name"
   - "conf-history"
 
-# Test configuration - VPP MRR Test Configs 2n-dnv
+# Test configuration - VPP MRR Test Configs 3n-aws
 - type: "table"
-  title: "Test configuration - VPP MRR Test Configs 2n-dnv"
+  title: "Test configuration - VPP MRR Test Configs 3n-aws"
   algorithm: "table_merged_details"
-  output-file: "{DIR[DTC,MRR,VPP,2N,DNV]}/"
+  output-file: "{DIR[DTC,MRR,VPP,3N,AWS]}/"
   columns:
     - title: " |prein| Test Name |preout| "
       data: "data name"
     - title: " |prein| VPP API Test Commands History - Commands Used Per Test Case |preout| "
       data: "data conf-history"
-  data: "vpp-mrr-results-2n-dnv"
+  data: "vpp-3n-aws-curr-iter-mrr"
   filter: "all"
   parameters:
   - "parent"
@@ -4282,98 +4969,6 @@
 
 ################################################################################
 
-# DPDK Performance Changes 3n-hsw 1t1c pdr
-- type: "table"
-  title: "DPDK Performance Changes 3n-hsw 1t1c pdr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-hsw-1t1c-pdr"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'1T1C' and 'NDRPDR' and 'NIC_Intel-XL710'"
-  columns:
-    - title: "2005"
-      data-set: "dpdk-performance-changes-3n-hsw-h1"
-    - title: "2009"
-      data-set: "dpdk-performance-changes-3n-hsw-ref"
-    - title: "2101"
-      data-set: "dpdk-performance-changes-3n-hsw-cmp"
-  comparisons:
-    - title: "Diff"
-      reference: 2
-      compare: 3
-  legend:
-    - ""
-    - "2005, 2009, 2101 - DPDK versions tested."
-    - "Diff - difference between 2009 and 2101 DPDK version."
-
-# DPDK Performance Changes 3n-hsw 2t2c pdr
-- type: "table"
-  title: "DPDK Performance Changes 3n-hsw 2t2c pdr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-hsw-2t2c-pdr"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T2C' and 'NDRPDR' and 'NIC_Intel-XL710'"
-  columns:
-    - title: "2005"
-      data-set: "dpdk-performance-changes-3n-hsw-h1"
-    - title: "2009"
-      data-set: "dpdk-performance-changes-3n-hsw-ref"
-    - title: "2101"
-      data-set: "dpdk-performance-changes-3n-hsw-cmp"
-  comparisons:
-    - title: "Diff"
-      reference: 2
-      compare: 3
-  legend:
-    - ""
-    - "2005, 2009, 2101 - DPDK versions tested."
-    - "Diff - difference between 2009 and 2101 DPDK version."
-
-# DPDK Performance Changes 3n-hsw 1t1c pdr
-- type: "table"
-  title: "DPDK Performance Changes 3n-hsw 1t1c ndr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-hsw-1t1c-ndr"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'1T1C' and 'NDRPDR' and 'NIC_Intel-XL710'"
-  columns:
-    - title: "2005"
-      data-set: "dpdk-performance-changes-3n-hsw-h1"
-    - title: "2009"
-      data-set: "dpdk-performance-changes-3n-hsw-ref"
-    - title: "2101"
-      data-set: "dpdk-performance-changes-3n-hsw-cmp"
-  comparisons:
-    - title: "Diff"
-      reference: 2
-      compare: 3
-  legend:
-    - ""
-    - "2005, 2009, 2101 - DPDK versions tested."
-    - "Diff - difference between 2009 and 2101 DPDK version."
-
-# DPDK Performance Changes 3n-hsw 2t2c ndr
-- type: "table"
-  title: "DPDK Performance Changes 3n-hsw 2t2c ndr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-hsw-2t2c-ndr"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T2C' and 'NDRPDR' and 'NIC_Intel-XL710'"
-  columns:
-    - title: "2005"
-      data-set: "dpdk-performance-changes-3n-hsw-h1"
-    - title: "2009"
-      data-set: "dpdk-performance-changes-3n-hsw-ref"
-    - title: "2101"
-      data-set: "dpdk-performance-changes-3n-hsw-cmp"
-  comparisons:
-    - title: "Diff"
-      reference: 2
-      compare: 3
-  legend:
-    - ""
-    - "2005, 2009, 2101 - DPDK versions tested."
-    - "Diff - difference between 2009 and 2101 DPDK version."
-
 # DPDK Performance Changes 3n-skx 2t1c pdr
 - type: "table"
   title: "DPDK Performance Changes 3n-skx 2t1c pdr"
@@ -4382,20 +4977,20 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "2005"
-      data-set: "dpdk-performance-changes-3n-skx-h1"
-    - title: "2009"
-      data-set: "dpdk-performance-changes-3n-skx-ref"
-    - title: "2101"
-      data-set: "dpdk-performance-changes-3n-skx-cmp"
+    - title: "20.11"
+      data-set: "dpdk-3n-skx-hist-iter"
+    - title: "21.02"
+      data-set: "dpdk-3n-skx-prev-iter"
+    - title: "21.08"
+      data-set: "dpdk-3n-skx-curr-iter"
   comparisons:
     - title: "Diff"
       reference: 2
       compare: 3
   legend:
     - ""
-    - "2005, 2009, 2101 - DPDK versions tested."
-    - "Diff - difference between 2009 and 2101 DPDK version."
+    - "20.11, 21.02, 21.08 - DPDK versions tested."
+    - "Diff - difference between 21.02 and 21.08 DPDK version."
 
 # DPDK Performance Changes 3n-skx 4t2c pdr
 - type: "table"
@@ -4405,20 +5000,20 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "2005"
-      data-set: "dpdk-performance-changes-3n-skx-h1"
-    - title: "2009"
-      data-set: "dpdk-performance-changes-3n-skx-ref"
-    - title: "2101"
-      data-set: "dpdk-performance-changes-3n-skx-cmp"
+    - title: "20.11"
+      data-set: "dpdk-3n-skx-hist-iter"
+    - title: "21.02"
+      data-set: "dpdk-3n-skx-prev-iter"
+    - title: "21.08"
+      data-set: "dpdk-3n-skx-curr-iter"
   comparisons:
     - title: "Diff"
       reference: 2
       compare: 3
   legend:
     - ""
-    - "2005, 2009, 2101 - DPDK versions tested."
-    - "Diff - difference between 2009 and 2101 DPDK version."
+    - "20.11, 21.02, 21.08 - DPDK versions tested."
+    - "Diff - difference between 21.02 and 21.08 DPDK version."
 
 # DPDK Performance Changes 3n-skx 2t1c ndr
 - type: "table"
@@ -4428,20 +5023,20 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "2005"
-      data-set: "dpdk-performance-changes-3n-skx-h1"
-    - title: "2009"
-      data-set: "dpdk-performance-changes-3n-skx-ref"
-    - title: "2101"
-      data-set: "dpdk-performance-changes-3n-skx-cmp"
+    - title: "20.11"
+      data-set: "dpdk-3n-skx-hist-iter"
+    - title: "21.02"
+      data-set: "dpdk-3n-skx-prev-iter"
+    - title: "21.08"
+      data-set: "dpdk-3n-skx-curr-iter"
   comparisons:
     - title: "Diff"
       reference: 2
       compare: 3
   legend:
     - ""
-    - "2005, 2009, 2101 - DPDK versions tested."
-    - "Diff - difference between 2009 and 2101 DPDK version."
+    - "20.11, 21.02, 21.08 - DPDK versions tested."
+    - "Diff - difference between 21.02 and 21.08 DPDK version."
 
 # DPDK Performance Changes 3n-skx 4t2c ndr
 - type: "table"
@@ -4451,20 +5046,20 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "2005"
-      data-set: "dpdk-performance-changes-3n-skx-h1"
-    - title: "2009"
-      data-set: "dpdk-performance-changes-3n-skx-ref"
-    - title: "2101"
-      data-set: "dpdk-performance-changes-3n-skx-cmp"
+    - title: "20.11"
+      data-set: "dpdk-3n-skx-hist-iter"
+    - title: "21.02"
+      data-set: "dpdk-3n-skx-prev-iter"
+    - title: "21.08"
+      data-set: "dpdk-3n-skx-curr-iter"
   comparisons:
     - title: "Diff"
       reference: 2
       compare: 3
   legend:
     - ""
-    - "2005, 2009, 2101 - DPDK versions tested."
-    - "Diff - difference between 2009 and 2101 DPDK version."
+    - "20.11, 21.02, 21.08 - DPDK versions tested."
+    - "Diff - difference between 21.02 and 21.08 DPDK version."
 
 # DPDK Performance Changes 2n-skx 2t1c pdr
 - type: "table"
@@ -4474,20 +5069,20 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "2005"
-      data-set: "dpdk-performance-changes-2n-skx-h1"
-    - title: "2009"
-      data-set: "dpdk-performance-changes-2n-skx-ref"
-    - title: "2101"
-      data-set: "dpdk-performance-changes-2n-skx-cmp"
+    - title: "20.11"
+      data-set: "dpdk-2n-skx-hist-iter"
+    - title: "21.02"
+      data-set: "dpdk-2n-skx-prev-iter"
+    - title: "21.08"
+      data-set: "dpdk-2n-skx-curr-iter"
   comparisons:
     - title: "Diff"
       reference: 2
       compare: 3
   legend:
     - ""
-    - "2005, 2009, 2101 - DPDK versions tested."
-    - "Diff - difference between 2009 and 2101 DPDK version."
+    - "20.11, 21.02, 21.08 - DPDK versions tested."
+    - "Diff - difference between 21.02 and 21.08 DPDK version."
 
 # DPDK Performance Changes 2n-skx 4t2c pdr
 - type: "table"
@@ -4497,20 +5092,20 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "2005"
-      data-set: "dpdk-performance-changes-2n-skx-h1"
-    - title: "2009"
-      data-set: "dpdk-performance-changes-2n-skx-ref"
-    - title: "2101"
-      data-set: "dpdk-performance-changes-2n-skx-cmp"
+    - title: "20.11"
+      data-set: "dpdk-2n-skx-hist-iter"
+    - title: "21.02"
+      data-set: "dpdk-2n-skx-prev-iter"
+    - title: "21.08"
+      data-set: "dpdk-2n-skx-curr-iter"
   comparisons:
     - title: "Diff"
       reference: 2
       compare: 3
   legend:
     - ""
-    - "2005, 2009, 2101 - DPDK versions tested."
-    - "Diff - difference between 2009 and 2101 DPDK version."
+    - "20.11, 21.02, 21.08 - DPDK versions tested."
+    - "Diff - difference between 21.02 and 21.08 DPDK version."
 
 # DPDK Performance Changes 2n-skx 2t1c ndr
 - type: "table"
@@ -4520,20 +5115,20 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "2005"
-      data-set: "dpdk-performance-changes-2n-skx-h1"
-    - title: "2009"
-      data-set: "dpdk-performance-changes-2n-skx-ref"
-    - title: "2101"
-      data-set: "dpdk-performance-changes-2n-skx-cmp"
+    - title: "20.11"
+      data-set: "dpdk-2n-skx-hist-iter"
+    - title: "21.02"
+      data-set: "dpdk-2n-skx-prev-iter"
+    - title: "21.08"
+      data-set: "dpdk-2n-skx-curr-iter"
   comparisons:
     - title: "Diff"
       reference: 2
       compare: 3
   legend:
     - ""
-    - "2005, 2009, 2101 - DPDK versions tested."
-    - "Diff - difference between 2009 and 2101 DPDK version."
+    - "20.11, 21.02, 21.08 - DPDK versions tested."
+    - "Diff - difference between 21.02 and 21.08 DPDK version."
 
 # DPDK Performance Changes 2n-skx 4t2c ndr
 - type: "table"
@@ -4543,20 +5138,20 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "2005"
-      data-set: "dpdk-performance-changes-2n-skx-h1"
-    - title: "2009"
-      data-set: "dpdk-performance-changes-2n-skx-ref"
-    - title: "2101"
-      data-set: "dpdk-performance-changes-2n-skx-cmp"
+    - title: "20.11"
+      data-set: "dpdk-2n-skx-hist-iter"
+    - title: "21.02"
+      data-set: "dpdk-2n-skx-prev-iter"
+    - title: "21.08"
+      data-set: "dpdk-2n-skx-curr-iter"
   comparisons:
     - title: "Diff"
       reference: 2
       compare: 3
   legend:
     - ""
-    - "2005, 2009, 2101 - DPDK versions tested."
-    - "Diff - difference between 2009 and 2101 DPDK version."
+    - "20.11, 21.02, 21.08 - DPDK versions tested."
+    - "Diff - difference between 21.02 and 21.08 DPDK version."
 
 # DPDK Performance Changes 2n-clx 2t1c pdr
 - type: "table"
@@ -4566,20 +5161,20 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "2005"
-      data-set: "dpdk-performance-changes-2n-clx-h1"
-    - title: "2009"
-      data-set: "dpdk-performance-changes-2n-clx-ref"
-    - title: "2101"
-      data-set: "dpdk-performance-changes-2n-clx-cmp"
+    - title: "20.11"
+      data-set: "dpdk-2n-clx-hist-iter"
+    - title: "21.02"
+      data-set: "dpdk-2n-clx-prev-iter"
+    - title: "21.08"
+      data-set: "dpdk-2n-clx-curr-iter"
   comparisons:
     - title: "Diff"
       reference: 2
       compare: 3
   legend:
     - ""
-    - "2005, 2009, 2101 - DPDK versions tested."
-    - "Diff - difference between 2009 and 2101 DPDK version."
+    - "20.11, 21.02, 21.08 - DPDK versions tested."
+    - "Diff - difference between 21.02 and 21.08 DPDK version."
 
 # DPDK Performance Changes 2n-clx 4t2c pdr
 - type: "table"
@@ -4589,20 +5184,20 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "2005"
-      data-set: "dpdk-performance-changes-2n-clx-h1"
-    - title: "2009"
-      data-set: "dpdk-performance-changes-2n-clx-ref"
-    - title: "2101"
-      data-set: "dpdk-performance-changes-2n-clx-cmp"
+    - title: "20.11"
+      data-set: "dpdk-2n-clx-hist-iter"
+    - title: "21.02"
+      data-set: "dpdk-2n-clx-prev-iter"
+    - title: "21.08"
+      data-set: "dpdk-2n-clx-curr-iter"
   comparisons:
     - title: "Diff"
       reference: 2
       compare: 3
   legend:
     - ""
-    - "2005, 2009, 2101 - DPDK versions tested."
-    - "Diff - difference between 2009 and 2101 DPDK version."
+    - "20.11, 21.02, 21.08 - DPDK versions tested."
+    - "Diff - difference between 21.02 and 21.08 DPDK version."
 
 # DPDK Performance Changes 2n-clx 2t1c ndr
 - type: "table"
@@ -4612,20 +5207,20 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "2005"
-      data-set: "dpdk-performance-changes-2n-clx-h1"
-    - title: "2009"
-      data-set: "dpdk-performance-changes-2n-clx-ref"
-    - title: "2101"
-      data-set: "dpdk-performance-changes-2n-clx-cmp"
+    - title: "20.11"
+      data-set: "dpdk-2n-clx-hist-iter"
+    - title: "21.02"
+      data-set: "dpdk-2n-clx-prev-iter"
+    - title: "21.08"
+      data-set: "dpdk-2n-clx-curr-iter"
   comparisons:
     - title: "Diff"
       reference: 2
       compare: 3
   legend:
     - ""
-    - "2005, 2009, 2101 - DPDK versions tested."
-    - "Diff - difference between 2009 and 2101 DPDK version."
+    - "20.11, 21.02, 21.08 - DPDK versions tested."
+    - "Diff - difference between 21.02 and 21.08 DPDK version."
 
 # DPDK Performance Changes 2n-clx 4t2c ndr
 - type: "table"
@@ -4635,20 +5230,20 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "2005"
-      data-set: "dpdk-performance-changes-2n-clx-h1"
-    - title: "2009"
-      data-set: "dpdk-performance-changes-2n-clx-ref"
-    - title: "2101"
-      data-set: "dpdk-performance-changes-2n-clx-cmp"
+    - title: "20.11"
+      data-set: "dpdk-2n-clx-hist-iter"
+    - title: "21.02"
+      data-set: "dpdk-2n-clx-prev-iter"
+    - title: "21.08"
+      data-set: "dpdk-2n-clx-curr-iter"
   comparisons:
     - title: "Diff"
       reference: 2
       compare: 3
   legend:
     - ""
-    - "2005, 2009, 2101 - DPDK versions tested."
-    - "Diff - difference between 2009 and 2101 DPDK version."
+    - "20.11, 21.02, 21.08 - DPDK versions tested."
+    - "Diff - difference between 21.02 and 21.08 DPDK version."
 
 # DPDK Performance Changes 2n-zn2 2t1c pdr
 - type: "table"
@@ -4658,20 +5253,20 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-#     - title: "2005"
-#       data-set: "dpdk-performance-changes-2n-zn2-h1"
-    - title: "2009"
-      data-set: "dpdk-performance-changes-2n-zn2-ref"
-    - title: "2101"
-      data-set: "dpdk-performance-changes-2n-zn2-cmp"
+    - title: "20.11"
+      data-set: "dpdk-2n-zn2-hist-iter"
+    - title: "21.02"
+      data-set: "dpdk-2n-zn2-prev-iter"
+    - title: "21.08"
+      data-set: "dpdk-2n-zn2-curr-iter"
   comparisons:
     - title: "Diff"
-      reference: 1  # 2
-      compare: 2  # 3
+      reference: 2
+      compare: 3
   legend:
     - ""
-    - "2009, 2101 - DPDK versions tested."
-    - "Diff - difference between 2009 and 2101 DPDK version."
+    - "20.11, 21.02, 21.08 - DPDK versions tested."
+    - "Diff - difference between 21.02 and 21.08 DPDK version."
 
 # DPDK Performance Changes 2n-zn2 4t2c pdr
 - type: "table"
@@ -4681,20 +5276,20 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-#     - title: "2005"
-#       data-set: "dpdk-performance-changes-2n-zn2-h1"
-    - title: "2009"
-      data-set: "dpdk-performance-changes-2n-zn2-ref"
-    - title: "2101"
-      data-set: "dpdk-performance-changes-2n-zn2-cmp"
+    - title: "20.11"
+      data-set: "dpdk-2n-zn2-hist-iter"
+    - title: "21.02"
+      data-set: "dpdk-2n-zn2-prev-iter"
+    - title: "21.08"
+      data-set: "dpdk-2n-zn2-curr-iter"
   comparisons:
     - title: "Diff"
-      reference: 1  # 2
-      compare: 2  # 3
+      reference: 2
+      compare: 3
   legend:
     - ""
-    - "2009, 2101 - DPDK versions tested."
-    - "Diff - difference between 2009 and 2101 DPDK version."
+    - "20.11, 21.02, 21.08 - DPDK versions tested."
+    - "Diff - difference between 21.02 and 21.08 DPDK version."
 
 # DPDK Performance Changes 2n-zn2 2t1c ndr
 - type: "table"
@@ -4704,20 +5299,20 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-#     - title: "2005"
-#       data-set: "dpdk-performance-changes-2n-zn2-h1"
-    - title: "2009"
-      data-set: "dpdk-performance-changes-2n-zn2-ref"
-    - title: "2101"
-      data-set: "dpdk-performance-changes-2n-zn2-cmp"
+    - title: "20.11"
+      data-set: "dpdk-2n-zn2-hist-iter"
+    - title: "21.02"
+      data-set: "dpdk-2n-zn2-prev-iter"
+    - title: "21.08"
+      data-set: "dpdk-2n-zn2-curr-iter"
   comparisons:
     - title: "Diff"
-      reference: 1  # 2
-      compare: 2  # 3
+      reference: 2
+      compare: 3
   legend:
     - ""
-    - "2009, 2101 - DPDK versions tested."
-    - "Diff - difference between 2009 and 2101 DPDK version."
+    - "20.11, 21.02, 21.08 - DPDK versions tested."
+    - "Diff - difference between 21.02 and 21.08 DPDK version."
 
 # DPDK Performance Changes 2n-zn2 4t2c ndr
 - type: "table"
@@ -4727,20 +5322,20 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-#     - title: "2005"
-#       data-set: "dpdk-performance-changes-2n-zn2-h1"
-    - title: "2009"
-      data-set: "dpdk-performance-changes-2n-zn2-ref"
-    - title: "2101"
-      data-set: "dpdk-performance-changes-2n-zn2-cmp"
+    - title: "20.11"
+      data-set: "dpdk-2n-zn2-hist-iter"
+    - title: "21.02"
+      data-set: "dpdk-2n-zn2-prev-iter"
+    - title: "21.08"
+      data-set: "dpdk-2n-zn2-curr-iter"
   comparisons:
     - title: "Diff"
-      reference: 1  # 2
-      compare: 2  # 3
+      reference: 2
+      compare: 3
   legend:
     - ""
-    - "2009, 2101 - DPDK versions tested."
-    - "Diff - difference between 2009 and 2101 DPDK version."
+    - "20.11, 21.02, 21.08 - DPDK versions tested."
+    - "Diff - difference between 21.02 and 21.08 DPDK version."
 
 ## DPDK Performance Changes 2n-dnv 1t1c pdr
 #- type: "table"
@@ -4934,20 +5529,20 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "2005"
-      data-set: "dpdk-performance-changes-3n-tsh-h1"
-    - title: "2009"
-      data-set: "dpdk-performance-changes-3n-tsh-ref"
-    - title: "2101"
-      data-set: "dpdk-performance-changes-3n-tsh-cmp"
+    - title: "20.11"
+      data-set: "dpdk-3n-tsh-hist-iter"
+    - title: "21.02"
+      data-set: "dpdk-3n-tsh-prev-iter"
+    - title: "21.08"
+      data-set: "dpdk-3n-tsh-curr-iter"
   comparisons:
     - title: "Diff"
       reference: 2
       compare: 3
   legend:
     - ""
-    - "2005, 2009, 2101 - DPDK versions tested."
-    - "Diff - difference between 2009 and 2101 DPDK version."
+    - "20.11, 21.02, 21.08 - DPDK versions tested."
+    - "Diff - difference between 21.02 and 21.08 DPDK version."
 
 # DPDK Performance Changes 3n-tsh 2t2c pdr
 - type: "table"
@@ -4957,20 +5552,20 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "2005"
-      data-set: "dpdk-performance-changes-3n-tsh-h1"
-    - title: "2009"
-      data-set: "dpdk-performance-changes-3n-tsh-ref"
-    - title: "2101"
-      data-set: "dpdk-performance-changes-3n-tsh-cmp"
+    - title: "20.11"
+      data-set: "dpdk-3n-tsh-hist-iter"
+    - title: "21.02"
+      data-set: "dpdk-3n-tsh-prev-iter"
+    - title: "21.08"
+      data-set: "dpdk-3n-tsh-curr-iter"
   comparisons:
     - title: "Diff"
       reference: 2
       compare: 3
   legend:
     - ""
-    - "2005, 2009, 2101 - DPDK versions tested."
-    - "Diff - difference between 2009 and 2101 DPDK version."
+    - "20.11, 21.02, 21.08 - DPDK versions tested."
+    - "Diff - difference between 21.02 and 21.08 DPDK version."
 
 # DPDK Performance Changes 3n-tsh 1t1c ndr
 - type: "table"
@@ -4980,20 +5575,20 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "2005"
-      data-set: "dpdk-performance-changes-3n-tsh-h1"
-    - title: "2009"
-      data-set: "dpdk-performance-changes-3n-tsh-ref"
-    - title: "2101"
-      data-set: "dpdk-performance-changes-3n-tsh-cmp"
+    - title: "20.11"
+      data-set: "dpdk-3n-tsh-hist-iter"
+    - title: "21.02"
+      data-set: "dpdk-3n-tsh-prev-iter"
+    - title: "21.08"
+      data-set: "dpdk-3n-tsh-curr-iter"
   comparisons:
     - title: "Diff"
       reference: 2
       compare: 3
   legend:
     - ""
-    - "2005, 2009, 2101 - DPDK versions tested."
-    - "Diff - difference between 2009 and 2101 DPDK version."
+    - "20.11, 21.02, 21.08 - DPDK versions tested."
+    - "Diff - difference between 21.02 and 21.08 DPDK version."
 
 # DPDK Performance Changes 3n-tsh 2t2c ndr
 - type: "table"
@@ -5003,62 +5598,20 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "2005"
-      data-set: "dpdk-performance-changes-3n-tsh-h1"
-    - title: "2009"
-      data-set: "dpdk-performance-changes-3n-tsh-ref"
-    - title: "2101"
-      data-set: "dpdk-performance-changes-3n-tsh-cmp"
+    - title: "20.11"
+      data-set: "dpdk-3n-tsh-hist-iter"
+    - title: "21.02"
+      data-set: "dpdk-3n-tsh-prev-iter"
+    - title: "21.08"
+      data-set: "dpdk-3n-tsh-curr-iter"
   comparisons:
     - title: "Diff"
       reference: 2
       compare: 3
   legend:
     - ""
-    - "2005, 2009, 2101 - DPDK versions tested."
-    - "Diff - difference between 2009 and 2101 DPDK version."
-
-# DPDK Comparison Across Testbeds 3n-hsw to 3n-skx ndr
-- type: "table"
-  title: "DPDK Comparison Across Testbeds 3n-hsw to 3n-skx ndr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-compare-testbeds-3n-hsw-3n-skx-ndr"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'NIC_Intel-X710'"
-  columns:
-    - title: "3n-hsw x710"
-      data-set: "dpdk-compare-testbeds-ref"
-    - title: "3n-skx x710"
-      data-set: "dpdk-compare-testbeds-cmp"
-  comparisons:
-    - title: "Diff"
-      reference: 1
-      compare: 2
-  legend:
-    - ""
-    - "3n-hsw x710, 3n-skx x710 - testbeds and NICs tested."
-    - "Diff - difference between 3n-hsw x710 and 3n-skx x710 testbeds."
-
-# DPDK Comparison Across Testbeds 3n-hsw to 3n-skx pdr
-- type: "table"
-  title: "DPDK Comparison Across Testbeds 3n-hsw to 3n-skx pdr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-compare-testbeds-3n-hsw-3n-skx-pdr"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'NIC_Intel-X710'"
-  columns:
-    - title: "3n-hsw x710"
-      data-set: "dpdk-compare-testbeds-ref"
-    - title: "3n-skx x710"
-      data-set: "dpdk-compare-testbeds-cmp"
-  comparisons:
-    - title: "Diff"
-      reference: 1
-      compare: 2
-  legend:
-    - ""
-    - "3n-hsw x710, 3n-skx x710 - testbeds and NICs tested."
-    - "Diff - difference between 3n-hsw x710 and 3n-skx x710 testbeds."
+    - "20.11, 21.02, 21.08 - DPDK versions tested."
+    - "Diff - difference between 21.02 and 21.08 DPDK version."
 
 # DPDK Comparison Across Testbeds 2n-skx to 2n-clx ndr
 - type: "table"
@@ -5069,9 +5622,9 @@
   filter: "'NIC_Intel-XXV710'"
   columns:
     - title: "2n-skx"
-      data-set: "dpdk-compare-testbeds-skx-clx-ref"
+      data-set: "dpdk-2n-skx-curr-iter"
     - title: "2n-clx"
-      data-set: "dpdk-compare-testbeds-skx-clx-cmp"
+      data-set: "dpdk-2n-clx-curr-iter"
   comparisons:
     - title: "Diff"
       reference: 1
@@ -5090,9 +5643,9 @@
   filter: "'NIC_Intel-XXV710'"
   columns:
     - title: "2n-skx"
-      data-set: "dpdk-compare-testbeds-skx-clx-ref"
+      data-set: "dpdk-2n-skx-curr-iter"
     - title: "2n-clx"
-      data-set: "dpdk-compare-testbeds-skx-clx-cmp"
+      data-set: "dpdk-2n-clx-curr-iter"
   comparisons:
     - title: "Diff"
       reference: 1
@@ -5111,9 +5664,9 @@
   filter: "'NIC_Intel-XXV710'"
   columns:
     - title: "3n-skx"
-      data-set: "dpdk-compare-topologies-ref"
+      data-set: "dpdk-3n-skx-curr-iter"
     - title: "2n-skx"
-      data-set: "dpdk-compare-topologies-cmp"
+      data-set: "dpdk-2n-skx-curr-iter"
   comparisons:
     - title: "Diff"
       reference: 1
@@ -5132,9 +5685,9 @@
   filter: "'NIC_Intel-XXV710'"
   columns:
     - title: "3n-skx"
-      data-set: "dpdk-compare-topologies-ref"
+      data-set: "dpdk-3n-skx-curr-iter"
     - title: "2n-skx"
-      data-set: "dpdk-compare-topologies-cmp"
+      data-set: "dpdk-2n-skx-curr-iter"
   comparisons:
     - title: "Diff"
       reference: 1
@@ -5144,23 +5697,6 @@
     - "3n-skx, 2n-skx - topologies tested."
     - "Diff - difference between 3n-skx and 2n-skx topologies."
 
-# Detailed Test Results - DPDK Performance Results 3n-hsw
-- type: "table"
-  title: "Detailed Test Results - DPDK Performance Results 3n-hsw"
-  algorithm: "table_merged_details"
-  output-file: "{DIR[DTR,PERF,DPDK,3N,HSW]}/dpdk_performance_results_3n_hsw"
-  columns:
-    - title: " |prein| Test Name |preout| "
-      data: "data name"
-    - title: " |prein| Throughput: |br| 1.  Mpps       Gbps (NDR) |br| 2.  Mpps       Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, |br| one set per each direction: |br| 3.  P50  P90  P99       P50  P90  P99 (10% PDR) |br| 4.  P50  P90  P99       P50  P90  P99 (50% PDR) |br| 5.  P50  P90  P99       P50  P90  P99 (90% PDR) |preout| "
-      data: "data msg"
-  data: "dpdk-perf-results-3n-hsw"
-  filter: "all"
-  parameters:
-  - "name"
-  - "parent"
-  - "msg"
-
 # Detailed Test Results - DPDK Performance Results 3n-skx
 - type: "table"
   title: "Detailed Test Results - DPDK Performance Results 3n-skx"
@@ -5171,7 +5707,7 @@
       data: "data name"
     - title: " |prein| Throughput: |br| 1.  Mpps       Gbps (NDR) |br| 2.  Mpps       Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, |br| one set per each direction: |br| 3.  P50  P90  P99       P50  P90  P99 (10% PDR) |br| 4.  P50  P90  P99       P50  P90  P99 (50% PDR) |br| 5.  P50  P90  P99       P50  P90  P99 (90% PDR) |preout| "
       data: "data msg"
-  data: "dpdk-perf-results-3n-skx"
+  data: "dpdk-3n-skx-curr-iter-best"
   filter: "all"
   remove-ndr: False
   parameters:
@@ -5189,7 +5725,7 @@
       data: "data name"
     - title: " |prein| Throughput: |br| 1.  Mpps       Gbps (NDR) |br| 2.  Mpps       Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, |br| one set per each direction: |br| 3.  P50  P90  P99       P50  P90  P99 (10% PDR) |br| 4.  P50  P90  P99       P50  P90  P99 (50% PDR) |br| 5.  P50  P90  P99       P50  P90  P99 (90% PDR) |preout| "
       data: "data msg"
-  data: "dpdk-perf-results-2n-skx"
+  data: "dpdk-2n-skx-curr-iter-best"
   filter: "all"
   remove-ndr: False
   parameters:
@@ -5207,7 +5743,7 @@
       data: "data name"
     - title: " |prein| Throughput: |br| 1.  Mpps       Gbps (NDR) |br| 2.  Mpps       Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, |br| one set per each direction: |br| 3.  P50  P90  P99       P50  P90  P99 (10% PDR) |br| 4.  P50  P90  P99       P50  P90  P99 (50% PDR) |br| 5.  P50  P90  P99       P50  P90  P99 (90% PDR) |preout| "
       data: "data msg"
-  data: "dpdk-perf-results-2n-zn2"
+  data: "dpdk-2n-zn2-curr-iter-best"
   filter: "all"
   remove-ndr: False
   parameters:
@@ -5225,7 +5761,7 @@
       data: "data name"
     - title: " |prein| Throughput: |br| 1.  Mpps       Gbps (NDR) |br| 2.  Mpps       Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, |br| one set per each direction: |br| 3.  P50  P90  P99       P50  P90  P99 (10% PDR) |br| 4.  P50  P90  P99       P50  P90  P99 (50% PDR) |br| 5.  P50  P90  P99       P50  P90  P99 (90% PDR) |preout| "
       data: "data msg"
-  data: "dpdk-perf-results-2n-clx"
+  data: "dpdk-2n-clx-curr-iter-best"
   filter: "all"
   parameters:
   - "name"
@@ -5276,7 +5812,7 @@
       data: "data name"
     - title: " |prein| Throughput: |br| 1.  Mpps       Gbps (NDR) |br| 2.  Mpps       Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, |br| one set per each direction: |br| 3.  P50  P90  P99       P50  P90  P99 (10% PDR) |br| 4.  P50  P90  P99       P50  P90  P99 (50% PDR) |br| 5.  P50  P90  P99       P50  P90  P99 (90% PDR) |preout| "
       data: "data msg"
-  data: "dpdk-perf-results-3n-tsh"
+  data: "dpdk-3n-tsh-curr-iter-best"
   filter: "all"
   parameters:
   - "name"
@@ -5293,8 +5829,44 @@
       data: "data name"
     - title: " |prein| Throughput: |br| 1.  Mpps       Gbps (NDR) |br| 2.  Mpps       Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, |br| one set per each direction: |br| 3.  P50  P90  P99       P50  P90  P99 (10% PDR) |br| 4.  P50  P90  P99       P50  P90  P99 (50% PDR) |br| 5.  P50  P90  P99       P50  P90  P99 (90% PDR) |preout| "
       data: "data msg"
-  data: "dpdk-perf-results-2n-tx2"
+  data: "dpdk-2n-tx2-curr-iter-best"
+  filter: "all"
+  parameters:
+  - "name"
+  - "parent"
+  - "msg"
+
+# # Detailed Test Results - TRex Performance Results 3n-skx
+# - type: "table"
+#   title: "Detailed Test Results - TRex Performance Results 3n-skx"
+#   algorithm: "table_merged_details"
+#   output-file: "{DIR[DTR,PERF,TREX,3N,SKX]}/trex_performance_results_3n_skx"
+#   columns:
+#     - title: " |prein| Test Name |preout| "
+#       data: "data name"
+#     - title: " |prein| Throughput: |br| 1.  Mpps       Gbps (NDR) |br| 2.  Mpps       Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, |br| one set per each direction: |br| 3.  P50  P90  P99       P50  P90  P99 (10% PDR) |br| 4.  P50  P90  P99       P50  P90  P99 (50% PDR) |br| 5.  P50  P90  P99       P50  P90  P99 (90% PDR) |preout| "
+#       data: "data msg"
+#   data: "trex-3n-skx-curr-iter-best"
+#   filter: "all"
+#   remove-ndr: False
+#   parameters:
+#   - "name"
+#   - "parent"
+#   - "msg"
+
+# Detailed Test Results - TRex Performance Results 2n-skx
+- type: "table"
+  title: "Detailed Test Results - TRex Performance Results 2n-skx"
+  algorithm: "table_merged_details"
+  output-file: "{DIR[DTR,PERF,TREX,2N,SKX]}/trex_performance_results_2n_skx"
+  columns:
+    - title: " |prein| Test Name |preout| "
+      data: "data name"
+    - title: " |prein| Throughput: |br| 1.  Mpps       Gbps (NDR) |br| 2.  Mpps       Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, |br| one set per each direction: |br| 3.  P50  P90  P99       P50  P90  P99 (10% PDR) |br| 4.  P50  P90  P99       P50  P90  P99 (50% PDR) |br| 5.  P50  P90  P99       P50  P90  P99 (90% PDR) |preout| "
+      data: "data msg"
+  data: "trex-2n-skx-curr-iter-best"
   filter: "all"
+  remove-ndr: False
   parameters:
   - "name"
   - "parent"
@@ -5316,23 +5888,25 @@
 #     - "{DIR[DTR,PERF,VPP,2N,ICX]}"
 #     - "{DIR[DTR,PERF,VPP,3N,ICX]}"
     - "{DIR[DTR,PERF,VPP,2N,ZN2]}"
-    - "{DIR[DTR,PERF,VPP,3N,HSW]}"
     - "{DIR[DTR,PERF,VPP,3N,TSH]}"
     - "{DIR[DTR,PERF,VPP,2N,TX2]}"
     - "{DIR[DTR,PERF,VPP,2N,DNV]}"
     - "{DIR[DTR,PERF,VPP,3N,DNV]}"
+    - "{DIR[DTR,PERF,VPP,2N,AWS]}"
+    - "{DIR[DTR,PERF,VPP,3N,AWS]}"
   data:
-    - "vpp-perf-results-2n-skx"
-    - "vpp-perf-results-3n-skx"
-    - "vpp-perf-results-2n-clx"
-#     - "vpp-perf-results-2n-icx"
-#     - "vpp-perf-results-3n-icx"
-    - "vpp-perf-results-2n-zn2"
-    - "vpp-perf-results-3n-hsw"
-    - "vpp-perf-results-3n-tsh"
-    - "vpp-perf-results-2n-tx2"
-    - "vpp-perf-results-2n-dnv"
-    - "vpp-perf-results-3n-dnv"
+    - "vpp-2n-skx-curr-cov"
+    - "vpp-3n-skx-curr-cov"
+    - "vpp-2n-clx-curr-cov"
+#     - "vpp-2n-icx-curr-iter-best"
+#     - "vpp-3n-icx-curr-iter-best"
+    - "vpp-2n-zn2-curr-cov"
+    - "vpp-3n-tsh-curr-cov"
+    - "vpp-2n-tx2-curr-cov"
+    - "vpp-2n-dnv-curr-cov"
+    - "vpp-3n-dnv-curr-cov"
+    - "vpp-2n-aws-curr-cov"
+    - "vpp-3n-aws-curr-cov"
   filter: "'NDRPDR'"
   data-start-level: 4
   order-chapters:
@@ -5357,11 +5931,12 @@
 #       - "2n-icx"
 #       - "3n-icx"
       - "2n-zn2"
-      - "3n-hsw"
       - "3n-tsh"
       - "2n-tx2"
       - "2n-dnv"
       - "3n-dnv"
+      - "2n-aws"
+      - "3n-aws"
     level-3:
       - "xl710"
       - "x520"
@@ -5372,6 +5947,7 @@
       - "cx556a"
       - "vic1227"
       - "vic1385"
+      - "nitro50g"
 
 # VPP Performance Configuration
 - type: "file"
@@ -5385,23 +5961,25 @@
 #     - "{DIR[DTC,PERF,VPP,2N,ICX]}"
 #     - "{DIR[DTC,PERF,VPP,3N,ICX]}"
     - "{DIR[DTC,PERF,VPP,2N,ZN2]}"
-    - "{DIR[DTC,PERF,VPP,3N,HSW]}"
     - "{DIR[DTC,PERF,VPP,3N,TSH]}"
     - "{DIR[DTC,PERF,VPP,2N,TX2]}"
     - "{DIR[DTC,PERF,VPP,2N,DNV]}"
     - "{DIR[DTC,PERF,VPP,3N,DNV]}"
+    - "{DIR[DTC,PERF,VPP,2N,AWS]}"
+    - "{DIR[DTC,PERF,VPP,3N,AWS]}"
   data:
-    - "vpp-perf-results-2n-skx"
-    - "vpp-perf-results-3n-skx"
-    - "vpp-perf-results-2n-clx"
-#     - "vpp-perf-results-2n-icx"
-#     - "vpp-perf-results-3n-icx"
-    - "vpp-perf-results-2n-zn2"
-    - "vpp-perf-results-3n-hsw"
-    - "vpp-perf-results-3n-tsh"
-    - "vpp-perf-results-2n-tx2"
-    - "vpp-perf-results-2n-dnv"
-    - "vpp-perf-results-3n-dnv"
+    - "vpp-2n-skx-curr-cov"
+    - "vpp-3n-skx-curr-cov"
+    - "vpp-2n-clx-curr-cov"
+#     - "vpp-2n-icx-curr-iter-best"
+#     - "vpp-3n-icx-curr-iter-best"
+    - "vpp-2n-zn2-curr-cov"
+    - "vpp-3n-tsh-curr-cov"
+    - "vpp-2n-tx2-curr-cov"
+    - "vpp-2n-dnv-curr-cov"
+    - "vpp-3n-dnv-curr-cov"
+    - "vpp-2n-aws-curr-cov"
+    - "vpp-3n-aws-curr-cov"
   filter: "'NDRPDR'"
   data-start-level: 4
   order-chapters:
@@ -5426,11 +6004,12 @@
 #       - "2n-icx"
 #       - "3n-icx"
       - "2n-zn2"
-      - "3n-hsw"
       - "3n-tsh"
       - "2n-tx2"
       - "2n-dnv"
       - "3n-dnv"
+      - "2n-aws"
+      - "3n-aws"
     level-3:
       - "xl710"
       - "x520"
@@ -5441,6 +6020,7 @@
       - "cx556a"
       - "vic1227"
       - "vic1385"
+      - "nitro50g"
 
 # VPP Performance Operational
 - type: "file"
@@ -5454,23 +6034,25 @@
 #     - "{DIR[DTO,PERF,VPP,2N,ICX]}"
 #     - "{DIR[DTO,PERF,VPP,3N,ICX]}"
     - "{DIR[DTO,PERF,VPP,2N,ZN2]}"
-    - "{DIR[DTO,PERF,VPP,3N,HSW]}"
     - "{DIR[DTO,PERF,VPP,3N,TSH]}"
     - "{DIR[DTO,PERF,VPP,2N,TX2]}"
     - "{DIR[DTO,PERF,VPP,2N,DNV]}"
     - "{DIR[DTO,PERF,VPP,3N,DNV]}"
+    - "{DIR[DTO,PERF,VPP,2N,AWS]}"
+    - "{DIR[DTO,PERF,VPP,3N,AWS]}"
   data:
-    - "vpp-perf-results-2n-skx"
-    - "vpp-perf-results-3n-skx"
-    - "vpp-perf-results-2n-clx"
-#     - "vpp-perf-results-2n-icx"
-#     - "vpp-perf-results-3n-icx"
-    - "vpp-perf-results-2n-zn2"
-    - "vpp-perf-results-3n-hsw"
-    - "vpp-perf-results-3n-tsh"
-    - "vpp-perf-results-2n-tx2"
-    - "vpp-perf-results-2n-dnv"
-    - "vpp-perf-results-3n-dnv"
+    - "vpp-2n-skx-curr-cov"
+    - "vpp-3n-skx-curr-cov"
+    - "vpp-2n-clx-curr-cov"
+#     - "vpp-2n-icx-curr-iter-best"
+#     - "vpp-3n-icx-curr-iter-best"
+    - "vpp-2n-zn2-curr-cov"
+    - "vpp-3n-tsh-curr-cov"
+    - "vpp-2n-tx2-curr-cov"
+    - "vpp-2n-dnv-curr-cov"
+    - "vpp-3n-dnv-curr-cov"
+    - "vpp-2n-aws-curr-cov"
+    - "vpp-3n-aws-curr-cov"
   filter: "'NDRPDR'"
   data-start-level: 4
   order-chapters:
@@ -5495,11 +6077,12 @@
 #       - "2n-icx"
 #       - "3n-icx"
       - "2n-zn2"
-      - "3n-hsw"
       - "3n-tsh"
       - "2n-tx2"
       - "2n-dnv"
       - "3n-dnv"
+      - "2n-aws"
+      - "3n-aws"
     level-3:
       - "xl710"
       - "x520"
@@ -5510,6 +6093,7 @@
       - "cx556a"
       - "vic1227"
       - "vic1385"
+      - "aws"
 
 # VPP MRR Results
 - type: "file"
@@ -5523,23 +6107,25 @@
 #     - "{DIR[DTR,MRR,VPP,2N,ICX]}"
 #     - "{DIR[DTR,MRR,VPP,3N,ICX]}"
     - "{DIR[DTR,MRR,VPP,2N,ZN2]}"
-    - "{DIR[DTR,MRR,VPP,3N,HSW]}"
     - "{DIR[DTR,MRR,VPP,3N,TSH]}"
     - "{DIR[DTR,MRR,VPP,2N,TX2]}"
     - "{DIR[DTR,MRR,VPP,2N,DNV]}"
     - "{DIR[DTR,MRR,VPP,3N,DNV]}"
+    - "{DIR[DTR,MRR,VPP,2N,AWS]}"
+    - "{DIR[DTR,MRR,VPP,3N,AWS]}"
   data:
-    - "vpp-mrr-results-2n-skx"
-    - "vpp-mrr-results-3n-skx"
-    - "vpp-mrr-results-2n-clx"
-#     - "vpp-mrr-results-2n-icx"
+    - "vpp-2n-skx-curr-iter-mrr"
+    - "vpp-3n-skx-curr-iter-mrr"
+    - "vpp-2n-clx-curr-iter-mrr"
+#     - "vpp-2n-icx-curr-iter-mrr"
 #     - "vpp-mrr-results-3n-icx"
-    - "vpp-mrr-results-2n-zn2"
-    - "vpp-mrr-results-3n-hsw"
-    - "vpp-mrr-results-3n-tsh"
-    - "vpp-mrr-results-2n-tx2"
-    - "vpp-mrr-results-2n-dnv"
-    - "vpp-mrr-results-3n-dnv"
+    - "vpp-2n-zn2-curr-iter-mrr"
+    - "vpp-3n-tsh-curr-iter-mrr"
+    - "vpp-2n-tx2-curr-iter-mrr"
+    - "vpp-2n-dnv-curr-iter-mrr"
+    - "vpp-3n-dnv-curr-iter-mrr"
+    - "vpp-2n-aws-curr-iter-mrr"
+    - "vpp-3n-aws-curr-iter-mrr"
   filter: "'MRR'"
   data-start-level: 4
   order-chapters:
@@ -5564,11 +6150,12 @@
 #       - "2n-icx"
 #       - "3n-icx"
       - "2n-zn2"
-      - "3n-hsw"
       - "3n-tsh"
       - "2n-tx2"
       - "2n-dnv"
       - "3n-dnv"
+      - "2n-aws"
+      - "3n-aws"
     level-3:
       - "xl710"
       - "x520"
@@ -5579,6 +6166,7 @@
       - "cx556a"
       - "vic1227"
       - "vic1385"
+      - "nitro50g"
 
 # VPP MRR Configuration
 - type: "file"
@@ -5592,23 +6180,25 @@
 #     - "{DIR[DTC,MRR,VPP,2N,ICX]}"
 #     - "{DIR[DTC,MRR,VPP,3N,ICX]}"
     - "{DIR[DTC,MRR,VPP,2N,ZN2]}"
-    - "{DIR[DTC,MRR,VPP,3N,HSW]}"
     - "{DIR[DTC,MRR,VPP,3N,TSH]}"
     - "{DIR[DTC,MRR,VPP,2N,TX2]}"
     - "{DIR[DTC,MRR,VPP,2N,DNV]}"
     - "{DIR[DTC,MRR,VPP,3N,DNV]}"
+    - "{DIR[DTC,MRR,VPP,2N,AWS]}"
+    - "{DIR[DTC,MRR,VPP,3N,AWS]}"
   data:
-    - "vpp-mrr-results-2n-skx"
-    - "vpp-mrr-results-3n-skx"
-    - "vpp-mrr-results-2n-clx"
-#     - "vpp-mrr-results-2n-icx"
+    - "vpp-2n-skx-curr-iter-mrr"
+    - "vpp-3n-skx-curr-iter-mrr"
+    - "vpp-2n-clx-curr-iter-mrr"
+#     - "vpp-2n-icx-curr-iter-mrr"
 #     - "vpp-mrr-results-3n-icx"
-    - "vpp-mrr-results-2n-zn2"
-    - "vpp-mrr-results-3n-hsw"
-    - "vpp-mrr-results-3n-tsh"
-    - "vpp-mrr-results-2n-tx2"
-    - "vpp-mrr-results-2n-dnv"
-    - "vpp-mrr-results-3n-dnv"
+    - "vpp-2n-zn2-curr-iter-mrr"
+    - "vpp-3n-tsh-curr-iter-mrr"
+    - "vpp-2n-tx2-curr-iter-mrr"
+    - "vpp-2n-dnv-curr-iter-mrr"
+    - "vpp-3n-dnv-curr-iter-mrr"
+    - "vpp-2n-aws-curr-iter-mrr"
+    - "vpp-3n-aws-curr-iter-mrr"
   filter: "'MRR'"
   data-start-level: 4
   order-chapters:
@@ -5633,11 +6223,12 @@
 #       - "2n-icx"
 #       - "3n-icx"
       - "2n-zn2"
-      - "3n-hsw"
       - "3n-tsh"
       - "2n-tx2"
       - "2n-dnv"
       - "3n-dnv"
+      - "2n-aws"
+      - "3n-aws"
     level-3:
       - "xl710"
       - "x520"
@@ -5648,6 +6239,7 @@
       - "cx556a"
       - "vic1227"
       - "vic1385"
+      - "nitro50g"
 
 # VPP Device Results - Ubuntu
 - type: "file"
@@ -5669,23 +6261,13 @@
   filter: "all"
   data-start-level: 4
 
-# DPDK Performance Results 3n-hsw
-- type: "file"
-  title: "DPDK Performance Results 3n-hsw"
-  algorithm: "file_test_results"
-  output-file: "{DIR[DTR,PERF,DPDK,3N,HSW]}"
-  dir-tables: "{DIR[DTR,PERF,DPDK,3N,HSW]}"
-  data: "dpdk-perf-results-3n-hsw"
-  filter: "all"
-  data-start-level: 4
-
 # DPDK Performance Results 3n-skx
 - type: "file"
   title: "DPDK Performance Results 3n-skx"
   algorithm: "file_test_results"
   output-file: "{DIR[DTR,PERF,DPDK,3N,SKX]}"
   dir-tables: "{DIR[DTR,PERF,DPDK,3N,SKX]}"
-  data: "dpdk-perf-results-3n-skx"
+  data: "dpdk-3n-skx-curr-iter-best"
   filter: "all"
   data-start-level: 4
 
@@ -5695,7 +6277,7 @@
   algorithm: "file_test_results"
   output-file: "{DIR[DTR,PERF,DPDK,2N,SKX]}"
   dir-tables: "{DIR[DTR,PERF,DPDK,2N,SKX]}"
-  data: "dpdk-perf-results-2n-skx"
+  data: "dpdk-2n-skx-curr-iter-best"
   filter: "all"
   data-start-level: 4
 
@@ -5705,7 +6287,7 @@
   algorithm: "file_test_results"
   output-file: "{DIR[DTR,PERF,DPDK,2N,ZN2]}"
   dir-tables: "{DIR[DTR,PERF,DPDK,2N,ZN2]}"
-  data: "dpdk-perf-results-2n-zn2"
+  data: "dpdk-2n-zn2-curr-iter-best"
   filter: "all"
   data-start-level: 4
 
@@ -5715,7 +6297,7 @@
   algorithm: "file_test_results"
   output-file: "{DIR[DTR,PERF,DPDK,2N,CLX]}"
   dir-tables: "{DIR[DTR,PERF,DPDK,2N,CLX]}"
-  data: "dpdk-perf-results-2n-clx"
+  data: "dpdk-2n-clx-curr-iter-best"
   filter: "all"
   data-start-level: 4
 
@@ -5745,7 +6327,7 @@
   algorithm: "file_test_results"
   output-file: "{DIR[DTR,PERF,DPDK,3N,TSH]}"
   dir-tables: "{DIR[DTR,PERF,DPDK,3N,TSH]}"
-  data: "dpdk-perf-results-3n-tsh"
+  data: "dpdk-3n-tsh-curr-iter-best"
   filter: "all"
   data-start-level: 4
 
@@ -5755,7 +6337,27 @@
   algorithm: "file_test_results"
   output-file: "{DIR[DTR,PERF,DPDK,2N,TX2]}"
   dir-tables: "{DIR[DTR,PERF,DPDK,2N,TX2]}"
-  data: "dpdk-perf-results-2n-tx2"
+  data: "dpdk-2n-tx2-curr-iter-best"
+  filter: "all"
+  data-start-level: 4
+
+# # TRex Performance Results 3n-skx
+# - type: "file"
+#   title: "TRex Performance Results 3n-skx"
+#   algorithm: "file_test_results"
+#   output-file: "{DIR[DTR,PERF,TREX,3N,SKX]}"
+#   dir-tables: "{DIR[DTR,PERF,TREX,3N,SKX]}"
+#   data: "trex-3n-skx-curr-iter-best"
+#   filter: "all"
+#   data-start-level: 4
+
+# TRex Performance Results 2n-skx
+- type: "file"
+  title: "TRex Performance Results 2n-skx"
+  algorithm: "file_test_results"
+  output-file: "{DIR[DTR,PERF,TREX,2N,SKX]}"
+  dir-tables: "{DIR[DTR,PERF,TREX,2N,SKX]}"
+  data: "trex-2n-skx-curr-iter-best"
   filter: "all"
   data-start-level: 4
 
@@ -5763,44 +6365,142 @@
 ###                                P L O T S                                 ###
 ################################################################################
 
-# Hoststack tests 3n-hsw
+# VSAP tests 2n-clx
+
+# - type: "plot"
+#   title: "2n-clx-e810cg-0b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps"
+#   algorithm: "plot_perf_box_name"
+#   output-file: "{DIR[STATIC,VPP]}/2n-clx-e810cg-0b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps"
+#   data: "vpp-2n-clx-curr-iter-vsap"
+#   include:
+#     - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1E810Cq-Eth-Ip4Tcphttp-Ldpreload-Nginx-1.14.2-Cps.0B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1.14.2-cps"
+#     - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1E810Cq-Eth-Ip4Tcphttp-Ldpreload-Nginx-1.15.0-Cps.0B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1.15.0-cps"
+#   layout:
+#     title: "2n-clx-e810cg-0b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
+#     layout: "plot-hoststack"
+#
+# - type: "plot"
+#   title: "2n-clx-e810cg-64b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps"
+#   algorithm: "plot_perf_box_name"
+#   output-file: "{DIR[STATIC,VPP]}/2n-clx-e810cg-64b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps"
+#   data: "vpp-2n-clx-curr-iter-vsap"
+#   include:
+#     - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1E810Cq-Eth-Ip4Tcphttp-Ldpreload-Nginx-1.14.2-Cps.64b-2t1c-eth-ip4tcphttp-ldpreload-nginx-1.14.2-cps"
+#     - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1E810Cq-Eth-Ip4Tcphttp-Ldpreload-Nginx-1.15.0-Cps.64b-2t1c-eth-ip4tcphttp-ldpreload-nginx-1.15.0-cps"
+#   layout:
+#     title: "2n-clx-e810cg-64b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
+#     layout: "plot-hoststack"
+#
+# - type: "plot"
+#   title: "2n-clx-e810cg-1024b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps"
+#   algorithm: "plot_perf_box_name"
+#   output-file: "{DIR[STATIC,VPP]}/2n-clx-e810cg-1024b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps"
+#   data: "vpp-2n-clx-curr-iter-vsap"
+#   include:
+#     - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1E810Cq-Eth-Ip4Tcphttp-Ldpreload-Nginx-1.14.2-Cps.1024b-2t1c-eth-ip4tcphttp-ldpreload-nginx-1.14.2-cps"
+#     - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1E810Cq-Eth-Ip4Tcphttp-Ldpreload-Nginx-1.15.0-Cps.1024b-2t1c-eth-ip4tcphttp-ldpreload-nginx-1.15.0-cps"
+#   layout:
+#     title: "2n-clx-e810cg-1024b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
+#     layout: "plot-hoststack"
+#
+# - type: "plot"
+#   title: "2n-clx-e810cg-2048b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps"
+#   algorithm: "plot_perf_box_name"
+#   output-file: "{DIR[STATIC,VPP]}/2n-clx-e810cg-2048b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps"
+#   data: "vpp-2n-clx-curr-iter-vsap"
+#   include:
+#     - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1E810Cq-Eth-Ip4Tcphttp-Ldpreload-Nginx-1.14.2-Cps.2048b-2t1c-eth-ip4tcphttp-ldpreload-nginx-1.14.2-cps"
+#     - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1E810Cq-Eth-Ip4Tcphttp-Ldpreload-Nginx-1.15.0-Cps.2048b-2t1c-eth-ip4tcphttp-ldpreload-nginx-1.15.0-cps"
+#   layout:
+#     title: "2n-clx-e810cg-2048b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
+#     layout: "plot-hoststack"
+#
+# - type: "plot"
+#   title: "2n-clx-e810cg-0b-2t1c-eth-ip4tcphttp-ldpreload-nginx-rps"
+#   algorithm: "plot_perf_box_name"
+#   output-file: "{DIR[STATIC,VPP]}/2n-clx-e810cg-0b-2t1c-eth-ip4tcphttp-ldpreload-nginx-rps"
+#   data: "vpp-2n-clx-curr-iter-vsap"
+#   include:
+#     - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1E810Cq-Eth-Ip4Tcphttp-Ldpreload-Nginx-1.14.2-rps.0B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1.14.2-rps"
+#     - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1E810Cq-Eth-Ip4Tcphttp-Ldpreload-Nginx-1.15.0-rps.0B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1.15.0-rps"
+#   layout:
+#     title: "2n-clx-e810cg-0b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
+#     layout: "plot-hoststack"
+#
+# - type: "plot"
+#   title: "2n-clx-e810cg-64b-2t1c-eth-ip4tcphttp-ldpreload-nginx-rps"
+#   algorithm: "plot_perf_box_name"
+#   output-file: "{DIR[STATIC,VPP]}/2n-clx-e810cg-64b-2t1c-eth-ip4tcphttp-ldpreload-nginx-rps"
+#   data: "vpp-2n-clx-curr-iter-vsap"
+#   include:
+#     - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1E810Cq-Eth-Ip4Tcphttp-Ldpreload-Nginx-1.14.2-rps.64b-2t1c-eth-ip4tcphttp-ldpreload-nginx-1.14.2-rps"
+#     - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1E810Cq-Eth-Ip4Tcphttp-Ldpreload-Nginx-1.15.0-rps.64b-2t1c-eth-ip4tcphttp-ldpreload-nginx-1.15.0-rps"
+#   layout:
+#     title: "2n-clx-e810cg-64b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
+#     layout: "plot-hoststack"
+#
+# - type: "plot"
+#   title: "2n-clx-e810cg-1024b-2t1c-eth-ip4tcphttp-ldpreload-nginx-rps"
+#   algorithm: "plot_perf_box_name"
+#   output-file: "{DIR[STATIC,VPP]}/2n-clx-e810cg-1024b-2t1c-eth-ip4tcphttp-ldpreload-nginx-rps"
+#   data: "vpp-2n-clx-curr-iter-vsap"
+#   include:
+#     - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1E810Cq-Eth-Ip4Tcphttp-Ldpreload-Nginx-1.14.2-rps.1024b-2t1c-eth-ip4tcphttp-ldpreload-nginx-1.14.2-rps"
+#     - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1E810Cq-Eth-Ip4Tcphttp-Ldpreload-Nginx-1.15.0-rps.1024b-2t1c-eth-ip4tcphttp-ldpreload-nginx-1.15.0-rps"
+#   layout:
+#     title: "2n-clx-e810cg-1024b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
+#     layout: "plot-hoststack"
+#
+# - type: "plot"
+#   title: "2n-clx-e810cg-2048b-2t1c-eth-ip4tcphttp-ldpreload-nginx-rps"
+#   algorithm: "plot_perf_box_name"
+#   output-file: "{DIR[STATIC,VPP]}/2n-clx-e810cg-2048b-2t1c-eth-ip4tcphttp-ldpreload-nginx-rps"
+#   data: "vpp-2n-clx-curr-iter-vsap"
+#   include:
+#     - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1E810Cq-Eth-Ip4Tcphttp-Ldpreload-Nginx-1.14.2-rps.2048b-2t1c-eth-ip4tcphttp-ldpreload-nginx-1.14.2-rps"
+#     - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1E810Cq-Eth-Ip4Tcphttp-Ldpreload-Nginx-1.15.0-rps.2048b-2t1c-eth-ip4tcphttp-ldpreload-nginx-1.15.0-rps"
+#   layout:
+#     title: "2n-clx-e810cg-2048b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
+#     layout: "plot-hoststack"
+
+# Hoststack tests 3n-skx
 
 - type: "plot"
-  title: "Bandwidth: 3n-hsw-xl710-1460b-1t1c-eth-ip4tcp-ldpreload-iperf3"
+  title: "Bandwidth: 3n-skx-xxv710-1460b-2t1c-eth-ip4tcp-ldpreload-iperf3"
   algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-1460b-1t1c-eth-ip4tcp-ldpreload-iperf3-bps"
-  data: "plot-vpp-hoststack-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-1460b-2t1c-eth-ip4tcp-ldpreload-iperf3-bps"
+  data: "vpp-3n-skx-curr-iter-hoststack"
   include:
-    - "Tests.Vpp.Perf.Hoststack.40Ge2P1Xl710-Eth-Ip4Tcpbase-Ldpreload-Iperf3-Bps.1460B-1t1c-eth-ip4tcpbase-ldpreload-iperf3-bps"
-    - "Tests.Vpp.Perf.Hoststack.40Ge2P1Xl710-Eth-Ip4Tcpscale1Cl10S-Ldpreload-Iperf3-Bps.1460B-1t1c-eth-ip4tcpscale1cl10s-ldpreload-iperf3-bps"
+    - "Tests.Vpp.Perf.Hoststack.25Ge2P1Xxv710-Eth-Ip4Tcpbase-Ldpreload-Iperf3-Bps.1460B-2t1c-eth-ip4tcpbase-ldpreload-iperf3-bps"
+    - "Tests.Vpp.Perf.Hoststack.25Ge2P1Xxv710-Eth-Ip4Tcpscale1Cl10S-Ldpreload-Iperf3-Bps.1460B-2t1c-eth-ip4tcpscale1cl10s-ldpreload-iperf3-bps"
   layout:
-    title: "3n-hsw-xl710-1460b-1t1c-eth-ip4tcp-ldpreload-iperf3"
+    title: "3n-skx-xxv710-1460b-2t1c-eth-ip4tcp-ldpreload-iperf3"
     layout: "plot-hoststack"
 
 - type: "plot"
-  title: "Bandwidth: 3n-hsw-xl710-1460b-1t1c-eth-ip4tcp-nsim-ldpreload-iperf3"
+  title: "Bandwidth: 3n-skx-xxv710-1460b-2t1c-eth-ip4udp-ldpreload-iperf3"
   algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-1460b-1t1c-eth-ip4tcp-nsim-ldpreload-iperf3-bps"
-  data: "plot-vpp-hoststack-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-1460b-2t1c-eth-ip4udp-ldpreload-iperf3-bps"
+  data: "vpp-3n-skx-curr-iter-hoststack"
   include:
-    - "Tests.Vpp.Perf.Hoststack.40Ge2P1Xl710-Eth-Ip4Tcpbase-Nsim-Ldpreload-Iperf3-Bps.1460B-1t1c-eth-ip4tcpbase-nsim-ldpreload-iperf3-bps"
-    - "Tests.Vpp.Perf.Hoststack.40Ge2P1Xl710-Eth-Ip4Tcpscale1Cl10S-Nsim-Ldpreload-Iperf3-Bps.1460B-1t1c-eth-ip4tcpscale1cl10s-nsim-ldpreload-iperf3-bps"
+    - "Tests.Vpp.Perf.Hoststack.25Ge2P1Xxv710-Eth-Ip4Udpbase-Ldpreload-Iperf3-Bps.1460B-2t1c-eth-ip4udpbase-ldpreload-iperf3-bps"
+    - "Tests.Vpp.Perf.Hoststack.25Ge2P1Xxv710-Eth-Ip4Udpscale1Cl10S-Ldpreload-Iperf3-Bps.1460B-2t1c-eth-ip4udpscale1cl10s-ldpreload-iperf3-bps"
   layout:
-    title: "3n-hsw-xl710-1460b-1t1c-eth-ip4tcp-nsim-ldpreload-iperf3"
+    title: "3n-skx-xxv710-1460b-2t1c-eth-ip4udp-ldpreload-iperf3"
     layout: "plot-hoststack"
 
 - type: "plot"
-  title: "Bandwidth: 3n-hsw-xl710-1280b-1t1c-eth-ip4udpquic-vppecho"
+  title: "Bandwidth: 3n-skx-xxv710-1280b-2t1c-eth-ip4udpquic-vppecho"
   algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-1280b-1t1c-eth-ip4udpquic-vppecho-bps"
-  data: "plot-vpp-hoststack-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-1280b-2t1c-eth-ip4udpquic-vppecho-bps"
+  data: "vpp-3n-skx-curr-iter-hoststack"
   include:
-    - "Tests.Vpp.Perf.Hoststack.40Ge2P1Xl710-Eth-Ip4Udpquicbase-Vppecho-Bps.1280B-1t1c-eth-ip4udpquicbase-vppecho-bps"
-    - "Tests.Vpp.Perf.Hoststack.40Ge2P1Xl710-Eth-Ip4Udpquicscale1Cl10S-Vppecho-Bps.1280B-1t1c-eth-ip4udpquicscale1cl10s-vppecho-bps"
-    - "Tests.Vpp.Perf.Hoststack.40Ge2P1Xl710-Eth-Ip4Udpquicscale10Cl1S-Vppecho-Bps.1280B-1t1c-eth-ip4udpquicscale10cl1s-vppecho-bps"
-    - "Tests.Vpp.Perf.Hoststack.40Ge2P1Xl710-Eth-Ip4Udpquicscale10Cl10S-Vppecho-Bps.1280B-1t1c-eth-ip4udpquicscale10cl10s-vppecho-bps"
+    - "Tests.Vpp.Perf.Hoststack.25Ge2P1Xxv710-Eth-Ip4Udpquicbase-Vppecho-Bps.1280B-2t1c-eth-ip4udpquicbase-vppecho-bps"
+    - "Tests.Vpp.Perf.Hoststack.25Ge2P1Xxv710-Eth-Ip4Udpquicscale1Cl10S-Vppecho-Bps.1280B-2t1c-eth-ip4udpquicscale1cl10s-vppecho-bps"
+    - "Tests.Vpp.Perf.Hoststack.25Ge2P1Xxv710-Eth-Ip4Udpquicscale10Cl1S-Vppecho-Bps.1280B-2t1c-eth-ip4udpquicscale10cl1s-vppecho-bps"
+    - "Tests.Vpp.Perf.Hoststack.25Ge2P1Xxv710-Eth-Ip4Udpquicscale10Cl10S-Vppecho-Bps.1280B-2t1c-eth-ip4udpquicscale10cl10s-vppecho-bps"
   layout:
-    title: "3n-hsw-xl710-1280b-1t1c-eth-ip4udpquic-vppecho"
+    title: "3n-skx-xxv710-1280b-2t1c-eth-ip4udpquic-vppecho"
     layout: "plot-hoststack"
 
 ################################################################################
@@ -5811,7 +6511,7 @@
   algorithm: "plot_perf_box_name"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/soak-test-1"
-  data: "plot-vpp-soak-2n-clx"
+  data: "vpp-2n-clx-curr-soak"
   include:
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Soak.64B-2t1c-avf-eth-l2xcbase-soak"
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Soak.64B-2t1c-avf-eth-l2bdbasemaclrn-soak"
@@ -5829,7 +6529,7 @@
   algorithm: "plot_perf_box_name"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/soak-test-2"
-  data: "plot-vpp-soak-2n-clx"
+  data: "vpp-2n-clx-curr-soak"
   include:
     - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Base-Soak.78B-2t1c-avf-ethip6-ip6base-soak"
     - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Base-Soak.78B-2t1c-ethip6-ip6base-soak"
@@ -5847,7 +6547,7 @@
   algorithm: "plot_perf_box_name"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/soak-test-2n-skx-1"
-  data: "plot-vpp-soak-2n-skx"
+  data: "vpp-2n-skx-curr-soak"
   include:
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Soak.64B-2t1c-avf-eth-l2xcbase-soak"
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Soak.64B-2t1c-avf-eth-l2bdbasemaclrn-soak"
@@ -5865,7 +6565,7 @@
   algorithm: "plot_perf_box_name"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/soak-test-2n-skx-2"
-  data: "plot-vpp-soak-2n-skx"
+  data: "vpp-2n-skx-curr-soak"
   include:
     - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Base-Soak.78B-2t1c-avf-ethip6-ip6base-soak"
     - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Base-Soak.78B-2t1c-ethip6-ip6base-soak"
@@ -5885,7 +6585,7 @@
   title: "NFV Effective Blocked Time: 2n-skx-xxv710-imix-{core}-dot1qip4vxlan-l2bd-{Y}ch-1ach-{2XY}vh-{XY}vm-reconf"
   algorithm: "plot_nf_reconf_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-imix-{core}-dot1qip4vxlan-l2bd-reconf"
-  data: "plot-vpp-nfv-reconf-2n-skx"
+  data: "vpp-2n-skx-curr-nfv-reconf"
   core: ["2t1c", "4t2c", "8t4c"]
   include:
     - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-1Ch-1Ach-2Vh-1Vm1T-Testpmd-Reconf.IMIX-{core}-avf-dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm1t-testpmd-reconf"
@@ -5906,7 +6606,7 @@
   title: "NFV Effective Blocked Time: 2n-clx-xxv710-imix-{core}-dot1qip4vxlan-l2bd-{Y}ch-1ach-{2XY}vh-{XY}vm-reconf"
   algorithm: "plot_nf_reconf_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-imix-{core}-dot1qip4vxlan-l2bd-reconf"
-  data: "plot-vpp-nfv-reconf-2n-clx"
+  data: "vpp-2n-clx-curr-nfv-reconf"
   core: ["2t1c", "4t2c", "8t4c"]
   include:
     - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-1Ch-1Ach-2Vh-1Vm1T-Testpmd-Reconf.IMIX-{core}-avf-dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm1t-testpmd-reconf"
@@ -5919,61 +6619,12 @@
 
 ###############################################################################
 
-# Reconf tests 3n-hsw
-
-- type: "plot"
-  title: "Effective Blocked Time: 3n-hsw-xl710-64b-{core}-ethip4ipsec4tnlsw-1atnl-ip4base-reconf"
-  algorithm: "plot_nf_reconf_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-64b-{core}-ethip4ipsec4tnlsw-1atnl-ip4base-reconf"
-  data: "plot-vpp-ipsec-reconf-3n-hsw"
-  core: ["1t1c", "2t2c", "4t4c"]
-  include:
-    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec4Tnlsw-1Atnl-Ip4Base-Int-Aes128Cbc-Hmac256Sha-Reconf.64B-{core}-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf"
-    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec4Tnlsw-1Atnl-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Reconf.64B-{core}-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf"
-    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec4Tnlsw-1Atnl-Ip4Base-Int-Aes128Gcm-Reconf.64B-{core}-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128gcm-reconf"
-    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec4Tnlsw-1Atnl-Ip4Base-Int-Aes256Gcm-Reconf.64B-{core}-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes256gcm-reconf"
-  layout:
-    title: "ethip4ipsec4tnlsw-1atnl-ip4base"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Effective Blocked Time: 3n-hsw-xl710-64b-{core}-ethip4ipsec1000tnlsw-1atnl-ip4base-reconf"
-  algorithm: "plot_nf_reconf_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-64b-{core}-ethip4ipsec1000tnlsw-1atnl-ip4base-reconf"
-  data: "plot-vpp-ipsec-reconf-3n-hsw"
-  core: ["1t1c", "2t2c", "4t4c"]
-  include:
-    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-1Atnl-Ip4Base-Int-Aes128Cbc-Hmac256Sha-Reconf.64B-{core}-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf"
-    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-1Atnl-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Reconf.64B-{core}-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf"
-    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-1Atnl-Ip4Base-Int-Aes128Gcm-Reconf.64B-{core}-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128gcm-reconf"
-    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-1Atnl-Ip4Base-Int-Aes256Gcm-Reconf.64B-{core}-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes256gcm-reconf"
-  layout:
-    title: "ethip4ipsec1000tnlsw-1atnl-ip4base"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Effective Blocked Time: 3n-hsw-xl710-64b-{core}-ethip4ipsec60000tnlsw-1atnl-ip4base-reconf"
-  algorithm: "plot_nf_reconf_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-64b-{core}-ethip4ipsec60000tnlsw-1atnl-ip4base-reconf"
-  data: "plot-vpp-ipsec-reconf-3n-hsw"
-  core: ["1t1c", "2t2c", "4t4c"]
-  include:
-    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec60000Tnlsw-1Atnl-Ip4Base-Int-Aes128Cbc-Hmac256Sha-Reconf.64B-{core}-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf"
-    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec60000Tnlsw-1Atnl-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Reconf.64B-{core}-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf"
-    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec60000Tnlsw-1Atnl-Ip4Base-Int-Aes128Gcm-Reconf.64B-{core}-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128gcm-reconf"
-    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec60000Tnlsw-1Atnl-Ip4Base-Int-Aes256Gcm-Reconf.64B-{core}-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes256gcm-reconf"
-  layout:
-    title: "ethip4ipsec60000tnlsw-1atnl-ip4base"
-    layout: "plot-throughput"
-
-###############################################################################
-
 # Plots - NF Density - 2n-skx - VSC - MRR IMIX
 - type: "plot"
   title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-{test_type}"
   algorithm: "plot_nf_heatmap"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-{core}-base-vsc-{test_type}"
-  data: "plot-vpp-nfv-2n-skx-mrr"
+  data: "vpp-2n-skx-curr-nfv-mrr"
   core: ["2t1c", "4t2c", "8t4c"]
   test-type: ["mrr", ]
   include:
@@ -5997,7 +6648,7 @@
   title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-{test_type}"
   algorithm: "plot_nf_heatmap"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-{core}-base-vsc-{test_type}"
-  data: "plot-vpp-nfv-2n-skx-ndrpdr"
+  data: "vpp-2n-skx-curr-nfv-ndrpdr"
   core: ["2t1c", "4t2c", "8t4c"]
   include:
     - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Ch-2Vh-1Vm1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-1ch-2vh-1vm1t-vppip4-ndrpdr"
@@ -6020,7 +6671,7 @@
   title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-{test_type}"
   algorithm: "plot_nf_heatmap"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-{core}-base-vsc-vxlan-{test_type}"
-  data: "plot-vpp-nfv-2n-skx-mrr"
+  data: "vpp-2n-skx-curr-nfv-mrr"
   core: ["2t1c", "4t2c", "8t4c"]
   test-type: ["mrr", ]
   include:
@@ -6040,7 +6691,7 @@
   title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-{test_type}"
   algorithm: "plot_nf_heatmap"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-{core}-base-vsc-vxlan-{test_type}"
-  data: "plot-vpp-nfv-2n-skx-ndrpdr"
+  data: "vpp-2n-skx-curr-nfv-ndrpdr"
   core: ["2t1c", "4t2c", "8t4c"]
   include:
     - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-1Ch-2Vh-1Vm1T-Testpmd-ndrpdr.IMIX-{core}-avf-dot1qip4vxlan-l2bd-1ch-2vh-1vm1t-testpmd-ndrpdr"
@@ -6061,7 +6712,7 @@
   title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-{test_type}"
   algorithm: "plot_nf_heatmap"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-{core}-base-csc-{test_type}"
-  data: "plot-vpp-nfv-2n-skx-mrr"
+  data: "vpp-2n-skx-curr-nfv-mrr"
   core: ["2t1c", "4t2c", "8t4c"]
   test-type: ["mrr", ]
   include:
@@ -6085,7 +6736,7 @@
   title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-{test_type}"
   algorithm: "plot_nf_heatmap"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-{core}-base-csc-{test_type}"
-  data: "plot-vpp-nfv-2n-skx-ndrpdr"
+  data: "vpp-2n-skx-curr-nfv-ndrpdr"
   core: ["2t1c", "4t2c", "8t4c"]
   include:
     - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Ch-2Mif-1Dcr1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-1ch-2mif-1dcr1t-vppip4-ndrpdr"
@@ -6110,7 +6761,7 @@
   title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-{test_type}"
   algorithm: "plot_nf_heatmap"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-{core}-base-csp-{test_type}"
-  data: "plot-vpp-nfv-2n-skx-mrr"
+  data: "vpp-2n-skx-curr-nfv-mrr"
   core: ["2t1c", "4t2c", "8t4c"]
   test-type: ["mrr", ]
   include:
@@ -6134,7 +6785,7 @@
   title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-{test_type}"
   algorithm: "plot_nf_heatmap"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-{core}-base-csp-{test_type}"
-  data: "plot-vpp-nfv-2n-skx-ndrpdr"
+  data: "vpp-2n-skx-curr-nfv-ndrpdr"
   core: ["2t1c", "4t2c", "8t4c"]
   include:
     - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Pipeline.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Pl-2Mif-1Dcr1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-1pl-2mif-1dcr1t-vppip4-ndrpdr"
@@ -6159,7 +6810,7 @@
   title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-{test_type}"
   algorithm: "plot_nf_heatmap"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-clx-xxv710-imix-{core}-base-vsc-{test_type}"
-  data: "plot-vpp-nfv-2n-clx-mrr"
+  data: "vpp-2n-clx-curr-nfv-mrr"
   core: ["2t1c", "4t2c", "8t4c"]
   test-type: ["mrr", ]
   include:
@@ -6183,7 +6834,7 @@
   title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-{test_type}"
   algorithm: "plot_nf_heatmap"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-clx-xxv710-imix-{core}-base-vsc-{test_type}"
-  data: "plot-vpp-nfv-2n-clx-ndrpdr"
+  data: "vpp-2n-clx-curr-nfv-ndrpdr"
   core: ["2t1c", "4t2c", "8t4c"]
   include:
     - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Ch-2Vh-1Vm1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-1ch-2vh-1vm1t-vppip4-ndrpdr"
@@ -6206,7 +6857,7 @@
   title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-{test_type}"
   algorithm: "plot_nf_heatmap"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-clx-xxv710-imix-{core}-base-vsc-vxlan-{test_type}"
-  data: "plot-vpp-nfv-2n-clx-mrr"
+  data: "vpp-2n-clx-curr-nfv-mrr"
   core: ["2t1c", "4t2c", "8t4c"]
   test-type: ["mrr", ]
   include:
@@ -6226,7 +6877,7 @@
   title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-{test_type}"
   algorithm: "plot_nf_heatmap"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-clx-xxv710-imix-{core}-base-vsc-vxlan-{test_type}"
-  data: "plot-vpp-nfv-2n-clx-ndrpdr"
+  data: "vpp-2n-clx-curr-nfv-ndrpdr"
   core: ["2t1c", "4t2c", "8t4c"]
   include:
     - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-1Ch-2Vh-1Vm1T-Testpmd-ndrpdr.IMIX-{core}-avf-dot1qip4vxlan-l2bd-1ch-2vh-1vm1t-testpmd-ndrpdr"
@@ -6247,7 +6898,7 @@
   title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-{test_type}"
   algorithm: "plot_nf_heatmap"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-clx-xxv710-imix-{core}-base-csc-{test_type}"
-  data: "plot-vpp-nfv-2n-clx-mrr"
+  data: "vpp-2n-clx-curr-nfv-mrr"
   core: ["2t1c", "4t2c", "8t4c"]
   test-type: ["mrr", ]
   include:
@@ -6271,7 +6922,7 @@
   title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-{test_type}"
   algorithm: "plot_nf_heatmap"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-clx-xxv710-imix-{core}-base-csc-{test_type}"
-  data: "plot-vpp-nfv-2n-clx-ndrpdr"
+  data: "vpp-2n-clx-curr-nfv-ndrpdr"
   core: ["2t1c", "4t2c", "8t4c"]
   include:
     - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Ch-4Mif-2Dcr1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-1ch-4mif-2dcr1t-vppip4-ndrpdr"
@@ -6295,7 +6946,7 @@
   title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-{test_type}"
   algorithm: "plot_nf_heatmap"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-clx-xxv710-imix-{core}-base-csp-{test_type}"
-  data: "plot-vpp-nfv-2n-clx-mrr"
+  data: "vpp-2n-clx-curr-nfv-mrr"
   core: ["2t1c", "4t2c", "8t4c"]
   test-type: ["mrr", ]
   include:
@@ -6319,7 +6970,7 @@
   title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-{test_type}"
   algorithm: "plot_nf_heatmap"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-clx-xxv710-imix-{core}-base-csp-{test_type}"
-  data: "plot-vpp-nfv-2n-clx-ndrpdr"
+  data: "vpp-2n-clx-curr-nfv-ndrpdr"
   core: ["2t1c", "4t2c", "8t4c"]
   include:
     - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Pipeline.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Pl-2Mif-1Dcr1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-1pl-2mif-1dcr1t-vppip4-ndrpdr"
@@ -6345,7 +6996,7 @@
   title: "Throughput: 2n-skx-xxv710-64b-{core}-memif-base-avf-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-{core}-memif-base-avf-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  data: "vpp-2n-skx-curr-iter"
   core: ["2t1c", ]
   include:
     - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-{core}-avf-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
@@ -6360,7 +7011,7 @@
   title: "Throughput: 2n-skx-xxv710-64b-{core}-memif-base-dpdk-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-{core}-memif-base-dpdk-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  data: "vpp-2n-skx-curr-iter"
   core: ["2t1c", ]
   include:
     - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-{core}-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
@@ -6375,7 +7026,7 @@
   title: "Throughput: 3n-skx-xxv710-64b-{core}-memif-base-avf-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-{core}-memif-base-avf-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  data: "vpp-3n-skx-curr-iter"
   core: ["2t1c", ]
   include:
     - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-{core}-avf-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
@@ -6391,7 +7042,7 @@
   title: "Throughput: 3n-skx-xxv710-64b-{core}-memif-base-dpdk-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-{core}-memif-base-dpdk-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  data: "vpp-3n-skx-curr-iter"
   core: ["2t1c", ]
   include:
     - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-{core}-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
@@ -6404,46 +7055,28 @@
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 3n-tsh-x520-64b-{core}-memif-base-ixgbe-{test_type}"
+  title: "Throughput: 2n-skx-x710-64b-{core}-ip4routing-base-scale-[avf,dpdk,af_xdp]-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-tsh-x520-64b-{core}-memif-base-ixgbe-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-3n-tsh"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-x710-64b-{core}-ip4routing-base-scale-[avf,dpdk,af_xdp]-{test_type}"
+  data: "vpp-2n-skx-curr-iter"
   core: ["2t1c", ]
   include:
-    - "Tests.Vpp.Perf.Container Memif.10Ge2P1X520-Eth-L2Xcbase-Eth-2Memif-1Lxc-Ndrpdr.64B-{core}-eth-l2xcbase-eth-2memif-1lxc-ndrpdr"
-    - "Tests.Vpp.Perf.Container Memif.10Ge2P1X520-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-{core}-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
-    - "Tests.Vpp.Perf.Container Memif.10Ge2P1X520-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-{core}-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
-    - "Tests.Vpp.Perf.Container Memif.10Ge2P1X520-Eth-L2Bdbasemaclrn-Eth-2Memif-1Lxc-Ndrpdr.64B-{core}-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr"
-    - "Tests.Vpp.Perf.Container Memif.10Ge2P1X520-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Ndrpdr.64B-{core}-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
-  layout:
-    title: "3n-tsh-x520-64b-{core}-memif-base-ixgbe-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Throughput: 2n-skx-x710-64b-{core}-ip4routing-base-scale-[avf,dpdk]-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-skx-x710-64b-{core}-ip4routing-base-scale-[avf,dpdk]-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  core: ["2t1c", ]
-  include:
-    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Dot1Q-Ip4Base-Ndrpdr.64B-{core}-avf-dot1q-ip4base-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Base-Ndrpdr.64B-{core}-avf-ethip4-ip4base-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-{core}-avf-ethip4-ip4scale2m-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-Rnd-Ndrpdr.64B-{core}-avf-ethip4-ip4scale2m-rnd-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Dot1Q-Ip4Base-Ndrpdr.64B-{core}-dot1q-ip4base-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Base-Ndrpdr.64B-{core}-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-af-xdp-Ethip4-Ip4Base-Ndrpdr.64B-{core}-af-xdp-ethip4-ip4base-ndrpdr"
   layout:
-    title: "2n-skx-x710-64b-{core}-ip4routing-base-scale-[avf,dpdk]-{test_type}"
+    title: "2n-skx-x710-64b-{core}-ip4routing-base-scale-[avf,dpdk,af_xdp]-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
   title: "Throughput: 2n-skx-xxv710-64b-{core}-ip4routing-base-scale-avf-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-{core}-ip4routing-base-scale-avf-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  data: "vpp-2n-skx-curr-iter"
   core: ["2t1c", ]
   include:
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-Ip4Base-Ndrpdr.64B-{core}-avf-dot1q-ip4base-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Ndrpdr.64B-{core}-avf-ethip4-ip4base-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale20K-Ndrpdr.64B-{core}-avf-ethip4-ip4scale20k-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale20K-Rnd-Ndrpdr.64B-{core}-avf-ethip4-ip4scale20k-rnd-ndrpdr"
@@ -6455,11 +7088,29 @@
     title: "2n-skx-xxv710-64b-{core}-ip4routing-base-scale-avf-{test_type}"
     layout: "plot-throughput"
 
+- type: "plot"
+  title: "Throughput: 2n-skx-xxv710-64b-{core}-ip4routing-base-scale-af_xdp-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-{core}-ip4routing-base-scale-af_xdp-{test_type}"
+  data: "vpp-2n-skx-curr-iter"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-af-xdp-Ethip4-Ip4Base-Ndrpdr.64B-{core}-af-xdp-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-af-xdp-Ethip4-Ip4Scale20K-Ndrpdr.64B-{core}-af-xdp-ethip4-ip4scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-af-xdp-Ethip4-Ip4Scale20K-Rnd-Ndrpdr.64B-{core}-af-xdp-ethip4-ip4scale20k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-af-xdp-Ethip4-Ip4Scale200K-Ndrpdr.64B-{core}-af-xdp-ethip4-ip4scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-af-xdp-Ethip4-Ip4Scale200K-Rnd-Ndrpdr.64B-{core}-af-xdp-ethip4-ip4scale200k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-af-xdp-Ethip4-Ip4Scale2M-Ndrpdr.64B-{core}-af-xdp-ethip4-ip4scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-af-xdp-Ethip4-Ip4Scale2M-Rnd-Ndrpdr.64B-{core}-af-xdp-ethip4-ip4scale2m-rnd-ndrpdr"
+  layout:
+    title: "2n-skx-xxv710-64b-{core}-ip4routing-base-scale-af_xdp-{test_type}"
+    layout: "plot-throughput"
+
 - type: "plot"
   title: "Throughput: 2n-skx-xxv710-64b-{core}-ip4routing-base-scale-dpdk-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-{core}-ip4routing-base-scale-dpdk-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  data: "vpp-2n-skx-curr-iter"
   core: ["2t1c", ]
   include:
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Dot1Q-Ip4Base-Ndrpdr.64B-{core}-dot1q-ip4base-ndrpdr"
@@ -6478,7 +7129,7 @@
   title: "Throughput: 2n-skx-xxv710-64b-{core}-features-ip4routing-base-avf-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-{core}-features-ip4routing-base-avf-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  data: "vpp-2n-skx-curr-iter"
   core: ["2t1c", ]
   include:
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-{core}-avf-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
@@ -6495,7 +7146,7 @@
   title: "Throughput: 2n-skx-xxv710-64b-{core}-nat44det-ip4routing-stl-bidir-avf-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-{core}-nat44det-ip4routing-stl-bidir-avf-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  data: "vpp-2n-skx-curr-iter"
   core: ["2t1c", ]
   include:
     - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr.64b-{core}-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr"
@@ -6511,7 +7162,7 @@
   title: "Throughput: 2n-skx-xxv710-64b-{core}-nat44ed-ip4routing-stl-unidir-avf-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-{core}-nat44ed-ip4routing-stl-unidir-avf-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  data: "vpp-2n-skx-curr-iter"
   core: ["2t1c", ]
   include:
     - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-ndrpdr.64b-{core}-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-ndrpdr"
@@ -6527,7 +7178,7 @@
   title: "Throughput: 2n-skx-xxv710-64b-{core}-nat44ed-ip4routing-udp-stf-cps-avf-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-{core}-nat44ed-ip4routing-udp-stf-cps-avf-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  data: "vpp-2n-skx-curr-iter"
   core: ["2t1c", ]
   include:
     - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-ndrpdr.64b-{core}-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-ndrpdr"
@@ -6544,32 +7195,11 @@
     title: "2n-skx-xxv710-64b-{core}-nat44ed-ip4routing-udp-stf-cps-avf-{test_type}"
     layout: "plot-cps"
 
-- type: "plot"
-  title: "Throughput: 2n-skx-xxv710-64b-{core}-nat44ed-ip4routing-udp-stf-pps-avf-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-{core}-nat44ed-ip4routing-udp-stf-pps-avf-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  core: ["2t1c", ]
-  include:
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-ndrpdr.64b-{core}-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h1024-p63-s64512-pps-ndrpdr.64b-{core}-avf-ethip4udp-ip4base-h1024-p63-s64512-pps-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-pps-ndrpdr.64b-{core}-avf-ethip4udp-nat44ed-h4096-p63-s258048-pps-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h4096-p63-s258048-pps-ndrpdr.64b-{core}-avf-ethip4udp-ip4base-h4096-p63-s258048-pps-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-pps-ndrpdr.64b-{core}-avf-ethip4udp-nat44ed-h16384-p63-s1032192-pps-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h16384-p63-s1032192-pps-ndrpdr.64b-{core}-avf-ethip4udp-ip4base-h16384-p63-s1032192-pps-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-pps-ndrpdr.64b-{core}-avf-ethip4udp-nat44ed-h65536-p63-s4128768-pps-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h65536-p63-s4128768-pps-ndrpdr.64b-{core}-avf-ethip4udp-ip4base-h65536-p63-s4128768-pps-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-pps-ndrpdr.64b-{core}-avf-ethip4udp-nat44ed-h262144-p63-s16515072-pps-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h262144-p63-s16515072-pps-ndrpdr.64b-{core}-avf-ethip4udp-ip4base-h262144-p63-s16515072-pps-ndrpdr"
-  layout:
-    title: "2n-skx-xxv710-64b-{core}-nat44ed-ip4routing-udp-stf-pps-avf-{test_type}"
-    layout: "plot-throughput"
-
 - type: "plot"
   title: "Throughput: 2n-skx-xxv710-64b-{core}-nat44ed-ip4routing-tcp-stf-cps-avf-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-{core}-nat44ed-ip4routing-tcp-stf-cps-avf-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  data: "vpp-2n-skx-curr-iter"
   core: ["2t1c", ]
   include:
     - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-ndrpdr.64b-{core}-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-ndrpdr"
@@ -6586,32 +7216,11 @@
     title: "2n-skx-xxv710-64b-{core}-nat44ed-ip4routing-tcp-stf-cps-avf-{test_type}"
     layout: "plot-cps"
 
-- type: "plot"
-  title: "Throughput: 2n-skx-xxv710-64b-{core}-nat44ed-ip4routing-tcp-stf-pps-avf-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-{core}-nat44ed-ip4routing-tcp-stf-pps-avf-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  core: ["2t1c", ]
-  include:
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-ndrpdr.64b-{core}-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h1024-p63-s64512-pps-ndrpdr.64b-{core}-avf-ethip4tcp-ip4base-h1024-p63-s64512-pps-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h4096-p63-s258048-pps-ndrpdr.64b-{core}-avf-ethip4tcp-nat44ed-h4096-p63-s258048-pps-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h4096-p63-s258048-pps-ndrpdr.64b-{core}-avf-ethip4tcp-ip4base-h4096-p63-s258048-pps-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-ndrpdr.64b-{core}-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h16384-p63-s1032192-pps-ndrpdr.64b-{core}-avf-ethip4tcp-ip4base-h16384-p63-s1032192-pps-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-ndrpdr.64b-{core}-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h65536-p63-s4128768-pps-ndrpdr.64b-{core}-avf-ethip4tcp-ip4base-h65536-p63-s4128768-pps-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-ndrpdr.64b-{core}-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h262144-p63-s16515072-pps-ndrpdr.64b-{core}-avf-ethip4tcp-ip4base-h262144-p63-s16515072-pps-ndrpdr"
-  layout:
-    title: "2n-skx-xxv710-64b-{core}-nat44ed-ip4routing-tcp-stf-pps-avf-{test_type}"
-    layout: "plot-throughput"
-
 - type: "plot"
   title: "Throughput: 2n-skx-xxv710-64b-{core}-nat44ed-ip4routing-tcp-tput-avf-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-{core}-nat44ed-ip4routing-tcp-tput-avf-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  data: "vpp-2n-skx-curr-iter"
   core: ["2t1c", ]
   include:
     - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-ndrpdr.64b-{core}-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-ndrpdr"
@@ -6632,7 +7241,7 @@
   title: "Throughput: 2n-skx-xxv710-64b-{core}-nat44ed-ip4routing-udp-tput-avf-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-{core}-nat44ed-ip4routing-udp-tput-avf-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  data: "vpp-2n-skx-curr-iter"
   core: ["2t1c", ]
   include:
     - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-ndrpdr.64b-{core}-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-ndrpdr"
@@ -6653,7 +7262,7 @@
   title: "Throughput: 2n-skx-xxv710-64b-{core}-nat44ed-ip4routing-tcp-tput2-avf-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-{core}-nat44ed-ip4routing-tcp-tput2-avf-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  data: "vpp-2n-skx-curr-iter"
   core: ["2t1c", ]
   include:
     - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h1024-p63-s64512-pps-ndrpdr.64b-{core}-avf-ethip4tcp-ip4base-h1024-p63-s64512-pps-ndrpdr"
@@ -6674,7 +7283,7 @@
   title: "Throughput: 2n-skx-xxv710-64b-{core}-nat44ed-ip4routing-udp-tput2-avf-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-{core}-nat44ed-ip4routing-udp-tput2-avf-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  data: "vpp-2n-skx-curr-iter"
   core: ["2t1c", ]
   include:
     - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h1024-p63-s64512-pps-ndrpdr.64b-{core}-avf-ethip4udp-ip4base-h1024-p63-s64512-pps-ndrpdr"
@@ -6691,28 +7300,11 @@
     title: "2n-skx-xxv710-64b-{core}-nat44ed-ip4routing-udp-tput-avf-{test_type}"
     layout: "plot-throughput"
 
-- type: "plot"
-  title: "Throughput: 2n-skx-xxv710-64b-{core}-features-ip4routing-base-dpdk-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-{core}-features-ip4routing-base-dpdk-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  core: ["2t1c", ]
-  include:
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Ndrpdr.64B-{core}-ethip4-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-{core}-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-{core}-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-{core}-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-{core}-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-ethip4udp-nat44det-h1-p1-s1-Ndrpdr.64B-{core}-ethip4udp-nat44det-h1-p1-s1-ndrpdr"
-  layout:
-    title: "2n-skx-xxv710-64b-{core}-features-ip4routing-base-dpdk-{test_type}"
-    layout: "plot-throughput"
-
 - type: "plot"
   title: "Throughput: 2n-skx-xxv710-64b-{core}-ethip4--ethip4udpgeneve-avf-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-{core}-ethip4--ethip4udpgeneve-avf-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  data: "vpp-2n-skx-curr-iter"
   core: ["2t1c", ]
   include:
     - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-1Tun-Ip4Base-Ndrpdr.64B-{core}-avf-ethip4--ethip4udpgeneve-1tun-ip4base-ndrpdr"
@@ -6721,29 +7313,14 @@
     - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-64Tun-Ip4Base-Ndrpdr.64B-{core}-avf-ethip4--ethip4udpgeneve-64tun-ip4base-ndrpdr"
     - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-256Tun-Ip4Base-Ndrpdr.64B-{core}-avf-ethip4--ethip4udpgeneve-256tun-ip4base-ndrpdr"
   layout:
-    title: "2n-skx-xxv710-64b-{core}-ethip4--ethip4udpgeneve-avf-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Throughput: 3n-hsw-xl710-64b-{core}-ip4routing-base-scale-dpdk-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-64b-{core}-ip4routing-base-scale-dpdk-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  core: ["1t1c", ]
-  include:
-    - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Dot1Q-Ip4Base-Ndrpdr.64B-{core}-dot1q-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4-Ip4Base-Ndrpdr.64B-{core}-ethip4-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4-Ip4Scale2M-Ndrpdr.64B-{core}-ethip4-ip4scale2m-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4-Ip4Scale2M-rnd-Ndrpdr.64B-{core}-ethip4-ip4scale2m-rnd-ndrpdr"
-  layout:
-    title: "3n-hsw-xl710-64b-{core}-ip4routing-base-scale-dpdk-{test_type}"
+    title: "2n-skx-xxv710-64b-{core}-ethip4--ethip4udpgeneve-avf-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
   title: "Throughput: 3n-skx-x710-64b-{core}-ip4routing-base-scale-avf-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/3n-skx-x710-64b-{core}-ip4routing-base-scale-avf-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  data: "vpp-3n-skx-curr-iter"
   core: ["2t1c", ]
   include:
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Avf-Ethip4-Ip4Base-Ndrpdr.64B-{core}-avf-ethip4-ip4base-ndrpdr"
@@ -6759,7 +7336,7 @@
   title: "Throughput: 3n-skx-xxv710-64b-{core}-ip4routing-base-scale-avf-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-{core}-ip4routing-base-scale-avf-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  data: "vpp-3n-skx-curr-iter"
   core: ["2t1c", ]
   include:
     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Dot1Q-Ip4Base-Ndrpdr.64B-{core}-avf-dot1q-ip4base-ndrpdr"
@@ -6775,7 +7352,7 @@
   title: "Throughput: 3n-skx-xxv710-64b-{core}-ip4routing-base-scale-dpdk-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-{core}-ip4routing-base-scale-dpdk-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  data: "vpp-3n-skx-curr-iter"
   core: ["2t1c", ]
   include:
     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Dot1Q-Ip4Base-Ndrpdr.64B-{core}-dot1q-ip4base-ndrpdr"
@@ -6791,7 +7368,7 @@
   title: "Throughput: 3n-skx-xxv710-64b-{core}-features-ip4routing-base-avf-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-{core}-features-ip4routing-base-avf-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  data: "vpp-3n-skx-curr-iter"
   core: ["2t1c", ]
   include:
     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-{core}-avf-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
@@ -6806,7 +7383,7 @@
   title: "Throughput: 3n-skx-xxv710-64b-{core}-features-ip4routing-base-dpdk-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-{core}-features-ip4routing-base-dpdk-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  data: "vpp-3n-skx-curr-iter"
   core: ["2t1c", ]
   include:
     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Base-Ndrpdr.64B-{core}-ethip4-ip4base-ndrpdr"
@@ -6822,7 +7399,7 @@
   title: "Throughput: 3n-tsh-x520-64b-{core}-ip4routing-base-scale-ixgbe-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/3n-tsh-x520-64b-{core}-ip4routing-base-scale-ixgbe-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-3n-tsh"
+  data: "vpp-3n-tsh-curr-iter"
   core: ["1t1c", ]
   include:
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Dot1Q-Ip4Base-Ndrpdr.64B-{core}-dot1q-ip4base-ndrpdr"
@@ -6838,7 +7415,7 @@
   title: "Throughput: 3n-tsh-x520-64b-{core}-features-ip4routing-base-ixgbe-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/3n-tsh-x520-64b-{core}-features-ip4routing-base-ixgbe-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-3n-tsh"
+  data: "vpp-3n-tsh-curr-iter"
   core: ["1t1c", ]
   include:
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-{core}-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
@@ -6852,42 +7429,25 @@
 - type: "plot"
   title: "Throughput: 2n-dnv-x553-64b-{core}-ip4routing-base-scale-ixgbe-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-dnv-x553-64b-{core}-ip4routing-base-scale-ixgbe-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-dnv"
+  output-file: "{DIR[STATIC,VPP]}/2n-dnv-x553-64b-{core}-ip4routing-base-scale-[ixgbe,af_xdp]-{test_type}"
+  data: "vpp-2n-dnv-curr-iter"
   core: ["1t1c", ]
   include:
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Dot1Q-Ip4Base-Ndrpdr.64B-{core}-dot1q-ip4base-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4-Ip4Base-Ndrpdr.64B-{core}-ethip4-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4-Ip4Scale20K-Ndrpdr.64B-{core}-ethip4-ip4scale20k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4-Ip4Scale200K-Ndrpdr.64B-{core}-ethip4-ip4scale200k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4-Ip4Scale2M-Ndrpdr.64B-{core}-ethip4-ip4scale2m-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4-Ip4Scale20K-rnd-Ndrpdr.64B-{core}-ethip4-ip4scale20k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-af-xdp-Dot1Q-Ip4Base-Ndrpdr.64B-{core}-af-xdp-dot1q-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-af-xdp-Ethip4-Ip4Base-Ndrpdr.64B-{core}-af-xdp-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-af-xdp-Ethip4-Ip4Scale20K-rnd-Ndrpdr.64B-{core}-af-xdp-ethip4-ip4scale20k-rnd-ndrpdr"
   layout:
     title: "2n-dnv-x553-64b-{core}-ip4routing-base-scale-ixgbe-{test_type}"
     layout: "plot-throughput"
 
-- type: "plot"
-  title: "Throughput: 2n-dnv-x553-64b-{core}-features-ip4routing-base-ixgbe-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-dnv-x553-64b-{core}-features-ip4routing-base-ixgbe-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-dnv"
-  core: ["1t1c", ]
-  include:
-    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4-Ip4Base-Ndrpdr.64B-{core}-ethip4-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-{core}-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-{core}-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-{core}-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-{core}-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-ethip4udp-nat44det-h1-p1-s1-Ndrpdr.64B-{core}-ethip4udp-nat44det-h1-p1-s1-ndrpdr"
-  layout:
-    title: "2n-dnv-x553-64b-{core}-features-ip4routing-base-ixgbe-{test_type}"
-    layout: "plot-throughput"
-
 - type: "plot"
   title: "Throughput: 3n-dnv-x553-64b-{core}-ip4routing-base-scale-ixgbe-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/3n-dnv-x553-64b-{core}-ip4routing-base-scale-ixgbe-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-3n-dnv"
+  data: "vpp-3n-dnv-curr-iter"
   core: ["1t1c", ]
   include:
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Dot1Q-Ip4Base-Ndrpdr.64B-{core}-dot1q-ip4base-ndrpdr"
@@ -6901,117 +7461,121 @@
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 3n-dnv-x553-64b-{core}-features-ip4routing-base-ixgbe-{test_type}"
+  title: "Throughput: 2n-aws-nitro50g-64b-{core}-ip4routing-base-scale-ena-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-dnv-x553-64b-{core}-features-ip4routing-base-ixgbe-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-3n-dnv"
-  core: ["1t1c", ]
+  output-file: "{DIR[STATIC,VPP]}/2n-aws-nitro50g-64b-{core}-ip4routing-base-scale-{test_type}"
+  data: "vpp-2n-aws-curr-iter"
+  core: ["2t1c", ]
   include:
-    - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4-Ip4Base-Ndrpdr.64B-{core}-ethip4-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-{core}-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-{core}-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-{core}-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-{core}-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2n1l-50ge1p1ENA-ethip4-ip4base-ndrpdr.64B-{core}-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2n1l-50ge1p1ENA-ethip4-ip4scale2m-ndrpdr.64B-{core}-ethip4-ip4scale2m-ndrpdr"
   layout:
-    title: "3n-dnv-x553-64b-{core}-features-ip4routing-base-ixgbe-{test_type}"
+    title: "2n-aws-nitro50g-64b-{core}-ip4routing-base-scale-ena-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 3n-hsw-xl710-64b-{core}-ip4tunnel-base-dpdk-{test_type}"
+  title: "Throughput: 2n-aws-nitro50g-1518b-{core}-ip4routing-base-scale-ena-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-64b-{core}-ip4tunnel-base-dpdk-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  core: ["1t1c", ]
+  output-file: "{DIR[STATIC,VPP]}/2n-aws-nitro50g-1518b-{core}-ip4routing-base-scale-{test_type}"
+  data: "vpp-2n-aws-curr-iter"
+  core: ["2t1c", ]
   include:
-    - "Tests.Vpp.Perf.Ip4 Tunnels.40Ge2P1Xl710-Ethip4Vxlan-L2Xcbase-Ndrpdr.64B-{core}-ethip4vxlan-l2xcbase-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.40Ge2P1Xl710-Ethip4Vxlan-L2Bdbasemaclrn-Ndrpdr.64B-{core}-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2n1l-50ge1p1ENA-ethip4-ip4base-ndrpdr.1518b-{core}-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2n1l-50ge1p1ENA-ethip4-ip4scale2m-ndrpdr.1518b-{core}-ethip4-ip4scale2m-ndrpdr"
   layout:
-    title: "3n-hsw-xl710-64b-{core}-ip4tunnel-base-dpdk-{test_type}"
+    title: "2n-aws-nitro50g-1518b-{core}-ip4routing-base-scale-ena-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 3n-skx-xxv710-64b-{core}-ip4tunnel-base-scale-avf-{test_type}"
+  title: "Throughput: 3n-aws-nitro50g-64b-{core}-ip4routing-base-scale-ena-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-{core}-ip4tunnel-base-scale-avf-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/3n-aws-nitro50g-64b-{core}-ip4routing-base-scale-{test_type}"
+  data: "vpp-3n-aws-curr-iter"
   core: ["2t1c", ]
   include:
-    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Xcbase-Ndrpdr.64B-{core}-avf-ethip4vxlan-l2xcbase-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Ndrpdr.64B-{core}-avf-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Avf-Dot1Q--Ethip4Vxlan-L2Bdscale1L2Bd1Vlan1Vxlan-Ndrpdr.64B-{core}-avf-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Avf-Dot1Q--Ethip4Vxlan-L2Bdscale100L2Bd100Vlan100Vxlan-Ndrpdr.64B-{core}-avf-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.50ge1p1ENA-ethip4-ip4base-ndrpdr.64B-{core}-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.50ge1p1ENA-ethip4-ip4scale2m-ndrpdr.64B-{core}-ethip4-ip4scale2m-ndrpdr"
   layout:
-    title: "3n-skx-xxv710-64b-{core}-ip4tunnel-base-scale-avf-{test_type}"
+    title: "3n-aws-nitro50g-64b-{core}-ip4routing-base-scale-ena-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 3n-skx-xxv710-64b-{core}-ip4tunnel-base-scale-dpdk-{test_type}"
+  title: "Throughput: 3n-aws-nitro50g-1518b-{core}-ip4routing-base-scale-ena-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-{core}-ip4tunnel-base-scale-dpdk-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/3n-aws-nitro50g-1518b-{core}-ip4routing-base-scale-{test_type}"
+  data: "vpp-3n-aws-curr-iter"
   core: ["2t1c", ]
   include:
+    - "Tests.Vpp.Perf.Ip4.50ge1p1ENA-ethip4-ip4base-ndrpdr.1518b-{core}-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.50ge1p1ENA-ethip4-ip4scale2m-ndrpdr.1518b-{core}-ethip4-ip4scale2m-ndrpdr"
+  layout:
+    title: "3n-aws-nitro50g-1518b-{core}-ip4routing-base-scale-ena-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 3n-skx-xxv710-64b-{core}-ip4tunnel-base-[avf,dpdk]-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-{core}-ip4tunnel-base-{test_type}"
+  data: "vpp-3n-skx-curr-iter"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Xcbase-Ndrpdr.64B-{core}-avf-ethip4vxlan-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Ndrpdr.64B-{core}-avf-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Avf-Ethip4Gtpusw-Ip4Base-Ndrpdr.64B-{core}-avf-ethip4gtpusw-ip4base-ndrpdr"
     - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Vxlan-L2Xcbase-Ndrpdr.64B-{core}-ethip4vxlan-l2xcbase-ndrpdr"
     - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Ndrpdr.64B-{core}-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Dot1Q--Ethip4Vxlan-L2Bdscale1L2Bd1Vlan1Vxlan-Ndrpdr.64B-{core}-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Dot1Q--Ethip4Vxlan-L2Bdscale100L2Bd100Vlan100Vxlan-Ndrpdr.64B-{core}-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Gtpusw-Ip4Base-Ndrpdr.64B-{core}-ethip4gtpusw-ip4base-ndrpdr"
   layout:
-    title: "3n-skx-xxv710-64b-{core}-ip4tunnel-base-scale-dpdk-{test_type}"
+    title: "3n-skx-xxv710-64b-{core}-ip4tunnel-base-[avf,dpdk]-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 3n-tsh-x520-64b-{core}-ip4tunnel-base-scale-ixgbe-{test_type}"
+  title: "Throughput: 3n-tsh-x520-64b-{core}-ip4tunnel-base-ixgbe-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-tsh-x520-64b-{core}-ip4tunnel-base-scale-ixgbe-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-3n-tsh"
+  output-file: "{DIR[STATIC,VPP]}/3n-tsh-x520-64b-{core}-ip4tunnel-base-ixgbe-{test_type}"
+  data: "vpp-3n-tsh-curr-iter"
   core: ["1t1c", ]
   include:
     - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X520-Ethip4Vxlan-L2Xcbase-Ndrpdr.64B-{core}-ethip4vxlan-l2xcbase-ndrpdr"
     - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X520-Ethip4Vxlan-L2Bdbasemaclrn-Ndrpdr.64B-{core}-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X520-Dot1Q--Ethip4Vxlan-L2Bdscale1L2Bd1Vlan1Vxlan-Ndrpdr.64B-{core}-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X520-Dot1Q--Ethip4Vxlan-L2Bdscale100L2Bd100Vlan100Vxlan-Ndrpdr.64B-{core}-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-ndrpdr"
   layout:
-    title: "3n-tsh-x520-64b-{core}-ip4tunnel-base-scale-ixgbe-{test_type}"
+    title: "3n-tsh-x520-64b-{core}-ip4tunnel-base-ixgbe-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 3n-dnv-x553-64b-{core}-ip4tunnel-base-scale-ixgbe-{test_type}"
+  title: "Throughput: 3n-dnv-x553-64b-{core}-ip4tunnel-base-ixgbe-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-dnv-x553-64b-{core}-ip4tunnel-base-scale-ixgbe-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-3n-dnv"
+  output-file: "{DIR[STATIC,VPP]}/3n-dnv-x553-64b-{core}-ip4tunnel-base-ixgbe-{test_type}"
+  data: "vpp-3n-dnv-curr-iter"
   core: ["1t1c", ]
   include:
     - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X553-Ethip4Vxlan-L2Xcbase-Ndrpdr.64B-{core}-ethip4vxlan-l2xcbase-ndrpdr"
     - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X553-Ethip4Vxlan-L2Bdbasemaclrn-Ndrpdr.64B-{core}-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X553-Dot1Q--Ethip4Vxlan-L2Bdscale1L2Bd1Vlan1Vxlan-Ndrpdr.64B-{core}-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X553-Dot1Q--Ethip4Vxlan-L2Bdscale100L2Bd100Vlan100Vxlan-Ndrpdr.64B-{core}-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-ndrpdr"
   layout:
-    title: "3n-dnv-x553-64b-{core}-ip4tunnel-base-scale-ixgbe-{test_type}"
+    title: "3n-dnv-x553-64b-{core}-ip4tunnel-base-ixgbe-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 2n-skx-x710-78b-{core}-ip6routing-base-scale-[avf,dpdk]-{test_type}"
+  title: "Throughput: 2n-skx-x710-78b-{core}-ip6routing-base-scale-[avf,dpdk,af_xdp]-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-skx-x710-78b-{core}-ip6routing-base-scale-[avf,dpdk]-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-x710-78b-{core}-ip6routing-base-scale-[avf,dpdk,af_xdp]-{test_type}"
+  data: "vpp-2n-skx-curr-iter"
   core: ["2t1c", ]
   include:
-    - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Dot1Q-Ip6Base-Ndrpdr.78B-{core}-avf-dot1q-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Base-Ndrpdr.78B-{core}-avf-ethip6-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-Ndrpdr.78B-{core}-avf-ethip6-ip6scale2m-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-rnd-Ndrpdr.78B-{core}-avf-ethip6-ip6scale2m-rnd-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Dot1Q-Ip6Base-Ndrpdr.78B-{core}-dot1q-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Base-Ndrpdr.78B-{core}-ethip6-ip6base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Scale2M-Ndrpdr.78B-{core}-ethip6-ip6scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-af-xdp-Ethip6-Ip6Base-Ndrpdr.78B-{core}-af-xdp-ethip6-ip6base-ndrpdr"
   layout:
-    title: "2n-skx-x710-78b-{core}-ip6routing-base-scale-[avf,dpdk]-{test_type}"
+    title: "2n-skx-x710-78b-{core}-ip6routing-base-scale-[avf,dpdk,af_xdp]-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
   title: "Throughput: 2n-skx-xxv710-78b-{core}-ip6routing-base-scale-dpdk-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-78b-{core}-ip6routing-base-scale-dpdk-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  data: "vpp-2n-skx-curr-iter"
   core: ["2t1c", ]
   include:
     - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Dot1Q-Ip6Base-Ndrpdr.78B-{core}-dot1q-ip6base-ndrpdr"
@@ -7030,10 +7594,9 @@
   title: "Throughput: 2n-skx-xxv710-78b-{core}-ip6routing-base-scale-avf-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-78b-{core}-ip6routing-base-scale-avf-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  data: "vpp-2n-skx-curr-iter"
   core: ["2t1c", ]
   include:
-    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-Ip6Base-Ndrpdr.78B-{core}-avf-dot1q-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Base-Ndrpdr.78B-{core}-avf-ethip6-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale20K-Ndrpdr.78B-{core}-avf-ethip6-ip6scale20k-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale20K-rnd-Ndrpdr.78B-{core}-avf-ethip6-ip6scale20k-rnd-ndrpdr"
@@ -7046,25 +7609,28 @@
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 3n-hsw-xl710-78b-{core}-ip6routing-base-scale-dpdk-{test_type}"
+  title: "Throughput: 2n-skx-xxv710-78b-{core}-ip6routing-base-scale-af_xdp-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-78b-{core}-ip6routing-base-scale-dpdk-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  core: ["1t1c", ]
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-78b-{core}-ip6routing-base-scale-af_xdp-{test_type}"
+  data: "vpp-2n-skx-curr-iter"
+  core: ["2t1c", ]
   include:
-    - "Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Dot1Q-Ip6Base-Ndrpdr.78B-{core}-dot1q-ip6base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Ethip6-Ip6Base-Ndrpdr.78B-{core}-ethip6-ip6base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Ethip6-Ip6Scale2M-Ndrpdr.78B-{core}-ethip6-ip6scale2m-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Ethip6-Ip6Scale2M-rnd-Ndrpdr.78B-{core}-ethip6-ip6scale2m-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-af_xdp-Ethip6-Ip6Base-Ndrpdr.78B-{core}-af_xdp-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-af_xdp-Ethip6-Ip6Scale20K-Ndrpdr.78B-{core}-af_xdp-ethip6-ip6scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-af_xdp-Ethip6-Ip6Scale20K-rnd-Ndrpdr.78B-{core}-af_xdp-ethip6-ip6scale20k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-af_xdp-Ethip6-Ip6Scale200K-Ndrpdr.78B-{core}-af_xdp-ethip6-ip6scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-af_xdp-Ethip6-Ip6Scale200K-rnd-Ndrpdr.78B-{core}-af_xdp-ethip6-ip6scale200k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-af_xdp-Ethip6-Ip6Scale2M-Ndrpdr.78B-{core}-af_xdp-ethip6-ip6scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-af_xdp-Ethip6-Ip6Scale2M-rnd-Ndrpdr.78B-{core}-af_xdp-ethip6-ip6scale2m-rnd-ndrpdr"
   layout:
-    title: "3n-hsw-xl710-78b-{core}-ip6routing-base-scale-dpdk-{test_type}"
+    title: "2n-skx-xxv710-78b-{core}-ip6routing-base-scale-af_xdp-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
   title: "Throughput: 3n-skx-x710-78b-{core}-ip6routing-base-scale-avf-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/3n-skx-x710-78b-{core}-ip6routing-base-scale-avf-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  data: "vpp-3n-skx-curr-iter"
   core: ["2t1c", ]
   include:
     - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Avf-Dot1Q-Ip6Base-Ndrpdr.78B-{core}-avf-dot1q-ip6base-ndrpdr"
@@ -7078,7 +7644,7 @@
   title: "Throughput: 3n-skx-xxv710-78b-{core}-ip6routing-base-scale-dpdk-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-78b-{core}-ip6routing-base-scale-dpdk-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  data: "vpp-3n-skx-curr-iter"
   core: ["2t1c", ]
   include:
     - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Dot1Q-Ip6Base-Ndrpdr.78B-{core}-dot1q-ip6base-ndrpdr"
@@ -7094,7 +7660,7 @@
   title: "Throughput: 3n-skx-xxv710-78b-{core}-ip6routing-base-scale-avf-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-78b-{core}-ip6routing-base-scale-avf-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  data: "vpp-3n-skx-curr-iter"
   core: ["2t1c", ]
   include:
     - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Avf-Dot1Q-Ip6Base-Ndrpdr.78B-{core}-avf-dot1q-ip6base-ndrpdr"
@@ -7110,7 +7676,7 @@
   title: "Throughput: 3n-tsh-x520-78b-{core}-ip6routing-base-scale-ixgbe-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/3n-tsh-x520-78b-{core}-ip6routing-base-scale-ixgbe-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-3n-tsh"
+  data: "vpp-3n-tsh-curr-iter"
   core: ["1t1c", ]
   include:
     - "Tests.Vpp.Perf.Ip6.10Ge2P1X520-Dot1Q-Ip6Base-Ndrpdr.78B-{core}-dot1q-ip6base-ndrpdr"
@@ -7123,17 +7689,17 @@
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 2n-dnv-x553-78b-{core}-ip6routing-base-scale-ixgbe-{test_type}"
+  title: "Throughput: 2n-dnv-x553-78b-{core}-ip6routing-base-scale-[ixgbe,af_xdp]-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-dnv-x553-78b-{core}-ip6routing-base-scale-ixgbe-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-dnv"
+  output-file: "{DIR[STATIC,VPP]}/2n-dnv-x553-78b-{core}-ip6routing-base-scale-[ixgbe,af_xdp]-{test_type}"
+  data: "vpp-2n-dnv-curr-iter"
   core: ["1t1c", ]
   include:
-    - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X553-Dot1Q-Ip6Base-Ndrpdr.78B-{core}-dot1q-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X553-Ethip6-Ip6Base-Ndrpdr.78B-{core}-ethip6-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X553-Ethip6-Ip6Scale20K-Ndrpdr.78B-{core}-ethip6-ip6scale20k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X553-Ethip6-Ip6Scale200K-Ndrpdr.78B-{core}-ethip6-ip6scale200k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X553-Ethip6-Ip6Scale2M-Ndrpdr.78B-{core}-ethip6-ip6scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X553-af-xdp-Ethip6-Ip6Base-Ndrpdr.78B-{core}-af-xdp-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X553-af-xdp-Ethip6-Ip6Scale20K-Ndrpdr.78B-{core}-af-xdp-ethip6-ip6scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X553-af-xdp-Ethip6-Ip6Scale20K-rnd-Ndrpdr.78B-{core}-af-xdp-ethip6-ip6scale20k-rnd-ndrpdr"
   layout:
     title: "2n-dnv-x553-78b-{core}-ip6routing-base-scale-ixgbe-{test_type}"
     layout: "plot-throughput"
@@ -7142,7 +7708,7 @@
   title: "Throughput: 3n-dnv-x553-78b-{core}-ip6routing-base-scale-ixgbe-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/3n-dnv-x553-78b-{core}-ip6routing-base-scale-ixgbe-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-3n-dnv"
+  data: "vpp-3n-dnv-curr-iter"
   core: ["1t1c", ]
   include:
     - "Tests.Vpp.Perf.Ip6.10Ge2P1X553-Dot1Q-Ip6Base-Ndrpdr.78B-{core}-dot1q-ip6base-ndrpdr"
@@ -7154,43 +7720,11 @@
     title: "3n-dnv-x553-78b-{core}-ip6routing-base-scale-ixgbe-{test_type}"
     layout: "plot-throughput"
 
-- type: "plot"
-  title: "Throughput: 3n-hsw-xl710-imix-{core}-ipsec-ip4routing-base-scale-sw-dpdk-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-imix-{core}-ipsec-ip4routing-base-scale-sw-dpdk-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  core: ["1t1c", ]
-  include:
-    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-{core}-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-{core}-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-{core}-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-{core}-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-{core}-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-{core}-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
-  layout:
-    title: "3n-hsw-xl710-imix-{core}-ipsec-ip4routing-base-scale-sw-dpdk-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Throughput: 3n-hsw-xl710-imix-{core}-ipsec-ip4routing-base-scale-hw-dpdk-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-imix-{core}-ipsec-ip4routing-base-scale-hw-dpdk-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  core: ["1t1c", ]
-  include:
-    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1Tnlhw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-{core}-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1Tnlhw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-{core}-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlhw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-{core}-ethip4ipsec1000tnlhw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlhw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-{core}-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
-  layout:
-    title: "3n-hsw-xl710-imix-{core}-ipsec-ip4routing-base-scale-hw-dpdk-{test_type}"
-    layout: "plot-throughput"
-
 - type: "plot"
   title: "Throughput: 3n-skx-xxv710-imix-{core}-ipsec-ip4routing-base-scale-avf-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-imix-{core}-ipsec-ip4routing-base-scale-avf-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  data: "vpp-3n-skx-curr-iter"
   core: ["2t1c", ]
   include:
     - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-{core}-avf-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
@@ -7207,7 +7741,7 @@
   title: "Throughput: 3n-skx-xxv710-1518b-{core}-ipsec-ip4routing-base-scale-dpdk-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-1518b-{core}-ipsec-ip4routing-base-scale-dpdk-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  data: "vpp-3n-skx-curr-iter"
   core: ["2t1c", ]
   include:
     - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518B-{core}-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
@@ -7224,7 +7758,7 @@
   title: "Throughput: 3n-skx-xxv710-imix-{core}-ipsec-ip4routing-base-scale-dpdk-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-imix-{core}-ipsec-ip4routing-base-scale-dpdk-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  data: "vpp-3n-skx-curr-iter"
   core: ["2t1c", ]
   include:
     - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-{core}-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
@@ -7241,7 +7775,7 @@
   title: "Throughput: 3n-tsh-x520-imix-{core}-ipsec-ip4routing-base-scale-sw-ixgbe-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/3n-tsh-x520-imix-{core}-ipsec-ip4routing-base-scale-sw-ixgbe-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-3n-tsh"
+  data: "vpp-3n-tsh-curr-iter"
   core: ["1t1c", ]
   include:
     - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-{core}-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
@@ -7258,7 +7792,7 @@
   title: "Throughput: 3n-dnv-x553-imix-{core}-ipsec-ip4routing-base-scale-sw-ixgbe-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/3n-dnv-x553-imix-{core}-ipsec-ip4routing-base-scale-sw-ixgbe-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-3n-dnv"
+  data: "vpp-3n-dnv-curr-iter"
   core: ["1t1c", ]
   include:
     - "Tests.Vpp.Perf.Crypto.10Ge2P1X553-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-{core}-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
@@ -7272,27 +7806,26 @@
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 2n-skx-x710-64b-{core}-l2switching-base-scale-[avf,dpdk]-{test_type}"
+  title: "Throughput: 2n-skx-x710-64b-{core}-l2switching-base-scale-[avf,dpdk,af_xdp]-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-skx-x710-64b-{core}-l2switching-base-scale-[avf,dpdk]-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-x710-64b-{core}-l2switching-base-scale-[avf,dpdk,af_xdp]-{test_type}"
+  data: "vpp-2n-skx-curr-iter"
   core: ["2t1c", ]
   include:
     - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Xcbase-Ndrpdr.64B-{core}-avf-eth-l2xcbase-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-{core}-avf-dot1q-l2bdbasemaclrn-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-{core}-dot1q-l2bdbasemaclrn-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-{core}-eth-l2bdbasemaclrn-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-{core}-eth-l2bdscale1mmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-af-xdp-Eth-L2Bdbasemaclrn-Ndrpdr.64B-{core}-af-xdp-eth-l2bdbasemaclrn-ndrpdr"
   layout:
-    title: "2n-skx-x710-64b-{core}-l2switching-base-scale-[avf,dpdk]-{test_type}"
+    title: "2n-skx-x710-64b-{core}-l2switching-base-scale-[avf,dpdk,af_xdp]-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
   title: "Throughput: 2n-skx-xxv710-64b-{core}-l2switching-base-avf-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-{core}-l2switching-base-avf-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  data: "vpp-2n-skx-curr-iter"
   core: ["2t1c", ]
   include:
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Ndrpdr.64B-{core}-avf-dot1q-l2xcbase-ndrpdr"
@@ -7308,7 +7841,7 @@
   title: "Throughput: 2n-skx-xxv710-64b-{core}-l2switching-base-dpdk-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-{core}-l2switching-base-dpdk-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  data: "vpp-2n-skx-curr-iter"
   core: ["2t1c", ]
   include:
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Xcbase-Ndrpdr.64B-{core}-dot1q-l2xcbase-ndrpdr"
@@ -7324,7 +7857,7 @@
   title: "Throughput: 2n-skx-xxv710-64b-{core}-l2switching-base-scale-avf-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-{core}-l2switching-base-scale-avf-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  data: "vpp-2n-skx-curr-iter"
   core: ["2t1c", ]
   include:
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-ndrpdr"
@@ -7335,11 +7868,28 @@
     title: "2n-skx-xxv710-64b-{core}-l2switching-base-scale-avf-{test_type}"
     layout: "plot-throughput"
 
+- type: "plot"
+  title: "Throughput: 2n-skx-xxv710-64b-{core}-l2switching-base-scale-af_xdp-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-{core}-l2switching-base-scale-af_xdp-{test_type}"
+  data: "vpp-2n-skx-curr-iter"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-af-xdp-Eth-L2Patch-Ndrpdr.64B-{core}-af-xdp-eth-l2patch-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-af-xdp-Eth-L2Xcbase-Ndrpdr.64B-{core}-af-xdp-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-af-xdp-Eth-L2Bdbasemaclrn-Ndrpdr.64B-{core}-af-xdp-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-af-xdp-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-{core}-af-xdp-eth-l2bdscale10kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-af-xdp-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-{core}-af-xdp-eth-l2bdscale100kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-af-xdp-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-{core}-af-xdp-eth-l2bdscale1mmaclrn-ndrpdr"
+  layout:
+    title: "2n-skx-xxv710-64b-{core}-l2switching-base-scale-af_xdp-{test_type}"
+    layout: "plot-throughput"
+
 - type: "plot"
   title: "Throughput: 2n-skx-xxv710-64b-{core}-l2switching-base-scale-dpdk-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-{core}-l2switching-base-scale-dpdk-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  data: "vpp-2n-skx-curr-iter"
   core: ["2t1c", ]
   include:
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-{core}-eth-l2bdbasemaclrn-ndrpdr"
@@ -7350,28 +7900,11 @@
     title: "2n-skx-xxv710-64b-{core}-l2switching-base-scale-dpdk-{test_type}"
     layout: "plot-throughput"
 
-- type: "plot"
-  title: "Throughput: 3n-hsw-xl710-64b-{core}-l2switching-base-scale-dpdk-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-64b-{core}-l2switching-base-scale-dpdk-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  core: ["1t1c", ]
-  include:
-    - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Patch-Ndrpdr.64B-{core}-eth-l2patch-ndrpdr"
-    - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Dot1Q-L2Xcbase-Ndrpdr.64B-{core}-dot1q-l2xcbase-ndrpdr"
-    - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Xcbase-Ndrpdr.64B-{core}-eth-l2xcbase-ndrpdr"
-    - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-{core}-dot1q-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-{core}-eth-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-{core}-eth-l2bdscale1mmaclrn-ndrpdr"
-  layout:
-    title: "3n-hsw-xl710-64b-{core}-base-scale-dpdk-{test_type}"
-    layout: "plot-throughput"
-
 - type: "plot"
   title: "Throughput: 3n-skx-x710-64b-{core}-l2switching-base-scale-avf-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/3n-skx-x710-64b-{core}-l2switching-base-scale-avf-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  data: "vpp-3n-skx-curr-iter"
   core: ["2t1c", ]
   include:
     - "Tests.Vpp.Perf.L2.10Ge2P1X710-Avf-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-{core}-avf-dot1q-l2bdbasemaclrn-ndrpdr"
@@ -7384,10 +7917,10 @@
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 3n-skx-xxv710-64b-{core}-l2switching-base-avf-{test_type}"
+  title: "Throughput: 3n-skx-xxv710-64b-{core}-l2switching-base-[avf,dpdk]-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-{core}-l2switching-base-avf-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-{core}-l2switching-base-{test_type}"
+  data: "vpp-3n-skx-curr-iter"
   core: ["2t1c", ]
   include:
     - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Ndrpdr.64B-{core}-avf-dot1q-l2xcbase-ndrpdr"
@@ -7395,30 +7928,17 @@
     - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Patch-Ndrpdr.64B-{core}-avf-eth-l2patch-ndrpdr"
     - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Ndrpdr.64B-{core}-avf-eth-l2xcbase-ndrpdr"
     - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-ndrpdr"
-  layout:
-    title: "3n-skx-xxv710-64b-{core}-l2switching-base-avf-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Throughput: 3n-skx-xxv710-64b-{core}-l2switching-base-dpdk-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-{core}-l2switching-base-dpdk-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  core: ["2t1c", ]
-  include:
-    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Dot1Q-L2Xcbase-Ndrpdr.64B-{core}-dot1q-l2xcbase-ndrpdr"
     - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Xcbase-Ndrpdr.64B-{core}-eth-l2xcbase-ndrpdr"
-    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-{core}-dot1q-l2bdbasemaclrn-ndrpdr"
     - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-{core}-eth-l2bdbasemaclrn-ndrpdr"
   layout:
-    title: "3n-skx-xxv710-64b-{core}-l2switching-base-dpdk-{test_type}"
+    title: "3n-skx-xxv710-64b-{core}-l2switching-base-[avf,dpdk]-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
   title: "Throughput: 3n-skx-xxv710-64b-{core}-l2switching-base-scale-avf-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-{core}-l2switching-base-scale-avf-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  data: "vpp-3n-skx-curr-iter"
   core: ["2t1c", ]
   include:
     - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Patch-Ndrpdr.64B-{core}-avf-eth-l2patch-ndrpdr"
@@ -7435,7 +7955,7 @@
   title: "Throughput: 3n-skx-xxv710-64b-{core}-l2switching-base-scale-dpdk-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-{core}-l2switching-base-scale-dpdk-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  data: "vpp-3n-skx-curr-iter"
   core: ["2t1c", ]
   include:
     - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Patch-Ndrpdr.64B-{core}-eth-l2patch-ndrpdr"
@@ -7452,7 +7972,7 @@
   title: "Throughput: 3n-skx-xxv710-64b-{core}-features-l2switching-base-avf-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-{core}-features-l2switching-base-avf-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  data: "vpp-3n-skx-curr-iter"
   core: ["2t1c", ]
   include:
     - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-ndrpdr"
@@ -7469,7 +7989,7 @@
   title: "Throughput: 3n-skx-xxv710-64b-{core}-features-l2switching-base-dpdk-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-{core}-features-l2switching-base-dpdk-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  data: "vpp-3n-skx-curr-iter"
   core: ["2t1c", ]
   include:
     - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-{core}-eth-l2bdbasemaclrn-ndrpdr"
@@ -7486,7 +8006,7 @@
   title: "Throughput: 3n-tsh-x520-64b-{core}-l2switching-base-ixgbe-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/3n-tsh-x520-64b-{core}-l2switching-base-ixgbe-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-3n-tsh"
+  data: "vpp-3n-tsh-curr-iter"
   core: ["1t1c", ]
   include:
     - "Tests.Vpp.Perf.L2.10Ge2P1X520-Dot1Q-L2Xcbase-Ndrpdr.64B-{core}-dot1q-l2xcbase-ndrpdr"
@@ -7501,7 +8021,7 @@
   title: "Throughput: 3n-tsh-x520-64b-{core}-l2switching-base-scale-ixgbe-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/3n-tsh-x520-64b-{core}-l2switching-base-scale-ixgbe-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-3n-tsh"
+  data: "vpp-3n-tsh-curr-iter"
   core: ["1t1c", ]
   include:
     - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Patch-Ndrpdr.64B-{core}-eth-l2patch-ndrpdr"
@@ -7518,7 +8038,7 @@
   title: "Throughput: 3n-tsh-x520-64b-{core}-features-l2switching-base-ixgbe-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/3n-tsh-x520-64b-{core}-features-l2switching-base-ixgbe-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-3n-tsh"
+  data: "vpp-3n-tsh-curr-iter"
   core: ["1t1c", ]
   include:
     - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Ndrpdr.64B-{core}-eth-l2bdbasemaclrn-ndrpdr"
@@ -7535,7 +8055,7 @@
   title: "Throughput: 2n-dnv-x553-64b-{core}-l2switching-base-ixgbe-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-dnv-x553-64b-{core}-l2switching-base-ixgbe-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-dnv"
+  data: "vpp-2n-dnv-curr-iter"
   core: ["1t1c", ]
   include:
     - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Dot1Q-L2Xcbase-Ndrpdr.64B-{core}-dot1q-l2xcbase-ndrpdr"
@@ -7550,24 +8070,37 @@
   title: "Throughput: 2n-dnv-x553-64b-{core}-l2switching-base-scale-ixgbe-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-dnv-x553-64b-{core}-l2switching-base-scale-ixgbe-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-dnv"
+  data: "vpp-2n-dnv-curr-iter"
   core: ["1t1c", ]
   include:
     - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Eth-L2Patch-Ndrpdr.64B-{core}-eth-l2patch-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Eth-L2Xcbase-Ndrpdr.64B-{core}-eth-l2xcbase-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Eth-L2Bdbasemaclrn-Ndrpdr.64B-{core}-eth-l2bdbasemaclrn-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-{core}-eth-l2bdscale10kmaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-{core}-eth-l2bdscale100kmaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-{core}-eth-l2bdscale1mmaclrn-ndrpdr"
   layout:
     title: "2n-dnv-x553-64b-{core}-l2switching-base-scale-ixgbe-{test_type}"
     layout: "plot-throughput"
 
+- type: "plot"
+  title: "Throughput: 2n-dnv-x553-64b-{core}-l2switching-base-scale-af_xdp-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-dnv-x553-64b-{core}-l2switching-base-scale-af_xdp-{test_type}"
+  data: "vpp-2n-dnv-curr-iter"
+  core: ["1t1c", ]
+  include:
+    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-af-xdp-Eth-L2Patch-Ndrpdr.64B-{core}-af-xdp-eth-l2patch-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-af-xdp-Eth-L2Xcbase-Ndrpdr.64B-{core}-af-xdp-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-af-xdp-Eth-L2Bdbasemaclrn-Ndrpdr.64B-{core}-af-xdp-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-af-xdp-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-{core}-af-xdp-eth-l2bdscale10kmaclrn-ndrpdr"
+  layout:
+    title: "2n-dnv-x553-64b-{core}-l2switching-base-scale-af_xdp-{test_type}"
+    layout: "plot-throughput"
+
 - type: "plot"
   title: "Throughput: 3n-dnv-x553-64b-{core}-l2switching-base-ixgbe-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/3n-dnv-x553-64b-{core}-l2switching-base-ixgbe-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-3n-dnv"
+  data: "vpp-3n-dnv-curr-iter"
   core: ["1t1c", ]
   include:
     - "Tests.Vpp.Perf.L2.10Ge2P1X553-Dot1Q-L2Xcbase-Ndrpdr.64B-{core}-dot1q-l2xcbase-ndrpdr"
@@ -7582,7 +8115,7 @@
   title: "Throughput: 3n-dnv-x553-64b-{core}-l2switching-base-scale-ixgbe-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/3n-dnv-x553-64b-{core}-l2switching-base-scale-ixgbe-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-3n-dnv"
+  data: "vpp-3n-dnv-curr-iter"
   core: ["1t1c", ]
   include:
     - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Patch-Ndrpdr.64B-{core}-eth-l2patch-ndrpdr"
@@ -7599,7 +8132,7 @@
   title: "Throughput: 3n-dnv-x553-64b-{core}-features-l2switching-base-ixgbe-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/3n-dnv-x553-64b-{core}-features-l2switching-base-ixgbe-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-3n-dnv"
+  data: "vpp-3n-dnv-curr-iter"
   core: ["1t1c", ]
   include:
     - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Xcbase-Ndrpdr.64B-{core}-eth-l2xcbase-ndrpdr"
@@ -7612,28 +8145,11 @@
     title: "3n-dnv-x553-64b-{core}-features-l2switching-base-ixgbe-{test_type}"
     layout: "plot-throughput"
 
-- type: "plot"
-  title: "Throughput: 3n-hsw-xl710-78b-{core}-srv6-ip6routing-base-dpdk-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-78b-{core}-srv6-ip6routing-base-dpdk-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  core: ["1t1c", ]
-  include:
-    - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-Ndrpdr.78B-{core}-ethip6ip6-ip6base-srv6enc1sid-ndrpdr"
-    - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Ndrpdr.78B-{core}-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr"
-    - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Nodecaps-Ndrpdr.78B-{core}-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr"
-    - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Dyn-Ndrpdr.78B-{core}-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr"
-    - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Masq-Ndrpdr.78B-{core}-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr"
-    - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Stat-Ndrpdr.78B-{core}-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr"
-  layout:
-    title: "3n-hsw-xl710-78b-{core}-srv6-ip6routing-base-dpdk-{test_type}"
-    layout: "plot-throughput"
-
 - type: "plot"
   title: "Throughput: 3n-skx-xxv710-78b-{core}-srv6-ip6routing-base-avf-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-78b-{core}-srv6-ip6routing-base-avf-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  data: "vpp-3n-skx-curr-iter"
   core: ["2t1c", ]
   include:
     - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-Ndrpdr.78B-{core}-avf-ethip6ip6-ip6base-srv6enc1sid-ndrpdr"
@@ -7650,7 +8166,7 @@
   title: "Throughput: 3n-skx-xxv710-78b-{core}-srv6-ip6routing-base-dpdk-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-78b-{core}-srv6-ip6routing-base-dpdk-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  data: "vpp-3n-skx-curr-iter"
   core: ["2t1c", ]
   include:
     - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-Ndrpdr.78B-{core}-ethip6ip6-ip6base-srv6enc1sid-ndrpdr"
@@ -7667,7 +8183,7 @@
   title: "Throughput: 3n-tsh-x520-78b-{core}-srv6-ip6routing-base-ixgbe-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/3n-tsh-x520-78b-{core}-srv6-ip6routing-base-ixgbe-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-3n-tsh"
+  data: "vpp-3n-tsh-curr-iter"
   core: ["1t1c", ]
   include:
     - "Tests.Vpp.Perf.Srv6.10Ge2P1X520-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-Ndrpdr.78B-{core}-ethip6ip6-ip6base-srv6enc1sid-ndrpdr"
@@ -7681,136 +8197,40 @@
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 2n-skx-xxv710-64b-{core}-vhost-base-avf-{test_type}"
+  title: "Throughput: 2n-skx-xxv710-64b-{core}-vhost-base-[avf,dpdk]-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-{core}-vhost-base-avf-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-{core}-vhost-base-{test_type}"
+  data: "vpp-2n-skx-curr-iter"
   core: ["2t1c", ]
   include:
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-avf-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
     - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-avf-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
     - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-avf-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr"
-  layout:
-    title: "2n-skx-xxv710-64b-{core}-vhost-base-avf-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Throughput: 2n-skx-xxv710-64b-{core}-vhost-base-avf-vpp-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-{core}-vhost-base-avf-vpp-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  core: ["2t1c", ]
-  include:
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-avf-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-avf-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Vppip4-Ndrpdr.64B-{core}-avf-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr"
-  layout:
-    title: "2n-skx-xxv710-64b-{core}-vhost-base-avf-vpp-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Throughput: 2n-skx-xxv710-64b-{core}-vhost-base-dpdk-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-{core}-vhost-base-dpdk-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  core: ["2t1c", ]
-  include:
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
     - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
     - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr"
   layout:
-    title: "2n-skx-xxv710-64b-{core}-vhost-base-dpdk-{test_type}"
+    title: "2n-skx-xxv710-64b-{core}-vhost-base-[avf,dpdk]-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 2n-skx-xxv710-64b-{core}-vhost-base-dpdk-vpp-{test_type}"
+  title: "Throughput: 2n-skx-xxv710-64b-{core}-vhost-base-[avf,dpdk]-vpp-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-{core}-vhost-base-dpdk-vpp-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-{core}-vhost-base-vpp-{test_type}"
+  data: "vpp-2n-skx-curr-iter"
   core: ["2t1c", ]
   include:
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
     - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
     - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Vppip4-Ndrpdr.64B-{core}-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr"
-  layout:
-    title: "2n-skx-xxv710-64b-{core}-vhost-base-dpdk-vpp-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Throughput: 3n-hsw-xl710-64b-{core}-vhost-base-dpdk-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-64b-{core}-vhost-base-dpdk-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  core: ["1t1c", ]
-  include:
-    - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr"
-  layout:
-    title: "3n-hsw-xl710-64b-{core}-vhost-base-dpdk-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Throughput: 3n-hsw-xl710-64b-{core}-vhost-base-dpdk-vpp-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-64b-{core}-vhost-base-dpdk-vpp-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  core: ["1t1c", ]
-  include:
-    - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr10241Vm-Vppl2Xc-Ndrpdr.64B-{core}-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1V-m-Vppl2Xc-Ndrpdr.64B-{core}-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Vppip4-Ndrpdr.64B-{core}-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr"
-  layout:
-    title: "3n-hsw-xl710-64b-{core}-vhost-base-dpdk-vpp-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Throughput: 3n-skx-x710-64b-{core}-link-bonding-vhost-base-avf-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-skx-x710-64b-{core}-link-bonding-vhost-base-avf-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  core: ["2t1c", ]
-  include:
-    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Avf-1Lbvpplacp-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-avf-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Avf-1Lbvpplacp-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-avf-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Avf-2Lbvpplacp-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-avf-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Avf-2Lbvpplacp-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-avf-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-  layout:
-    title: "3n-skx-x710-64b-{core}-link-bonding-vhost-base-avf-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Throughput: 3n-skx-x710-64b-{core}-link-bonding-vhost-base-avf-vpp-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-skx-x710-64b-{core}-link-bonding-vhost-base-avf-vpp-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  core: ["2t1c", ]
-  include:
-    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Avf-1Lbvpplacp-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-avf-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Avf-1Lbvpplacp-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-avf-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Avf-2Lbvpplacp-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-avf-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Avf-2Lbvpplacp-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-avf-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
   layout:
-    title: "3n-skx-x710-64b-{core}-link-bonding-vhost-base-avf-vpp-{test_type}"
+    title: "2n-skx-xxv710-64b-{core}-vhost-base-[avf,dpdk]-vpp-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
   title: "Throughput: 3n-skx-xxv710-64b-{core}-vhost-base-avf-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-{core}-vhost-base-avf-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  data: "vpp-3n-skx-curr-iter"
   core: ["2t1c", ]
   include:
     - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-avf-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
@@ -7827,7 +8247,7 @@
   title: "Throughput: 3n-skx-xxv710-64b-{core}-vhost-base-avf-vpp-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-{core}-vhost-base-avf-vpp-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  data: "vpp-3n-skx-curr-iter"
   core: ["2t1c", ]
   include:
     - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-avf-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
@@ -7844,7 +8264,7 @@
   title: "Throughput: 3n-skx-xxv710-64b-{core}-vhost-base-dpdk-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-{core}-vhost-base-dpdk-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  data: "vpp-3n-skx-curr-iter"
   core: ["2t1c", ]
   include:
     - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
@@ -7857,79 +8277,11 @@
     title: "3n-skx-xxv710-64b-{core}-vhost-base-dpdk-{test_type}"
     layout: "plot-throughput"
 
-- type: "plot"
-  title: "Throughput: 3n-skx-xxv710-64b-{core}-vhost-base-dpdk-vpp-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-{core}-vhost-base-dpdk-vpp-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  core: ["2t1c", ]
-  include:
-    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Vppip4-Ndrpdr.64B-{core}-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr"
-  layout:
-    title: "3n-skx-xxv710-64b-{core}-vhost-base-dpdk-vpp-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Throughput: 3n-skx-xxv710-64b-{core}-link-bonding-vhost-base-avf-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-{core}-link-bonding-vhost-base-avf-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  core: ["2t1c", ]
-  include:
-    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-1Lbvpplacp-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-avf-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-1Lbvpplacp-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-avf-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-  layout:
-    title: "3n-skx-xxv710-64b-{core}-link-bonding-vhost-base-avf-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Throughput: 3n-skx-xxv710-64b-{core}-link-bonding-vhost-base-avf-vpp-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-{core}-link-bonding-vhost-base-avf-vpp-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  core: ["2t1c", ]
-  include:
-    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-1Lbvpplacp-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-avf-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-1Lbvpplacp-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-avf-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-  layout:
-    title: "3n-skx-xxv710-64b-{core}-link-bonding-vhost-base-avf-vpp-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Throughput: 3n-skx-xxv710-64b-{core}-link-bonding-vhost-base-dpdk-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-{core}-link-bonding-vhost-base-dpdk-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  core: ["2t1c", ]
-  include:
-    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-1Lbvpplacp-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-1Lbvpplacp-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-  layout:
-    title: "3n-skx-xxv710-64b-{core}-link-bonding-vhost-base-dpdk-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Throughput: 3n-skx-xxv710-64b-{core}-link-bonding-vhost-base-dpdk-vpp-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-{core}-link-bonding-vhost-base-dpdk-vpp-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  core: ["2t1c", ]
-  include:
-    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-1Lbvpplacp-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-1Lbvpplacp-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-  layout:
-    title: "3n-skx-xxv710-64b-{core}-link-bonding-vhost-base-dpdk-vpp-{test_type}"
-    layout: "plot-throughput"
-
 - type: "plot"
   title: "Throughput: 3n-tsh-x520-64b-{core}-vhost-base-ixgbe-vppl2xc-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/3n-tsh-x520-64b-{core}-vhost-base-ixgbe-vppl2xc-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-3n-tsh"
+  data: "vpp-3n-tsh-curr-iter"
   core: ["1t1c", ]
   include:
     - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-vppl2xc-Ndrpdr.64B-{core}-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
@@ -7946,7 +8298,7 @@
   title: "Throughput: 3n-tsh-x520-64b-{core}-vhost-base-ixgbe-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/3n-tsh-x520-64b-{core}-vhost-base-ixgbe-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-3n-tsh"
+  data: "vpp-3n-tsh-curr-iter"
   core: ["1t1c", ]
   include:
     - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
@@ -7959,31 +8311,13 @@
     title: "3n-tsh-x520-64b-{core}-vhost-base-ixgbe-{test_type}"
     layout: "plot-throughput"
 
-- type: "plot"
-  title: "Throughput: 2n-skx-xxv710-114b-{core}-vts-l2switching-base-dpdk-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-114b-{core}-vts-l2switching-base-dpdk-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  core: ["2t1c", ]
-  include:
-    - "Tests.Vpp.Perf.Vts.2N1L-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermit-2Vhostvr1024-1Vm-Ndrpdr.114B-{core}-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vts.2N1L-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermitreflect-2Vhostvr1024-1Vm-Ndrpdr.114B-{core}-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vts.2N1L-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Noacl-2Vhostvr1024-1Vm-Ndrpdr.114B-{core}-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Noacl-2Vhostvr1024-1Vm-Ndrpdr.114B-{core}-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermit-2Vhostvr1024-1Vm-Ndrpdr.114B-{core}-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermitreflect-2Vhostvr1024-1Vm-Ndrpdr.114B-{core}-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr"
-  layout:
-    title: "2n-skx-xxv710-114b-{core}-vts-l2switching-base-[avf,dpdk]-{test_type}"
-    layout: "plot-throughput"
-
 - type: "plot"
   title: "Throughput: 2n-tx2-xl710-64b-{core}-ip4routing-base-scale-dpdk-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-tx2-xl710-64b-{core}-ip4routing-base-scale-dpdk-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-tx2"
+  data: "vpp-2n-tx2-curr-iter"
   core: ["1t1c", ]
   include:
-    - "Tests.Vpp.Perf.Ip4.2N1L-40Ge2P1Xl710-Dot1Q-Ip4Base-Ndrpdr.64B-{core}-dot1q-ip4base-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-40Ge2P1Xl710-Ethip4-Ip4Base-Ndrpdr.64B-{core}-ethip4-ip4base-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-40Ge2P1Xl710-Ethip4-Ip4Scale20K-Ndrpdr.64B-{core}-ethip4-ip4scale20k-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-40Ge2P1Xl710-Ethip4-Ip4Scale200K-Ndrpdr.64B-{core}-ethip4-ip4scale200k-ndrpdr"
@@ -7992,11 +8326,26 @@
     title: "2n-tx2-xl710-64b-{core}-ip4routing-base-scale-dpdk-{test_type}"
     layout: "plot-throughput"
 
+- type: "plot"
+  title: "Throughput: 2n-tx2-xl710-64b-{core}-ip4routing-base-scale-af_xdp-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-tx2-xl710-64b-{core}-ip4routing-base-scale-af_xdp-{test_type}"
+  data: "vpp-2n-tx2-curr-iter"
+  core: ["1t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-40Ge2P1Xl710-af-xdp-Ethip4-Ip4Base-Ndrpdr.64B-{core}-af-xdp-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-40Ge2P1Xl710-af-xdp-Ethip4-Ip4Scale20K-Ndrpdr.64B-{core}-af-xdp-ethip4-ip4scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-40Ge2P1Xl710-af-xdp-Ethip4-Ip4Scale200K-Ndrpdr.64B-{core}-af-xdp-ethip4-ip4scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-40Ge2P1Xl710-af-xdp-Ethip4-Ip4Scale2M-Ndrpdr.64B-{core}-af-xdp-ethip4-ip4scale2m-ndrpdr"
+  layout:
+    title: "2n-tx2-xl710-64b-{core}-ip4routing-base-scale-af_xdp-{test_type}"
+    layout: "plot-throughput"
+
 - type: "plot"
   title: "Throughput: 2n-tx2-xl710-64b-{core}-features-ip4routing-base-scale-dpdk-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-tx2-xl710-64b-{core}-features-ip4routing-base-scale-dpdk-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-tx2"
+  data: "vpp-2n-tx2-curr-iter"
   core: ["1t1c", ]
   include:
     - "Tests.Vpp.Perf.Ip4.2N1L-40Ge2P1Xl710-Ethip4-Ip4Base-Iacldstbase-Ndrpdr.64B-{core}-ethip4-ip4base-iacldstbase-ndrpdr"
@@ -8012,24 +8361,38 @@
   title: "Throughput: 2n-tx2-xl710-78b-{core}-ip6routing-base-scale-dpdk-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-tx2-xl710-78b-{core}-ip6routing-base-scale-dpdk-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-tx2"
+  data: "vpp-2n-tx2-curr-iter"
   core: ["1t1c", ]
   include:
-    - "Tests.Vpp.Perf.Ip6.2N1L-40Ge2P1Xl710-Dot1Q-Ip6Base-Ndrpdr.78B-{core}-dot1q-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-40Ge2P1Xl710-Ethip6-Ip6Base-Ndrpdr.78B-{core}-ethip6-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-40Ge2P1Xl710-Ethip6-Ip6Scale20K-Ndrpdr.78B-{core}-ethip6-ip6scale20k-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-40Ge2P1Xl710-Ethip6-Ip6Scale200K-Ndrpdr.78B-{core}-ethip6-ip6scale200k-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-40Ge2P1Xl710-Ethip6-Ip6Scale2M-Ndrpdr.78B-{core}-ethip6-ip6scale2m-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-40Ge2P1Xl710-Ethip6-Ip6Base-Iacldstbase-Ndrpdr.78B-{core}-ethip6-ip6base-iacldstbase-ndrpdr"
   layout:
-    title: "2n-tx2-xl710-78b-{core}-ip4routing-base-scale-dpdk-{test_type}"
+    title: "2n-tx2-xl710-78b-{core}-ip6routing-base-scale-dpdk-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 2n-tx2-xl710-78b-{core}-ip6routing-base-scale-af_xdp-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-tx2-xl710-78b-{core}-ip6routing-base-scale-af_xdp-{test_type}"
+  data: "vpp-2n-tx2-curr-iter"
+  core: ["1t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Ip6.2N1L-40Ge2P1Xl710-af-xdp-Ethip6-Ip6Base-Ndrpdr.78B-{core}-af-xdp-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-40Ge2P1Xl710-af-xdp-Ethip6-Ip6Scale20K-Ndrpdr.78B-{core}-af-xdp-ethip6-ip6scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-40Ge2P1Xl710-af-xdp-Ethip6-Ip6Scale200K-Ndrpdr.78B-{core}-af-xdp-ethip6-ip6scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-40Ge2P1Xl710-af-xdp-Ethip6-Ip6Scale2M-Ndrpdr.78B-{core}-af-xdp-ethip6-ip6scale2m-ndrpdr"
+  layout:
+    title: "2n-tx2-xl710-78b-{core}-ip6routing-base-scale-af_xdp-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
   title: "Throughput: 2n-tx2-xl710-64b-{core}-l2switching-base-dpdk-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-tx2-xl710-64b-{core}-l2switching-base-dpdk-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-tx2"
+  data: "vpp-2n-tx2-curr-iter"
   core: ["1t1c", ]
   include:
     - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-Dot1Q-L2Xcbase-Ndrpdr.64B-{core}-dot1q-l2xcbase-ndrpdr"
@@ -8045,7 +8408,7 @@
   title: "Throughput: 2n-tx2-xl710-64b-{core}-l2switching-scale-dpdk-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-tx2-xl710-64b-{core}-l2switching-scale-dpdk-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-tx2"
+  data: "vpp-2n-tx2-curr-iter"
   core: ["1t1c", ]
   include:
     - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-{core}-eth-l2bdbasemaclrn-ndrpdr"
@@ -8056,11 +8419,28 @@
     title: "2n-tx2-xl710-64b-{core}-l2switching-scale-dpdk-{test_type}"
     layout: "plot-throughput"
 
+- type: "plot"
+  title: "Throughput: 2n-tx2-xl710-64b-{core}-l2switching-scale-af_xdp-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-tx2-xl710-64b-{core}-l2switching-scale-af_xdp-{test_type}"
+  data: "vpp-2n-tx2-curr-iter"
+  core: ["1t1c", ]
+  include:
+    - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-af-xdp-Eth-L2Patch-Ndrpdr.64B-{core}-af-xdp-eth-l2patch-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-af-xdp-Eth-L2Xcbase-Ndrpdr.64B-{core}-af-xdp-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-af-xdp-Eth-L2Bdbasemaclrn-Ndrpdr.64B-{core}-af-xdp-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-af-xdp-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-{core}-af-xdp-eth-l2bdscale10kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-af-xdp-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-{core}-eth-l2bdscale100kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-af-xdp-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-{core}-af-xdp-eth-l2bdscale1mmaclrn-ndrpdr"
+  layout:
+    title: "2n-tx2-xl710-64b-{core}-l2switching-scale-af_xdp-{test_type}"
+    layout: "plot-throughput"
+
 - type: "plot"
   title: "Throughput: 2n-tx2-xl710-64b-{core}-features-l2switching-base-dpdk-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-tx2-xl710-64b-{core}-features-l2switching-base-dpdk-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-tx2"
+  data: "vpp-2n-tx2-curr-iter"
   core: ["1t1c", ]
   include:
     - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Iacl50Sf-10Kflows-Ndrpdr.64B-{core}-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr"
@@ -8080,7 +8460,7 @@
   title: "Speedup: 2n-skx-xxv710-64b-memif-base-avf-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-memif-base-avf-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  data: "vpp-2n-skx-curr-iter"
   include:
     - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-.t.c-avf-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
     - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-.t.c-avf-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
@@ -8094,7 +8474,7 @@
   title: "Speedup: 2n-skx-xxv710-64b-memif-base-dpdk-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-memif-base-dpdk-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  data: "vpp-2n-skx-curr-iter"
   include:
     - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-.t.c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
     - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-.t.c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
@@ -8108,7 +8488,7 @@
   title: "Speedup: 3n-skx-xxv710-64b-memif-base-avf-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-memif-base-avf-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  data: "vpp-3n-skx-curr-iter"
   include:
     - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-.t.c-avf-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
     - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Memif-1Lxc-Ndrpdr.64B-.t.c-avf-eth-l2xcbase-eth-2memif-1lxc-ndrpdr"
@@ -8123,7 +8503,7 @@
   title: "Speedup: 3n-skx-xxv710-64b-memif-base-dpdk-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-memif-base-dpdk-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  data: "vpp-3n-skx-curr-iter"
   include:
     - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-.t.c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
     - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Memif-1Lxc-Ndrpdr.64B-.t.c-eth-l2xcbase-eth-2memif-1lxc-ndrpdr"
@@ -8135,28 +8515,26 @@
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 2n-skx-x710-64b-ip4routing-base-scale-[avf,dpdk]-{test_type}-tsa"
+  title: "Speedup: 2n-skx-x710-64b-ip4routing-base-scale-[avf,dpdk,af_xdp]-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-skx-x710-64b-ip4routing-base-scale-[avf,dpdk]-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-x710-64b-ip4routing-base-scale-[avf,dpdk,af_xdp]-{test_type}-tsa"
+  data: "vpp-2n-skx-curr-iter"
   include:
-    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Dot1Q-Ip4Base-Ndrpdr.64B-.t.c-avf-dot1q-ip4base-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Base-Ndrpdr.64B-.t.c-avf-ethip4-ip4base-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-.t.c-avf-ethip4-ip4scale2m-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-Rnd-Ndrpdr.64B-.t.c-avf-ethip4-ip4scale2m-rnd-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Dot1Q-Ip4Base-Ndrpdr.64B-.t.c-dot1q-ip4base-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Base-Ndrpdr.64B-.t.c-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-af-xdp-Ethip4-Ip4Base-Ndrpdr.64B-.t.c-af-xdp-ethip4-ip4base-ndrpdr"
   layout:
-    title: "2n-skx-x710-64b-ip4routing-base-scale-[avf,dpdk]-{test_type}"
+    title: "2n-skx-x710-64b-ip4routing-base-scale-[avf,dpdk,af_xdp]-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
   title: "Speedup: 2n-skx-xxv710-64b-ip4routing-base-scale-avf-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-ip4routing-base-scale-avf-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  data: "vpp-2n-skx-curr-iter"
   include:
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-Ip4Base-Ndrpdr.64B-.t.c-avf-dot1q-ip4base-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Ndrpdr.64B-.t.c-avf-ethip4-ip4base-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale20K-Ndrpdr.64B-.t.c-avf-ethip4-ip4scale20k-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale20K-Rnd-Ndrpdr.64B-.t.c-avf-ethip4-ip4scale20k-rnd-ndrpdr"
@@ -8168,11 +8546,28 @@
     title: "2n-skx-xxv710-64b-ip4routing-base-scale-avf-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
+- type: "plot"
+  title: "Speedup: 2n-skx-xxv710-64b-ip4routing-base-scale-af_xdp-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-ip4routing-base-scale-af_xdp-{test_type}-tsa"
+  data: "vpp-2n-skx-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-af-xdp-Ethip4-Ip4Base-Ndrpdr.64B-.t.c-af-xdp-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-af-xdp-Ethip4-Ip4Scale20K-Ndrpdr.64B-.t.c-af-xdp-ethip4-ip4scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-af-xdp-Ethip4-Ip4Scale20K-Rnd-Ndrpdr.64B-.t.c-af-xdp-ethip4-ip4scale20k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-af-xdp-Ethip4-Ip4Scale200K-Ndrpdr.64B-.t.c-af-xdp-ethip4-ip4scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-af-xdp-Ethip4-Ip4Scale200K-Rnd-Ndrpdr.64B-.t.c-af-xdp-ethip4-ip4scale200k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-af-xdp-Ethip4-Ip4Scale2M-Ndrpdr.64B-.t.c-af-xdp-ethip4-ip4scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-af-xdp-Ethip4-Ip4Scale2M-Rnd-Ndrpdr.64B-.t.c-af-xdp-ethip4-ip4scale2m-rnd-ndrpdr"
+  layout:
+    title: "2n-skx-xxv710-64b-ip4routing-base-scale-af_xdp-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
 - type: "plot"
   title: "Speedup: 2n-skx-xxv710-64b-ip4routing-base-scale-dpdk-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-ip4routing-base-scale-dpdk-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  data: "vpp-2n-skx-curr-iter"
   include:
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Dot1Q-Ip4Base-Ndrpdr.64B-.t.c-dot1q-ip4base-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Ndrpdr.64B-.t.c-ethip4-ip4base-ndrpdr"
@@ -8190,7 +8585,7 @@
   title: "Speedup: 2n-skx-xxv710-64b-features-ip4routing-base-avf-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-features-ip4routing-base-avf-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  data: "vpp-2n-skx-curr-iter"
   include:
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
@@ -8206,7 +8601,7 @@
   title: "Speedup: 2n-skx-xxv710-64b-nat44det-ip4routing-stl-bidir-avf-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-nat44det-ip4routing-stl-bidir-avf-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  data: "vpp-2n-skx-curr-iter"
   include:
     - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr.64b-.t.c-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr"
     - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h4096-p63-s258048-ndrpdr.64b-.t.c-avf-ethip4udp-nat44det-h4096-p63-s258048-ndrpdr"
@@ -8221,7 +8616,7 @@
   title: "Speedup: 2n-skx-xxv710-64b-nat44ed-ip4routing-stl-unidir-avf-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-nat44ed-ip4routing-stl-unidir-avf-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  data: "vpp-2n-skx-curr-iter"
   include:
     - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-ndrpdr"
     - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-udir-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h4096-p63-s258048-udir-ndrpdr"
@@ -8236,7 +8631,7 @@
   title: "Speedup: 2n-skx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  data: "vpp-2n-skx-curr-iter"
   include:
     - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-ndrpdr"
     - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h1024-p63-s64512-cps-ndrpdr.64b-.t.c-avf-ethip4udp-ip4base-h1024-p63-s64512-cps-ndrpdr"
@@ -8252,31 +8647,11 @@
     title: "2n-skx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-{test_type}"
     layout: "plot-throughput-speedup-analysis-cps"
 
-- type: "plot"
-  title: "Speedup: 2n-skx-xxv710-64b-nat44ed-ip4routing-udp-stf-pps-avf-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-nat44ed-ip4routing-udp-stf-pps-avf-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  include:
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h1024-p63-s64512-pps-ndrpdr.64b-.t.c-avf-ethip4udp-ip4base-h1024-p63-s64512-pps-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-pps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h4096-p63-s258048-pps-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h4096-p63-s258048-pps-ndrpdr.64b-.t.c-avf-ethip4udp-ip4base-h4096-p63-s258048-pps-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-pps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-pps-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h16384-p63-s1032192-pps-ndrpdr.64b-.t.c-avf-ethip4udp-ip4base-h16384-p63-s1032192-pps-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-pps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-pps-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h65536-p63-s4128768-pps-ndrpdr.64b-.t.c-avf-ethip4udp-ip4base-h65536-p63-s4128768-pps-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-pps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-pps-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h262144-p63-s16515072-pps-ndrpdr.64b-.t.c-avf-ethip4udp-ip4base-h262144-p63-s16515072-pps-ndrpdr"
-  layout:
-    title: "2n-skx-xxv710-64b-nat44ed-ip4routing-udp-stf-pps-avf-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
 - type: "plot"
   title: "Speedup: 2n-skx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  data: "vpp-2n-skx-curr-iter"
   include:
     - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-ndrpdr"
     - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h1024-p63-s64512-cps-ndrpdr.64b-.t.c-avf-ethip4tcp-ip4base-h1024-p63-s64512-cps-ndrpdr"
@@ -8292,31 +8667,11 @@
     title: "2n-skx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-{test_type}"
     layout: "plot-throughput-speedup-analysis-cps"
 
-- type: "plot"
-  title: "Speedup: 2n-skx-xxv710-64b-nat44ed-ip4routing-tcp-stf-pps-avf-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-nat44ed-ip4routing-tcp-stf-pps-avf-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  include:
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h1024-p63-s64512-pps-ndrpdr.64b-.t.c-avf-ethip4tcp-ip4base-h1024-p63-s64512-pps-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h4096-p63-s258048-pps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h4096-p63-s258048-pps-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h4096-p63-s258048-pps-ndrpdr.64b-.t.c-avf-ethip4tcp-ip4base-h4096-p63-s258048-pps-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h16384-p63-s1032192-pps-ndrpdr.64b-.t.c-avf-ethip4tcp-ip4base-h16384-p63-s1032192-pps-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h65536-p63-s4128768-pps-ndrpdr.64b-.t.c-avf-ethip4tcp-ip4base-h65536-p63-s4128768-pps-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h262144-p63-s16515072-pps-ndrpdr.64b-.t.c-avf-ethip4tcp-ip4base-h262144-p63-s16515072-pps-ndrpdr"
-  layout:
-    title: "2n-skx-xxv710-64b-nat44ed-ip4routing-tcp-stf-pps-avf-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
 - type: "plot"
   title: "Speedup: 2n-skx-xxv710-64b-nat44ed-ip4routing-tcp-tput-avf-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-nat44ed-ip4routing-tcp-tput-avf-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  data: "vpp-2n-skx-curr-iter"
   include:
     - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-Ethip4Tcp-nat44ed-h1024-p63-s64512-pps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H1024-P63-S64512-Tput-Ndrpdr.64B-.t.c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-tput-ndrpdr"
@@ -8336,7 +8691,7 @@
   title: "Speedup: 2n-skx-xxv710-64b-nat44ed-ip4routing-udp-tput-avf-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-nat44ed-ip4routing-udp-tput-avf-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  data: "vpp-2n-skx-curr-iter"
   include:
     - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-Ethip4Udp-nat44ed-h1024-p63-s64512-pps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H1024-P63-S64512-Tput-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44ed-h1024-p63-s64512-tput-ndrpdr"
@@ -8356,7 +8711,7 @@
   title: "Speedup: 2n-skx-xxv710-64b-nat44ed-ip4routing-tcp-tput2-avf-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-nat44ed-ip4routing-tcp-tput2-avf-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  data: "vpp-2n-skx-curr-iter"
   include:
     - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h1024-p63-s64512-pps-ndrpdr.64b-.t.c-avf-ethip4tcp-ip4base-h1024-p63-s64512-pps-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H1024-P63-S64512-Tput-Ndrpdr.64B-.t.c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-tput-ndrpdr"
@@ -8376,7 +8731,7 @@
   title: "Speedup: 2n-skx-xxv710-64b-nat44ed-ip4routing-udp-tput2-avf-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-nat44ed-ip4routing-udp-tput2-avf-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  data: "vpp-2n-skx-curr-iter"
   include:
     - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-Ethip4Udp-ip4base-h1024-p63-s64512-pps-ndrpdr.64b-.t.c-avf-ethip4udp-ip4base-h1024-p63-s64512-pps-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H1024-P63-S64512-Tput-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44ed-h1024-p63-s64512-tput-ndrpdr"
@@ -8392,27 +8747,11 @@
     title: "2n-skx-xxv710-64b-nat44ed-ip4routing-udp-tput-avf-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
-- type: "plot"
-  title: "Speedup: 2n-skx-xxv710-64b-features-ip4routing-base-dpdk-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-features-ip4routing-base-dpdk-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  include:
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Ndrpdr.64B-.t.c-ethip4-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-ethip4udp-nat44det-h1-p1-s1-Ndrpdr.64B-.t.c-ethip4udp-nat44det-h1-p1-s1-ndrpdr"
-  layout:
-    title: "2n-skx-xxv710-64b-features-ip4routing-base-dpdk-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
 - type: "plot"
   title: "Speedup: 2n-skx-xxv710-64b-ethip4--ethip4udpgeneve-avf-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-ethip4--ethip4udpgeneve-avf-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  data: "vpp-2n-skx-curr-iter"
   include:
     - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-1Tun-Ip4Base-Ndrpdr.64B-.t.c-avf-ethip4--ethip4udpgeneve-1tun-ip4base-ndrpdr"
     - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-4Tun-Ip4Base-Ndrpdr.64B-.t.c-avf-ethip4--ethip4udpgeneve-4tun-ip4base-ndrpdr"
@@ -8423,25 +8762,11 @@
     title: "2n-skx-xxv710-64b-ethip4--ethip4udpgeneve-avf-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
-- type: "plot"
-  title: "Speedup: 3n-hsw-xl710-64b-ip4routing-base-scale-dpdk-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-64b-ip4routing-base-scale-dpdk-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  include:
-    - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Dot1Q-Ip4Base-Ndrpdr.64B-.t.c-dot1q-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4-Ip4Base-Ndrpdr.64B-.t.c-ethip4-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4-Ip4Scale2M-Ndrpdr.64B-.t.c-ethip4-ip4scale2m-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4-Ip4Scale2M-rnd-Ndrpdr.64B-.t.c-ethip4-ip4scale2m-rnd-ndrpdr"
-  layout:
-    title: "3n-hsw-xl710-64b-ip4routing-base-scale-dpdk-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
 - type: "plot"
   title: "Speedup: 3n-skx-x710-64b-ip4routing-base-scale-avf-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/3n-skx-x710-64b-ip4routing-base-scale-avf-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  data: "vpp-3n-skx-curr-iter"
   include:
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Avf-Ethip4-Ip4Base-Ndrpdr.64B-.t.c-avf-ethip4-ip4base-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-.t.c-avf-ethip4-ip4scale2m-ndrpdr"
@@ -8456,7 +8781,7 @@
   title: "Speedup: 3n-skx-xxv710-64b-ip4routing-base-scale-avf-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-ip4routing-base-scale-avf-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  data: "vpp-3n-skx-curr-iter"
   include:
     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Dot1Q-Ip4Base-Ndrpdr.64B-.t.c-avf-dot1q-ip4base-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Ndrpdr.64B-.t.c-avf-eth-ip4base-ndrpdr"
@@ -8471,7 +8796,7 @@
   title: "Speedup: 3n-skx-xxv710-64b-ip4routing-base-scale-dpdk-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-ip4routing-base-scale-dpdk-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  data: "vpp-3n-skx-curr-iter"
   include:
     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Dot1Q-Ip4Base-Ndrpdr.64B-.t.c-dot1q-ip4base-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Base-Ndrpdr.64B-.t.c-ethip4-ip4base-ndrpdr"
@@ -8486,7 +8811,7 @@
   title: "Speedup: 3n-skx-xxv710-64b-features-ip4routing-base-avf-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-features-ip4routing-base-avf-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  data: "vpp-3n-skx-curr-iter"
   include:
     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
@@ -8500,7 +8825,7 @@
   title: "Speedup: 3n-skx-xxv710-64b-features-ip4routing-base-dpdk-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-features-ip4routing-base-dpdk-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  data: "vpp-3n-skx-curr-iter"
   include:
     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Base-Ndrpdr.64B-.t.c-ethip4-ip4base-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
@@ -8512,67 +8837,41 @@
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 3n-hsw-xl710-64b-ip4tunnel-base-dpdk-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-64b-ip4tunnel-base-dpdk-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  include:
-    - "Tests.Vpp.Perf.Ip4 Tunnels.40Ge2P1Xl710-Ethip4Vxlan-L2Xcbase-Ndrpdr.64B-.t.c-ethip4vxlan-l2xcbase-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.40Ge2P1Xl710-Ethip4Vxlan-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
-  layout:
-    title: "3n-hsw-xl710-64b-ip4tunnel-base-dpdk-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: 3n-skx-xxv710-64b-ip4tunnel-base-scale-avf-{test_type}-tsa"
+  title: "Speedup: 3n-skx-xxv710-64b-ip4tunnel-base-[avf,dpdk]-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-ip4tunnel-base-scale-avf-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-ip4tunnel-base-{test_type}-tsa"
+  data: "vpp-3n-skx-curr-iter"
   include:
     - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Xcbase-Ndrpdr.64B-.t.c-avf-ethip4vxlan-l2xcbase-ndrpdr"
     - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-avf-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Avf-Dot1Q--Ethip4Vxlan-L2Bdscale1L2Bd1Vlan1Vxlan-Ndrpdr.64B-.t.c-avf-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Avf-Dot1Q--Ethip4Vxlan-L2Bdscale100L2Bd100Vlan100Vxlan-Ndrpdr.64B-.t.c-avf-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-ndrpdr"
-  layout:
-    title: "3n-skx-xxv710-64b-ip4tunnel-base-scale-avf-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: 3n-skx-xxv710-64b-ip4tunnel-base-scale-dpdk-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-ip4tunnel-base-scale-dpdk-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  include:
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Avf-Ethip4Gtpusw-Ip4Base-Ndrpdr.64B-.t.c-avf-ethip4gtpusw-ip4base-ndrpdr"
     - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Vxlan-L2Xcbase-Ndrpdr.64B-.t.c-ethip4vxlan-l2xcbase-ndrpdr"
     - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Dot1Q--Ethip4Vxlan-L2Bdscale1L2Bd1Vlan1Vxlan-Ndrpdr.64B-.t.c-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Dot1Q--Ethip4Vxlan-L2Bdscale100L2Bd100Vlan100Vxlan-Ndrpdr.64B-.t.c-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Gtpusw-Ip4Base-Ndrpdr.64B-.t.c-ethip4gtpusw-ip4base-ndrpdr"
   layout:
-    title: "3n-skx-xxv710-64b-ip4tunnel-base-scale-dpdk-{test_type}"
+    title: "3n-skx-xxv710-64b-ip4tunnel-base-[avf,dpdk]-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 2n-skx-x710-78b-ip6routing-base-scale-[avf,dpdk]-{test_type}-tsa"
+  title: "Speedup: 2n-skx-x710-78b-ip6routing-base-scale-[avf,dpdk,af_xdp]-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-skx-x710-78b-ip6routing-base-scale-[avf,dpdk]-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-x710-78b-ip6routing-base-scale-[avf,dpdk,af_xdp]-{test_type}-tsa"
+  data: "vpp-2n-skx-curr-iter"
   include:
-    - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Dot1Q-Ip6Base-Ndrpdr.78B-.t.c-avf-dot1q-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-avf-ethip6-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-Ndrpdr.78B-.t.c-avf-ethip6-ip6scale2m-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-rnd-Ndrpdr.78B-.t.c-avf-ethip6-ip6scale2m-rnd-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Dot1Q-Ip6Base-Ndrpdr.78B-.t.c-dot1q-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-ethip6-ip6base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Scale2M-Ndrpdr.78B-.t.c-ethip6-ip6scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-af-xdp-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-af-xdp-ethip6-ip6base-ndrpdr"
   layout:
-    title: "2n-skx-x710-78b-ip6routing-base-scale-[avf,dpdk]-{test_type}"
+    title: "2n-skx-x710-78b-ip6routing-base-scale-[avf,dpdk,af_xdp]-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
   title: "Speedup: 2n-skx-xxv710-78b-ip6routing-base-scale-dpdk-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-78b-ip6routing-base-scale-dpdk-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  data: "vpp-2n-skx-curr-iter"
   include:
     - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Dot1Q-Ip6Base-Ndrpdr.78B-.t.c-dot1q-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-ethip6-ip6base-ndrpdr"
@@ -8590,9 +8889,8 @@
   title: "Speedup: 2n-skx-xxv710-78b-ip6routing-base-scale-avf-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-78b-ip6routing-base-scale-avf-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  data: "vpp-2n-skx-curr-iter"
   include:
-    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-Ip6Base-Ndrpdr.78B-.t.c-avf-dot1q-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-avf-ethip6-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale20K-Ndrpdr.78B-.t.c-avf-ethip6-ip6scale20k-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale20K-rnd-Ndrpdr.78B-.t.c-avf-ethip6-ip6scale20k-rnd-ndrpdr"
@@ -8605,24 +8903,27 @@
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 3n-hsw-xl710-78b-ip6routing-base-scale-dpdk-{test_type}-tsa"
+  title: "Speedup: 2n-skx-xxv710-78b-ip6routing-base-scale-af_xdp-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-78b-ip6routing-base-scale-dpdk-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-78b-ip6routing-base-scale-af_xdp-{test_type}-tsa"
+  data: "vpp-2n-skx-curr-iter"
   include:
-    - "Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Dot1Q-Ip6Base-Ndrpdr.78B-.t.c-dot1q-ip6base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-ethip6-ip6base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Ethip6-Ip6Scale2M-Ndrpdr.78B-.t.c-ethip6-ip6scale2m-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Ethip6-Ip6Scale2M-rnd-Ndrpdr.78B-.t.c-ethip6-ip6scale2m-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-af-xdp-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-af-xdp-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-af-xdp-Ethip6-Ip6Scale20K-Ndrpdr.78B-.t.c-af-xdp-ethip6-ip6scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-af-xdp-Ethip6-Ip6Scale20K-rnd-Ndrpdr.78B-.t.c-af-xdp-ethip6-ip6scale20k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-af-xdp-Ethip6-Ip6Scale200K-Ndrpdr.78B-.t.c-af-xdp-ethip6-ip6scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-af-xdp-Ethip6-Ip6Scale200K-rnd-Ndrpdr.78B-.t.c-af-xdp-ethip6-ip6scale200k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-af-xdp-Ethip6-Ip6Scale2M-Ndrpdr.78B-.t.c-af-xdp-ethip6-ip6scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-af-xdp-Ethip6-Ip6Scale2M-rnd-Ndrpdr.78B-.t.c-af-xdp-ethip6-ip6scale2m-rnd-ndrpdr"
   layout:
-    title: "3n-hsw-xl710-78b-ip6routing-base-scale-dpdk-{test_type}"
+    title: "2n-skx-xxv710-78b-ip6routing-base-scale-af_xdp-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
   title: "Speedup: 3n-skx-x710-78b-ip6routing-base-scale-avf-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/3n-skx-x710-78b-ip6routing-base-scale-avf-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  data: "vpp-3n-skx-curr-iter"
   include:
     - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Avf-Dot1Q-Ip6Base-Ndrpdr.78B-.t.c-avf-dot1q-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Avf-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-avf-ethip6-ip6base-ndrpdr"
@@ -8635,7 +8936,7 @@
   title: "Speedup: 3n-skx-xxv710-78b-ip6routing-base-scale-dpdk-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-78b-ip6routing-base-scale-dpdk-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  data: "vpp-3n-skx-curr-iter"
   include:
     - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Dot1Q-Ip6Base-Ndrpdr.78B-.t.c-dot1q-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-ethip6-ip6base-ndrpdr"
@@ -8650,7 +8951,7 @@
   title: "Speedup: 3n-skx-xxv710-78b-ip6routing-base-scale-avf-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-78b-ip6routing-base-scale-avf-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  data: "vpp-3n-skx-curr-iter"
   include:
     - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Avf-Dot1Q-Ip6Base-Ndrpdr.78B-.t.c-avf-dot1q-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Avf-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-avf-ethip6-ip6base-ndrpdr"
@@ -8661,41 +8962,11 @@
     title: "3n-skx-xxv710-78b-ip6routing-base-scale-avf-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
-- type: "plot"
-  title: "Speedup: 3n-hsw-xl710-imix-ipsec-ip4routing-base-scale-sw-dpdk-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-imix-ipsec-ip4routing-base-scale-sw-dpdk-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  include:
-    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-.t.c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-.t.c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-.t.c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-.t.c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-.t.c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-.t.c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
-  layout:
-    title: "3n-hsw-xl710-imix-ipsec-ip4routing-base-scale-sw-dpdk-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: 3n-hsw-xl710-imix-ipsec-ip4routing-base-scale-hw-dpdk-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-imix-ipsec-ip4routing-base-scale-hw-dpdk-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  include:
-    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1Tnlhw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-.t.c-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1Tnlhw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-.t.c-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlhw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-.t.c-ethip4ipsec1000tnlhw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlhw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-.t.c-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
-  layout:
-    title: "3n-hsw-xl710-imix-ipsec-ip4routing-base-scale-hw-dpdk-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
 - type: "plot"
   title: "Speedup: 3n-skx-xxv710-imix-ipsec-ip4routing-base-scale-avf-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-imix-ipsec-ip4routing-base-scale-avf-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  data: "vpp-3n-skx-curr-iter"
   include:
     - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-.t.c-avf-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
     - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-.t.c-avf-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
@@ -8711,7 +8982,7 @@
   title: "Speedup: 3n-skx-xxv710-imix-ipsec-ip4routing-base-scale-dpdk-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-imix-ipsec-ip4routing-base-scale-dpdk-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  data: "vpp-3n-skx-curr-iter"
   include:
     - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-.t.c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
     - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-.t.c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
@@ -8724,26 +8995,25 @@
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 2n-skx-x710-64b-l2switching-base-scale-[avf,dpdk]-{test_type}-tsa"
+  title: "Speedup: 2n-skx-x710-64b-l2switching-base-scale-[avf,dpdk,af_xdp]-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-skx-x710-64b-l2switching-base-scale-[avf,dpdk]-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-x710-64b-l2switching-base-scale-[avf,dpdk,af_xdp]-{test_type}-tsa"
+  data: "vpp-2n-skx-curr-iter"
   include:
     - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Xcbase-Ndrpdr.64B-.t.c-avf-eth-l2xcbase-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-avf-dot1q-l2bdbasemaclrn-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-avf-eth-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-dot1q-l2bdbasemaclrn-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-.t.c-eth-l2bdscale1mmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-af-xdp-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-af-xdp-eth-l2bdbasemaclrn-ndrpdr"
   layout:
-    title: "2n-skx-x710-64b-l2switching-base-scale-[avf,dpdk]-{test_type}"
+    title: "2n-skx-x710-64b-l2switching-base-scale-[avf,dpdk,af_xdp]-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
   title: "Speedup: 2n-skx-xxv710-64b-l2switching-base-avf-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-l2switching-base-avf-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  data: "vpp-2n-skx-curr-iter"
   include:
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Ndrpdr.64B-.t.c-avf-dot1q-l2xcbase-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-avf-dot1q-l2bdbasemaclrn-ndrpdr"
@@ -8758,7 +9028,7 @@
   title: "Speedup: 2n-skx-xxv710-64b-l2switching-base-dpdk-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-l2switching-base-dpdk-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  data: "vpp-2n-skx-curr-iter"
   include:
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Xcbase-Ndrpdr.64B-.t.c-dot1q-l2xcbase-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-dot1q-l2bdbasemaclrn-ndrpdr"
@@ -8773,7 +9043,7 @@
   title: "Speedup: 2n-skx-xxv710-64b-l2switching-base-scale-avf-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-l2switching-base-scale-avf-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  data: "vpp-2n-skx-curr-iter"
   include:
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-avf-eth-l2bdbasemaclrn-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-.t.c-avf-eth-l2bdscale10kmaclrn-ndrpdr"
@@ -8784,40 +9054,40 @@
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 2n-skx-xxv710-64b-l2switching-base-scale-dpdk-{test_type}-tsa"
+  title: "Speedup: 2n-skx-xxv710-64b-l2switching-base-scale-af_xdp-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-l2switching-base-scale-dpdk-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-l2switching-base-scale-af_xdp-{test_type}-tsa"
+  data: "vpp-2n-skx-curr-iter"
   include:
-    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-.t.c-eth-l2bdscale10kmaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-.t.c-eth-l2bdscale100kmaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-.t.c-eth-l2bdscale1mmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-af-xdp-Eth-L2Patch-Ndrpdr.64B-.t.c-af-xdp-eth-l2patch-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-af-xdp-Eth-L2Xcbase-Ndrpdr.64B-.t.c-af-xdp-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-af-xdp-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-af-xdp-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-af-xdp-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-.t.c-af-xdp-eth-l2bdscale10kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-af-xdp-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-.t.c-af-xdp-eth-l2bdscale100kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-af-xdp-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-.t.c-af-xdp-eth-l2bdscale1mmaclrn-ndrpdr"
   layout:
-    title: "2n-skx-xxv710-64b-l2switching-base-scale-dpdk-{test_type}"
+    title: "2n-skx-xxv710-64b-l2switching-base-scale-af_xdp-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 3n-hsw-xl710-64b-l2switching-base-scale-dpdk-{test_type}-tsa"
+  title: "Speedup: 2n-skx-xxv710-64b-l2switching-base-scale-dpdk-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-64b-l2switching-base-scale-dpdk-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-l2switching-base-scale-dpdk-{test_type}-tsa"
+  data: "vpp-2n-skx-curr-iter"
   include:
-    - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Patch-Ndrpdr.64B-.t.c-eth-l2patch-ndrpdr"
-    - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Dot1Q-L2Xcbase-Ndrpdr.64B-.t.c-dot1q-l2xcbase-ndrpdr"
-    - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Xcbase-Ndrpdr.64B-.t.c-eth-l2xcbase-ndrpdr"
-    - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-dot1q-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-.t.c-eth-l2bdscale1mmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-.t.c-eth-l2bdscale10kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-.t.c-eth-l2bdscale100kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-.t.c-eth-l2bdscale1mmaclrn-ndrpdr"
   layout:
-    title: "3n-hsw-xl710-64b-l2switching-base-scale-dpdk-{test_type}"
+    title: "2n-skx-xxv710-64b-l2switching-base-scale-dpdk-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
   title: "Speedup: 3n-skx-x710-64b-l2switching-base-scale-avf-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/3n-skx-x710-64b-l2switching-base-scale-avf-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  data: "vpp-3n-skx-curr-iter"
   include:
     - "Tests.Vpp.Perf.L2.10Ge2P1X710-Avf-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-avf-dot1q-l2bdbasemaclrn-ndrpdr"
     - "Tests.Vpp.Perf.L2.10Ge2P1X710-Avf-Eth-L2Patch-Ndrpdr.64B-.t.c-avf-eth-l2patch-ndrpdr"
@@ -8829,39 +9099,27 @@
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 3n-skx-xxv710-64b-l2switching-base-avf-{test_type}-tsa"
+  title: "Speedup: 3n-skx-xxv710-64b-l2switching-base-[avf,dpdk]-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-l2switching-base-avf-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-l2switching-base-{test_type}-tsa"
+  data: "vpp-3n-skx-curr-iter"
   include:
     - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Ndrpdr.64B-.t.c-avf-dot1q-l2xcbase-ndrpdr"
     - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-avf-dot1q-l2bdbasemaclrn-ndrpdr"
     - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Patch-Ndrpdr.64B-.t.c-avf-eth-l2patch-ndrpdr"
     - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Ndrpdr.64B-.t.c-avf-eth-l2xcbase-ndrpdr"
     - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-avf-eth-l2bdbasemaclrn-ndrpdr"
-  layout:
-    title: "3n-skx-xxv710-64b-l2switching-base-avf-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: 3n-skx-xxv710-64b-l2switching-base-dpdk-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-l2switching-base-dpdk-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  include:
-    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Dot1Q-L2Xcbase-Ndrpdr.64B-.t.c-dot1q-l2xcbase-ndrpdr"
     - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Xcbase-Ndrpdr.64B-.t.c-eth-l2xcbase-ndrpdr"
-    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-dot1q-l2bdbasemaclrn-ndrpdr"
     - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-ndrpdr"
   layout:
-    title: "3n-skx-xxv710-64b-l2switching-base-dpdk-{test_type}"
+    title: "3n-skx-xxv710-64b-l2switching-base-[avf,dpdk]-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
   title: "Speedup: 3n-skx-xxv710-64b-l2switching-base-scale-avf-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-l2switching-base-scale-avf-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  data: "vpp-3n-skx-curr-iter"
   include:
     - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Patch-Ndrpdr.64B-.t.c-avf-eth-l2patch-ndrpdr"
     - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Ndrpdr.64B-.t.c-avf-eth-l2xcbase-ndrpdr"
@@ -8877,7 +9135,7 @@
   title: "Speedup: 3n-skx-xxv710-64b-l2switching-base-scale-dpdk-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-l2switching-base-scale-dpdk-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  data: "vpp-3n-skx-curr-iter"
   include:
     - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Patch-Ndrpdr.64B-.t.c-eth-l2patch-ndrpdr"
     - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Xcbase-Ndrpdr.64B-.t.c-eth-l2xcbase-ndrpdr"
@@ -8893,7 +9151,7 @@
   title: "Speedup: 3n-skx-xxv710-64b-features-l2switching-base-avf-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-features-l2switching-base-avf-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  data: "vpp-3n-skx-curr-iter"
   include:
     - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-avf-eth-l2bdbasemaclrn-ndrpdr"
     - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Iacl50Sf-10Kflows-Ndrpdr.64B-.t.c-avf-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr"
@@ -8905,27 +9163,11 @@
     title: "3n-skx-xxv710-64b-features-l2switching-base-avf-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
-- type: "plot"
-  title: "Speedup: 3n-hsw-xl710-78b-srv6-ip6routing-base-dpdk-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-78b-srv6-ip6routing-base-dpdk-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  include:
-    - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-Ndrpdr.78B-.t.c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr"
-    - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Ndrpdr.78B-.t.c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr"
-    - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Nodecaps-Ndrpdr.78B-.t.c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr"
-    - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Dyn-Ndrpdr.78B-.t.c-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr"
-    - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Masq-Ndrpdr.78B-.t.c-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr"
-    - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Stat-Ndrpdr.78B-.t.c-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr"
-  layout:
-    title: "3n-hsw-xl710-78b-srv6-ip6routing-base-dpdk-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
 - type: "plot"
   title: "Speedup: 3n-skx-xxv710-78b-srv6-ip6routing-base-avf-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-78b-srv6-ip6routing-base-avf-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  data: "vpp-3n-skx-curr-iter"
   include:
     - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-Ndrpdr.78B-.t.c-avf-ethip6ip6-ip6base-srv6enc1sid-ndrpdr"
     - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Ndrpdr.78B-.t.c-avf-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr"
@@ -8938,128 +9180,38 @@
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 2n-skx-xxv710-64b-vhost-base-avf-{test_type}-tsa"
+  title: "Speedup: 2n-skx-xxv710-64b-vhost-base-[avf,dpdk]-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-vhost-base-avf-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-vhost-base-{test_type}-tsa"
+  data: "vpp-2n-skx-curr-iter"
   include:
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-avf-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
     - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-avf-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
     - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-avf-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr"
-  layout:
-    title: "2n-skx-xxv710-64b-vhost-base-avf-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: 2n-skx-xxv710-64b-vhost-base-avf-vpp-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-vhost-base-avf-vpp-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  include:
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-.t.c-avf-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-.t.c-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-.t.c-avf-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-.t.c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Vppip4-Ndrpdr.64B-.t.c-avf-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr"
-  layout:
-    title: "2n-skx-xxv710-64b-vhost-base-avf-vpp-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: 2n-skx-xxv710-64b-vhost-base-dpdk-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-vhost-base-dpdk-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  include:
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
     - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
     - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr"
   layout:
-    title: "2n-skx-xxv710-64b-vhost-base-dpdk-{test_type}"
+    title: "2n-skx-xxv710-64b-vhost-base-[avf,dpdk]-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 2n-skx-xxv710-64b-vhost-base-dpdk-vpp-{test_type}-tsa"
+  title: "Speedup: 2n-skx-xxv710-64b-vhost-base-[avf,dpdk]-vpp-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-vhost-base-dpdk-vpp-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-vhost-base-vpp-{test_type}-tsa"
+  data: "vpp-2n-skx-curr-iter"
   include:
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-.t.c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-.t.c-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-.t.c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
     - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-.t.c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-.t.c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
     - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Vppip4-Ndrpdr.64B-.t.c-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr"
-  layout:
-    title: "2n-skx-xxv710-64b-vhost-base-dpdk-vpp-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: 3n-hsw-xl710-64b-vhost-base-dpdk-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-64b-vhost-base-dpdk-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  include:
-    - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr"
-  layout:
-    title: "3n-hsw-xl710-64b-vhost-base-dpdk-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: 3n-hsw-xl710-64b-vhost-base-dpdk-vpp-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-64b-vhost-base-dpdk-vpp-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  include:
-    - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-.t.c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr10241Vm-Vppl2Xc-Ndrpdr.64B-.t.c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-.t.c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1V-m-Vppl2Xc-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Vppip4-Ndrpdr.64B-.t.c-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr"
-  layout:
-    title: "3n-hsw-xl710-64b-vhost-base-dpdk-vpp-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: 3n-skx-x710-64b-link-bonding-vhost-base-avf-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-skx-x710-64b-link-bonding-vhost-base-avf-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  include:
-    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Avf-1Lbvpplacp-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-avf-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Avf-1Lbvpplacp-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-avf-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Avf-2Lbvpplacp-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-avf-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Avf-2Lbvpplacp-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-avf-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-  layout:
-    title: "3n-skx-x710-64b-link-bonding-vhost-base-avf-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: 3n-skx-x710-64b-link-bonding-vhost-base-avf-vpp-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-skx-x710-64b-link-bonding-vhost-base-avf-vpp-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  include:
-    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Avf-1Lbvpplacp-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-.t.c-avf-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Avf-1Lbvpplacp-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-.t.c-avf-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Avf-2Lbvpplacp-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-.t.c-avf-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Avf-2Lbvpplacp-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-.t.c-avf-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
   layout:
-    title: "3n-skx-x710-64b-link-bonding-vhost-base-avf-vpp-{test_type}"
+    title: "2n-skx-xxv710-64b-vhost-base-[avf,dpdk]-vpp-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
   title: "Speedup: 3n-skx-xxv710-64b-vhost-base-avf-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-vhost-base-avf-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  data: "vpp-3n-skx-curr-iter"
   include:
     - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-avf-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
     - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
@@ -9075,7 +9227,7 @@
   title: "Speedup: 3n-skx-xxv710-64b-vhost-base-avf-vpp-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-vhost-base-avf-vpp-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  data: "vpp-3n-skx-curr-iter"
   include:
     - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-.t.c-avf-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
     - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-.t.c-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
@@ -9091,7 +9243,7 @@
   title: "Speedup: 3n-skx-xxv710-64b-vhost-base-dpdk-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-vhost-base-dpdk-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  data: "vpp-3n-skx-curr-iter"
   include:
     - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
     - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
@@ -9103,81 +9255,11 @@
     title: "3n-skx-xxv710-64b-vhost-base-dpdk-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
-- type: "plot"
-  title: "Speedup: 3n-skx-xxv710-64b-vhost-base-dpdk-vpp-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-vhost-base-dpdk-vpp-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  include:
-    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-.t.c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-.t.c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-.t.c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Vppip4-Ndrpdr.64B-.t.c-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr"
-  layout:
-    title: "3n-skx-xxv710-64b-vhost-base-dpdk-vpp-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: 3n-skx-xxv710-64b-link-bonding-vhost-base-avf-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-link-bonding-vhost-base-avf-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  include:
-    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-1Lbvpplacp-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-avf-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-1Lbvpplacp-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-avf-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-  layout:
-    title: "3n-skx-xxv710-64b-link-bonding-vhost-base-avf-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: 3n-skx-xxv710-64b-link-bonding-vhost-base-avf-vpp-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-link-bonding-vhost-base-avf-vpp-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  include:
-    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-1Lbvpplacp-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-.t.c-avf-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-1Lbvpplacp-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-.t.c-avf-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-  layout:
-    title: "3n-skx-xxv710-64b-link-bonding-vhost-base-avf-vpp-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: 2n-skx-xxv710-114b-vts-l2switching-base-dpdk-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-114b-vts-l2switching-base-dpdk-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  include:
-    - "Tests.Vpp.Perf.Vts.2N1L-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermit-2Vhostvr1024-1Vm-Ndrpdr.114B-.t.c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vts.2N1L-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermitreflect-2Vhostvr1024-1Vm-Ndrpdr.114B-.t.c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vts.2N1L-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Noacl-2Vhostvr1024-1Vm-Ndrpdr.114B-.t.c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Noacl-2Vhostvr1024-1Vm-Ndrpdr.114B-.t.c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermit-2Vhostvr1024-1Vm-Ndrpdr.114B-.t.c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermitreflect-2Vhostvr1024-1Vm-Ndrpdr.114B-.t.c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr"
-  layout:
-    title: "2n-skx-xxv710-114b-vts-l2switching-base-[avf,dpdk]-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: 3n-tsh-x520-64b-memif-base-ixgbe-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-tsh-x520-64b-memif-base-ixgbe-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-tsh"
-  include:
-    - "Tests.Vpp.Perf.Container Memif.10Ge2P1X520-Eth-L2Xcbase-Eth-2Memif-1Lxc-Ndrpdr.64B-.t.c-eth-l2xcbase-eth-2memif-1lxc-ndrpdr"
-    - "Tests.Vpp.Perf.Container Memif.10Ge2P1X520-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-.t.c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
-    - "Tests.Vpp.Perf.Container Memif.10Ge2P1X520-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-.t.c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
-    - "Tests.Vpp.Perf.Container Memif.10Ge2P1X520-Eth-L2Bdbasemaclrn-Eth-2Memif-1Lxc-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr"
-    - "Tests.Vpp.Perf.Container Memif.10Ge2P1X520-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Ndrpdr.64B-.t.c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
-  layout:
-    title: "3n-tsh-x520-64b-memif-base-ixgbe-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
 - type: "plot"
   title: "Speedup: 3n-tsh-x520-64b-ip4routing-base-scale-ixgbe-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/3n-tsh-x520-64b-ip4routing-base-scale-ixgbe-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-tsh"
+  data: "vpp-3n-tsh-curr-iter"
   include:
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Dot1Q-Ip4Base-Ndrpdr.64B-.t.c-dot1q-ip4base-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4-Ip4Base-Ndrpdr.64B-.t.c-ethip4-ip4base-ndrpdr"
@@ -9192,7 +9274,7 @@
   title: "Speedup: 3n-tsh-x520-64b-features-ip4routing-base-ixgbe-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/3n-tsh-x520-64b-features-ip4routing-base-ixgbe-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-tsh"
+  data: "vpp-3n-tsh-curr-iter"
   include:
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
@@ -9203,24 +9285,22 @@
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 3n-tsh-x520-64b-ip4tunnel-base-scale-ixgbe-{test_type}-tsa"
+  title: "Speedup: 3n-tsh-x520-64b-ip4tunnel-base-ixgbe-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-tsh-x520-64b-ip4tunnel-base-scale-ixgbe-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-tsh"
+  output-file: "{DIR[STATIC,VPP]}/3n-tsh-x520-64b-ip4tunnel-base-ixgbe-{test_type}-tsa"
+  data: "vpp-3n-tsh-curr-iter"
   include:
     - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X520-Ethip4Vxlan-L2Xcbase-Ndrpdr.64B-.t.c-ethip4vxlan-l2xcbase-ndrpdr"
     - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X520-Ethip4Vxlan-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X520-Dot1Q--Ethip4Vxlan-L2Bdscale1L2Bd1Vlan1Vxlan-Ndrpdr.64B-.t.c-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X520-Dot1Q--Ethip4Vxlan-L2Bdscale100L2Bd100Vlan100Vxlan-Ndrpdr.64B-.t.c-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-ndrpdr"
   layout:
-    title: "3n-tsh-x520-64b-ip4tunnel-base-scale-ixgbe-{test_type}"
+    title: "3n-tsh-x520-64b-ip4tunnel-base-ixgbe-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
   title: "Speedup: 3n-tsh-x520-78b-ip6routing-base-scale-ixgbe-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/3n-tsh-x520-78b-ip6routing-base-scale-ixgbe-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-tsh"
+  data: "vpp-3n-tsh-curr-iter"
   include:
     - "Tests.Vpp.Perf.Ip6.10Ge2P1X520-Dot1Q-Ip6Base-Ndrpdr.78B-.t.c-dot1q-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.10Ge2P1X520-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-ethip6-ip6base-ndrpdr"
@@ -9235,7 +9315,7 @@
   title: "Speedup: 3n-tsh-x520-imix-ipsec-ip4routing-base-scale-sw-ixgbe-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/3n-tsh-x520-imix-ipsec-ip4routing-base-scale-sw-ixgbe-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-tsh"
+  data: "vpp-3n-tsh-curr-iter"
   include:
     - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-.t.c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
     - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-.t.c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
@@ -9251,7 +9331,7 @@
   title: "Speedup: 3n-tsh-x520-64b-l2switching-base-ixgbe-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/3n-tsh-x520-64b-l2switching-base-ixgbe-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-tsh"
+  data: "vpp-3n-tsh-curr-iter"
   include:
     - "Tests.Vpp.Perf.L2.10Ge2P1X520-Dot1Q-L2Xcbase-Ndrpdr.64B-.t.c-dot1q-l2xcbase-ndrpdr"
     - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Xcbase-Ndrpdr.64B-.t.c-eth-l2xcbase-ndrpdr"
@@ -9265,7 +9345,7 @@
   title: "Speedup: 3n-tsh-x520-64b-l2switching-base-scale-ixgbe-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/3n-tsh-x520-64b-l2switching-base-scale-ixgbe-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-tsh"
+  data: "vpp-3n-tsh-curr-iter"
   include:
     - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Patch-Ndrpdr.64B-.t.c-eth-l2patch-ndrpdr"
     - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Xcbase-Ndrpdr.64B-.t.c-eth-l2xcbase-ndrpdr"
@@ -9281,7 +9361,7 @@
   title: "Speedup: 3n-tsh-x520-64b-features-l2switching-base-ixgbe-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/3n-tsh-x520-64b-features-l2switching-base-ixgbe-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-tsh"
+  data: "vpp-3n-tsh-curr-iter"
   include:
     - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-ndrpdr"
     - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Iacl50Sf-10Kflows-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr"
@@ -9297,7 +9377,7 @@
   title: "Speedup: 3n-tsh-x520-78b-srv6-ip6routing-base-ixgbe-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/3n-tsh-x520-78b-srv6-ip6routing-base-ixgbe-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-tsh"
+  data: "vpp-3n-tsh-curr-iter"
   include:
     - "Tests.Vpp.Perf.Srv6.10Ge2P1X520-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-Ndrpdr.78B-.t.c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr"
     - "Tests.Vpp.Perf.Srv6.10Ge2P1X520-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Ndrpdr.78B-.t.c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr"
@@ -9313,7 +9393,7 @@
   title: "Speedup: 3n-tsh-x520-64b-vhost-base-ixgbe-vppl2xc-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/3n-tsh-x520-64b-vhost-base-ixgbe-vppl2xc-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-tsh"
+  data: "vpp-3n-tsh-curr-iter"
   include:
     - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-vppl2xc-Ndrpdr.64B-.t.c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
     - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-vppl2xc-Ndrpdr.64B-.t.c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
@@ -9329,7 +9409,7 @@
   title: "Speedup: 3n-tsh-x520-64b-vhost-base-ixgbe-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/3n-tsh-x520-64b-vhost-base-ixgbe-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-tsh"
+  data: "vpp-3n-tsh-curr-iter"
   include:
     - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
     - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
@@ -9345,7 +9425,7 @@
 #  title: "Speedup: 3n-tsh-x520-64b-link-bonding-vhost-base-ixgbe-{test_type}-tsa"
 #  algorithm: "plot_tsa_name"
 #  output-file: "{DIR[STATIC,VPP]}/3n-tsh-x520-64b-link-bonding-vhost-base-ixgbe-{test_type}-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-3n-tsh"
+#  data: "vpp-3n-tsh-curr-iter"
 #  test-type: ["ndr", "pdr"]
 #  include:
 #    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-1Lbvpplacp-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
@@ -9361,55 +9441,39 @@
 - type: "plot"
   title: "Speedup: 2n-dnv-x553-64b-ip4routing-base-scale-ixgbe-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-dnv-x553-64b-ip4routing-base-scale-ixgbe-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-dnv"
+  output-file: "{DIR[STATIC,VPP]}/2n-dnv-x553-64b-ip4routing-base-scale-[ixgbe,af_xdp]-{test_type}-tsa"
+  data: "vpp-2n-dnv-curr-iter"
   include:
-    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Dot1Q-Ip4Base-Ndrpdr.64B-.t.c-dot1q-ip4base-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4-Ip4Base-Ndrpdr.64B-.t.c-ethip4-ip4base-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4-Ip4Scale20K-Ndrpdr.64B-.t.c-ethip4-ip4scale20k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4-Ip4Scale200K-Ndrpdr.64B-.t.c-ethip4-ip4scale200k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4-Ip4Scale2M-Ndrpdr.64B-.t.c-ethip4-ip4scale2m-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4-Ip4Scale20K-rnd-Ndrpdr.64B-.t.c-ethip4-ip4scale20k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-af-xdp-Ethip4-Ip4Base-Ndrpdr.64B-.t.c-af-xdp-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-af-xdp-Ethip4-Ip4Scale20K-Ndrpdr.64B-.t.c-af-xdp-ethip4-ip4scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-af-xdp-Ethip4-Ip4Scale20K-rnd-Ndrpdr.64B-.t.c-af-xdp-ethip4-ip4scale20k-rnd-ndrpdr"
   layout:
     title: "2n-dnv-x553-64b-ip4routing-base-scale-ixgbe-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 2n-dnv-x553-64b-features-ip4routing-base-ixgbe-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-dnv-x553-64b-features-ip4routing-base-ixgbe-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-dnv"
-  include:
-    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4-Ip4Base-Ndrpdr.64B-.t.c-ethip4-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-ethip4udp-nat44det-h1-p1-s1-Ndrpdr.64B-.t.c-ethip4udp-nat44det-h1-p1-s1-ndrpdr"
-  layout:
-    title: "2n-dnv-x553-64b-features-ip4routing-base-ixgbe-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: 2n-dnv-x553-78b-ip6routing-base-scale-ixgbe-{test_type}-tsa"
+  title: "Speedup: 2n-dnv-x553-78b-ip6routing-base-scale-[ixgbe,af_xdp]-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-dnv-x553-78b-ip6routing-base-scale-ixgbe-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-dnv"
+  output-file: "{DIR[STATIC,VPP]}/2n-dnv-x553-78b-ip6routing-base-scale-[ixgbe,af_xdp]-{test_type}-tsa"
+  data: "vpp-2n-dnv-curr-iter"
   include:
-    - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X553-Dot1Q-Ip6Base-Ndrpdr.78B-.t.c-dot1q-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X553-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-ethip6-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X553-Ethip6-Ip6Scale20K-Ndrpdr.78B-.t.c-ethip6-ip6scale20k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X553-Ethip6-Ip6Scale200K-Ndrpdr.78B-.t.c-ethip6-ip6scale200k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X553-Ethip6-Ip6Scale2M-Ndrpdr.78B-.t.c-ethip6-ip6scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X553-af-xdp-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-af-xdp-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X553-af-xdp-Ethip6-Ip6Scale20K-Ndrpdr.78B-.t.c-af-xdp-ethip6-ip6scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X553-af-xdp-Ethip6-Ip6Scale20K-rnd-Ndrpdr.78B-.t.c-af-xdp-ethip6-ip6scale20k-rnd-ndrpdr"
   layout:
-    title: "2n-dnv-x553-78b-ip6routing-base-scale-ixgbe-{test_type}"
+    title: "2n-dnv-x553-78b-ip6routing-base-scale-[ixgbe,af_xdp]-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
   title: "Speedup: 2n-dnv-x553-64b-l2switching-base-ixgbe-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-dnv-x553-64b-l2switching-base-ixgbe-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-dnv"
+  data: "vpp-2n-dnv-curr-iter"
   include:
     - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Dot1Q-L2Xcbase-Ndrpdr.64B-.t.c-dot1q-l2xcbase-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Eth-L2Xcbase-Ndrpdr.64B-.t.c-eth-l2xcbase-ndrpdr"
@@ -9423,23 +9487,35 @@
   title: "Speedup: 2n-dnv-x553-64b-l2switching-base-scale-ixgbe-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-dnv-x553-64b-l2switching-base-scale-ixgbe-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-dnv"
+  data: "vpp-2n-dnv-curr-iter"
   include:
     - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Eth-L2Patch-Ndrpdr.64B-.t.c-eth-l2patch-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Eth-L2Xcbase-Ndrpdr.64B-.t.c-eth-l2xcbase-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-.t.c-eth-l2bdscale10kmaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-.t.c-eth-l2bdscale100kmaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-.t.c-eth-l2bdscale1mmaclrn-ndrpdr"
   layout:
     title: "2n-dnv-x553-64b-l2switching-base-scale-ixgbe-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
+- type: "plot"
+  title: "Speedup: 2n-dnv-x553-64b-l2switching-base-scale-af_xdp-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-dnv-x553-64b-l2switching-base-scale-ixgbe-{test_type}-tsa"
+  data: "vpp-2n-dnv-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-af-xdp-Eth-L2Patch-Ndrpdr.64B-.t.c-af-xdp-eth-l2patch-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-af-xdp-Eth-L2Xcbase-Ndrpdr.64B-.t.c-af-xdp-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-af-xdp-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-af-xdp-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-af-xdp-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-.t.c-af-xdp-eth-l2bdscale10kmaclrn-ndrpdr"
+  layout:
+    title: "2n-dnv-x553-64b-l2switching-base-scale-af_xdp-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
 - type: "plot"
   title: "Speedup: 3n-dnv-x553-64b-ip4routing-base-scale-ixgbe-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/3n-dnv-x553-64b-ip4routing-base-scale-ixgbe-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-dnv"
+  data: "vpp-3n-dnv-curr-iter"
   include:
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Dot1Q-Ip4Base-Ndrpdr.64B-.t.c-dot1q-ip4base-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4-Ip4Base-Ndrpdr.64B-.t.c-ethip4-ip4base-ndrpdr"
@@ -9452,39 +9528,22 @@
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 3n-dnv-x553-64b-features-ip4routing-base-ixgbe-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-dnv-x553-64b-features-ip4routing-base-ixgbe-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-dnv"
-  include:
-    - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4-Ip4Base-Ndrpdr.64B-.t.c-ethip4-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-  layout:
-    title: "3n-dnv-x553-64b-features-ip4routing-base-ixgbe-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: 3n-dnv-x553-64b-ip4tunnel-base-scale-ixgbe-{test_type}-tsa"
+  title: "Speedup: 3n-dnv-x553-64b-ip4tunnel-base-ixgbe-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-dnv-x553-64b-ip4tunnel-base-scale-ixgbe-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-dnv"
+  output-file: "{DIR[STATIC,VPP]}/3n-dnv-x553-64b-ip4tunnel-base-ixgbe-{test_type}-tsa"
+  data: "vpp-3n-dnv-curr-iter"
   include:
     - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X553-Ethip4Vxlan-L2Xcbase-Ndrpdr.64B-.t.c-ethip4vxlan-l2xcbase-ndrpdr"
     - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X553-Ethip4Vxlan-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X553-Dot1Q--Ethip4Vxlan-L2Bdscale1L2Bd1Vlan1Vxlan-Ndrpdr.64B-.t.c-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X553-Dot1Q--Ethip4Vxlan-L2Bdscale100L2Bd100Vlan100Vxlan-Ndrpdr.64B-.t.c-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-ndrpdr"
   layout:
-    title: "3n-dnv-x553-64b-ip4tunnel-base-scale-ixgbe-{test_type}"
+    title: "3n-dnv-x553-64b-ip4tunnel-base-ixgbe-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
   title: "Speedup: 3n-dnv-x553-78b-ip6routing-base-scale-ixgbe-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/3n-dnv-x553-78b-ip6routing-base-scale-ixgbe-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-dnv"
+  data: "vpp-3n-dnv-curr-iter"
   include:
     - "Tests.Vpp.Perf.Ip6.10Ge2P1X553-Dot1Q-Ip6Base-Ndrpdr.78B-.t.c-dot1q-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.10Ge2P1X553-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-ethip6-ip6base-ndrpdr"
@@ -9499,7 +9558,7 @@
   title: "Speedup: 3n-dnv-x553-imix-ipsec-ip4routing-base-scale-sw-ixgbe-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/3n-dnv-x553-imix-ipsec-ip4routing-base-scale-sw-ixgbe-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-dnv"
+  data: "vpp-3n-dnv-curr-iter"
   include:
     - "Tests.Vpp.Perf.Crypto.10Ge2P1X553-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-.t.c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
     - "Tests.Vpp.Perf.Crypto.10Ge2P1X553-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-.t.c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
@@ -9515,7 +9574,7 @@
   title: "Speedup: 3n-dnv-x553-64b-l2switching-base-ixgbe-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/3n-dnv-x553-64b-l2switching-base-ixgbe-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-dnv"
+  data: "vpp-3n-dnv-curr-iter"
   include:
     - "Tests.Vpp.Perf.L2.10Ge2P1X553-Dot1Q-L2Xcbase-Ndrpdr.64B-.t.c-dot1q-l2xcbase-ndrpdr"
     - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Xcbase-Ndrpdr.64B-.t.c-eth-l2xcbase-ndrpdr"
@@ -9529,7 +9588,7 @@
   title: "Speedup: 3n-dnv-x553-64b-l2switching-base-scale-ixgbe-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/3n-dnv-x553-64b-l2switching-base-scale-ixgbe-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-dnv"
+  data: "vpp-3n-dnv-curr-iter"
   include:
     - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Patch-Ndrpdr.64B-.t.c-eth-l2patch-ndrpdr"
     - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Xcbase-Ndrpdr.64B-.t.c-eth-l2xcbase-ndrpdr"
@@ -9545,7 +9604,7 @@
   title: "Speedup: 3n-dnv-x553-64b-features-l2switching-base-ixgbe-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/3n-dnv-x553-64b-features-l2switching-base-ixgbe-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-dnv"
+  data: "vpp-3n-dnv-curr-iter"
   include:
     - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Xcbase-Ndrpdr.64B-.t.c-eth-l2xcbase-ndrpdr"
     - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdbasemaclrn-Iacl50Sf-10Kflows-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr"
@@ -9561,7 +9620,7 @@
 #  title: "Speedup: 3n-dnv-x553-78b-srv6-ip6routing-base-ixgbe-{test_type}-tsa"
 #  algorithm: "plot_tsa_name"
 #  output-file: "{DIR[STATIC,VPP]}/3n-dnv-x553-78b-srv6-ip6routing-base-ixgbe-{test_type}-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-3n-dnv"
+#  data: "vpp-3n-dnv-curr-iter"
 #  test-type: ["ndr", "pdr"]
 #  include:
 #    - "Tests.Vpp.Perf.Srv6.10Ge2P1X553-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-Ndrpdr.78B-.t.c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr"
@@ -9575,9 +9634,8 @@
   title: "Speedup: 2n-tx2-xl710-64b-ip4routing-base-scale-dpdk-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-tx2-xl710-64b-ip4routing-base-scale-dpdk-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-tx2"
+  data: "vpp-2n-tx2-curr-iter"
   include:
-    - "Tests.Vpp.Perf.Ip4.2N1L-40Ge2P1Xl710-Dot1Q-Ip4Base-Ndrpdr.64B-.t.c-dot1q-ip4base-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-40Ge2P1Xl710-Ethip4-Ip4Base-Ndrpdr.64B-.t.c-ethip4-ip4base-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-40Ge2P1Xl710-Ethip4-Ip4Scale20K-Ndrpdr.64B-.t.c-ethip4-ip4scale20k-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-40Ge2P1Xl710-Ethip4-Ip4Scale200K-Ndrpdr.64B-.t.c-ethip4-ip4scale200k-ndrpdr"
@@ -9586,11 +9644,25 @@
     title: "2n-tx2-xl710-64b-ip4routing-base-scale-dpdk-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
+- type: "plot"
+  title: "Speedup: 2n-tx2-xl710-64b-ip4routing-base-scale-af_xdp-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-tx2-xl710-64b-ip4routing-base-scale-af_xdp-{test_type}-tsa"
+  data: "vpp-2n-tx2-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-40Ge2P1Xl710-af-xdp-Ethip4-Ip4Base-Ndrpdr.64B-.t.c-af-xdp-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-40Ge2P1Xl710-af-xdp-Ethip4-Ip4Scale20K-Ndrpdr.64B-.t.c-af-xdp-ethip4-ip4scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-40Ge2P1Xl710-af-xdp-Ethip4-Ip4Scale200K-Ndrpdr.64B-.t.c-af-xdp-ethip4-ip4scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-40Ge2P1Xl710-af-xdp-Ethip4-Ip4Scale2M-Ndrpdr.64B-.t.c-af-xdp-ethip4-ip4scale2m-ndrpdr"
+  layout:
+    title: "2n-tx2-xl710-64b-ip4routing-base-scale-af_xdp-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
 - type: "plot"
   title: "Speedup: 2n-tx2-xl710-64b-features-ip4routing-base-scale-dpdk-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-tx2-xl710-64b-features-ip4routing-base-scale-dpdk-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-tx2"
+  data: "vpp-2n-tx2-curr-iter"
   include:
     - "Tests.Vpp.Perf.Ip4.2N1L-40Ge2P1Xl710-Ethip4-Ip4Base-Iacldstbase-Ndrpdr.64B-.t.c-ethip4-ip4base-iacldstbase-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-40Ge2P1Xl710-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
@@ -9605,9 +9677,8 @@
   title: "Speedup: 2n-tx2-xl710-78b-ip6routing-base-scale-dpdk-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-tx2-xl710-78b-ip6routing-base-scale-dpdk-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-tx2"
+  data: "vpp-2n-tx2-curr-iter"
   include:
-    - "Tests.Vpp.Perf.Ip6.2N1L-40Ge2P1Xl710-Dot1Q-Ip6Base-Ndrpdr.78B-.t.c-dot1q-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-40Ge2P1Xl710-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-ethip6-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-40Ge2P1Xl710-Ethip6-Ip6Scale20K-Ndrpdr.78B-.t.c-ethip6-ip6scale20k-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-40Ge2P1Xl710-Ethip6-Ip6Scale200K-Ndrpdr.78B-.t.c-ethip6-ip6scale200k-ndrpdr"
@@ -9617,11 +9688,25 @@
     title: "2n-tx2-xl710-78b-ip6routing-base-scale-dpdk-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
+- type: "plot"
+  title: "Speedup: 2n-tx2-xl710-78b-ip6routing-base-scale-af_xdp-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-tx2-xl710-78b-ip6routing-base-scale-af_xdp-{test_type}-tsa"
+  data: "vpp-2n-tx2-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.Ip6.2N1L-40Ge2P1Xl710-af-xdp-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-af-xdp-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-40Ge2P1Xl710-af-xdp-Ethip6-Ip6Scale20K-Ndrpdr.78B-.t.c-af-xdp-ethip6-ip6scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-40Ge2P1Xl710-af-xdp-Ethip6-Ip6Scale200K-Ndrpdr.78B-.t.c-af-xdp-ethip6-ip6scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-40Ge2P1Xl710-af-xdp-Ethip6-Ip6Scale2M-Ndrpdr.78B-.t.c-af-xdp-ethip6-ip6scale2m-ndrpdr"
+  layout:
+    title: "2n-tx2-xl710-78b-ip6routing-base-scale-af_xdp-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
 - type: "plot"
   title: "Speedup: 2n-tx2-xl710-64b-l2switching-base-dpdk-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-tx2-xl710-64b-l2switching-base-dpdk-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-tx2"
+  data: "vpp-2n-tx2-curr-iter"
   include:
     - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-Dot1Q-L2Xcbase-Ndrpdr.64B-.t.c-dot1q-l2xcbase-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-dot1q-l2bdbasemaclrn-ndrpdr"
@@ -9636,7 +9721,7 @@
   title: "Speedup: 2n-tx2-xl710-64b-l2switching-scale-dpdk-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-tx2-xl710-64b-l2switching-scale-dpdk-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-tx2"
+  data: "vpp-2n-tx2-curr-iter"
   include:
     - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-.t.c-eth-l2bdscale10kmaclrn-ndrpdr"
@@ -9646,11 +9731,27 @@
     title: "2n-tx2-xl710-64b-l2switching-scale-dpdk-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
+- type: "plot"
+  title: "Speedup: 2n-tx2-xl710-64b-l2switching-scale-af_xdp-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-tx2-xl710-64b-l2switching-scale-af_xdp-{test_type}-tsa"
+  data: "vpp-2n-tx2-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-af-xdp-Eth-L2Patch-Ndrpdr.64B-.t.c-af-xdp-eth-l2patch-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-af-xdp-Eth-L2Xcbase-Ndrpdr.64B-.t.c-af-xdp-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-af-xdp-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-af-xdp-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-af-xdp-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-.t.c-af-xdp-eth-l2bdscale10kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-af-xdp-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-.t.c-af-xdp-eth-l2bdscale100kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-af-xdp-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-.t.c-af-xdp-eth-l2bdscale1mmaclrn-ndrpdr"
+  layout:
+    title: "2n-tx2-xl710-64b-l2switching-scale-af_xdp-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
 - type: "plot"
   title: "Speedup: 2n-tx2-xl710-64b-features-l2switching-base-dpdk-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-tx2-xl710-64b-features-l2switching-base-dpdk-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-tx2"
+  data: "vpp-2n-tx2-curr-iter"
   include:
     - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Iacl50Sf-10Kflows-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr"
@@ -9671,7 +9772,7 @@
   title: "DPDK Throughput: 2n-skx-xxv710-64b-{core}-base-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,DPDK]}/2n-skx-xxv710-64b-{core}-base-{test_type}"
-  data: "plot-dpdk-throughput-latency-2n-skx"
+  data: "dpdk-2n-skx-curr-iter"
   core: ["2t1c", "4t2c"]
   include:
     - "tests.dpdk.perf.2n1l-25ge2p1xxv710-eth-l2xcbase-testpmd-ndrpdr.64b-{core}-eth-l2xcbase-testpmd-ndrpdr"
@@ -9684,7 +9785,7 @@
   title: "DPDK Throughput: 2n-skx-x710-64b-{core}-base-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,DPDK]}/2n-skx-x710-64b-{core}-base-{test_type}"
-  data: "plot-dpdk-throughput-latency-2n-skx"
+  data: "dpdk-2n-skx-curr-iter"
   core: ["2t1c", "4t2c"]
   include:
     - "tests.dpdk.perf.2n1l-10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.64b-{core}-eth-l2xcbase-testpmd-ndrpdr"
@@ -9699,7 +9800,7 @@
   title: "DPDK Throughput: 3n-skx-xxv710-64b-{core}-base-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,DPDK]}/3n-skx-xxv710-64b-{core}-base-{test_type}"
-  data: "plot-dpdk-throughput-latency-3n-skx"
+  data: "dpdk-3n-skx-curr-iter"
   core: ["2t1c", "4t2c"]
   include:
     - "tests.dpdk.perf.25ge2p1xxv710-eth-l2xcbase-testpmd-ndrpdr.64b-{core}-eth-l2xcbase-testpmd-ndrpdr"
@@ -9712,7 +9813,7 @@
   title: "DPDK Throughput: 3n-skx-x710-64b-{core}-base-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,DPDK]}/3n-skx-x710-64b-{core}-base-{test_type}"
-  data: "plot-dpdk-throughput-latency-3n-skx"
+  data: "dpdk-3n-skx-curr-iter"
   core: ["2t1c", "4t2c"]
   include:
     - "tests.dpdk.perf.10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.64b-{core}-eth-l2xcbase-testpmd-ndrpdr"
@@ -9721,34 +9822,6 @@
     title: "3n-skx-x710-64b-{core}-base-{test_type}"
     layout: "plot-throughput"
 
-# 3n-hsw
-
-- type: "plot"
-  title: "DPDK Throughput: 3n-hsw-xl710-64b-{core}-base-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,DPDK]}/3n-hsw-xl710-64b-{core}-base-{test_type}"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  core: ["1t1c", "2t2c"]
-  include:
-    - "tests.dpdk.perf.40ge2p1xl710-eth-l2xcbase-testpmd-ndrpdr.64b-{core}-eth-l2xcbase-testpmd-ndrpdr"
-    - "tests.dpdk.perf.40ge2p1xl710-ethip4-ip4base-l3fwd-ndrpdr.64b-{core}-ethip4-ip4base-l3fwd-ndrpdr"
-  layout:
-    title: "3n-hsw-xl710-64b-{core}-base-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "DPDK Throughput: 3n-hsw-x710-64b-{core}-base-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,DPDK]}/3n-hsw-x710-64b-{core}-base-{test_type}"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  core: ["1t1c", "2t2c"]
-  include:
-    - "tests.dpdk.perf.10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.64b-{core}-eth-l2xcbase-testpmd-ndrpdr"
-    - "tests.dpdk.perf.10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.64b-{core}-ethip4-ip4base-l3fwd-ndrpdr"
-  layout:
-    title: "3n-hsw-x710-64b-{core}-base-{test_type}"
-    layout: "plot-throughput"
-
 ## 2n-dnv-x553
 #
 #- type: "plot"
@@ -9787,7 +9860,7 @@
   title: "DPDK Throughput: 3n-tsh-x520-64b-{core}-base-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,DPDK]}/3n-tsh-x520-64b-{core}-base-{test_type}"
-  data: "plot-dpdk-throughput-latency-3n-tsh"
+  data: "dpdk-3n-tsh-curr-iter"
   core: ["1t1c", "2t2c"]
   include:
     - "tests.dpdk.perf.10ge2p1x520-eth-l2xcbase-testpmd-ndrpdr.64b-{core}-eth-l2xcbase-testpmd-ndrpdr"
@@ -9802,7 +9875,7 @@
   title: "DPDK Throughput: 2n-tx2-xl710-64b-{core}-base-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,DPDK]}/2n-tx2-xl710-64b-{core}-base-{test_type}"
-  data: "plot-dpdk-throughput-latency-2n-tx2"
+  data: "dpdk-2n-tx2-curr-iter"
   core: ["1t1c", "2t2c"]
   include:
     - "tests.dpdk.perf.2N1L-40ge2p1xl710-eth-l2xcbase-testpmd-ndrpdr.64b-{core}-eth-l2xcbase-testpmd-ndrpdr"
@@ -9821,7 +9894,7 @@
   title: "Throughput: 2n-clx-xxv710-64b-{core}-memif-base-avf-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-{core}-memif-base-avf-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  data: "vpp-2n-clx-curr-iter"
   core: ["2t1c", ]
   include:
     - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-{core}-avf-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
@@ -9836,7 +9909,7 @@
   title: "Throughput: 2n-clx-xxv710-64b-{core}-memif-base-dpdk-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-{core}-memif-base-dpdk-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  data: "vpp-2n-clx-curr-iter"
   core: ["2t1c", ]
   include:
     - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-{core}-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
@@ -9851,7 +9924,7 @@
   title: "Throughput: 2n-clx-cx556a-64b-{core}-rdma-l2-eth-2memif-1dcr-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-clx-cx556a-64b-{core}-rdma-l2-eth-2memif-1dcr-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  data: "vpp-2n-clx-curr-iter"
   core: ["2t1c", ]
   include:
     - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-{core}-rdma-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
@@ -9863,27 +9936,26 @@
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 2n-clx-x710-64b-{core}-ip4routing-base-scale-[avf,dpdk]-{test_type}"
+  title: "Throughput: 2n-clx-x710-64b-{core}-ip4routing-base-scale-[avf,dpdk,af_xdp]-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-x710-64b-{core}-ip4routing-base-scale-[avf,dpdk]-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-x710-64b-{core}-ip4routing-base-scale-[avf,dpdk,af_xdp]-{test_type}"
+  data: "vpp-2n-clx-curr-iter"
   core: ["2t1c", ]
   include:
-    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Dot1Q-Ip4Base-Ndrpdr.64B-{core}-avf-dot1q-ip4base-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Base-Ndrpdr.64B-{core}-avf-ethip4-ip4base-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-{core}-avf-ethip4-ip4scale2m-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-Rnd-Ndrpdr.64B-{core}-avf-ethip4-ip4scale2m-rnd-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Dot1Q-Ip4Base-Ndrpdr.64B-{core}-dot1q-ip4base-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Base-Ndrpdr.64B-{core}-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-af-xdp-Ethip4-Ip4Base-Ndrpdr.64B-{core}-af-xdp-ethip4-ip4base-ndrpdr"
   layout:
-    title: "2n-clx-x710-64b-{core}-ip4routing-base-scale-[avf,dpdk]-{test_type}"
+    title: "2n-clx-x710-64b-{core}-ip4routing-base-scale-[avf,dpdk,af_xdp]-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
   title: "Throughput: 2n-clx-xxv710-64b-{core}-ip4routing-base-scale-avf-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-{core}-ip4routing-base-scale-avf-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  data: "vpp-2n-clx-curr-iter"
   core: ["2t1c", ]
   include:
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Ndrpdr.64B-{core}-avf-ethip4-ip4base-ndrpdr"
@@ -9897,11 +9969,29 @@
     title: "2n-clx-xxv710-64b-{core}-ip4routing-base-scale-avf-{test_type}"
     layout: "plot-throughput"
 
+- type: "plot"
+  title: "Throughput: 2n-clx-xxv710-64b-{core}-ip4routing-base-scale-af_xdp-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-{core}-ip4routing-base-scale-af_xdp-{test_type}"
+  data: "vpp-2n-clx-curr-iter"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-af-xdp-Ethip4-Ip4Base-Ndrpdr.64B-{core}-af-xdp-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-af-xdp-Ethip4-Ip4Scale20K-Ndrpdr.64B-{core}-af-xdp-ethip4-ip4scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-af-xdp-Ethip4-Ip4Scale20K-Rnd-Ndrpdr.64B-{core}-af-xdp-ethip4-ip4scale20k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-af-xdp-Ethip4-Ip4Scale200K-Ndrpdr.64B-{core}-af-xdp-ethip4-ip4scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-af-xdp-Ethip4-Ip4Scale200K-Rnd-Ndrpdr.64B-{core}-af-xdp-ethip4-ip4scale200k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-af-xdp-Ethip4-Ip4Scale2M-Ndrpdr.64B-{core}-af-xdp-ethip4-ip4scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-af-xdp-Ethip4-Ip4Scale2M-Rnd-Ndrpdr.64B-{core}-af-xdp-ethip4-ip4scale2m-rnd-ndrpdr"
+  layout:
+    title: "2n-clx-xxv710-64b-{core}-ip4routing-base-scale-af_xdp-{test_type}"
+    layout: "plot-throughput"
+
 - type: "plot"
   title: "Throughput: 2n-clx-xxv710-64b-{core}-ip4routing-base-scale-dpdk-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-{core}-ip4routing-base-scale-dpdk-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  data: "vpp-2n-clx-curr-iter"
   core: ["2t1c", ]
   include:
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Dot1Q-Ip4Base-Ndrpdr.64B-{core}-dot1q-ip4base-ndrpdr"
@@ -9920,7 +10010,7 @@
   title: "Throughput: 2n-clx-xxv710-64b-{core}-features-ip4routing-base-avf-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-{core}-features-ip4routing-base-avf-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  data: "vpp-2n-clx-curr-iter"
   core: ["2t1c", ]
   include:
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-{core}-avf-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
@@ -9937,7 +10027,7 @@
   title: "Throughput: 2n-clx-xxv710-64b-{core}-nat44det-ip4routing-stl-bidir-avf-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-{core}-nat44det-ip4routing-stl-bidir-avf-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  data: "vpp-2n-clx-curr-iter"
   core: ["2t1c", ]
   include:
     - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr.64b-{core}-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr"
@@ -9953,7 +10043,7 @@
   title: "Throughput: 2n-clx-xxv710-64b-{core}-nat44ed-ip4routing-stl-unidir-avf-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-{core}-nat44ed-ip4routing-stl-unidir-avf-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  data: "vpp-2n-clx-curr-iter"
   core: ["2t1c", ]
   include:
     - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-ndrpdr.64b-{core}-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-ndrpdr"
@@ -9969,7 +10059,7 @@
   title: "Throughput: 2n-clx-xxv710-64b-{core}-nat44ed-ip4routing-udp-stf-cps-avf-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-{core}-nat44ed-ip4routing-udp-stf-cps-avf-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  data: "vpp-2n-clx-curr-iter"
   core: ["2t1c", ]
   include:
     - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-ndrpdr.64b-{core}-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-ndrpdr"
@@ -9986,32 +10076,11 @@
     title: "2n-clx-xxv710-64b-{core}-nat44ed-ip4routing-udp-stf-cps-avf-{test_type}"
     layout: "plot-cps"
 
-- type: "plot"
-  title: "Throughput: 2n-clx-xxv710-64b-{core}-nat44ed-ip4routing-udp-stf-pps-avf-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-{core}-nat44ed-ip4routing-udp-stf-pps-avf-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-clx"
-  core: ["2t1c", ]
-  include:
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-ndrpdr.64b-{core}-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h1024-p63-s64512-pps-ndrpdr.64b-{core}-avf-ethip4udp-ip4base-h1024-p63-s64512-pps-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-pps-ndrpdr.64b-{core}-avf-ethip4udp-nat44ed-h4096-p63-s258048-pps-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h4096-p63-s258048-pps-ndrpdr.64b-{core}-avf-ethip4udp-ip4base-h4096-p63-s258048-pps-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-pps-ndrpdr.64b-{core}-avf-ethip4udp-nat44ed-h16384-p63-s1032192-pps-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h16384-p63-s1032192-pps-ndrpdr.64b-{core}-avf-ethip4udp-ip4base-h16384-p63-s1032192-pps-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-pps-ndrpdr.64b-{core}-avf-ethip4udp-nat44ed-h65536-p63-s4128768-pps-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h65536-p63-s4128768-pps-ndrpdr.64b-{core}-avf-ethip4udp-ip4base-h65536-p63-s4128768-pps-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-pps-ndrpdr.64b-{core}-avf-ethip4udp-nat44ed-h262144-p63-s16515072-pps-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h262144-p63-s16515072-pps-ndrpdr.64b-{core}-avf-ethip4udp-ip4base-h262144-p63-s16515072-pps-ndrpdr"
-  layout:
-    title: "2n-clx-xxv710-64b-{core}-nat44ed-ip4routing-udp-stf-pps-avf-{test_type}"
-    layout: "plot-throughput"
-
 - type: "plot"
   title: "Throughput: 2n-clx-xxv710-64b-{core}-nat44ed-ip4routing-tcp-stf-cps-avf-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-{core}-nat44ed-ip4routing-tcp-stf-cps-avf-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  data: "vpp-2n-clx-curr-iter"
   core: ["2t1c", ]
   include:
     - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-ndrpdr.64b-{core}-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-ndrpdr"
@@ -10028,32 +10097,11 @@
     title: "2n-clx-xxv710-64b-{core}-nat44ed-ip4routing-tcp-stf-cps-avf-{test_type}"
     layout: "plot-cps"
 
-- type: "plot"
-  title: "Throughput: 2n-clx-xxv710-64b-{core}-nat44ed-ip4routing-tcp-stf-pps-avf-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-{core}-nat44ed-ip4routing-tcp-stf-pps-avf-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-clx"
-  core: ["2t1c", ]
-  include:
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-ndrpdr.64b-{core}-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h1024-p63-s64512-pps-ndrpdr.64b-{core}-avf-ethip4tcp-ip4base-h1024-p63-s64512-pps-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h4096-p63-s258048-pps-ndrpdr.64b-{core}-avf-ethip4tcp-nat44ed-h4096-p63-s258048-pps-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h4096-p63-s258048-pps-ndrpdr.64b-{core}-avf-ethip4tcp-ip4base-h4096-p63-s258048-pps-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-ndrpdr.64b-{core}-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h16384-p63-s1032192-pps-ndrpdr.64b-{core}-avf-ethip4tcp-ip4base-h16384-p63-s1032192-pps-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-ndrpdr.64b-{core}-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h65536-p63-s4128768-pps-ndrpdr.64b-{core}-avf-ethip4tcp-ip4base-h65536-p63-s4128768-pps-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-ndrpdr.64b-{core}-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h262144-p63-s16515072-pps-ndrpdr.64b-{core}-avf-ethip4tcp-ip4base-h262144-p63-s16515072-pps-ndrpdr"
-  layout:
-    title: "2n-clx-xxv710-64b-{core}-nat44ed-ip4routing-tcp-stf-pps-avf-{test_type}"
-    layout: "plot-throughput"
-
 - type: "plot"
   title: "Throughput: 2n-clx-xxv710-64b-{core}-nat44ed-ip4routing-tcp-tput-avf-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-{core}-nat44ed-ip4routing-tcp-tput-avf-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  data: "vpp-2n-clx-curr-iter"
   core: ["2t1c", ]
   include:
     - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-ndrpdr.64b-{core}-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-ndrpdr"
@@ -10074,7 +10122,7 @@
   title: "Throughput: 2n-clx-xxv710-64b-{core}-nat44ed-ip4routing-udp-tput-avf-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-{core}-nat44ed-ip4routing-udp-tput-avf-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  data: "vpp-2n-clx-curr-iter"
   core: ["2t1c", ]
   include:
     - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-ndrpdr.64b-{core}-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-ndrpdr"
@@ -10095,7 +10143,7 @@
   title: "Throughput: 2n-clx-xxv710-64b-{core}-nat44ed-ip4routing-tcp-tput2-avf-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-{core}-nat44ed-ip4routing-tcp-tput2-avf-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  data: "vpp-2n-clx-curr-iter"
   core: ["2t1c", ]
   include:
     - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h1024-p63-s64512-pps-ndrpdr.64b-{core}-avf-ethip4tcp-ip4base-h1024-p63-s64512-pps-ndrpdr"
@@ -10116,7 +10164,7 @@
   title: "Throughput: 2n-clx-xxv710-64b-{core}-nat44ed-ip4routing-udp-tput2-avf-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-{core}-nat44ed-ip4routing-udp-tput2-avf-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  data: "vpp-2n-clx-curr-iter"
   core: ["2t1c", ]
   include:
     - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h1024-p63-s64512-pps-ndrpdr.64b-{core}-avf-ethip4udp-ip4base-h1024-p63-s64512-pps-ndrpdr"
@@ -10133,28 +10181,11 @@
     title: "2n-clx-xxv710-64b-{core}-nat44ed-ip4routing-udp-tput-avf-{test_type}"
     layout: "plot-throughput"
 
-- type: "plot"
-  title: "Throughput: 2n-clx-xxv710-64b-{core}-features-ip4routing-base-dpdk-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-{core}-features-ip4routing-base-dpdk-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-clx"
-  core: ["2t1c", ]
-  include:
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Ndrpdr.64B-{core}-ethip4-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-{core}-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-{core}-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-{core}-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-{core}-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-ethip4udp-nat44det-h1-p1-s1-Ndrpdr.64B-{core}-ethip4udp-nat44det-h1-p1-s1-ndrpdr"
-  layout:
-    title: "2n-clx-xxv710-64b-{core}-features-ip4routing-base-dpdk-{test_type}"
-    layout: "plot-throughput"
-
 - type: "plot"
   title: "Throughput: 2n-clx-cx556a-64b-{core}-rdma-ip4base-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-clx-cx556a-64b-{core}-rdma-ip4base-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  data: "vpp-2n-clx-curr-iter"
   core: ["2t1c", ]
   include:
     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-Ip4Base-Ndrpdr.64B-{core}-rdma-dot1q-ip4base-ndrpdr"
@@ -10173,7 +10204,7 @@
   title: "Throughput: 2n-clx-cx556a-64b-{core}-rdma-ethip4-features-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-clx-cx556a-64b-{core}-rdma-ethip4-features-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  data: "vpp-2n-clx-curr-iter"
   core: ["2t1c", ]
   include:
     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-{core}-rdma-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
@@ -10190,7 +10221,7 @@
   title: "Throughput: 2n-clx-xxv710-64b-{core}-ethip4--ethip4udpgeneve-avf-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-{core}-ethip4--ethip4udpgeneve-avf-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  data: "vpp-2n-clx-curr-iter"
   core: ["2t1c", ]
   include:
     - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-1Tun-Ip4Base-Ndrpdr.64B-{core}-avf-ethip4--ethip4udpgeneve-1tun-ip4base-ndrpdr"
@@ -10203,31 +10234,29 @@
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 2n-clx-x710-78b-{core}-ip6routing-base-scale-[avf,dpdk]-{test_type}"
+  title: "Throughput: 2n-clx-x710-78b-{core}-ip6routing-base-scale-[avf,dpdk,af_xdp]-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-x710-78b-{core}-ip6routing-base-scale-[avf,dpdk]-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-x710-78b-{core}-ip6routing-base-scale-[avf,dpdk,af_xdp]-{test_type}"
+  data: "vpp-2n-clx-curr-iter"
   core: ["2t1c", ]
   include:
-    - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Dot1Q-Ip6Base-Ndrpdr.78B-{core}-avf-dot1q-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Base-Ndrpdr.78B-{core}-avf-ethip6-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-Ndrpdr.78B-{core}-avf-ethip6-ip6scale2m-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-rnd-Ndrpdr.78B-{core}-avf-ethip6-ip6scale2m-rnd-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Dot1Q-Ip6Base-Ndrpdr.78B-{core}-dot1q-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Base-Ndrpdr.78B-{core}-ethip6-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Scale2M-Ndrpdr.78B-{core}-ethip6-ip6scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-af-xdp-Ethip6-Ip6Base-Ndrpdr.78B-{core}-af-xdp-ethip6-ip6base-ndrpdr"
   layout:
-    title: "2n-clx-x710-78b-{core}-ip6routing-base-scale-[avf,dpdk]-{test_type}"
+    title: "2n-clx-x710-78b-{core}-ip6routing-base-scale-[avf,dpdk,af_xdp]-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
   title: "Throughput: 2n-clx-xxv710-78b-{core}-ip6routing-base-scale-avf-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-78b-{core}-ip6routing-base-scale-avf-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  data: "vpp-2n-clx-curr-iter"
   core: ["2t1c", ]
   include:
-    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-Ip6Base-Ndrpdr.78B-{core}-avf-dot1q-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Base-Ndrpdr.78B-{core}-avf-ethip6-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale20K-Ndrpdr.78B-{core}-avf-ethip6-ip6scale20k-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale20K-rnd-Ndrpdr.78B-{core}-avf-ethip6-ip6scale20k-rnd-ndrpdr"
@@ -10239,11 +10268,29 @@
     title: "2n-clx-xxv710-78b-{core}-ip6routing-base-scale-avf-{test_type}"
     layout: "plot-throughput"
 
+- type: "plot"
+  title: "Throughput: 2n-clx-xxv710-78b-{core}-ip6routing-base-scale-af_xdp-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-78b-{core}-ip6routing-base-scale-af_xdp-{test_type}"
+  data: "vpp-2n-clx-curr-iter"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-af-xdp-Ethip6-Ip6Base-Ndrpdr.78B-{core}-af-xdp-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-af-xdp-Ethip6-Ip6Scale20K-Ndrpdr.78B-{core}-af-xdp-ethip6-ip6scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-af-xdp-Ethip6-Ip6Scale20K-rnd-Ndrpdr.78B-{core}-af-xdp-ethip6-ip6scale20k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-af-xdp-Ethip6-Ip6Scale200K-Ndrpdr.78B-{core}-af-xdp-ethip6-ip6scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-af-xdp-Ethip6-Ip6Scale200K-rnd-Ndrpdr.78B-{core}-af-xdp-ethip6-ip6scale200k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-af-xdp-Ethip6-Ip6Scale2M-Ndrpdr.78B-{core}-af-xdp-ethip6-ip6scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-af-xdp-Ethip6-Ip6Scale2M-rnd-Ndrpdr.78B-{core}-af-xdp-ethip6-ip6scale2m-rnd-ndrpdr"
+  layout:
+    title: "2n-clx-xxv710-78b-{core}-ip6routing-base-scale-af_xdp-{test_type}"
+    layout: "plot-throughput"
+
 - type: "plot"
   title: "Throughput: 2n-clx-xxv710-78b-{core}-ip6routing-base-scale-dpdk-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-78b-{core}-ip6routing-base-scale-dpdk-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  data: "vpp-2n-clx-curr-iter"
   core: ["2t1c", ]
   include:
     - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Dot1Q-Ip6Base-Ndrpdr.78B-{core}-dot1q-ip6base-ndrpdr"
@@ -10262,7 +10309,7 @@
   title: "Throughput: 2n-clx-cx556a-78b-{core}-rdma-ip6routing-base-scale-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-clx-cx556a-78b-{core}-rdma-ip6routing-base-scale-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  data: "vpp-2n-clx-curr-iter"
   core: ["2t1c", ]
   include:
     - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-Ip6Base-Ndrpdr.78B-{core}-rdma-dot1q-ip6base-ndrpdr"
@@ -10278,42 +10325,24 @@
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 2n-clx-x710-64b-{core}-l2switching-base-scale-avf-{test_type}"
+  title: "Throughput: 2n-clx-x710-64b-{core}-l2switching-base-scale-[avf,af_xdp]-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-x710-64b-{core}-l2switching-base-scale-avf-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-x710-64b-{core}-l2switching-base-scale-[avf,af_xdp]-{test_type}"
+  data: "vpp-2n-clx-curr-iter"
   core: ["2t1c", ]
   include:
-    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-{core}-avf-dot1q-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Patch-Ndrpdr.64B-{core}-avf-eth-l2patch-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Xcbase-Ndrpdr.64B-{core}-avf-eth-l2xcbase-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-{core}-avf-eth-l2bdscale1mmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-af-xdp-Eth-L2Bdbasemaclrn-Ndrpdr.64B-{core}-af-xdp-eth-l2bdbasemaclrn-ndrpdr"
   layout:
-    title: "2n-clx-x710-64b-{core}-l2switching-base-scale-avf-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Throughput: 2n-clx-x710-64b-{core}-l2switching-base-scale-dpdk-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-x710-64b-{core}-l2switching-base-scale-dpdk-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-clx"
-  core: ["2t1c", ]
-  include:
-    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-{core}-dot1q-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Patch-Ndrpdr.64B-{core}-eth-l2patch-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Xcbase-Ndrpdr.64B-{core}-eth-l2xcbase-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-{core}-eth-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-{core}-eth-l2bdscale1mmaclrn-ndrpdr"
-  layout:
-    title: "2n-clx-x710-64b-{core}-l2switching-base-scale-dpdk-{test_type}"
+    title: "2n-clx-x710-64b-{core}-l2switching-base-scale-[avf,af_xdp]-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
   title: "Throughput: 2n-clx-xxv710-64b-{core}-l2switching-base-avf-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-{core}-l2switching-base-avf-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  data: "vpp-2n-clx-curr-iter"
   core: ["2t1c", ]
   include:
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Ndrpdr.64B-{core}-avf-dot1q-l2xcbase-ndrpdr"
@@ -10329,7 +10358,7 @@
   title: "Throughput: 2n-clx-xxv710-64b-{core}-l2switching-base-scale-avf-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-{core}-l2switching-base-scale-avf-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  data: "vpp-2n-clx-curr-iter"
   core: ["2t1c", ]
   include:
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-ndrpdr"
@@ -10340,11 +10369,28 @@
     title: "2n-clx-xxv710-64b-{core}-l2switching-base-scale-avf-{test_type}"
     layout: "plot-throughput"
 
+- type: "plot"
+  title: "Throughput: 2n-clx-xxv710-64b-{core}-l2switching-base-scale-af_xdp-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-{core}-l2switching-base-scale-af_xdp-{test_type}"
+  data: "vpp-2n-clx-curr-iter"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-af-xdp-Eth-L2Patch-Ndrpdr.64B-{core}-af-xdp-eth-l2patch-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-af-xdp-Eth-L2Xcbase-Ndrpdr.64B-{core}-af-xdp-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-af-xdp-Eth-L2Bdbasemaclrn-Ndrpdr.64B-{core}-af-xdp-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-af-xdp-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-{core}-af-xdp-eth-l2bdscale10kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-af-xdp-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-{core}-af-xdp-eth-l2bdscale100kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-af-xdp-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-{core}-af-xdp-eth-l2bdscale1mmaclrn-ndrpdr"
+  layout:
+    title: "2n-clx-xxv710-64b-{core}-l2switching-base-scale-af_xdp-{test_type}"
+    layout: "plot-throughput"
+
 - type: "plot"
   title: "Throughput: 2n-clx-xxv710-64b-{core}-l2switching-base-dpdk-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-{core}-l2switching-base-dpdk-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  data: "vpp-2n-clx-curr-iter"
   core: ["2t1c", ]
   include:
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Xcbase-Ndrpdr.64B-{core}-dot1q-l2xcbase-ndrpdr"
@@ -10360,7 +10406,7 @@
   title: "Throughput: 2n-clx-xxv710-64b-{core}-l2switching-base-scale-dpdk-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-{core}-l2switching-base-scale-dpdk-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  data: "vpp-2n-clx-curr-iter"
   core: ["2t1c", ]
   include:
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-{core}-eth-l2bdbasemaclrn-ndrpdr"
@@ -10375,7 +10421,7 @@
   title: "Throughput: 2n-clx-cx556a-64b-{core}-rdma-l2switching-base-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-clx-cx556a-64b-{core}-rdma-l2switching-base-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  data: "vpp-2n-clx-curr-iter"
   core: ["2t1c", ]
   include:
     - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Xcbase-Ndrpdr.64B-{core}-rdma-dot1q-l2xcbase-ndrpdr"
@@ -10391,7 +10437,7 @@
   title: "Throughput: 2n-clx-cx556a-64b-{core}-rdma-l2switching-scale-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-clx-cx556a-64b-{core}-rdma-l2switching-scale-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  data: "vpp-2n-clx-curr-iter"
   core: ["2t1c", ]
   include:
     - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdbasemaclrn-Ndrpdr.64B-{core}-rdma-eth-l2bdbasemaclrn-ndrpdr"
@@ -10403,114 +10449,48 @@
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 2n-clx-xxv710-64b-{core}-vhost-base-avf-{test_type}"
+  title: "Throughput: 2n-clx-xxv710-64b-{core}-vhost-base-[avf,dpdk]-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-{core}-vhost-base-avf-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-{core}-vhost-base-{test_type}"
+  data: "vpp-2n-clx-curr-iter"
   core: ["2t1c", ]
   include:
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-avf-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-avf-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
     - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
     - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-avf-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr"
-  layout:
-    title: "2n-clx-xxv710-64b-{core}-vhost-base-avf-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Throughput: 2n-clx-xxv710-64b-{core}-vhost-base-avf-vpp-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-{core}-vhost-base-avf-vpp-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-clx"
-  core: ["2t1c", ]
-  include:
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-avf-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-avf-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Vppip4-Ndrpdr.64B-{core}-avf-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr"
-  layout:
-    title: "2n-clx-xxv710-64b-{core}-vhost-base-avf-vpp-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Throughput: 2n-clx-xxv710-64b-{core}-vhost-base-dpdk-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-{core}-vhost-base-dpdk-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-clx"
-  core: ["2t1c", ]
-  include:
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
     - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
     - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr"
   layout:
-    title: "2n-clx-xxv710-64b-{core}-vhost-base-dpdk-{test_type}"
+    title: "2n-clx-xxv710-64b-{core}-vhost-base-[avf,dpdk]-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 2n-clx-xxv710-64b-{core}-vhost-base-dpdk-vpp-{test_type}"
+  title: "Throughput: 2n-clx-xxv710-64b-{core}-vhost-base-[avf,dpdk]-vpp-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-{core}-vhost-base-dpdk-vpp-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-{core}-vhost-base-vpp-{test_type}"
+  data: "vpp-2n-clx-curr-iter"
   core: ["2t1c", ]
   include:
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
     - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
     - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Vppip4-Ndrpdr.64B-{core}-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr"
   layout:
-    title: "2n-clx-xxv710-64b-{core}-vhost-base-dpdk-vpp-{test_type}"
+    title: "2n-clx-xxv710-64b-{core}-vhost-base-[avf,dpdk]-vpp-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
   title: "Throughput: 2n-clx-cx556a-64b-{core}-rdma-l2-vhost-base-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-clx-cx556a-64b-{core}-rdma-l2-vhost-base-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  data: "vpp-2n-clx-curr-iter"
   core: ["2t1c", ]
   include:
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-rdma-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-rdma-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
     - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-rdma-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
     - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-rdma-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-  layout:
-    title: "2n-clx-cx556a-64b-{core}-rdma-l2-vhost-base-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Throughput: 2n-clx-cx556a-64b-{core}-rdma-l2-vhost-vppl2xc-base-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-cx556a-64b-{core}-rdma-l2-vhost-vppl2xc-base-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-clx"
-  core: ["2t1c", ]
-  include:
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-rdma-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-rdma-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
     - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-rdma-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
     - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-rdma-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
   layout:
-    title: "2n-clx-cx556a-64b-{core}-rdma-l2-vhost-vppl2xc-base-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Throughput: 2n-clx-xxv710-114b-{core}-vts-l2switching-base-dpdk-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-114b-{core}-vts-l2switching-base-dpdk-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-clx"
-  core: ["2t1c", ]
-  include:
-    - "Tests.Vpp.Perf.Vts.2N1L-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermit-2Vhostvr1024-1Vm-Ndrpdr.114B-{core}-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vts.2N1L-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermitreflect-2Vhostvr1024-1Vm-Ndrpdr.114B-{core}-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vts.2N1L-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Noacl-2Vhostvr1024-1Vm-Ndrpdr.114B-{core}-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Noacl-2Vhostvr1024-1Vm-Ndrpdr.114B-{core}-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermit-2Vhostvr1024-1Vm-Ndrpdr.114B-{core}-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermitreflect-2Vhostvr1024-1Vm-Ndrpdr.114B-{core}-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr"
-  layout:
-    title: "2n-clx-xxv710-114b-{core}-vts-l2switching-base-[avf,dpdk]-{test_type}"
+    title: "2n-clx-cx556a-64b-{core}-rdma-l2-vhost-base-{test_type}"
     layout: "plot-throughput"
 
 ################################################################################
@@ -10521,7 +10501,7 @@
   title: "Speedup: 2n-clx-xxv710-64b-memif-base-avf-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-memif-base-avf-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  data: "vpp-2n-clx-curr-iter"
   include:
     - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-.t.c-avf-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
     - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-.t.c-avf-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
@@ -10535,7 +10515,7 @@
   title: "Speedup: 2n-clx-xxv710-64b-memif-base-dpdk-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-memif-base-dpdk-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  data: "vpp-2n-clx-curr-iter"
   include:
     - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-.t.c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
     - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-.t.c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
@@ -10549,7 +10529,7 @@
   title: "Speedup: 2n-clx-cx556a-64b-rdma-l2-eth-2memif-1dcr-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-clx-cx556a-64b-rdma-l2-eth-2memif-1dcr-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  data: "vpp-2n-clx-curr-iter"
   include:
     - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-.t.c-rdma-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
     - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-.t.c-rdma-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
@@ -10560,26 +10540,25 @@
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 2n-clx-x710-64b-ip4routing-base-scale-[avf,dpdk]-{test_type}-tsa"
+  title: "Speedup: 2n-clx-x710-64b-ip4routing-base-scale-[avf,dpdk,af_xdp]-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-x710-64b-ip4routing-base-scale-[avf,dpdk]-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-x710-64b-ip4routing-base-scale-[avf,dpdk,af_xdp]-{test_type}-tsa"
+  data: "vpp-2n-clx-curr-iter"
   include:
-    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Dot1Q-Ip4Base-Ndrpdr.64B-.t.c-avf-dot1q-ip4base-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Base-Ndrpdr.64B-.t.c-avf-ethip4-ip4base-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-.t.c-avf-ethip4-ip4scale2m-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-Rnd-Ndrpdr.64B-.t.c-avf-ethip4-ip4scale2m-rnd-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Dot1Q-Ip4Base-Ndrpdr.64B-.t.c-dot1q-ip4base-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Base-Ndrpdr.64B-.t.c-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-af-xdp-Ethip4-Ip4Base-Ndrpdr.64B-.t.c-af-xdp-ethip4-ip4base-ndrpdr"
   layout:
-    title: "2n-clx-x710-64b-ip4routing-base-scale-[avf,dpdk]-{test_type}"
+    title: "2n-clx-x710-64b-ip4routing-base-scale-[avf,dpdk,af_xdp]-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
   title: "Speedup: 2n-clx-xxv710-64b-ip4routing-base-scale-avf-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-ip4routing-base-scale-avf-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  data: "vpp-2n-clx-curr-iter"
   include:
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Ndrpdr.64B-.t.c-avf-ethip4-ip4base-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale20K-Ndrpdr.64B-.t.c-avf-ethip4-ip4scale20k-ndrpdr"
@@ -10589,14 +10568,31 @@
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-.t.c-avf-ethip4-ip4scale2m-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale2M-Rnd-Ndrpdr.64B-.t.c-avf-ethip4-ip4scale2m-rnd-ndrpdr"
   layout:
-    title: "2n-clx-xxv710-64b-ip4routing-base-scale-avf-{test_type}"
+    title: "2n-clx-xxv710-64b-ip4routing-base-scale-avf-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 2n-clx-xxv710-64b-ip4routing-base-scale-af_xdp-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-ip4routing-base-scale-af_xdp-{test_type}-tsa"
+  data: "vpp-2n-clx-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-af-xdp-Ethip4-Ip4Base-Ndrpdr.64B-.t.c-af-xdp-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-af-xdp-Ethip4-Ip4Scale20K-Ndrpdr.64B-.t.c-af-xdp-ethip4-ip4scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-af-xdp-Ethip4-Ip4Scale20K-Rnd-Ndrpdr.64B-.t.c-af-xdp-ethip4-ip4scale20k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-af-xdp-Ethip4-Ip4Scale200K-Ndrpdr.64B-.t.c-af-xdp-ethip4-ip4scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-af-xdp-Ethip4-Ip4Scale200K-Rnd-Ndrpdr.64B-.t.c-af-xdp-ethip4-ip4scale200k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-af-xdp-Ethip4-Ip4Scale2M-Ndrpdr.64B-.t.c-af-xdp-ethip4-ip4scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-af-xdp-Ethip4-Ip4Scale2M-Rnd-Ndrpdr.64B-.t.c-af-xdp-ethip4-ip4scale2m-rnd-ndrpdr"
+  layout:
+    title: "2n-clx-xxv710-64b-ip4routing-base-scale-af_xdp-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
   title: "Speedup: 2n-clx-xxv710-64b-ip4routing-base-scale-dpdk-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-ip4routing-base-scale-dpdk-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  data: "vpp-2n-clx-curr-iter"
   include:
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Dot1Q-Ip4Base-Ndrpdr.64B-.t.c-dot1q-ip4base-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Ndrpdr.64B-.t.c-ethip4-ip4base-ndrpdr"
@@ -10614,7 +10610,7 @@
   title: "Speedup: 2n-clx-xxv710-64b-features-ip4routing-base-avf-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-features-ip4routing-base-avf-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  data: "vpp-2n-clx-curr-iter"
   include:
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
@@ -10630,7 +10626,7 @@
   title: "Speedup: 2n-clx-xxv710-64b-nat44det-ip4routing-stl-bidir-avf-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-nat44det-ip4routing-stl-bidir-avf-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  data: "vpp-2n-clx-curr-iter"
   include:
     - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr.64b-.t.c-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr"
     - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h4096-p63-s258048-ndrpdr.64b-.t.c-avf-ethip4udp-nat44det-h4096-p63-s258048-ndrpdr"
@@ -10645,7 +10641,7 @@
   title: "Speedup: 2n-clx-xxv710-64b-nat44ed-ip4routing-stl-unidir-avf-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-nat44ed-ip4routing-stl-unidir-avf-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  data: "vpp-2n-clx-curr-iter"
   include:
     - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-ndrpdr"
     - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-udir-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h4096-p63-s258048-udir-ndrpdr"
@@ -10660,7 +10656,7 @@
   title: "Speedup: 2n-clx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  data: "vpp-2n-clx-curr-iter"
   include:
     - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-ndrpdr"
     - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h1024-p63-s64512-cps-ndrpdr.64b-.t.c-avf-ethip4udp-ip4base-h1024-p63-s64512-cps-ndrpdr"
@@ -10676,31 +10672,11 @@
     title: "2n-clx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-{test_type}"
     layout: "plot-throughput-speedup-analysis-cps"
 
-- type: "plot"
-  title: "Speedup: 2n-clx-xxv710-64b-nat44ed-ip4routing-udp-stf-pps-avf-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-nat44ed-ip4routing-udp-stf-pps-avf-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-clx"
-  include:
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h1024-p63-s64512-pps-ndrpdr.64b-.t.c-avf-ethip4udp-ip4base-h1024-p63-s64512-pps-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-pps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h4096-p63-s258048-pps-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h4096-p63-s258048-pps-ndrpdr.64b-.t.c-avf-ethip4udp-ip4base-h4096-p63-s258048-pps-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-pps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-pps-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h16384-p63-s1032192-pps-ndrpdr.64b-.t.c-avf-ethip4udp-ip4base-h16384-p63-s1032192-pps-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-pps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-pps-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h65536-p63-s4128768-pps-ndrpdr.64b-.t.c-avf-ethip4udp-ip4base-h65536-p63-s4128768-pps-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-pps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-pps-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h262144-p63-s16515072-pps-ndrpdr.64b-.t.c-avf-ethip4udp-ip4base-h262144-p63-s16515072-pps-ndrpdr"
-  layout:
-    title: "2n-clx-xxv710-64b-nat44ed-ip4routing-udp-stf-pps-avf-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
 - type: "plot"
   title: "Speedup: 2n-clx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  data: "vpp-2n-clx-curr-iter"
   include:
     - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-ndrpdr"
     - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h1024-p63-s64512-cps-ndrpdr.64b-.t.c-avf-ethip4tcp-ip4base-h1024-p63-s64512-cps-ndrpdr"
@@ -10716,31 +10692,11 @@
     title: "2n-clx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-{test_type}"
     layout: "plot-throughput-speedup-analysis-cps"
 
-- type: "plot"
-  title: "Speedup: 2n-clx-xxv710-64b-nat44ed-ip4routing-tcp-stf-pps-avf-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-nat44ed-ip4routing-tcp-stf-pps-avf-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-clx"
-  include:
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h1024-p63-s64512-pps-ndrpdr.64b-.t.c-avf-ethip4tcp-ip4base-h1024-p63-s64512-pps-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h4096-p63-s258048-pps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h4096-p63-s258048-pps-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h4096-p63-s258048-pps-ndrpdr.64b-.t.c-avf-ethip4tcp-ip4base-h4096-p63-s258048-pps-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h16384-p63-s1032192-pps-ndrpdr.64b-.t.c-avf-ethip4tcp-ip4base-h16384-p63-s1032192-pps-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h65536-p63-s4128768-pps-ndrpdr.64b-.t.c-avf-ethip4tcp-ip4base-h65536-p63-s4128768-pps-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h262144-p63-s16515072-pps-ndrpdr.64b-.t.c-avf-ethip4tcp-ip4base-h262144-p63-s16515072-pps-ndrpdr"
-  layout:
-    title: "2n-clx-xxv710-64b-nat44ed-ip4routing-tcp-stf-pps-avf-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
 - type: "plot"
   title: "Speedup: 2n-clx-xxv710-64b-nat44ed-ip4routing-tcp-tput-avf-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-nat44ed-ip4routing-tcp-tput-avf-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  data: "vpp-2n-clx-curr-iter"
   include:
     - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-Ethip4Tcp-nat44ed-h1024-p63-s64512-pps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H1024-P63-S64512-Tput-Ndrpdr.64B-.t.c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-tput-ndrpdr"
@@ -10760,7 +10716,7 @@
   title: "Speedup: 2n-clx-xxv710-64b-nat44ed-ip4routing-udp-tput-avf-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-nat44ed-ip4routing-udp-tput-avf-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  data: "vpp-2n-clx-curr-iter"
   include:
     - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-Ethip4Udp-nat44ed-h1024-p63-s64512-pps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H1024-P63-S64512-Tput-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44ed-h1024-p63-s64512-tput-ndrpdr"
@@ -10780,7 +10736,7 @@
   title: "Speedup: 2n-clx-xxv710-64b-nat44ed-ip4routing-tcp-tput2-avf-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-nat44ed-ip4routing-tcp-tput2-avf-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  data: "vpp-2n-clx-curr-iter"
   include:
     - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h1024-p63-s64512-pps-ndrpdr.64b-.t.c-avf-ethip4tcp-ip4base-h1024-p63-s64512-pps-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H1024-P63-S64512-Tput-Ndrpdr.64B-.t.c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-tput-ndrpdr"
@@ -10800,7 +10756,7 @@
   title: "Speedup: 2n-clx-xxv710-64b-nat44ed-ip4routing-udp-tput2-avf-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-nat44ed-ip4routing-udp-tput2-avf-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  data: "vpp-2n-clx-curr-iter"
   include:
     - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-Ethip4Udp-ip4base-h1024-p63-s64512-pps-ndrpdr.64b-.t.c-avf-ethip4udp-ip4base-h1024-p63-s64512-pps-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H1024-P63-S64512-Tput-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44ed-h1024-p63-s64512-tput-ndrpdr"
@@ -10816,27 +10772,11 @@
     title: "2n-clx-xxv710-64b-nat44ed-ip4routing-udp-tput-avf-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
-- type: "plot"
-  title: "Speedup: 2n-clx-xxv710-64b-features-ip4routing-base-dpdk-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-features-ip4routing-base-dpdk-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-clx"
-  include:
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Ndrpdr.64B-.t.c-ethip4-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-ethip4udp-nat44det-h1-p1-s1-Ndrpdr.64B-.t.c-ethip4udp-nat44det-h1-p1-s1-ndrpdr"
-  layout:
-    title: "2n-clx-xxv710-64b-features-ip4routing-base-dpdk-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
 - type: "plot"
   title: "Speedup: 2n-clx-cx556a-64b-rdma-ip4base-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-clx-cx556a-64b-rdma-ip4base-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  data: "vpp-2n-clx-curr-iter"
   include:
     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-Ip4Base-Ndrpdr.64B-.t.c-rdma-dot1q-ip4base-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4-Ip4Base-Ndrpdr.64B-.t.c-rdma-ethip4-ip4base-ndrpdr"
@@ -10854,7 +10794,7 @@
   title: "Speedup: 2n-clx-cx556a-64b-rdma-ethip4-features-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-clx-cx556a-64b-rdma-ethip4-features-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  data: "vpp-2n-clx-curr-iter"
   include:
     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-.t.c-rdma-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-rdma-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
@@ -10870,7 +10810,7 @@
   title: "Speedup: 2n-clx-xxv710-64b-ethip4--ethip4udpgeneve-avf-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-ethip4--ethip4udpgeneve-avf-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  data: "vpp-2n-clx-curr-iter"
   include:
     - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-1Tun-Ip4Base-Ndrpdr.64B-.t.c-avf-ethip4--ethip4udpgeneve-1tun-ip4base-ndrpdr"
     - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-4Tun-Ip4Base-Ndrpdr.64B-.t.c-avf-ethip4--ethip4udpgeneve-4tun-ip4base-ndrpdr"
@@ -10882,29 +10822,27 @@
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 2n-clx-x710-78b-ip6routing-base-scale-[avf,dpdk]-{test_type}-tsa"
+  title: "Speedup: 2n-clx-x710-78b-ip6routing-base-scale-[avf,dpdk,af_xdp]-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-x710-78b-ip6routing-base-scale-[avf,dpdk]-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-x710-78b-ip6routing-base-scale-[avf,dpdk,af_xdp]-{test_type}-tsa"
+  data: "vpp-2n-clx-curr-iter"
   include:
-    - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Dot1Q-Ip6Base-Ndrpdr.78B-.t.c-avf-dot1q-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-avf-ethip6-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-Ndrpdr.78B-.t.c-avf-ethip6-ip6scale2m-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-rnd-Ndrpdr.78B-.t.c-avf-ethip6-ip6scale2m-rnd-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Dot1Q-Ip6Base-Ndrpdr.78B-.t.c-dot1q-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-ethip6-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Scale2M-Ndrpdr.78B-.t.c-ethip6-ip6scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-af-xdp-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-af-xdp-ethip6-ip6base-ndrpdr"
   layout:
-    title: "2n-clx-x710-78b-ip6routing-base-scale-[avf,dpdk]-{test_type}"
+    title: "2n-clx-x710-78b-ip6routing-base-scale-[avf,dpdk,af_xdp]-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
   title: "Speedup: 2n-clx-xxv710-78b-ip6routing-base-scale-avf-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-78b-ip6routing-base-scale-avf-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  data: "vpp-2n-clx-curr-iter"
   include:
-    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-Ip6Base-Ndrpdr.78B-.t.c-avf-dot1q-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-avf-ethip6-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale20K-Ndrpdr.78B-.t.c-avf-ethip6-ip6scale20k-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale20K-rnd-Ndrpdr.78B-.t.c-avf-ethip6-ip6scale20k-rnd-ndrpdr"
@@ -10916,11 +10854,28 @@
     title: "2n-clx-xxv710-78b-ip6routing-base-scale-avf-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
+- type: "plot"
+  title: "Speedup: 2n-clx-xxv710-78b-ip6routing-base-scale-af_xdp-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-78b-ip6routing-base-scale-af_xdp-{test_type}-tsa"
+  data: "vpp-2n-clx-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-af-xdp-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-af-xdp-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-af-xdp-Ethip6-Ip6Scale20K-Ndrpdr.78B-.t.c-af-xdp-ethip6-ip6scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-af-xdp-Ethip6-Ip6Scale20K-rnd-Ndrpdr.78B-.t.c-af-xdp-ethip6-ip6scale20k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-af-xdp-Ethip6-Ip6Scale200K-Ndrpdr.78B-.t.c-af-xdp-ethip6-ip6scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-af-xdp-Ethip6-Ip6Scale200K-rnd-Ndrpdr.78B-.t.c-af-xdp-ethip6-ip6scale200k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-af-xdp-Ethip6-Ip6Scale2M-Ndrpdr.78B-.t.c-af-xdp-ethip6-ip6scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-af-xdp-Ethip6-Ip6Scale2M-rnd-Ndrpdr.78B-.t.c-af-xdp-ethip6-ip6scale2m-rnd-ndrpdr"
+  layout:
+    title: "2n-clx-xxv710-78b-ip6routing-base-scale-af_xdp-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
 - type: "plot"
   title: "Speedup: 2n-clx-xxv710-78b-ip6routing-base-scale-dpdk-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-78b-ip6routing-base-scale-dpdk-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  data: "vpp-2n-clx-curr-iter"
   include:
     - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Dot1Q-Ip6Base-Ndrpdr.78B-.t.c-dot1q-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-ethip6-ip6base-ndrpdr"
@@ -10938,7 +10893,7 @@
   title: "Speedup: 2n-clx-cx556a-78b-rdma-ip6routing-base-scale-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-clx-cx556a-78b-rdma-ip6routing-base-scale-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  data: "vpp-2n-clx-curr-iter"
   include:
     - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-Ip6Base-Ndrpdr.78B-.t.c-rdma-dot1q-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1Cx556A-Rdma-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-rdma-ethip6-ip6base-ndrpdr"
@@ -10953,40 +10908,23 @@
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 2n-clx-x710-64b-l2switching-base-scale-avf-{test_type}-tsa"
+  title: "Speedup: 2n-clx-x710-64b-l2switching-base-scale-[avf,af_xdp]-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-x710-64b-l2switching-base-scale-avf-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-x710-64b-l2switching-base-scale-[avf,af_xdp]-{test_type}-tsa"
+  data: "vpp-2n-clx-curr-iter"
   include:
-    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-avf-dot1q-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Patch-Ndrpdr.64B-.t.c-avf-eth-l2patch-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Xcbase-Ndrpdr.64B-.t.c-avf-eth-l2xcbase-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-avf-eth-l2bdbasemaclrn-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-.t.c-avf-eth-l2bdscale1mmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-af-xdp-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-af-xdp-eth-l2bdbasemaclrn-ndrpdr"
   layout:
-    title: "2n-clx-x710-64b-l2switching-base-scale-avf-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: 2n-clx-x710-64b-l2switching-base-scale-dpdk-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-x710-64b-l2switching-base-scale-dpdk-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-clx"
-  include:
-    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-dot1q-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Patch-Ndrpdr.64B-.t.c-eth-l2patch-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Xcbase-Ndrpdr.64B-.t.c-eth-l2xcbase-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-.t.c-eth-l2bdscale1mmaclrn-ndrpdr"
-  layout:
-    title: "2n-clx-x710-64b-l2switching-base-scale-dpdk-{test_type}"
+    title: "2n-clx-x710-64b-l2switching-base-scale-[avf,af_xdp]-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
   title: "Speedup: 2n-clx-xxv710-64b-l2switching-base-avf-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-l2switching-base-avf-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  data: "vpp-2n-clx-curr-iter"
   include:
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Ndrpdr.64B-.t.c-avf-dot1q-l2xcbase-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-avf-dot1q-l2bdbasemaclrn-ndrpdr"
@@ -11001,7 +10939,7 @@
   title: "Speedup: 2n-clx-xxv710-64b-l2switching-base-scale-avf-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-l2switching-base-scale-avf-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  data: "vpp-2n-clx-curr-iter"
   include:
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-avf-eth-l2bdbasemaclrn-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-.t.c-avf-eth-l2bdscale10kmaclrn-ndrpdr"
@@ -11011,11 +10949,27 @@
     title: "2n-clx-xxv710-64b-l2switching-base-scale-avf-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
+- type: "plot"
+  title: "Speedup: 2n-clx-xxv710-64b-l2switching-base-scale-af_xdp-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-l2switching-base-scale-af_xdp-{test_type}-tsa"
+  data: "vpp-2n-clx-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-af-xdp-Eth-L2Patch-Ndrpdr.64B-.t.c-af-xdp-eth-l2patch-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-af-xdp-Eth-L2Xcbase-Ndrpdr.64B-.t.c-af-xdp-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-af-xdp-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-af-xdp-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-af-xdp-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-.t.c-af-xdp-eth-l2bdscale10kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-af-xdp-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-.t.c-af-xdp-eth-l2bdscale100kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-af-xdp-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-.t.c-af-xdp-eth-l2bdscale1mmaclrn-ndrpdr"
+  layout:
+    title: "2n-clx-xxv710-64b-l2switching-base-scale-af_xdp-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
 - type: "plot"
   title: "Speedup: 2n-clx-xxv710-64b-l2switching-base-dpdk-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-l2switching-base-dpdk-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  data: "vpp-2n-clx-curr-iter"
   include:
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Xcbase-Ndrpdr.64B-.t.c-dot1q-l2xcbase-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-dot1q-l2bdbasemaclrn-ndrpdr"
@@ -11030,7 +10984,7 @@
   title: "Speedup: 2n-clx-xxv710-64b-l2switching-base-scale-dpdk-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-l2switching-base-scale-dpdk-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  data: "vpp-2n-clx-curr-iter"
   include:
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-.t.c-eth-l2bdscale10kmaclrn-ndrpdr"
@@ -11044,7 +10998,7 @@
   title: "Speedup: 2n-clx-cx556a-64b-rdma-l2switching-base-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-clx-cx556a-64b-rdma-l2switching-base-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  data: "vpp-2n-clx-curr-iter"
   include:
     - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Xcbase-Ndrpdr.64B-.t.c-rdma-dot1q-l2xcbase-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-rdma-dot1q-l2bdbasemaclrn-ndrpdr"
@@ -11059,7 +11013,7 @@
   title: "Speedup: 2n-clx-cx556a-64b-rdma-l2switching-scale-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-clx-cx556a-64b-rdma-l2switching-scale-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  data: "vpp-2n-clx-curr-iter"
   include:
     - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-rdma-eth-l2bdbasemaclrn-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-.t.c-rdma-eth-l2bdscale10kmaclrn-ndrpdr"
@@ -11070,107 +11024,45 @@
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 2n-clx-xxv710-64b-vhost-base-avf-{test_type}-tsa"
+  title: "Speedup: 2n-clx-xxv710-64b-vhost-base-[avf,dpdk]-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-vhost-base-avf-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-vhost-base-{test_type}-tsa"
+  data: "vpp-2n-clx-curr-iter"
   include:
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-avf-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-avf-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
     - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
     - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-avf-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr"
-  layout:
-    title: "2n-clx-xxv710-64b-vhost-base-avf-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: 2n-clx-xxv710-64b-vhost-base-avf-vpp-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-vhost-base-avf-vpp-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-clx"
-  include:
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-.t.c-avf-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-.t.c-avf-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-.t.c-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-.t.c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Vppip4-Ndrpdr.64B-.t.c-avf-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr"
-  layout:
-    title: "2n-clx-xxv710-64b-vhost-base-avf-vpp-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: 2n-clx-xxv710-64b-vhost-base-dpdk-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-vhost-base-dpdk-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-clx"
-  include:
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
     - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
     - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr"
   layout:
-    title: "2n-clx-xxv710-64b-vhost-base-dpdk-{test_type}"
+    title: "2n-clx-xxv710-64b-vhost-base-[avf,dpdk]-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 2n-clx-xxv710-64b-vhost-base-dpdk-vpp-{test_type}-tsa"
+  title: "Speedup: 2n-clx-xxv710-64b-vhost-base-[avf,dpdk]-vpp-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-vhost-base-dpdk-vpp-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-vhost-base-vpp-{test_type}-tsa"
+  data: "vpp-2n-clx-curr-iter"
   include:
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-.t.c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-.t.c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-.t.c-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-.t.c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
     - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-.t.c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
     - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Vppip4-Ndrpdr.64B-.t.c-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr"
   layout:
-    title: "2n-clx-xxv710-64b-vhost-base-dpdk-vpp-{test_type}"
+    title: "2n-clx-xxv710-64b-vhost-base-[avf,dpdk]-vpp-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
   title: "Speedup: 2n-clx-cx556a-64b-rdma-l2-vhost-base-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-clx-cx556a-64b-rdma-l2-vhost-base-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  data: "vpp-2n-clx-curr-iter"
   include:
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-rdma-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-rdma-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
     - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-rdma-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
     - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-rdma-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-  layout:
-    title: "2n-clx-cx556a-64b-rdma-l2-vhost-base-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: 2n-clx-cx556a-64b-rdma-l2-vhost-vppl2xc-base-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-cx556a-64b-rdma-l2-vhost-vppl2xc-base-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-clx"
-  include:
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-.t.c-rdma-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-.t.c-rdma-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
     - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-.t.c-rdma-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
     - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-.t.c-rdma-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
   layout:
-    title: "2n-clx-cx556a-64b-2t1c-l2-vhost-vppl2xc-base-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: 2n-clx-xxv710-114b-vts-l2switching-base-dpdk-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-114b-vts-l2switching-base-dpdk-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-clx"
-  include:
-    - "Tests.Vpp.Perf.Vts.2N1L-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermit-2Vhostvr1024-1Vm-Ndrpdr.114B-.t.c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vts.2N1L-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermitreflect-2Vhostvr1024-1Vm-Ndrpdr.114B-.t.c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vts.2N1L-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Noacl-2Vhostvr1024-1Vm-Ndrpdr.114B-.t.c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Noacl-2Vhostvr1024-1Vm-Ndrpdr.114B-.t.c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermit-2Vhostvr1024-1Vm-Ndrpdr.114B-.t.c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermitreflect-2Vhostvr1024-1Vm-Ndrpdr.114B-.t.c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr"
-  layout:
-    title: "2n-clx-xxv710-114b-vts-l2switching-base-[avf,dpdk]-{test_type}"
+    title: "2n-clx-cx556a-64b-rdma-l2-vhost-base-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 # # 2n-icx
@@ -11179,7 +11071,7 @@
 #   title: "Throughput: 2n-icx-e810cq-64b-{core}-ip4routing-base-scale-avf-{test_type}"
 #   algorithm: "plot_ndrpdr_box_name"
 #   output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-{core}-ip4routing-base-scale-avf-{test_type}"
-#   data: "plot-vpp-throughput-lat-tsa-2n-icx"
+#   data: "vpp-2n-icx-curr-iter"
 #   core: ["2t1c", ]
 #   include:
 #     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4-Ip4Base-Ndrpdr.64B-{core}-avf-ethip4-ip4base-ndrpdr"
@@ -11194,7 +11086,7 @@
 #   title: "Throughput: 2n-icx-e810cq-64b-{core}-ip4routing-base-scale-dpdk-{test_type}"
 #   algorithm: "plot_ndrpdr_box_name"
 #   output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-{core}-ip4routing-base-scale-dpdk-{test_type}"
-#   data: "plot-vpp-throughput-lat-tsa-2n-icx"
+#   data: "vpp-2n-icx-curr-iter"
 #   core: ["2t1c", ]
 #   include:
 #     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Ethip4-Ip4Base-Ndrpdr.64B-{core}-ethip4-ip4base-ndrpdr"
@@ -11202,435 +11094,435 @@
 #     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Ethip4-Ip4Scale200K-Ndrpdr.64B-{core}-ethip4-ip4scale200k-ndrpdr"
 #     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Ethip4-Ip4Scale2M-Ndrpdr.64B-{core}-ethip4-ip4scale2m-ndrpdr"
 #   layout:
-#     title: "2n-icx-e810cq-64b-{core}-ip4routing-base-scale-dpdk-{test_type}"
+#     title: "2n-icx-e810cq-64b-{core}-ip4routing-base-scale-dpdk-{test_type}"
+#     layout: "plot-throughput"
+#
+# - type: "plot"
+#   title: "Throughput: 2n-icx-e810cq-78b-{core}-ip6routing-base-scale-avf-{test_type}"
+#   algorithm: "plot_ndrpdr_box_name"
+#   output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-78b-{core}-ip6routing-base-scale-avf-{test_type}"
+#   data: "vpp-2n-icx-curr-iter"
+#   core: ["2t1c", ]
+#   include:
+#     - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Avf-Ethip6-Ip6Base-Ndrpdr.78B-{core}-avf-ethip6-ip6base-ndrpdr"
+#     - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Avf-Ethip6-Ip6Scale20K-Ndrpdr.78B-{core}-avf-ethip6-ip6scale20k-ndrpdr"
+#     - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Avf-Ethip6-Ip6Scale200K-Ndrpdr.78B-{core}-avf-ethip6-ip6scale200k-ndrpdr"
+#     - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Avf-Ethip6-Ip6Scale2M-Ndrpdr.78B-{core}-avf-ethip6-ip6scale2m-ndrpdr"
+#   layout:
+#     title: "2n-icx-e810cq-78b-{core}-ip6routing-base-scale-avf-{test_type}"
+#     layout: "plot-throughput"
+#
+# - type: "plot"
+#   title: "Throughput: 2n-icx-e810cq-78b-{core}-ip6routing-base-scale-dpdk-{test_type}"
+#   algorithm: "plot_ndrpdr_box_name"
+#   output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-78b-{core}-ip6routing-base-scale-dpdk-{test_type}"
+#   data: "vpp-2n-icx-curr-iter"
+#   core: ["2t1c", ]
+#   include:
+#     - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Ethip6-Ip6Base-Ndrpdr.78B-{core}-ethip6-ip6base-ndrpdr"
+#     - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Ethip6-Ip6Scale20K-Ndrpdr.78B-{core}-ethip6-ip6scale20k-ndrpdr"
+#     - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Ethip6-Ip6Scale200K-Ndrpdr.78B-{core}-ethip6-ip6scale200k-ndrpdr"
+#     - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Ethip6-Ip6Scale2M-Ndrpdr.78B-{core}-ethip6-ip6scale2m-ndrpdr"
+#   layout:
+#     title: "2n-icx-e810cq-78b-{core}-ip6routing-base-scale-dpdk-{test_type}"
+#     layout: "plot-throughput"
+#
+# - type: "plot"
+#   title: "Throughput: 2n-icx-e810cq-64b-{core}-l2switching-base-scale-avf-{test_type}"
+#   algorithm: "plot_ndrpdr_box_name"
+#   output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-{core}-l2switching-base-scale-avf-{test_type}"
+#   data: "vpp-2n-icx-curr-iter"
+#   core: ["2t1c", ]
+#   include:
+#     - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Patch-Ndrpdr.64B-{core}-avf-eth-l2patch-ndrpdr"
+#     - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Xcbase-Ndrpdr.64B-{core}-avf-eth-l2xcbase-ndrpdr"
+#     - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-ndrpdr"
+#     - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-{core}-avf-eth-l2bdscale10kmaclrn-ndrpdr"
+#     - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-{core}-avf-eth-l2bdscale100kmaclrn-ndrpdr"
+#     - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-{core}-avf-eth-l2bdscale1mmaclrn-ndrpdr"
+#   layout:
+#     title: "2n-icx-e810cq-64b-{core}-l2switching-base-scale-avf-{test_type}"
+#     layout: "plot-throughput"
+#
+# - type: "plot"
+#   title: "Throughput: 2n-icx-e810cq-64b-{core}-l2switching-base-scale-dpdk-{test_type}"
+#   algorithm: "plot_ndrpdr_box_name"
+#   output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-{core}-l2switching-base-scale-dpdk-{test_type}"
+#   data: "vpp-2n-icx-curr-iter"
+#   core: ["2t1c", ]
+#   include:
+#     - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Eth-L2Patch-Ndrpdr.64B-{core}-eth-l2patch-ndrpdr"
+#     - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Eth-L2Xcbase-Ndrpdr.64B-{core}-eth-l2xcbase-ndrpdr"
+#     - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Eth-L2Bdbasemaclrn-Ndrpdr.64B-{core}-eth-l2bdbasemaclrn-ndrpdr"
+#     - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-{core}-eth-l2bdscale10kmaclrn-ndrpdr"
+#     - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-{core}-eth-l2bdscale100kmaclrn-ndrpdr"
+#     - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-{core}-eth-l2bdscale1mmaclrn-ndrpdr"
+#   layout:
+#     title: "2n-icx-e810cq-64b-{core}-l2switching-base-scale-dpdk-{test_type}"
+#     layout: "plot-throughput"
+#
+# - type: "plot"
+#   title: "Speedup: 2n-icx-e810cq-64b-ip4routing-base-scale-avf-{test_type}-tsa"
+#   algorithm: "plot_tsa_name"
+#   output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-ip4routing-base-scale-avf-{test_type}-tsa"
+#   data: "vpp-2n-icx-curr-iter"
+#   include:
+#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4-Ip4Base-Ndrpdr.64B-.t.c-avf-ethip4-ip4base-ndrpdr"
+#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4-Ip4Scale20K-Ndrpdr.64B-.t.c-avf-ethip4-ip4scale20k-ndrpdr"
+#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4-Ip4Scale200K-Ndrpdr.64B-.t.c-avf-ethip4-ip4scale200k-ndrpdr"
+#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-.t.c-avf-ethip4-ip4scale2m-ndrpdr"
+#   layout:
+#     title: "2n-icx-e810cq-64b-ip4routing-base-scale-avf-{test_type}"
+#     layout: "plot-throughput-speedup-analysis"
+#
+# - type: "plot"
+#   title: "Speedup: 2n-icx-e810cq-64b-ip4routing-base-scale-dpdk-{test_type}-tsa"
+#   algorithm: "plot_tsa_name"
+#   output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-ip4routing-base-scale-dpdk-{test_type}-tsa"
+#   data: "vpp-2n-icx-curr-iter"
+#   include:
+#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Ethip4-Ip4Base-Ndrpdr.64B-.t.c-ethip4-ip4base-ndrpdr"
+#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Ethip4-Ip4Scale20K-Ndrpdr.64B-.t.c-ethip4-ip4scale20k-ndrpdr"
+#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Ethip4-Ip4Scale200K-Ndrpdr.64B-.t.c-ethip4-ip4scale200k-ndrpdr"
+#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Ethip4-Ip4Scale2M-Ndrpdr.64B-.t.c-ethip4-ip4scale2m-ndrpdr"
+#   layout:
+#     title: "2n-icx-e810cq-64b-ip4routing-base-scale-dpdk-{test_type}"
+#     layout: "plot-throughput-speedup-analysis"
+#
+# - type: "plot"
+#   title: "Speedup: 2n-icx-e810cq-78b-ip6routing-base-scale-avf-{test_type}-tsa"
+#   algorithm: "plot_tsa_name"
+#   output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-78b-ip6routing-base-scale-avf-{test_type}-tsa"
+#   data: "vpp-2n-icx-curr-iter"
+#   include:
+#     - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Avf-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-avf-ethip6-ip6base-ndrpdr"
+#     - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Avf-Ethip6-Ip6Scale20K-Ndrpdr.78B-.t.c-avf-ethip6-ip6scale20k-ndrpdr"
+#     - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Avf-Ethip6-Ip6Scale200K-Ndrpdr.78B-.t.c-avf-ethip6-ip6scale200k-ndrpdr"
+#     - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Avf-Ethip6-Ip6Scale2M-Ndrpdr.78B-.t.c-avf-ethip6-ip6scale2m-ndrpdr"
+#   layout:
+#     title: "2n-icx-e810cq-78b-ip6routing-base-scale-avf-{test_type}"
+#     layout: "plot-throughput-speedup-analysis"
+#
+# - type: "plot"
+#   title: "Speedup: 2n-icx-e810cq-78b-ip6routing-base-scale-dpdk-{test_type}-tsa"
+#   algorithm: "plot_tsa_name"
+#   output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-78b-ip6routing-base-scale-dpdk-{test_type}-tsa"
+#   data: "vpp-2n-icx-curr-iter"
+#   include:
+#     - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-ethip6-ip6base-ndrpdr"
+#     - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Ethip6-Ip6Scale20K-Ndrpdr.78B-.t.c-ethip6-ip6scale20k-ndrpdr"
+#     - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Ethip6-Ip6Scale200K-Ndrpdr.78B-.t.c-ethip6-ip6scale200k-ndrpdr"
+#     - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Ethip6-Ip6Scale2M-Ndrpdr.78B-.t.c-ethip6-ip6scale2m-ndrpdr"
+#   layout:
+#     title: "2n-icx-e810cq-78b-ip6routing-base-scale-dpdk-{test_type}"
+#     layout: "plot-throughput-speedup-analysis"
+#
+# - type: "plot"
+#   title: "Speedup: 2n-icx-e810cq-64b-l2switching-base-scale-avf-{test_type}-tsa"
+#   algorithm: "plot_tsa_name"
+#   output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-l2switching-base-scale-avf-{test_type}-tsa"
+#   data: "vpp-2n-icx-curr-iter"
+#   include:
+#     - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Patch-Ndrpdr.64B-.t.c-avf-eth-l2patch-ndrpdr"
+#     - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Xcbase-Ndrpdr.64B-.t.c-avf-eth-l2xcbase-ndrpdr"
+#     - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-avf-eth-l2bdbasemaclrn-ndrpdr"
+#     - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-.t.c-avf-eth-l2bdscale10kmaclrn-ndrpdr"
+#     - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-.t.c-avf-eth-l2bdscale100kmaclrn-ndrpdr"
+#     - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-.t.c-avf-eth-l2bdscale1mmaclrn-ndrpdr"
+#   layout:
+#     title: "2n-icx-e810cq-64b-l2switching-base-scale-avf-{test_type}"
+#     layout: "plot-throughput-speedup-analysis"
+#
+# - type: "plot"
+#   title: "Speedup: 2n-icx-e810cq-64b-l2switching-base-scale-dpdk-{test_type}-tsa"
+#   algorithm: "plot_tsa_name"
+#   output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-l2switching-base-scale-dpdk-{test_type}-tsa"
+#   data: "vpp-2n-icx-curr-iter"
+#   include:
+#     - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Eth-L2Patch-Ndrpdr.64B-.t.c-eth-l2patch-ndrpdr"
+#     - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Eth-L2Xcbase-Ndrpdr.64B-.t.c-eth-l2xcbase-ndrpdr"
+#     - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-ndrpdr"
+#     - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-.t.c-eth-l2bdscale10kmaclrn-ndrpdr"
+#     - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-.t.c-eth-l2bdscale100kmaclrn-ndrpdr"
+#     - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-.t.c-eth-l2bdscale1mmaclrn-ndrpdr"
+#   layout:
+#     title: "2n-icx-e810cq-64b-l2switching-base-scale-dpdk-{test_type}"
+#     layout: "plot-throughput-speedup-analysis"
+#
+# # 3n-icx
+#
+# - type: "plot"
+#   title: "Throughput: 3n-icx-e810cq-64b-{core}-ipsec-aes128gcm-ip4routing-scale-avf-{test_type}"
+#   algorithm: "plot_ndrpdr_box_name"
+#   output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-64b-{core}-ipsec-aes128gcm-ip4routing-scale-avf-{test_type}"
+#   data: "vpp-3n-icx-curr-iter"
+#   core: ["2t1c", ]
+#   include:
+#     - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.64B-{core}-avf-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-ndrpdr"
+#     - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.64B-{core}-avf-ethip4ipsec40tnlsw-ip4base-int-aes128gcm-ndrpdr"
+#     - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec400Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.64B-{core}-avf-ethip4ipsec400tnlsw-ip4base-int-aes128gcm-ndrpdr"
+#     - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.64B-{core}-avf-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-ndrpdr"
+#     - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec20000Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.64B-{core}-avf-ethip4ipsec20000tnlsw-ip4base-int-aes128gcm-ndrpdr"
+#     - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.64B-{core}-avf-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-ndrpdr"
+#   layout:
+#     title: "3n-icx-e810cq-64b-{core}-ipsec-aes128gcm-ip4routing-scale-avf-{test_type}"
+#     layout: "plot-throughput"
+#
+# - type: "plot"
+#   title: "Throughput: 3n-icx-e810cq-1518b-{core}-ipsec-aes128gcm-ip4routing-scale-avf-{test_type}"
+#   algorithm: "plot_ndrpdr_box_name"
+#   output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-1518b-{core}-ipsec-aes128gcm-ip4routing-scale-avf-{test_type}"
+#   data: "vpp-3n-icx-curr-iter"
+#   core: ["2t1c", ]
+#   include:
+#     - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.1518b-{core}-avf-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-ndrpdr"
+#     - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.1518b-{core}-avf-ethip4ipsec40tnlsw-ip4base-int-aes128gcm-ndrpdr"
+#     - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec400Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.1518b-{core}-avf-ethip4ipsec400tnlsw-ip4base-int-aes128gcm-ndrpdr"
+#     - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.1518b-{core}-avf-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-ndrpdr"
+#     - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec20000Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.1518b-{core}-avf-ethip4ipsec20000tnlsw-ip4base-int-aes128gcm-ndrpdr"
+#     - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.1518b-{core}-avf-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-ndrpdr"
+#   layout:
+#     title: "3n-icx-e810cq-1518b-{core}-ipsec-aes128gcm-ip4routing-scale-avf-{test_type}"
+#     layout: "plot-throughput"
+#
+# - type: "plot"
+#   title: "Throughput: 3n-icx-e810cq-imix-{core}-ipsec-aes128gcm-ip4routing-scale-avf-{test_type}"
+#   algorithm: "plot_ndrpdr_box_name"
+#   output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-imix-{core}-ipsec-aes128gcm-ip4routing-scale-avf-{test_type}"
+#   data: "vpp-3n-icx-curr-iter"
+#   core: ["2t1c", ]
+#   include:
+#     - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.imix-{core}-avf-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-ndrpdr"
+#     - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.imix-{core}-avf-ethip4ipsec40tnlsw-ip4base-int-aes128gcm-ndrpdr"
+#     - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec400Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.imix-{core}-avf-ethip4ipsec400tnlsw-ip4base-int-aes128gcm-ndrpdr"
+#     - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.imix-{core}-avf-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-ndrpdr"
+#     - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec20000Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.imix-{core}-avf-ethip4ipsec20000tnlsw-ip4base-int-aes128gcm-ndrpdr"
+#     - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.imix-{core}-avf-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-ndrpdr"
+#   layout:
+#     title: "3n-icx-e810cq-imix-{core}-ipsec-aes128gcm-ip4routing-scale-avf-{test_type}"
+#     layout: "plot-throughput"
+#
+# - type: "plot"
+#   title: "Throughput: 3n-icx-e810cq-64b-{core}-ipsec-aes256gcm-ip4routing-scale-avf-{test_type}"
+#   algorithm: "plot_ndrpdr_box_name"
+#   output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-64b-{core}-ipsec-aes256gcm-ip4routing-scale-avf-{test_type}"
+#   data: "vpp-3n-icx-curr-iter"
+#   core: ["2t1c", ]
+#   include:
+#     - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.64B-{core}-avf-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
+#     - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.64B-{core}-avf-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr"
+#     - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec400Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.64B-{core}-avf-ethip4ipsec400tnlsw-ip4base-int-aes256gcm-ndrpdr"
+#     - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.64B-{core}-avf-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+#     - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec20000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.64B-{core}-avf-ethip4ipsec20000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+#     - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.64B-{core}-avf-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+#   layout:
+#     title: "3n-icx-e810cq-64b-{core}-ipsec-aes256gcm-ip4routing-scale-avf-{test_type}"
+#     layout: "plot-throughput"
+#
+# - type: "plot"
+#   title: "Throughput: 3n-icx-e810cq-1518b-{core}-ipsec-aes256gcm-ip4routing-scale-avf-{test_type}"
+#   algorithm: "plot_ndrpdr_box_name"
+#   output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-1518b-{core}-ipsec-aes256gcm-ip4routing-scale-avf-{test_type}"
+#   data: "vpp-3n-icx-curr-iter"
+#   core: ["2t1c", ]
+#   include:
+#     - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518b-{core}-avf-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
+#     - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518b-{core}-avf-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr"
+#     - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec400Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518b-{core}-avf-ethip4ipsec400tnlsw-ip4base-int-aes256gcm-ndrpdr"
+#     - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518b-{core}-avf-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+#     - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec20000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518b-{core}-avf-ethip4ipsec20000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+#     - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518b-{core}-avf-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+#   layout:
+#     title: "3n-icx-e810cq-1518b-{core}-ipsec-aes256gcm-ip4routing-scale-avf-{test_type}"
 #     layout: "plot-throughput"
 #
 # - type: "plot"
-#   title: "Throughput: 2n-icx-e810cq-78b-{core}-ip6routing-base-scale-avf-{test_type}"
+#   title: "Throughput: 3n-icx-e810cq-imix-{core}-ipsec-aes256gcm-ip4routing-scale-avf-{test_type}"
 #   algorithm: "plot_ndrpdr_box_name"
-#   output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-78b-{core}-ip6routing-base-scale-avf-{test_type}"
-#   data: "plot-vpp-throughput-lat-tsa-2n-icx"
+#   output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-imix-{core}-ipsec-aes256gcm-ip4routing-scale-avf-{test_type}"
+#   data: "vpp-3n-icx-curr-iter"
 #   core: ["2t1c", ]
 #   include:
-#     - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Avf-Ethip6-Ip6Base-Ndrpdr.78B-{core}-avf-ethip6-ip6base-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Avf-Ethip6-Ip6Scale20K-Ndrpdr.78B-{core}-avf-ethip6-ip6scale20k-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Avf-Ethip6-Ip6Scale200K-Ndrpdr.78B-{core}-avf-ethip6-ip6scale200k-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Avf-Ethip6-Ip6Scale2M-Ndrpdr.78B-{core}-avf-ethip6-ip6scale2m-ndrpdr"
+#     - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.imix-{core}-avf-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
+#     - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.imix-{core}-avf-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr"
+#     - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec400Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.imix-{core}-avf-ethip4ipsec400tnlsw-ip4base-int-aes256gcm-ndrpdr"
+#     - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.imix-{core}-avf-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+#     - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec20000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.imix-{core}-avf-ethip4ipsec20000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+#     - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.imix-{core}-avf-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
 #   layout:
-#     title: "2n-icx-e810cq-78b-{core}-ip6routing-base-scale-avf-{test_type}"
+#     title: "3n-icx-e810cq-imix-{core}-ipsec-aes256gcm-ip4routing-scale-avf-{test_type}"
 #     layout: "plot-throughput"
 #
 # - type: "plot"
-#   title: "Throughput: 2n-icx-e810cq-78b-{core}-ip6routing-base-scale-dpdk-{test_type}"
+#   title: "Throughput: 3n-icx-e810cq-64b-{core}-ip4tunnel-base-avf-{test_type}"
 #   algorithm: "plot_ndrpdr_box_name"
-#   output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-78b-{core}-ip6routing-base-scale-dpdk-{test_type}"
-#   data: "plot-vpp-throughput-lat-tsa-2n-icx"
+#   output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-64b-{core}-ip4tunnel-base-avf-{test_type}"
+#   data: "vpp-3n-icx-curr-iter"
 #   core: ["2t1c", ]
 #   include:
-#     - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Ethip6-Ip6Base-Ndrpdr.78B-{core}-ethip6-ip6base-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Ethip6-Ip6Scale20K-Ndrpdr.78B-{core}-ethip6-ip6scale20k-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Ethip6-Ip6Scale200K-Ndrpdr.78B-{core}-ethip6-ip6scale200k-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Ethip6-Ip6Scale2M-Ndrpdr.78B-{core}-ethip6-ip6scale2m-ndrpdr"
+#     - "Tests.Vpp.Perf.Ip4 Tunnels.100Ge2P1E810Cq-Avf-Ethip4Vxlan-L2Xcbase-Ndrpdr.64B-{core}-avf-ethip4vxlan-l2xcbase-ndrpdr"
+#     - "Tests.Vpp.Perf.Ip4 Tunnels.100Ge2P1E810Cq-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Ndrpdr.64B-{core}-avf-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
 #   layout:
-#     title: "2n-icx-e810cq-78b-{core}-ip6routing-base-scale-dpdk-{test_type}"
+#     title: "3n-icx-e810cq-64b-{core}-ip4tunnel-base-avf-{test_type}"
 #     layout: "plot-throughput"
 #
 # - type: "plot"
-#   title: "Throughput: 2n-icx-e810cq-64b-{core}-l2switching-base-scale-avf-{test_type}"
+#   title: "Throughput: 3n-icx-e810cq-1518b-{core}-ip4tunnel-base-avf-{test_type}"
 #   algorithm: "plot_ndrpdr_box_name"
-#   output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-{core}-l2switching-base-scale-avf-{test_type}"
-#   data: "plot-vpp-throughput-lat-tsa-2n-icx"
+#   output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-1518b-{core}-ip4tunnel-base-avf-{test_type}"
+#   data: "vpp-3n-icx-curr-iter"
 #   core: ["2t1c", ]
 #   include:
-#     - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Patch-Ndrpdr.64B-{core}-avf-eth-l2patch-ndrpdr"
-#     - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Xcbase-Ndrpdr.64B-{core}-avf-eth-l2xcbase-ndrpdr"
-#     - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-ndrpdr"
-#     - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-{core}-avf-eth-l2bdscale10kmaclrn-ndrpdr"
-#     - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-{core}-avf-eth-l2bdscale100kmaclrn-ndrpdr"
-#     - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-{core}-avf-eth-l2bdscale1mmaclrn-ndrpdr"
+#     - "Tests.Vpp.Perf.Ip4 Tunnels.100Ge2P1E810Cq-Avf-Ethip4Vxlan-L2Xcbase-Ndrpdr.1518b-{core}-avf-ethip4vxlan-l2xcbase-ndrpdr"
+#     - "Tests.Vpp.Perf.Ip4 Tunnels.100Ge2P1E810Cq-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Ndrpdr.1518b-{core}-avf-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
 #   layout:
-#     title: "2n-icx-e810cq-64b-{core}-l2switching-base-scale-avf-{test_type}"
+#     title: "3n-icx-e810cq-1518b-{core}-ip4tunnel-base-avf-{test_type}"
 #     layout: "plot-throughput"
 #
 # - type: "plot"
-#   title: "Throughput: 2n-icx-e810cq-64b-{core}-l2switching-base-scale-dpdk-{test_type}"
+#   title: "Throughput: 3n-icx-e810cq-imix-{core}-ip4tunnel-base-avf-{test_type}"
 #   algorithm: "plot_ndrpdr_box_name"
-#   output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-{core}-l2switching-base-scale-dpdk-{test_type}"
-#   data: "plot-vpp-throughput-lat-tsa-2n-icx"
+#   output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-imix-{core}-ip4tunnel-base-avf-{test_type}"
+#   data: "vpp-3n-icx-curr-iter"
 #   core: ["2t1c", ]
 #   include:
-#     - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Eth-L2Patch-Ndrpdr.64B-{core}-eth-l2patch-ndrpdr"
-#     - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Eth-L2Xcbase-Ndrpdr.64B-{core}-eth-l2xcbase-ndrpdr"
-#     - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Eth-L2Bdbasemaclrn-Ndrpdr.64B-{core}-eth-l2bdbasemaclrn-ndrpdr"
-#     - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-{core}-eth-l2bdscale10kmaclrn-ndrpdr"
-#     - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-{core}-eth-l2bdscale100kmaclrn-ndrpdr"
-#     - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-{core}-eth-l2bdscale1mmaclrn-ndrpdr"
+#     - "Tests.Vpp.Perf.Ip4 Tunnels.100Ge2P1E810Cq-Avf-Ethip4Vxlan-L2Xcbase-Ndrpdr.imix-{core}-avf-ethip4vxlan-l2xcbase-ndrpdr"
+#     - "Tests.Vpp.Perf.Ip4 Tunnels.100Ge2P1E810Cq-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Ndrpdr.imix-{core}-avf-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
 #   layout:
-#     title: "2n-icx-e810cq-64b-{core}-l2switching-base-scale-dpdk-{test_type}"
+#     title: "3n-icx-e810cq-imix-{core}-ip4tunnel-base-avf-{test_type}"
 #     layout: "plot-throughput"
 #
 # - type: "plot"
-#   title: "Speedup: 2n-icx-e810cq-64b-ip4routing-base-scale-avf-{test_type}-tsa"
+#   title: "Speedup: 3n-icx-e810cq-64b-ipsec-aes128gcm-ip4routing-scale-avf-{test_type}-tsa"
 #   algorithm: "plot_tsa_name"
-#   output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-ip4routing-base-scale-avf-{test_type}-tsa"
-#   data: "plot-vpp-throughput-lat-tsa-2n-icx"
+#   output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-64b-ipsec-aes128gcm-ip4routing-scale-avf-{test_type}-tsa"
+#   data: "vpp-3n-icx-curr-iter"
 #   include:
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4-Ip4Base-Ndrpdr.64B-.t.c-avf-ethip4-ip4base-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4-Ip4Scale20K-Ndrpdr.64B-.t.c-avf-ethip4-ip4scale20k-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4-Ip4Scale200K-Ndrpdr.64B-.t.c-avf-ethip4-ip4scale200k-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-.t.c-avf-ethip4-ip4scale2m-ndrpdr"
+#     - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.64B-.t.c-avf-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-ndrpdr"
+#     - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.64B-.t.c-avf-ethip4ipsec40tnlsw-ip4base-int-aes128gcm-ndrpdr"
+#     - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec400Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.64B-.t.c-avf-ethip4ipsec400tnlsw-ip4base-int-aes128gcm-ndrpdr"
+#     - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.64B-.t.c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-ndrpdr"
+#     - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec20000Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.64B-.t.c-avf-ethip4ipsec20000tnlsw-ip4base-int-aes128gcm-ndrpdr"
+#     - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.64B-.t.c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-ndrpdr"
 #   layout:
-#     title: "2n-icx-e810cq-64b-ip4routing-base-scale-avf-{test_type}"
+#     title: "3n-icx-e810cq-64b-ipsec-aes128gcm-ip4routing-scale-avf-{test_type}"
 #     layout: "plot-throughput-speedup-analysis"
 #
 # - type: "plot"
-#   title: "Speedup: 2n-icx-e810cq-64b-ip4routing-base-scale-dpdk-{test_type}-tsa"
+#   title: "Speedup: 3n-icx-e810cq-1518b-ipsec-aes128gcm-ip4routing-scale-avf-{test_type}-tsa"
 #   algorithm: "plot_tsa_name"
-#   output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-ip4routing-base-scale-dpdk-{test_type}-tsa"
-#   data: "plot-vpp-throughput-lat-tsa-2n-icx"
+#   output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-1518b-ipsec-aes128gcm-ip4routing-scale-avf-{test_type}-tsa"
+#   data: "vpp-3n-icx-curr-iter"
 #   include:
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Ethip4-Ip4Base-Ndrpdr.64B-.t.c-ethip4-ip4base-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Ethip4-Ip4Scale20K-Ndrpdr.64B-.t.c-ethip4-ip4scale20k-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Ethip4-Ip4Scale200K-Ndrpdr.64B-.t.c-ethip4-ip4scale200k-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Ethip4-Ip4Scale2M-Ndrpdr.64B-.t.c-ethip4-ip4scale2m-ndrpdr"
+#     - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.1518b-.t.c-avf-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-ndrpdr"
+#     - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.1518b-.t.c-avf-ethip4ipsec40tnlsw-ip4base-int-aes128gcm-ndrpdr"
+#     - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec400Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.1518b-.t.c-avf-ethip4ipsec400tnlsw-ip4base-int-aes128gcm-ndrpdr"
+#     - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.1518b-.t.c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-ndrpdr"
+#     - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec20000Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.1518b-.t.c-avf-ethip4ipsec20000tnlsw-ip4base-int-aes128gcm-ndrpdr"
+#     - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.1518b-.t.c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-ndrpdr"
 #   layout:
-#     title: "2n-icx-e810cq-64b-ip4routing-base-scale-dpdk-{test_type}"
+#     title: "3n-icx-e810cq-1518b-ipsec-aes128gcm-ip4routing-scale-avf-{test_type}"
 #     layout: "plot-throughput-speedup-analysis"
 #
 # - type: "plot"
-#   title: "Speedup: 2n-icx-e810cq-78b-ip6routing-base-scale-avf-{test_type}-tsa"
+#   title: "Speedup: 3n-icx-e810cq-imix-ipsec-aes128gcm-ip4routing-scale-avf-{test_type}-tsa"
 #   algorithm: "plot_tsa_name"
-#   output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-78b-ip6routing-base-scale-avf-{test_type}-tsa"
-#   data: "plot-vpp-throughput-lat-tsa-2n-icx"
+#   output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-imix-ipsec-aes128gcm-ip4routing-scale-avf-{test_type}-tsa"
+#   data: "vpp-3n-icx-curr-iter"
 #   include:
-#     - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Avf-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-avf-ethip6-ip6base-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Avf-Ethip6-Ip6Scale20K-Ndrpdr.78B-.t.c-avf-ethip6-ip6scale20k-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Avf-Ethip6-Ip6Scale200K-Ndrpdr.78B-.t.c-avf-ethip6-ip6scale200k-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Avf-Ethip6-Ip6Scale2M-Ndrpdr.78B-.t.c-avf-ethip6-ip6scale2m-ndrpdr"
+#     - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.imix-.t.c-avf-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-ndrpdr"
+#     - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.imix-.t.c-avf-ethip4ipsec40tnlsw-ip4base-int-aes128gcm-ndrpdr"
+#     - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec400Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.imix-.t.c-avf-ethip4ipsec400tnlsw-ip4base-int-aes128gcm-ndrpdr"
+#     - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.imix-.t.c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-ndrpdr"
+#     - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec20000Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.imix-.t.c-avf-ethip4ipsec20000tnlsw-ip4base-int-aes128gcm-ndrpdr"
+#     - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.imix-.t.c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-ndrpdr"
 #   layout:
-#     title: "2n-icx-e810cq-78b-ip6routing-base-scale-avf-{test_type}"
+#     title: "3n-icx-e810cq-imix-ipsec-aes128gcm-ip4routing-scale-avf-{test_type}"
 #     layout: "plot-throughput-speedup-analysis"
 #
 # - type: "plot"
-#   title: "Speedup: 2n-icx-e810cq-78b-ip6routing-base-scale-dpdk-{test_type}-tsa"
+#   title: "Speedup: 3n-icx-e810cq-64b-ipsec-aes256gcm-ip4routing-scale-avf-{test_type}-tsa"
 #   algorithm: "plot_tsa_name"
-#   output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-78b-ip6routing-base-scale-dpdk-{test_type}-tsa"
-#   data: "plot-vpp-throughput-lat-tsa-2n-icx"
+#   output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-64b-ipsec-aes256gcm-ip4routing-scale-avf-{test_type}-tsa"
+#   data: "vpp-3n-icx-curr-iter"
 #   include:
-#     - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-ethip6-ip6base-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Ethip6-Ip6Scale20K-Ndrpdr.78B-.t.c-ethip6-ip6scale20k-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Ethip6-Ip6Scale200K-Ndrpdr.78B-.t.c-ethip6-ip6scale200k-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Ethip6-Ip6Scale2M-Ndrpdr.78B-.t.c-ethip6-ip6scale2m-ndrpdr"
+#     - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.64B-.t.c-avf-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
+#     - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.64B-.t.c-avf-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr"
+#     - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec400Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.64B-.t.c-avf-ethip4ipsec400tnlsw-ip4base-int-aes256gcm-ndrpdr"
+#     - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.64B-.t.c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+#     - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec20000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.64B-.t.c-avf-ethip4ipsec20000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+#     - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.64B-.t.c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
 #   layout:
-#     title: "2n-icx-e810cq-78b-ip6routing-base-scale-dpdk-{test_type}"
+#     title: "3n-icx-e810cq-64b-ipsec-aes256gcm-ip4routing-scale-avf-{test_type}"
 #     layout: "plot-throughput-speedup-analysis"
 #
 # - type: "plot"
-#   title: "Speedup: 2n-icx-e810cq-64b-l2switching-base-scale-avf-{test_type}-tsa"
+#   title: "Speedup: 3n-icx-e810cq-1518b-ipsec-aes256gcm-ip4routing-scale-avf-{test_type}-tsa"
 #   algorithm: "plot_tsa_name"
-#   output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-l2switching-base-scale-avf-{test_type}-tsa"
-#   data: "plot-vpp-throughput-lat-tsa-2n-icx"
+#   output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-1518b-ipsec-aes256gcm-ip4routing-scale-avf-{test_type}-tsa"
+#   data: "vpp-3n-icx-curr-iter"
 #   include:
-#     - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Patch-Ndrpdr.64B-.t.c-avf-eth-l2patch-ndrpdr"
-#     - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Xcbase-Ndrpdr.64B-.t.c-avf-eth-l2xcbase-ndrpdr"
-#     - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-avf-eth-l2bdbasemaclrn-ndrpdr"
-#     - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-.t.c-avf-eth-l2bdscale10kmaclrn-ndrpdr"
-#     - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-.t.c-avf-eth-l2bdscale100kmaclrn-ndrpdr"
-#     - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-.t.c-avf-eth-l2bdscale1mmaclrn-ndrpdr"
+#     - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518b-.t.c-avf-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
+#     - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518b-.t.c-avf-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr"
+#     - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec400Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518b-.t.c-avf-ethip4ipsec400tnlsw-ip4base-int-aes256gcm-ndrpdr"
+#     - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518b-.t.c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+#     - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec20000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518b-.t.c-avf-ethip4ipsec20000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+#     - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518b-.t.c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
 #   layout:
-#     title: "2n-icx-e810cq-64b-l2switching-base-scale-avf-{test_type}"
+#     title: "3n-icx-e810cq-1518b-ipsec-aes256gcm-ip4routing-scale-avf-{test_type}"
 #     layout: "plot-throughput-speedup-analysis"
 #
 # - type: "plot"
-#   title: "Speedup: 2n-icx-e810cq-64b-l2switching-base-scale-dpdk-{test_type}-tsa"
+#   title: "Speedup: 3n-icx-e810cq-imix-ipsec-aes256gcm-ip4routing-scale-avf-{test_type}-tsa"
 #   algorithm: "plot_tsa_name"
-#   output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-l2switching-base-scale-dpdk-{test_type}-tsa"
-#   data: "plot-vpp-throughput-lat-tsa-2n-icx"
+#   output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-imix-ipsec-aes256gcm-ip4routing-scale-avf-{test_type}-tsa"
+#   data: "vpp-3n-icx-curr-iter"
 #   include:
-#     - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Eth-L2Patch-Ndrpdr.64B-.t.c-eth-l2patch-ndrpdr"
-#     - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Eth-L2Xcbase-Ndrpdr.64B-.t.c-eth-l2xcbase-ndrpdr"
-#     - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-ndrpdr"
-#     - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-.t.c-eth-l2bdscale10kmaclrn-ndrpdr"
-#     - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-.t.c-eth-l2bdscale100kmaclrn-ndrpdr"
-#     - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-.t.c-eth-l2bdscale1mmaclrn-ndrpdr"
+#     - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.imix-.t.c-avf-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
+#     - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.imix-.t.c-avf-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr"
+#     - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec400Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.imix-.t.c-avf-ethip4ipsec400tnlsw-ip4base-int-aes256gcm-ndrpdr"
+#     - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.imix-.t.c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+#     - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec20000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.imix-.t.c-avf-ethip4ipsec20000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+#     - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.imix-.t.c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
 #   layout:
-#     title: "2n-icx-e810cq-64b-l2switching-base-scale-dpdk-{test_type}"
+#     title: "3n-icx-e810cq-imix-ipsec-aes256gcm-ip4routing-scale-avf-{test_type}"
+#     layout: "plot-throughput-speedup-analysis"
+#
+# - type: "plot"
+#   title: "Speedup: 3n-icx-e810cq-64b-ip4tunnel-base-avf-{test_type}-tsa"
+#   algorithm: "plot_tsa_name"
+#   output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-64b-ip4tunnel-base-avf-{test_type}-tsa"
+#   data: "vpp-3n-icx-curr-iter"
+#   include:
+#     - "Tests.Vpp.Perf.Ip4 Tunnels.100Ge2P1E810Cq-Avf-Ethip4Vxlan-L2Xcbase-Ndrpdr.64B-.t.c-avf-ethip4vxlan-l2xcbase-ndrpdr"
+#     - "Tests.Vpp.Perf.Ip4 Tunnels.100Ge2P1E810Cq-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-avf-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
+#   layout:
+#     title: "3n-icx-e810cq-64b-ip4tunnel-base-avf-{test_type}"
+#     layout: "plot-throughput-speedup-analysis"
+#
+# - type: "plot"
+#   title: "Speedup: 3n-icx-e810cq-1518b-ip4tunnel-base-avf-{test_type}-tsa"
+#   algorithm: "plot_tsa_name"
+#   output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-1518b-ip4tunnel-base-avf-{test_type}-tsa"
+#   data: "vpp-3n-icx-curr-iter"
+#   include:
+#     - "Tests.Vpp.Perf.Ip4 Tunnels.100Ge2P1E810Cq-Avf-Ethip4Vxlan-L2Xcbase-Ndrpdr.1518b-.t.c-avf-ethip4vxlan-l2xcbase-ndrpdr"
+#     - "Tests.Vpp.Perf.Ip4 Tunnels.100Ge2P1E810Cq-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Ndrpdr.1518b-.t.c-avf-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
+#   layout:
+#     title: "3n-icx-e810cq-1518b-ip4tunnel-base-avf-{test_type}"
+#     layout: "plot-throughput-speedup-analysis"
+#
+# - type: "plot"
+#   title: "Speedup: 3n-icx-e810cq-imix-ip4tunnel-base-avf-{test_type}-tsa"
+#   algorithm: "plot_tsa_name"
+#   output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-imix-ip4tunnel-base-avf-{test_type}-tsa"
+#   data: "vpp-3n-icx-curr-iter"
+#   include:
+#     - "Tests.Vpp.Perf.Ip4 Tunnels.100Ge2P1E810Cq-Avf-Ethip4Vxlan-L2Xcbase-Ndrpdr.imix-.t.c-avf-ethip4vxlan-l2xcbase-ndrpdr"
+#     - "Tests.Vpp.Perf.Ip4 Tunnels.100Ge2P1E810Cq-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Ndrpdr.imix-.t.c-avf-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
+#   layout:
+#     title: "3n-icx-e810cq-imix-ip4tunnel-base-avf-{test_type}"
 #     layout: "plot-throughput-speedup-analysis"
-
-# 3n-icx
-
-- type: "plot"
-  title: "Throughput: 3n-icx-e810cq-64b-{core}-ipsec-aes128gcm-ip4routing-scale-avf-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-64b-{core}-ipsec-aes128gcm-ip4routing-scale-avf-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-3n-icx"
-  core: ["2t1c", ]
-  include:
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.64B-{core}-avf-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.64B-{core}-avf-ethip4ipsec40tnlsw-ip4base-int-aes128gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec400Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.64B-{core}-avf-ethip4ipsec400tnlsw-ip4base-int-aes128gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.64B-{core}-avf-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec20000Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.64B-{core}-avf-ethip4ipsec20000tnlsw-ip4base-int-aes128gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.64B-{core}-avf-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-ndrpdr"
-  layout:
-    title: "3n-icx-e810cq-64b-{core}-ipsec-aes128gcm-ip4routing-scale-avf-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Throughput: 3n-icx-e810cq-1518b-{core}-ipsec-aes128gcm-ip4routing-scale-avf-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-1518b-{core}-ipsec-aes128gcm-ip4routing-scale-avf-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-3n-icx"
-  core: ["2t1c", ]
-  include:
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.1518b-{core}-avf-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.1518b-{core}-avf-ethip4ipsec40tnlsw-ip4base-int-aes128gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec400Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.1518b-{core}-avf-ethip4ipsec400tnlsw-ip4base-int-aes128gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.1518b-{core}-avf-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec20000Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.1518b-{core}-avf-ethip4ipsec20000tnlsw-ip4base-int-aes128gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.1518b-{core}-avf-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-ndrpdr"
-  layout:
-    title: "3n-icx-e810cq-1518b-{core}-ipsec-aes128gcm-ip4routing-scale-avf-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Throughput: 3n-icx-e810cq-imix-{core}-ipsec-aes128gcm-ip4routing-scale-avf-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-imix-{core}-ipsec-aes128gcm-ip4routing-scale-avf-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-3n-icx"
-  core: ["2t1c", ]
-  include:
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.imix-{core}-avf-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.imix-{core}-avf-ethip4ipsec40tnlsw-ip4base-int-aes128gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec400Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.imix-{core}-avf-ethip4ipsec400tnlsw-ip4base-int-aes128gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.imix-{core}-avf-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec20000Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.imix-{core}-avf-ethip4ipsec20000tnlsw-ip4base-int-aes128gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.imix-{core}-avf-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-ndrpdr"
-  layout:
-    title: "3n-icx-e810cq-imix-{core}-ipsec-aes128gcm-ip4routing-scale-avf-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Throughput: 3n-icx-e810cq-64b-{core}-ipsec-aes256gcm-ip4routing-scale-avf-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-64b-{core}-ipsec-aes256gcm-ip4routing-scale-avf-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-3n-icx"
-  core: ["2t1c", ]
-  include:
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.64B-{core}-avf-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.64B-{core}-avf-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec400Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.64B-{core}-avf-ethip4ipsec400tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.64B-{core}-avf-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec20000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.64B-{core}-avf-ethip4ipsec20000tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.64B-{core}-avf-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
-  layout:
-    title: "3n-icx-e810cq-64b-{core}-ipsec-aes256gcm-ip4routing-scale-avf-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Throughput: 3n-icx-e810cq-1518b-{core}-ipsec-aes256gcm-ip4routing-scale-avf-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-1518b-{core}-ipsec-aes256gcm-ip4routing-scale-avf-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-3n-icx"
-  core: ["2t1c", ]
-  include:
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518b-{core}-avf-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518b-{core}-avf-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec400Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518b-{core}-avf-ethip4ipsec400tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518b-{core}-avf-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec20000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518b-{core}-avf-ethip4ipsec20000tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518b-{core}-avf-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
-  layout:
-    title: "3n-icx-e810cq-1518b-{core}-ipsec-aes256gcm-ip4routing-scale-avf-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Throughput: 3n-icx-e810cq-imix-{core}-ipsec-aes256gcm-ip4routing-scale-avf-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-imix-{core}-ipsec-aes256gcm-ip4routing-scale-avf-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-3n-icx"
-  core: ["2t1c", ]
-  include:
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.imix-{core}-avf-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.imix-{core}-avf-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec400Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.imix-{core}-avf-ethip4ipsec400tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.imix-{core}-avf-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec20000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.imix-{core}-avf-ethip4ipsec20000tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.imix-{core}-avf-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
-  layout:
-    title: "3n-icx-e810cq-imix-{core}-ipsec-aes256gcm-ip4routing-scale-avf-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Throughput: 3n-icx-e810cq-64b-{core}-ip4tunnel-base-avf-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-64b-{core}-ip4tunnel-base-avf-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-3n-icx"
-  core: ["2t1c", ]
-  include:
-    - "Tests.Vpp.Perf.Ip4 Tunnels.100Ge2P1E810Cq-Avf-Ethip4Vxlan-L2Xcbase-Ndrpdr.64B-{core}-avf-ethip4vxlan-l2xcbase-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.100Ge2P1E810Cq-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Ndrpdr.64B-{core}-avf-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
-  layout:
-    title: "3n-icx-e810cq-64b-{core}-ip4tunnel-base-avf-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Throughput: 3n-icx-e810cq-1518b-{core}-ip4tunnel-base-avf-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-1518b-{core}-ip4tunnel-base-avf-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-3n-icx"
-  core: ["2t1c", ]
-  include:
-    - "Tests.Vpp.Perf.Ip4 Tunnels.100Ge2P1E810Cq-Avf-Ethip4Vxlan-L2Xcbase-Ndrpdr.1518b-{core}-avf-ethip4vxlan-l2xcbase-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.100Ge2P1E810Cq-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Ndrpdr.1518b-{core}-avf-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
-  layout:
-    title: "3n-icx-e810cq-1518b-{core}-ip4tunnel-base-avf-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Throughput: 3n-icx-e810cq-imix-{core}-ip4tunnel-base-avf-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-imix-{core}-ip4tunnel-base-avf-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-3n-icx"
-  core: ["2t1c", ]
-  include:
-    - "Tests.Vpp.Perf.Ip4 Tunnels.100Ge2P1E810Cq-Avf-Ethip4Vxlan-L2Xcbase-Ndrpdr.imix-{core}-avf-ethip4vxlan-l2xcbase-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.100Ge2P1E810Cq-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Ndrpdr.imix-{core}-avf-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
-  layout:
-    title: "3n-icx-e810cq-imix-{core}-ip4tunnel-base-avf-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Speedup: 3n-icx-e810cq-64b-ipsec-aes128gcm-ip4routing-scale-avf-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-64b-ipsec-aes128gcm-ip4routing-scale-avf-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-icx"
-  include:
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.64B-.t.c-avf-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.64B-.t.c-avf-ethip4ipsec40tnlsw-ip4base-int-aes128gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec400Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.64B-.t.c-avf-ethip4ipsec400tnlsw-ip4base-int-aes128gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.64B-.t.c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec20000Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.64B-.t.c-avf-ethip4ipsec20000tnlsw-ip4base-int-aes128gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.64B-.t.c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-ndrpdr"
-  layout:
-    title: "3n-icx-e810cq-64b-ipsec-aes128gcm-ip4routing-scale-avf-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: 3n-icx-e810cq-1518b-ipsec-aes128gcm-ip4routing-scale-avf-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-1518b-ipsec-aes128gcm-ip4routing-scale-avf-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-icx"
-  include:
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.1518b-.t.c-avf-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.1518b-.t.c-avf-ethip4ipsec40tnlsw-ip4base-int-aes128gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec400Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.1518b-.t.c-avf-ethip4ipsec400tnlsw-ip4base-int-aes128gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.1518b-.t.c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec20000Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.1518b-.t.c-avf-ethip4ipsec20000tnlsw-ip4base-int-aes128gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.1518b-.t.c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-ndrpdr"
-  layout:
-    title: "3n-icx-e810cq-1518b-ipsec-aes128gcm-ip4routing-scale-avf-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: 3n-icx-e810cq-imix-ipsec-aes128gcm-ip4routing-scale-avf-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-imix-ipsec-aes128gcm-ip4routing-scale-avf-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-icx"
-  include:
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.imix-.t.c-avf-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.imix-.t.c-avf-ethip4ipsec40tnlsw-ip4base-int-aes128gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec400Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.imix-.t.c-avf-ethip4ipsec400tnlsw-ip4base-int-aes128gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.imix-.t.c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec20000Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.imix-.t.c-avf-ethip4ipsec20000tnlsw-ip4base-int-aes128gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Gcm-Ndrpdr.imix-.t.c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-ndrpdr"
-  layout:
-    title: "3n-icx-e810cq-imix-ipsec-aes128gcm-ip4routing-scale-avf-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: 3n-icx-e810cq-64b-ipsec-aes256gcm-ip4routing-scale-avf-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-64b-ipsec-aes256gcm-ip4routing-scale-avf-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-icx"
-  include:
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.64B-.t.c-avf-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.64B-.t.c-avf-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec400Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.64B-.t.c-avf-ethip4ipsec400tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.64B-.t.c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec20000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.64B-.t.c-avf-ethip4ipsec20000tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.64B-.t.c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
-  layout:
-    title: "3n-icx-e810cq-64b-ipsec-aes256gcm-ip4routing-scale-avf-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: 3n-icx-e810cq-1518b-ipsec-aes256gcm-ip4routing-scale-avf-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-1518b-ipsec-aes256gcm-ip4routing-scale-avf-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-icx"
-  include:
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518b-.t.c-avf-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518b-.t.c-avf-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec400Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518b-.t.c-avf-ethip4ipsec400tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518b-.t.c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec20000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518b-.t.c-avf-ethip4ipsec20000tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518b-.t.c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
-  layout:
-    title: "3n-icx-e810cq-1518b-ipsec-aes256gcm-ip4routing-scale-avf-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: 3n-icx-e810cq-imix-ipsec-aes256gcm-ip4routing-scale-avf-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-imix-ipsec-aes256gcm-ip4routing-scale-avf-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-icx"
-  include:
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.imix-.t.c-avf-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.imix-.t.c-avf-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec400Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.imix-.t.c-avf-ethip4ipsec400tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.imix-.t.c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec20000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.imix-.t.c-avf-ethip4ipsec20000tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.imix-.t.c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
-  layout:
-    title: "3n-icx-e810cq-imix-ipsec-aes256gcm-ip4routing-scale-avf-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: 3n-icx-e810cq-64b-ip4tunnel-base-avf-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-64b-ip4tunnel-base-avf-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-icx"
-  include:
-    - "Tests.Vpp.Perf.Ip4 Tunnels.100Ge2P1E810Cq-Avf-Ethip4Vxlan-L2Xcbase-Ndrpdr.64B-.t.c-avf-ethip4vxlan-l2xcbase-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.100Ge2P1E810Cq-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-avf-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
-  layout:
-    title: "3n-icx-e810cq-64b-ip4tunnel-base-avf-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: 3n-icx-e810cq-1518b-ip4tunnel-base-avf-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-1518b-ip4tunnel-base-avf-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-icx"
-  include:
-    - "Tests.Vpp.Perf.Ip4 Tunnels.100Ge2P1E810Cq-Avf-Ethip4Vxlan-L2Xcbase-Ndrpdr.1518b-.t.c-avf-ethip4vxlan-l2xcbase-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.100Ge2P1E810Cq-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Ndrpdr.1518b-.t.c-avf-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
-  layout:
-    title: "3n-icx-e810cq-1518b-ip4tunnel-base-avf-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: 3n-icx-e810cq-imix-ip4tunnel-base-avf-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-imix-ip4tunnel-base-avf-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-icx"
-  include:
-    - "Tests.Vpp.Perf.Ip4 Tunnels.100Ge2P1E810Cq-Avf-Ethip4Vxlan-L2Xcbase-Ndrpdr.imix-.t.c-avf-ethip4vxlan-l2xcbase-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.100Ge2P1E810Cq-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Ndrpdr.imix-.t.c-avf-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
-  layout:
-    title: "3n-icx-e810cq-imix-ip4tunnel-base-avf-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
 
 # Packet Throughput - DPDK
 
@@ -11640,8 +11532,8 @@
   title: "DPDK Throughput: 2n-clx-xxv710-64b-{core}-base-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,DPDK]}/2n-clx-xxv710-64b-{core}-base-{test_type}"
-  data: "plot-dpdk-throughput-latency-2n-clx"
-  core: ["1t1c", "4t2c"]
+  data: "dpdk-2n-clx-curr-iter"
+  core: ["2t1c", "4t2c"]
   include:
     - "tests.dpdk.perf.2n1l-25ge2p1xxv710-eth-l2xcbase-testpmd-ndrpdr.64b-{core}-eth-l2xcbase-testpmd-ndrpdr"
     - "tests.dpdk.perf.2n1l-25ge2p1xxv710-ethip4-ip4base-l3fwd-ndrpdr.64b-{core}-ethip4-ip4base-l3fwd-ndrpdr"
@@ -11653,8 +11545,8 @@
   title: "DPDK Throughput: 2n-clx-x710-64b-{core}-base-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,DPDK]}/2n-clx-x710-64b-{core}-base-{test_type}"
-  data: "plot-dpdk-throughput-latency-2n-clx"
-  core: ["1t1c", "4t2c"]
+  data: "dpdk-2n-clx-curr-iter"
+  core: ["2t1c", "4t2c"]
   include:
     - "tests.dpdk.perf.2n1l-10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.64b-{core}-eth-l2xcbase-testpmd-ndrpdr"
     - "tests.dpdk.perf.2n1l-10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.64b-{core}-ethip4-ip4base-l3fwd-ndrpdr"
@@ -11672,7 +11564,7 @@
   title: "Throughput: 2n-zn2-xxv710-64b-{core}-memif-base-avf-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-64b-{core}-memif-base-avf-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-zn2"
+  data: "vpp-2n-zn2-curr-iter"
   core: ["2t1c", ]
   include:
     - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-{core}-avf-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
@@ -11687,7 +11579,7 @@
   title: "Throughput: 2n-zn2-xxv710-64b-{core}-memif-base-dpdk-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-64b-{core}-memif-base-dpdk-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-zn2"
+  data: "vpp-2n-zn2-curr-iter"
   core: ["2t1c", ]
   include:
     - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-{core}-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
@@ -11702,7 +11594,7 @@
   title: "Throughput: 2n-zn2-cx556a-64b-{core}-rdma-l2-eth-2memif-1dcr-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-zn2-cx556a-64b-{core}-rdma-l2-eth-2memif-1dcr-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-zn2"
+  data: "vpp-2n-zn2-curr-iter"
   core: ["2t1c", ]
   include:
     - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-{core}-rdma-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
@@ -11714,27 +11606,26 @@
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 2n-zn2-x710-64b-{core}-ip4routing-base-scale-[avf,dpdk]-{test_type}"
+  title: "Throughput: 2n-zn2-x710-64b-{core}-ip4routing-base-scale-[avf,dpdk,af_xdp]-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-zn2-x710-64b-{core}-ip4routing-base-scale-[avf,dpdk]-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-zn2"
+  output-file: "{DIR[STATIC,VPP]}/2n-zn2-x710-64b-{core}-ip4routing-base-scale-[avf,dpdk,af_xdp]-{test_type}"
+  data: "vpp-2n-zn2-curr-iter"
   core: ["2t1c", ]
   include:
-    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Dot1Q-Ip4Base-Ndrpdr.64B-{core}-avf-dot1q-ip4base-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Base-Ndrpdr.64B-{core}-avf-ethip4-ip4base-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-{core}-avf-ethip4-ip4scale2m-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-Rnd-Ndrpdr.64B-{core}-avf-ethip4-ip4scale2m-rnd-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Dot1Q-Ip4Base-Ndrpdr.64B-{core}-dot1q-ip4base-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Base-Ndrpdr.64B-{core}-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-af-xdp-Ethip4-Ip4Base-Ndrpdr.64B-{core}-af-xdp-ethip4-ip4base-ndrpdr"
   layout:
-    title: "2n-zn2-x710-64b-{core}-ip4routing-base-scale-[avf,dpdk]-{test_type}"
+    title: "2n-zn2-x710-64b-{core}-ip4routing-base-scale-[avf,dpdk,af_xdp]-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
   title: "Throughput: 2n-zn2-xxv710-64b-{core}-ip4routing-base-scale-avf-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-64b-{core}-ip4routing-base-scale-avf-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-zn2"
+  data: "vpp-2n-zn2-curr-iter"
   core: ["2t1c", ]
   include:
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Ndrpdr.64B-{core}-avf-ethip4-ip4base-ndrpdr"
@@ -11748,11 +11639,29 @@
     title: "2n-zn2-xxv710-64b-{core}-ip4routing-base-scale-avf-{test_type}"
     layout: "plot-throughput"
 
+- type: "plot"
+  title: "Throughput: 2n-zn2-xxv710-64b-{core}-ip4routing-base-scale-af_xdp-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-64b-{core}-ip4routing-base-scale-af_xdp-{test_type}"
+  data: "vpp-2n-zn2-curr-iter"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-af-xdp-Ethip4-Ip4Base-Ndrpdr.64B-{core}-af-xdp-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-af-xdp-Ethip4-Ip4Scale20K-Ndrpdr.64B-{core}-af-xdp-ethip4-ip4scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-af-xdp-Ethip4-Ip4Scale20K-Rnd-Ndrpdr.64B-{core}-af-xdp-ethip4-ip4scale20k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-af-xdp-Ethip4-Ip4Scale200K-Ndrpdr.64B-{core}-af-xdp-ethip4-ip4scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-af-xdp-Ethip4-Ip4Scale200K-Rnd-Ndrpdr.64B-{core}-af-xdp-ethip4-ip4scale200k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-af-xdp-Ethip4-Ip4Scale2M-Ndrpdr.64B-{core}-af-xdp-ethip4-ip4scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-af-xdp-Ethip4-Ip4Scale2M-Rnd-Ndrpdr.64B-{core}-af-xdp-ethip4-ip4scale2m-rnd-ndrpdr"
+  layout:
+    title: "2n-zn2-xxv710-64b-{core}-ip4routing-base-scale-af_xdp-{test_type}"
+    layout: "plot-throughput"
+
 - type: "plot"
   title: "Throughput: 2n-zn2-xxv710-64b-{core}-ip4routing-base-scale-dpdk-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-64b-{core}-ip4routing-base-scale-dpdk-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-zn2"
+  data: "vpp-2n-zn2-curr-iter"
   core: ["2t1c", ]
   include:
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Dot1Q-Ip4Base-Ndrpdr.64B-{core}-dot1q-ip4base-ndrpdr"
@@ -11771,7 +11680,7 @@
   title: "Throughput: 2n-zn2-xxv710-64b-{core}-features-ip4routing-base-avf-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-64b-{core}-features-ip4routing-base-avf-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-zn2"
+  data: "vpp-2n-zn2-curr-iter"
   core: ["2t1c", ]
   include:
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-{core}-avf-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
@@ -11788,7 +11697,7 @@
   title: "Throughput: 2n-zn2-xxv710-64b-{core}-nat44det-ip4routing-stl-bidir-avf-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-64b-{core}-nat44det-ip4routing-stl-bidir-avf-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-zn2"
+  data: "vpp-2n-zn2-curr-iter"
   core: ["2t1c", ]
   include:
     - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr.64b-{core}-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr"
@@ -11804,7 +11713,7 @@
 #  title: "Throughput: 2n-zn2-xxv710-64b-{core}-nat44ed-ip4routing-stl-unidir-avf-{test_type}"
 #  algorithm: "plot_ndrpdr_box_name"
 #  output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-64b-{core}-nat44ed-ip4routing-stl-unidir-avf-{test_type}"
-#  data: "plot-vpp-throughput-lat-tsa-2n-zn2"
+#  data: "vpp-2n-zn2-curr-iter"
 #  core: ["2t1c", ]
 #  test-type: ["ndr", "pdr"]
 #  include:
@@ -11821,7 +11730,7 @@
 #  title: "Throughput: 2n-zn2-xxv710-64b-{core}-nat44ed-ip4routing-udp-stf-cps-avf-{test_type}"
 #  algorithm: "plot_ndrpdr_box_name"
 #  output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-64b-{core}-nat44ed-ip4routing-udp-stf-cps-avf-{test_type}"
-#  data: "plot-vpp-throughput-lat-tsa-2n-zn2"
+#  data: "vpp-2n-zn2-curr-iter"
 #  core: ["2t1c", ]
 #  test-type: ["ndr", "pdr"]
 #  include:
@@ -11843,7 +11752,7 @@
 #  title: "Throughput: 2n-zn2-xxv710-64b-{core}-nat44ed-ip4routing-udp-stf-pps-avf-{test_type}"
 #  algorithm: "plot_ndrpdr_box_name"
 #  output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-64b-{core}-nat44ed-ip4routing-udp-stf-pps-avf-{test_type}"
-#  data: "plot-vpp-throughput-lat-tsa-2n-zn2"
+#  data: "vpp-2n-zn2-curr-iter"
 #  core: ["2t1c", ]
 #  test-type: ["ndr", "pdr"]
 #  include:
@@ -11865,7 +11774,7 @@
 #  title: "Throughput: 2n-zn2-xxv710-64b-{core}-nat44ed-ip4routing-tcp-stf-cps-avf-{test_type}"
 #  algorithm: "plot_ndrpdr_box_name"
 #  output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-64b-{core}-nat44ed-ip4routing-tcp-stf-cps-avf-{test_type}"
-#  data: "plot-vpp-throughput-lat-tsa-2n-zn2"
+#  data: "vpp-2n-zn2-curr-iter"
 #  core: ["2t1c", ]
 #  test-type: ["ndr", "pdr"]
 #  include:
@@ -11887,7 +11796,7 @@
 #  title: "Throughput: 2n-zn2-xxv710-64b-{core}-nat44ed-ip4routing-tcp-stf-pps-avf-{test_type}"
 #  algorithm: "plot_ndrpdr_box_name"
 #  output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-64b-{core}-nat44ed-ip4routing-tcp-stf-pps-avf-{test_type}"
-#  data: "plot-vpp-throughput-lat-tsa-2n-zn2"
+#  data: "vpp-2n-zn2-curr-iter"
 #  core: ["2t1c", ]
 #  test-type: ["ndr", "pdr"]
 #  include:
@@ -11909,7 +11818,7 @@
   title: "Throughput: 2n-zn2-xxv710-64b-{core}-nat44det-ip4routing-stl-bidir-avf-pdr"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-64b-{core}-nat44det-ip4routing-stl-bidir-avf-pdr"
-  data: "plot-vpp-throughput-lat-tsa-2n-zn2"
+  data: "vpp-2n-zn2-curr-iter"
   core: ["2t1c", ]
   include:
     - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr.64b-{core}-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr"
@@ -11921,28 +11830,11 @@
     title: "2n-zn2-xxv710-64b-{core}-nat44det-ip4routing-stl-bidir-avf-pdr"
     layout: "plot-throughput"
 
-- type: "plot"
-  title: "Throughput: 2n-zn2-xxv710-64b-{core}-features-ip4routing-base-dpdk-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-64b-{core}-features-ip4routing-base-dpdk-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-zn2"
-  core: ["2t1c", ]
-  include:
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Ndrpdr.64B-{core}-ethip4-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-{core}-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-{core}-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-{core}-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-{core}-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-ethip4udp-nat44det-h1-p1-s1-Ndrpdr.64B-{core}-ethip4udp-nat44det-h1-p1-s1-ndrpdr"
-  layout:
-    title: "2n-zn2-xxv710-64b-{core}-features-ip4routing-base-dpdk-{test_type}"
-    layout: "plot-throughput"
-
 - type: "plot"
   title: "Throughput: 2n-zn2-cx556a-64b-{core}-rdma-ip4base-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-zn2-cx556a-64b-{core}-rdma-ip4base-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-zn2"
+  data: "vpp-2n-zn2-curr-iter"
   core: ["2t1c", ]
   include:
     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-Ip4Base-Ndrpdr.64B-{core}-rdma-dot1q-ip4base-ndrpdr"
@@ -11961,7 +11853,7 @@
   title: "Throughput: 2n-zn2-cx556a-64b-{core}-rdma-ethip4-features-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-zn2-cx556a-64b-{core}-rdma-ethip4-features-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-zn2"
+  data: "vpp-2n-zn2-curr-iter"
   core: ["2t1c", ]
   include:
     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-{core}-rdma-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
@@ -11978,7 +11870,7 @@
   title: "Throughput: 2n-zn2-xxv710-64b-{core}-ethip4--ethip4udpgeneve-avf-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-64b-{core}-ethip4--ethip4udpgeneve-avf-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-zn2"
+  data: "vpp-2n-zn2-curr-iter"
   core: ["2t1c", ]
   include:
     - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-1Tun-Ip4Base-Ndrpdr.64B-{core}-avf-ethip4--ethip4udpgeneve-1tun-ip4base-ndrpdr"
@@ -11991,31 +11883,28 @@
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 2n-zn2-x710-78b-{core}-ip6routing-base-scale-[avf,dpdk]-{test_type}"
+  title: "Throughput: 2n-zn2-x710-78b-{core}-ip6routing-base-scale-[avf,dpdk,af_xdp]-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-zn2-x710-78b-{core}-ip6routing-base-scale-[avf,dpdk]-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-zn2"
+  output-file: "{DIR[STATIC,VPP]}/2n-zn2-x710-78b-{core}-ip6routing-base-scale-[avf,dpdk,af_xdp]-{test_type}"
+  data: "vpp-2n-zn2-curr-iter"
   core: ["2t1c", ]
   include:
-    - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Dot1Q-Ip6Base-Ndrpdr.78B-{core}-avf-dot1q-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Base-Ndrpdr.78B-{core}-avf-ethip6-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-Ndrpdr.78B-{core}-avf-ethip6-ip6scale2m-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-rnd-Ndrpdr.78B-{core}-avf-ethip6-ip6scale2m-rnd-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Dot1Q-Ip6Base-Ndrpdr.78B-{core}-dot1q-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Base-Ndrpdr.78B-{core}-ethip6-ip6base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Scale2M-Ndrpdr.78B-{core}-ethip6-ip6scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-af-xdp-Ethip6-Ip6Base-Ndrpdr.78B-{core}-af-xdp-ethip6-ip6base-ndrpdr"
   layout:
-    title: "2n-zn2-x710-78b-{core}-ip6routing-base-scale-[avf,dpdk]-{test_type}"
+    title: "2n-zn2-x710-78b-{core}-ip6routing-base-scale-[avf,dpdk,af_xdp]-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
   title: "Throughput: 2n-zn2-xxv710-78b-{core}-ip6routing-base-scale-avf-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-78b-{core}-ip6routing-base-scale-avf-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-zn2"
+  data: "vpp-2n-zn2-curr-iter"
   core: ["2t1c", ]
   include:
-    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-Ip6Base-Ndrpdr.78B-{core}-avf-dot1q-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Base-Ndrpdr.78B-{core}-avf-ethip6-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale20K-Ndrpdr.78B-{core}-avf-ethip6-ip6scale20k-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale20K-rnd-Ndrpdr.78B-{core}-avf-ethip6-ip6scale20k-rnd-ndrpdr"
@@ -12027,11 +11916,29 @@
     title: "2n-zn2-xxv710-78b-{core}-ip6routing-base-scale-avf-{test_type}"
     layout: "plot-throughput"
 
+- type: "plot"
+  title: "Throughput: 2n-zn2-xxv710-78b-{core}-ip6routing-base-scale-af_xdp-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-78b-{core}-ip6routing-base-scale-af_xdp-{test_type}"
+  data: "vpp-2n-zn2-curr-iter"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-af-xdp-Ethip6-Ip6Base-Ndrpdr.78B-{core}-af-xdp-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-af-xdp-Ethip6-Ip6Scale20K-Ndrpdr.78B-{core}-af-xdp-ethip6-ip6scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-af-xdp-Ethip6-Ip6Scale20K-rnd-Ndrpdr.78B-{core}-af-xdp-ethip6-ip6scale20k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-af-xdp-Ethip6-Ip6Scale200K-Ndrpdr.78B-{core}-af-xdp-ethip6-ip6scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-af-xdp-Ethip6-Ip6Scale200K-rnd-Ndrpdr.78B-{core}-af-xdp-ethip6-ip6scale200k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-af-xdp-Ethip6-Ip6Scale2M-Ndrpdr.78B-{core}-af-xdp-ethip6-ip6scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-af-xdp-Ethip6-Ip6Scale2M-rnd-Ndrpdr.78B-{core}-af-xdp-ethip6-ip6scale2m-rnd-ndrpdr"
+  layout:
+    title: "2n-zn2-xxv710-78b-{core}-ip6routing-base-scale-af_xdp-{test_type}"
+    layout: "plot-throughput"
+
 - type: "plot"
   title: "Throughput: 2n-zn2-xxv710-78b-{core}-ip6routing-base-scale-dpdk-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-78b-{core}-ip6routing-base-scale-dpdk-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-zn2"
+  data: "vpp-2n-zn2-curr-iter"
   core: ["2t1c", ]
   include:
     - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Dot1Q-Ip6Base-Ndrpdr.78B-{core}-dot1q-ip6base-ndrpdr"
@@ -12050,7 +11957,7 @@
   title: "Throughput: 2n-zn2-cx556a-78b-{core}-rdma-ip6routing-base-scale-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-zn2-cx556a-78b-{core}-rdma-ip6routing-base-scale-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-zn2"
+  data: "vpp-2n-zn2-curr-iter"
   core: ["2t1c", ]
   include:
     - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-Ip6Base-Ndrpdr.78B-{core}-rdma-dot1q-ip6base-ndrpdr"
@@ -12063,42 +11970,25 @@
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 2n-zn2-x710-64b-{core}-l2switching-base-scale-avf-{test_type}"
+  title: "Throughput: 2n-zn2-x710-64b-{core}-l2switching-base-scale-[avf,dpdk,af_xdp]-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-zn2-x710-64b-{core}-l2switching-base-scale-avf-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-zn2"
+  output-file: "{DIR[STATIC,VPP]}/2n-zn2-x710-64b-{core}-l2switching-base-scale-{test_type}"
+  data: "vpp-2n-zn2-curr-iter"
   core: ["2t1c", ]
   include:
-    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-{core}-avf-dot1q-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Patch-Ndrpdr.64B-{core}-avf-eth-l2patch-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Xcbase-Ndrpdr.64B-{core}-avf-eth-l2xcbase-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-{core}-avf-eth-l2bdscale1mmaclrn-ndrpdr"
-  layout:
-    title: "2n-zn2-x710-64b-{core}-l2switching-base-scale-avf-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Throughput: 2n-zn2-x710-64b-{core}-l2switching-base-scale-dpdk-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-zn2-x710-64b-{core}-l2switching-base-scale-dpdk-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-zn2"
-  core: ["2t1c", ]
-  include:
-    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-{core}-dot1q-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Patch-Ndrpdr.64B-{core}-eth-l2patch-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Xcbase-Ndrpdr.64B-{core}-eth-l2xcbase-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-{core}-eth-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-{core}-eth-l2bdscale1mmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-af-xdp-Eth-L2Bdbasemaclrn-Ndrpdr.64B-{core}-af-xdp-eth-l2bdbasemaclrn-ndrpdr"
   layout:
-    title: "2n-zn2-x710-64b-{core}-l2switching-base-scale-dpdk-{test_type}"
+    title: "2n-zn2-x710-64b-{core}-l2switching-base-scale-[avf,dpdk,af_xdp]-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
   title: "Throughput: 2n-zn2-xxv710-64b-{core}-l2switching-base-avf-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-64b-{core}-l2switching-base-avf-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-zn2"
+  data: "vpp-2n-zn2-curr-iter"
   core: ["2t1c", ]
   include:
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Ndrpdr.64B-{core}-avf-dot1q-l2xcbase-ndrpdr"
@@ -12115,7 +12005,7 @@
   title: "Throughput: 2n-zn2-xxv710-64b-{core}-l2switching-base-scale-avf-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-64b-{core}-l2switching-base-scale-avf-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-zn2"
+  data: "vpp-2n-zn2-curr-iter"
   core: ["2t1c", ]
   include:
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-ndrpdr"
@@ -12126,11 +12016,28 @@
     title: "2n-zn2-xxv710-64b-{core}-l2switching-base-scale-avf-{test_type}"
     layout: "plot-throughput"
 
+- type: "plot"
+  title: "Throughput: 2n-zn2-xxv710-64b-{core}-l2switching-base-scale-af_xdp-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-64b-{core}-l2switching-base-scale-af_xdp-{test_type}"
+  data: "vpp-2n-zn2-curr-iter"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-af-xdp-Eth-L2Patch-Ndrpdr.64B-{core}-af-xdp-eth-l2patch-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-af-xdp-Eth-L2Xcbase-Ndrpdr.64B-{core}-af-xdp-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-af-xdp-Eth-L2Bdbasemaclrn-Ndrpdr.64B-{core}-af-xdp-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-af-xdp-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-{core}-af-xdp-eth-l2bdscale10kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-af-xdp-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-{core}-af-xdp-eth-l2bdscale100kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-af-xdp-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-{core}-af-xdp-eth-l2bdscale1mmaclrn-ndrpdr"
+  layout:
+    title: "2n-zn2-xxv710-64b-{core}-l2switching-base-scale-af_xdp-{test_type}"
+    layout: "plot-throughput"
+
 - type: "plot"
   title: "Throughput: 2n-zn2-xxv710-64b-{core}-l2switching-base-dpdk-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-64b-{core}-l2switching-base-dpdk-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-zn2"
+  data: "vpp-2n-zn2-curr-iter"
   core: ["2t1c", ]
   include:
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Xcbase-Ndrpdr.64B-{core}-dot1q-l2xcbase-ndrpdr"
@@ -12147,7 +12054,7 @@
   title: "Throughput: 2n-zn2-xxv710-64b-{core}-l2switching-base-scale-dpdk-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-64b-{core}-l2switching-base-scale-dpdk-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-zn2"
+  data: "vpp-2n-zn2-curr-iter"
   core: ["2t1c", ]
   include:
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-{core}-eth-l2bdbasemaclrn-ndrpdr"
@@ -12162,7 +12069,7 @@
   title: "Throughput: 2n-zn2-cx556a-64b-{core}-rdma-l2switching-base-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-zn2-cx556a-64b-{core}-rdma-l2switching-base-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-zn2"
+  data: "vpp-2n-zn2-curr-iter"
   core: ["2t1c", ]
   include:
     - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Xcbase-Ndrpdr.64B-{core}-rdma-dot1q-l2xcbase-ndrpdr"
@@ -12179,7 +12086,7 @@
   title: "Throughput: 2n-zn2-cx556a-64b-{core}-rdma-l2switching-scale-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-zn2-cx556a-64b-{core}-rdma-l2switching-scale-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-zn2"
+  data: "vpp-2n-zn2-curr-iter"
   core: ["2t1c", ]
   include:
     - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdbasemaclrn-Ndrpdr.64B-{core}-rdma-eth-l2bdbasemaclrn-ndrpdr"
@@ -12191,114 +12098,48 @@
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 2n-zn2-xxv710-64b-{core}-vhost-base-avf-{test_type}"
+  title: "Throughput: 2n-zn2-xxv710-64b-{core}-vhost-base-[avf,dpdk]-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-64b-{core}-vhost-base-avf-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-zn2"
+  output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-64b-{core}-vhost-base-{test_type}"
+  data: "vpp-2n-zn2-curr-iter"
   core: ["2t1c", ]
   include:
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-avf-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-avf-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
     - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
     - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-avf-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr"
-  layout:
-    title: "2n-zn2-xxv710-64b-{core}-vhost-base-avf-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Throughput: 2n-zn2-xxv710-64b-{core}-vhost-base-avf-vpp-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-64b-{core}-vhost-base-avf-vpp-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-zn2"
-  core: ["2t1c", ]
-  include:
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-avf-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-avf-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Vppip4-Ndrpdr.64B-{core}-avf-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr"
-  layout:
-    title: "2n-zn2-xxv710-64b-{core}-vhost-base-avf-vpp-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Throughput: 2n-zn2-xxv710-64b-{core}-vhost-base-dpdk-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-64b-{core}-vhost-base-dpdk-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-zn2"
-  core: ["2t1c", ]
-  include:
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
     - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
     - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr"
   layout:
-    title: "2n-zn2-xxv710-64b-{core}-vhost-base-dpdk-{test_type}"
+    title: "2n-zn2-xxv710-64b-{core}-vhost-base-[avf,dpdk]-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 2n-zn2-xxv710-64b-{core}-vhost-base-dpdk-vpp-{test_type}"
+  title: "Throughput: 2n-zn2-xxv710-64b-{core}-vhost-base-[avf,dpdk]-vpp-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-64b-{core}-vhost-base-dpdk-vpp-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-zn2"
+  output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-64b-{core}-vhost-base-vpp-{test_type}"
+  data: "vpp-2n-zn2-curr-iter"
   core: ["2t1c", ]
   include:
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
     - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
     - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Vppip4-Ndrpdr.64B-{core}-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr"
   layout:
-    title: "2n-zn2-xxv710-64b-{core}-vhost-base-dpdk-vpp-{test_type}"
+    title: "2n-zn2-xxv710-64b-{core}-vhost-base-[avf,dpdk]-vpp-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
   title: "Throughput: 2n-zn2-cx556a-64b-{core}-rdma-l2-vhost-base-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-zn2-cx556a-64b-{core}-rdma-l2-vhost-base-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-zn2"
+  data: "vpp-2n-zn2-curr-iter"
   core: ["2t1c", ]
   include:
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-rdma-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-rdma-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
     - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-rdma-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
     - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-rdma-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-  layout:
-    title: "2n-zn2-cx556a-64b-{core}-rdma-l2-vhost-base-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Throughput: 2n-zn2-cx556a-64b-{core}-rdma-l2-vhost-vppl2xc-base-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-zn2-cx556a-64b-{core}-rdma-l2-vhost-vppl2xc-base-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-zn2"
-  core: ["2t1c", ]
-  include:
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-rdma-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-rdma-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
     - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-rdma-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
     - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-rdma-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
   layout:
-    title: "2n-zn2-cx556a-64b-{core}-rdma-l2-vhost-vppl2xc-base-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Throughput: 2n-zn2-xxv710-114b-{core}-vts-l2switching-base-dpdk-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-114b-{core}-vts-l2switching-base-dpdk-{test_type}"
-  data: "plot-vpp-throughput-lat-tsa-2n-zn2"
-  core: ["2t1c", ]
-  include:
-    - "Tests.Vpp.Perf.Vts.2N1L-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermit-2Vhostvr1024-1Vm-Ndrpdr.114B-{core}-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vts.2N1L-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermitreflect-2Vhostvr1024-1Vm-Ndrpdr.114B-{core}-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vts.2N1L-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Noacl-2Vhostvr1024-1Vm-Ndrpdr.114B-{core}-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Noacl-2Vhostvr1024-1Vm-Ndrpdr.114B-{core}-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermit-2Vhostvr1024-1Vm-Ndrpdr.114B-{core}-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermitreflect-2Vhostvr1024-1Vm-Ndrpdr.114B-{core}-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr"
-  layout:
-    title: "2n-zn2-xxv710-114b-{core}-vts-l2switching-base-[avf,dpdk]-{test_type}"
+    title: "2n-zn2-cx556a-64b-{core}-rdma-l2-vhost-base-{test_type}"
     layout: "plot-throughput"
 
 ################################################################################
@@ -12309,7 +12150,7 @@
   title: "Speedup: 2n-zn2-xxv710-64b-memif-base-avf-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-64b-memif-base-avf-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-zn2"
+  data: "vpp-2n-zn2-curr-iter"
   include:
     - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-.t.c-avf-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
     - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-.t.c-avf-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
@@ -12323,7 +12164,7 @@
   title: "Speedup: 2n-zn2-xxv710-64b-memif-base-dpdk-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-64b-memif-base-dpdk-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-zn2"
+  data: "vpp-2n-zn2-curr-iter"
   include:
     - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-.t.c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
     - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-.t.c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
@@ -12337,7 +12178,7 @@
   title: "Speedup: 2n-zn2-cx556a-64b-rdma-l2-eth-2memif-1dcr-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-zn2-cx556a-64b-rdma-l2-eth-2memif-1dcr-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-zn2"
+  data: "vpp-2n-zn2-curr-iter"
   include:
     - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-.t.c-rdma-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
     - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-.t.c-rdma-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
@@ -12348,26 +12189,25 @@
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 2n-zn2-x710-64b-ip4routing-base-scale-[avf,dpdk]-{test_type}-tsa"
+  title: "Speedup: 2n-zn2-x710-64b-ip4routing-base-scale-[avf,dpdk,af_xdp]-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-zn2-x710-64b-ip4routing-base-scale-[avf,dpdk]-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-zn2"
+  output-file: "{DIR[STATIC,VPP]}/2n-zn2-x710-64b-ip4routing-base-scale-[avf,dpdk,af_xdp]-{test_type}-tsa"
+  data: "vpp-2n-zn2-curr-iter"
   include:
-    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Dot1Q-Ip4Base-Ndrpdr.64B-.t.c-avf-dot1q-ip4base-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Base-Ndrpdr.64B-.t.c-avf-ethip4-ip4base-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-.t.c-avf-ethip4-ip4scale2m-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-Rnd-Ndrpdr.64B-.t.c-avf-ethip4-ip4scale2m-rnd-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Dot1Q-Ip4Base-Ndrpdr.64B-.t.c-dot1q-ip4base-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Base-Ndrpdr.64B-.t.c-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-af-xdp-Ethip4-Ip4Base-Ndrpdr.64B-.t.c-af-xdp-ethip4-ip4base-ndrpdr"
   layout:
-    title: "2n-zn2-x710-64b-ip4routing-base-scale-[avf,dpdk]-{test_type}"
+    title: "2n-zn2-x710-64b-ip4routing-base-scale-[avf,dpdk,af_xdp]-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
   title: "Speedup: 2n-zn2-xxv710-64b-ip4routing-base-scale-avf-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-64b-ip4routing-base-scale-avf-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-zn2"
+  data: "vpp-2n-zn2-curr-iter"
   include:
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Ndrpdr.64B-.t.c-avf-ethip4-ip4base-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale20K-Ndrpdr.64B-.t.c-avf-ethip4-ip4scale20k-ndrpdr"
@@ -12380,11 +12220,28 @@
     title: "2n-zn2-xxv710-64b-ip4routing-base-scale-avf-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
+- type: "plot"
+  title: "Speedup: 2n-zn2-xxv710-64b-ip4routing-base-scale-af_xdp-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-64b-ip4routing-base-scale-af_xdp-{test_type}-tsa"
+  data: "vpp-2n-zn2-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-af-xdp-Ethip4-Ip4Base-Ndrpdr.64B-.t.c-af-xdp-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-af-xdp-Ethip4-Ip4Scale20K-Ndrpdr.64B-.t.c-af-xdp-ethip4-ip4scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-af-xdp-Ethip4-Ip4Scale20K-Rnd-Ndrpdr.64B-.t.c-af-xdp-ethip4-ip4scale20k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-af-xdp-Ethip4-Ip4Scale200K-Ndrpdr.64B-.t.c-af-xdp-ethip4-ip4scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-af-xdp-Ethip4-Ip4Scale200K-Rnd-Ndrpdr.64B-.t.c-af-xdp-ethip4-ip4scale200k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-af-xdp-Ethip4-Ip4Scale2M-Ndrpdr.64B-.t.c-af-xdp-ethip4-ip4scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-af-xdp-Ethip4-Ip4Scale2M-Rnd-Ndrpdr.64B-.t.c-af-xdp-ethip4-ip4scale2m-rnd-ndrpdr"
+  layout:
+    title: "2n-zn2-xxv710-64b-ip4routing-base-scale-af_xdp-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
 - type: "plot"
   title: "Speedup: 2n-zn2-xxv710-64b-ip4routing-base-scale-dpdk-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-64b-ip4routing-base-scale-dpdk-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-zn2"
+  data: "vpp-2n-zn2-curr-iter"
   include:
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Dot1Q-Ip4Base-Ndrpdr.64B-.t.c-dot1q-ip4base-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Ndrpdr.64B-.t.c-ethip4-ip4base-ndrpdr"
@@ -12402,7 +12259,7 @@
   title: "Speedup: 2n-zn2-xxv710-64b-features-ip4routing-base-avf-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-64b-features-ip4routing-base-avf-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-zn2"
+  data: "vpp-2n-zn2-curr-iter"
   include:
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
@@ -12418,7 +12275,7 @@
   title: "Speedup: 2n-zn2-xxv710-64b-nat44det-ip4routing-stl-bidir-avf-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-64b-nat44det-ip4routing-stl-bidir-avf-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-zn2"
+  data: "vpp-2n-zn2-curr-iter"
   include:
     - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr.64b-.t.c-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr"
     - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h4096-p63-s258048-ndrpdr.64b-.t.c-avf-ethip4udp-nat44det-h4096-p63-s258048-ndrpdr"
@@ -12433,7 +12290,7 @@
 #  title: "Speedup: 2n-zn2-xxv710-64b-nat44ed-ip4routing-stl-unidir-avf-{test_type}-tsa"
 #  algorithm: "plot_tsa_name"
 #  output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-64b-nat44ed-ip4routing-stl-unidir-avf-{test_type}-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-2n-zn2"
+#  data: "vpp-2n-zn2-curr-iter"
 #  include:
 #    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-ndrpdr"
 #    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-udir-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h4096-p63-s258048-udir-ndrpdr"
@@ -12448,7 +12305,7 @@
 #  title: "Speedup: 2n-zn2-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-{test_type}-tsa"
 #  algorithm: "plot_tsa_name"
 #  output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-{test_type}-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-2n-zn2"
+#  data: "vpp-2n-zn2-curr-iter"
 #  include:
 #    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-ndrpdr"
 #    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h1024-p63-s64512-cps-ndrpdr.64b-.t.c-avf-ethip4udp-ip4base-h1024-p63-s64512-cps-ndrpdr"
@@ -12468,7 +12325,7 @@
 #  title: "Speedup: 2n-zn2-xxv710-64b-nat44ed-ip4routing-udp-stf-pps-avf-{test_type}-tsa"
 #  algorithm: "plot_tsa_name"
 #  output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-64b-nat44ed-ip4routing-udp-stf-pps-avf-{test_type}-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-2n-zn2"
+#  data: "vpp-2n-zn2-curr-iter"
 #  include:
 #    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-ndrpdr"
 #    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h1024-p63-s64512-pps-ndrpdr.64b-.t.c-avf-ethip4udp-ip4base-h1024-p63-s64512-pps-ndrpdr"
@@ -12488,7 +12345,7 @@
 #  title: "Speedup: 2n-zn2-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-{test_type}-tsa"
 #  algorithm: "plot_tsa_name"
 #  output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-{test_type}-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-2n-zn2"
+#  data: "vpp-2n-zn2-curr-iter"
 #  include:
 #    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-ndrpdr"
 #    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h1024-p63-s64512-cps-ndrpdr.64b-.t.c-avf-ethip4tcp-ip4base-h1024-p63-s64512-cps-ndrpdr"
@@ -12508,7 +12365,7 @@
 #  title: "Speedup: 2n-zn2-xxv710-64b-nat44ed-ip4routing-tcp-stf-pps-avf-{test_type}-tsa"
 #  algorithm: "plot_tsa_name"
 #  output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-64b-nat44ed-ip4routing-tcp-stf-pps-avf-{test_type}-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-2n-zn2"
+#  data: "vpp-2n-zn2-curr-iter"
 #  include:
 #    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-ndrpdr"
 #    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h1024-p63-s64512-pps-ndrpdr.64b-.t.c-avf-ethip4tcp-ip4base-h1024-p63-s64512-pps-ndrpdr"
@@ -12524,27 +12381,11 @@
 #    title: "2n-zn2-xxv710-64b-nat44ed-ip4routing-tcp-stf-pps-avf-{test_type}"
 #    layout: "plot-throughput-speedup-analysis"
 
-- type: "plot"
-  title: "Speedup: 2n-zn2-xxv710-64b-features-ip4routing-base-dpdk-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-64b-features-ip4routing-base-dpdk-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-zn2"
-  include:
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Ndrpdr.64B-.t.c-ethip4-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-ethip4udp-nat44det-h1-p1-s1-Ndrpdr.64B-.t.c-ethip4udp-nat44det-h1-p1-s1-ndrpdr"
-  layout:
-    title: "2n-zn2-xxv710-64b-features-ip4routing-base-dpdk-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
 - type: "plot"
   title: "Speedup: 2n-zn2-cx556a-64b-rdma-ip4base-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-zn2-cx556a-64b-rdma-ip4base-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-zn2"
+  data: "vpp-2n-zn2-curr-iter"
   include:
     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-Ip4Base-Ndrpdr.64B-.t.c-rdma-dot1q-ip4base-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4-Ip4Base-Ndrpdr.64B-.t.c-rdma-ethip4-ip4base-ndrpdr"
@@ -12562,7 +12403,7 @@
   title: "Speedup: 2n-zn2-cx556a-64b-rdma-ethip4-features-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-zn2-cx556a-64b-rdma-ethip4-features-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-zn2"
+  data: "vpp-2n-zn2-curr-iter"
   include:
     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-.t.c-rdma-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-rdma-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
@@ -12578,7 +12419,7 @@
   title: "Speedup: 2n-zn2-xxv710-64b-ethip4--ethip4udpgeneve-avf-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-64b-ethip4--ethip4udpgeneve-avf-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-zn2"
+  data: "vpp-2n-zn2-curr-iter"
   include:
     - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-1Tun-Ip4Base-Ndrpdr.64B-.t.c-avf-ethip4--ethip4udpgeneve-1tun-ip4base-ndrpdr"
     - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-4Tun-Ip4Base-Ndrpdr.64B-.t.c-avf-ethip4--ethip4udpgeneve-4tun-ip4base-ndrpdr"
@@ -12590,29 +12431,26 @@
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 2n-zn2-x710-78b-ip6routing-base-scale-[avf,dpdk]-{test_type}-tsa"
+  title: "Speedup: 2n-zn2-x710-78b-ip6routing-base-scale-[avf,dpdk,af_xdp]-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-zn2-x710-78b-ip6routing-base-scale-[avf,dpdk]-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-zn2"
+  output-file: "{DIR[STATIC,VPP]}/2n-zn2-x710-78b-ip6routing-base-scale-[avf,dpdk,af_xdp]-{test_type}-tsa"
+  data: "vpp-2n-zn2-curr-iter"
   include:
-    - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Dot1Q-Ip6Base-Ndrpdr.78B-.t.c-avf-dot1q-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-avf-ethip6-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-Ndrpdr.78B-.t.c-avf-ethip6-ip6scale2m-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-rnd-Ndrpdr.78B-.t.c-avf-ethip6-ip6scale2m-rnd-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Dot1Q-Ip6Base-Ndrpdr.78B-.t.c-dot1q-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-ethip6-ip6base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Scale2M-Ndrpdr.78B-.t.c-ethip6-ip6scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-af-xdp-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-af-xdp-ethip6-ip6base-ndrpdr"
   layout:
-    title: "2n-zn2-x710-78b-ip6routing-base-scale-[avf,dpdk]-{test_type}"
+    title: "2n-zn2-x710-78b-ip6routing-base-scale-[avf,dpdk,af_xdp]-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
   title: "Speedup: 2n-zn2-xxv710-78b-ip6routing-base-scale-avf-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-78b-ip6routing-base-scale-avf-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-zn2"
+  data: "vpp-2n-zn2-curr-iter"
   include:
-    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-Ip6Base-Ndrpdr.78B-.t.c-avf-dot1q-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-avf-ethip6-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale20K-Ndrpdr.78B-.t.c-avf-ethip6-ip6scale20k-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale20K-rnd-Ndrpdr.78B-.t.c-avf-ethip6-ip6scale20k-rnd-ndrpdr"
@@ -12624,11 +12462,28 @@
     title: "2n-zn2-xxv710-78b-ip6routing-base-scale-avf-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
+- type: "plot"
+  title: "Speedup: 2n-zn2-xxv710-78b-ip6routing-base-scale-af_xdp-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-78b-ip6routing-base-scale-af_xdp-{test_type}-tsa"
+  data: "vpp-2n-zn2-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-af-xdp-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-af-xdp-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-af-xdp-Ethip6-Ip6Scale20K-Ndrpdr.78B-.t.c-af-xdp-ethip6-ip6scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-af-xdp-Ethip6-Ip6Scale20K-rnd-Ndrpdr.78B-.t.c-af-xdp-ethip6-ip6scale20k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-af-xdp-Ethip6-Ip6Scale200K-Ndrpdr.78B-.t.c-af-xdp-ethip6-ip6scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-af-xdp-Ethip6-Ip6Scale200K-rnd-Ndrpdr.78B-.t.c-af-xdp-ethip6-ip6scale200k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-af-xdp-Ethip6-Ip6Scale2M-Ndrpdr.78B-.t.c-af-xdp-ethip6-ip6scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-af-xdp-Ethip6-Ip6Scale2M-rnd-Ndrpdr.78B-.t.c-af-xdp-ethip6-ip6scale2m-rnd-ndrpdr"
+  layout:
+    title: "2n-zn2-xxv710-78b-ip6routing-base-scale-af_xdp-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
 - type: "plot"
   title: "Speedup: 2n-zn2-xxv710-78b-ip6routing-base-scale-dpdk-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-78b-ip6routing-base-scale-dpdk-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-zn2"
+  data: "vpp-2n-zn2-curr-iter"
   include:
     - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Dot1Q-Ip6Base-Ndrpdr.78B-.t.c-dot1q-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-ethip6-ip6base-ndrpdr"
@@ -12646,7 +12501,7 @@
   title: "Speedup: 2n-zn2-cx556a-78b-rdma-ip6routing-base-scale-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-zn2-cx556a-78b-rdma-ip6routing-base-scale-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-zn2"
+  data: "vpp-2n-zn2-curr-iter"
   include:
     - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-Ip6Base-Ndrpdr.78B-.t.c-rdma-dot1q-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1Cx556A-Rdma-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-rdma-ethip6-ip6base-ndrpdr"
@@ -12658,40 +12513,24 @@
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 2n-zn2-x710-64b-l2switching-base-scale-avf-{test_type}-tsa"
+  title: "Speedup: 2n-zn2-x710-64b-l2switching-base-scale-[avf,dpdk,af_xdp]-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-zn2-x710-64b-l2switching-base-scale-avf-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-zn2"
+  output-file: "{DIR[STATIC,VPP]}/2n-zn2-x710-64b-l2switching-base-scale-{test_type}-tsa"
+  data: "vpp-2n-zn2-curr-iter"
   include:
-    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-avf-dot1q-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Patch-Ndrpdr.64B-.t.c-avf-eth-l2patch-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Xcbase-Ndrpdr.64B-.t.c-avf-eth-l2xcbase-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-avf-eth-l2bdbasemaclrn-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-.t.c-avf-eth-l2bdscale1mmaclrn-ndrpdr"
-  layout:
-    title: "2n-zn2-x710-64b-l2switching-base-scale-avf-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: 2n-zn2-x710-64b-l2switching-base-scale-dpdk-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-zn2-x710-64b-l2switching-base-scale-dpdk-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-zn2"
-  include:
-    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-dot1q-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Patch-Ndrpdr.64B-.t.c-eth-l2patch-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Xcbase-Ndrpdr.64B-.t.c-eth-l2xcbase-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-.t.c-eth-l2bdscale1mmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-af-xdp-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-af-xdp-eth-l2bdbasemaclrn-ndrpdr"
   layout:
-    title: "2n-zn2-x710-64b-l2switching-base-scale-dpdk-{test_type}"
+    title: "2n-zn2-x710-64b-l2switching-base-scale-[avf,dpdk,af_xdp]-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
   title: "Speedup: 2n-zn2-xxv710-64b-l2switching-base-avf-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-64b-l2switching-base-avf-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-zn2"
+  data: "vpp-2n-zn2-curr-iter"
   include:
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Ndrpdr.64B-.t.c-avf-dot1q-l2xcbase-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-avf-dot1q-l2bdbasemaclrn-ndrpdr"
@@ -12707,7 +12546,7 @@
   title: "Speedup: 2n-zn2-xxv710-64b-l2switching-base-scale-avf-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-64b-l2switching-base-scale-avf-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-zn2"
+  data: "vpp-2n-zn2-curr-iter"
   include:
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-avf-eth-l2bdbasemaclrn-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-.t.c-avf-eth-l2bdscale10kmaclrn-ndrpdr"
@@ -12717,11 +12556,27 @@
     title: "2n-zn2-xxv710-64b-l2switching-base-scale-avf-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
+- type: "plot"
+  title: "Speedup: 2n-zn2-xxv710-64b-l2switching-base-scale-af_xdp-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-64b-l2switching-base-scale-af_xdp-{test_type}-tsa"
+  data: "vpp-2n-zn2-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-af-xdp-Eth-L2Patch-Ndrpdr.64B-.t.c-af-xdp-eth-l2patch-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-af-xdp-Eth-L2Xcbase-Ndrpdr.64B-.t.c-af-xdp-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-af-xdp-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-af-xdp-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-af-xdp-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-.t.c-af-xdp-eth-l2bdscale10kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-af-xdp-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-.t.c-af-xdp-eth-l2bdscale100kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-af-xdp-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-.t.c-af-xdp-eth-l2bdscale1mmaclrn-ndrpdr"
+  layout:
+    title: "2n-zn2-xxv710-64b-l2switching-base-scale-af_xdp-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
 - type: "plot"
   title: "Speedup: 2n-zn2-xxv710-64b-l2switching-base-dpdk-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-64b-l2switching-base-dpdk-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-zn2"
+  data: "vpp-2n-zn2-curr-iter"
   include:
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Xcbase-Ndrpdr.64B-.t.c-dot1q-l2xcbase-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-dot1q-l2bdbasemaclrn-ndrpdr"
@@ -12737,7 +12592,7 @@
   title: "Speedup: 2n-zn2-xxv710-64b-l2switching-base-scale-dpdk-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-64b-l2switching-base-scale-dpdk-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-zn2"
+  data: "vpp-2n-zn2-curr-iter"
   include:
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-.t.c-eth-l2bdscale10kmaclrn-ndrpdr"
@@ -12751,7 +12606,7 @@
   title: "Speedup: 2n-zn2-cx556a-64b-rdma-l2switching-base-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-zn2-cx556a-64b-rdma-l2switching-base-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-zn2"
+  data: "vpp-2n-zn2-curr-iter"
   include:
     - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Xcbase-Ndrpdr.64B-.t.c-rdma-dot1q-l2xcbase-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-rdma-dot1q-l2bdbasemaclrn-ndrpdr"
@@ -12767,7 +12622,7 @@
   title: "Speedup: 2n-zn2-cx556a-64b-rdma-l2switching-scale-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-zn2-cx556a-64b-rdma-l2switching-scale-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-zn2"
+  data: "vpp-2n-zn2-curr-iter"
   include:
     - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-rdma-eth-l2bdbasemaclrn-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-.t.c-rdma-eth-l2bdscale10kmaclrn-ndrpdr"
@@ -12778,107 +12633,45 @@
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 2n-zn2-xxv710-64b-vhost-base-avf-{test_type}-tsa"
+  title: "Speedup: 2n-zn2-xxv710-64b-vhost-base-[avf,dpdk]-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-64b-vhost-base-avf-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-zn2"
+  output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-64b-vhost-base-{test_type}-tsa"
+  data: "vpp-2n-zn2-curr-iter"
   include:
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-avf-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-avf-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
     - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
     - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-avf-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr"
-  layout:
-    title: "2n-zn2-xxv710-64b-vhost-base-avf-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: 2n-zn2-xxv710-64b-vhost-base-avf-vpp-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-64b-vhost-base-avf-vpp-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-zn2"
-  include:
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-.t.c-avf-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-.t.c-avf-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-.t.c-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-.t.c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Vppip4-Ndrpdr.64B-.t.c-avf-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr"
-  layout:
-    title: "2n-zn2-xxv710-64b-vhost-base-avf-vpp-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: 2n-zn2-xxv710-64b-vhost-base-dpdk-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-64b-vhost-base-dpdk-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-zn2"
-  include:
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
     - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
     - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr"
   layout:
-    title: "2n-zn2-xxv710-64b-vhost-base-dpdk-{test_type}"
+    title: "2n-zn2-xxv710-64b-vhost-base-[avf,dpdk]-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 2n-zn2-xxv710-64b-vhost-base-dpdk-vpp-{test_type}-tsa"
+  title: "Speedup: 2n-zn2-xxv710-64b-vhost-base-[avf,dpdk]-vpp-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-64b-vhost-base-dpdk-vpp-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-zn2"
+  output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-64b-vhost-base-vpp-{test_type}-tsa"
+  data: "vpp-2n-zn2-curr-iter"
   include:
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-.t.c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-.t.c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-.t.c-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-.t.c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
     - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-.t.c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
     - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Vppip4-Ndrpdr.64B-.t.c-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr"
   layout:
-    title: "2n-zn2-xxv710-64b-vhost-base-dpdk-vpp-{test_type}"
+    title: "2n-zn2-xxv710-64b-vhost-base-[avf,dpdk]-vpp-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
   title: "Speedup: 2n-zn2-cx556a-64b-rdma-l2-vhost-base-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-zn2-cx556a-64b-rdma-l2-vhost-base-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-zn2"
+  data: "vpp-2n-zn2-curr-iter"
   include:
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-rdma-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-rdma-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
     - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-rdma-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
     - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-rdma-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-  layout:
-    title: "2n-zn2-cx556a-64b-rdma-l2-vhost-base-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: 2n-zn2-cx556a-64b-rdma-l2-vhost-vppl2xc-base-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-zn2-cx556a-64b-rdma-l2-vhost-vppl2xc-base-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-zn2"
-  include:
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-.t.c-rdma-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-.t.c-rdma-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
     - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-.t.c-rdma-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
     - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-.t.c-rdma-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
   layout:
-    title: "2n-zn2-cx556a-64b-2t1c-l2-vhost-vppl2xc-base-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: 2n-zn2-xxv710-114b-vts-l2switching-base-dpdk-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-114b-vts-l2switching-base-dpdk-{test_type}-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-zn2"
-  include:
-    - "Tests.Vpp.Perf.Vts.2N1L-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermit-2Vhostvr1024-1Vm-Ndrpdr.114B-.t.c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vts.2N1L-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermitreflect-2Vhostvr1024-1Vm-Ndrpdr.114B-.t.c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vts.2N1L-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Noacl-2Vhostvr1024-1Vm-Ndrpdr.114B-.t.c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Noacl-2Vhostvr1024-1Vm-Ndrpdr.114B-.t.c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermit-2Vhostvr1024-1Vm-Ndrpdr.114B-.t.c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermitreflect-2Vhostvr1024-1Vm-Ndrpdr.114B-.t.c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr"
-  layout:
-    title: "2n-zn2-xxv710-114b-vts-l2switching-base-[avf,dpdk]-{test_type}"
+    title: "2n-zn2-cx556a-64b-rdma-l2-vhost-base-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 # Packet Throughput - DPDK
@@ -12889,7 +12682,7 @@
   title: "DPDK Throughput: 2n-zn2-xxv710-64b-{core}-base-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,DPDK]}/2n-zn2-xxv710-64b-{core}-base-{test_type}"
-  data: "plot-dpdk-throughput-latency-2n-zn2"
+  data: "dpdk-2n-zn2-curr-iter"
   core: ["2t1c", "4t2c"]
   include:
     - "tests.dpdk.perf.2n1l-25ge2p1xxv710-eth-l2xcbase-testpmd-ndrpdr.64b-{core}-eth-l2xcbase-testpmd-ndrpdr"
@@ -12902,7 +12695,7 @@
   title: "DPDK Throughput: 2n-zn2-x710-64b-{core}-base-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,DPDK]}/2n-zn2-x710-64b-{core}-base-{test_type}"
-  data: "plot-dpdk-throughput-latency-2n-zn2"
+  data: "dpdk-2n-zn2-curr-iter"
   core: ["2t1c", "4t2c"]
   include:
     - "tests.dpdk.perf.2n1l-10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.64b-{core}-eth-l2xcbase-testpmd-ndrpdr"
@@ -12919,30 +12712,19 @@
   output-file: "{DIR[STATIC,VPP]}/hdrh-lat-percentile-2n-skx"
   output-file-links: "{DIR[LAT,VPP]}/2n_skx.rst"
   target-links: "../../_static/vpp"
-  data: "plot-vpp-hdrh-lat-2n-skx"
-  filter: "'2T1C' and 'NIC_Intel-XXV710'"
-  layout:
-    layout: "plot-hdrh-latency-percentile-x-log"
-
-- type: "plot"
-  title: "Latency by percentile: 2n-skx RND"
-  algorithm: "plot_hdrh_lat_by_percentile_x_log"
-  output-file: "{DIR[STATIC,VPP]}/hdrh-lat-percentile-2n-skx"
-  output-file-links: "{DIR[LAT,VPP]}/2n_skx.rst"
-  target-links: "../../_static/vpp"
-  data: "plot-vpp-hdrh-lat-2n-skx-rnd"
+  data: "vpp-2n-skx-curr-iter-best"
   filter: "'2T1C' and 'NIC_Intel-XXV710'"
   layout:
     layout: "plot-hdrh-latency-percentile-x-log"
 
 - type: "plot"
-  title: "Latency by percentile: 2n-skx NAT"
+  title: "Latency by percentile: TRex 2n-skx"
   algorithm: "plot_hdrh_lat_by_percentile_x_log"
-  output-file: "{DIR[STATIC,VPP]}/hdrh-lat-percentile-2n-skx"
-  output-file-links: "{DIR[LAT,VPP]}/2n_skx.rst"
-  target-links: "../../_static/vpp"
-  data: "plot-vpp-hdrh-lat-2n-skx-nat"
-  filter: "'2T1C' and 'NIC_Intel-XXV710'"
+  output-file: "{DIR[STATIC,TREX]}/hdrh-lat-percentile-2n-skx"
+  output-file-links: "{DIR[LAT,TREX]}/2n_skx.rst"
+  target-links: "../../_static/trex"
+  data: "trex-2n-skx-curr-iter-best"
+  filter: "'NIC_Intel-X710'"
   layout:
     layout: "plot-hdrh-latency-percentile-x-log"
 
@@ -12952,18 +12734,7 @@
   output-file: "{DIR[STATIC,VPP]}/hdrh-lat-percentile-2n-zn2"
   output-file-links: "{DIR[LAT,VPP]}/2n_zn2.rst"
   target-links: "../../_static/vpp"
-  data: "plot-vpp-hdrh-lat-2n-zn2"
-  filter: "'2T1C' and 'NIC_Intel-XXV710'"
-  layout:
-    layout: "plot-hdrh-latency-percentile-x-log"
-
-- type: "plot"
-  title: "Latency by percentile: 2n-zn2 RND"
-  algorithm: "plot_hdrh_lat_by_percentile_x_log"
-  output-file: "{DIR[STATIC,VPP]}/hdrh-lat-percentile-2n-zn2"
-  output-file-links: "{DIR[LAT,VPP]}/2n_zn2.rst"
-  target-links: "../../_static/vpp"
-  data: "plot-vpp-hdrh-lat-2n-zn2-rnd"
+  data: "vpp-2n-zn2-curr-iter-best"
   filter: "'2T1C' and 'NIC_Intel-XXV710'"
   layout:
     layout: "plot-hdrh-latency-percentile-x-log"
@@ -12974,51 +12745,40 @@
   output-file: "{DIR[STATIC,VPP]}/hdrh-lat-percentile-3n-skx"
   output-file-links: "{DIR[LAT,VPP]}/3n_skx.rst"
   target-links: "../../_static/vpp"
-  data: "plot-vpp-hdrh-lat-3n-skx"
-  filter: "'2T1C' and 'NIC_Intel-XXV710'"
-  layout:
-    layout: "plot-hdrh-latency-percentile-x-log"
-
-- type: "plot"
-  title: "Latency by percentile: 2n-clx"
-  algorithm: "plot_hdrh_lat_by_percentile_x_log"
-  output-file: "{DIR[STATIC,VPP]}/hdrh-lat-percentile-2n-clx"
-  output-file-links: "{DIR[LAT,VPP]}/2n_clx.rst"
-  target-links: "../../_static/vpp"
-  data: "plot-vpp-hdrh-lat-2n-clx"
+  data: "vpp-3n-skx-curr-iter-best"
   filter: "'2T1C' and 'NIC_Intel-XXV710'"
   layout:
     layout: "plot-hdrh-latency-percentile-x-log"
 
-- type: "plot"
-  title: "Latency by percentile: 2n-clx RND"
-  algorithm: "plot_hdrh_lat_by_percentile_x_log"
-  output-file: "{DIR[STATIC,VPP]}/hdrh-lat-percentile-2n-clx"
-  output-file-links: "{DIR[LAT,VPP]}/2n_clx.rst"
-  target-links: "../../_static/vpp"
-  data: "plot-vpp-hdrh-lat-2n-clx-rnd"
-  filter: "'2T1C' and 'NIC_Intel-XXV710'"
-  layout:
-    layout: "plot-hdrh-latency-percentile-x-log"
+# - type: "plot"
+#   title: "Latency by percentile: TRex 3n-skx"
+#   algorithm: "plot_hdrh_lat_by_percentile_x_log"
+#   output-file: "{DIR[STATIC,TREX]}/hdrh-lat-percentile-3n-skx"
+#   output-file-links: "{DIR[LAT,TREX]}/3n_skx.rst"
+#   target-links: "../../_static/trex"
+#   data: "trex-3n-skx-curr-iter-best"
+#   filter: "'NIC_Intel-X710'"
+#   layout:
+#     layout: "plot-hdrh-latency-percentile-x-log"
 
 - type: "plot"
-  title: "Latency by percentile: 2n-clx NAT"
+  title: "Latency by percentile: 2n-clx"
   algorithm: "plot_hdrh_lat_by_percentile_x_log"
   output-file: "{DIR[STATIC,VPP]}/hdrh-lat-percentile-2n-clx"
   output-file-links: "{DIR[LAT,VPP]}/2n_clx.rst"
   target-links: "../../_static/vpp"
-  data: "plot-vpp-hdrh-lat-2n-clx-nat"
+  data: "vpp-2n-clx-curr-iter-best"
   filter: "'2T1C' and 'NIC_Intel-XXV710'"
   layout:
     layout: "plot-hdrh-latency-percentile-x-log"
 
 - type: "plot"
-  title: "Latency by percentile: 2n-clx MLX"
+  title: "Latency by percentile: 2n-clx"
   algorithm: "plot_hdrh_lat_by_percentile_x_log"
   output-file: "{DIR[STATIC,VPP]}/hdrh-lat-percentile-2n-clx"
   output-file-links: "{DIR[LAT,VPP]}/2n_clx.rst"
   target-links: "../../_static/vpp"
-  data: "plot-vpp-hdrh-lat-2n-clx-mlx"
+  data: "vpp-2n-clx-curr-iter-best"
   filter: "'2T1C' and 'NIC_Mellanox-CX556A'"
   layout:
     layout: "plot-hdrh-latency-percentile-x-log"
@@ -13029,63 +12789,63 @@
 #   output-file: "{DIR[STATIC,VPP]}/hdrh-lat-percentile-2n-icx"
 #   output-file-links: "{DIR[LAT,VPP]}/2n_icx.rst"
 #   target-links: "../../_static/vpp"
-#   data: "plot-vpp-hdrh-lat-2n-icx"
+#   data: "vpp-2n-icx-curr-iter-best"
+#   filter: "'2T1C' and 'NIC_Intel-E810CQ' and 'NDRPDR'"
+#   layout:
+#     layout: "plot-hdrh-latency-percentile-x-log"
+#
+# - type: "plot"
+#   title: "Latency by percentile: 3n-icx"
+#   algorithm: "plot_hdrh_lat_by_percentile_x_log"
+#   output-file: "{DIR[STATIC,VPP]}/hdrh-lat-percentile-3n-icx"
+#   output-file-links: "{DIR[LAT,VPP]}/3n_icx.rst"
+#   target-links: "../../_static/vpp"
+#   data: "vpp-3n-icx-curr-iter-best"
 #   filter: "'2T1C' and 'NIC_Intel-E810CQ' and 'NDRPDR'"
 #   layout:
 #     layout: "plot-hdrh-latency-percentile-x-log"
 
 - type: "plot"
-  title: "Latency by percentile: 3n-icx"
-  algorithm: "plot_hdrh_lat_by_percentile_x_log"
-  output-file: "{DIR[STATIC,VPP]}/hdrh-lat-percentile-3n-icx"
-  output-file-links: "{DIR[LAT,VPP]}/3n_icx.rst"
-  target-links: "../../_static/vpp"
-  data: "plot-vpp-hdrh-lat-3n-icx"
-  filter: "'2T1C' and 'NIC_Intel-E810CQ' and 'NDRPDR'"
-  layout:
-    layout: "plot-hdrh-latency-percentile-x-log"
-
-- type: "plot"
-  title: "Latency by percentile: 3n-hsw"
+  title: "Latency by percentile: 3n-tsh"
   algorithm: "plot_hdrh_lat_by_percentile_x_log"
-  output-file: "{DIR[STATIC,VPP]}/hdrh-lat-percentile-3n-hsw"
-  output-file-links: "{DIR[LAT,VPP]}/3n_hsw.rst"
+  output-file: "{DIR[STATIC,VPP]}/hdrh-lat-percentile-3n-tsh"
+  output-file-links: "{DIR[LAT,VPP]}/3n_tsh.rst"
   target-links: "../../_static/vpp"
-  data: "plot-vpp-hdrh-lat-3n-hsw"
-  filter: "'1T1C' and 'NIC_Intel-XL710'"
+  data: "vpp-3n-tsh-curr-iter-best"
+  filter: "'1T1C' and 'NIC_Intel-X520-DA2'"
   layout:
     layout: "plot-hdrh-latency-percentile-x-log"
 
 - type: "plot"
-  title: "Latency by percentile: 3n-hsw RND"
+  title: "Latency by percentile: 2n-tx2"
   algorithm: "plot_hdrh_lat_by_percentile_x_log"
-  output-file: "{DIR[STATIC,VPP]}/hdrh-lat-percentile-3n-hsw"
-  output-file-links: "{DIR[LAT,VPP]}/3n_hsw.rst"
+  output-file: "{DIR[STATIC,VPP]}/hdrh-lat-percentile-2n-tx2"
+  output-file-links: "{DIR[LAT,VPP]}/2n-tx2.rst"
   target-links: "../../_static/vpp"
-  data: "plot-vpp-hdrh-lat-3n-hsw-rnd"
+  data: "vpp-2n-tx2-curr-iter"
   filter: "'1T1C' and 'NIC_Intel-XL710'"
   layout:
     layout: "plot-hdrh-latency-percentile-x-log"
 
 - type: "plot"
-  title: "Latency by percentile: 3n-tsh"
+  title: "Latency by percentile: 2n-aws"
   algorithm: "plot_hdrh_lat_by_percentile_x_log"
-  output-file: "{DIR[STATIC,VPP]}/hdrh-lat-percentile-3n-tsh"
-  output-file-links: "{DIR[LAT,VPP]}/3n_tsh.rst"
+  output-file: "{DIR[STATIC,VPP]}/hdrh-lat-percentile-2n-aws"
+  output-file-links: "{DIR[LAT,VPP]}/2n_aws.rst"
   target-links: "../../_static/vpp"
-  data: "plot-vpp-hdrh-lat-3n-tsh"
-  filter: "'1T1C' and 'NIC_Intel-X520-DA2'"
+  data: "vpp-2n-aws-curr-iter-best"
+  filter: "'2T1C'"
   layout:
     layout: "plot-hdrh-latency-percentile-x-log"
 
 - type: "plot"
-  title: "Latency by percentile: 2n-tx2"
+  title: "Latency by percentile: 3n-aws"
   algorithm: "plot_hdrh_lat_by_percentile_x_log"
-  output-file: "{DIR[STATIC,VPP]}/hdrh-lat-percentile-2n-tx2"
-  output-file-links: "{DIR[LAT,VPP]}/2n-tx2.rst"
+  output-file: "{DIR[STATIC,VPP]}/hdrh-lat-percentile-3n-aws"
+  output-file-links: "{DIR[LAT,VPP]}/3n_aws.rst"
   target-links: "../../_static/vpp"
-  data: "plot-vpp-hdrh-lat-2n-tx2"
-  filter: "'1T1C' and 'NIC_Intel-XL710'"
+  data: "vpp-3n-aws-curr-iter-best"
+  filter: "'2T1C'"
   layout:
     layout: "plot-hdrh-latency-percentile-x-log"
 
@@ -13095,7 +12855,7 @@
   output-file: "{DIR[STATIC,DPDK]}/hdrh-lat-percentile-2n-skx"
   output-file-links: "{DIR[LAT,DPDK]}/2n_skx.rst"
   target-links: "../../_static/dpdk"
-  data: "plot-dpdk-hdrh-lat-2n-skx"
+  data: "dpdk-2n-skx-curr-iter-best"
   filter: "'2T1C' and 'NIC_Intel-XXV710'"
   layout:
     layout: "plot-hdrh-latency-percentile-x-log"
@@ -13106,7 +12866,7 @@
   output-file: "{DIR[STATIC,DPDK]}/hdrh-lat-percentile-3n-skx"
   output-file-links: "{DIR[LAT,DPDK]}/3n_skx.rst"
   target-links: "../../_static/dpdk"
-  data: "plot-dpdk-hdrh-lat-3n-skx"
+  data: "dpdk-3n-skx-curr-iter-best"
   filter: "'2T1C' and 'NIC_Intel-XXV710'"
   layout:
     layout: "plot-hdrh-latency-percentile-x-log"
@@ -13117,7 +12877,7 @@
   output-file: "{DIR[STATIC,DPDK]}/hdrh-lat-percentile-2n-clx"
   output-file-links: "{DIR[LAT,DPDK]}/2n_clx.rst"
   target-links: "../../_static/dpdk"
-  data: "plot-dpdk-hdrh-lat-2n-clx"
+  data: "dpdk-2n-clx-curr-iter-best"
   filter: "'2T1C' and 'NIC_Intel-XXV710'"
   layout:
     layout: "plot-hdrh-latency-percentile-x-log"
@@ -13128,29 +12888,18 @@
   output-file: "{DIR[STATIC,DPDK]}/hdrh-lat-percentile-2n-zn2"
   output-file-links: "{DIR[LAT,DPDK]}/2n_zn2.rst"
   target-links: "../../_static/dpdk"
-  data: "plot-dpdk-hdrh-lat-2n-zn2"
+  data: "dpdk-2n-zn2-curr-iter-best"
   filter: "'2T1C' and 'NIC_Intel-XXV710'"
   layout:
     layout: "plot-hdrh-latency-percentile-x-log"
 
-- type: "plot"
-  title: "Latency by percentile: DPDK 3n-hsw"
-  algorithm: "plot_hdrh_lat_by_percentile_x_log"
-  output-file: "{DIR[STATIC,DPDK]}/hdrh-lat-percentile-3n-hsw"
-  output-file-links: "{DIR[LAT,DPDK]}/3n_hsw.rst"
-  target-links: "../../_static/dpdk"
-  data: "plot-dpdk-hdrh-lat-3n-hsw"
-  filter: "'1T1C' and 'NIC_Intel-XL710'"
-  layout:
-    layout: "plot-hdrh-latency-percentile-x-log"
-
 - type: "plot"
   title: "Latency by percentile: DPDK 3n-tsh"
   algorithm: "plot_hdrh_lat_by_percentile_x_log"
   output-file: "{DIR[STATIC,DPDK]}/hdrh-lat-percentile-3n-tsh"
   output-file-links: "{DIR[LAT,DPDK]}/3n_tsh.rst"
   target-links: "../../_static/dpdk"
-  data: "plot-dpdk-hdrh-lat-3n-tsh"
+  data: "dpdk-3n-tsh-curr-iter-best"
   filter: "'1T1C' and 'NIC_Intel-X520-DA2'"
   layout:
     layout: "plot-hdrh-latency-percentile-x-log"
@@ -13161,18 +12910,20 @@
   output-file: "{DIR[STATIC,DPDK]}/hdrh-lat-percentile-2n-tx2"
   output-file-links: "{DIR[LAT,DPDK]}/2n-tx2.rst"
   target-links: "../../_static/dpdk"
-  data: "plot-dpdk-hdrh-lat-2n-tx2"
+  data: "dpdk-2n-tx2-curr-iter-best"
   filter: "'1T1C' and 'NIC_Intel-XL710'"
   layout:
     layout: "plot-hdrh-latency-percentile-x-log"
 
 ###############################################################################
 
+# GSO
+
 - type: "plot"
   title: "Throughput: 2n-skx-128kb-{core}-ip4routing-iperf3"
   algorithm: "plot_mrr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-skx-128kb-{core}-ip4routing-iperf3"
-  data: "plot-vpp-gso-2n-skx"
+  data: "vpp-2n-skx-curr-gso"
   core: ["1t1c", "2t2c", "4t4c"]
   include:
     - "Tests.Vpp.Perf.Gso.2N1L-10Ge2P1X710-Ethip4-Ip4Base-2Tap-Gso-Iperf3-Mrr.128KB-{core}-ethip4-ip4base-2tap-gso-iperf3-mrr"
@@ -13187,7 +12938,7 @@
   title: "Throughput: 2n-clx-128kb-{core}-ip4routing-iperf3"
   algorithm: "plot_mrr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-clx-128kb-{core}-ip4routing-iperf3"
-  data: "plot-vpp-gso-2n-clx"
+  data: "vpp-2n-clx-curr-iter-gso"
   core: ["1t1c", "2t2c", "4t4c"]
   include:
     - "Tests.Vpp.Perf.Gso.2N1L-10Ge2P1X710-Ethip4-Ip4Base-2Tap-Gso-Iperf3-Mrr.128KB-{core}-ethip4-ip4base-2tap-gso-iperf3-mrr"
@@ -13202,7 +12953,7 @@
   title: "Throughput: 2n-zn2-128kb-{core}-ip4routing-iperf3"
   algorithm: "plot_mrr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-zn2-128kb-{core}-ip4routing-iperf3"
-  data: "plot-vpp-gso-2n-zn2"
+  data: "vpp-2n-zn2-curr-iter-gso"
   core: ["1t1c", "2t2c", "4t4c"]
   include:
     - "Tests.Vpp.Perf.Gso.2N1L-10Ge2P1X710-Ethip4-Ip4Base-2Tap-Gso-Iperf3-Mrr.128KB-{core}-ethip4-ip4base-2tap-gso-iperf3-mrr"
@@ -13212,3 +12963,145 @@
   layout:
     title: "2n-zn2-128kb-{core}-ip4routing-iperf3"
     layout: "plot-throughput-gbps"
+
+###############################################################################
+
+# TRex 3n-skx
+
+# - type: "plot"
+#   title: "Throughput: 3n-skx-x710-64b--ip4-base-scale-{test_type}"
+#   algorithm: "plot_ndrpdr_box_name"
+#   output-file: "{DIR[STATIC,TREX]}/3n-skx-x710-64b--ip4-base-scale-{test_type}"
+#   data: "trex-3n-skx-curr-iter"
+#   core: ["2t1c", ]
+#   include:
+#     - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4-Ip4Base-Tg-Ndrpdr.64B--ethip4-ip4base-tg-ndrpdr"
+#     - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4-Ip4Scale2M-Tg-Ndrpdr.64B--ethip4-ip4scale2m-tg-ndrpdr"
+#   layout:
+#     title: "3n-skx-x710-64b--ip4-base-scale-{test_type}"
+#     layout: "plot-throughput"
+#
+# - type: "plot"
+#   title: "Throughput: 3n-skx-x710-64b--ip4routing-stf-cps-{test_type}"
+#   algorithm: "plot_ndrpdr_box_name"
+#   output-file: "{DIR[STATIC,TREX]}/3n-skx-x710-64b--ip4routing-stf-cps-{test_type}"
+#   data: "trex-3n-skx-curr-iter"
+#   core: ["2t1c", ]
+#   include:
+#     - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4Tcp-Ip4Base-H1024-P63-S64512-Cps-Tg-Ndrpdr.64B--ethip4tcp-ip4base-h1024-p63-s64512-cps-tg-ndrpdr"
+#     - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4Tcp-Ip4Base-H262144-P63-S16515072-Cps-Tg-Ndrpdr.64B--ethip4tcp-ip4base-h262144-p63-s16515072-cps-tg-ndrpdr"
+#     - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4Udp-Ip4Base-H1024-P63-S64512-Cps-Tg-Ndrpdr.64B--ethip4udp-ip4base-h1024-p63-s64512-cps-tg-ndrpdr"
+#     - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4Udp-Ip4Base-H262144-P63-S16515072-Cps-Tg-Ndrpdr.64B--ethip4udp-ip4base-h262144-p63-s16515072-cps-tg-ndrpdr"
+#   layout:
+#     title: "3n-skx-x710-64b--ip4routing-stf-cps-{test_type}"
+#     layout: "plot-throughput"
+#
+# - type: "plot"
+#   title: "Throughput: 3n-skx-x710-64b--ip4routing-stf-pps-{test_type}"
+#   algorithm: "plot_ndrpdr_box_name"
+#   output-file: "{DIR[STATIC,TREX]}/3n-skx-x710-64b--ip4routing-stf-pps-{test_type}"
+#   data: "trex-3n-skx-curr-iter"
+#   core: ["2t1c", ]
+#   include:
+#     - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4Tcp-Ip4Base-H1024-P63-S64512-pps-Tg-Ndrpdr.64B--ethip4tcp-ip4base-h1024-p63-s64512-pps-tg-ndrpdr"
+#     - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4Tcp-Ip4Base-H262144-P63-S16515072-pps-Tg-Ndrpdr.64B--ethip4tcp-ip4base-h262144-p63-s16515072-pps-tg-ndrpdr"
+#     - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4Udp-Ip4Base-H1024-P63-S64512-pps-Tg-Ndrpdr.64B--ethip4udp-ip4base-h1024-p63-s64512-pps-tg-ndrpdr"
+#     - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4Udp-Ip4Base-H262144-P63-S16515072-pps-Tg-Ndrpdr.64B--ethip4udp-ip4base-h262144-p63-s16515072-pps-tg-ndrpdr"
+#   layout:
+#     title: "3n-skx-x710-64b--ip4routing-stf-pps-{test_type}"
+#     layout: "plot-throughput"
+#
+# - type: "plot"
+#   title: "Throughput: 3n-skx-x710-78b--ip6-base-scale-{test_type}"
+#   algorithm: "plot_ndrpdr_box_name"
+#   output-file: "{DIR[STATIC,TREX]}/3n-skx-x710-78b--ip6-base-scale-{test_type}"
+#   data: "trex-3n-skx-curr-iter"
+#   core: ["2t1c", ]
+#   include:
+#     - "Tests.Trex.Perf.Ip6.1N1L-10Ge2P1X710-Ethip6-Ip6Base-Tg-Ndrpdr.78B--ethip6-ip6base-tg-ndrpdr"
+#     - "Tests.Trex.Perf.Ip6.1N1L-10Ge2P1X710-Ethip6-Ip6Scale2M-Tg-Ndrpdr.78B--ethip6-ip6scale2m-tg-ndrpdr"
+#   layout:
+#     title: "3n-skx-x710-78b--ip6-base-scale-{test_type}"
+#     layout: "plot-throughput"
+#
+# - type: "plot"
+#   title: "Throughput: 3n-skx-x710-64b--l2-scale-{test_type}"
+#   algorithm: "plot_ndrpdr_box_name"
+#   output-file: "{DIR[STATIC,TREX]}/3n-skx-x710-64b--l2-scale-{test_type}"
+#   data: "trex-3n-skx-curr-iter"
+#   core: ["2t1c", ]
+#   include:
+#     - "Tests.Trex.Perf.L2.1N1L-10Ge2P1X710-Eth-L2Bdscale1Mmaclrn-Tg-Ndrpdr.64B--eth-l2bdscale1mmaclrn-tg-ndrpdr"
+#   layout:
+#     title: "3n-skx-x710-64b--l2-scale-{test_type}"
+#     layout: "plot-throughput"
+
+# TRex 2n-skx
+
+- type: "plot"
+  title: "Throughput: 2n-skx-x710-64b--ip4-base-scale-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,TREX]}/2n-skx-x710-64b--ip4-base-scale-{test_type}"
+  data: "trex-2n-skx-curr-iter"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4-Ip4Base-Tg-Ndrpdr.64B--ethip4-ip4base-tg-ndrpdr"
+    - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4-Ip4Scale2M-Tg-Ndrpdr.64B--ethip4-ip4scale2m-tg-ndrpdr"
+  layout:
+    title: "2n-skx-x710-64b--ip4-base-scale-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 2n-skx-x710-64b--ip4routing-stf-cps-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,TREX]}/2n-skx-x710-64b--ip4routing-stf-cps-{test_type}"
+  data: "trex-2n-skx-curr-iter"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4Tcp-Ip4Base-H1024-P63-S64512-Cps-Tg-Ndrpdr.64B--ethip4tcp-ip4base-h1024-p63-s64512-cps-tg-ndrpdr"
+    - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4Tcp-Ip4Base-H262144-P63-S16515072-Cps-Tg-Ndrpdr.64B--ethip4tcp-ip4base-h262144-p63-s16515072-cps-tg-ndrpdr"
+    - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4Udp-Ip4Base-H1024-P63-S64512-Cps-Tg-Ndrpdr.64B--ethip4udp-ip4base-h1024-p63-s64512-cps-tg-ndrpdr"
+    - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4Udp-Ip4Base-H262144-P63-S16515072-Cps-Tg-Ndrpdr.64B--ethip4udp-ip4base-h262144-p63-s16515072-cps-tg-ndrpdr"
+  layout:
+    title: "2n-skx-x710-64b--ip4routing-stf-cps-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 2n-skx-x710-64b--ip4routing-stf-pps-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,TREX]}/2n-skx-x710-64b--ip4routing-stf-pps-{test_type}"
+  data: "trex-2n-skx-curr-iter"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4Tcp-Ip4Base-H1024-P63-S64512-pps-Tg-Ndrpdr.64B--ethip4tcp-ip4base-h1024-p63-s64512-pps-tg-ndrpdr"
+    - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4Tcp-Ip4Base-H262144-P63-S16515072-pps-Tg-Ndrpdr.64B--ethip4tcp-ip4base-h262144-p63-s16515072-pps-tg-ndrpdr"
+    - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4Udp-Ip4Base-H1024-P63-S64512-pps-Tg-Ndrpdr.64B--ethip4udp-ip4base-h1024-p63-s64512-pps-tg-ndrpdr"
+    - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4Udp-Ip4Base-H262144-P63-S16515072-pps-Tg-Ndrpdr.64B--ethip4udp-ip4base-h262144-p63-s16515072-pps-tg-ndrpdr"
+  layout:
+    title: "2n-skx-x710-64b--ip4routing-stf-pps-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 2n-skx-x710-78b--ip6-base-scale-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,TREX]}/2n-skx-x710-78b--ip6-base-scale-{test_type}"
+  data: "trex-2n-skx-curr-iter"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Trex.Perf.Ip6.1N1L-10Ge2P1X710-Ethip6-Ip6Base-Tg-Ndrpdr.78B--ethip6-ip6base-tg-ndrpdr"
+    - "Tests.Trex.Perf.Ip6.1N1L-10Ge2P1X710-Ethip6-Ip6Scale2M-Tg-Ndrpdr.78B--ethip6-ip6scale2m-tg-ndrpdr"
+  layout:
+    title: "2n-skx-x710-78b--ip6-base-scale-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 2n-skx-x710-64b--l2-scale-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,TREX]}/2n-skx-x710-64b--l2-scale-{test_type}"
+  data: "trex-2n-skx-curr-iter"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Trex.Perf.L2.1N1L-10Ge2P1X710-Eth-L2Bdscale1Mmaclrn-Tg-Ndrpdr.64B--eth-l2bdscale1mmaclrn-tg-ndrpdr"
+  layout:
+    title: "2n-skx-x710-64b--l2-scale-{test_type}"
+    layout: "plot-throughput"