X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fspecifications%2Freport%2Felements.yaml;h=42fc7d1883b344ebc05a7ff5c5ae352edf735dbd;hp=b6867ffd6744f33beab7376d2173d4cabd3bc3d9;hb=aa5bc14e8d85814ff1e107c8f613bd1ce5d3f720;hpb=578e9a678ebd96789fb63a450336645d6d840afd

diff --git a/resources/tools/presentation/specifications/report/elements.yaml b/resources/tools/presentation/specifications/report/elements.yaml
index b6867ffd67..42fc7d1883 100644
--- a/resources/tools/presentation/specifications/report/elements.yaml
+++ b/resources/tools/presentation/specifications/report/elements.yaml
@@ -2,6 +2,1290 @@
 ###                               T A B L E S                                ###
 ################################################################################
 
+# Statistics: job-specs' durations
+
+- type: "table"
+  title: "Job Specification Duration: 2n-icx-iterative"
+  algorithm: "table_job_spec_duration"
+  output-file: "{DIR[STATIC,VPP]}/job-spec-duration-2n-icx-iter"
+  jb-type: "iterative"
+  lines:
+    - job-spec: "vpp-mrr-00"
+      data-set: "vpp-2n-icx-curr-iter-mrr"
+    - job-spec: "vpp-mlr-00"
+      data-set: "vpp-2n-icx-curr-iter"
+    - job-spec: "vpp-gso-mrr-00"
+      data-set: "vpp-2n-icx-curr-iter-gso"
+    - job-spec: "soak-00"
+      data-set: "vpp-2n-icx-curr-soak"
+    - job-spec: "nfv-density-mrr-00"
+      data-set: "vpp-2n-icx-curr-nfv-mrr"
+    - job-spec: "nfv-density-mlr-00"
+      data-set: "vpp-2n-icx-curr-nfv-ndrpdr"
+    - job-spec: "reconf-00"
+      data-set: "vpp-2n-icx-curr-nfv-reconf"
+    - job-spec: "dpdk-mlr-00"
+      data-set: "dpdk-2n-icx-curr-iter"
+
+# - type: "table"
+#   title: "Job Specification Duration: 2n-icx-coverage"
+#   algorithm: "table_job_spec_duration"
+#   output-file: "{DIR[STATIC,VPP]}/job-spec-duration-2n-icx-cov"
+#   jb-type: "coverage"
+#   data: "vpp-2n-icx-curr-cov"
+#   lines:
+
+- type: "table"
+  title: "Job Specification Duration: 3n-icx-iterative"
+  algorithm: "table_job_spec_duration"
+  output-file: "{DIR[STATIC,VPP]}/job-spec-duration-3n-icx-iter"
+  jb-type: "iterative"
+  lines:
+    - job-spec: "vpp-mrr-00"
+      data-set: "vpp-3n-icx-curr-iter-mrr"
+    - job-spec: "vpp-mlr-00"
+      data-set: "vpp-3n-icx-curr-iter"
+    - job-spec: "dpdk-mlr-00"
+      data-set: "dpdk-3n-icx-curr-iter"
+
+- type: "table"
+  title: "Job Specification Duration: 3n-icx-coverage"
+  algorithm: "table_job_spec_duration"
+  output-file: "{DIR[STATIC,VPP]}/job-spec-duration-3n-icx-cov"
+  jb-type: "coverage"
+  data: "vpp-3n-icx-curr-cov"
+  lines:
+    - job-spec: "crypto-00"
+      build: "35"
+    - job-spec: "crypto-01"
+      build: "36"
+    - job-spec: "crypto-02"
+      build: "37"
+    # - job-spec: "crypto-03"  # Completly failed
+    #   build: "68"
+    - job-spec: "crypto-04"
+      build: "38"
+    - job-spec: "ip4-00"
+      build: "39"
+    # - job-spec: "ip4-01"
+    #   build: "40"
+    - job-spec: "ip4-02"
+      build: "41"
+    - job-spec: "ip4-03"
+      build: "42"
+    - job-spec: "ip4-04"
+      build: "43"
+    - job-spec: "ip4-05"
+      build: "44"
+    - job-spec: "ip4-06"
+      build: "45"
+    - job-spec: "ip4-07"
+      build: "46"
+    # - job-spec: "ip4tun-00"
+    #   build: "47"
+    - job-spec: "ip4tun-02"
+      build: "48"
+    - job-spec: "ip6-00"
+      build: "49"
+    - job-spec: "ip6-01"
+      build: "50"
+    - job-spec: "ip6tun-00"
+      build: "51"
+    - job-spec: "l2-00"
+      build: "52"
+    - job-spec: "l2-01"
+      build: "53"
+    # - job-spec: "l2-02"
+    #   build: "54"
+    # - job-spec: "l2-03"
+    #   build: "55"
+    - job-spec: "l2-04"
+      build: "56"
+    - job-spec: "l2-05"
+      build: "57"
+    - job-spec: "l2-06"
+      build: "58"
+    - job-spec: "l2-07"
+      build: "59"
+    # - job-spec: "l2-08"
+    #   build: "60"
+    # - job-spec: "l2-09"
+    #   build: "61"
+    # - job-spec: "l2-10"
+    #   build: "62"
+    # - job-spec: "memif-00"
+    #   build: "63"
+    - job-spec: "srv6-00"
+      build: "64"
+    # - job-spec: "srv6-01"
+    #   build: "65"
+    # - job-spec: "vhost-00"
+    #   build: "66"
+    # - job-spec: "vhost-01"
+    #   build: "67"
+
+- 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"
+    - 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: "18"
+    - job-spec: "ip4-00"
+      build: "19"
+    - job-spec: "ip4-01"
+      build: "20"
+    - job-spec: "ip4-02"
+      build: "21"
+    - job-spec: "ip4-03"
+      build: "22"
+    - job-spec: "ip4-04"
+      build: "23"
+    - job-spec: "ip4-05"
+      build: "24"
+    - job-spec: "ip4-06"
+      build: "25"
+    - job-spec: "ip4-07"
+      build: "26"
+    - job-spec: "ip4tun-00"
+      build: "27"
+    - job-spec: "ip6-00"
+      build: "28"
+    - job-spec: "ip6-01"
+      build: "29"
+    - job-spec: "l2-00"
+      build: "30"
+    - job-spec: "l2-01"
+      build: "31"
+    - job-spec: "lb-00"
+      build: "32"
+    - job-spec: "memif-00"
+      build: "33"
+    - job-spec: "vhost-00"
+      build: "34"
+
+- 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: "14"
+    - job-spec: "ip6-01"
+      build: "10"
+    - job-spec: "l2-00"
+      build: "11"
+    - job-spec: "l2-01"
+      build: "12"
+
+- 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"
+    - job-spec: "vpp-gso-mrr-00"
+      data-set: "vpp-2n-skx-curr-iter-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: "18"
+    - job-spec: "ip4-00"
+      build: "19"
+    - job-spec: "ip4-01"
+      build: "20"
+    - job-spec: "ip4-02"
+      build: "21"
+    - job-spec: "ip4-03"
+      build: "22"
+    - job-spec: "ip4-04"
+      build: "23"
+    - job-spec: "ip4-05"
+      build: "24"
+    - job-spec: "ip4-06"
+      build: "25"
+    - job-spec: "ip4-07"
+      build: "26"
+    - job-spec: "ip4tun-00"
+      build: "27"
+    - job-spec: "ip6-00"
+      build: "28"
+    - job-spec: "ip6-01"
+      build: "29"
+    - job-spec: "l2-00"
+      build: "30"
+    - job-spec: "l2-01"
+      build: "31"
+    - job-spec: "lb-00"
+      build: "32"
+    - job-spec: "memif-00"
+      build: "33"
+    - job-spec: "vhost-00"
+      build: "34"
+
+- 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: "15"
+    - job-spec: "ip4-01"
+      build: "16"
+    - job-spec: "ip4-02"
+      build: "17"
+    - job-spec: "ip4-03"
+      build: "18"
+#     - job-spec: "ip4-04"
+#       build: "19"
+    - job-spec: "ip4-05"
+      build: "20"
+    - job-spec: "ip4-06"
+      build: "21"
+#     - job-spec: "ip6-00"
+#       build: "22"
+    - job-spec: "ip6-01"
+      build: "23"
+    - job-spec: "l2-00"
+      build: "24"
+#     - job-spec: "l2-01"
+#       build: "25"
+#     - job-spec: "l2-02"
+#       build: "26"
+#     - job-spec: "l2-03"
+#       build: "27"
+#     - job-spec: "l2-04"
+#       build: "28"
+
+- 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"
+    - 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: "16"
+#     - job-spec: "ip4-00"
+#       build: "17"
+    - job-spec: "ip4-01"
+      build: "18"
+    - job-spec: "ip4-02"
+      build: "19"
+    - job-spec: "ip4-03"
+      build: "20"
+#     - job-spec: "ip4-04"
+#       build: "21"
+#     - job-spec: "ip4-05"
+#       build: "22"
+#     - job-spec: "ip4tun-00"
+#       build: "23"
+#     - job-spec: "ip6-00"
+#       build: "24"
+#     - job-spec: "ip6-01"
+#       build: "25"
+#     - job-spec: "l2-00"
+#       build: "26"
+    - job-spec: "l2-01"
+      build: "27"
+#     - job-spec: "lb-00"
+#       build: "28"
+#     - job-spec: "memif-00"
+#       build: "29"
+    - job-spec: "vhost-00"
+      build: "30"
+
+- 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: "18"
+    - job-spec: "l2-00"
+      build: "19"
+    - job-spec: "l2-01"
+      build: "20"
+
+- 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"
+
+- 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: "35"
+    - job-spec: "crypto-01"
+      build: "36"
+    - job-spec: "crypto-02"
+      build: "37"
+    # - job-spec: "crypto-03"  # Completly failed
+    #   build: "68"
+    - job-spec: "crypto-04"
+      build: "38"
+    - job-spec: "ip4-00"
+      build: "39"
+    - job-spec: "ip4-01"
+      build: "40"
+    - job-spec: "ip4-02"
+      build: "41"
+    - job-spec: "ip4-03"
+      build: "42"
+    - job-spec: "ip4-04"
+      build: "43"
+    - job-spec: "ip4-05"
+      build: "44"
+    - job-spec: "ip4-06"
+      build: "45"
+    - job-spec: "ip4-07"
+      build: "46"
+    - job-spec: "ip4tun-00"
+      build: "47"
+    - job-spec: "ip4tun-02"
+      build: "48"
+    - job-spec: "ip6-00"
+      build: "49"
+    - job-spec: "ip6-01"
+      build: "50"
+    - job-spec: "ip6tun-00"
+      build: "51"
+    - job-spec: "l2-00"
+      build: "52"
+    - job-spec: "l2-01"
+      build: "53"
+    - job-spec: "l2-02"
+      build: "54"
+    - job-spec: "l2-03"
+      build: "55"
+    - job-spec: "l2-04"
+      build: "56"
+    - job-spec: "l2-05"
+      build: "57"
+    - job-spec: "l2-06"
+      build: "58"
+    - job-spec: "l2-07"
+      build: "59"
+    - job-spec: "l2-08"
+      build: "60"
+    - job-spec: "l2-09"
+      build: "61"
+    - job-spec: "l2-10"
+      build: "62"
+    - job-spec: "memif-00"
+      build: "63"
+    - job-spec: "srv6-00"
+      build: "64"
+    - job-spec: "srv6-01"
+      build: "65"
+    - job-spec: "vhost-00"
+      build: "66"
+    - job-spec: "vhost-01"
+      build: "67"
+
+- 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: "18"
+#     - job-spec: "ip4-01"
+#       build: "19"
+    - job-spec: "ip4-02"
+      build: "20"
+    - job-spec: "ip4-03"
+      build: "21"
+    - job-spec: "ip4tun-00"
+      build: "22"
+    - job-spec: "ip6-00"
+      build: "23"
+#     - job-spec: "ip6-01"
+#       build: "24"
+#     - job-spec: "l2-00"
+#       build: "25"
+#     - job-spec: "l2-01"
+#       build: "26"
+#     - job-spec: "l2-02"
+#       build: "27"
+#     - job-spec: "l2-03"
+#       build: "28"
+#     - job-spec: "l2-04"
+#       build: "29"
+#     - job-spec: "memif-00"
+#       build: "30"
+#     - job-spec: "srv6-00"
+#       build: "31"
+#     - job-spec: "srv6-01"
+#       build: "32"
+#     - job-spec: "vhost-00"
+#       build: "33"
+#     - job-spec: "vhost-01"
+#       build: "34"
+
+# 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: "2106.0-8"
+      data-set: "vpp-3n-skx-hist-iter-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-3n-skx-prev-iter-old-env"
+    - title: "2110.0-9"
+      data-set: "vpp-3n-skx-prev-iter-new-env"
+    - title: "2202.0-9"
+      data-set: "vpp-3n-skx-curr-iter"
+  comparisons:
+    - title: "2110.0-9 vs 2110.0-8"
+      reference: 2
+      compare: 3
+    - title: "2202.0-9 vs 2110.0-9"
+      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, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - '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.'
+    - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2202.0-9 vs 2110.0-9: 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: "2106.0-8"
+      data-set: "vpp-3n-skx-hist-iter-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-3n-skx-prev-iter-old-env"
+    - title: "2110.0-9"
+      data-set: "vpp-3n-skx-prev-iter-new-env"
+    - title: "2202.0-9"
+      data-set: "vpp-3n-skx-curr-iter"
+  comparisons:
+    - title: "2110.0-9 vs 2110.0-8"
+      reference: 2
+      compare: 3
+    - title: "2202.0-9 vs 2110.0-9"
+      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, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - '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.'
+    - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2202.0-9 vs 2110.0-9: 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: "2106.0-8"
+      data-set: "vpp-3n-skx-hist-iter-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-3n-skx-prev-iter-old-env"
+    - title: "2110.0-9"
+      data-set: "vpp-3n-skx-prev-iter-new-env"
+    - title: "2202.0-9"
+      data-set: "vpp-3n-skx-curr-iter"
+  comparisons:
+    - title: "2110.0-9 vs 2110.0-8"
+      reference: 2
+      compare: 3
+    - title: "2202.0-9 vs 2110.0-9"
+      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, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - '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.'
+    - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2202.0-9 vs 2110.0-9: 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: "2106.0-8"
+      data-set: "vpp-2n-skx-hist-iter-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-2n-skx-prev-iter-old-env"
+    - title: "2110.0-9"
+      data-set: "vpp-2n-skx-prev-iter-new-env"
+    - title: "2202.0-9"
+      data-set: "vpp-2n-skx-curr-iter"
+  comparisons:
+    - title: "2110.0-9 vs 2110.0-8"
+      reference: 2
+      compare: 3
+    - title: "2202.0-9 vs 2110.0-9"
+      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, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - '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.'
+    - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2202.0-9 vs 2110.0-9: 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: "2106.0-8"
+      data-set: "vpp-2n-skx-hist-iter-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-2n-skx-prev-iter-old-env"
+    - title: "2110.0-9"
+      data-set: "vpp-2n-skx-prev-iter-new-env"
+    - title: "2202.0-9"
+      data-set: "vpp-2n-skx-curr-iter"
+  comparisons:
+    - title: "2110.0-9 vs 2110.0-8"
+      reference: 2
+      compare: 3
+    - title: "2202.0-9 vs 2110.0-9"
+      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, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - '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.'
+    - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2202.0-9 vs 2110.0-9: 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: "2106.0-8"
+      data-set: "vpp-2n-skx-hist-iter-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-2n-skx-prev-iter-old-env"
+    - title: "2110.0-9"
+      data-set: "vpp-2n-skx-prev-iter-new-env"
+    - title: "2202.0-9"
+      data-set: "vpp-2n-skx-curr-iter"
+  comparisons:
+    - title: "2110.0-9 vs 2110.0-8"
+      reference: 2
+      compare: 3
+    - title: "2202.0-9 vs 2110.0-9"
+      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, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - '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.'
+    - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2202.0-9 vs 2110.0-9: 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: "2106.0-8"
+      data-set: "vpp-2n-clx-hist-iter-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-2n-clx-prev-iter-old-env"
+    - title: "2110.0-9"
+      data-set: "vpp-2n-clx-prev-iter-new-env"
+    - title: "2202.0-9"
+      data-set: "vpp-2n-clx-curr-iter"
+  comparisons:
+    - title: "2110.0-9 vs 2110.0-8"
+      reference: 2
+      compare: 3
+    - title: "2202.0-9 vs 2110.0-9"
+      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, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - '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.'
+    - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2202.0-9 vs 2110.0-9: 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: "2106.0-8"
+      data-set: "vpp-2n-clx-hist-iter-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-2n-clx-prev-iter-old-env"
+    - title: "2110.0-9"
+      data-set: "vpp-2n-clx-prev-iter-new-env"
+    - title: "2202.0-9"
+      data-set: "vpp-2n-clx-curr-iter"
+  comparisons:
+    - title: "2110.0-9 vs 2110.0-8"
+      reference: 2
+      compare: 3
+    - title: "2202.0-9 vs 2110.0-9"
+      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, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - '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.'
+    - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2202.0-9 vs 2110.0-9: 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: "2106.0-8"
+      data-set: "vpp-2n-clx-hist-iter-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-2n-clx-prev-iter-old-env"
+    - title: "2110.0-9"
+      data-set: "vpp-2n-clx-prev-iter-new-env"
+    - title: "2202.0-9"
+      data-set: "vpp-2n-clx-curr-iter"
+  comparisons:
+    - title: "2110.0-9 vs 2110.0-8"
+      reference: 2
+      compare: 3
+    - title: "2202.0-9 vs 2110.0-9"
+      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, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - '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.'
+    - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2202.0-9 vs 2110.0-9: 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: "2106.0-8"
+      data-set: "vpp-2n-clx-hist-iter-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-2n-clx-prev-iter-old-env"
+    - title: "2110.0-9"
+      data-set: "vpp-2n-clx-prev-iter-new-env"
+    - title: "2202.0-9"
+      data-set: "vpp-2n-clx-curr-iter"
+  comparisons:
+    - title: "2110.0-9 vs 2110.0-8"
+      reference: 2
+      compare: 3
+    - title: "2202.0-9 vs 2110.0-9"
+      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, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - '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.'
+    - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2202.0-9 vs 2110.0-9: 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: "2106.0-8"
+      data-set: "vpp-2n-clx-hist-iter-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-2n-clx-prev-iter-old-env"
+    - title: "2110.0-9"
+      data-set: "vpp-2n-clx-prev-iter-new-env"
+    - title: "2202.0-9"
+      data-set: "vpp-2n-clx-curr-iter"
+  comparisons:
+    - title: "2110.0-9 vs 2110.0-8"
+      reference: 2
+      compare: 3
+    - title: "2202.0-9 vs 2110.0-9"
+      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, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - '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.'
+    - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2202.0-9 vs 2110.0-9: 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: "2106.0-8"
+      data-set: "vpp-2n-clx-hist-iter-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-2n-clx-prev-iter-old-env"
+    - title: "2110.0-9"
+      data-set: "vpp-2n-clx-prev-iter-new-env"
+    - title: "2202.0-9"
+      data-set: "vpp-2n-clx-curr-iter"
+  comparisons:
+    - title: "2110.0-9 vs 2110.0-8"
+      reference: 2
+      compare: 3
+    - title: "2202.0-9 vs 2110.0-9"
+      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, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - '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.'
+    - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2202.0-9 vs 2110.0-9: 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: "2106.0-8"
+      data-set: "vpp-2n-zn2-hist-iter-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-2n-zn2-prev-iter-old-env"
+    - title: "2110.0-9"
+      data-set: "vpp-2n-zn2-prev-iter-new-env"
+    - title: "2202.0-9"
+      data-set: "vpp-2n-zn2-curr-iter"
+  comparisons:
+    - title: "2110.0-9 vs 2110.0-8"
+      reference: 2
+      compare: 3
+    - title: "2202.0-9 vs 2110.0-9"
+      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, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - '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.'
+    - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2202.0-9 vs 2110.0-9: 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: "2106.0-8"
+      data-set: "vpp-2n-zn2-hist-iter-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-2n-zn2-prev-iter-old-env"
+    - title: "2110.0-9"
+      data-set: "vpp-2n-zn2-prev-iter-new-env"
+    - title: "2202.0-9"
+      data-set: "vpp-2n-zn2-curr-iter"
+  comparisons:
+    - title: "2110.0-9 vs 2110.0-8"
+      reference: 2
+      compare: 3
+    - title: "2202.0-9 vs 2110.0-9"
+      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, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - '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.'
+    - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2202.0-9 vs 2110.0-9: 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: "2106.0-8"
+      data-set: "vpp-2n-zn2-hist-iter-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-2n-zn2-prev-iter-old-env"
+    - title: "2110.0-9"
+      data-set: "vpp-2n-zn2-prev-iter-new-env"
+    - title: "2202.0-9"
+      data-set: "vpp-2n-zn2-curr-iter"
+  comparisons:
+    - title: "2110.0-9 vs 2110.0-8"
+      reference: 2
+      compare: 3
+    - title: "2202.0-9 vs 2110.0-9"
+      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, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - '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.'
+    - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2202.0-9 vs 2110.0-9: 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: "2106.0-8"
+      data-set: "vpp-2n-tx2-hist-iter-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-2n-tx2-prev-iter-old-env"
+    - title: "2110.0-9"
+      data-set: "vpp-2n-tx2-prev-iter-new-env"
+    - title: "2202.0-9"
+      data-set: "vpp-2n-tx2-curr-iter"
+  comparisons:
+    - title: "2110.0-9 vs 2110.0-8"
+      reference: 2
+      compare: 3
+    - title: "2202.0-9 vs 2110.0-9"
+      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, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - '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.'
+    - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2202.0-9 vs 2110.0-9: 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: "2106.0-8"
+      data-set: "vpp-2n-tx2-hist-iter-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-2n-tx2-prev-iter-old-env"
+    - title: "2110.0-9"
+      data-set: "vpp-2n-tx2-prev-iter-new-env"
+    - title: "2202.0-9"
+      data-set: "vpp-2n-tx2-curr-iter"
+  comparisons:
+    - title: "2110.0-9 vs 2110.0-8"
+      reference: 2
+      compare: 3
+    - title: "2202.0-9 vs 2110.0-9"
+      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, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - '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.'
+    - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2202.0-9 vs 2110.0-9: 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: "2106.0-8"
+      data-set: "vpp-2n-tx2-hist-iter-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-2n-tx2-prev-iter-old-env"
+    - title: "2110.0-9"
+      data-set: "vpp-2n-tx2-prev-iter-new-env"
+    - title: "2202.0-9"
+      data-set: "vpp-2n-tx2-curr-iter"
+  comparisons:
+    - title: "2110.0-9 vs 2110.0-8"
+      reference: 2
+      compare: 3
+    - title: "2202.0-9 vs 2110.0-9"
+      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, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - '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.'
+    - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2202.0-9 vs 2110.0-9: 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: "2106.0-8"
+      data-set: "vpp-3n-tsh-hist-iter-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-3n-tsh-prev-iter-old-env"
+    - title: "2110.0-9"
+      data-set: "vpp-3n-tsh-prev-iter-new-env"
+    - title: "2202.0-9"
+      data-set: "vpp-3n-tsh-curr-iter"
+  comparisons:
+    - title: "2110.0-9 vs 2110.0-8"
+      reference: 2
+      compare: 3
+    - title: "2202.0-9 vs 2110.0-9"
+      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, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - '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.'
+    - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2202.0-9 vs 2110.0-9: 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: "2106.0-8"
+      data-set: "vpp-3n-tsh-hist-iter-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-3n-tsh-prev-iter-old-env"
+    - title: "2110.0-9"
+      data-set: "vpp-3n-tsh-prev-iter-new-env"
+    - title: "2202.0-9"
+      data-set: "vpp-3n-tsh-curr-iter"
+  comparisons:
+    - title: "2110.0-9 vs 2110.0-8"
+      reference: 2
+      compare: 3
+    - title: "2202.0-9 vs 2110.0-9"
+      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, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - '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.'
+    - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2202.0-9 vs 2110.0-9: 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: "2106.0-8"
+      data-set: "vpp-3n-tsh-hist-iter-new-env"
+    - title: "2110.0-8"
+      data-set: "vpp-3n-tsh-prev-iter-old-env"
+    - title: "2110.0-9"
+      data-set: "vpp-3n-tsh-prev-iter-new-env"
+    - title: "2202.0-9"
+      data-set: "vpp-3n-tsh-curr-iter"
+  comparisons:
+    - title: "2110.0-9 vs 2110.0-8"
+      reference: 2
+      compare: 3
+    - title: "2202.0-9 vs 2110.0-9"
+      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, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - '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.'
+    - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
+
+# VPP Soak vs NDR - 2n-icx
+- type: "table"
+  title: "VPP Soak vs NDR 2n-icx"
+  algorithm: "table_soak_vs_ndr"
+  output-file: "{DIR[STATIC,VPP]}/soak-vs-ndr-2n-icx"
+  reference:
+    title: "NDR"
+    data: "vpp-soak-vs-ndr-2n-icx-ref"
+  compare:
+    title: "Soak"
+    data: "vpp-2n-icx-curr-soak"
+  data: "vpp-soak-vs-ndr-2n-icx"
+  include-tests: "NDR"
+  filter: "'NDRPDR' or 'SOAK'"
+  parameters:
+    - "throughput"
+    - "name"
+    - "parent"
+
 # VPP Soak vs NDR - 2n-skx
 - type: "table"
   title: "VPP Soak vs NDR 2n-skx"
@@ -367,6 +1651,52 @@
 ################################################################################
 # VPP
 
+# VPP Performance Changes 3n-skx Hoststack
+- type: "table"
+  title: "VPP Performance Changes 3n-skx Hoststack"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-hoststack"
+  include-tests: "hoststack"
+  filter: "all"
+  columns:
+    - title: "2110.0-8"
+      data-set: "vpp-3n-skx-prev-iter-hoststack-old-env"
+    - title: "2202.0-9"
+      data-set: "vpp-3n-skx-curr-iter-hoststack"
+  comparisons:
+    - title: "2202.0-9 vs 2110.0-8"
+      reference: 1
+      compare: 2
+  legend:
+    - ''
+    - 'Test Case:            Test cases executed for: Hoststack on 3n-skx with xxv710.'
+    - 'YYMM.V-E:             [Gbps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - '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.'
+    - '2202.0-9 vs 2110.0-8: Compares VPP code current vs previous.'
+
+# VPP Performance Changes 2n-clx VSAP
+- type: "table"
+  title: "VPP Performance Changes 2n-clx VSAP"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-clx-vsap"
+  include-tests: "vsap"
+  filter: "all"
+  columns:
+    - title: "2110.0-8"
+      data-set: "vpp-2n-clx-curr-iter-vsap-old-env"
+    - title: "2202.0-9"
+      data-set: "vpp-2n-clx-curr-iter-vsap"
+  comparisons:
+    - title: "2202.0-9 vs 2110.0-8"
+      reference: 1
+      compare: 2
+  legend:
+    - ''
+    - 'Test Case:            Test cases executed for: VSAP on 2n-clx with cx556a.'
+    - 'YYMM.V-E:             [cps|rps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - '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.'
+    - '2202.0-9 vs 2110.0-8: Compares VPP code current vs previous.'
+
 # VPP Performance Changes 3n-skx 2t1c pdr
 - type: "table"
   title: "VPP Performance Changes 3n-skx 2t1c pdr"
@@ -375,30 +1705,28 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2009.0-6"
+    - title: "2106.0-8"
       data-set: "vpp-3n-skx-hist-iter-new-env"
-    - title: "2101.0-6"
+    - title: "2110.0-8"
       data-set: "vpp-3n-skx-prev-iter-old-env"
-    - title: "2101.0-7"
+    - title: "2110.0-9"
       data-set: "vpp-3n-skx-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2202.0-9"
       data-set: "vpp-3n-skx-curr-iter"
   comparisons:
-    - title: "2101.0-7 vs 2101.0-6"
+    - title: "2110.0-9 vs 2110.0-8"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-3n-skx-2t1c-pdr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2202.0-9 vs 2110.0-9"
       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, "6" for CSIT rls2101, "7" for CSIT rls2106).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - '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.'
-    - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-skx 4t2c pdr
 - type: "table"
@@ -408,30 +1736,28 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2009.0-6"
+    - title: "2106.0-8"
       data-set: "vpp-3n-skx-hist-iter-new-env"
-    - title: "2101.0-6"
+    - title: "2110.0-8"
       data-set: "vpp-3n-skx-prev-iter-old-env"
-    - title: "2101.0-7"
+    - title: "2110.0-9"
       data-set: "vpp-3n-skx-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2202.0-9"
       data-set: "vpp-3n-skx-curr-iter"
   comparisons:
-    - title: "2101.0-7 vs 2101.0-6"
+    - title: "2110.0-9 vs 2110.0-8"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-3n-skx-4t2c-pdr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2202.0-9 vs 2110.0-9"
       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, "6" for CSIT rls2101, "7" for CSIT rls2106).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - '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.'
-    - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-skx 2t1c ndr
 - type: "table"
@@ -441,30 +1767,28 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2009.0-6"
+    - title: "2106.0-8"
       data-set: "vpp-3n-skx-hist-iter-new-env"
-    - title: "2101.0-6"
+    - title: "2110.0-8"
       data-set: "vpp-3n-skx-prev-iter-old-env"
-    - title: "2101.0-7"
+    - title: "2110.0-9"
       data-set: "vpp-3n-skx-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2202.0-9"
       data-set: "vpp-3n-skx-curr-iter"
   comparisons:
-    - title: "2101.0-7 vs 2101.0-6"
+    - title: "2110.0-9 vs 2110.0-8"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-3n-skx-2t1c-ndr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2202.0-9 vs 2110.0-9"
       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, "6" for CSIT rls2101, "7" for CSIT rls2106).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - '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.'
-    - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-skx 4t2c ndr
 - type: "table"
@@ -474,30 +1798,28 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2009.0-6"
+    - title: "2106.0-8"
       data-set: "vpp-3n-skx-hist-iter-new-env"
-    - title: "2101.0-6"
+    - title: "2110.0-8"
       data-set: "vpp-3n-skx-prev-iter-old-env"
-    - title: "2101.0-7"
+    - title: "2110.0-9"
       data-set: "vpp-3n-skx-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2202.0-9"
       data-set: "vpp-3n-skx-curr-iter"
   comparisons:
-    - title: "2101.0-7 vs 2101.0-6"
+    - title: "2110.0-9 vs 2110.0-8"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-3n-skx-4t2c-ndr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2202.0-9 vs 2110.0-9"
       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, "6" for CSIT rls2101, "7" for CSIT rls2106).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - '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.'
-    - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-skx 2t1c pdr
 - type: "table"
@@ -507,30 +1829,28 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2009.0-6"
+    - title: "2106.0-8"
       data-set: "vpp-2n-skx-hist-iter-new-env"
-    - title: "2101.0-6"
+    - title: "2110.0-8"
       data-set: "vpp-2n-skx-prev-iter-old-env"
-    - title: "2101.0-7"
+    - title: "2110.0-9"
       data-set: "vpp-2n-skx-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2202.0-9"
       data-set: "vpp-2n-skx-curr-iter"
   comparisons:
-    - title: "2101.0-7 vs 2101.0-6"
+    - title: "2110.0-9 vs 2110.0-8"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-2n-skx-2t1c-pdr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2202.0-9 vs 2110.0-9"
       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, "6" for CSIT rls2101, "7" for CSIT rls2106).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - '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.'
-    - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-skx 4t2c pdr
 - type: "table"
@@ -540,30 +1860,28 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2009.0-6"
+    - title: "2106.0-8"
       data-set: "vpp-2n-skx-hist-iter-new-env"
-    - title: "2101.0-6"
+    - title: "2110.0-8"
       data-set: "vpp-2n-skx-prev-iter-old-env"
-    - title: "2101.0-7"
+    - title: "2110.0-9"
       data-set: "vpp-2n-skx-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2202.0-9"
       data-set: "vpp-2n-skx-curr-iter"
   comparisons:
-    - title: "2101.0-7 vs 2101.0-6"
+    - title: "2110.0-9 vs 2110.0-8"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-2n-skx-4t2c-pdr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2202.0-9 vs 2110.0-9"
       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, "6" for CSIT rls2101, "7" for CSIT rls2106).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - '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.'
-    - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-skx 2t1c ndr
 - type: "table"
@@ -573,30 +1891,28 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2009.0-6"
+    - title: "2106.0-8"
       data-set: "vpp-2n-skx-hist-iter-new-env"
-    - title: "2101.0-6"
+    - title: "2110.0-8"
       data-set: "vpp-2n-skx-prev-iter-old-env"
-    - title: "2101.0-7"
+    - title: "2110.0-9"
       data-set: "vpp-2n-skx-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2202.0-9"
       data-set: "vpp-2n-skx-curr-iter"
   comparisons:
-    - title: "2101.0-7 vs 2101.0-6"
+    - title: "2110.0-9 vs 2110.0-8"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-2n-skx-2t1c-ndr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2202.0-9 vs 2110.0-9"
       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, "6" for CSIT rls2101, "7" for CSIT rls2106).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - '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.'
-    - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-skx 4t2c ndr
 - type: "table"
@@ -606,30 +1922,28 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2009.0-6"
+    - title: "2106.0-8"
       data-set: "vpp-2n-skx-hist-iter-new-env"
-    - title: "2101.0-6"
+    - title: "2110.0-8"
       data-set: "vpp-2n-skx-prev-iter-old-env"
-    - title: "2101.0-7"
+    - title: "2110.0-9"
       data-set: "vpp-2n-skx-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2202.0-9"
       data-set: "vpp-2n-skx-curr-iter"
   comparisons:
-    - title: "2101.0-7 vs 2101.0-6"
+    - title: "2110.0-9 vs 2110.0-8"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-2n-skx-4t2c-ndr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2202.0-9 vs 2110.0-9"
       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, "6" for CSIT rls2101, "7" for CSIT rls2106).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - '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.'
-    - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-xxv710 2t1c pdr
 - type: "table"
@@ -639,30 +1953,28 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2009.0-6"
+    - title: "2106.0-8"
       data-set: "vpp-2n-clx-hist-iter-new-env"
-    - title: "2101.0-6"
+    - title: "2110.0-8"
       data-set: "vpp-2n-clx-prev-iter-old-env"
-    - title: "2101.0-7"
+    - title: "2110.0-9"
       data-set: "vpp-2n-clx-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2202.0-9"
       data-set: "vpp-2n-clx-curr-iter"
   comparisons:
-    - title: "2101.0-7 vs 2101.0-6"
+    - title: "2110.0-9 vs 2110.0-8"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-2n-clx-2t1c-pdr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2202.0-9 vs 2110.0-9"
       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, "6" for CSIT rls2101, "7" for CSIT rls2106).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - '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.'
-    - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-xxv710 4t2c pdr
 - type: "table"
@@ -672,30 +1984,28 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2009.0-6"
+    - title: "2106.0-8"
       data-set: "vpp-2n-clx-hist-iter-new-env"
-    - title: "2101.0-6"
+    - title: "2110.0-8"
       data-set: "vpp-2n-clx-prev-iter-old-env"
-    - title: "2101.0-7"
+    - title: "2110.0-9"
       data-set: "vpp-2n-clx-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2202.0-9"
       data-set: "vpp-2n-clx-curr-iter"
   comparisons:
-    - title: "2101.0-7 vs 2101.0-6"
+    - title: "2110.0-9 vs 2110.0-8"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-2n-clx-4t2c-pdr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2202.0-9 vs 2110.0-9"
       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, "6" for CSIT rls2101, "7" for CSIT rls2106).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - '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.'
-    - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-xxv710 2t1c ndr
 - type: "table"
@@ -705,30 +2015,28 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2009.0-6"
+    - title: "2106.0-8"
       data-set: "vpp-2n-clx-hist-iter-new-env"
-    - title: "2101.0-6"
+    - title: "2110.0-8"
       data-set: "vpp-2n-clx-prev-iter-old-env"
-    - title: "2101.0-7"
+    - title: "2110.0-9"
       data-set: "vpp-2n-clx-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2202.0-9"
       data-set: "vpp-2n-clx-curr-iter"
   comparisons:
-    - title: "2101.0-7 vs 2101.0-6"
+    - title: "2110.0-9 vs 2110.0-8"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-2n-clx-2t1c-ndr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2202.0-9 vs 2110.0-9"
       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, "6" for CSIT rls2101, "7" for CSIT rls2106).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - '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.'
-    - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-xxv710 4t2c ndr
 - type: "table"
@@ -738,30 +2046,28 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2009.0-6"
+    - title: "2106.0-8"
       data-set: "vpp-2n-clx-hist-iter-new-env"
-    - title: "2101.0-6"
+    - title: "2110.0-8"
       data-set: "vpp-2n-clx-prev-iter-old-env"
-    - title: "2101.0-7"
+    - title: "2110.0-9"
       data-set: "vpp-2n-clx-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2202.0-9"
       data-set: "vpp-2n-clx-curr-iter"
   comparisons:
-    - title: "2101.0-7 vs 2101.0-6"
+    - title: "2110.0-9 vs 2110.0-8"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-2n-clx-4t2c-ndr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2202.0-9 vs 2110.0-9"
       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, "6" for CSIT rls2101, "7" for CSIT rls2106).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - '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.'
-    - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-cx556a 2t1c pdr
 - type: "table"
@@ -771,30 +2077,28 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Mellanox-CX556A' and not 'NF_DENSITY'"
   columns:
-    - title: "2009.0-6"
+    - title: "2106.0-8"
       data-set: "vpp-2n-clx-hist-iter-new-env"
-    - title: "2101.0-6"
+    - title: "2110.0-8"
       data-set: "vpp-2n-clx-prev-iter-old-env"
-    - title: "2101.0-7"
+    - title: "2110.0-9"
       data-set: "vpp-2n-clx-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2202.0-9"
       data-set: "vpp-2n-clx-curr-iter"
   comparisons:
-    - title: "2101.0-7 vs 2101.0-6"
+    - title: "2110.0-9 vs 2110.0-8"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-2n-clx-2t1c-pdr-rca2.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2202.0-9 vs 2110.0-9"
       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, "6" for CSIT rls2101, "7" for CSIT rls2106).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - '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.'
-    - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-cx556a 4t2c pdr
 - type: "table"
@@ -804,30 +2108,28 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Mellanox-CX556A' and not 'NF_DENSITY'"
   columns:
-    - title: "2009.0-6"
+    - title: "2106.0-8"
       data-set: "vpp-2n-clx-hist-iter-new-env"
-    - title: "2101.0-6"
+    - title: "2110.0-8"
       data-set: "vpp-2n-clx-prev-iter-old-env"
-    - title: "2101.0-7"
+    - title: "2110.0-9"
       data-set: "vpp-2n-clx-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2202.0-9"
       data-set: "vpp-2n-clx-curr-iter"
   comparisons:
-    - title: "2101.0-7 vs 2101.0-6"
+    - title: "2110.0-9 vs 2110.0-8"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-2n-clx-4t2c-pdr-rca2.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2202.0-9 vs 2110.0-9"
       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, "6" for CSIT rls2101, "7" for CSIT rls2106).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - '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.'
-    - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-cx556a 2t1c ndr
 - type: "table"
@@ -837,30 +2139,28 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Mellanox-CX556A' and not 'NF_DENSITY'"
   columns:
-    - title: "2009.0-6"
+    - title: "2106.0-8"
       data-set: "vpp-2n-clx-hist-iter-new-env"
-    - title: "2101.0-6"
+    - title: "2110.0-8"
       data-set: "vpp-2n-clx-prev-iter-old-env"
-    - title: "2101.0-7"
+    - title: "2110.0-9"
       data-set: "vpp-2n-clx-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2202.0-9"
       data-set: "vpp-2n-clx-curr-iter"
   comparisons:
-    - title: "2101.0-7 vs 2101.0-6"
+    - title: "2110.0-9 vs 2110.0-8"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-2n-clx-2t1c-ndr-rca2.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2202.0-9 vs 2110.0-9"
       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, "6" for CSIT rls2101, "7" for CSIT rls2106).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - '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.'
-    - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-cx556a 4t2c ndr
 - type: "table"
@@ -870,30 +2170,28 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Mellanox-CX556A' and not 'NF_DENSITY'"
   columns:
-    - title: "2009.0-6"
+    - title: "2106.0-8"
       data-set: "vpp-2n-clx-hist-iter-new-env"
-    - title: "2101.0-6"
+    - title: "2110.0-8"
       data-set: "vpp-2n-clx-prev-iter-old-env"
-    - title: "2101.0-7"
+    - title: "2110.0-9"
       data-set: "vpp-2n-clx-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2202.0-9"
       data-set: "vpp-2n-clx-curr-iter"
   comparisons:
-    - title: "2101.0-7 vs 2101.0-6"
+    - title: "2110.0-9 vs 2110.0-8"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-2n-clx-4t2c-ndr-rca2.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2202.0-9 vs 2110.0-9"
       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, "6" for CSIT rls2101, "7" for CSIT rls2106).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - '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.'
-    - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-zn2-xxv710 2t1c pdr
 - type: "table"
@@ -903,30 +2201,28 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "2009.0-6"
+    - title: "2106.0-8"
       data-set: "vpp-2n-zn2-hist-iter-new-env"
-    - title: "2101.0-6"
+    - title: "2110.0-8"
       data-set: "vpp-2n-zn2-prev-iter-old-env"
-    - title: "2101.0-7"
+    - title: "2110.0-9"
       data-set: "vpp-2n-zn2-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2202.0-9"
       data-set: "vpp-2n-zn2-curr-iter"
   comparisons:
-    - title: "2101.0-7 vs 2101.0-6"
+    - title: "2110.0-9 vs 2110.0-8"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-2n-zn2-2t1c-pdr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2202.0-9 vs 2110.0-9"
       reference: 3
       compare: 4
-#      rca-file: "rca/rca-2n-zn2-2t1c-pdr-rca1.yaml"
   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, "6" for CSIT rls2101, "7" for CSIT rls2106).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - '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.'
-    - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-zn2-xxv710 4t2c pdr
 - type: "table"
@@ -936,30 +2232,28 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "2009.0-6"
+    - title: "2106.0-8"
       data-set: "vpp-2n-zn2-hist-iter-new-env"
-    - title: "2101.0-6"
+    - title: "2110.0-8"
       data-set: "vpp-2n-zn2-prev-iter-old-env"
-    - title: "2101.0-7"
+    - title: "2110.0-9"
       data-set: "vpp-2n-zn2-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2202.0-9"
       data-set: "vpp-2n-zn2-curr-iter"
   comparisons:
-    - title: "2101.0-7 vs 2101.0-6"
+    - title: "2110.0-9 vs 2110.0-8"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-2n-zn2-4t2c-pdr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2202.0-9 vs 2110.0-9"
       reference: 3
       compare: 4
-#      rca-file: "rca/rca-2n-zn2-4t2c-pdr-rca1.yaml"
   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, "6" for CSIT rls2101, "7" for CSIT rls2106).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - '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.'
-    - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-zn2-xxv710 2t1c ndr
 - type: "table"
@@ -969,30 +2263,28 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "2009.0-6"
+    - title: "2106.0-8"
       data-set: "vpp-2n-zn2-hist-iter-new-env"
-    - title: "2101.0-6"
+    - title: "2110.0-8"
       data-set: "vpp-2n-zn2-prev-iter-old-env"
-    - title: "2101.0-7"
+    - title: "2110.0-9"
       data-set: "vpp-2n-zn2-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2202.0-9"
       data-set: "vpp-2n-zn2-curr-iter"
   comparisons:
-    - title: "2101.0-7 vs 2101.0-6"
+    - title: "2110.0-9 vs 2110.0-8"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-2n-zn2-2t1c-ndr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2202.0-9 vs 2110.0-9"
       reference: 3
       compare: 4
-#      rca-file: "rca/rca-2n-zn2-2t1c-ndr-rca1.yaml"
   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, "6" for CSIT rls2101, "7" for CSIT rls2106).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - '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.'
-    - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-zn2-xxv710 4t2c ndr
 - type: "table"
@@ -1002,30 +2294,28 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "2009.0-6"
+    - title: "2106.0-8"
       data-set: "vpp-2n-zn2-hist-iter-new-env"
-    - title: "2101.0-6"
+    - title: "2110.0-8"
       data-set: "vpp-2n-zn2-prev-iter-old-env"
-    - title: "2101.0-7"
+    - title: "2110.0-9"
       data-set: "vpp-2n-zn2-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2202.0-9"
       data-set: "vpp-2n-zn2-curr-iter"
   comparisons:
-    - title: "2101.0-7 vs 2101.0-6"
+    - title: "2110.0-9 vs 2110.0-8"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-2n-zn2-4t2c-ndr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2202.0-9 vs 2110.0-9"
       reference: 3
       compare: 4
-#      rca-file: "rca/rca-2n-zn2-4t2c-ndr-rca1.yaml"
   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, "6" for CSIT rls2101, "7" for CSIT rls2106).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - '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.'
-    - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-dnv 1t1c pdr
 - type: "table"
@@ -1035,28 +2325,28 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C'"
   columns:
-    - title: "2009.0-6"
+    - title: "2106.0-8"
       data-set: "vpp-2n-dnv-hist-iter-new-env"
-    - title: "2101.0-6"
+    - title: "2110.0-8"
       data-set: "vpp-2n-dnv-prev-iter-old-env"
-    - title: "2101.0-7"
+    - title: "2110.0-9"
       data-set: "vpp-2n-dnv-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2202.0-9"
       data-set: "vpp-2n-dnv-curr-iter"
   comparisons:
-    - title: "2101.0-7 vs 2101.0-6"
+    - title: "2110.0-9 vs 2110.0-8"
       reference: 2
       compare: 3
-    - title: "2101.0-6 vs 2009.0-5"
+    - title: "2202.0-9 vs 2110.0-9"
       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, "6" for CSIT rls2101, "7" for CSIT rls2106).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - '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.'
-    - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous.'
+    - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-dnv 2t2c pdr
 - type: "table"
@@ -1066,28 +2356,28 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C'"
   columns:
-    - title: "2009.0-6"
+    - title: "2106.0-8"
       data-set: "vpp-2n-dnv-hist-iter-new-env"
-    - title: "2101.0-6"
+    - title: "2110.0-8"
       data-set: "vpp-2n-dnv-prev-iter-old-env"
-    - title: "2101.0-7"
+    - title: "2110.0-9"
       data-set: "vpp-2n-dnv-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2202.0-9"
       data-set: "vpp-2n-dnv-curr-iter"
   comparisons:
-    - title: "2101.0-7 vs 2101.0-6"
+    - title: "2110.0-9 vs 2110.0-8"
       reference: 2
       compare: 3
-    - title: "2101.0-6 vs 2009.0-5"
+    - title: "2202.0-9 vs 2110.0-9"
       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, "6" for CSIT rls2101, "7" for CSIT rls2106).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - '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.'
-    - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous.'
+    - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-dnv 1t1c ndr
 - type: "table"
@@ -1097,28 +2387,28 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C'"
   columns:
-    - title: "2009.0-6"
+    - title: "2106.0-8"
       data-set: "vpp-2n-dnv-hist-iter-new-env"
-    - title: "2101.0-6"
+    - title: "2110.0-8"
       data-set: "vpp-2n-dnv-prev-iter-old-env"
-    - title: "2101.0-7"
+    - title: "2110.0-9"
       data-set: "vpp-2n-dnv-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2202.0-9"
       data-set: "vpp-2n-dnv-curr-iter"
   comparisons:
-    - title: "2101.0-7 vs 2101.0-6"
+    - title: "2110.0-9 vs 2110.0-8"
       reference: 2
       compare: 3
-    - title: "2101.0-6 vs 2009.0-5"
+    - title: "2202.0-9 vs 2110.0-9"
       reference: 3
       compare: 4
   legend:
     - ''
     - '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, "6" for CSIT rls2101, "7" for CSIT rls2106).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - '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.'
-    - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous.'
+    - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-dnv 2t2c ndr
 - type: "table"
@@ -1128,28 +2418,28 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C'"
   columns:
-    - title: "2009.0-6"
+    - title: "2106.0-8"
       data-set: "vpp-2n-dnv-hist-iter-new-env"
-    - title: "2101.0-6"
+    - title: "2110.0-8"
       data-set: "vpp-2n-dnv-prev-iter-old-env"
-    - title: "2101.0-7"
+    - title: "2110.0-9"
       data-set: "vpp-2n-dnv-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2202.0-9"
       data-set: "vpp-2n-dnv-curr-iter"
   comparisons:
-    - title: "2101.0-7 vs 2101.0-6"
+    - title: "2110.0-9 vs 2110.0-8"
       reference: 2
       compare: 3
-    - title: "2101.0-6 vs 2009.0-5"
+    - title: "2202.0-9 vs 2110.0-9"
       reference: 3
       compare: 4
   legend:
     - ''
     - '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, "6" for CSIT rls2101, "7" for CSIT rls2106).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - '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.'
-    - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous.'
+    - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-dnv 1t1c pdr
 - type: "table"
@@ -1159,28 +2449,28 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C'"
   columns:
-    - title: "2009.0-6"
+    - title: "2106.0-8"
       data-set: "vpp-3n-dnv-hist-iter-new-env"
-    - title: "2101.0-6"
+    - title: "2110.0-8"
       data-set: "vpp-3n-dnv-prev-iter-old-env"
-    - title: "2101.0-7"
+    - title: "2110.0-9"
       data-set: "vpp-3n-dnv-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2202.0-9"
       data-set: "vpp-3n-dnv-curr-iter"
   comparisons:
-    - title: "2101.0-7 vs 2101.0-6"
+    - title: "2110.0-9 vs 2110.0-8"
       reference: 2
       compare: 3
-    - title: "2101.0-6 vs 2009.0-5"
+    - title: "2202.0-9 vs 2110.0-9"
       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, "6" for CSIT rls2101, "7" for CSIT rls2106).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - '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.'
-    - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous.'
+    - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-dnv 2t2c pdr
 - type: "table"
@@ -1190,28 +2480,28 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C'"
   columns:
-    - title: "2009.0-6"
+    - title: "2106.0-8"
       data-set: "vpp-3n-dnv-hist-iter-new-env"
-    - title: "2101.0-6"
+    - title: "2110.0-8"
       data-set: "vpp-3n-dnv-prev-iter-old-env"
-    - title: "2101.0-7"
+    - title: "2110.0-9"
       data-set: "vpp-3n-dnv-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2202.0-9"
       data-set: "vpp-3n-dnv-curr-iter"
   comparisons:
-    - title: "2101.0-7 vs 2101.0-6"
+    - title: "2110.0-9 vs 2110.0-8"
       reference: 2
       compare: 3
-    - title: "2101.0-6 vs 2009.0-5"
+    - title: "2202.0-9 vs 2110.0-9"
       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, "6" for CSIT rls2101, "7" for CSIT rls2106).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - '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.'
-    - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous.'
+    - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-dnv 1t1c ndr
 - type: "table"
@@ -1221,28 +2511,28 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C'"
   columns:
-    - title: "2009.0-6"
+    - title: "2106.0-8"
       data-set: "vpp-3n-dnv-hist-iter-new-env"
-    - title: "2101.0-6"
+    - title: "2110.0-8"
       data-set: "vpp-3n-dnv-prev-iter-old-env"
-    - title: "2101.0-7"
+    - title: "2110.0-9"
       data-set: "vpp-3n-dnv-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2202.0-9"
       data-set: "vpp-3n-dnv-curr-iter"
   comparisons:
-    - title: "2101.0-7 vs 2101.0-6"
+    - title: "2110.0-9 vs 2110.0-8"
       reference: 2
       compare: 3
-    - title: "2101.0-6 vs 2009.0-5"
+    - title: "2202.0-9 vs 2110.0-9"
       reference: 3
       compare: 4
   legend:
     - ''
     - '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, "6" for CSIT rls2101, "7" for CSIT rls2106).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - '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.'
-    - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous.'
+    - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-dnv 2t2c ndr
 - type: "table"
@@ -1252,28 +2542,28 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C'"
   columns:
-    - title: "2009.0-6"
+    - title: "2106.0-8"
       data-set: "vpp-3n-dnv-hist-iter-new-env"
-    - title: "2101.0-6"
+    - title: "2110.0-8"
       data-set: "vpp-3n-dnv-prev-iter-old-env"
-    - title: "2101.0-7"
+    - title: "2110.0-9"
       data-set: "vpp-3n-dnv-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2202.0-9"
       data-set: "vpp-3n-dnv-curr-iter"
   comparisons:
-    - title: "2101.0-7 vs 2101.0-6"
+    - title: "2110.0-9 vs 2110.0-8"
       reference: 2
       compare: 3
-    - title: "2101.0-6 vs 2009.0-5"
+    - title: "2202.0-9 vs 2110.0-9"
       reference: 3
       compare: 4
   legend:
     - ''
     - '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, "6" for CSIT rls2101, "7" for CSIT rls2106).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - '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.'
-    - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous.'
+    - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-tsh 1t1c pdr
 - type: "table"
@@ -1283,32 +2573,28 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C'"
   columns:
-    - title: "2009.0-6"
+    - title: "2106.0-8"
       data-set: "vpp-3n-tsh-hist-iter-new-env"
-    - title: "2101.0-6"
+    - title: "2110.0-8"
       data-set: "vpp-3n-tsh-prev-iter-old-env"
-#     - title: "2101.0-7"
-#       data-set: "vpp-3n-tsh-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2110.0-9"
+      data-set: "vpp-3n-tsh-prev-iter-new-env"
+    - title: "2202.0-9"
       data-set: "vpp-3n-tsh-curr-iter"
   comparisons:
-#     - title: "2101.0-7 vs 2101.0-6"
-#       reference: 2
-#       compare: 3
-#      rca-file: "rca/rca-3n-tsh-1t1c-pdr-rca1.yaml"
-#     - title: "2106.0-7 vs 2101.0-7"
-    - title: "2106.0-7 vs 2101.0-6"
-      reference: 2  # 3
-      compare: 3  # 4
-#      rca-file: "rca/rca-3n-tsh-1t1c-pdr-rca2.yaml"
+    - title: "2110.0-9 vs 2110.0-8"
+      reference: 2
+      compare: 3
+    - title: "2202.0-9 vs 2110.0-9"
+      reference: 3
+      compare: 4
   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, "6" for CSIT rls2101, "7" for CSIT rls2106).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - '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.'
-    - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-#     - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
-    - '2106.0-7 vs 2101.0-6: Compares VPP code current vs previous.'
+    - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-tsh 2t2c pdr
 - type: "table"
@@ -1318,32 +2604,28 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C'"
   columns:
-    - title: "2009.0-6"
+    - title: "2106.0-8"
       data-set: "vpp-3n-tsh-hist-iter-new-env"
-    - title: "2101.0-6"
+    - title: "2110.0-8"
       data-set: "vpp-3n-tsh-prev-iter-old-env"
-#     - title: "2101.0-7"
-#       data-set: "vpp-3n-tsh-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2110.0-9"
+      data-set: "vpp-3n-tsh-prev-iter-new-env"
+    - title: "2202.0-9"
       data-set: "vpp-3n-tsh-curr-iter"
   comparisons:
-#     - title: "2101.0-7 vs 2101.0-6"
-#       reference: 2
-#       compare: 3
-#      rca-file: "rca/rca-3n-tsh-2t2c-pdr-rca1.yaml"
-#     - title: "2106.0-7 vs 2101.0-7"
-    - title: "2106.0-7 vs 2101.0-6"
-      reference: 2  # 3
-      compare: 3  # 4
-#      rca-file: "rca/rca-3n-tsh-2t2c-pdr-rca2.yaml"
+    - title: "2110.0-9 vs 2110.0-8"
+      reference: 2
+      compare: 3
+    - title: "2202.0-9 vs 2110.0-9"
+      reference: 3
+      compare: 4
   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, "6" for CSIT rls2101, "7" for CSIT rls2106).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - '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.'
-    - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-#     - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
-    - '2106.0-7 vs 2101.0-6: Compares VPP code current vs previous.'
+    - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-tsh 1t1c ndr
 - type: "table"
@@ -1353,32 +2635,28 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C'"
   columns:
-    - title: "2009.0-6"
+    - title: "2106.0-8"
       data-set: "vpp-3n-tsh-hist-iter-new-env"
-    - title: "2101.0-6"
+    - title: "2110.0-8"
       data-set: "vpp-3n-tsh-prev-iter-old-env"
-#     - title: "2101.0-7"
-#       data-set: "vpp-3n-tsh-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2110.0-9"
+      data-set: "vpp-3n-tsh-prev-iter-new-env"
+    - title: "2202.0-9"
       data-set: "vpp-3n-tsh-curr-iter"
   comparisons:
-#     - title: "2101.0-7 vs 2101.0-6"
-#       reference: 2
-#       compare: 3
-#      rca-file: "rca/rca-3n-tsh-1t1c-ndr-rca1.yaml"
-#     - title: "2106.0-7 vs 2101.0-7"
-    - title: "2106.0-7 vs 2101.0-6"
-      reference: 2  # 3
-      compare: 3  # 4
-#      rca-file: "rca/rca-3n-tsh-1t1c-ndr-rca2.yaml"
+    - title: "2110.0-9 vs 2110.0-8"
+      reference: 2
+      compare: 3
+    - title: "2202.0-9 vs 2110.0-9"
+      reference: 3
+      compare: 4
   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, "6" for CSIT rls2101, "7" for CSIT rls2106).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - '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.'
-    - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-#     - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
-    - '2106.0-7 vs 2101.0-6: Compares VPP code current vs previous.'
+    - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-tsh 2t2c ndr
 - type: "table"
@@ -1388,32 +2666,28 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C'"
   columns:
-    - title: "2009.0-6"
+    - title: "2106.0-8"
       data-set: "vpp-3n-tsh-hist-iter-new-env"
-    - title: "2101.0-6"
+    - title: "2110.0-8"
       data-set: "vpp-3n-tsh-prev-iter-old-env"
-#     - title: "2101.0-7"
-#       data-set: "vpp-3n-tsh-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2110.0-9"
+      data-set: "vpp-3n-tsh-prev-iter-new-env"
+    - title: "2202.0-9"
       data-set: "vpp-3n-tsh-curr-iter"
   comparisons:
-#     - title: "2101.0-7 vs 2101.0-6"
-#       reference: 2
-#       compare: 3
-#      rca-file: "rca/rca-3n-tsh-2t2c-ndr-rca1.yaml"
-#     - title: "2106.0-7 vs 2101.0-7"
-    - title: "2106.0-7 vs 2101.0-6"
-      reference: 2  # 3
-      compare: 3  # 4
-#      rca-file: "rca/rca-3n-tsh-2t2c-ndr-rca2.yaml"
+    - title: "2110.0-9 vs 2110.0-8"
+      reference: 2
+      compare: 3
+    - title: "2202.0-9 vs 2110.0-9"
+      reference: 3
+      compare: 4
   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, "6" for CSIT rls2101, "7" for CSIT rls2106).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - '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.'
-    - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-#     - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
-    - '2106.0-7 vs 2101.0-6: Compares VPP code current vs previous.'
+    - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-tx2 1t1c pdr
 - type: "table"
@@ -1423,30 +2697,28 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C'"
   columns:
-    - title: "2009.0-6"
+    - title: "2106.0-8"
       data-set: "vpp-2n-tx2-hist-iter-new-env"
-    - title: "2101.0-6"
+    - title: "2110.0-8"
       data-set: "vpp-2n-tx2-prev-iter-old-env"
-#     - title: "2101.0-7"
-#       data-set: "vpp-2n-tx2-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2110.0-9"
+      data-set: "vpp-2n-tx2-prev-iter-new-env"
+    - title: "2202.0-9"
       data-set: "vpp-2n-tx2-curr-iter"
   comparisons:
-#     - title: "2101.0-7 vs 2101.0-6"
-#       reference: 2
-#       compare: 3
-#     - title: "2106.0-7 vs 2101.0-7"
-    - title: "2106.0-7 vs 2101.0-6"
-      reference: 2  # 3
-      compare: 3  # 4
+    - title: "2110.0-9 vs 2110.0-8"
+      reference: 2
+      compare: 3
+    - title: "2202.0-9 vs 2110.0-9"
+      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, "6" for CSIT rls2101, "7" for CSIT rls2106).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - '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.'
-    - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-#     - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
-    - '2106.0-7 vs 2101.0-6: Compares VPP code current vs previous.'
+    - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-tx2 2t2c pdr
 - type: "table"
@@ -1456,30 +2728,28 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C'"
   columns:
-    - title: "2009.0-6"
+    - title: "2106.0-8"
       data-set: "vpp-2n-tx2-hist-iter-new-env"
-    - title: "2101.0-6"
+    - title: "2110.0-8"
       data-set: "vpp-2n-tx2-prev-iter-old-env"
-#     - title: "2101.0-7"
-#       data-set: "vpp-2n-tx2-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2110.0-9"
+      data-set: "vpp-2n-tx2-prev-iter-new-env"
+    - title: "2202.0-9"
       data-set: "vpp-2n-tx2-curr-iter"
   comparisons:
-#     - title: "2101.0-7 vs 2101.0-6"
-#       reference: 2
-#       compare: 3
-#     - title: "2106.0-7 vs 2101.0-7"
-    - title: "2106.0-7 vs 2101.0-6"
-      reference: 2  # 3
-      compare: 3  # 4
+    - title: "2110.0-9 vs 2110.0-8"
+      reference: 2
+      compare: 3
+    - title: "2202.0-9 vs 2110.0-9"
+      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, "6" for CSIT rls2101, "7" for CSIT rls2106).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - '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.'
-    - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-#     - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
-    - '2106.0-7 vs 2101.0-6: Compares VPP code current vs previous.'
+    - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-tx2 1t1c ndr
 - type: "table"
@@ -1489,30 +2759,28 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C'"
   columns:
-    - title: "2009.0-6"
+    - title: "2106.0-8"
       data-set: "vpp-2n-tx2-hist-iter-new-env"
-    - title: "2101.0-6"
+    - title: "2110.0-8"
       data-set: "vpp-2n-tx2-prev-iter-old-env"
-#     - title: "2101.0-7"
-#       data-set: "vpp-2n-tx2-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2110.0-9"
+      data-set: "vpp-2n-tx2-prev-iter-new-env"
+    - title: "2202.0-9"
       data-set: "vpp-2n-tx2-curr-iter"
   comparisons:
-#     - title: "2101.0-7 vs 2101.0-6"
-#       reference: 2
-#       compare: 3
-#     - title: "2106.0-7 vs 2101.0-7"
-    - title: "2106.0-7 vs 2101.0-6"
-      reference: 2  # 3
-      compare: 3  # 4
+    - title: "2110.0-9 vs 2110.0-8"
+      reference: 2
+      compare: 3
+    - title: "2202.0-9 vs 2110.0-9"
+      reference: 3
+      compare: 4
   legend:
     - ''
     - '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, "6" for CSIT rls2101, "7" for CSIT rls2106).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - '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.'
-    - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-#     - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
-    - '2106.0-7 vs 2101.0-6: Compares VPP code current vs previous.'
+    - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-tx2 2t2c ndr
 - type: "table"
@@ -1522,30 +2790,212 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C'"
   columns:
-    - title: "2009.0-6"
+    - title: "2106.0-8"
       data-set: "vpp-2n-tx2-hist-iter-new-env"
-    - title: "2101.0-6"
+    - title: "2110.0-8"
       data-set: "vpp-2n-tx2-prev-iter-old-env"
-#     - title: "2101.0-7"
-#       data-set: "vpp-2n-tx2-prev-iter-new-env"
-    - title: "2106.0-7"
+    - title: "2110.0-9"
+      data-set: "vpp-2n-tx2-prev-iter-new-env"
+    - title: "2202.0-9"
       data-set: "vpp-2n-tx2-curr-iter"
   comparisons:
-#     - title: "2101.0-7 vs 2101.0-6"
-#       reference: 2
-#       compare: 3
-#     - title: "2106.0-7 vs 2101.0-7"
-    - title: "2106.0-7 vs 2101.0-6"
-      reference: 2  # 3
-      compare: 3  # 4
+    - title: "2110.0-9 vs 2110.0-8"
+      reference: 2
+      compare: 3
+    - title: "2202.0-9 vs 2110.0-9"
+      reference: 3
+      compare: 4
   legend:
     - ''
     - '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, "6" for CSIT rls2101, "7" for CSIT rls2106).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - '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.'
+    - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
+
+# VPP Performance Changes 2n-aws 2t1c pdr
+- type: "table"
+  title: "VPP Performance Changes 2n-aws 2t1c pdr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-aws-2t1c-pdr"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T1C' and 'NDRPDR'"
+  columns:
+    - title: "2110.0-8"
+      data-set: "vpp-2n-aws-prev-iter"
+    - title: "2202.0-9"
+      data-set: "vpp-2n-aws-curr-iter"
+  comparisons:
+    - title: "2202.0-9 vs 2110.0-8"
+      reference: 1
+      compare: 2
+  legend:
+    - ''
+    - 'Test Case:            Test cases executed for: PDR throughput on 2n-aws with nitro50g.'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - '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.'
+    - '2202.0-9 vs 2110.0-8: Compares VPP code current vs previous.'
+
+# VPP Performance Changes 2n-aws 4t2c pdr
+- type: "table"
+  title: "VPP Performance Changes 2n-aws 4t2c pdr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-aws-4t2c-pdr"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T2C' and 'NDRPDR'"
+  columns:
+    - title: "2110.0-8"
+      data-set: "vpp-2n-aws-prev-iter"
+    - title: "2202.0-9"
+      data-set: "vpp-2n-aws-curr-iter"
+  comparisons:
+    - title: "2202.0-9 vs 2110.0-8"
+      reference: 1
+      compare: 2
+  legend:
+    - ''
+    - 'Test Case:            Test cases executed for: PDR throughput on 2n-aws with nitro50g.'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - '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.'
+    - '2202.0-9 vs 2110.0-8: Compares VPP code current vs previous.'
+
+# VPP Performance Changes 2n-aws 2t1c ndr
+- type: "table"
+  title: "VPP Performance Changes 2n-aws 2t1c ndr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-aws-2t1c-ndr"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T1C' and 'NDRPDR'"
+  columns:
+    - title: "2110.0-8"
+      data-set: "vpp-2n-aws-prev-iter"
+    - title: "2202.0-9"
+      data-set: "vpp-2n-aws-curr-iter"
+  comparisons:
+    - title: "2202.0-9 vs 2110.0-8"
+      reference: 1
+      compare: 2
+  legend:
+    - ''
+    - 'Test Case:            Test cases executed for: NDR throughput on 2n-aws with nitro50g.'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - '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.'
+    - '2202.0-9 vs 2110.0-8: Compares VPP code current vs previous.'
+
+# VPP Performance Changes 2n-aws 4t2c ndr
+- type: "table"
+  title: "VPP Performance Changes 2n-aws 4t2c ndr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-aws-4t2c-ndr"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T2C' and 'NDRPDR'"
+  columns:
+    - title: "2110.0-8"
+      data-set: "vpp-2n-aws-prev-iter"
+    - title: "2202.0-9"
+      data-set: "vpp-2n-aws-curr-iter"
+  comparisons:
+    - title: "2202.0-9 vs 2110.0-8"
+      reference: 1
+      compare: 2
+  legend:
+    - ''
+    - 'Test Case:            Test cases executed for: NDR throughput on 2n-aws with nitro50g.'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - '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.'
+    - '2202.0-9 vs 2110.0-8: Compares VPP code current vs previous.'
+
+# VPP Performance Changes 3n-aws 2t1c pdr
+- type: "table"
+  title: "VPP Performance Changes 3n-aws 2t1c pdr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-aws-2t1c-pdr"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T1C' and 'NDRPDR'"
+  columns:
+    - title: "2110.0-8"
+      data-set: "vpp-3n-aws-prev-iter"
+    - title: "2202.0-9"
+      data-set: "vpp-3n-aws-curr-iter"
+  comparisons:
+    - title: "2202.0-9 vs 2110.0-8"
+      reference: 1
+      compare: 2
+  legend:
+    - ''
+    - 'Test Case:            Test cases executed for: PDR throughput on 3n-aws with nitro50g.'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - '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.'
+    - '2202.0-9 vs 2110.0-8: Compares VPP code current vs previous.'
+
+# VPP Performance Changes 3n-aws 4t2c pdr
+- type: "table"
+  title: "VPP Performance Changes 3n-aws 4t2c pdr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-aws-4t2c-pdr"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T2C' and 'NDRPDR'"
+  columns:
+    - title: "2110.0-8"
+      data-set: "vpp-3n-aws-prev-iter"
+    - title: "2202.0-9"
+      data-set: "vpp-3n-aws-curr-iter"
+  comparisons:
+    - title: "2202.0-9 vs 2110.0-8"
+      reference: 1
+      compare: 2
+  legend:
+    - ''
+    - 'Test Case:            Test cases executed for: PDR throughput on 3n-aws with nitro50g.'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - '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.'
+    - '2202.0-9 vs 2110.0-8: Compares VPP code current vs previous.'
+
+# VPP Performance Changes 3n-aws 2t1c ndr
+- type: "table"
+  title: "VPP Performance Changes 3n-aws 2t1c ndr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-aws-2t1c-ndr"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T1C' and 'NDRPDR'"
+  columns:
+    - title: "2110.0-8"
+      data-set: "vpp-3n-aws-prev-iter"
+    - title: "2202.0-9"
+      data-set: "vpp-3n-aws-curr-iter"
+  comparisons:
+    - title: "2202.0-9 vs 2110.0-8"
+      reference: 1
+      compare: 2
+  legend:
+    - ''
+    - 'Test Case:            Test cases executed for: NDR throughput on 3n-aws with nitro50g.'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - '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.'
+    - '2202.0-9 vs 2110.0-8: Compares VPP code current vs previous.'
+
+# VPP Performance Changes 3n-aws 4t2c ndr
+- type: "table"
+  title: "VPP Performance Changes 3n-aws 4t2c ndr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-aws-4t2c-ndr"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T2C' and 'NDRPDR'"
+  columns:
+    - title: "2110.0-8"
+      data-set: "vpp-3n-aws-prev-iter"
+    - title: "2202.0-9"
+      data-set: "vpp-3n-aws-curr-iter"
+  comparisons:
+    - title: "2202.0-9 vs 2110.0-8"
+      reference: 1
+      compare: 2
+  legend:
+    - ''
+    - 'Test Case:            Test cases executed for: NDR throughput on 3n-aws with nitro50g.'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - '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.'
-    - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-#     - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
-    - '2106.0-7 vs 2101.0-6: Compares VPP code current vs previous.'
+    - '2202.0-9 vs 2110.0-8: Compares VPP code current vs previous.'
 
 # VPP Comparison Across Testbeds 2n-skx to 2n-clx 2t1c ndr
 - type: "table"
@@ -1637,22 +3087,20 @@
   algorithm: "table_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-2n-clx-2n-icx-1c-ndr"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "('NIC_Intel-XXV710' or 'NIC_Intel-E810CQ') and 'NDRPDR' and '1C'"
+  filter: "'NIC_Intel-XXV710' and 'NDRPDR' and '1C'"
   columns:
     - title: "2n-clx xxv710"
       data-set: "vpp-2n-clx-curr-iter"
-      tag: "NIC_Intel-XXV710"
-    - title: "2n-icx e810cq"
+    - title: "2n-icx xxv710"
       data-set: "vpp-2n-icx-curr-iter"
-      tag: "NIC_Intel-E810CQ"
   comparisons:
     - title: "Diff"
       reference: 1
       compare: 2
   legend:
     - ""
-    - "2n-clx xxv710, 2n-icx e810cq - testbeds and NICs tested."
-    - "Diff - difference between 2n-clx xxv710 and 2n-icx e810cq testbeds."
+    - "2n-clx xxv710, 2n-icx xxv710 - testbeds and NICs tested."
+    - "Diff - difference between 2n-clx xxv710 and 2n-icx xxv710 testbeds."
 
 # VPP Comparison Across Testbeds 2n-clx to 2n-icx 2c ndr
 - type: "table"
@@ -1660,22 +3108,20 @@
   algorithm: "table_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-2n-clx-2n-icx-2c-ndr"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "('NIC_Intel-XXV710' or 'NIC_Intel-E810CQ') and 'NDRPDR' and '2C'"
+  filter: "'NIC_Intel-XXV710' and 'NDRPDR' and '2C'"
   columns:
     - title: "2n-clx xxv710"
       data-set: "vpp-2n-clx-curr-iter"
-      tag: "NIC_Intel-XXV710"
-    - title: "2n-icx e810cq"
+    - title: "2n-icx xxv710"
       data-set: "vpp-2n-icx-curr-iter"
-      tag: "NIC_Intel-E810CQ"
   comparisons:
     - title: "Diff"
       reference: 1
       compare: 2
   legend:
     - ""
-    - "2n-clx xxv710, 2n-icx e810cq - testbeds and NICs tested."
-    - "Diff - difference between 2n-clx xxv710 and 2n-icx e810cq testbeds."
+    - "2n-clx xxv710, 2n-icx xxv710 - testbeds and NICs tested."
+    - "Diff - difference between 2n-clx xxv710 and 2n-icx xxv710 testbeds."
 
 # VPP Comparison Across Testbeds 2n-clx to 2n-icx 1c pdr
 - type: "table"
@@ -1683,22 +3129,20 @@
   algorithm: "table_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-2n-clx-2n-icx-1c-pdr"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "('NIC_Intel-XXV710' or 'NIC_Intel-E810CQ') and 'NDRPDR' and '1C'"
+  filter: "'NIC_Intel-XXV710' and 'NDRPDR' and '1C'"
   columns:
     - title: "2n-clx xxv710"
       data-set: "vpp-2n-clx-curr-iter"
-      tag: "NIC_Intel-XXV710"
-    - title: "2n-icx e810cq"
+    - title: "2n-icx xxv710"
       data-set: "vpp-2n-icx-curr-iter"
-      tag: "NIC_Intel-E810CQ"
   comparisons:
     - title: "Diff"
       reference: 1
       compare: 2
   legend:
     - ""
-    - "2n-clx xxv710, 2n-icx e810cq - testbeds and NICs tested."
-    - "Diff - difference between 2n-clx xxv710 and 2n-icx e810cq testbeds."
+    - "2n-clx xxv710, 2n-icx xxv710 - testbeds and NICs tested."
+    - "Diff - difference between 2n-clx xxv710 and 2n-icx xxv710 testbeds."
 
 # VPP Comparison Across Testbeds 2n-clx to 2n-icx 2c pdr
 - type: "table"
@@ -1706,22 +3150,20 @@
   algorithm: "table_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-2n-clx-2n-icx-2c-pdr"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "('NIC_Intel-XXV710' or 'NIC_Intel-E810CQ') and 'NDRPDR' and '2C'"
+  filter: "'NIC_Intel-XXV710' and 'NDRPDR' and '2C'"
   columns:
     - title: "2n-clx xxv710"
       data-set: "vpp-3n-skx-curr-iter"
-      tag: "NIC_Intel-XXV710"
-    - title: "2n-icx e810cq"
+    - title: "2n-icx xxv710"
       data-set: "vpp-2n-icx-curr-iter"
-      tag: "NIC_Intel-E810CQ"
   comparisons:
     - title: "Diff"
       reference: 1
       compare: 2
   legend:
     - ""
-    - "2n-clx xxv710, 2n-icx e810cq - testbeds and NICs tested."
-    - "Diff - difference between 2n-clx xxv710 and 2n-icx e810cq testbeds."
+    - "2n-clx xxv710, 2n-icx xxv710 - testbeds and NICs tested."
+    - "Diff - difference between 2n-clx xxv710 and 2n-icx xxv710 testbeds."
 
 # VPP Comparison Across Testbeds 3n-skx to 3n-icx 1c ndr
 - type: "table"
@@ -1729,22 +3171,20 @@
   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'"
+  filter: "'NIC_Intel-XXV710' and 'NDRPDR' and '1C'"
   columns:
     - title: "3n-skx xxv710"
       data-set: "vpp-3n-skx-curr-iter"
-      tag: "NIC_Intel-XXV710"
-    - title: "3n-icx e810cq"
+    - title: "3n-icx xxv710"
       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."
+    - "3n-skx xxv710, 3n-icx xxv710 - testbeds and NICs tested."
+    - "Diff - difference between 3n-skx xxv710 and 3n-icx xxv710 testbeds."
 
 # VPP Comparison Across Testbeds 3n-skx to 3n-icx 2c ndr
 - type: "table"
@@ -1752,22 +3192,20 @@
   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'"
+  filter: "'NIC_Intel-XXV710' and 'NDRPDR' and '2C'"
   columns:
     - title: "3n-skx xxv710"
       data-set: "vpp-3n-skx-curr-iter"
-      tag: "NIC_Intel-XXV710"
-    - title: "3n-icx e810cq"
+    - title: "3n-icx xxv710"
       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."
+    - "3n-skx xxv710, 3n-icx xxv710 - testbeds and NICs tested."
+    - "Diff - difference between 3n-skx xxv710 and 3n-icx xxv710 testbeds."
 
 # VPP Comparison Across Testbeds 3n-skx to 3n-icx 1c pdr
 - type: "table"
@@ -1775,22 +3213,20 @@
   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'"
+  filter: "'NIC_Intel-XXV710' and 'NDRPDR' and '1C'"
   columns:
     - title: "3n-skx xxv710"
       data-set: "vpp-3n-skx-curr-iter"
-      tag: "NIC_Intel-XXV710"
-    - title: "3n-icx e810cq"
+    - title: "3n-icx xxv710"
       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."
+    - "3n-skx xxv710, 3n-icx xxv710 - testbeds and NICs tested."
+    - "Diff - difference between 3n-skx xxv710 and 3n-icx xxv710 testbeds."
 
 # VPP Comparison Across Testbeds 3n-skx to 3n-icx 2c pdr
 - type: "table"
@@ -1798,22 +3234,20 @@
   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'"
+  filter: "'NIC_Intel-XXV710' and 'NDRPDR' and '2C'"
   columns:
     - title: "3n-skx xxv710"
       data-set: "vpp-3n-skx-curr-iter"
-      tag: "NIC_Intel-XXV710"
-    - title: "3n-icx e810cq"
+    - title: "3n-icx xxv710"
       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."
+    - "3n-skx xxv710, 3n-icx xxv710 - testbeds and NICs tested."
+    - "Diff - difference between 3n-skx xxv710 and 3n-icx xxv710 testbeds."
 
 # VPP Comparison Across Topologies 3n-skx to 2n-skx 1c ndr
 - type: "table"
@@ -1907,30 +3341,28 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'MRR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2009.0-6"
+    - title: "2106.0-8"
       data-set: "vpp-3n-skx-hist-iter-mrr-new-env"
-    - title: "2101.0-6"
+    - title: "2110.0-8"
       data-set: "vpp-3n-skx-prev-iter-mrr-old-env"
-    - title: "2101.0-7"
+    - title: "2110.0-9"
       data-set: "vpp-3n-skx-prev-iter-mrr-new-env"
-    - title: "2106.0-7"
+    - title: "2202.0-9"
       data-set: "vpp-3n-skx-curr-iter-mrr"
   comparisons:
-    - title: "2101.0-7 vs 2101.0-6"
+    - title: "2110.0-9 vs 2110.0-8"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-3n-skx-2t1c-mrr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2202.0-9 vs 2110.0-9"
       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, "6" for CSIT rls2101, "7" for CSIT rls2106).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - '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.'
-    - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-skx 4t2c mrr
 - type: "table"
@@ -1940,30 +3372,28 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'MRR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2009.0-6"
+    - title: "2106.0-8"
       data-set: "vpp-3n-skx-hist-iter-mrr-new-env"
-    - title: "2101.0-6"
+    - title: "2110.0-8"
       data-set: "vpp-3n-skx-prev-iter-mrr-old-env"
-    - title: "2101.0-7"
+    - title: "2110.0-9"
       data-set: "vpp-3n-skx-prev-iter-mrr-new-env"
-    - title: "2106.0-7"
+    - title: "2202.0-9"
       data-set: "vpp-3n-skx-curr-iter-mrr"
   comparisons:
-    - title: "2101.0-7 vs 2101.0-6"
+    - title: "2110.0-9 vs 2110.0-8"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-3n-skx-4t2c-mrr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2202.0-9 vs 2110.0-9"
       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, "6" for CSIT rls2101, "7" for CSIT rls2106).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - '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.'
-    - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-skx 8t4c mrr
 - type: "table"
@@ -1973,30 +3403,28 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'8T4C' and 'MRR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2009.0-6"
+    - title: "2106.0-8"
       data-set: "vpp-3n-skx-hist-iter-mrr-new-env"
-    - title: "2101.0-6"
+    - title: "2110.0-8"
       data-set: "vpp-3n-skx-prev-iter-mrr-old-env"
-    - title: "2101.0-7"
+    - title: "2110.0-9"
       data-set: "vpp-3n-skx-prev-iter-mrr-new-env"
-    - title: "2106.0-7"
+    - title: "2202.0-9"
       data-set: "vpp-3n-skx-curr-iter-mrr"
   comparisons:
-    - title: "2101.0-7 vs 2101.0-6"
+    - title: "2110.0-9 vs 2110.0-8"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-3n-skx-8t4c-mrr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2202.0-9 vs 2110.0-9"
       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, "6" for CSIT rls2101, "7" for CSIT rls2106).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - '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.'
-    - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-skx 2t1c mrr
 - type: "table"
@@ -2006,30 +3434,28 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'MRR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2009.0-6"
+    - title: "2106.0-8"
       data-set: "vpp-2n-skx-hist-iter-mrr-new-env"
-    - title: "2101.0-6"
+    - title: "2110.0-8"
       data-set: "vpp-2n-skx-prev-iter-mrr-old-env"
-    - title: "2101.0-7"
+    - title: "2110.0-9"
       data-set: "vpp-2n-skx-prev-iter-mrr-new-env"
-    - title: "2106.0-7"
+    - title: "2202.0-9"
       data-set: "vpp-2n-skx-curr-iter-mrr"
   comparisons:
-    - title: "2101.0-7 vs 2101.0-6"
+    - title: "2110.0-9 vs 2110.0-8"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-2n-skx-2t1c-mrr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2202.0-9 vs 2110.0-9"
       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, "6" for CSIT rls2101, "7" for CSIT rls2106).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - '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.'
-    - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-skx 4t2c mrr
 - type: "table"
@@ -2039,30 +3465,28 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'MRR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2009.0-6"
+    - title: "2106.0-8"
       data-set: "vpp-2n-skx-hist-iter-mrr-new-env"
-    - title: "2101.0-6"
+    - title: "2110.0-8"
       data-set: "vpp-2n-skx-prev-iter-mrr-old-env"
-    - title: "2101.0-7"
+    - title: "2110.0-9"
       data-set: "vpp-2n-skx-prev-iter-mrr-new-env"
-    - title: "2106.0-7"
+    - title: "2202.0-9"
       data-set: "vpp-2n-skx-curr-iter-mrr"
   comparisons:
-    - title: "2101.0-7 vs 2101.0-6"
+    - title: "2110.0-9 vs 2110.0-8"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-2n-skx-4t2c-mrr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2202.0-9 vs 2110.0-9"
       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, "6" for CSIT rls2101, "7" for CSIT rls2106).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - '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.'
-    - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-skx 8t4c mrr
 - type: "table"
@@ -2072,30 +3496,28 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'8T4C' and 'MRR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2009.0-6"
+    - title: "2106.0-8"
       data-set: "vpp-2n-skx-hist-iter-mrr-new-env"
-    - title: "2101.0-6"
+    - title: "2110.0-8"
       data-set: "vpp-2n-skx-prev-iter-mrr-old-env"
-    - title: "2101.0-7"
+    - title: "2110.0-9"
       data-set: "vpp-2n-skx-prev-iter-mrr-new-env"
-    - title: "2106.0-7"
+    - title: "2202.0-9"
       data-set: "vpp-2n-skx-curr-iter-mrr"
   comparisons:
-    - title: "2101.0-7 vs 2101.0-6"
+    - title: "2110.0-9 vs 2110.0-8"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-2n-skx-8t4c-mrr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2202.0-9 vs 2110.0-9"
       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, "6" for CSIT rls2101, "7" for CSIT rls2106).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - '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.'
-    - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-xxv710 2t1c mrr
 - type: "table"
@@ -2105,30 +3527,28 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'MRR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2009.0-6"
+    - title: "2106.0-8"
       data-set: "vpp-2n-clx-hist-iter-mrr-new-env"
-    - title: "2101.0-6"
+    - title: "2110.0-8"
       data-set: "vpp-2n-clx-prev-iter-mrr-old-env"
-    - title: "2101.0-7"
+    - title: "2110.0-9"
       data-set: "vpp-2n-clx-prev-iter-mrr-new-env"
-    - title: "2106.0-7"
+    - title: "2202.0-9"
       data-set: "vpp-2n-clx-curr-iter-mrr"
   comparisons:
-    - title: "2101.0-7 vs 2101.0-6"
+    - title: "2110.0-9 vs 2110.0-8"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-2n-clx-2t1c-mrr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2202.0-9 vs 2110.0-9"
       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, "6" for CSIT rls2101, "7" for CSIT rls2106).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - '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.'
-    - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-xxv710 4t2c mrr
 - type: "table"
@@ -2138,30 +3558,28 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'MRR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2009.0-6"
+    - title: "2106.0-8"
       data-set: "vpp-2n-clx-hist-iter-mrr-new-env"
-    - title: "2101.0-6"
+    - title: "2110.0-8"
       data-set: "vpp-2n-clx-prev-iter-mrr-old-env"
-    - title: "2101.0-7"
+    - title: "2110.0-9"
       data-set: "vpp-2n-clx-prev-iter-mrr-new-env"
-    - title: "2106.0-7"
+    - title: "2202.0-9"
       data-set: "vpp-2n-clx-curr-iter-mrr"
   comparisons:
-    - title: "2101.0-7 vs 2101.0-6"
+    - title: "2110.0-9 vs 2110.0-8"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-2n-clx-4t2c-mrr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2202.0-9 vs 2110.0-9"
       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, "6" for CSIT rls2101, "7" for CSIT rls2106).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - '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.'
-    - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-xxv710 8t4c mrr
 - type: "table"
@@ -2171,30 +3589,28 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'8T4C' and 'MRR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2009.0-6"
+    - title: "2106.0-8"
       data-set: "vpp-2n-clx-hist-iter-mrr-new-env"
-    - title: "2101.0-6"
+    - title: "2110.0-8"
       data-set: "vpp-2n-clx-prev-iter-mrr-old-env"
-    - title: "2101.0-7"
+    - title: "2110.0-9"
       data-set: "vpp-2n-clx-prev-iter-mrr-new-env"
-    - title: "2106.0-7"
+    - title: "2202.0-9"
       data-set: "vpp-2n-clx-curr-iter-mrr"
   comparisons:
-    - title: "2101.0-7 vs 2101.0-6"
+    - title: "2110.0-9 vs 2110.0-8"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-2n-clx-8t4c-mrr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2202.0-9 vs 2110.0-9"
       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, "6" for CSIT rls2101, "7" for CSIT rls2106).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - '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.'
-    - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-cx556a 2t1c mrr
 - type: "table"
@@ -2204,30 +3620,28 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'MRR' and 'NIC_Mellanox-CX556A' and not 'NF_DENSITY'"
   columns:
-    - title: "2009.0-6"
+    - title: "2106.0-8"
       data-set: "vpp-2n-clx-hist-iter-mrr-new-env"
-    - title: "2101.0-6"
+    - title: "2110.0-8"
       data-set: "vpp-2n-clx-prev-iter-mrr-old-env"
-    - title: "2101.0-7"
+    - title: "2110.0-9"
       data-set: "vpp-2n-clx-prev-iter-mrr-new-env"
-    - title: "2106.0-7"
+    - title: "2202.0-9"
       data-set: "vpp-2n-clx-curr-iter-mrr"
   comparisons:
-    - title: "2101.0-7 vs 2101.0-6"
+    - title: "2110.0-9 vs 2110.0-8"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-2n-clx-2t1c-mrr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2202.0-9 vs 2110.0-9"
       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 cx556a.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - '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.'
-    - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-cx556a 4t2c mrr
 - type: "table"
@@ -2237,30 +3651,28 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'MRR' and 'NIC_Mellanox-CX556A' and not 'NF_DENSITY'"
   columns:
-    - title: "2009.0-6"
+    - title: "2106.0-8"
       data-set: "vpp-2n-clx-hist-iter-mrr-new-env"
-    - title: "2101.0-6"
+    - title: "2110.0-8"
       data-set: "vpp-2n-clx-prev-iter-mrr-old-env"
-    - title: "2101.0-7"
+    - title: "2110.0-9"
       data-set: "vpp-2n-clx-prev-iter-mrr-new-env"
-    - title: "2106.0-7"
+    - title: "2202.0-9"
       data-set: "vpp-2n-clx-curr-iter-mrr"
   comparisons:
-    - title: "2101.0-7 vs 2101.0-6"
+    - title: "2110.0-9 vs 2110.0-8"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-2n-clx-4t2c-mrr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2202.0-9 vs 2110.0-9"
       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 cx556a.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - '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.'
-    - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-cx556a 8t4c mrr
 - type: "table"
@@ -2270,30 +3682,28 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'8T4C' and 'MRR' and 'NIC_Mellanox-CX556A' and not 'NF_DENSITY'"
   columns:
-    - title: "2009.0-6"
+    - title: "2106.0-8"
       data-set: "vpp-2n-clx-hist-iter-mrr-new-env"
-    - title: "2101.0-6"
+    - title: "2110.0-8"
       data-set: "vpp-2n-clx-prev-iter-mrr-old-env"
-    - title: "2101.0-7"
+    - title: "2110.0-9"
       data-set: "vpp-2n-clx-prev-iter-mrr-new-env"
-    - title: "2106.0-7"
+    - title: "2202.0-9"
       data-set: "vpp-2n-clx-curr-iter-mrr"
   comparisons:
-    - title: "2101.0-7 vs 2101.0-6"
+    - title: "2110.0-9 vs 2110.0-8"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-2n-clx-8t4c-mrr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2202.0-9 vs 2110.0-9"
       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 cx556a.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "6" for CSIT rls2101, "7" for CSIT rls2106).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - '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.'
-    - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-zn2-xxv710 2t1c mrr
 - type: "table"
@@ -2303,30 +3713,28 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'MRR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "2009.0-6"
+    - title: "2106.0-8"
       data-set: "vpp-2n-zn2-hist-iter-mrr-new-env"
-    - title: "2101.0-6"
+    - title: "2110.0-8"
       data-set: "vpp-2n-zn2-prev-iter-mrr-old-env"
-    - title: "2101.0-7"
+    - title: "2110.0-9"
       data-set: "vpp-2n-zn2-prev-iter-mrr-new-env"
-    - title: "2106.0-7"
+    - title: "2202.0-9"
       data-set: "vpp-2n-zn2-curr-iter-mrr"
   comparisons:
-    - title: "2101.0-7 vs 2101.0-6"
+    - title: "2110.0-9 vs 2110.0-8"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-2n-zn2-2t1c-mrr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2202.0-9 vs 2110.0-9"
       reference: 3
       compare: 4
-#      rca-file: "rca/rca-2n-zn2-2t1c-mrr-rca2.yaml"
   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, "6" for CSIT rls2101, "7" for CSIT rls2106).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - '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.'
-    - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-zn2-xxv710 4t2c mrr
 - type: "table"
@@ -2336,30 +3744,28 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'MRR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "2009.0-6"
+    - title: "2106.0-8"
       data-set: "vpp-2n-zn2-hist-iter-mrr-new-env"
-    - title: "2101.0-6"
+    - title: "2110.0-8"
       data-set: "vpp-2n-zn2-prev-iter-mrr-old-env"
-    - title: "2101.0-7"
+    - title: "2110.0-9"
       data-set: "vpp-2n-zn2-prev-iter-mrr-new-env"
-    - title: "2106.0-7"
+    - title: "2202.0-9"
       data-set: "vpp-2n-zn2-curr-iter-mrr"
   comparisons:
-    - title: "2101.0-7 vs 2101.0-6"
+    - title: "2110.0-9 vs 2110.0-8"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-2n-zn2-4t2c-mrr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2202.0-9 vs 2110.0-9"
       reference: 3
       compare: 4
-#      rca-file: "rca/rca-2n-zn2-4t2c-mrr-rca2.yaml"
   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, "6" for CSIT rls2101, "7" for CSIT rls2106).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - '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.'
-    - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-zn2-xxv710 8t4c mrr
 - type: "table"
@@ -2369,30 +3775,28 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'8T4C' and 'MRR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "2009.0-6"
+    - title: "2106.0-8"
       data-set: "vpp-2n-zn2-hist-iter-mrr-new-env"
-    - title: "2101.0-6"
+    - title: "2110.0-8"
       data-set: "vpp-2n-zn2-prev-iter-mrr-old-env"
-    - title: "2101.0-7"
+    - title: "2110.0-9"
       data-set: "vpp-2n-zn2-prev-iter-mrr-new-env"
-    - title: "2106.0-7"
+    - title: "2202.0-9"
       data-set: "vpp-2n-zn2-curr-iter-mrr"
   comparisons:
-    - title: "2101.0-7 vs 2101.0-6"
+    - title: "2110.0-9 vs 2110.0-8"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-2n-zn2-8t4c-mrr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2202.0-9 vs 2110.0-9"
       reference: 3
       compare: 4
-#      rca-file: "rca/rca-2n-zn2-8t4c-mrr-rca2.yaml"
   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, "6" for CSIT rls2101, "7" for CSIT rls2106).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - '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.'
-    - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-dnv 1t1c mrr
 - type: "table"
@@ -2402,30 +3806,28 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C'"
   columns:
-    - title: "2009.0-6"
+    - title: "2106.0-8"
       data-set: "vpp-2n-dnv-hist-iter-mrr-new-env"
-    - title: "2101.0-6"
+    - title: "2110.0-8"
       data-set: "vpp-2n-dnv-prev-iter-mrr-old-env"
-    - title: "2101.0-7"
+    - title: "2110.0-9"
       data-set: "vpp-2n-dnv-prev-iter-mrr-new-env"
-    - title: "2106.0-7"
+    - title: "2202.0-9"
       data-set: "vpp-2n-dnv-curr-iter-mrr"
   comparisons:
-    - title: "2101.0-7 vs 2101.0-6"
+    - title: "2110.0-9 vs 2110.0-8"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-2n-dnv-1t1c-mrr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2202.0-9 vs 2110.0-9"
       reference: 3
       compare: 4
-#      rca-file: "rca/rca-2n-dnv-1t1c-mrr-rca2.yaml"
   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, "6" for CSIT rls2101, "7" for CSIT rls2106).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - '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.'
-    - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-dnv 2t2c mrr
 - type: "table"
@@ -2435,30 +3837,28 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C'"
   columns:
-    - title: "2009.0-6"
+    - title: "2106.0-8"
       data-set: "vpp-2n-dnv-hist-iter-mrr-new-env"
-    - title: "2101.0-6"
+    - title: "2110.0-8"
       data-set: "vpp-2n-dnv-prev-iter-mrr-old-env"
-    - title: "2101.0-7"
+    - title: "2110.0-9"
       data-set: "vpp-2n-dnv-prev-iter-mrr-new-env"
-    - title: "2106.0-7"
+    - title: "2202.0-9"
       data-set: "vpp-2n-dnv-curr-iter-mrr"
   comparisons:
-    - title: "2101.0-7 vs 2101.0-6"
+    - title: "2110.0-9 vs 2110.0-8"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-2n-dnv-2t2c-mrr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2202.0-9 vs 2110.0-9"
       reference: 3
       compare: 4
-#      rca-file: "rca/rca-2n-dnv-2t2c-mrr-rca2.yaml"
   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, "6" for CSIT rls2101, "7" for CSIT rls2106).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - '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.'
-    - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-dnv 4t4c mrr
 - type: "table"
@@ -2468,30 +3868,28 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'4T4C'"
   columns:
-    - title: "2009.0-6"
+    - title: "2106.0-8"
       data-set: "vpp-2n-dnv-hist-iter-mrr-new-env"
-    - title: "2101.0-6"
+    - title: "2110.0-8"
       data-set: "vpp-2n-dnv-prev-iter-mrr-old-env"
-    - title: "2101.0-7"
+    - title: "2110.0-9"
       data-set: "vpp-2n-dnv-prev-iter-mrr-new-env"
-    - title: "2106.0-7"
+    - title: "2202.0-9"
       data-set: "vpp-2n-dnv-curr-iter-mrr"
   comparisons:
-    - title: "2101.0-7 vs 2101.0-6"
+    - title: "2110.0-9 vs 2110.0-8"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-2n-dnv-4t4c-mrr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2202.0-9 vs 2110.0-9"
       reference: 3
       compare: 4
-#      rca-file: "rca/rca-2n-dnv-4t4c-mrr-rca2.yaml"
   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, "6" for CSIT rls2101, "7" for CSIT rls2106).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - '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.'
-    - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-dnv 1t1c mrr
 - type: "table"
@@ -2501,30 +3899,28 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C'"
   columns:
-    - title: "2009.0-6"
+    - title: "2106.0-8"
       data-set: "vpp-3n-dnv-hist-iter-mrr-new-env"
-    - title: "2101.0-6"
+    - title: "2110.0-8"
       data-set: "vpp-3n-dnv-prev-iter-mrr-old-env"
-    - title: "2101.0-7"
+    - title: "2110.0-9"
       data-set: "vpp-3n-dnv-prev-iter-mrr-new-env"
-    - title: "2106.0-7"
+    - title: "2202.0-9"
       data-set: "vpp-3n-dnv-curr-iter-mrr"
   comparisons:
-    - title: "2101.0-7 vs 2101.0-6"
+    - title: "2110.0-9 vs 2110.0-8"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-3n-dnv-1t1c-mrr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2202.0-9 vs 2110.0-9"
       reference: 3
       compare: 4
-#      rca-file: "rca/rca-3n-dnv-1t1c-mrr-rca2.yaml"
   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, "6" for CSIT rls2101, "7" for CSIT rls2106).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - '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.'
-    - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-dnv 2t2c mrr
 - type: "table"
@@ -2534,30 +3930,28 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C'"
   columns:
-    - title: "2009.0-6"
+    - title: "2106.0-8"
       data-set: "vpp-3n-dnv-hist-iter-mrr-new-env"
-    - title: "2101.0-6"
+    - title: "2110.0-8"
       data-set: "vpp-3n-dnv-prev-iter-mrr-old-env"
-    - title: "2101.0-7"
+    - title: "2110.0-9"
       data-set: "vpp-3n-dnv-prev-iter-mrr-new-env"
-    - title: "2106.0-7"
+    - title: "2202.0-9"
       data-set: "vpp-3n-dnv-curr-iter-mrr"
   comparisons:
-    - title: "2101.0-7 vs 2101.0-6"
+    - title: "2110.0-9 vs 2110.0-8"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-3n-dnv-2t2c-mrr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2202.0-9 vs 2110.0-9"
       reference: 3
       compare: 4
-#      rca-file: "rca/rca-3n-dnv-2t2c-mrr-rca2.yaml"
   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, "6" for CSIT rls2101, "7" for CSIT rls2106).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - '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.'
-    - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-dnv 4t4c mrr
 - type: "table"
@@ -2567,30 +3961,28 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'4T4C'"
   columns:
-    - title: "2009.0-6"
+    - title: "2106.0-8"
       data-set: "vpp-3n-dnv-hist-iter-mrr-new-env"
-    - title: "2101.0-6"
+    - title: "2110.0-8"
       data-set: "vpp-3n-dnv-prev-iter-mrr-old-env"
-    - title: "2101.0-7"
+    - title: "2110.0-9"
       data-set: "vpp-3n-dnv-prev-iter-mrr-new-env"
-    - title: "2106.0-7"
+    - title: "2202.0-9"
       data-set: "vpp-3n-dnv-curr-iter-mrr"
   comparisons:
-    - title: "2101.0-7 vs 2101.0-6"
+    - title: "2110.0-9 vs 2110.0-8"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-3n-dnv-4t4c-mrr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2202.0-9 vs 2110.0-9"
       reference: 3
       compare: 4
-#      rca-file: "rca/rca-3n-dnv-4t4c-mrr-rca2.yaml"
   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, "6" for CSIT rls2101, "7" for CSIT rls2106).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - '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.'
-    - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-tsh 1t1c mrr
 - type: "table"
@@ -2600,30 +3992,28 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C'"
   columns:
-    - title: "2009.0-6"
+    - title: "2106.0-8"
       data-set: "vpp-3n-tsh-hist-iter-mrr-new-env"
-    - title: "2101.0-6"
+    - title: "2110.0-8"
       data-set: "vpp-3n-tsh-prev-iter-mrr-old-env"
-    - title: "2101.0-7"
+    - title: "2110.0-9"
       data-set: "vpp-3n-tsh-prev-iter-mrr-new-env"
-    - title: "2106.0-7"
+    - title: "2202.0-9"
       data-set: "vpp-3n-tsh-curr-iter-mrr"
   comparisons:
-    - title: "2101.0-7 vs 2101.0-6"
+    - title: "2110.0-9 vs 2110.0-8"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-3n-tsh-1t1c-mrr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2202.0-9 vs 2110.0-9"
       reference: 3
       compare: 4
-#      rca-file: "rca/rca-3n-tsh-1t1c-mrr-rca2.yaml"
   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, "6" for CSIT rls2101, "7" for CSIT rls2106).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - '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.'
-    - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-tsh 2t2c mrr
 - type: "table"
@@ -2633,30 +4023,28 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C'"
   columns:
-    - title: "2009.0-6"
+    - title: "2106.0-8"
       data-set: "vpp-3n-tsh-hist-iter-mrr-new-env"
-    - title: "2101.0-6"
+    - title: "2110.0-8"
       data-set: "vpp-3n-tsh-prev-iter-mrr-old-env"
-    - title: "2101.0-7"
+    - title: "2110.0-9"
       data-set: "vpp-3n-tsh-prev-iter-mrr-new-env"
-    - title: "2106.0-7"
+    - title: "2202.0-9"
       data-set: "vpp-3n-tsh-curr-iter-mrr"
   comparisons:
-    - title: "2101.0-7 vs 2101.0-6"
+    - title: "2110.0-9 vs 2110.0-8"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-3n-tsh-2t2c-mrr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2202.0-9 vs 2110.0-9"
       reference: 3
       compare: 4
-#      rca-file: "rca/rca-3n-tsh-2t2c-mrr-rca2.yaml"
   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, "6" for CSIT rls2101, "7" for CSIT rls2106).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - '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.'
-    - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-tsh 4t4c mrr
 - type: "table"
@@ -2666,30 +4054,28 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'4T4C'"
   columns:
-    - title: "2009.0-6"
+    - title: "2106.0-8"
       data-set: "vpp-3n-tsh-hist-iter-mrr-new-env"
-    - title: "2101.0-6"
+    - title: "2110.0-8"
       data-set: "vpp-3n-tsh-prev-iter-mrr-old-env"
-    - title: "2101.0-7"
+    - title: "2110.0-9"
       data-set: "vpp-3n-tsh-prev-iter-mrr-new-env"
-    - title: "2106.0-7"
+    - title: "2202.0-9"
       data-set: "vpp-3n-tsh-curr-iter-mrr"
   comparisons:
-    - title: "2101.0-7 vs 2101.0-6"
+    - title: "2110.0-9 vs 2110.0-8"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-3n-tsh-4t4c-mrr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2202.0-9 vs 2110.0-9"
       reference: 3
       compare: 4
-#      rca-file: "rca/rca-3n-tsh-4t4c-mrr-rca2.yaml"
   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, "6" for CSIT rls2101, "7" for CSIT rls2106).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - '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.'
-    - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-tx2 1t1c mrr
 - type: "table"
@@ -2699,30 +4085,28 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C'"
   columns:
-    - title: "2009.0-6"
+    - title: "2106.0-8"
       data-set: "vpp-2n-tx2-hist-iter-mrr-new-env"
-    - title: "2101.0-6"
+    - title: "2110.0-8"
       data-set: "vpp-2n-tx2-prev-iter-mrr-old-env"
-    - title: "2101.0-7"
+    - title: "2110.0-9"
       data-set: "vpp-2n-tx2-prev-iter-mrr-new-env"
-    - title: "2106.0-7"
+    - title: "2202.0-9"
       data-set: "vpp-2n-tx2-curr-iter-mrr"
   comparisons:
-    - title: "2101.0-7 vs 2101.0-6"
+    - title: "2110.0-9 vs 2110.0-8"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-2n-tx2-1t1c-mrr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2202.0-9 vs 2110.0-9"
       reference: 3
       compare: 4
-#      rca-file: "rca/rca-2n-tx2-1t1c-mrr-rca2.yaml"
   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, "6" for CSIT rls2101, "7" for CSIT rls2106).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - '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.'
-    - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-tx2 2t2c mrr
 - type: "table"
@@ -2732,30 +4116,28 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C'"
   columns:
-    - title: "2009.0-6"
+    - title: "2106.0-8"
       data-set: "vpp-2n-tx2-hist-iter-mrr-new-env"
-    - title: "2101.0-6"
+    - title: "2110.0-8"
       data-set: "vpp-2n-tx2-prev-iter-mrr-old-env"
-    - title: "2101.0-7"
+    - title: "2110.0-9"
       data-set: "vpp-2n-tx2-prev-iter-mrr-new-env"
-    - title: "2106.0-7"
+    - title: "2202.0-9"
       data-set: "vpp-2n-tx2-curr-iter-mrr"
   comparisons:
-    - title: "2101.0-7 vs 2101.0-6"
+    - title: "2110.0-9 vs 2110.0-8"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-2n-tx2-2t2c-mrr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2202.0-9 vs 2110.0-9"
       reference: 3
       compare: 4
-#      rca-file: "rca/rca-2n-tx2-2t2c-mrr-rca2.yaml"
   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, "6" for CSIT rls2101, "7" for CSIT rls2106).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - '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.'
-    - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-tx2 4t4c mrr
 - type: "table"
@@ -2765,30 +4147,166 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'4T4C'"
   columns:
-    - title: "2009.0-6"
+    - title: "2106.0-8"
       data-set: "vpp-2n-tx2-hist-iter-mrr-new-env"
-    - title: "2101.0-6"
+    - title: "2110.0-8"
       data-set: "vpp-2n-tx2-prev-iter-mrr-old-env"
-    - title: "2101.0-7"
+    - title: "2110.0-9"
       data-set: "vpp-2n-tx2-prev-iter-mrr-new-env"
-    - title: "2106.0-7"
+    - title: "2202.0-9"
       data-set: "vpp-2n-tx2-curr-iter-mrr"
   comparisons:
-    - title: "2101.0-7 vs 2101.0-6"
+    - title: "2110.0-9 vs 2110.0-8"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-2n-tx2-4t4c-mrr-rca1.yaml"
-    - title: "2106.0-7 vs 2101.0-7"
+    - title: "2202.0-9 vs 2110.0-9"
       reference: 3
       compare: 4
-#      rca-file: "rca/rca-2n-tx2-4t4c-mrr-rca2.yaml"
   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, "6" for CSIT rls2101, "7" for CSIT rls2106).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - '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.'
+    - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
+
+# VPP Performance Changes 2n-aws 2t1c mrr
+- type: "table"
+  title: "VPP Performance Changes 2n-aws 2t1c mrr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-aws-2t1c-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T1C'"
+  columns:
+    - title: "2110.0-8"
+      data-set: "vpp-2n-aws-prev-iter-mrr"
+    - title: "2202.0-9"
+      data-set: "vpp-2n-aws-curr-iter-mrr"
+  comparisons:
+    - title: "2202.0-9 vs 2110.0-8"
+      reference: 1
+      compare: 2
+  legend:
+    - ''
+    - 'Test Case:            Test cases executed for: MRR throughput on 2n-aws with nitro50g.'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - '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.'
+    - '2202.0-9 vs 2110.0-8: Compares VPP code current vs previous.'
+
+# VPP Performance Changes 2n-aws 4t2c mrr
+- type: "table"
+  title: "VPP Performance Changes 2n-aws 4t2c mrr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-aws-4t2c-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T2C'"
+  columns:
+    - title: "2110.0-8"
+      data-set: "vpp-2n-aws-prev-iter-mrr"
+    - title: "2202.0-9"
+      data-set: "vpp-2n-aws-curr-iter-mrr"
+  comparisons:
+    - title: "2202.0-9 vs 2110.0-8"
+      reference: 1
+      compare: 2
+  legend:
+    - ''
+    - 'Test Case:            Test cases executed for: MRR throughput on 2n-aws with nitro50g.'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - '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.'
+    - '2202.0-9 vs 2110.0-8: Compares VPP code current vs previous.'
+
+# VPP Performance Changes 2n-aws 8t4c mrr
+- type: "table"
+  title: "VPP Performance Changes 2n-aws 8t4c mrr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-aws-8t4c-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'8T4C'"
+  columns:
+    - title: "2110.0-8"
+      data-set: "vpp-2n-aws-prev-iter-mrr"
+    - title: "2202.0-9"
+      data-set: "vpp-2n-aws-curr-iter-mrr"
+  comparisons:
+    - title: "2202.0-9 vs 2110.0-8"
+      reference: 1
+      compare: 2
+  legend:
+    - ''
+    - 'Test Case:            Test cases executed for: MRR throughput on 2n-aws with nitro50g.'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - '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.'
+    - '2202.0-9 vs 2110.0-8: Compares VPP code current vs previous.'
+
+# VPP Performance Changes 3n-aws 2t1c mrr
+- type: "table"
+  title: "VPP Performance Changes 3n-aws 2t1c mrr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-aws-2t1c-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T1C'"
+  columns:
+    - title: "2110.0-8"
+      data-set: "vpp-3n-aws-prev-iter-mrr"
+    - title: "2202.0-9"
+      data-set: "vpp-3n-aws-curr-iter-mrr"
+  comparisons:
+    - title: "2202.0-9 vs 2110.0-8"
+      reference: 1
+      compare: 2
+  legend:
+    - ''
+    - 'Test Case:            Test cases executed for: MRR throughput on 3n-aws with nitro50g.'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - '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.'
+    - '2202.0-9 vs 2110.0-8: Compares VPP code current vs previous.'
+
+# VPP Performance Changes 3n-aws 4t2c mrr
+- type: "table"
+  title: "VPP Performance Changes 3n-aws 4t2c mrr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-aws-4t2c-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T2C'"
+  columns:
+    - title: "2110.0-8"
+      data-set: "vpp-3n-aws-prev-iter-mrr"
+    - title: "2202.0-9"
+      data-set: "vpp-3n-aws-curr-iter-mrr"
+  comparisons:
+    - title: "2202.0-9 vs 2110.0-8"
+      reference: 1
+      compare: 2
+  legend:
+    - ''
+    - 'Test Case:            Test cases executed for: MRR throughput on 3n-aws with nitro50g.'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - '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.'
+    - '2202.0-9 vs 2110.0-8: Compares VPP code current vs previous.'
+
+# VPP Performance Changes 3n-aws 8t4c mrr
+- type: "table"
+  title: "VPP Performance Changes 3n-aws 8t4c mrr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-aws-8t4c-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'8T4C'"
+  columns:
+    - title: "2110.0-8"
+      data-set: "vpp-3n-aws-prev-iter-mrr"
+    - title: "2202.0-9"
+      data-set: "vpp-3n-aws-curr-iter-mrr"
+  comparisons:
+    - title: "2202.0-9 vs 2110.0-8"
+      reference: 1
+      compare: 2
+  legend:
+    - ''
+    - 'Test Case:            Test cases executed for: MRR throughput on 3n-aws with nitro50g.'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - '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.'
-    - '2101.0-7 vs 2101.0-6: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2106.0-7 vs 2101.0-7: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2202.0-9 vs 2110.0-8: Compares VPP code current vs previous.'
 
 # VPP Comparison Across Testbeds 2n-skx to 2n-clx 2t1c mrr
 - type: "table"
@@ -2916,74 +4434,131 @@
     - "3n-skx, 2n-skx - topologies tested."
     - "Diff - difference between 3n-skx and 2n-skx topologies."
 
-# # 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"
-#   algorithm: "table_comparison"
-#   output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-2n-clx-2n-icx-1c-mrr"
-#   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#   filter: "('NIC_Intel-XXV710' or 'NIC_Intel-E810CQ') and 'MRR' and '1C'"
-#   columns:
-#     - title: "2n-clx xxv710"
-#       data-set: "vpp-2n-clx-curr-iter-mrr"
-#       tag: "NIC_Intel-XXV710"
-#     - title: "2n-icx e810cq"
-#       data-set: "vpp-2n-icx-curr-iter-mrr"
-#       tag: "NIC_Intel-E810CQ"
-#   comparisons:
-#     - title: "Diff"
-#       reference: 1
-#       compare: 2
-#   legend:
-#     - ""
-#     - "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 2n-clx to 2n-icx 2c mrr
-# - type: "table"
-#   title: "VPP Comparison Across Testbeds 2n-clx to 2n-icx 2c mrr"
-#   algorithm: "table_comparison"
-#   output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-2n-clx-2n-icx-2c-mrr"
-#   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#   filter: "('NIC_Intel-XXV710' or 'NIC_Intel-E810CQ') and 'MRR' and '2C'"
-#   columns:
-#     - title: "2n-clx xxv710"
-#       data-set: "vpp-2n-clx-curr-iter-mrr"
-#       tag: "NIC_Intel-XXV710"
-#     - title: "2n-icx e810cq"
-#       data-set: "vpp-2n-icx-curr-iter-mrr"
-#       tag: "NIC_Intel-E810CQ"
-#   comparisons:
-#     - title: "Diff"
-#       reference: 1
-#       compare: 2
-#   legend:
-#     - ""
-#     - "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 2n-clx to 2n-icx 4c mrr
-# - type: "table"
-#   title: "VPP Comparison Across Testbeds 2n-clx to 2n-icx 4c mrr"
-#   algorithm: "table_comparison"
-#   output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-2n-clx-2n-icx-4c-mrr"
-#   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#   filter: "('NIC_Intel-XXV710' or 'NIC_Intel-E810CQ') and 'MRR' and '4C'"
-#   columns:
-#     - title: "2n-clx xxv710"
-#       data-set: "vpp-2n-clx-curr-iter-mrr"
-#       tag: "NIC_Intel-XXV710"
-#     - title: "2n-icx e810cq"
-#       data-set: "vpp-2n-icx-curr-iter-mrr"
-#       tag: "NIC_Intel-E810CQ"
-#   comparisons:
-#     - title: "Diff"
-#       reference: 1
-#       compare: 2
-#   legend:
-#     - ""
-#     - "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 2n-clx to 2n-icx 1c mrr
+- type: "table"
+  title: "VPP Comparison Across Testbeds 2n-clx to 2n-icx 1c mrr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-2n-clx-2n-icx-1c-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'NIC_Intel-XXV710' and 'MRR' and '1C'"
+  columns:
+    - title: "2n-clx xxv710"
+      data-set: "vpp-2n-clx-curr-iter-mrr"
+    - title: "2n-icx xxv710"
+      data-set: "vpp-2n-icx-curr-iter-mrr"
+  comparisons:
+    - title: "Diff"
+      reference: 1
+      compare: 2
+  legend:
+    - ""
+    - "2n-clx xxv710, 2n-icx xxv710 - testbeds and NICs tested."
+    - "Diff - difference between 2n-clx xxv710 and 2n-icx xxv710 testbeds."
+
+# VPP Comparison Across Testbeds 2n-clx to 2n-icx 2c mrr
+- type: "table"
+  title: "VPP Comparison Across Testbeds 2n-clx to 2n-icx 2c mrr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-2n-clx-2n-icx-2c-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'NIC_Intel-XXV710' and 'MRR' and '2C'"
+  columns:
+    - title: "2n-clx xxv710"
+      data-set: "vpp-2n-clx-curr-iter-mrr"
+    - title: "2n-icx xxv710"
+      data-set: "vpp-2n-icx-curr-iter-mrr"
+  comparisons:
+    - title: "Diff"
+      reference: 1
+      compare: 2
+  legend:
+    - ""
+    - "2n-clx xxv710, 2n-icx xxv710 - testbeds and NICs tested."
+    - "Diff - difference between 2n-clx xxv710 and 2n-icx xxv710 testbeds."
+
+# VPP Comparison Across Testbeds 2n-clx to 2n-icx 4c mrr
+- type: "table"
+  title: "VPP Comparison Across Testbeds 2n-clx to 2n-icx 4c mrr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-2n-clx-2n-icx-4c-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'NIC_Intel-XXV710' and 'MRR' and '4C'"
+  columns:
+    - title: "2n-clx xxv710"
+      data-set: "vpp-2n-clx-curr-iter-mrr"
+    - title: "2n-icx xxv710"
+      data-set: "vpp-2n-icx-curr-iter-mrr"
+  comparisons:
+    - title: "Diff"
+      reference: 1
+      compare: 2
+  legend:
+    - ""
+    - "2n-clx xxv710, 2n-icx xxv710 - testbeds and NICs tested."
+    - "Diff - difference between 2n-clx xxv710 and 2n-icx xxv710 testbeds."
+
+# VPP Comparison Across Testbeds 3n-skx to 3n-icx 1c mrr
+- type: "table"
+  title: "VPP Comparison Across Testbeds 3n-skx to 3n-icx 1c mrr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-skx-3n-icx-1c-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'NIC_Intel-XXV710' and 'MRR' and '1C'"
+  columns:
+    - title: "3n-skx xxv710"
+      data-set: "vpp-3n-skx-curr-iter-mrr"
+    - title: "3n-icx xxv710"
+      data-set: "vpp-3n-icx-curr-iter-mrr"
+  comparisons:
+    - title: "Diff"
+      reference: 1
+      compare: 2
+  legend:
+    - ""
+    - "3n-skx xxv710, 3n-icx xxv710 - testbeds and NICs tested."
+    - "Diff - difference between 3n-skx xxv710 and 3n-icx xxv710 testbeds."
+
+# VPP Comparison Across Testbeds 3n-skx to 3n-icx 2c mrr
+- type: "table"
+  title: "VPP Comparison Across Testbeds 3n-skx to 3n-icx 2c mrr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-skx-3n-icx-2c-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'NIC_Intel-XXV710' and 'MRR' and '2C'"
+  columns:
+    - title: "3n-skx xxv710"
+      data-set: "vpp-3n-skx-curr-iter-mrr"
+    - title: "3n-icx xxv710"
+      data-set: "vpp-3n-icx-curr-iter-mrr"
+  comparisons:
+    - title: "Diff"
+      reference: 1
+      compare: 2
+  legend:
+    - ""
+    - "3n-skx xxv710, 3n-icx xxv710 - testbeds and NICs tested."
+    - "Diff - difference between 3n-skx xxv710 and 3n-icx xxv710 testbeds."
+
+# VPP Comparison Across Testbeds 3n-skx to 3n-icx 4c mrr
+- type: "table"
+  title: "VPP Comparison Across Testbeds 3n-skx to 3n-icx 4c mrr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-skx-3n-icx-4c-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'NIC_Intel-XXV710' and 'MRR' and '4C'"
+  columns:
+    - title: "3n-skx xxv710"
+      data-set: "vpp-3n-skx-curr-iter-mrr"
+    - title: "3n-icx xxv710"
+      data-set: "vpp-3n-icx-curr-iter-mrr"
+  comparisons:
+    - title: "Diff"
+      reference: 1
+      compare: 2
+  legend:
+    - ""
+    - "3n-skx xxv710, 3n-icx xxv710 - testbeds and NICs tested."
+    - "Diff - difference between 3n-skx xxv710 and 3n-icx xxv710 testbeds."
 
 # Detailed Test Results - VPP Performance Results 3n-skx
 - type: "table"
@@ -3056,39 +4631,41 @@
   - "parent"
   - "msg"
 
-# # Detailed Test Results - VPP Performance Results 2n-icx
-# - type: "table"
-#   title: "Detailed Test Results - VPP Performance Results 2n-icx"
-#   algorithm: "table_merged_details"
-#   output-file: "{DIR[DTR,PERF,VPP,2N,ICX]}/"
-#   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-2n-icx-curr-iter-best"
-#   filter: "'NDRPDR'"
-#   parameters:
-#   - "name"
-#   - "parent"
-#   - "msg"
-
-# # Detailed Test Results - VPP Performance Results 3n-icx
-# - type: "table"
-#   title: "Detailed Test Results - VPP Performance Results 3n-icx"
-#   algorithm: "table_merged_details"
-#   output-file: "{DIR[DTR,PERF,VPP,3N,ICX]}/"
-#   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-icx-curr-iter-best"
-#   filter: "'NDRPDR'"
-#   parameters:
-#   - "name"
-#   - "parent"
-#   - "msg"
+# Detailed Test Results - VPP Performance Results 2n-icx
+- type: "table"
+  title: "Detailed Test Results - VPP Performance Results 2n-icx"
+  algorithm: "table_merged_details"
+  output-file: "{DIR[DTR,PERF,VPP,2N,ICX]}/"
+  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-2n-icx-curr-cov"
+  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"
+  algorithm: "table_merged_details"
+  output-file: "{DIR[DTR,PERF,VPP,3N,ICX]}/"
+  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-icx-curr-cov"
+  filter: "'NDRPDR'"
+  # remove-ndr: True
+  parameters:
+  - "name"
+  - "parent"
+  - "msg"
 
 # Detailed Test Results - VPP Performance Results 3n-tsh
 - type: "table"
@@ -3145,7 +4722,7 @@
 - type: "table"
   title: "Detailed Test Results - VPP Performance Results 2n-dnv"
   algorithm: "table_merged_details"
-  output-file: "{DIR[DTR,PERF,VPP,2N,DNV]}/vpp_performance_results_2n_dnv"
+  output-file: "{DIR[DTR,PERF,VPP,2N,DNV]}/"
   columns:
     - title: " |prein| Test Name |preout| "
       data: "data name"
@@ -3158,6 +4735,40 @@
   - "parent"
   - "msg"
 
+# Detailed Test Results - VPP Performance Results 2n-aws
+- type: "table"
+  title: "Detailed Test Results - VPP Performance Results 2n-aws"
+  algorithm: "table_merged_details"
+  output-file: "{DIR[DTR,PERF,VPP,2N,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.  min  avg  max       min  avg  max (10% PDR) |br| 4.  min  avg  max       min  avg  max (50% PDR) |br| 5.  min  avg  max       min  avg  max (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]}/"
+  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.  min  avg  max       min  avg  max (10% PDR) |br| 4.  min  avg  max       min  avg  max (50% PDR) |br| 5.  min  avg  max       min  avg  max (90% PDR) |preout| "
+      data: "data msg"
+  data: "vpp-3n-aws-curr-cov"
+  filter: "all"
+  parameters:
+  - "name"
+  - "parent"
+  - "msg"
+
 # Test configuration - VPP Performance Test Configs 3n-skx
 - type: "table"
   title: "Test configuration - VPP Performance Test Configs 3n-skx"
@@ -3226,39 +4837,41 @@
   - "name"
   - "conf-history"
 
-# # Test configuration - VPP Performance Test Configs 2n-icx
-# - type: "table"
-#   title: "Test configuration - VPP Performance Test Configs 2n-icx"
-#   algorithm: "table_merged_details"
-#   output-file: "{DIR[DTC,PERF,VPP,2N,ICX]}/"
-#   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-icx-curr-iter-best"
-#   filter: "'NDRPDR'"
-#   parameters:
-#   - "parent"
-#   - "name"
-#   - "conf-history"
-
-# # Test configuration - VPP Performance Test Configs 3n-icx
-# - type: "table"
-#   title: "Test configuration - VPP Performance Test Configs 3n-icx"
-#   algorithm: "table_merged_details"
-#   output-file: "{DIR[DTC,PERF,VPP,3N,ICX]}/"
-#   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-icx-curr-iter-best"
-#   filter: "'NDRPDR'"
-#   parameters:
-#   - "parent"
-#   - "name"
-#   - "conf-history"
+# Test configuration - VPP Performance Test Configs 2n-icx
+- type: "table"
+  title: "Test configuration - VPP Performance Test Configs 2n-icx"
+  algorithm: "table_merged_details"
+  output-file: "{DIR[DTC,PERF,VPP,2N,ICX]}/"
+  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-icx-curr-cov"
+  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"
+  algorithm: "table_merged_details"
+  output-file: "{DIR[DTC,PERF,VPP,3N,ICX]}/"
+  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-icx-curr-cov"
+  filter: "'NDRPDR'"
+  # remove-ndr: True
+  parameters:
+  - "parent"
+  - "name"
+  - "conf-history"
 
 # Test configuration - VPP Performance Test Configs 3n-tsh
 - type: "table"
@@ -3315,13 +4928,47 @@
 - type: "table"
   title: "Test configuration - VPP Performance Test Configs 2n-dnv"
   algorithm: "table_merged_details"
-  output-file: "{DIR[DTC,PERF,VPP,2N,DNV]}/"
+  output-file: "{DIR[DTC,PERF,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-2n-dnv-curr-cov"
+  filter: "all"
+  parameters:
+  - "parent"
+  - "name"
+  - "conf-history"
+
+# Test configuration - VPP Performance Test Configs 2n-aws
+- type: "table"
+  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-2n-dnv-curr-cov"
+  data: "vpp-3n-aws-curr-cov"
   filter: "all"
   parameters:
   - "parent"
@@ -3360,21 +5007,21 @@
   data: "vpp-2n-clx-curr-cov"
   filter: "all"
 
-# # Test Operational Data - VPP Performance Operational Data 2n-icx
-# - type: "table"
-#   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-2n-icx-curr-iter-best"
-#   filter: "'NDRPDR'"
+# Test Operational Data - VPP Performance Operational Data 2n-icx
+- type: "table"
+  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-2n-icx-curr-cov"
+  filter: "'NDRPDR'"
 
-# # Test Operational Data - VPP Performance Operational Data 3n-icx
-# - type: "table"
-#   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-3n-icx-curr-iter-best"
-#   filter: "'NDRPDR'"
+# Test Operational Data - VPP Performance Operational Data 3n-icx
+- type: "table"
+  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-3n-icx-curr-cov"
+  filter: "'NDRPDR'"
 
 # Test Operational Data - VPP Performance Operational Data 3n-tsh
 - type: "table"
@@ -3408,6 +5055,22 @@
   data: "vpp-2n-dnv-curr-cov"
   filter: "all"
 
+# Test Operational Data - VPP Performance Operational Data 2n-aws
+- type: "table"
+  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"
+
 # Detailed Test Results - VPP MRR Results 3n-skx
 - type: "table"
   title: "Detailed Test Results - VPP MRR Results 3n-skx"
@@ -3476,39 +5139,39 @@
   - "parent"
   - "msg"
 
-# # Detailed Test Results - VPP MRR Results 2n-icx
-# - type: "table"
-#   title: "Detailed Test Results - VPP MRR Results 2n-icx"
-#   algorithm: "table_merged_details"
-#   output-file: "{DIR[DTR,MRR,VPP,2N,ICX]}/"
-#   columns:
-#     - title: " |prein| Test Name |preout| "
-#       data: "data name"
-#     - title: " |prein| Maximum Receive Rate trial [Mpps] |preout| "
-#       data: "data msg"
-#   data: "vpp-2n-icx-curr-iter-mrr"
-#   filter: "'MRR'"
-#   parameters:
-#   - "name"
-#   - "parent"
-#   - "msg"
-
-# # Detailed Test Results - VPP MRR Results 3n-icx
-# - type: "table"
-#   title: "Detailed Test Results - VPP MRR Results 3n-icx"
-#   algorithm: "table_merged_details"
-#   output-file: "{DIR[DTR,MRR,VPP,3N,ICX]}/"
-#   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-icx"
-#   filter: "'MRR'"
-#   parameters:
-#   - "name"
-#   - "parent"
-#   - "msg"
+# Detailed Test Results - VPP MRR Results 2n-icx
+- type: "table"
+  title: "Detailed Test Results - VPP MRR Results 2n-icx"
+  algorithm: "table_merged_details"
+  output-file: "{DIR[DTR,MRR,VPP,2N,ICX]}/"
+  columns:
+    - title: " |prein| Test Name |preout| "
+      data: "data name"
+    - title: " |prein| Maximum Receive Rate trial [Mpps] |preout| "
+      data: "data msg"
+  data: "vpp-2n-icx-curr-iter-mrr"
+  filter: "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "msg"
+
+# Detailed Test Results - VPP MRR Results 3n-icx
+- type: "table"
+  title: "Detailed Test Results - VPP MRR Results 3n-icx"
+  algorithm: "table_merged_details"
+  output-file: "{DIR[DTR,MRR,VPP,3N,ICX]}/"
+  columns:
+    - title: " |prein| Test Name |preout| "
+      data: "data name"
+    - title: " |prein| Maximum Receive Rate trial [Mpps] |preout| "
+      data: "data msg"
+  data: "vpp-3n-icx-curr-iter-mrr"
+  filter: "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "msg"
 
 # Detailed Test Results - VPP MRR Results 3n-tsh
 - type: "table"
@@ -3578,6 +5241,40 @@
   - "parent"
   - "msg"
 
+# Detailed Test Results - VPP MRR Results 2n-aws
+- type: "table"
+  title: "Detailed Test Results - VPP MRR Results 2n-aws"
+  algorithm: "table_merged_details"
+  output-file: "{DIR[DTR,MRR,VPP,2N,AWS]}/"
+  columns:
+    - title: " |prein| Test Name |preout| "
+      data: "data name"
+    - 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"
+  - "parent"
+  - "msg"
+
 # Test configuration - VPP MRR Test Configs 3n-skx
 - type: "table"
   title: "Test configuration - VPP MRR Test Configs 3n-skx"
@@ -3646,39 +5343,39 @@
   - "name"
   - "conf-history"
 
-# # Test configuration - VPP MRR Test Configs 2n-icx
-# - type: "table"
-#   title: "Test configuration - VPP MRR Test Configs 2n-icx"
-#   algorithm: "table_merged_details"
-#   output-file: "{DIR[DTC,MRR,VPP,2N,ICX]}/"
-#   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-icx-curr-iter-mrr"
-#   filter: "'MRR'"
-#   parameters:
-#   - "parent"
-#   - "name"
-#   - "conf-history"
-
-# # Test configuration - VPP MRR Test Configs 3n-icx
-# - type: "table"
-#   title: "Test configuration - VPP MRR Test Configs 3n-icx"
-#   algorithm: "table_merged_details"
-#   output-file: "{DIR[DTC,MRR,VPP,3N,ICX]}/"
-#   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-icx"
-#   filter: "'MRR'"
-#   parameters:
-#   - "parent"
-#   - "name"
-#   - "conf-history"
+# Test configuration - VPP MRR Test Configs 2n-icx
+- type: "table"
+  title: "Test configuration - VPP MRR Test Configs 2n-icx"
+  algorithm: "table_merged_details"
+  output-file: "{DIR[DTC,MRR,VPP,2N,ICX]}/"
+  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-icx-curr-iter-mrr"
+  filter: "'MRR'"
+  parameters:
+  - "parent"
+  - "name"
+  - "conf-history"
+
+# Test configuration - VPP MRR Test Configs 3n-icx
+- type: "table"
+  title: "Test configuration - VPP MRR Test Configs 3n-icx"
+  algorithm: "table_merged_details"
+  output-file: "{DIR[DTC,MRR,VPP,3N,ICX]}/"
+  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-icx-curr-iter-mrr"
+  filter: "'MRR'"
+  parameters:
+  - "parent"
+  - "name"
+  - "conf-history"
 
 # Test configuration - VPP MRR Test Configs 3n-tsh
 - type: "table"
@@ -3748,6 +5445,40 @@
   - "name"
   - "conf-history"
 
+# Test configuration - VPP MRR Test Configs 2n-aws
+- type: "table"
+  title: "Test configuration - VPP MRR Test Configs 2n-aws"
+  algorithm: "table_merged_details"
+  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-2n-aws-curr-iter-mrr"
+  filter: "all"
+  parameters:
+  - "parent"
+  - "name"
+  - "conf-history"
+
+# Test configuration - VPP MRR Test Configs 3n-aws
+- type: "table"
+  title: "Test configuration - VPP MRR Test Configs 3n-aws"
+  algorithm: "table_merged_details"
+  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-3n-aws-curr-iter-mrr"
+  filter: "all"
+  parameters:
+  - "parent"
+  - "name"
+  - "conf-history"
+
 # Detailed Test Results - VPP Device Results - Ubuntu
 - type: "table"
   title: "Detailed Test Results - VPP Device Results - Ubuntu"
@@ -3793,11 +5524,11 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "2009"
+    - title: "21.02"
       data-set: "dpdk-3n-skx-hist-iter"
-    - title: "2101"
+    - title: "21.08"
       data-set: "dpdk-3n-skx-prev-iter"
-    - title: "2106"
+    - title: "21.11"
       data-set: "dpdk-3n-skx-curr-iter"
   comparisons:
     - title: "Diff"
@@ -3805,8 +5536,8 @@
       compare: 3
   legend:
     - ""
-    - "2009, 2101, 2106 - DPDK versions tested."
-    - "Diff - difference between 2101 and 2106 DPDK version."
+    - "21.02, 21.08, 21.11 - DPDK versions tested."
+    - "Diff - difference between 21.08 and 21.11 DPDK version."
 
 # DPDK Performance Changes 3n-skx 4t2c pdr
 - type: "table"
@@ -3816,11 +5547,11 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "2005"
+    - title: "21.02"
       data-set: "dpdk-3n-skx-hist-iter"
-    - title: "2009"
+    - title: "21.08"
       data-set: "dpdk-3n-skx-prev-iter"
-    - title: "2101"
+    - title: "21.11"
       data-set: "dpdk-3n-skx-curr-iter"
   comparisons:
     - title: "Diff"
@@ -3828,8 +5559,8 @@
       compare: 3
   legend:
     - ""
-    - "2009, 2101, 2106 - DPDK versions tested."
-    - "Diff - difference between 2101 and 2106 DPDK version."
+    - "21.02, 21.08, 21.11 - DPDK versions tested."
+    - "Diff - difference between 21.08 and 21.11 DPDK version."
 
 # DPDK Performance Changes 3n-skx 2t1c ndr
 - type: "table"
@@ -3839,11 +5570,11 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "2009"
+    - title: "21.02"
       data-set: "dpdk-3n-skx-hist-iter"
-    - title: "2101"
+    - title: "21.08"
       data-set: "dpdk-3n-skx-prev-iter"
-    - title: "2106"
+    - title: "21.11"
       data-set: "dpdk-3n-skx-curr-iter"
   comparisons:
     - title: "Diff"
@@ -3851,8 +5582,8 @@
       compare: 3
   legend:
     - ""
-    - "2009, 2101, 2106 - DPDK versions tested."
-    - "Diff - difference between 2101 and 2106 DPDK version."
+    - "21.02, 21.08, 21.11 - DPDK versions tested."
+    - "Diff - difference between 21.08 and 21.11 DPDK version."
 
 # DPDK Performance Changes 3n-skx 4t2c ndr
 - type: "table"
@@ -3862,11 +5593,11 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "2009"
+    - title: "21.02"
       data-set: "dpdk-3n-skx-hist-iter"
-    - title: "2101"
+    - title: "21.08"
       data-set: "dpdk-3n-skx-prev-iter"
-    - title: "2106"
+    - title: "21.11"
       data-set: "dpdk-3n-skx-curr-iter"
   comparisons:
     - title: "Diff"
@@ -3874,8 +5605,8 @@
       compare: 3
   legend:
     - ""
-    - "2009, 2101, 2106 - DPDK versions tested."
-    - "Diff - difference between 2101 and 2106 DPDK version."
+    - "21.02, 21.08, 21.11 - DPDK versions tested."
+    - "Diff - difference between 21.08 and 21.11 DPDK version."
 
 # DPDK Performance Changes 2n-skx 2t1c pdr
 - type: "table"
@@ -3885,11 +5616,11 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "2009"
+    - title: "21.02"
       data-set: "dpdk-2n-skx-hist-iter"
-    - title: "2101"
+    - title: "21.08"
       data-set: "dpdk-2n-skx-prev-iter"
-    - title: "2106"
+    - title: "21.11"
       data-set: "dpdk-2n-skx-curr-iter"
   comparisons:
     - title: "Diff"
@@ -3897,8 +5628,8 @@
       compare: 3
   legend:
     - ""
-    - "2009, 2101, 2106 - DPDK versions tested."
-    - "Diff - difference between 2101 and 2106 DPDK version."
+    - "21.02, 21.08, 21.11 - DPDK versions tested."
+    - "Diff - difference between 21.08 and 21.11 DPDK version."
 
 # DPDK Performance Changes 2n-skx 4t2c pdr
 - type: "table"
@@ -3908,11 +5639,11 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "2009"
+    - title: "21.02"
       data-set: "dpdk-2n-skx-hist-iter"
-    - title: "2101"
+    - title: "21.08"
       data-set: "dpdk-2n-skx-prev-iter"
-    - title: "2106"
+    - title: "21.11"
       data-set: "dpdk-2n-skx-curr-iter"
   comparisons:
     - title: "Diff"
@@ -3920,8 +5651,8 @@
       compare: 3
   legend:
     - ""
-    - "2009, 2101, 2106 - DPDK versions tested."
-    - "Diff - difference between 2101 and 2106 DPDK version."
+    - "21.02, 21.08, 21.11 - DPDK versions tested."
+    - "Diff - difference between 21.08 and 21.11 DPDK version."
 
 # DPDK Performance Changes 2n-skx 2t1c ndr
 - type: "table"
@@ -3931,11 +5662,11 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "2009"
+    - title: "21.02"
       data-set: "dpdk-2n-skx-hist-iter"
-    - title: "2101"
+    - title: "21.08"
       data-set: "dpdk-2n-skx-prev-iter"
-    - title: "2106"
+    - title: "21.11"
       data-set: "dpdk-2n-skx-curr-iter"
   comparisons:
     - title: "Diff"
@@ -3943,8 +5674,8 @@
       compare: 3
   legend:
     - ""
-    - "2009, 2101, 2106 - DPDK versions tested."
-    - "Diff - difference between 2101 and 2106 DPDK version."
+    - "21.02, 21.08, 21.11 - DPDK versions tested."
+    - "Diff - difference between 21.08 and 21.11 DPDK version."
 
 # DPDK Performance Changes 2n-skx 4t2c ndr
 - type: "table"
@@ -3954,11 +5685,11 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "2009"
+    - title: "21.02"
       data-set: "dpdk-2n-skx-hist-iter"
-    - title: "2101"
+    - title: "21.08"
       data-set: "dpdk-2n-skx-prev-iter"
-    - title: "2106"
+    - title: "21.11"
       data-set: "dpdk-2n-skx-curr-iter"
   comparisons:
     - title: "Diff"
@@ -3966,8 +5697,8 @@
       compare: 3
   legend:
     - ""
-    - "2009, 2101, 2106 - DPDK versions tested."
-    - "Diff - difference between 2101 and 2106 DPDK version."
+    - "21.02, 21.08, 21.11 - DPDK versions tested."
+    - "Diff - difference between 21.08 and 21.11 DPDK version."
 
 # DPDK Performance Changes 2n-clx 2t1c pdr
 - type: "table"
@@ -3977,11 +5708,11 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "2009"
+    - title: "21.02"
       data-set: "dpdk-2n-clx-hist-iter"
-    - title: "2101"
+    - title: "21.08"
       data-set: "dpdk-2n-clx-prev-iter"
-    - title: "2106"
+    - title: "21.11"
       data-set: "dpdk-2n-clx-curr-iter"
   comparisons:
     - title: "Diff"
@@ -3989,8 +5720,8 @@
       compare: 3
   legend:
     - ""
-    - "2009, 2101, 2106 - DPDK versions tested."
-    - "Diff - difference between 2101 and 2106 DPDK version."
+    - "21.02, 21.08, 21.11 - DPDK versions tested."
+    - "Diff - difference between 21.08 and 21.11 DPDK version."
 
 # DPDK Performance Changes 2n-clx 4t2c pdr
 - type: "table"
@@ -4000,11 +5731,11 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "2009"
+    - title: "21.02"
       data-set: "dpdk-2n-clx-hist-iter"
-    - title: "2101"
+    - title: "21.08"
       data-set: "dpdk-2n-clx-prev-iter"
-    - title: "2106"
+    - title: "21.11"
       data-set: "dpdk-2n-clx-curr-iter"
   comparisons:
     - title: "Diff"
@@ -4012,8 +5743,8 @@
       compare: 3
   legend:
     - ""
-    - "2009, 2101, 2106 - DPDK versions tested."
-    - "Diff - difference between 2101 and 2106 DPDK version."
+    - "21.02, 21.08, 21.11 - DPDK versions tested."
+    - "Diff - difference between 21.08 and 21.11 DPDK version."
 
 # DPDK Performance Changes 2n-clx 2t1c ndr
 - type: "table"
@@ -4023,11 +5754,11 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "2009"
+    - title: "21.02"
       data-set: "dpdk-2n-clx-hist-iter"
-    - title: "2101"
+    - title: "21.08"
       data-set: "dpdk-2n-clx-prev-iter"
-    - title: "2106"
+    - title: "21.11"
       data-set: "dpdk-2n-clx-curr-iter"
   comparisons:
     - title: "Diff"
@@ -4035,8 +5766,8 @@
       compare: 3
   legend:
     - ""
-    - "2009, 2101, 2106 - DPDK versions tested."
-    - "Diff - difference between 2101 and 2106 DPDK version."
+    - "21.02, 21.08, 21.11 - DPDK versions tested."
+    - "Diff - difference between 21.08 and 21.11 DPDK version."
 
 # DPDK Performance Changes 2n-clx 4t2c ndr
 - type: "table"
@@ -4046,11 +5777,11 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "2009"
+    - title: "21.02"
       data-set: "dpdk-2n-clx-hist-iter"
-    - title: "2101"
+    - title: "21.08"
       data-set: "dpdk-2n-clx-prev-iter"
-    - title: "2106"
+    - title: "21.11"
       data-set: "dpdk-2n-clx-curr-iter"
   comparisons:
     - title: "Diff"
@@ -4058,8 +5789,8 @@
       compare: 3
   legend:
     - ""
-    - "2009, 2101, 2106 - DPDK versions tested."
-    - "Diff - difference between 2101 and 2106 DPDK version."
+    - "21.02, 21.08, 21.11 - DPDK versions tested."
+    - "Diff - difference between 21.08 and 21.11 DPDK version."
 
 # DPDK Performance Changes 2n-zn2 2t1c pdr
 - type: "table"
@@ -4069,11 +5800,11 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "2009"
+    - title: "21.02"
       data-set: "dpdk-2n-zn2-hist-iter"
-    - title: "2101"
+    - title: "21.08"
       data-set: "dpdk-2n-zn2-prev-iter"
-    - title: "2106"
+    - title: "21.11"
       data-set: "dpdk-2n-zn2-curr-iter"
   comparisons:
     - title: "Diff"
@@ -4081,8 +5812,8 @@
       compare: 3
   legend:
     - ""
-    - "2009, 2101, 2106 - DPDK versions tested."
-    - "Diff - difference between 2101 and 2106 DPDK version."
+    - "21.02, 21.08, 21.11 - DPDK versions tested."
+    - "Diff - difference between 21.08 and 21.11 DPDK version."
 
 # DPDK Performance Changes 2n-zn2 4t2c pdr
 - type: "table"
@@ -4092,11 +5823,11 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "2009"
+    - title: "21.02"
       data-set: "dpdk-2n-zn2-hist-iter"
-    - title: "2101"
+    - title: "21.08"
       data-set: "dpdk-2n-zn2-prev-iter"
-    - title: "2106"
+    - title: "21.11"
       data-set: "dpdk-2n-zn2-curr-iter"
   comparisons:
     - title: "Diff"
@@ -4104,8 +5835,8 @@
       compare: 3
   legend:
     - ""
-    - "2009, 2101, 2106 - DPDK versions tested."
-    - "Diff - difference between 2101 and 2106 DPDK version."
+    - "21.02, 21.08, 21.11 - DPDK versions tested."
+    - "Diff - difference between 21.08 and 21.11 DPDK version."
 
 # DPDK Performance Changes 2n-zn2 2t1c ndr
 - type: "table"
@@ -4115,11 +5846,11 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "2009"
+    - title: "21.02"
       data-set: "dpdk-2n-zn2-hist-iter"
-    - title: "2101"
+    - title: "21.08"
       data-set: "dpdk-2n-zn2-prev-iter"
-    - title: "2106"
+    - title: "21.11"
       data-set: "dpdk-2n-zn2-curr-iter"
   comparisons:
     - title: "Diff"
@@ -4127,8 +5858,8 @@
       compare: 3
   legend:
     - ""
-    - "2009, 2101, 2106 - DPDK versions tested."
-    - "Diff - difference between 2101 and 2106 DPDK version."
+    - "21.02, 21.08, 21.11 - DPDK versions tested."
+    - "Diff - difference between 21.08 and 21.11 DPDK version."
 
 # DPDK Performance Changes 2n-zn2 4t2c ndr
 - type: "table"
@@ -4138,11 +5869,11 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "2009"
+    - title: "21.02"
       data-set: "dpdk-2n-zn2-hist-iter"
-    - title: "2101"
+    - title: "21.08"
       data-set: "dpdk-2n-zn2-prev-iter"
-    - title: "2106"
+    - title: "21.11"
       data-set: "dpdk-2n-zn2-curr-iter"
   comparisons:
     - title: "Diff"
@@ -4150,8 +5881,8 @@
       compare: 3
   legend:
     - ""
-    - "2009, 2101, 2106 - DPDK versions tested."
-    - "Diff - difference between 2101 and 2106 DPDK version."
+    - "21.02, 21.08, 21.11 - DPDK versions tested."
+    - "Diff - difference between 21.08 and 21.11 DPDK version."
 
 ## DPDK Performance Changes 2n-dnv 1t1c pdr
 #- type: "table"
@@ -4345,11 +6076,11 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "2009"
+    - title: "21.02"
       data-set: "dpdk-3n-tsh-hist-iter"
-    - title: "2101"
+    - title: "21.08"
       data-set: "dpdk-3n-tsh-prev-iter"
-    - title: "2106"
+    - title: "21.11"
       data-set: "dpdk-3n-tsh-curr-iter"
   comparisons:
     - title: "Diff"
@@ -4357,8 +6088,8 @@
       compare: 3
   legend:
     - ""
-    - "2009, 2101, 2106 - DPDK versions tested."
-    - "Diff - difference between 2101 and 2106 DPDK version."
+    - "21.02, 21.08, 21.11 - DPDK versions tested."
+    - "Diff - difference between 21.08 and 21.11 DPDK version."
 
 # DPDK Performance Changes 3n-tsh 2t2c pdr
 - type: "table"
@@ -4368,11 +6099,11 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "2009"
+    - title: "21.02"
       data-set: "dpdk-3n-tsh-hist-iter"
-    - title: "2101"
+    - title: "21.08"
       data-set: "dpdk-3n-tsh-prev-iter"
-    - title: "2106"
+    - title: "21.11"
       data-set: "dpdk-3n-tsh-curr-iter"
   comparisons:
     - title: "Diff"
@@ -4380,8 +6111,8 @@
       compare: 3
   legend:
     - ""
-    - "2009, 2101, 2106 - DPDK versions tested."
-    - "Diff - difference between 2101 and 2106 DPDK version."
+    - "21.02, 21.08, 21.11 - DPDK versions tested."
+    - "Diff - difference between 21.08 and 21.11 DPDK version."
 
 # DPDK Performance Changes 3n-tsh 1t1c ndr
 - type: "table"
@@ -4391,11 +6122,11 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "2009"
+    - title: "21.02"
       data-set: "dpdk-3n-tsh-hist-iter"
-    - title: "2101"
+    - title: "21.08"
       data-set: "dpdk-3n-tsh-prev-iter"
-    - title: "2106"
+    - title: "21.11"
       data-set: "dpdk-3n-tsh-curr-iter"
   comparisons:
     - title: "Diff"
@@ -4403,8 +6134,8 @@
       compare: 3
   legend:
     - ""
-    - "2009, 2101, 2106 - DPDK versions tested."
-    - "Diff - difference between 2101 and 2106 DPDK version."
+    - "21.02, 21.08, 21.11 - DPDK versions tested."
+    - "Diff - difference between 21.08 and 21.11 DPDK version."
 
 # DPDK Performance Changes 3n-tsh 2t2c ndr
 - type: "table"
@@ -4414,11 +6145,11 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "2009"
+    - title: "21.02"
       data-set: "dpdk-3n-tsh-hist-iter"
-    - title: "2101"
+    - title: "21.08"
       data-set: "dpdk-3n-tsh-prev-iter"
-    - title: "2106"
+    - title: "21.11"
       data-set: "dpdk-3n-tsh-curr-iter"
   comparisons:
     - title: "Diff"
@@ -4426,8 +6157,92 @@
       compare: 3
   legend:
     - ""
-    - "2009, 2101, 2106 - DPDK versions tested."
-    - "Diff - difference between 2101 and 2106 DPDK version."
+    - "21.02, 21.08, 21.11 - DPDK versions tested."
+    - "Diff - difference between 21.08 and 21.11 DPDK version."
+
+# DPDK Performance Changes 2n-tx2 1t1c pdr
+- type: "table"
+  title: "DPDK Performance Changes 2n-tx2 1t1c pdr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-tx2-1t1c-pdr"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'1T1C' and 'NDRPDR'"
+  columns:
+    - title: "21.08"
+      data-set: "dpdk-2n-tx2-prev-iter"
+    - title: "21.11"
+      data-set: "dpdk-2n-tx2-curr-iter"
+  comparisons:
+    - title: "Diff"
+      reference: 1
+      compare: 2
+  legend:
+    - ""
+    - "21.08, 21.11 - DPDK versions tested."
+    - "Diff - difference between 21.08 and 21.11 DPDK version."
+
+# DPDK Performance Changes 2n-tx2 2t2c pdr
+- type: "table"
+  title: "DPDK Performance Changes 2n-tx2 2t2c pdr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-tx2-2t2c-pdr"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T2C' and 'NDRPDR'"
+  columns:
+    - title: "21.08"
+      data-set: "dpdk-2n-tx2-prev-iter"
+    - title: "21.11"
+      data-set: "dpdk-2n-tx2-curr-iter"
+  comparisons:
+    - title: "Diff"
+      reference: 1
+      compare: 2
+  legend:
+    - ""
+    - "21.08, 21.11 - DPDK versions tested."
+    - "Diff - difference between 21.08 and 21.11 DPDK version."
+
+# DPDK Performance Changes 2n-tx2 1t1c ndr
+- type: "table"
+  title: "DPDK Performance Changes 2n-tx2 1t1c ndr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-tx2-1t1c-ndr"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'1T1C' and 'NDRPDR'"
+  columns:
+    - title: "21.08"
+      data-set: "dpdk-2n-tx2-prev-iter"
+    - title: "21.11"
+      data-set: "dpdk-2n-tx2-curr-iter"
+  comparisons:
+    - title: "Diff"
+      reference: 1
+      compare: 2
+  legend:
+    - ""
+    - "21.08, 21.11 - DPDK versions tested."
+    - "Diff - difference between 21.08 and 21.11 DPDK version."
+
+# DPDK Performance Changes 2n-tx2 2t2c ndr
+- type: "table"
+  title: "DPDK Performance Changes 2n-tx2 2t2c ndr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-tx2-2t2c-ndr"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T2C' and 'NDRPDR'"
+  columns:
+    - title: "21.08"
+      data-set: "dpdk-2n-tx2-prev-iter"
+    - title: "21.11"
+      data-set: "dpdk-2n-tx2-curr-iter"
+  comparisons:
+    - title: "Diff"
+      reference: 1
+      compare: 2
+  legend:
+    - ""
+    - "21.08, 21.11 - DPDK versions tested."
+    - "Diff - difference between 21.08 and 21.11 DPDK version."
 
 # DPDK Comparison Across Testbeds 2n-skx to 2n-clx ndr
 - type: "table"
@@ -4471,6 +6286,90 @@
     - "2n-skx, 2n-clx - testbeds and NICs tested."
     - "Diff - difference between 2n-skx and 2n-clx testbeds."
 
+# DPDK Comparison Across Testbeds 2n-clx to 2n-icx ndr
+- type: "table"
+  title: "DPDK Comparison Across Testbeds 2n-clx to 2n-icx ndr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-compare-testbeds-2n-clx-2n-icx-ndr"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'NIC_Intel-XXV710'"
+  columns:
+    - title: "2n-clx xxv710"
+      data-set: "dpdk-2n-clx-curr-iter"
+    - title: "2n-icx xxv710"
+      data-set: "dpdk-2n-icx-curr-iter"
+  comparisons:
+    - title: "Diff"
+      reference: 1
+      compare: 2
+  legend:
+    - ""
+    - "2n-clx xxv710, 2n-icx xxv710 - testbeds and NICs tested."
+    - "Diff - difference between 2n-clx xxv710 and 2n-icx xxv710 testbeds."
+
+# DPDK Comparison Across Testbeds 2n-clx to 2n-icx pdr
+- type: "table"
+  title: "DPDK Comparison Across Testbeds 2n-clx to 2n-icx pdr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-compare-testbeds-2n-clx-2n-icx-pdr"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'NIC_Intel-XXV710'"
+  columns:
+    - title: "2n-clx xxv710"
+      data-set: "dpdk-2n-clx-curr-iter"
+    - title: "2n-icx xxv710"
+      data-set: "dpdk-2n-icx-curr-iter"
+  comparisons:
+    - title: "Diff"
+      reference: 1
+      compare: 2
+  legend:
+    - ""
+    - "2n-clx xxv710, 2n-icx xxv710 - testbeds and NICs tested."
+    - "Diff - difference between 2n-clx xxv710 and 2n-icx xxv710 testbeds."
+
+# DPDK Comparison Across Testbeds 3n-skx to 3n-icx ndr
+- type: "table"
+  title: "DPDK Comparison Across Testbeds 3n-skx to 3n-icx ndr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-compare-testbeds-3n-skx-3n-icx-ndr"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'NIC_Intel-XXV710'"
+  columns:
+    - title: "3n-skx xxv710"
+      data-set: "dpdk-3n-skx-curr-iter"
+    - title: "3n-icx xxv710"
+      data-set: "dpdk-3n-icx-curr-iter"
+  comparisons:
+    - title: "Diff"
+      reference: 1
+      compare: 2
+  legend:
+    - ""
+    - "3n-skx xxv710, 3n-icx xxv710 - testbeds and NICs tested."
+    - "Diff - difference between 3n-skx xxv710 and 3n-icx xxv710 testbeds."
+
+# DPDK Comparison Across Testbeds 3n-skx to 3n-icx pdr
+- type: "table"
+  title: "DPDK Comparison Across Testbeds 3n-skx to 3n-icx pdr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-compare-testbeds-3n-skx-3n-icx-pdr"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'NIC_Intel-XXV710'"
+  columns:
+    - title: "3n-skx xxv710"
+      data-set: "dpdk-3n-skx-curr-iter"
+    - title: "3n-icx xxv710"
+      data-set: "dpdk-3n-icx-curr-iter"
+  comparisons:
+    - title: "Diff"
+      reference: 1
+      compare: 2
+  legend:
+    - ""
+    - "3n-skx xxv710, 3n-icx xxv710 - testbeds and NICs tested."
+    - "Diff - difference between 3n-skx xxv710 and 3n-icx xxv710 testbeds."
+
 # DPDK Comparison Across Topologies 3n-skx to 2n-skx ndr
 - type: "table"
   title: "DPDK Comparison Across Topologies 3n-skx to 2n-skx ndr"
@@ -4553,31 +6452,65 @@
 - type: "table"
   title: "Detailed Test Results - DPDK Performance Results 2n-zn2"
   algorithm: "table_merged_details"
-  output-file: "{DIR[DTR,PERF,DPDK,2N,SKX]}/dpdk_performance_results_2n_zn2"
+  output-file: "{DIR[DTR,PERF,DPDK,2N,ZN2]}/dpdk_performance_results_2n_zn2"
+  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-2n-zn2-curr-iter-best"
+  filter: "all"
+  remove-ndr: False
+  parameters:
+  - "name"
+  - "parent"
+  - "msg"
+
+# Detailed Test Results - DPDK Performance Results 2n-clx
+- type: "table"
+  title: "Detailed Test Results - DPDK Performance Results 2n-clx"
+  algorithm: "table_merged_details"
+  output-file: "{DIR[DTR,PERF,DPDK,2N,CLX]}/dpdk_performance_results_2n_clx"
+  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-2n-clx-curr-iter-best"
+  filter: "all"
+  parameters:
+  - "name"
+  - "parent"
+  - "msg"
+
+# Detailed Test Results - DPDK Performance Results 2n-icx
+- type: "table"
+  title: "Detailed Test Results - DPDK Performance Results 2n-icx"
+  algorithm: "table_merged_details"
+  output-file: "{DIR[DTR,PERF,DPDK,2N,ICX]}/dpdk_performance_results_2n_icx"
   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-2n-zn2-curr-iter-best"
+  data: "dpdk-2n-icx-curr-iter-best"
   filter: "all"
-  remove-ndr: False
   parameters:
   - "name"
   - "parent"
   - "msg"
 
-# Detailed Test Results - DPDK Performance Results 2n-clx
+# Detailed Test Results - DPDK Performance Results 3n-icx
 - type: "table"
-  title: "Detailed Test Results - DPDK Performance Results 2n-clx"
+  title: "Detailed Test Results - DPDK Performance Results 3n-icx"
   algorithm: "table_merged_details"
-  output-file: "{DIR[DTR,PERF,DPDK,2N,CLX]}/dpdk_performance_results_2n_clx"
+  output-file: "{DIR[DTR,PERF,DPDK,3N,ICX]}/dpdk_performance_results_3n_icx"
   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-2n-clx-curr-iter-best"
+  data: "dpdk-3n-icx-curr-iter-best"
   filter: "all"
   parameters:
   - "name"
@@ -4635,22 +6568,40 @@
   - "parent"
   - "msg"
 
-# # Detailed Test Results - DPDK Performance Results 2n-tx2
-# - type: "table"
-#   title: "Detailed Test Results - DPDK Performance Results 2n-tx2"
-#   algorithm: "table_merged_details"
-#   output-file: "{DIR[DTR,PERF,DPDK,2N,TX2]}/dpdk_performance_results_2n_tx2"
-#   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-2n-tx2-curr-iter-best"
-#   filter: "all"
-#   parameters:
-#   - "name"
-#   - "parent"
-#   - "msg"
+# Detailed Test Results - DPDK Performance Results 2n-tx2
+- type: "table"
+  title: "Detailed Test Results - DPDK Performance Results 2n-tx2"
+  algorithm: "table_merged_details"
+  output-file: "{DIR[DTR,PERF,DPDK,2N,TX2]}/dpdk_performance_results_2n_tx2"
+  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-2n-tx2-curr-iter-best"
+  filter: "all"
+  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-cov"
+  filter: "all"
+  remove-ndr: False
+  parameters:
+  - "name"
+  - "parent"
+  - "msg"
 
 ################################################################################
 ###                                F I L E S                                 ###
@@ -4665,24 +6616,28 @@
     - "{DIR[DTR,PERF,VPP,2N,SKX]}"
     - "{DIR[DTR,PERF,VPP,3N,SKX]}"
     - "{DIR[DTR,PERF,VPP,2N,CLX]}"
-#     - "{DIR[DTR,PERF,VPP,2N,ICX]}"
-#     - "{DIR[DTR,PERF,VPP,3N,ICX]}"
+    - "{DIR[DTR,PERF,VPP,2N,ICX]}"
+    - "{DIR[DTR,PERF,VPP,3N,ICX]}"
     - "{DIR[DTR,PERF,VPP,2N,ZN2]}"
     - "{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-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-icx-curr-cov"
+    - "vpp-3n-icx-curr-cov"
     - "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:
@@ -4704,13 +6659,15 @@
       - "2n-skx"
       - "3n-skx"
       - "2n-clx"
-#       - "2n-icx"
-#       - "3n-icx"
+      - "2n-icx"
+      - "3n-icx"
       - "2n-zn2"
       - "3n-tsh"
       - "2n-tx2"
       - "2n-dnv"
       - "3n-dnv"
+      - "2n-aws"
+      - "3n-aws"
     level-3:
       - "xl710"
       - "x520"
@@ -4721,6 +6678,7 @@
       - "cx556a"
       - "vic1227"
       - "vic1385"
+      - "ena"
 
 # VPP Performance Configuration
 - type: "file"
@@ -4731,24 +6689,28 @@
     - "{DIR[DTC,PERF,VPP,2N,SKX]}"
     - "{DIR[DTC,PERF,VPP,3N,SKX]}"
     - "{DIR[DTC,PERF,VPP,2N,CLX]}"
-#     - "{DIR[DTC,PERF,VPP,2N,ICX]}"
-#     - "{DIR[DTC,PERF,VPP,3N,ICX]}"
+    - "{DIR[DTC,PERF,VPP,2N,ICX]}"
+    - "{DIR[DTC,PERF,VPP,3N,ICX]}"
     - "{DIR[DTC,PERF,VPP,2N,ZN2]}"
     - "{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-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-icx-curr-cov"
+    - "vpp-3n-icx-curr-cov"
     - "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:
@@ -4770,13 +6732,15 @@
       - "2n-skx"
       - "3n-skx"
       - "2n-clx"
-#       - "2n-icx"
-#       - "3n-icx"
+      - "2n-icx"
+      - "3n-icx"
       - "2n-zn2"
       - "3n-tsh"
       - "2n-tx2"
       - "2n-dnv"
       - "3n-dnv"
+      - "2n-aws"
+      - "3n-aws"
     level-3:
       - "xl710"
       - "x520"
@@ -4787,6 +6751,7 @@
       - "cx556a"
       - "vic1227"
       - "vic1385"
+      - "ena"
 
 # VPP Performance Operational
 - type: "file"
@@ -4797,24 +6762,28 @@
     - "{DIR[DTO,PERF,VPP,2N,SKX]}"
     - "{DIR[DTO,PERF,VPP,3N,SKX]}"
     - "{DIR[DTO,PERF,VPP,2N,CLX]}"
-#     - "{DIR[DTO,PERF,VPP,2N,ICX]}"
-#     - "{DIR[DTO,PERF,VPP,3N,ICX]}"
+    - "{DIR[DTO,PERF,VPP,2N,ICX]}"
+    - "{DIR[DTO,PERF,VPP,3N,ICX]}"
     - "{DIR[DTO,PERF,VPP,2N,ZN2]}"
     - "{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-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-icx-curr-cov"
+    - "vpp-3n-icx-curr-cov"
     - "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:
@@ -4836,13 +6805,15 @@
       - "2n-skx"
       - "3n-skx"
       - "2n-clx"
-#       - "2n-icx"
-#       - "3n-icx"
+      - "2n-icx"
+      - "3n-icx"
       - "2n-zn2"
       - "3n-tsh"
       - "2n-tx2"
       - "2n-dnv"
       - "3n-dnv"
+      - "2n-aws"
+      - "3n-aws"
     level-3:
       - "xl710"
       - "x520"
@@ -4853,6 +6824,7 @@
       - "cx556a"
       - "vic1227"
       - "vic1385"
+      - "ena"
 
 # VPP MRR Results
 - type: "file"
@@ -4863,24 +6835,28 @@
     - "{DIR[DTR,MRR,VPP,2N,SKX]}"
     - "{DIR[DTR,MRR,VPP,3N,SKX]}"
     - "{DIR[DTR,MRR,VPP,2N,CLX]}"
-#     - "{DIR[DTR,MRR,VPP,2N,ICX]}"
-#     - "{DIR[DTR,MRR,VPP,3N,ICX]}"
+    - "{DIR[DTR,MRR,VPP,2N,ICX]}"
+    - "{DIR[DTR,MRR,VPP,3N,ICX]}"
     - "{DIR[DTR,MRR,VPP,2N,ZN2]}"
     - "{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-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-2n-icx-curr-iter-mrr"
+    - "vpp-3n-icx-curr-iter-mrr"
     - "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:
@@ -4902,13 +6878,15 @@
       - "2n-skx"
       - "3n-skx"
       - "2n-clx"
-#       - "2n-icx"
-#       - "3n-icx"
+      - "2n-icx"
+      - "3n-icx"
       - "2n-zn2"
       - "3n-tsh"
       - "2n-tx2"
       - "2n-dnv"
       - "3n-dnv"
+      - "2n-aws"
+      - "3n-aws"
     level-3:
       - "xl710"
       - "x520"
@@ -4919,6 +6897,7 @@
       - "cx556a"
       - "vic1227"
       - "vic1385"
+      - "ena"
 
 # VPP MRR Configuration
 - type: "file"
@@ -4929,24 +6908,28 @@
     - "{DIR[DTC,MRR,VPP,2N,SKX]}"
     - "{DIR[DTC,MRR,VPP,3N,SKX]}"
     - "{DIR[DTC,MRR,VPP,2N,CLX]}"
-#     - "{DIR[DTC,MRR,VPP,2N,ICX]}"
-#     - "{DIR[DTC,MRR,VPP,3N,ICX]}"
+    - "{DIR[DTC,MRR,VPP,2N,ICX]}"
+    - "{DIR[DTC,MRR,VPP,3N,ICX]}"
     - "{DIR[DTC,MRR,VPP,2N,ZN2]}"
     - "{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-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-2n-icx-curr-iter-mrr"
+    - "vpp-3n-icx-curr-iter-mrr"
     - "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:
@@ -4968,13 +6951,15 @@
       - "2n-skx"
       - "3n-skx"
       - "2n-clx"
-#       - "2n-icx"
-#       - "3n-icx"
+      - "2n-icx"
+      - "3n-icx"
       - "2n-zn2"
       - "3n-tsh"
       - "2n-tx2"
       - "2n-dnv"
       - "3n-dnv"
+      - "2n-aws"
+      - "3n-aws"
     level-3:
       - "xl710"
       - "x520"
@@ -4985,6 +6970,7 @@
       - "cx556a"
       - "vic1227"
       - "vic1385"
+      - "ena"
 
 # VPP Device Results - Ubuntu
 - type: "file"
@@ -5046,6 +7032,26 @@
   filter: "all"
   data-start-level: 4
 
+# DPDK Performance Results 2n-icx
+- type: "file"
+  title: "DPDK Performance Results 2n-icx"
+  algorithm: "file_test_results"
+  output-file: "{DIR[DTR,PERF,DPDK,2N,ICX]}"
+  dir-tables: "{DIR[DTR,PERF,DPDK,2N,ICX]}"
+  data: "dpdk-2n-icx-curr-iter-best"
+  filter: "all"
+  data-start-level: 4
+
+# DPDK Performance Results 3n-icx
+- type: "file"
+  title: "DPDK Performance Results 3n-icx"
+  algorithm: "file_test_results"
+  output-file: "{DIR[DTR,PERF,DPDK,3N,ICX]}"
+  dir-tables: "{DIR[DTR,PERF,DPDK,3N,ICX]}"
+  data: "dpdk-3n-icx-curr-iter-best"
+  filter: "all"
+  data-start-level: 4
+
 ## DPDK Performance Results 2n-dnv
 #- type: "file"
 #  title: "DPDK Performance Results 2n-dnv"
@@ -5076,15 +7082,25 @@
   filter: "all"
   data-start-level: 4
 
-# # DPDK Performance Results 2n-tx2
-# - type: "file"
-#   title: "DPDK Performance Results 2n-tx2"
-#   algorithm: "file_test_results"
-#   output-file: "{DIR[DTR,PERF,DPDK,2N,TX2]}"
-#   dir-tables: "{DIR[DTR,PERF,DPDK,2N,TX2]}"
-#   data: "dpdk-2n-tx2-curr-iter-best"
-#   filter: "all"
-#   data-start-level: 4
+# DPDK Performance Results 2n-tx2
+- type: "file"
+  title: "DPDK Performance Results 2n-tx2"
+  algorithm: "file_test_results"
+  output-file: "{DIR[DTR,PERF,DPDK,2N,TX2]}"
+  dir-tables: "{DIR[DTR,PERF,DPDK,2N,TX2]}"
+  data: "dpdk-2n-tx2-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-cov"
+  filter: "all"
+  data-start-level: 4
 
 ################################################################################
 ###                                P L O T S                                 ###
@@ -5093,99 +7109,91 @@
 # VSAP tests 2n-clx
 
 - type: "plot"
-  title: "2n-clx-e810cg-0b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps"
+  title: "2n-clx-cx556a-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"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-cx556a-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"
+    - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1Cx556A-Rdma-Eth-Ip4Tcphttp-Ldpreload-Nginx-1 15 0-Cps.0B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps"
   layout:
-    title: "2n-clx-e810cg-0b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
+    title: "2n-clx-cx556a-0b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
     layout: "plot-hoststack"
 
 - type: "plot"
-  title: "2n-clx-e810cg-64b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps"
+  title: "2n-clx-cx556a-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"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-cx556a-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"
+    - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1Cx556A-Rdma-Eth-Ip4Tcphttp-Ldpreload-Nginx-1 15 0-Cps.64B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps"
   layout:
-    title: "2n-clx-e810cg-64b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
+    title: "2n-clx-cx556a-64b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
     layout: "plot-hoststack"
 
 - type: "plot"
-  title: "2n-clx-e810cg-1024b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps"
+  title: "2n-clx-cx556a-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"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-cx556a-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"
+    - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1Cx556A-Rdma-Eth-Ip4Tcphttp-Ldpreload-Nginx-1 15 0-Cps.1024B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps"
   layout:
-    title: "2n-clx-e810cg-1024b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
+    title: "2n-clx-cx556a-1024b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
     layout: "plot-hoststack"
 
 - type: "plot"
-  title: "2n-clx-e810cg-2048b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps"
+  title: "2n-clx-cx556a-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"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-cx556a-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"
+    - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1Cx556A-Rdma-Eth-Ip4Tcphttp-Ldpreload-Nginx-1 15 0-Cps.2048B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps"
   layout:
-    title: "2n-clx-e810cg-2048b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
+    title: "2n-clx-cx556a-2048b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
     layout: "plot-hoststack"
 
 - type: "plot"
-  title: "2n-clx-e810cg-0b-2t1c-eth-ip4tcphttp-ldpreload-nginx-rps"
+  title: "2n-clx-cx556a-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"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-cx556a-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"
+    - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1Cx556A-Rdma-Eth-Ip4Tcphttp-Ldpreload-Nginx-1 15 0-Rps.0B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps"
   layout:
-    title: "2n-clx-e810cg-0b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
+    title: "2n-clx-cx556a-0b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
     layout: "plot-hoststack"
 
 - type: "plot"
-  title: "2n-clx-e810cg-64b-2t1c-eth-ip4tcphttp-ldpreload-nginx-rps"
+  title: "2n-clx-cx556a-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"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-cx556a-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"
+    - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1Cx556A-Rdma-Eth-Ip4Tcphttp-Ldpreload-Nginx-1 15 0-Rps.64B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps"
   layout:
-    title: "2n-clx-e810cg-64b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
+    title: "2n-clx-cx556a-64b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
     layout: "plot-hoststack"
 
 - type: "plot"
-  title: "2n-clx-e810cg-1024b-2t1c-eth-ip4tcphttp-ldpreload-nginx-rps"
+  title: "2n-clx-cx556a-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"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-cx556a-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"
+    - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1Cx556A-Rdma-Eth-Ip4Tcphttp-Ldpreload-Nginx-1 15 0-Rps.1024B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps"
   layout:
-    title: "2n-clx-e810cg-1024b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
+    title: "2n-clx-cx556a-1024b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
     layout: "plot-hoststack"
 
 - type: "plot"
-  title: "2n-clx-e810cg-2048b-2t1c-eth-ip4tcphttp-ldpreload-nginx-rps"
+  title: "2n-clx-cx556a-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"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-cx556a-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"
+    - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1Cx556A-Rdma-Eth-Ip4Tcphttp-Ldpreload-Nginx-1 15 0-Rps.2048B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps"
   layout:
-    title: "2n-clx-e810cg-2048b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
+    title: "2n-clx-cx556a-2048b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
     layout: "plot-hoststack"
 
 # Hoststack tests 3n-skx
@@ -5230,6 +7238,42 @@
 
 ################################################################################
 
+# Soak Test (PLRsearch), boxes - 2n-icx
+- type: "plot"
+  title: "VPP Critical rate: 30 Minutes Soak Test (PLRsearch)"
+  algorithm: "plot_perf_box_name"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/soak-test-2n-icx-1"
+  data: "vpp-2n-icx-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"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Soak.64B-2t1c-eth-l2xcbase-soak"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Soak.64B-2t1c-eth-l2bdbasemaclrn-soak"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Soak.64B-2t1c-avf-ethip4-ip4base-soak"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Soak.64B-2t1c-ethip4-ip4base-soak"
+  layout:
+    title: "30 Minutes Soak Test (PLRsearch)"
+    layout: "plot-soak-throughput"
+
+# Soak Test (PLRsearch), boxes - 2n-icx
+- type: "plot"
+  title: "VPP Critical rate: 30 Minutes Soak Test (PLRsearch)"
+  algorithm: "plot_perf_box_name"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/soak-test-2n-icx-2"
+  data: "vpp-2n-icx-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"
+    - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Soak.64B-2t1c-avf-eth-l2bdbasemaclrn-eth-2memif-1dcr-soak"
+    - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Soak.64B-2t1c-eth-l2bdbasemaclrn-eth-2memif-1dcr-soak"
+    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Soak.64B-2t1c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-soak"
+    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Soak.64B-2t1c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-soak"
+  layout:
+    title: "30 Minutes Soak Test (PLRsearch)"
+    layout: "plot-soak-throughput"
+
 # Soak Test (PLRsearch), boxes - 2n-clx
 - type: "plot"
   title: "VPP Critical rate: 30 Minutes Soak Test (PLRsearch)"
@@ -5304,43 +7348,250 @@
 
 ###############################################################################
 
+# Reconf tests 2n-icx
+
+- type: "plot"
+  title: "NFV Effective Blocked Time: 2n-icx-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-icx-xxv710-imix-{core}-dot1qip4vxlan-l2bd-reconf"
+  data: "vpp-2n-icx-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"
+    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-2Ch-1Ach-4Vh-2Vm1T-Testpmd-Reconf.IMIX-{core}-avf-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm1t-testpmd-reconf"
+    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-4Ch-1Ach-8Vh-4Vm1T-Testpmd-Reconf.IMIX-{core}-avf-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm1t-testpmd-reconf"
+    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-6Ch-1Ach-12Vh-6Vm1T-Testpmd-Reconf.IMIX-{core}-avf-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm1t-testpmd-reconf"
+    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-8Ch-1Ach-16Vh-8Vm1T-Testpmd-Reconf.IMIX-{core}-avf-dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm1t-testpmd-reconf"
+    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-10Ch-1Ach-20Vh-10Vm1T-Testpmd-Reconf.IMIX-{core}-avf-dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm1t-testpmd-reconf"
+  layout:
+    title: "dot1qip4vxlan-l2bd-{Y}ch-1ach-{2XY}vh-{XY}vm-testpmd"
+    layout: "plot-throughput"
+
+###############################################################################
+
 # Reconf tests 2n-skx
 
 - type: "plot"
-  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: "vpp-2n-skx-curr-nfv-reconf"
+  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: "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"
+    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-2Ch-1Ach-4Vh-2Vm1T-Testpmd-Reconf.IMIX-{core}-avf-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm1t-testpmd-reconf"
+    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-4Ch-1Ach-8Vh-4Vm1T-Testpmd-Reconf.IMIX-{core}-avf-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm1t-testpmd-reconf"
+    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-6Ch-1Ach-12Vh-6Vm1T-Testpmd-Reconf.IMIX-{core}-avf-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm1t-testpmd-reconf"
+    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-8Ch-1Ach-16Vh-8Vm1T-Testpmd-Reconf.IMIX-{core}-avf-dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm1t-testpmd-reconf"
+    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-10Ch-1Ach-20Vh-10Vm1T-Testpmd-Reconf.IMIX-{core}-avf-dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm1t-testpmd-reconf"
+  layout:
+    title: "dot1qip4vxlan-l2bd-{Y}ch-1ach-{2XY}vh-{XY}vm-testpmd"
+    layout: "plot-throughput"
+
+###############################################################################
+
+# Reconf tests 2n-clx
+
+- type: "plot"
+  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: "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"
+    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-2Ch-1Ach-4Vh-2Vm1T-Testpmd-Reconf.IMIX-{core}-avf-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm1t-testpmd-reconf"
+    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-4Ch-1Ach-8Vh-4Vm1T-Testpmd-Reconf.IMIX-{core}-avf-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm1t-testpmd-reconf"
+    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-6Ch-1Ach-12Vh-6Vm1T-Testpmd-Reconf.IMIX-{core}-avf-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm1t-testpmd-reconf"
+  layout:
+    title: "dot1qip4vxlan-l2bd-{Y}ch-1ach-{2XY}vh-{XY}vm-testpmd"
+    layout: "plot-throughput"
+
+###############################################################################
+
+# Plots - NF Density - 2n-icx - 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-icx-xxv710-imix-{core}-base-vsc-{test_type}"
+  data: "vpp-2n-icx-curr-nfv-mrr"
+  core: ["2t1c", "4t2c", "8t4c"]
+  test-type: ["mrr", ]
+  include:
+    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Ch-2Vh-1Vm1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-1ch-2vh-1vm1t-vppip4-mrr"
+    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Ch-4Vh-2Vm1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-1ch-4vh-2vm1t-vppip4-mrr"
+    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Ch-8Vh-4Vm1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-1ch-8vh-4vm1t-vppip4-mrr"
+    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Ch-12Vh-6Vm1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-1ch-12vh-6vm1t-vppip4-mrr"
+    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-2Ch-4Vh-2Vm1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-2ch-4vh-2vm1t-vppip4-mrr"
+    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-2Ch-8Vh-4Vm1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-2ch-8vh-4vm1t-vppip4-mrr"
+    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-4Ch-8Vh-4Vm1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-4ch-8vh-4vm1t-vppip4-mrr"
+    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-6Ch-12Vh-6Vm1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-6ch-12vh-6vm1t-vppip4-mrr"
+  x-axis: "X = VNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "IMIX Packet Throughput (mean {test_type}) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-test_type"
+    layout: "plot-service-density"
+
+# Plots - NF Density - 2n-icx - VSC - NDRPDR 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-icx-xxv710-imix-{core}-base-vsc-{test_type}"
+  data: "vpp-2n-icx-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"
+    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Ch-4Vh-2Vm1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-1ch-4vh-2vm1t-vppip4-ndrpdr"
+    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Ch-8Vh-4Vm1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-1ch-8vh-4vm1t-vppip4-ndrpdr"
+    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Ch-12Vh-6Vm1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-1ch-12vh-6vm1t-vppip4-ndrpdr"
+    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-2Ch-4Vh-2Vm1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-2ch-4vh-2vm1t-vppip4-ndrpdr"
+    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-2Ch-8Vh-4Vm1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-2ch-8vh-4vm1t-vppip4-ndrpdr"
+    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-4Ch-8Vh-4Vm1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-4ch-8vh-4vm1t-vppip4-ndrpdr"
+    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-6Ch-12Vh-6Vm1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-6ch-12vh-6vm1t-vppip4-ndrpdr"
+  x-axis: "X = VNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "IMIX Packet Throughput (mean {test_type}) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-test_type"
+    layout: "plot-service-density"
+
+# Plots - NF Density - 2n-icx - VSC vxlan - MRR IMIX
+- type: "plot"
+  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-icx-xxv710-imix-{core}-base-vsc-vxlan-{test_type}"
+  data: "vpp-2n-icx-curr-nfv-mrr"
+  core: ["2t1c", "4t2c", "8t4c"]
+  test-type: ["mrr", ]
+  include:
+    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-1Ch-2Vh-1Vm1T-Testpmd-Mrr.IMIX-{core}-avf-dot1qip4vxlan-l2bd-1ch-2vh-1vm1t-testpmd-mrr"
+    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-2Ch-4Vh-2Vm1T-Testpmd-Mrr.IMIX-{core}-avf-dot1qip4vxlan-l2bd-2ch-4vh-2vm1t-testpmd-mrr"
+    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-4Ch-8Vh-4Vm1T-Testpmd-Mrr.IMIX-{core}-avf-dot1qip4vxlan-l2bd-4ch-8vh-4vm1t-testpmd-mrr"
+    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-6Ch-12Vh-6Vm1T-Testpmd-Mrr.IMIX-{core}-avf-dot1qip4vxlan-l2bd-6ch-12vh-6vm1t-testpmd-mrr"
+  x-axis: "X = VNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "IMIX Packet Throughput (mean {test_type}) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-test_type"
+    layout: "plot-service-density"
+
+# Plots - NF Density - 2n-icx - VSC vxlan - NDRPDR IMIX
+- type: "plot"
+  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-icx-xxv710-imix-{core}-base-vsc-vxlan-{test_type}"
+  data: "vpp-2n-icx-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"
+    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-2Ch-4Vh-2Vm1T-Testpmd-ndrpdr.IMIX-{core}-avf-dot1qip4vxlan-l2bd-2ch-4vh-2vm1t-testpmd-ndrpdr"
+    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-4Ch-8Vh-4Vm1T-Testpmd-ndrpdr.IMIX-{core}-avf-dot1qip4vxlan-l2bd-4ch-8vh-4vm1t-testpmd-ndrpdr"
+    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-6Ch-12Vh-6Vm1T-Testpmd-ndrpdr.IMIX-{core}-avf-dot1qip4vxlan-l2bd-6ch-12vh-6vm1t-testpmd-ndrpdr"
+  x-axis: "X = VNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "IMIX Packet Throughput (mean {test_type}) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-test_type"
+    layout: "plot-service-density"
+
+###############################################################################
+
+# Plots - NF Density - 2n-icx - CSC - MRR IMIX
+- type: "plot"
+  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-icx-xxv710-imix-{core}-base-csc-{test_type}"
+  data: "vpp-2n-icx-curr-nfv-mrr"
+  core: ["2t1c", "4t2c", "8t4c"]
+  test-type: ["mrr", ]
+  include:
+    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Ch-2Mif-1Dcr1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-1ch-2mif-1dcr1t-vppip4-mrr"
+    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Ch-4Mif-2Dcr1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-1ch-4mif-2dcr1t-vppip4-mrr"
+    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Ch-8Mif-4Dcr1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-1ch-8mif-4dcr1t-vppip4-mrr"
+    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Ch-12Mif-6Dcr1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-1ch-12mif-6dcr1t-vppip4-mrr"
+    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-2Ch-4Mif-2Dcr1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-2ch-4mif-2dcr1t-vppip4-mrr"
+    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-2Ch-8Mif-4Dcr1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-2ch-8mif-4dcr1t-vppip4-mrr"
+    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-4Ch-8Mif-4Dcr1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-4ch-8mif-4dcr1t-vppip4-mrr"
+    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-6Ch-12Mif-6Dcr1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-6ch-12mif-6dcr1t-vppip4-mrr"
+  x-axis: "X = CNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "IMIX Packet Throughput (mean {test_type}) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-test_type"
+    layout: "plot-service-density"
+
+# Plots - NF Density - 2n-icx - CSC - NDRPDR IMIX
+- type: "plot"
+  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-icx-xxv710-imix-{core}-base-csc-{test_type}"
+  data: "vpp-2n-icx-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"
+    - "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"
+    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Ch-8Mif-4Dcr1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-1ch-8mif-4dcr1t-vppip4-ndrpdr"
+    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Ch-12Mif-6Dcr1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-1ch-12mif-6dcr1t-vppip4-ndrpdr"
+    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-2Ch-4Mif-2Dcr1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-2ch-4mif-2dcr1t-vppip4-ndrpdr"
+    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-2Ch-8Mif-4Dcr1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-2ch-8mif-4dcr1t-vppip4-ndrpdr"
+    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-4Ch-8Mif-4Dcr1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-4ch-8mif-4dcr1t-vppip4-ndrpdr"
+    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-6Ch-12Mif-6Dcr1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-6ch-12mif-6dcr1t-vppip4-ndrpdr"
+  x-axis: "X = CNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "IMIX Packet Throughput (mean {test_type}) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-test_type"
+    layout: "plot-service-density"
+
+###############################################################################
+
+# Plots - NF Density - 2n-icx - CSP - MRR IMIX
+- type: "plot"
+  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-icx-xxv710-imix-{core}-base-csp-{test_type}"
+  data: "vpp-2n-icx-curr-nfv-mrr"
   core: ["2t1c", "4t2c", "8t4c"]
+  test-type: ["mrr", ]
   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"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-2Ch-1Ach-4Vh-2Vm1T-Testpmd-Reconf.IMIX-{core}-avf-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm1t-testpmd-reconf"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-4Ch-1Ach-8Vh-4Vm1T-Testpmd-Reconf.IMIX-{core}-avf-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm1t-testpmd-reconf"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-6Ch-1Ach-12Vh-6Vm1T-Testpmd-Reconf.IMIX-{core}-avf-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm1t-testpmd-reconf"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-8Ch-1Ach-16Vh-8Vm1T-Testpmd-Reconf.IMIX-{core}-avf-dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm1t-testpmd-reconf"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-10Ch-1Ach-20Vh-10Vm1T-Testpmd-Reconf.IMIX-{core}-avf-dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm1t-testpmd-reconf"
+    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Pipeline.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Pl-2Mif-1Dcr1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-1pl-2mif-1dcr1t-vppip4-mrr"
+    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Pipeline.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Pl-2Mif-2Dcr1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-1pl-2mif-2dcr1t-vppip4-mrr"
+    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Pipeline.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Pl-2Mif-4Dcr1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-1pl-2mif-4dcr1t-vppip4-mrr"
+    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Pipeline.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Pl-2Mif-6Dcr1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-1pl-2mif-6dcr1t-vppip4-mrr"
+    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Pipeline.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-2Pl-4Mif-2Dcr1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-2pl-4mif-2dcr1t-vppip4-mrr"
+    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Pipeline.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-2Pl-4Mif-4Dcr1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-2pl-4mif-4dcr1t-vppip4-mrr"
+    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Pipeline.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-2Pl-8Mif-4Dcr1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-2pl-8mif-4dcr1t-vppip4-mrr"
+    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Pipeline.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-6Pl-12Mif-6Dcr1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-6pl-12mif-6dcr1t-vppip4-mrr"
+  x-axis: "X = CNFs per Service Pipeline"
+  y-axis: "Y = Number of Service Pipelines"
+  z-axis: "IMIX Packet Throughput (mean {test_type}) [Mpps]"
   layout:
-    title: "dot1qip4vxlan-l2bd-{Y}ch-1ach-{2XY}vh-{XY}vm-testpmd"
-    layout: "plot-throughput"
-
-###############################################################################
-
-# Reconf tests 2n-clx
+    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-test_type"
+    layout: "plot-service-density"
 
+# Plots - NF Density - 2n-icx - CSP - NDRPDR IMIX
 - type: "plot"
-  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: "vpp-2n-clx-curr-nfv-reconf"
+  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-icx-xxv710-imix-{core}-base-csp-{test_type}"
+  data: "vpp-2n-icx-curr-nfv-ndrpdr"
   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"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-2Ch-1Ach-4Vh-2Vm1T-Testpmd-Reconf.IMIX-{core}-avf-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm1t-testpmd-reconf"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-4Ch-1Ach-8Vh-4Vm1T-Testpmd-Reconf.IMIX-{core}-avf-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm1t-testpmd-reconf"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-6Ch-1Ach-12Vh-6Vm1T-Testpmd-Reconf.IMIX-{core}-avf-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm1t-testpmd-reconf"
+    - "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"
+    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Pipeline.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Pl-2Mif-2Dcr1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-1pl-2mif-2dcr1t-vppip4-ndrpdr"
+    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Pipeline.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Pl-2Mif-4Dcr1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-1pl-2mif-4dcr1t-vppip4-ndrpdr"
+    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Pipeline.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Pl-2Mif-6Dcr1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-1pl-2mif-6dcr1t-vppip4-ndrpdr"
+    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Pipeline.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-2Pl-4Mif-2Dcr1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-2pl-4mif-2dcr1t-vppip4-ndrpdr"
+    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Pipeline.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-2Pl-4Mif-4Dcr1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-2pl-4mif-4dcr1t-vppip4-ndrpdr"
+    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Pipeline.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-2Pl-8Mif-4Dcr1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-2pl-8mif-4dcr1t-vppip4-ndrpdr"
+    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Pipeline.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-6Pl-12Mif-6Dcr1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-6pl-12mif-6dcr1t-vppip4-ndrpdr"
+  x-axis: "X = CNFs per Service Pipeline"
+  y-axis: "Y = Number of Service Pipelines"
+  z-axis: "IMIX Packet Throughput (mean {test_type}) [Mpps]"
   layout:
-    title: "dot1qip4vxlan-l2bd-{Y}ch-1ach-{2XY}vh-{XY}vm-testpmd"
-    layout: "plot-throughput"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-test_type"
+    layout: "plot-service-density"
 
 ###############################################################################
 
@@ -5748,68 +7999,19 @@
     layout: "plot-throughput"
 
 - type: "plot"
-  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: "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"
-    - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Memif-1Lxc-Ndrpdr.64B-{core}-avf-eth-l2xcbase-eth-2memif-1lxc-ndrpdr"
-    - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-{core}-avf-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
-    - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Memif-1Lxc-Ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr"
-    - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Ndrpdr.64B-{core}-avf-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
-  layout:
-    title: "3n-skx-xxv710-64b-{core}-memif-base-avf-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  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: "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"
-    - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Memif-1Lxc-Ndrpdr.64B-{core}-eth-l2xcbase-eth-2memif-1lxc-ndrpdr"
-    - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-{core}-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
-    - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Memif-1Lxc-Ndrpdr.64B-{core}-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr"
-    - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Ndrpdr.64B-{core}-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
-  layout:
-    title: "3n-skx-xxv710-64b-{core}-memif-base-dpdk-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Throughput: 3n-tsh-x520-64b-{core}-memif-base-ixgbe-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-tsh-x520-64b-{core}-memif-base-ixgbe-{test_type}"
-  data: "vpp-3n-tsh-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}"
+  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]}/2n-skx-x710-64b-{core}-ip4routing-base-scale-[avf,dpdk]-{test_type}"
+  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.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"
@@ -5819,7 +8021,6 @@
   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"
@@ -5831,6 +8032,24 @@
     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"
@@ -5920,27 +8139,6 @@
     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: "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"
-    - "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"
@@ -5962,27 +8160,6 @@
     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: "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"
-    - "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"
@@ -6025,65 +8202,6 @@
     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}-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: "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"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H1024-P63-S64512-Tput-Ndrpdr.64B-{core}-avf-ethip4tcp-nat44ed-h1024-p63-s64512-tput-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-H4096-P63-S258048-Tput-Ndrpdr.64B-{core}-avf-ethip4tcp-nat44ed-h4096-p63-s258048-tput-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-H16384-P63-S1032192-Tput-Ndrpdr.64B-{core}-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-tput-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-H65536-P63-S4128768-Tput-Ndrpdr.64B-{core}-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-tput-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"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H262144-P63-S16515072-Tput-Ndrpdr.64B-{core}-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-tput-ndrpdr"
-  layout:
-    title: "2n-skx-xxv710-64b-{core}-nat44ed-ip4routing-tcp-tput-avf-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  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: "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"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H1024-P63-S64512-Tput-Ndrpdr.64B-{core}-avf-ethip4udp-nat44ed-h1024-p63-s64512-tput-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-H4096-P63-S258048-Tput-Ndrpdr.64B-{core}-avf-ethip4udp-nat44ed-h4096-p63-s258048-tput-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-H16384-P63-S1032192-Tput-Ndrpdr.64B-{core}-avf-ethip4udp-nat44ed-h16384-p63-s1032192-tput-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-H65536-P63-S4128768-Tput-Ndrpdr.64B-{core}-avf-ethip4udp-nat44ed-h65536-p63-s4128768-tput-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"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H262144-P63-S16515072-Tput-Ndrpdr.64B-{core}-avf-ethip4udp-nat44ed-h262144-p63-s16515072-tput-ndrpdr"
-  layout:
-    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: "vpp-2n-skx-curr-iter"
-  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"
@@ -6108,81 +8226,58 @@
   core: ["2t1c", ]
   include:
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Avf-Ethip4-Ip4Base-Ndrpdr.64B-{core}-avf-ethip4-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-{core}-avf-ethip4-ip4scale2m-ndrpdr"
-#    - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Avf-Dot1Q-Ip4Base-Ndrpdr.64B-{core}-avf-dot1q-ip4base-ndrpdr"
-#    - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Ethip4-Ip4Base-Ndrpdr.64B-{core}-ethip4-ip4base-ndrpdr"
-#    - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Ethip4-Ip4Scale2M-Ndrpdr.64B-{core}-ethip4-ip4scale2m-ndrpdr"
   layout:
-    title: "3n-skx-x710-64b-{core}-ip4routing-base-scale-avf-{test_type}"
+    title: "3n-skx-x710-64b-{core}-ip4routing-base-avf-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 3n-skx-xxv710-64b-{core}-ip4routing-base-scale-avf-{test_type}"
+  title: "Throughput: 3n-skx-xxv710-64b-{core}-ip4routing-base-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-{core}-ip4routing-base-scale-avf-{test_type}"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-{core}-ip4routing-base-{test_type}"
   data: "vpp-3n-skx-curr-iter"
   core: ["2t1c", ]
   include:
-    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Dot1Q-Ip4Base-Ndrpdr.64B-{core}-avf-dot1q-ip4base-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Ndrpdr.64B-{core}-avf-ethip4-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale20K-Ndrpdr.64B-{core}-avf-ethip4-ip4scale20k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale200K-Ndrpdr.64B-{core}-avf-ethip4-ip4scale200k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-{core}-avf-ethip4-ip4scale2m-ndrpdr"
-  layout:
-    title: "3n-skx-xxv710-64b-{core}-ip4routing-base-scale-avf-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  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: "vpp-3n-skx-curr-iter"
-  core: ["2t1c", ]
-  include:
-    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Dot1Q-Ip4Base-Ndrpdr.64B-{core}-dot1q-ip4base-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Base-Ndrpdr.64B-{core}-ethip4-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Scale20K-Ndrpdr.64B-{core}-ethip4-ip4scale20k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Scale200K-Ndrpdr.64B-{core}-ethip4-ip4scale200k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Scale2M-Ndrpdr.64B-{core}-ethip4-ip4scale2m-ndrpdr"
   layout:
-    title: "3n-skx-xxv710-64b-{core}-ip4routing-base-scale-dpdk-{test_type}"
+    title: "3n-skx-xxv710-64b-{core}-ip4routing-base-{test_type}"
     layout: "plot-throughput"
 
-- type: "plot"
-  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: "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"
-    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-{core}-avf-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-{core}-avf-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-{core}-avf-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-  layout:
-    title: "3n-skx-xxv710-64b-{core}-features-ip4routing-base-avf-{test_type}"
-    layout: "plot-throughput"
+# - type: "plot"
+#   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: "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"
+#     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-{core}-avf-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
+#     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-{core}-avf-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
+#     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-{core}-avf-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
+#   layout:
+#     title: "3n-skx-xxv710-64b-{core}-features-ip4routing-base-avf-{test_type}"
+#     layout: "plot-throughput"
 
-- type: "plot"
-  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: "vpp-3n-skx-curr-iter"
-  core: ["2t1c", ]
-  include:
-    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Base-Ndrpdr.64B-{core}-ethip4-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-{core}-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-{core}-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-{core}-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-{core}-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-  layout:
-    title: "3n-skx-xxv710-64b-{core}-features-ip4routing-base-dpdk-{test_type}"
-    layout: "plot-throughput"
+# - type: "plot"
+#   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: "vpp-3n-skx-curr-iter"
+#   core: ["2t1c", ]
+#   include:
+#     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Base-Ndrpdr.64B-{core}-ethip4-ip4base-ndrpdr"
+#     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-{core}-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
+#     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-{core}-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
+#     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-{core}-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
+#     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-{core}-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
+#   layout:
+#     title: "3n-skx-xxv710-64b-{core}-features-ip4routing-base-dpdk-{test_type}"
+#     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 3n-tsh-x520-64b-{core}-ip4routing-base-scale-ixgbe-{test_type}"
+  title: "Throughput: 3n-tsh-x520-64b-{core}-ip4routing-base-ixgbe-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-tsh-x520-64b-{core}-ip4routing-base-scale-ixgbe-{test_type}"
+  output-file: "{DIR[STATIC,VPP]}/3n-tsh-x520-64b-{core}-ip4routing-base-ixgbe-{test_type}"
   data: "vpp-3n-tsh-curr-iter"
   core: ["1t1c", ]
   include:
@@ -6192,7 +8287,7 @@
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4-Ip4Scale200K-Ndrpdr.64B-{core}-ethip4-ip4scale200k-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4-Ip4Scale2M-Ndrpdr.64B-{core}-ethip4-ip4scale2m-ndrpdr"
   layout:
-    title: "3n-tsh-x520-64b-{core}-ip4routing-base-scale-ixgbe-{test_type}"
+    title: "3n-tsh-x520-64b-{core}-ip4routing-base-ixgbe-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
@@ -6213,37 +8308,17 @@
 - 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}"
+  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"
   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: "vpp-2n-dnv-curr-iter"
-  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"
@@ -6262,97 +8337,170 @@
     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: "vpp-3n-dnv-curr-iter"
-  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", 4t2c]
   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-ip4scale20k-ndrpdr.64B-{core}-ethip4-ip4scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2n1l-50ge1p1ENA-ethip4-ip4scale20k-rnd-ndrpdr.64B-{core}-ethip4-ip4scale20k-rnd-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-skx-xxv710-64b-{core}-ip4tunnel-base-scale-avf-{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-skx-xxv710-64b-{core}-ip4tunnel-base-scale-avf-{test_type}"
-  data: "vpp-3n-skx-curr-iter"
-  core: ["2t1c", ]
+  output-file: "{DIR[STATIC,VPP]}/2n-aws-nitro50g-1518b-{core}-ip4routing-base-scale-{test_type}"
+  data: "vpp-2n-aws-curr-iter"
+  core: ["2t1c", 4t2c]
   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.2n1l-50ge1p1ENA-ethip4-ip4base-ndrpdr.1518b-{core}-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2n1l-50ge1p1ENA-ethip4-ip4scale20k-ndrpdr.1518b-{core}-ethip4-ip4scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2n1l-50ge1p1ENA-ethip4-ip4scale20k-rnd-ndrpdr.1518b-{core}-ethip4-ip4scale20k-rnd-ndrpdr"
+  layout:
+    title: "2n-aws-nitro50g-1518b-{core}-ip4routing-base-scale-ena-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 2n-aws-nitro50g-78b-{core}-ip6routing-base-scale-ena-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-aws-nitro50g-78b-{core}-ip6routing-base-scale-{test_type}"
+  data: "vpp-2n-aws-curr-iter"
+  core: ["2t1c", 4t2c]
+  include:
+    - "Tests.Vpp.Perf.Ip6.2n1l-50ge1p1ENA-ethip6-ip6base-ndrpdr.78b-{core}-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2n1l-50ge1p1ENA-ethip6-ip6scale20k-ndrpdr.78b-{core}-ethip6-ip6scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2n1l-50ge1p1ENA-ethip6-ip6scale20k-rnd-ndrpdr.78b-{core}-ethip6-ip6scale20k-rnd-ndrpdr"
+  layout:
+    title: "2n-aws-nitro50g-78b-{core}-ip6routing-base-scale-ena-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 2n-aws-nitro50g-1518b-{core}-ip6routing-base-scale-ena-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-aws-nitro50g-1518b-{core}-ip6routing-base-scale-{test_type}"
+  data: "vpp-2n-aws-curr-iter"
+  core: ["2t1c", 4t2c]
+  include:
+    - "Tests.Vpp.Perf.Ip6.2n1l-50ge1p1ENA-ethip6-ip6base-ndrpdr.1518B-{core}-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2n1l-50ge1p1ENA-ethip6-ip6scale20k-ndrpdr.1518B-{core}-ethip6-ip6scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2n1l-50ge1p1ENA-ethip6-ip6scale20k-rnd-ndrpdr.1518B-{core}-ethip6-ip6scale20k-rnd-ndrpdr"
+  layout:
+    title: "2n-aws-nitro50g-1518b-{core}-ip6routing-base-scale-ena-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 3n-aws-nitro50g-64b-{core}-ip4routing-base-scale-ena-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-aws-nitro50g-64b-{core}-ip4routing-base-scale-{test_type}"
+  data: "vpp-3n-aws-curr-iter"
+  core: ["2t1c", 4t2c]
+  include:
+    - "Tests.Vpp.Perf.Ip4.50ge1p1ENA-ethip4-ip4base-ndrpdr.64B-{core}-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.50ge1p1ENA-ethip4-ip4scale20k-ndrpdr.64B-{core}-ethip4-ip4scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.50ge1p1ENA-ethip4-ip4scale20k-rnd-ndrpdr.64B-{core}-ethip4-ip4scale20k-rnd-ndrpdr"
+  layout:
+    title: "3n-aws-nitro50g-64b-{core}-ip4routing-base-scale-ena-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 3n-aws-nitro50g-1518b-{core}-ip4routing-base-scale-ena-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-aws-nitro50g-1518b-{core}-ip4routing-base-scale-{test_type}"
+  data: "vpp-3n-aws-curr-iter"
+  core: ["2t1c", 4t2c]
+  include:
+    - "Tests.Vpp.Perf.Ip4.50ge1p1ENA-ethip4-ip4base-ndrpdr.1518b-{core}-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.50ge1p1ENA-ethip4-ip4scale20k-ndrpdr.1518b-{core}-ethip4-ip4scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.50ge1p1ENA-ethip4-ip4scale20k-rnd-ndrpdr.1518b-{core}-ethip4-ip4scale20k-rnd-ndrpdr"
+  layout:
+    title: "3n-aws-nitro50g-1518b-{core}-ip4routing-base-scale-ena-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 3n-aws-nitro50g-1518b-{core}-ipsec-ip4routing-scale-ena-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-aws-nitro50g-1518b-{core}-ipsec-ip4routing-scale-{test_type}"
+  data: "vpp-3n-aws-curr-iter"
+  core: ["2t1c", 4t2c]
+  include:
+    - "Tests.Vpp.Perf.Crypto.50ge1p1ENA-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr.1518B-{core}-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr"
+  layout:
+    title: "3n-aws-nitro50g-1518b-{core}-ipsec-ip4routing-scale-ena-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 3n-aws-nitro50g-imix-{core}-ipsec-ip4routing-scale-ena-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-aws-nitro50g-imix-{core}-ipsec-ip4routing-scale-{test_type}"
+  data: "vpp-3n-aws-curr-iter"
+  core: ["2t1c", 4t2c]
+  include:
+    - "Tests.Vpp.Perf.Crypto.50ge1p1ENA-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr.imix-{core}-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr"
   layout:
-    title: "3n-skx-xxv710-64b-{core}-ip4tunnel-base-scale-avf-{test_type}"
+    title: "3n-aws-nitro50g-imix-{core}-ipsec-ip4routing-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-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-scale-dpdk-{test_type}"
+  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}"
+  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}"
+  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}"
+  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"
@@ -6381,7 +8529,6 @@
   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"
@@ -6394,79 +8541,67 @@
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 3n-skx-x710-78b-{core}-ip6routing-base-scale-avf-{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-skx-x710-78b-{core}-ip6routing-base-scale-avf-{test_type}"
-  data: "vpp-3n-skx-curr-iter"
+  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.10Ge2P1X710-Avf-Dot1Q-Ip6Base-Ndrpdr.78B-{core}-avf-dot1q-ip6base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Avf-Ethip6-Ip6Base-Ndrpdr.78B-{core}-avf-ethip6-ip6base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-Ndrpdr.78B-{core}-avf-ethip6-ip6scale2m-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"
   layout:
-    title: "3n-skx-x710-78b-{core}-ip6routing-base-scale-avf-{test_type}"
+    title: "2n-skx-xxv710-78b-{core}-ip6routing-base-scale-af_xdp-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 3n-skx-xxv710-78b-{core}-ip6routing-base-scale-dpdk-{test_type}"
+  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-xxv710-78b-{core}-ip6routing-base-scale-dpdk-{test_type}"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-x710-78b-{core}-ip6routing-base-scale-avf-{test_type}"
   data: "vpp-3n-skx-curr-iter"
   core: ["2t1c", ]
   include:
-    - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Dot1Q-Ip6Base-Ndrpdr.78B-{core}-dot1q-ip6base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Ethip6-Ip6Base-Ndrpdr.78B-{core}-ethip6-ip6base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Ethip6-Ip6Scale20K-Ndrpdr.78B-{core}-ethip6-ip6scale20k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Ethip6-Ip6Scale200K-Ndrpdr.78B-{core}-ethip6-ip6scale200k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Ethip6-Ip6Scale2M-Ndrpdr.78B-{core}-ethip6-ip6scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Avf-Dot1Q-Ip6Base-Ndrpdr.78B-{core}-avf-dot1q-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Avf-Ethip6-Ip6Base-Ndrpdr.78B-{core}-avf-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-Ndrpdr.78B-{core}-avf-ethip6-ip6scale2m-ndrpdr"
   layout:
-    title: "3n-skx-xxv710-78b-{core}-ip6routing-base-scale-dpdk-{test_type}"
+    title: "3n-skx-x710-78b-{core}-ip6routing-base-scale-avf-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 3n-skx-xxv710-78b-{core}-ip6routing-base-scale-avf-{test_type}"
+  title: "Throughput: 3n-skx-xxv710-78b-{core}-ip6routing-base-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-78b-{core}-ip6routing-base-scale-avf-{test_type}"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-78b-{core}-ip6routing-base-{test_type}"
   data: "vpp-3n-skx-curr-iter"
   core: ["2t1c", ]
   include:
-    - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Avf-Dot1Q-Ip6Base-Ndrpdr.78B-{core}-avf-dot1q-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Ethip6-Ip6Base-Ndrpdr.78B-{core}-ethip6-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Avf-Ethip6-Ip6Base-Ndrpdr.78B-{core}-avf-ethip6-ip6base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale20K-Ndrpdr.78B-{core}-avf-ethip6-ip6scale20k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale200K-Ndrpdr.78B-{core}-avf-ethip6-ip6scale200k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale2M-Ndrpdr.78B-{core}-avf-ethip6-ip6scale2m-ndrpdr"
   layout:
-    title: "3n-skx-xxv710-78b-{core}-ip6routing-base-scale-avf-{test_type}"
+    title: "3n-skx-xxv710-78b-{core}-ip6routing-base-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 3n-tsh-x520-78b-{core}-ip6routing-base-scale-ixgbe-{test_type}"
+  title: "Throughput: 3n-tsh-x520-78b-{core}-ip6routing-base-ixgbe-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-tsh-x520-78b-{core}-ip6routing-base-scale-ixgbe-{test_type}"
+  output-file: "{DIR[STATIC,VPP]}/3n-tsh-x520-78b-{core}-ip6routing-base-ixgbe-{test_type}"
   data: "vpp-3n-tsh-curr-iter"
   core: ["1t1c", ]
   include:
-    - "Tests.Vpp.Perf.Ip6.10Ge2P1X520-Dot1Q-Ip6Base-Ndrpdr.78B-{core}-dot1q-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.10Ge2P1X520-Ethip6-Ip6Base-Ndrpdr.78B-{core}-ethip6-ip6base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.10Ge2P1X520-Ethip6-Ip6Scale20K-Ndrpdr.78B-{core}-ethip6-ip6scale20k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.10Ge2P1X520-Ethip6-Ip6Scale200K-Ndrpdr.78B-{core}-ethip6-ip6scale200k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.10Ge2P1X520-Ethip6-Ip6Scale2M-Ndrpdr.78B-{core}-ethip6-ip6scale2m-ndrpdr"
   layout:
-    title: "3n-tsh-x520-78b-{core}-ip6routing-base-scale-ixgbe-{test_type}"
+    title: "3n-tsh-x520-78b-{core}-ip6routing-base-ixgbe-{test_type}"
     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}"
+  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"
   layout:
     title: "2n-dnv-x553-78b-{core}-ip6routing-base-scale-ixgbe-{test_type}"
     layout: "plot-throughput"
@@ -6496,6 +8631,8 @@
   include:
     - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-{core}-avf-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
     - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-{core}-avf-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-{core}-avf-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-{core}-avf-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
     - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-{core}-avf-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
     - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-{core}-avf-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
     - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-{core}-avf-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
@@ -6504,6 +8641,25 @@
     title: "3n-skx-xxv710-imix-{core}-ipsec-ip4routing-base-scale-avf-{test_type}"
     layout: "plot-throughput"
 
+- type: "plot"
+  title: "Throughput: 3n-skx-xxv710-1518b-{core}-ipsec-ip4routing-base-scale-avf-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-1518b-{core}-ipsec-ip4routing-base-scale-avf-{test_type}"
+  data: "vpp-3n-skx-curr-iter"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518b-{core}-avf-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.1518b-{core}-avf-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518b-{core}-avf-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.1518b-{core}-avf-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518b-{core}-avf-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.1518b-{core}-avf-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518b-{core}-avf-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.1518b-{core}-avf-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+  layout:
+    title: "3n-skx-xxv710-1518b-{core}-ipsec-ip4routing-base-scale-avf-{test_type}"
+    layout: "plot-throughput"
+
 - type: "plot"
   title: "Throughput: 3n-skx-xxv710-1518b-{core}-ipsec-ip4routing-base-scale-dpdk-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
@@ -6513,6 +8669,7 @@
   include:
     - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518B-{core}-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
     - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.1518B-{core}-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518B-{core}-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr"
     - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518B-{core}-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
     - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.1518B-{core}-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
     - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518B-{core}-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
@@ -6530,6 +8687,7 @@
   include:
     - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-{core}-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
     - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-{core}-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-{core}-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr"
     - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-{core}-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
     - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-{core}-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
     - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-{core}-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
@@ -6580,9 +8738,7 @@
   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"
   layout:
@@ -6658,19 +8814,17 @@
   data: "vpp-3n-skx-curr-iter"
   core: ["2t1c", ]
   include:
-    - "Tests.Vpp.Perf.L2.10Ge2P1X710-Avf-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-{core}-avf-dot1q-l2bdbasemaclrn-ndrpdr"
     - "Tests.Vpp.Perf.L2.10Ge2P1X710-Avf-Eth-L2Patch-Ndrpdr.64B-{core}-avf-eth-l2patch-ndrpdr"
     - "Tests.Vpp.Perf.L2.10Ge2P1X710-Avf-Eth-L2Xcbase-Ndrpdr.64B-{core}-avf-eth-l2xcbase-ndrpdr"
     - "Tests.Vpp.Perf.L2.10Ge2P1X710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.10Ge2P1X710-Avf-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-{core}-avf-eth-l2bdscale1mmaclrn-ndrpdr"
   layout:
     title: "3n-skx-x710-64b-{core}-l2switching-base-scale-avf-{test_type}"
     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}"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-{core}-l2switching-base-{test_type}"
   data: "vpp-3n-skx-curr-iter"
   core: ["2t1c", ]
   include:
@@ -6679,92 +8833,45 @@
     - "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: "vpp-3n-skx-curr-iter"
-  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}"
-    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: "vpp-3n-skx-curr-iter"
-  core: ["2t1c", ]
-  include:
-    - "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"
-    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-{core}-avf-eth-l2bdscale10kmaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-{core}-avf-eth-l2bdscale100kmaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-{core}-avf-eth-l2bdscale1mmaclrn-ndrpdr"
-  layout:
-    title: "3n-skx-xxv710-64b-{core}-l2switching-base-scale-avf-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  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: "vpp-3n-skx-curr-iter"
-  core: ["2t1c", ]
-  include:
-    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Patch-Ndrpdr.64B-{core}-eth-l2patch-ndrpdr"
     - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Xcbase-Ndrpdr.64B-{core}-eth-l2xcbase-ndrpdr"
     - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-{core}-eth-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-{core}-eth-l2bdscale10kmaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-{core}-eth-l2bdscale100kmaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-{core}-eth-l2bdscale1mmaclrn-ndrpdr"
   layout:
-    title: "3n-skx-xxv710-64b-{core}-l2switching-base-scale-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}-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: "vpp-3n-skx-curr-iter"
-  core: ["2t1c", ]
-  include:
-    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Iacl50Sf-10Kflows-Ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Iacl50Sl-10Kflows-Ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Oacl50Sf-10Kflows-Ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Oacl50Sl-10Kflows-Ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Macip-Iacl50Sl-10Kflows-Ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr"
-  layout:
-    title: "3n-skx-xxv710-64b-{core}-features-l2switching-base-avf-{test_type}"
-    layout: "plot-throughput"
+# - type: "plot"
+#   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: "vpp-3n-skx-curr-iter"
+#   core: ["2t1c", ]
+#   include:
+#     - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-ndrpdr"
+#     - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Iacl50Sf-10Kflows-Ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr"
+#     - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Iacl50Sl-10Kflows-Ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr"
+#     - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Oacl50Sf-10Kflows-Ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr"
+#     - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Oacl50Sl-10Kflows-Ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr"
+#     - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Macip-Iacl50Sl-10Kflows-Ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr"
+#   layout:
+#     title: "3n-skx-xxv710-64b-{core}-features-l2switching-base-avf-{test_type}"
+#     layout: "plot-throughput"
 
-- type: "plot"
-  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: "vpp-3n-skx-curr-iter"
-  core: ["2t1c", ]
-  include:
-    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-{core}-eth-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Iacl50Sf-10Kflows-Ndrpdr.64B-{core}-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Iacl50Sl-10Kflows-Ndrpdr.64B-{core}-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Oacl50Sf-10Kflows-Ndrpdr.64B-{core}-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Oacl50Sl-10Kflows-Ndrpdr.64B-{core}-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Macip-Iacl50Sl-10Kflows-Ndrpdr.64B-{core}-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr"
-  layout:
-    title: "3n-skx-xxv710-64b-{core}-features-l2switching-base-dpdk-{test_type}"
-    layout: "plot-throughput"
+# - type: "plot"
+#   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: "vpp-3n-skx-curr-iter"
+#   core: ["2t1c", ]
+#   include:
+#     - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-{core}-eth-l2bdbasemaclrn-ndrpdr"
+#     - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Iacl50Sf-10Kflows-Ndrpdr.64B-{core}-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr"
+#     - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Iacl50Sl-10Kflows-Ndrpdr.64B-{core}-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr"
+#     - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Oacl50Sf-10Kflows-Ndrpdr.64B-{core}-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr"
+#     - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Oacl50Sl-10Kflows-Ndrpdr.64B-{core}-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr"
+#     - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Macip-Iacl50Sl-10Kflows-Ndrpdr.64B-{core}-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr"
+#   layout:
+#     title: "3n-skx-xxv710-64b-{core}-features-l2switching-base-dpdk-{test_type}"
+#     layout: "plot-throughput"
 
 - type: "plot"
   title: "Throughput: 3n-tsh-x520-64b-{core}-l2switching-base-ixgbe-{test_type}"
@@ -6773,6 +8880,7 @@
   data: "vpp-3n-tsh-curr-iter"
   core: ["1t1c", ]
   include:
+    - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Patch-Ndrpdr.64B-{core}-eth-l2patch-ndrpdr"
     - "Tests.Vpp.Perf.L2.10Ge2P1X520-Dot1Q-L2Xcbase-Ndrpdr.64B-{core}-dot1q-l2xcbase-ndrpdr"
     - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Xcbase-Ndrpdr.64B-{core}-eth-l2xcbase-ndrpdr"
     - "Tests.Vpp.Perf.L2.10Ge2P1X520-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-{core}-dot1q-l2bdbasemaclrn-ndrpdr"
@@ -6781,23 +8889,6 @@
     title: "3n-tsh-x520-64b-{core}-l2switching-base-ixgbe-{test_type}"
     layout: "plot-throughput"
 
-- type: "plot"
-  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: "vpp-3n-tsh-curr-iter"
-  core: ["1t1c", ]
-  include:
-    - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Patch-Ndrpdr.64B-{core}-eth-l2patch-ndrpdr"
-    - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Xcbase-Ndrpdr.64B-{core}-eth-l2xcbase-ndrpdr"
-    - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Ndrpdr.64B-{core}-eth-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-{core}-eth-l2bdscale10kmaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-{core}-eth-l2bdscale100kmaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-{core}-eth-l2bdscale1mmaclrn-ndrpdr"
-  layout:
-    title: "3n-tsh-x520-64b-{core}-l2switching-base-scale-ixgbe-{test_type}"
-    layout: "plot-throughput"
-
 - type: "plot"
   title: "Throughput: 3n-tsh-x520-64b-{core}-features-l2switching-base-ixgbe-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
@@ -6841,8 +8932,6 @@
     - "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"
@@ -6913,22 +9002,22 @@
     title: "3n-skx-xxv710-78b-{core}-srv6-ip6routing-base-avf-{test_type}"
     layout: "plot-throughput"
 
-- type: "plot"
-  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: "vpp-3n-skx-curr-iter"
-  core: ["2t1c", ]
-  include:
-    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-Ndrpdr.78B-{core}-ethip6ip6-ip6base-srv6enc1sid-ndrpdr"
-    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Ndrpdr.78B-{core}-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr"
-    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Nodecaps-Ndrpdr.78B-{core}-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr"
-    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Dyn-Ndrpdr.78B-{core}-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr"
-    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Masq-Ndrpdr.78B-{core}-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr"
-    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Stat-Ndrpdr.78B-{core}-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr"
-  layout:
-    title: "3n-skx-xxv710-78b-{core}-srv6-ip6routing-base-dpdk-{test_type}"
-    layout: "plot-throughput"
+# - type: "plot"
+#   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: "vpp-3n-skx-curr-iter"
+#   core: ["2t1c", ]
+#   include:
+#     - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-Ndrpdr.78B-{core}-ethip6ip6-ip6base-srv6enc1sid-ndrpdr"
+#     - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Ndrpdr.78B-{core}-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr"
+#     - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Nodecaps-Ndrpdr.78B-{core}-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr"
+#     - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Dyn-Ndrpdr.78B-{core}-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr"
+#     - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Masq-Ndrpdr.78B-{core}-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr"
+#     - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Stat-Ndrpdr.78B-{core}-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr"
+#   layout:
+#     title: "3n-skx-xxv710-78b-{core}-srv6-ip6routing-base-dpdk-{test_type}"
+#     layout: "plot-throughput"
 
 - type: "plot"
   title: "Throughput: 3n-tsh-x520-78b-{core}-srv6-ip6routing-base-ixgbe-{test_type}"
@@ -6948,267 +9037,163 @@
     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}"
+  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: "vpp-2n-skx-curr-iter"
-  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: "vpp-2n-skx-curr-iter"
-  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}"
+  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-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: "vpp-3n-skx-curr-iter"
-  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: "vpp-3n-skx-curr-iter"
-  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}"
-    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: "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"
-    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-avf-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-avf-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-avf-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-  layout:
-    title: "3n-skx-xxv710-64b-{core}-vhost-base-avf-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  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: "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"
-    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-avf-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Vppip4-Ndrpdr.64B-{core}-avf-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-avf-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-  layout:
-    title: "3n-skx-xxv710-64b-{core}-vhost-base-avf-vpp-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  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: "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"
-    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
   layout:
-    title: "3n-skx-xxv710-64b-{core}-vhost-base-dpdk-{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-dpdk-vpp-{test_type}"
+  title: "Throughput: 3n-tsh-x520-64b-{core}-vhost-base-ixgbe-vppl2xc-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-{core}-vhost-base-dpdk-vpp-{test_type}"
-  data: "vpp-3n-skx-curr-iter"
-  core: ["2t1c", ]
+  output-file: "{DIR[STATIC,VPP]}/3n-tsh-x520-64b-{core}-vhost-base-ixgbe-vppl2xc-{test_type}"
+  data: "vpp-3n-tsh-curr-iter"
+  core: ["1t1c", ]
   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"
+    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-vppl2xc-Ndrpdr.64B-{core}-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-vppl2xc-Ndrpdr.64B-{core}-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-vppl2xc-Ndrpdr.64B-{core}-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-vppl2xc-Ndrpdr.64B-{core}-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-vppl2xc-Ndrpdr.64B-{core}-ethip4-ip4base-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Ethip4Vxlan-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
   layout:
-    title: "3n-skx-xxv710-64b-{core}-vhost-base-dpdk-vpp-{test_type}"
+    title: "3n-tsh-x520-64b-{core}-vhost-base-ixgbe-vppl2xc-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 3n-skx-xxv710-64b-{core}-link-bonding-vhost-base-avf-{test_type}"
+  title: "Throughput: 3n-tsh-x520-64b-{core}-vhost-base-ixgbe-{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: "vpp-3n-skx-curr-iter"
-  core: ["2t1c", ]
+  output-file: "{DIR[STATIC,VPP]}/3n-tsh-x520-64b-{core}-vhost-base-ixgbe-{test_type}"
+  data: "vpp-3n-tsh-curr-iter"
+  core: ["1t1c", ]
   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"
+    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Ethip4Vxlan-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
   layout:
-    title: "3n-skx-xxv710-64b-{core}-link-bonding-vhost-base-avf-{test_type}"
+    title: "3n-tsh-x520-64b-{core}-vhost-base-ixgbe-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 3n-skx-xxv710-64b-{core}-link-bonding-vhost-base-avf-vpp-{test_type}"
+  title: "Throughput: 2n-tx2-xl710-64b-{core}-ipsec-base-scale-sw-policy-dpdk-{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: "vpp-3n-skx-curr-iter"
-  core: ["2t1c", ]
+  output-file: "{DIR[STATIC,VPP]}/2n-tx2-xl710-64b-{core}-ipsec-base-scale-sw-policy-dpdk-{test_type}"
+  data: "vpp-2n-tx2-curr-iter"
+  core: ["1t1c", ]
   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"
+    - "Tests.Vpp.Perf.Crypto.2N1L-40Ge2P1Xl710-Ethip4Ipsec1Tnlsw-Ip4Base-Policy-Aes256Gcm-Udir-ndrpdr.64B-{core}-ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-udir-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.2N1L-40Ge2P1Xl710-Ethip4Ipsec1Tnlsw-Ip4Base-Policy-Aes128Cbc-Hmac512Sha-Udir-ndrpdr.64B-{core}-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac512sha-udir-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.2N1L-40Ge2P1Xl710-Ethip4Ipsec40Tnlsw-Ip4Base-Policy-Aes256Gcm-Udir-ndrpdr.64B-{core}-ethip4ipsec40tnlsw-ip4base-policy-aes256gcm-udir-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.2N1L-40Ge2P1Xl710-Ethip4Ipsec40Tnlsw-Ip4Base-Policy-Aes128Cbc-Hmac512Sha-Udir-ndrpdr.64B-{core}-ethip4ipsec40tnlsw-ip4base-policy-aes128cbc-hmac512sha-udir-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.2N1L-40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-Ip4Base-Policy-Aes256Gcm-Udir-ndrpdr.64B-{core}-ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-udir-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.2N1L-40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-Ip4Base-Policy-Aes128Cbc-Hmac512Sha-Udir-ndrpdr.64B-{core}-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac512sha-udir-ndrpdr"
   layout:
-    title: "3n-skx-xxv710-64b-{core}-link-bonding-vhost-base-avf-vpp-{test_type}"
+    title: "2n-tx2-xl710-64b-{core}-ipsec-base-scale-sw-policy-dpdk-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 3n-skx-xxv710-64b-{core}-link-bonding-vhost-base-dpdk-{test_type}"
+  title: "Throughput: 2n-tx2-xl710-64b-{core}-ipsec-spe-base-scale-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: "vpp-3n-skx-curr-iter"
-  core: ["2t1c", ]
+  output-file: "{DIR[STATIC,VPP]}/2n-tx2-xl710-64b-{core}-ipsec-spe-base-scale-dpdk-{test_type}"
+  data: "vpp-2n-tx2-curr-iter"
+  core: ["1t1c", ]
   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"
+    - "Tests.Vpp.Perf.Crypto.2N1L-40Ge2P1Xl710-Ethip4Ipsec1Spe-Ip4Base-Policy-Outbound-Nocrypto-ndrpdr.64B-{core}-ethip4ipsec1spe-ip4base-policy-outbound-nocrypto-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.2N1L-40Ge2P1Xl710-Ethip4Ipsec1Spe-Cache-Ip4Base-Policy-Outbound-Nocrypto-ndrpdr.64B-{core}-ethip4ipsec1spe-cache-ip4base-policy-outbound-nocrypto-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.2N1L-40Ge2P1Xl710-Ethip4Ipsec100Spe-Ip4Base-Policy-Outbound-Nocrypto-ndrpdr.64B-{core}-ethip4ipsec100spe-ip4base-policy-outbound-nocrypto-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.2N1L-40Ge2P1Xl710-Ethip4Ipsec100Spe-Cache-Ip4Base-Policy-Outbound-Nocrypto-ndrpdr.64B-{core}-ethip4ipsec100spe-cache-ip4base-policy-outbound-nocrypto-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.2N1L-40Ge2P1Xl710-Ethip4Ipsec1000Spe-Ip4Base-Policy-Outbound-Nocrypto-ndrpdr.64B-{core}-ethip4ipsec1000spe-ip4base-policy-outbound-nocrypto-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.2N1L-40Ge2P1Xl710-Ethip4Ipsec1000Spe-Cache-Ip4Base-Policy-Outbound-Nocrypto-ndrpdr.64B-{core}-ethip4ipsec1000spe-cache-ip4base-policy-outbound-nocrypto-ndrpdr"
   layout:
-    title: "3n-skx-xxv710-64b-{core}-link-bonding-vhost-base-dpdk-{test_type}"
+    title: "2n-tx2-xl710-64b-{core}-ipsec-spe-base-scale-dpdk-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 3n-skx-xxv710-64b-{core}-link-bonding-vhost-base-dpdk-vpp-{test_type}"
+  title: "Throughput: 2n-tx2-xl710-1518b-{core}-ipsec-base-scale-sw-cbc-dpdk-{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: "vpp-3n-skx-curr-iter"
-  core: ["2t1c", ]
+  output-file: "{DIR[STATIC,VPP]}/2n-tx2-xl710-1518b-{core}-ipsec-base-scale-sw-cbc-dpdk-{test_type}"
+  data: "vpp-2n-tx2-curr-iter"
+  core: ["1t1c", ]
   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"
+    - "Tests.Vpp.Perf.Crypto.2N1L-40Ge2P1Xl710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Udir-ndrpdr.1518B-{core}-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-udir-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.2N1L-40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Udir-ndrpdr.1518B-{core}-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-udir-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.2N1L-40Ge2P1Xl710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Udir-ndrpdr.1518B-{core}-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-udir-ndrpdr"
   layout:
-    title: "3n-skx-xxv710-64b-{core}-link-bonding-vhost-base-dpdk-vpp-{test_type}"
+    title: "2n-tx2-xl710-1518b-{core}-ipsec-base-scale-sw-cbc-dpdk-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 3n-tsh-x520-64b-{core}-vhost-base-ixgbe-vppl2xc-{test_type}"
+  title: "Throughput: 2n-tx2-xl710-imix-{core}-ipsec-base-scale-sw-cbc-dpdk-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-tsh-x520-64b-{core}-vhost-base-ixgbe-vppl2xc-{test_type}"
-  data: "vpp-3n-tsh-curr-iter"
+  output-file: "{DIR[STATIC,VPP]}/2n-tx2-xl710-imix-{core}-ipsec-base-scale-sw-cbc-dpdk-{test_type}"
+  data: "vpp-2n-tx2-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"
-    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-vppl2xc-Ndrpdr.64B-{core}-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-vppl2xc-Ndrpdr.64B-{core}-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-vppl2xc-Ndrpdr.64B-{core}-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-vppl2xc-Ndrpdr.64B-{core}-ethip4-ip4base-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Ethip4Vxlan-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.2N1L-40Ge2P1Xl710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Udir-ndrpdr.imix-{core}-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-udir-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.2N1L-40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Udir-ndrpdr.imix-{core}-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-udir-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.2N1L-40Ge2P1Xl710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Udir-ndrpdr.imix-{core}-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-udir-ndrpdr"
   layout:
-    title: "3n-tsh-x520-64b-{core}-vhost-base-ixgbe-vppl2xc-{test_type}"
+    title: "2n-tx2-xl710-imix-{core}-ipsec-base-scale-sw-cbc-dpdk-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 3n-tsh-x520-64b-{core}-vhost-base-ixgbe-{test_type}"
+  title: "Throughput: 2n-tx2-xl710-1518b-{core}-ipsec-base-scale-sw-gcm-dpdk-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-tsh-x520-64b-{core}-vhost-base-ixgbe-{test_type}"
-  data: "vpp-3n-tsh-curr-iter"
+  output-file: "{DIR[STATIC,VPP]}/2n-tx2-xl710-1518b-{core}-ipsec-base-scale-sw-gcm-dpdk-{test_type}"
+  data: "vpp-2n-tx2-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"
-    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Ethip4Vxlan-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.2N1L-40Ge2P1Xl710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Gcm-Udir-ndrpdr.1518B-{core}-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-udir-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.2N1L-40Ge2P1Xl710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Udir-ndrpdr.1518B-{core}-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-udir-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.2N1L-40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Gcm-Udir-ndrpdr.1518B-{core}-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-udir-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.2N1L-40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-Udir-ndrpdr.1518B-{core}-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-udir-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.2N1L-40Ge2P1Xl710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Gcm-Udir-ndrpdr.1518B-{core}-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-udir-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.2N1L-40Ge2P1Xl710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Udir-ndrpdr.1518B-{core}-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-udir-ndrpdr"
   layout:
-    title: "3n-tsh-x520-64b-{core}-vhost-base-ixgbe-{test_type}"
+    title: "2n-tx2-xl710-1518b-{core}-ipsec-base-scale-sw-gcm-dpdk-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 2n-skx-xxv710-114b-{core}-vts-l2switching-base-dpdk-{test_type}"
+  title: "Throughput: 2n-tx2-xl710-imix-{core}-ipsec-base-scale-sw-gcm-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: "vpp-2n-skx-curr-iter"
-  core: ["2t1c", ]
+  output-file: "{DIR[STATIC,VPP]}/2n-tx2-xl710-imix-{core}-ipsec-base-scale-sw-gcm-dpdk-{test_type}"
+  data: "vpp-2n-tx2-curr-iter"
+  core: ["1t1c", ]
   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"
+    - "Tests.Vpp.Perf.Crypto.2N1L-40Ge2P1Xl710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Gcm-Udir-ndrpdr.imix-{core}-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-udir-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.2N1L-40Ge2P1Xl710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Udir-ndrpdr.imix-{core}-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-udir-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.2N1L-40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Gcm-Udir-ndrpdr.imix-{core}-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-udir-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.2N1L-40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-Udir-ndrpdr.imix-{core}-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-udir-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.2N1L-40Ge2P1Xl710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Gcm-Udir-ndrpdr.imix-{core}-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-udir-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.2N1L-40Ge2P1Xl710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Udir-ndrpdr.imix-{core}-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-udir-ndrpdr"
   layout:
-    title: "2n-skx-xxv710-114b-{core}-vts-l2switching-base-[avf,dpdk]-{test_type}"
+    title: "2n-tx2-xl710-imix-{core}-ipsec-base-scale-sw-gcm-dpdk-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
@@ -7218,7 +9203,6 @@
   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"
@@ -7227,6 +9211,21 @@
     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"
@@ -7250,14 +9249,28 @@
   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"
@@ -7291,6 +9304,23 @@
     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"
@@ -7326,63 +9356,32 @@
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  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: "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"
-    - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
-    - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Ndrpdr.64B-.t.c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
-  layout:
-    title: "2n-skx-xxv710-64b-memif-base-dpdk-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  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: "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"
-    - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-.t.c-avf-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
-    - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Memif-1Lxc-Ndrpdr.64B-.t.c-avf-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr"
-    - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Ndrpdr.64B-.t.c-avf-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
-  layout:
-    title: "3n-skx-xxv710-64b-memif-base-avf-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: 3n-skx-xxv710-64b-memif-base-dpdk-{test_type}-tsa"
+  title: "Speedup: 2n-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: "vpp-3n-skx-curr-iter"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-memif-base-dpdk-{test_type}-tsa"
+  data: "vpp-2n-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"
-    - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-.t.c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
-    - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Memif-1Lxc-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr"
-    - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Ndrpdr.64B-.t.c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
+    - "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"
+    - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Ndrpdr.64B-.t.c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
   layout:
-    title: "3n-skx-xxv710-64b-memif-base-dpdk-{test_type}"
+    title: "2n-skx-xxv710-64b-memif-base-dpdk-{test_type}"
     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"
+  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"
@@ -7391,7 +9390,6 @@
   output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-ip4routing-base-scale-avf-{test_type}-tsa"
   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"
@@ -7403,6 +9401,23 @@
     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"
@@ -7487,26 +9502,6 @@
     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: "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-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"
@@ -7527,26 +9522,6 @@
     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: "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-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"
@@ -7587,62 +9562,6 @@
     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-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: "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"
-    - "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-H4096-P63-S258048-Tput-Ndrpdr.64B-.t.c-avf-ethip4tcp-nat44ed-h4096-p63-s258048-tput-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-H16384-P63-S1032192-Tput-Ndrpdr.64B-.t.c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-tput-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-H65536-P63-S4128768-Tput-Ndrpdr.64B-.t.c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-tput-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-Nat44Ed-H262144-P63-S16515072-Tput-Ndrpdr.64B-.t.c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-tput-ndrpdr"
-  layout:
-    title: "2n-skx-xxv710-64b-nat44ed-ip4routing-tcp-tput-avf-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  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: "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"
-    - "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-H4096-P63-S258048-Tput-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44ed-h4096-p63-s258048-tput-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-H16384-P63-S1032192-Tput-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-tput-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-H65536-P63-S4128768-Tput-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-tput-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-Nat44Ed-H262144-P63-S16515072-Tput-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-tput-ndrpdr"
-  layout:
-    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: "vpp-2n-skx-curr-iter"
-  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"
@@ -7665,116 +9584,80 @@
   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"
-    - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Avf-Dot1Q-Ip4Base-Ndrpdr.64B-.t.c-avf-dot1q-ip4base-ndrpdr"
-#    - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Ethip4-Ip4Base-Ndrpdr.64B-.t.c-ethip4-ip4base-ndrpdr"
-#    - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Ethip4-Ip4Scale2M-Ndrpdr.64B-.t.c-ethip4-ip4scale2m-ndrpdr"
   layout:
-    title: "3n-skx-x710-64b-ip4routing-base-scale-avf-{test_type}"
+    title: "3n-skx-x710-64b-ip4routing-base-avf-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 3n-skx-xxv710-64b-ip4routing-base-scale-avf-{test_type}-tsa"
+  title: "Speedup: 3n-skx-xxv710-64b-ip4routing-base-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-ip4routing-base-scale-avf-{test_type}-tsa"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-ip4routing-base-{test_type}-tsa"
   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"
-    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale20K-Ndrpdr.64B-.t.c-avf-ethip4-ip4scale20k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale200K-Ndrpdr.64B-.t.c-avf-ethip4-ip4scale200k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-.t.c-avf-ethip4-ip4scale2m-ndrpdr"
-  layout:
-    title: "3n-skx-xxv710-64b-ip4routing-base-scale-avf-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  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: "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"
-    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Scale20K-Ndrpdr.64B-.t.c-ethip4-ip4scale20k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Scale200K-Ndrpdr.64B-.t.c-ethip4-ip4scale200k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Scale2M-Ndrpdr.64B-.t.c-ethip4-ip4scale2m-ndrpdr"
   layout:
-    title: "3n-skx-xxv710-64b-ip4routing-base-scale-dpdk-{test_type}"
+    title: "3n-skx-xxv710-64b-ip4routing-base-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
-- type: "plot"
-  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: "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"
-    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-  layout:
-    title: "3n-skx-xxv710-64b-features-ip4routing-base-avf-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
+# - type: "plot"
+#   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: "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"
+#     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
+#     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
+#   layout:
+#     title: "3n-skx-xxv710-64b-features-ip4routing-base-avf-{test_type}"
+#     layout: "plot-throughput-speedup-analysis"
 
-- type: "plot"
-  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: "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"
-    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-  layout:
-    title: "3n-skx-xxv710-64b-features-ip4routing-base-dpdk-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
+# - type: "plot"
+#   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: "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"
+#     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
+#     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
+#     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
+#   layout:
+#     title: "3n-skx-xxv710-64b-features-ip4routing-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"
+  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: "vpp-3n-skx-curr-iter"
-  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"
+  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"
@@ -7801,7 +9684,6 @@
   output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-78b-ip6routing-base-scale-avf-{test_type}-tsa"
   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"
@@ -7813,6 +9695,19 @@
     title: "2n-skx-xxv710-78b-ip6routing-base-scale-avf-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
+- type: "plot"
+  title: "Speedup: 2n-skx-xxv710-78b-ip6routing-base-scale-af_xdp-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  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.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"
+  layout:
+    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"
@@ -7827,33 +9722,15 @@
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 3n-skx-xxv710-78b-ip6routing-base-scale-dpdk-{test_type}-tsa"
+  title: "Speedup: 3n-skx-xxv710-78b-ip6routing-base-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-78b-ip6routing-base-scale-dpdk-{test_type}-tsa"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-78b-ip6routing-base-{test_type}-tsa"
   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"
-    - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Ethip6-Ip6Scale20K-Ndrpdr.78B-.t.c-ethip6-ip6scale20k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Ethip6-Ip6Scale200K-Ndrpdr.78B-.t.c-ethip6-ip6scale200k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Ethip6-Ip6Scale2M-Ndrpdr.78B-.t.c-ethip6-ip6scale2m-ndrpdr"
-  layout:
-    title: "3n-skx-xxv710-78b-ip6routing-base-scale-dpdk-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  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: "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"
-    - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale20K-Ndrpdr.78B-.t.c-avf-ethip6-ip6scale20k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale200K-Ndrpdr.78B-.t.c-avf-ethip6-ip6scale200k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale2M-Ndrpdr.78B-.t.c-avf-ethip6-ip6scale2m-ndrpdr"
   layout:
-    title: "3n-skx-xxv710-78b-ip6routing-base-scale-avf-{test_type}"
+    title: "3n-skx-xxv710-78b-ip6routing-base-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
@@ -7864,6 +9741,8 @@
   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"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-.t.c-avf-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-.t.c-avf-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
     - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-.t.c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
     - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-.t.c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
     - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-.t.c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
@@ -7872,6 +9751,24 @@
     title: "3n-skx-xxv710-imix-ipsec-ip4routing-base-scale-avf-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
+- type: "plot"
+  title: "Speedup: 3n-skx-xxv710-1518b-ipsec-ip4routing-base-scale-avf-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-1518b-ipsec-ip4routing-base-scale-avf-{test_type}-tsa"
+  data: "vpp-3n-skx-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518b-.t.c-avf-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.1518b-.t.c-avf-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518b-.t.c-avf-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.1518b-.t.c-avf-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518b-.t.c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.1518b-.t.c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518b-.t.c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.1518b-.t.c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+  layout:
+    title: "3n-skx-xxv710-1518b-ipsec-ip4routing-base-scale-avf-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
 - type: "plot"
   title: "Speedup: 3n-skx-xxv710-imix-ipsec-ip4routing-base-scale-dpdk-{test_type}-tsa"
   algorithm: "plot_tsa_name"
@@ -7880,6 +9777,7 @@
   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"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-.t.c-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr"
     - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-.t.c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
     - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-.t.c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
     - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-.t.c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
@@ -7895,11 +9793,10 @@
   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}"
     layout: "plot-throughput-speedup-analysis"
@@ -7968,19 +9865,17 @@
   output-file: "{DIR[STATIC,VPP]}/3n-skx-x710-64b-l2switching-base-scale-avf-{test_type}-tsa"
   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"
     - "Tests.Vpp.Perf.L2.10Ge2P1X710-Avf-Eth-L2Xcbase-Ndrpdr.64B-.t.c-avf-eth-l2xcbase-ndrpdr"
     - "Tests.Vpp.Perf.L2.10Ge2P1X710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-avf-eth-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.10Ge2P1X710-Avf-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-.t.c-avf-eth-l2bdscale1mmaclrn-ndrpdr"
   layout:
     title: "3n-skx-x710-64b-l2switching-base-scale-avf-{test_type}"
     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"
+  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"
@@ -7988,71 +9883,27 @@
     - "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: "vpp-3n-skx-curr-iter"
-  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}"
-    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: "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"
-    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-avf-eth-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-.t.c-avf-eth-l2bdscale10kmaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-.t.c-avf-eth-l2bdscale100kmaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-.t.c-avf-eth-l2bdscale1mmaclrn-ndrpdr"
-  layout:
-    title: "3n-skx-xxv710-64b-l2switching-base-scale-avf-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  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: "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"
     - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-.t.c-eth-l2bdscale10kmaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-.t.c-eth-l2bdscale100kmaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-.t.c-eth-l2bdscale1mmaclrn-ndrpdr"
   layout:
-    title: "3n-skx-xxv710-64b-l2switching-base-scale-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-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: "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"
-    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-avf-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Oacl50Sf-10Kflows-Ndrpdr.64B-.t.c-avf-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Oacl50Sl-10Kflows-Ndrpdr.64B-.t.c-avf-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Macip-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-avf-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr"
-  layout:
-    title: "3n-skx-xxv710-64b-features-l2switching-base-avf-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
+# - type: "plot"
+#   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: "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"
+#     - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-avf-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr"
+#     - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Oacl50Sf-10Kflows-Ndrpdr.64B-.t.c-avf-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr"
+#     - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Oacl50Sl-10Kflows-Ndrpdr.64B-.t.c-avf-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr"
+#     - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Macip-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-avf-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr"
+#   layout:
+#     title: "3n-skx-xxv710-64b-features-l2switching-base-avf-{test_type}"
+#     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
   title: "Speedup: 3n-skx-xxv710-78b-srv6-ip6routing-base-avf-{test_type}-tsa"
@@ -8071,215 +9922,37 @@
     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"
+  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: "vpp-2n-skx-curr-iter"
-  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: "vpp-2n-skx-curr-iter"
-  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"
+  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-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: "vpp-3n-skx-curr-iter"
-  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: "vpp-3n-skx-curr-iter"
-  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}"
-    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: "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"
-    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-avf-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-avf-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-avf-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-  layout:
-    title: "3n-skx-xxv710-64b-vhost-base-avf-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  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: "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"
-    - "Tests.Vpp.Perf.Vm Vhost.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.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.25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Vppip4-Ndrpdr.64B-.t.c-avf-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-.t.c-avf-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-  layout:
-    title: "3n-skx-xxv710-64b-vhost-base-avf-vpp-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  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: "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"
-    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-  layout:
-    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: "vpp-3n-skx-curr-iter"
-  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: "vpp-3n-skx-curr-iter"
-  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: "vpp-3n-skx-curr-iter"
-  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: "vpp-2n-skx-curr-iter"
-  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: "vpp-3n-tsh-curr-iter"
-  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}"
+    title: "2n-skx-xxv710-64b-vhost-base-[avf,dpdk]-vpp-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 3n-tsh-x520-64b-ip4routing-base-scale-ixgbe-{test_type}-tsa"
+  title: "Speedup: 3n-tsh-x520-64b-ip4routing-base-ixgbe-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-tsh-x520-64b-ip4routing-base-scale-ixgbe-{test_type}-tsa"
+  output-file: "{DIR[STATIC,VPP]}/3n-tsh-x520-64b-ip4routing-base-ixgbe-{test_type}-tsa"
   data: "vpp-3n-tsh-curr-iter"
   include:
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Dot1Q-Ip4Base-Ndrpdr.64B-.t.c-dot1q-ip4base-ndrpdr"
@@ -8288,7 +9961,7 @@
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4-Ip4Scale200K-Ndrpdr.64B-.t.c-ethip4-ip4scale200k-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4-Ip4Scale2M-Ndrpdr.64B-.t.c-ethip4-ip4scale2m-ndrpdr"
   layout:
-    title: "3n-tsh-x520-64b-ip4routing-base-scale-ixgbe-{test_type}"
+    title: "3n-tsh-x520-64b-ip4routing-base-ixgbe-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
@@ -8306,32 +9979,26 @@
     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"
+  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"
+  title: "Speedup: 3n-tsh-x520-78b-ip6routing-base-ixgbe-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-tsh-x520-78b-ip6routing-base-scale-ixgbe-{test_type}-tsa"
+  output-file: "{DIR[STATIC,VPP]}/3n-tsh-x520-78b-ip6routing-base-ixgbe-{test_type}-tsa"
   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"
-    - "Tests.Vpp.Perf.Ip6.10Ge2P1X520-Ethip6-Ip6Scale20K-Ndrpdr.78B-.t.c-ethip6-ip6scale20k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.10Ge2P1X520-Ethip6-Ip6Scale200K-Ndrpdr.78B-.t.c-ethip6-ip6scale200k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.10Ge2P1X520-Ethip6-Ip6Scale2M-Ndrpdr.78B-.t.c-ethip6-ip6scale2m-ndrpdr"
   layout:
-    title: "3n-tsh-x520-78b-ip6routing-base-scale-ixgbe-{test_type}"
+    title: "3n-tsh-x520-78b-ip6routing-base-ixgbe-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
@@ -8355,29 +10022,14 @@
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/3n-tsh-x520-64b-l2switching-base-ixgbe-{test_type}-tsa"
   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"
-    - "Tests.Vpp.Perf.L2.10Ge2P1X520-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-dot1q-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-ndrpdr"
-  layout:
-    title: "3n-tsh-x520-64b-l2switching-base-ixgbe-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  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: "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-Dot1Q-L2Xcbase-Ndrpdr.64B-.t.c-dot1q-l2xcbase-ndrpdr"
     - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Xcbase-Ndrpdr.64B-.t.c-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.10Ge2P1X520-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-dot1q-l2bdbasemaclrn-ndrpdr"
     - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-.t.c-eth-l2bdscale10kmaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-.t.c-eth-l2bdscale100kmaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-.t.c-eth-l2bdscale1mmaclrn-ndrpdr"
   layout:
-    title: "3n-tsh-x520-64b-l2switching-base-scale-ixgbe-{test_type}"
+    title: "3n-tsh-x520-64b-l2switching-base-ixgbe-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
@@ -8464,48 +10116,32 @@
 - 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"
+  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: "vpp-2n-dnv-curr-iter"
-  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"
+  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"
@@ -8532,12 +10168,24 @@
     - "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"
@@ -8555,32 +10203,15 @@
     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: "vpp-3n-dnv-curr-iter"
-  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"
+  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"
@@ -8674,13 +10305,102 @@
 #    title: "3n-dnv-x553-78b-srv6-ip6routing-base-ixgbe-{test_type}"
 #    layout: "plot-throughput-speedup-analysis"
 
+- type: "plot"
+  title: "Speedup: 2n-tx2-xl710-64b-ipsec-base-scale-sw-policy-dpdk-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-tx2-xl710-64b-ipsec-base-scale-sw-policy-dpdk-{test_type}-tsa"
+  data: "vpp-2n-tx2-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.Crypto.2N1L-40Ge2P1Xl710-Ethip4Ipsec1Tnlsw-Ip4Base-Policy-Aes256Gcm-Udir-ndrpdr.64B-.t.c-ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-udir-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.2N1L-40Ge2P1Xl710-Ethip4Ipsec1Tnlsw-Ip4Base-Policy-Aes128Cbc-Hmac512Sha-Udir-ndrpdr.64B-.t.c-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac512sha-udir-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.2N1L-40Ge2P1Xl710-Ethip4Ipsec40Tnlsw-Ip4Base-Policy-Aes256Gcm-Udir-ndrpdr.64B-.t.c-ethip4ipsec40tnlsw-ip4base-policy-aes256gcm-udir-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.2N1L-40Ge2P1Xl710-Ethip4Ipsec40Tnlsw-Ip4Base-Policy-Aes128Cbc-Hmac512Sha-Udir-ndrpdr.64B-.t.c-ethip4ipsec40tnlsw-ip4base-policy-aes128cbc-hmac512sha-udir-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.2N1L-40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-Ip4Base-Policy-Aes256Gcm-Udir-ndrpdr.64B-.t.c-ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-udir-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.2N1L-40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-Ip4Base-Policy-Aes128Cbc-Hmac512Sha-Udir-ndrpdr.64B-.t.c-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac512sha-udir-ndrpdr"
+  layout:
+    title: "2n-tx2-xl710-64b-ipsec-base-scale-sw-policy-dpdk-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 2n-tx2-xl710-64b-ipsec-spe-base-scale-dpdk-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-tx2-xl710-64b-ipsec-spe-base-scale-dpdk-{test_type}-tsa"
+  data: "vpp-2n-tx2-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.Crypto.2N1L-40Ge2P1Xl710-Ethip4Ipsec1Spe-Ip4Base-Policy-Outbound-Nocrypto-ndrpdr.64B-.t.c-ethip4ipsec1spe-ip4base-policy-outbound-nocrypto-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.2N1L-40Ge2P1Xl710-Ethip4Ipsec1Spe-Cache-Ip4Base-Policy-Outbound-Nocrypto-ndrpdr.64B-.t.c-ethip4ipsec1spe-cache-ip4base-policy-outbound-nocrypto-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.2N1L-40Ge2P1Xl710-Ethip4Ipsec100Spe-Ip4Base-Policy-Outbound-Nocrypto-ndrpdr.64B-.t.c-ethip4ipsec100spe-ip4base-policy-outbound-nocrypto-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.2N1L-40Ge2P1Xl710-Ethip4Ipsec100Spe-Cache-Ip4Base-Policy-Outbound-Nocrypto-ndrpdr.64B-.t.c-ethip4ipsec100spe-cache-ip4base-policy-outbound-nocrypto-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.2N1L-40Ge2P1Xl710-Ethip4Ipsec1000Spe-Ip4Base-Policy-Outbound-Nocrypto-ndrpdr.64B-.t.c-ethip4ipsec1000spe-ip4base-policy-outbound-nocrypto-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.2N1L-40Ge2P1Xl710-Ethip4Ipsec1000Spe-Cache-Ip4Base-Policy-Outbound-Nocrypto-ndrpdr.64B-.t.c-ethip4ipsec1000spe-cache-ip4base-policy-outbound-nocrypto-ndrpdr"
+  layout:
+    title: "2n-tx2-xl710-64b-ipsec-spe-base-scale-dpdk-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 2n-tx2-xl710-1518b-ipsec-base-scale-sw-cbc-dpdk-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-tx2-xl710-1518b-ipsec-base-scale-sw-cbc-dpdk-{test_type}-tsa"
+  data: "vpp-2n-tx2-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.Crypto.2N1L-40Ge2P1Xl710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Udir-ndrpdr.1518B-.t.c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-udir-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.2N1L-40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Udir-ndrpdr.1518B-.t.c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-udir-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.2N1L-40Ge2P1Xl710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Udir-ndrpdr.1518B-.t.c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-udir-ndrpdr"
+  layout:
+    title: "2n-tx2-xl710-1518b-ipsec-base-scale-sw-cbc-dpdk-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 2n-tx2-xl710-imix-ipsec-base-scale-sw-cbc-dpdk-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-tx2-xl710-imix-ipsec-base-scale-sw-cbc-dpdk-{test_type}-tsa"
+  data: "vpp-2n-tx2-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.Crypto.2N1L-40Ge2P1Xl710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Udir-ndrpdr.imix-.t.c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-udir-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.2N1L-40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Udir-ndrpdr.imix-.t.c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-udir-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.2N1L-40Ge2P1Xl710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Udir-ndrpdr.imix-.t.c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-udir-ndrpdr"
+  layout:
+    title: "2n-tx2-xl710-imix-ipsec-base-scale-sw-cbc-dpdk-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 2n-tx2-xl710-1518b-ipsec-base-scale-sw-gcm-dpdk-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-tx2-xl710-1518b-ipsec-base-scale-sw-gcm-dpdk-{test_type}-tsa"
+  data: "vpp-2n-tx2-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.Crypto.2N1L-40Ge2P1Xl710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Gcm-Udir-ndrpdr.1518B-.t.c-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-udir-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.2N1L-40Ge2P1Xl710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Udir-ndrpdr.1518B-.t.c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-udir-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.2N1L-40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Gcm-Udir-ndrpdr.1518B-.t.c-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-udir-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.2N1L-40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-Udir-ndrpdr.1518B-.t.c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-udir-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.2N1L-40Ge2P1Xl710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Gcm-Udir-ndrpdr.1518B-.t.c-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-udir-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.2N1L-40Ge2P1Xl710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Udir-ndrpdr.1518B-.t.c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-udir-ndrpdr"
+  layout:
+    title: "2n-tx2-xl710-1518b-ipsec-base-scale-sw-gcm-dpdk-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 2n-tx2-xl710-imix-ipsec-base-scale-sw-gcm-dpdk-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-tx2-xl710-imix-ipsec-base-scale-sw-gcm-dpdk-{test_type}-tsa"
+  data: "vpp-2n-tx2-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.Crypto.2N1L-40Ge2P1Xl710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Gcm-Udir-ndrpdr.imix-.t.c-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-udir-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.2N1L-40Ge2P1Xl710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Udir-ndrpdr.imix-.t.c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-udir-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.2N1L-40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Gcm-Udir-ndrpdr.imix-.t.c-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-udir-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.2N1L-40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-Udir-ndrpdr.imix-.t.c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-udir-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.2N1L-40Ge2P1Xl710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Gcm-Udir-ndrpdr.imix-.t.c-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-udir-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.2N1L-40Ge2P1Xl710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Udir-ndrpdr.imix-.t.c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-udir-ndrpdr"
+  layout:
+    title: "2n-tx2-xl710-imix-ipsec-base-scale-sw-gcm-dpdk-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
 - type: "plot"
   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: "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"
@@ -8689,6 +10409,20 @@
     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"
@@ -8710,7 +10444,6 @@
   output-file: "{DIR[STATIC,VPP]}/2n-tx2-xl710-78b-ip6routing-base-scale-dpdk-{test_type}-tsa"
   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"
@@ -8720,6 +10453,20 @@
     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"
@@ -8749,6 +10496,22 @@
     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"
@@ -8796,6 +10559,30 @@
     title: "2n-skx-x710-64b-{core}-base-{test_type}"
     layout: "plot-throughput"
 
+- type: "plot"
+  title: "Speedup: 2n-skx-xxv710-64b-base-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,DPDK]}/2n-skx-xxv710-64b-base-{test_type}-tsa"
+  data: "dpdk-2n-skx-curr-iter"
+  include:
+    - "tests.dpdk.perf.2n1l-25ge2p1xxv710-eth-l2xcbase-testpmd-ndrpdr.64b-.t.c-eth-l2xcbase-testpmd-ndrpdr"
+    - "tests.dpdk.perf.2n1l-25ge2p1xxv710-ethip4-ip4base-l3fwd-ndrpdr.64b-.t.c-ethip4-ip4base-l3fwd-ndrpdr"
+  layout:
+    title: "2n-skx-xxv710-64b-base-{test_type}-tsa"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 2n-skx-x710-64b-base-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,DPDK]}/2n-skx-x710-64b-base-{test_type}-tsa"
+  data: "dpdk-2n-skx-curr-iter"
+  include:
+    - "tests.dpdk.perf.2n1l-10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.64b-.t.c-eth-l2xcbase-testpmd-ndrpdr"
+    - "tests.dpdk.perf.2n1l-10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.64b-.t.c-ethip4-ip4base-l3fwd-ndrpdr"
+  layout:
+    title: "2n-skx-x710-64b-base-{test_type}-tsa"
+    layout: "plot-throughput-speedup-analysis"
+
 # 3n-skx
 
 - type: "plot"
@@ -8824,6 +10611,30 @@
     title: "3n-skx-x710-64b-{core}-base-{test_type}"
     layout: "plot-throughput"
 
+- type: "plot"
+  title: "Speedup: 3n-skx-xxv710-64b-base-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,DPDK]}/3n-skx-xxv710-64b-base-{test_type}-tsa"
+  data: "dpdk-3n-skx-curr-iter"
+  include:
+    - "tests.dpdk.perf.25ge2p1xxv710-eth-l2xcbase-testpmd-ndrpdr.64b-.t.c-eth-l2xcbase-testpmd-ndrpdr"
+    - "tests.dpdk.perf.25ge2p1xxv710-ethip4-ip4base-l3fwd-ndrpdr.64b-.t.c-ethip4-ip4base-l3fwd-ndrpdr"
+  layout:
+    title: "3n-skx-xxv710-64b-base-{test_type}-tsa"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 3n-skx-x710-64b-base-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,DPDK]}/3n-skx-x710-64b-base-{test_type}-tsa"
+  data: "dpdk-3n-skx-curr-iter"
+  include:
+    - "tests.dpdk.perf.10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.64b-.t.c-eth-l2xcbase-testpmd-ndrpdr"
+    - "tests.dpdk.perf.10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.64b-.t.c-ethip4-ip4base-l3fwd-ndrpdr"
+  layout:
+    title: "3n-skx-x710-64b-base-{test_type}-tsa"
+    layout: "plot-throughput-speedup-analysis"
+
 ## 2n-dnv-x553
 #
 #- type: "plot"
@@ -8871,20 +10682,44 @@
     title: "3n-tsh-x520-64b-{core}-base-{test_type}"
     layout: "plot-throughput"
 
+- type: "plot"
+  title: "Speedup: 3n-tsh-x520-64b-base-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,DPDK]}/3n-tsh-x520-64b-base-{test_type}-tsa"
+  data: "dpdk-3n-tsh-curr-iter"
+  include:
+    - "tests.dpdk.perf.10ge2p1x520-eth-l2xcbase-testpmd-ndrpdr.64b-.t.c-eth-l2xcbase-testpmd-ndrpdr"
+    - "tests.dpdk.perf.10ge2p1x520-ethip4-ip4base-l3fwd-ndrpdr.64b-.t.c-ethip4-ip4base-l3fwd-ndrpdr"
+  layout:
+    title: "3n-tsh-x520-64b-base-{test_type}-tsa"
+    layout: "plot-throughput-speedup-analysis"
+
 # 2n-tx2-xl710
 
-# - type: "plot"
-#   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: "dpdk-2n-tx2-curr-iter"
-#   core: ["1t1c", "2t2c"]
-#   include:
-#     - "tests.dpdk.perf.2N1L-40ge2p1xl710-eth-l2xcbase-testpmd-ndrpdr.64b-{core}-eth-l2xcbase-testpmd-ndrpdr"
-#     - "tests.dpdk.perf.2N1L-40ge2p1xl710-ethip4-ip4base-l3fwd-ndrpdr.64b-{core}-ethip4-ip4base-l3fwd-ndrpdr"
-#   layout:
-#     title: "2n-tx2-xl710-64b-{core}-base-{test_type}"
-#     layout: "plot-throughput"
+- type: "plot"
+  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: "dpdk-2n-tx2-curr-iter"
+  core: ["1t1c", "2t2c"]
+  include:
+    - "tests.dpdk.perf.2N1L-40ge2p1xl710-eth-l2xcbase-testpmd-ndrpdr.64b-{core}-eth-l2xcbase-testpmd-ndrpdr"
+    - "tests.dpdk.perf.2N1L-40ge2p1xl710-ethip4-ip4base-l3fwd-ndrpdr.64b-{core}-ethip4-ip4base-l3fwd-ndrpdr"
+  layout:
+    title: "2n-tx2-xl710-64b-{core}-base-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Speedup: 2n-tx2-xl710-64b-base-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,DPDK]}/2n-tx2-xl710-64b-base-{test_type}-tsa"
+  data: "dpdk-2n-tx2-curr-iter"
+  include:
+    - "tests.dpdk.perf.2N1L-40ge2p1xl710-eth-l2xcbase-testpmd-ndrpdr.64b-.t.c-eth-l2xcbase-testpmd-ndrpdr"
+    - "tests.dpdk.perf.2N1L-40ge2p1xl710-ethip4-ip4base-l3fwd-ndrpdr.64b-.t.c-ethip4-ip4base-l3fwd-ndrpdr"
+  layout:
+    title: "2n-tx2-xl710-64b-base-{test_type}-tsa"
+    layout: "plot-throughput-speedup-analysis"
 
 ################################################################################
 ###   2n-clx                                                                 ###
@@ -8938,20 +10773,19 @@
     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}"
+  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"
@@ -8972,6 +10806,24 @@
     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"
@@ -9061,27 +10913,6 @@
     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: "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"
-    - "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"
@@ -9103,27 +10934,6 @@
     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: "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"
-    - "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"
@@ -9166,65 +10976,6 @@
     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}-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: "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"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H1024-P63-S64512-Tput-Ndrpdr.64B-{core}-avf-ethip4tcp-nat44ed-h1024-p63-s64512-tput-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-H4096-P63-S258048-Tput-Ndrpdr.64B-{core}-avf-ethip4tcp-nat44ed-h4096-p63-s258048-tput-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-H16384-P63-S1032192-Tput-Ndrpdr.64B-{core}-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-tput-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-H65536-P63-S4128768-Tput-Ndrpdr.64B-{core}-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-tput-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"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H262144-P63-S16515072-Tput-Ndrpdr.64B-{core}-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-tput-ndrpdr"
-  layout:
-    title: "2n-clx-xxv710-64b-{core}-nat44ed-ip4routing-tcp-tput-avf-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  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: "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"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H1024-P63-S64512-Tput-Ndrpdr.64B-{core}-avf-ethip4udp-nat44ed-h1024-p63-s64512-tput-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-H4096-P63-S258048-Tput-Ndrpdr.64B-{core}-avf-ethip4udp-nat44ed-h4096-p63-s258048-tput-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-H16384-P63-S1032192-Tput-Ndrpdr.64B-{core}-avf-ethip4udp-nat44ed-h16384-p63-s1032192-tput-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-H65536-P63-S4128768-Tput-Ndrpdr.64B-{core}-avf-ethip4udp-nat44ed-h65536-p63-s4128768-tput-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"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H262144-P63-S16515072-Tput-Ndrpdr.64B-{core}-avf-ethip4udp-nat44ed-h262144-p63-s16515072-tput-ndrpdr"
-  layout:
-    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: "vpp-2n-clx-curr-iter"
-  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"
@@ -9278,21 +11029,20 @@
     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}"
+  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"
@@ -9302,7 +11052,6 @@
   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"
@@ -9314,6 +11063,24 @@
     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"
@@ -9353,35 +11120,15 @@
     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-avf-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-x710-64b-{core}-l2switching-base-scale-avf-{test_type}"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-x710-64b-{core}-l2switching-base-avf-{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"
-  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: "vpp-2n-clx-curr-iter"
-  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-avf-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
@@ -9465,80 +11212,46 @@
 - type: "plot"
   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: "vpp-2n-clx-curr-iter"
-  core: ["2t1c", ]
-  include:
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdbasemaclrn-Ndrpdr.64B-{core}-rdma-eth-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-{core}-rdma-eth-l2bdscale10kmaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-{core}-rdma-eth-l2bdscale100kmaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-{core}-rdma-eth-l2bdscale1mmaclrn-ndrpdr"
-  layout:
-    title: "2n-clx-cx556a-64b-{core}-rdma-l2switching-scale-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Throughput: 2n-clx-xxv710-64b-{core}-vhost-base-avf-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-{core}-vhost-base-avf-{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}"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-cx556a-64b-{core}-rdma-l2switching-scale-{test_type}"
   data: "vpp-2n-clx-curr-iter"
   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"
+    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdbasemaclrn-Ndrpdr.64B-{core}-rdma-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-{core}-rdma-eth-l2bdscale10kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-{core}-rdma-eth-l2bdscale100kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-{core}-rdma-eth-l2bdscale1mmaclrn-ndrpdr"
   layout:
-    title: "2n-clx-xxv710-64b-{core}-vhost-base-avf-vpp-{test_type}"
+    title: "2n-clx-cx556a-64b-{core}-rdma-l2switching-scale-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 2n-clx-xxv710-64b-{core}-vhost-base-dpdk-{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-dpdk-{test_type}"
+  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-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-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-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}"
+  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"
@@ -9548,44 +11261,12 @@
   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: "vpp-2n-clx-curr-iter"
-  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: "vpp-2n-clx-curr-iter"
-  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"
 
 ################################################################################
@@ -9635,19 +11316,18 @@
     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"
+  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"
@@ -9667,6 +11347,23 @@
     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"
@@ -9751,26 +11448,6 @@
     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: "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-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"
@@ -9791,26 +11468,6 @@
     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: "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-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"
@@ -9851,62 +11508,6 @@
     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-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: "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"
-    - "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-H4096-P63-S258048-Tput-Ndrpdr.64B-.t.c-avf-ethip4tcp-nat44ed-h4096-p63-s258048-tput-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-H16384-P63-S1032192-Tput-Ndrpdr.64B-.t.c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-tput-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-H65536-P63-S4128768-Tput-Ndrpdr.64B-.t.c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-tput-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-Nat44Ed-H262144-P63-S16515072-Tput-Ndrpdr.64B-.t.c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-tput-ndrpdr"
-  layout:
-    title: "2n-clx-xxv710-64b-nat44ed-ip4routing-tcp-tput-avf-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  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: "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"
-    - "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-H4096-P63-S258048-Tput-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44ed-h4096-p63-s258048-tput-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-H16384-P63-S1032192-Tput-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-tput-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-H65536-P63-S4128768-Tput-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-tput-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-Nat44Ed-H262144-P63-S16515072-Tput-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-tput-ndrpdr"
-  layout:
-    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: "vpp-2n-clx-curr-iter"
-  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"
@@ -9957,20 +11558,19 @@
     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"
+  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"
@@ -9979,7 +11579,6 @@
   output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-78b-ip6routing-base-scale-avf-{test_type}-tsa"
   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"
@@ -9991,6 +11590,23 @@
     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"
@@ -10028,33 +11644,14 @@
     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-avf-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-x710-64b-l2switching-base-scale-avf-{test_type}-tsa"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-x710-64b-l2switching-base-avf-{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"
-  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: "vpp-2n-clx-curr-iter"
-  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-avf-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
@@ -10145,63 +11742,31 @@
     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"
+  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: "vpp-2n-clx-curr-iter"
-  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: "vpp-2n-clx-curr-iter"
-  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"
+  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"
@@ -10210,505 +11775,630 @@
   output-file: "{DIR[STATIC,VPP]}/2n-clx-cx556a-64b-rdma-l2-vhost-base-{test_type}-tsa"
   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: "vpp-2n-clx-curr-iter"
-  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: "vpp-2n-clx-curr-iter"
-  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
 
 - type: "plot"
-  title: "Throughput: 2n-icx-e810cq-64b-{core}-ip4routing-base-scale-avf-{test_type}"
+  title: "Throughput: 2n-icx-xxv710-64b-{core}-memif-base-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-{core}-ip4routing-base-scale-avf-{test_type}"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-{core}-memif-base-{test_type}"
   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"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4-Ip4Scale20K-Ndrpdr.64B-{core}-avf-ethip4-ip4scale20k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4-Ip4Scale200K-Ndrpdr.64B-{core}-avf-ethip4-ip4scale200k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-{core}-avf-ethip4-ip4scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Memif-1Dcr-ndrpdr.64B-{core}-avf-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Eth-2Memif-1Dcr-ndrpdr.64B-{core}-avf-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Memif-1Dcr-ndrpdr.64B-{core}-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-ndrpdr.64B-{core}-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Memif-1Dcr-ndrpdr.64B-{core}-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
   layout:
-    title: "2n-icx-e810cq-64b-{core}-ip4routing-base-scale-avf-{test_type}"
+    title: "2n-icx-xxv710-64b-{core}-memif-base-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 2n-icx-e810cq-64b-{core}-ip4routing-base-scale-dpdk-{test_type}"
+  title: "Throughput: 2n-icx-xxv710-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-dpdk-{test_type}"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-{core}-ip4routing-base-scale-avf-{test_type}"
   data: "vpp-2n-icx-curr-iter"
   core: ["2t1c", ]
   include:
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Ethip4-Ip4Base-Ndrpdr.64B-{core}-ethip4-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Ethip4-Ip4Scale20K-Ndrpdr.64B-{core}-ethip4-ip4scale20k-ndrpdr"
-    - "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"
+    - "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"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale200K-ndrpdr.64B-{core}-avf-ethip4-ip4scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale200K-Rnd-ndrpdr.64B-{core}-avf-ethip4-ip4scale200k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale2M-ndrpdr.64B-{core}-avf-ethip4-ip4scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale2M-Rnd-ndrpdr.64B-{core}-avf-ethip4-ip4scale2m-rnd-ndrpdr"
   layout:
-    title: "2n-icx-e810cq-64b-{core}-ip4routing-base-scale-dpdk-{test_type}"
+    title: "2n-icx-xxv710-64b-{core}-ip4routing-base-scale-avf-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 2n-icx-e810cq-78b-{core}-ip6routing-base-scale-avf-{test_type}"
+  title: "Throughput: 2n-icx-xxv710-64b-{core}-ip4routing-base-scale-dpdk-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-78b-{core}-ip6routing-base-scale-avf-{test_type}"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-{core}-ip4routing-base-scale-dpdk-{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"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-ndrpdr.64B-{core}-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale20K-ndrpdr.64B-{core}-ethip4-ip4scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale20K-Rnd-ndrpdr.64B-{core}-ethip4-ip4scale20k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale200K-ndrpdr.64B-{core}-ethip4-ip4scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale200K-Rnd-ndrpdr.64B-{core}-ethip4-ip4scale200k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale2M-ndrpdr.64B-{core}-ethip4-ip4scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale2M-Rnd-ndrpdr.64B-{core}-ethip4-ip4scale2m-rnd-ndrpdr"
   layout:
-    title: "2n-icx-e810cq-78b-{core}-ip6routing-base-scale-avf-{test_type}"
+    title: "2n-icx-xxv710-64b-{core}-ip4routing-base-scale-dpdk-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 2n-icx-e810cq-78b-{core}-ip6routing-base-scale-dpdk-{test_type}"
+  title: "Throughput: 2n-icx-xxv710-64b-{core}-ip4routing-base-scale-af_xdp-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-78b-{core}-ip6routing-base-scale-dpdk-{test_type}"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-{core}-ip4routing-base-scale-af_xdp-{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"
+    - "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"
   layout:
-    title: "2n-icx-e810cq-78b-{core}-ip6routing-base-scale-dpdk-{test_type}"
+    title: "2n-icx-xxv710-64b-{core}-ip4routing-base-scale-af_xdp-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 2n-icx-e810cq-64b-{core}-l2switching-base-scale-avf-{test_type}"
+  title: "Throughput: 2n-icx-xxv710-64b-{core}-features-ip4routing-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}"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-{core}-features-ip4routing-base-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"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-ndrpdr.64B-{core}-avf-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-ndrpdr.64B-{core}-avf-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-ndrpdr.64B-{core}-avf-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-ndrpdr.64B-{core}-avf-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
   layout:
-    title: "2n-icx-e810cq-64b-{core}-l2switching-base-scale-avf-{test_type}"
+    title: "2n-icx-xxv710-64b-{core}-features-ip4routing-base-avf-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 2n-icx-e810cq-64b-{core}-l2switching-base-scale-dpdk-{test_type}"
+  title: "Throughput: 2n-icx-xxv710-64b-{core}-nat44det-ip4routing-stl-bidir-avf-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-{core}-l2switching-base-scale-dpdk-{test_type}"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-{core}-nat44det-ip4routing-stl-bidir-avf-{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"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Det-H1024-P63-S64512-ndrpdr.64B-{core}-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Det-H16384-P63-S1032192-ndrpdr.64B-{core}-avf-ethip4udp-nat44det-h16384-p63-s1032192-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Det-H65536-P63-S4128758-ndrpdr.64B-{core}-avf-ethip4udp-nat44det-h65536-p63-s4128758-ndrpdr"
   layout:
-    title: "2n-icx-e810cq-64b-{core}-l2switching-base-scale-dpdk-{test_type}"
+    title: "2n-icx-xxv710-64b-{core}-nat44det-ip4routing-stl-bidir-avf-{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"
+  title: "Throughput: 2n-icx-xxv710-64b-{core}-nat44ed-ip4routing-stl-unidir-avf-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-{core}-nat44ed-ip4routing-stl-unidir-avf-{test_type}"
   data: "vpp-2n-icx-curr-iter"
+  core: ["2t1c", ]
   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.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H1024-P63-S64512-Udir-ndrpdr.64B-{core}-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-ndrpdr"
   layout:
-    title: "2n-icx-e810cq-64b-ip4routing-base-scale-avf-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
+    title: "2n-icx-xxv710-64b-{core}-nat44ed-ip4routing-stl-unidir-avf-{test_type}"
+    layout: "plot-throughput"
 
 - 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"
+  title: "Throughput: 2n-icx-xxv710-64b-{core}-nat44ed-ip4routing-udp-stf-cps-avf-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-{core}-nat44ed-ip4routing-udp-stf-cps-avf-{test_type}"
   data: "vpp-2n-icx-curr-iter"
+  core: ["2t1c", ]
   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.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-H1024-P63-S64512-Cps-ndrpdr.64B-{core}-avf-ethip4udp-ip4base-h1024-p63-s64512-cps-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-H16384-P63-S1032192-Cps-ndrpdr.64B-{core}-avf-ethip4udp-ip4base-h16384-p63-s1032192-cps-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-H65536-P63-S4128768-Cps-ndrpdr.64B-{core}-avf-ethip4udp-ip4base-h65536-p63-s4128768-cps-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H1024-P63-S64512-Cps-ndrpdr.64B-{core}-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H16384-P63-S1032192-Cps-ndrpdr.64B-{core}-avf-ethip4udp-nat44ed-h16384-p63-s1032192-cps-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H65536-P63-S4128768-Cps-ndrpdr.64B-{core}-avf-ethip4udp-nat44ed-h65536-p63-s4128768-cps-ndrpdr"
   layout:
-    title: "2n-icx-e810cq-64b-ip4routing-base-scale-dpdk-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
+    title: "2n-icx-xxv710-64b-{core}-nat44ed-ip4routing-udp-stf-cps-avf-{test_type}"
+    layout: "plot-throughput"
 
 - 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"
+  title: "Throughput: 2n-icx-xxv710-64b-{core}-nat44ed-ip4routing-tcp-stf-cps-avf-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-{core}-nat44ed-ip4routing-tcp-stf-cps-avf-{test_type}"
   data: "vpp-2n-icx-curr-iter"
+  core: ["2t1c", ]
   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.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Ip4Base-H1024-P63-S64512-Cps-ndrpdr.64B-{core}-avf-ethip4tcp-ip4base-h1024-p63-s64512-cps-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Ip4Base-H16384-P63-S1032192-Cps-ndrpdr.64B-{core}-avf-ethip4tcp-ip4base-h16384-p63-s1032192-cps-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Ip4Base-H65536-P63-S4128768-Cps-ndrpdr.64B-{core}-avf-ethip4tcp-ip4base-h65536-p63-s4128768-cps-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H1024-P63-S64512-Cps-ndrpdr.64B-{core}-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H16384-P63-S1032192-Cps-ndrpdr.64B-{core}-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H65536-P63-S4128768-Cps-ndrpdr.64B-{core}-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-ndrpdr"
   layout:
-    title: "2n-icx-e810cq-78b-ip6routing-base-scale-avf-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
+    title: "2n-icx-xxv710-64b-{core}-nat44ed-ip4routing-tcp-stf-cps-avf-{test_type}"
+    layout: "plot-throughput"
 
 - 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"
+  title: "Throughput: 2n-icx-xxv710-64b-{core}-nat44ed-ip4routing-udp-tput-avf-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-{core}-nat44ed-ip4routing-udp-tput-avf-{test_type}"
   data: "vpp-2n-icx-curr-iter"
+  core: ["2t1c", ]
   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.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H1024-P63-S64512-Tput-ndrpdr.64B-{core}-avf-ethip4udp-nat44ed-h1024-p63-s64512-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H16384-P63-S1032192-Tput-ndrpdr.64B-{core}-avf-ethip4udp-nat44ed-h16384-p63-s1032192-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H65536-P63-S4128768-Tput-ndrpdr.64B-{core}-avf-ethip4udp-nat44ed-h65536-p63-s4128768-tput-ndrpdr"
   layout:
-    title: "2n-icx-e810cq-78b-ip6routing-base-scale-dpdk-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
+    title: "2n-icx-xxv710-64b-{core}-nat44ed-ip4routing-udp-tput-avf-{test_type}"
+    layout: "plot-throughput"
 
 - 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"
+  title: "Throughput: 2n-icx-xxv710-64b-{core}-nat44ed-ip4routing-tcp-tput-avf-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-{core}-nat44ed-ip4routing-tcp-tput-avf-{test_type}"
   data: "vpp-2n-icx-curr-iter"
+  core: ["2t1c", ]
   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.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H1024-P63-S64512-Tput-ndrpdr.64B-{core}-avf-ethip4tcp-nat44ed-h1024-p63-s64512-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H16384-P63-S1032192-Tput-ndrpdr.64B-{core}-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H65536-P63-S4128768-Tput-ndrpdr.64B-{core}-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-tput-ndrpdr"
   layout:
-    title: "2n-icx-e810cq-64b-l2switching-base-scale-avf-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
+    title: "2n-icx-xxv710-64b-{core}-nat44ed-ip4routing-tcp-tput-avf-{test_type}"
+    layout: "plot-throughput"
 
 - 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"
+  title: "Throughput: 2n-icx-xxv710-64b-{core}-ethip4--ethip4udpgeneve-avf-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-{core}-ethip4--ethip4udpgeneve-avf-{test_type}"
   data: "vpp-2n-icx-curr-iter"
+  core: ["2t1c", ]
   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.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-1Tun-Ip4Base-ndrpdr.64B-{core}-avf-ethip4--ethip4udpgeneve-1tun-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-4Tun-Ip4Base-ndrpdr.64B-{core}-avf-ethip4--ethip4udpgeneve-4tun-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-16Tun-Ip4Base-ndrpdr.64B-{core}-avf-ethip4--ethip4udpgeneve-16tun-ip4base-ndrpdr"
+    - "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-icx-e810cq-64b-l2switching-base-scale-dpdk-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
-# 3n-icx
+    title: "2n-icx-xxv710-64b-{core}-ethip4--ethip4udpgeneve-avf-{test_type}"
+    layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 3n-icx-e810cq-64b-{core}-ipsec-aes128gcm-ip4routing-scale-avf-{test_type}"
+  title: "Throughput: 2n-icx-xxv710-78b-{core}-ip6routing-base-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"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-78b-{core}-ip6routing-base-scale-avf-{test_type}"
+  data: "vpp-2n-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"
+    - "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"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale200K-ndrpdr.78B-{core}-avf-ethip6-ip6scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale200K-Rnd-ndrpdr.78B-{core}-avf-ethip6-ip6scale200k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale2M-ndrpdr.78B-{core}-avf-ethip6-ip6scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale2M-Rnd-ndrpdr.78B-{core}-avf-ethip6-ip6scale2m-rnd-ndrpdr"
   layout:
-    title: "3n-icx-e810cq-64b-{core}-ipsec-aes128gcm-ip4routing-scale-avf-{test_type}"
+    title: "2n-icx-xxv710-78b-{core}-ip6routing-base-scale-avf-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 3n-icx-e810cq-1518b-{core}-ipsec-aes128gcm-ip4routing-scale-avf-{test_type}"
+  title: "Throughput: 2n-icx-xxv710-78b-{core}-ip6routing-base-scale-dpdk-{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"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-78b-{core}-ip6routing-base-scale-dpdk-{test_type}"
+  data: "vpp-2n-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"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Base-ndrpdr.78B-{core}-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale20K-ndrpdr.78B-{core}-ethip6-ip6scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale20K-Rnd-ndrpdr.78B-{core}-ethip6-ip6scale20k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale200K-ndrpdr.78B-{core}-ethip6-ip6scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale200K-Rnd-ndrpdr.78B-{core}-ethip6-ip6scale200k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale2M-ndrpdr.78B-{core}-ethip6-ip6scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale2M-Rnd-ndrpdr.78B-{core}-ethip6-ip6scale2m-rnd-ndrpdr"
   layout:
-    title: "3n-icx-e810cq-1518b-{core}-ipsec-aes128gcm-ip4routing-scale-avf-{test_type}"
+    title: "2n-icx-xxv710-78b-{core}-ip6routing-base-scale-dpdk-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 3n-icx-e810cq-imix-{core}-ipsec-aes128gcm-ip4routing-scale-avf-{test_type}"
+  title: "Throughput: 2n-icx-xxv710-78b-{core}-ip6routing-base-scale-af_xdp-{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"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-78b-{core}-ip6routing-base-scale-af_xdp-{test_type}"
+  data: "vpp-2n-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"
+    - "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"
   layout:
-    title: "3n-icx-e810cq-imix-{core}-ipsec-aes128gcm-ip4routing-scale-avf-{test_type}"
+    title: "2n-icx-xxv710-78b-{core}-ip6routing-base-scale-af_xdp-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 3n-icx-e810cq-64b-{core}-ipsec-aes256gcm-ip4routing-scale-avf-{test_type}"
+  title: "Throughput: 2n-icx-xxv710-64b-{core}-l2switching-base-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"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-{core}-l2switching-base-scale-avf-{test_type}"
+  data: "vpp-2n-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"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-ndrpdr.64B-{core}-avf-dot1q-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Patch-ndrpdr.64B-{core}-avf-eth-l2patch-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-ndrpdr.64B-{core}-avf-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale10Kmaclrn-ndrpdr.64B-{core}-avf-eth-l2bdscale10kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale100Kmaclrn-ndrpdr.64B-{core}-avf-eth-l2bdscale100kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale1Mmaclrn-ndrpdr.64B-{core}-avf-eth-l2bdscale1mmaclrn-ndrpdr"
   layout:
-    title: "3n-icx-e810cq-64b-{core}-ipsec-aes256gcm-ip4routing-scale-avf-{test_type}"
+    title: "2n-icx-xxv710-64b-{core}-l2switching-base-scale-avf-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 3n-icx-e810cq-1518b-{core}-ipsec-aes256gcm-ip4routing-scale-avf-{test_type}"
+  title: "Throughput: 2n-icx-xxv710-64b-{core}-l2switching-base-scale-dpdk-{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"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-{core}-l2switching-base-scale-dpdk-{test_type}"
+  data: "vpp-2n-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"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Patch-ndrpdr.64B-{core}-eth-l2patch-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-ndrpdr.64B-{core}-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-ndrpdr.64B-{core}-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale10Kmaclrn-ndrpdr.64B-{core}-eth-l2bdscale10kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale100Kmaclrn-ndrpdr.64B-{core}-eth-l2bdscale100kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale1Mmaclrn-ndrpdr.64B-{core}-eth-l2bdscale1mmaclrn-ndrpdr"
   layout:
-    title: "3n-icx-e810cq-1518b-{core}-ipsec-aes256gcm-ip4routing-scale-avf-{test_type}"
+    title: "2n-icx-xxv710-64b-{core}-l2switching-base-scale-dpdk-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 3n-icx-e810cq-imix-{core}-ipsec-aes256gcm-ip4routing-scale-avf-{test_type}"
+  title: "Throughput: 2n-icx-xxv710-64b-{core}-vhost-base-{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: "vpp-3n-icx-curr-iter"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-{core}-vhost-base-{test_type}"
+  data: "vpp-2n-icx-curr-iter"
   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"
+    - "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-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-ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-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-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-ndrpdr.64B-{core}-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-ndrpdr.64B-{core}-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
   layout:
-    title: "3n-icx-e810cq-imix-{core}-ipsec-aes256gcm-ip4routing-scale-avf-{test_type}"
+    title: "2n-icx-xxv710-64b-{core}-vhost-base-{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: "vpp-3n-icx-curr-iter"
-  core: ["2t1c", ]
+  title: "Speedup: 2n-icx-xxv710-64b-memif-base-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-memif-base-{test_type}-tsa"
+  data: "vpp-2n-icx-curr-iter"
   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"
+    - "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-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-ndrpdr.64B-.t.c-avf-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Eth-2Memif-1Dcr-ndrpdr.64B-.t.c-avf-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
+    - "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-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Memif-1Dcr-ndrpdr.64B-.t.c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
   layout:
-    title: "3n-icx-e810cq-64b-{core}-ip4tunnel-base-avf-{test_type}"
-    layout: "plot-throughput"
+    title: "2n-icx-xxv710-64b-memif-base-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
 
 - 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: "vpp-3n-icx-curr-iter"
-  core: ["2t1c", ]
+  title: "Speedup: 2n-icx-xxv710-64b-ip4routing-base-scale-avf-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-ip4routing-base-scale-avf-{test_type}-tsa"
+  data: "vpp-2n-icx-curr-iter"
   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"
+    - "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"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale200K-ndrpdr.64B-.t.c-avf-ethip4-ip4scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale200K-Rnd-ndrpdr.64B-.t.c-avf-ethip4-ip4scale200k-rnd-ndrpdr"
+    - "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: "3n-icx-e810cq-1518b-{core}-ip4tunnel-base-avf-{test_type}"
-    layout: "plot-throughput"
+    title: "2n-icx-xxv710-64b-ip4routing-base-scale-avf-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
 
 - 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: "vpp-3n-icx-curr-iter"
-  core: ["2t1c", ]
+  title: "Speedup: 2n-icx-xxv710-64b-ip4routing-base-scale-dpdk-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-ip4routing-base-scale-dpdk-{test_type}-tsa"
+  data: "vpp-2n-icx-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-ndrpdr.64B-.t.c-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale20K-ndrpdr.64B-.t.c-ethip4-ip4scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale20K-Rnd-ndrpdr.64B-.t.c-ethip4-ip4scale20k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale200K-ndrpdr.64B-.t.c-ethip4-ip4scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale200K-Rnd-ndrpdr.64B-.t.c-ethip4-ip4scale200k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale2M-ndrpdr.64B-.t.c-ethip4-ip4scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale2M-Rnd-ndrpdr.64B-.t.c-ethip4-ip4scale2m-rnd-ndrpdr"
+  layout:
+    title: "2n-icx-xxv710-64b-ip4routing-base-scale-dpdk-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 2n-icx-xxv710-64b-ip4routing-base-scale-af_xdp-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-ip4routing-base-scale-af_xdp-{test_type}-tsa"
+  data: "vpp-2n-icx-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"
+  layout:
+    title: "2n-icx-xxv710-64b-ip4routing-base-scale-af_xdp-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 2n-icx-xxv710-64b-features-ip4routing-base-avf-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-features-ip4routing-base-avf-{test_type}-tsa"
+  data: "vpp-2n-icx-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"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
+  layout:
+    title: "2n-icx-xxv710-64b-features-ip4routing-base-avf-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 2n-icx-xxv710-64b-nat44det-ip4routing-stl-bidir-avf-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-nat44det-ip4routing-stl-bidir-avf-{test_type}-tsa"
+  data: "vpp-2n-icx-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-H16384-P63-S1032192-ndrpdr.64B-.t.c-avf-ethip4udp-nat44det-h16384-p63-s1032192-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Det-H65536-P63-S4128758-ndrpdr.64B-.t.c-avf-ethip4udp-nat44det-h65536-p63-s4128758-ndrpdr"
+  layout:
+    title: "2n-icx-xxv710-64b-nat44det-ip4routing-stl-bidir-avf-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 2n-icx-xxv710-64b-nat44ed-ip4routing-stl-unidir-avf-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-nat44ed-ip4routing-stl-unidir-avf-{test_type}-tsa"
+  data: "vpp-2n-icx-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"
+  layout:
+    title: "2n-icx-xxv710-64b-nat44ed-ip4routing-stl-unidir-avf-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 2n-icx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-{test_type}-tsa"
+  data: "vpp-2n-icx-curr-iter"
+  include:
+    - "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"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-H16384-P63-S1032192-Cps-ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-h16384-p63-s1032192-cps-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-H65536-P63-S4128768-Cps-ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-h65536-p63-s4128768-cps-ndrpdr"
+    - "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-Nat44Ed-H16384-P63-S1032192-Cps-ndrpdr.64B-.t.c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-cps-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H65536-P63-S4128768-Cps-ndrpdr.64B-.t.c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-cps-ndrpdr"
+  layout:
+    title: "2n-icx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 2n-icx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-{test_type}-tsa"
+  data: "vpp-2n-icx-curr-iter"
+  include:
+    - "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"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Ip4Base-H16384-P63-S1032192-Cps-ndrpdr.64B-.t.c-avf-ethip4tcp-ip4base-h16384-p63-s1032192-cps-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Ip4Base-H65536-P63-S4128768-Cps-ndrpdr.64B-.t.c-avf-ethip4tcp-ip4base-h65536-p63-s4128768-cps-ndrpdr"
+    - "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-Nat44Ed-H16384-P63-S1032192-Cps-ndrpdr.64B-.t.c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H65536-P63-S4128768-Cps-ndrpdr.64B-.t.c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-ndrpdr"
+  layout:
+    title: "2n-icx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 2n-icx-xxv710-64b-nat44ed-ip4routing-udp-tput-avf-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-nat44ed-ip4routing-udp-tput-avf-{test_type}-tsa"
+  data: "vpp-2n-icx-curr-iter"
+  include:
+    - "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"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H16384-P63-S1032192-Tput-ndrpdr.64B-.t.c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H65536-P63-S4128768-Tput-ndrpdr.64B-.t.c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-tput-ndrpdr"
+  layout:
+    title: "2n-icx-xxv710-64b-nat44ed-ip4routing-udp-tput-avf-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 2n-icx-xxv710-64b-nat44ed-ip4routing-tcp-tput-avf-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-nat44ed-ip4routing-tcp-tput-avf-{test_type}-tsa"
+  data: "vpp-2n-icx-curr-iter"
   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"
+    - "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"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H16384-P63-S1032192-Tput-ndrpdr.64B-.t.c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H65536-P63-S4128768-Tput-ndrpdr.64B-.t.c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-tput-ndrpdr"
   layout:
-    title: "3n-icx-e810cq-imix-{core}-ip4tunnel-base-avf-{test_type}"
-    layout: "plot-throughput"
+    title: "2n-icx-xxv710-64b-nat44ed-ip4routing-udp-tput-avf-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 3n-icx-e810cq-64b-ipsec-aes128gcm-ip4routing-scale-avf-{test_type}-tsa"
+  title: "Speedup: 2n-icx-xxv710-64b-ethip4--ethip4udpgeneve-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: "vpp-3n-icx-curr-iter"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-ethip4--ethip4udpgeneve-avf-{test_type}-tsa"
+  data: "vpp-2n-icx-curr-iter"
   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"
+    - "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"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-16Tun-Ip4Base-ndrpdr.64B-.t.c-avf-ethip4--ethip4udpgeneve-16tun-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-64Tun-Ip4Base-ndrpdr.64B-.t.c-avf-ethip4--ethip4udpgeneve-64tun-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-256Tun-Ip4Base-ndrpdr.64B-.t.c-avf-ethip4--ethip4udpgeneve-256tun-ip4base-ndrpdr"
   layout:
-    title: "3n-icx-e810cq-64b-ipsec-aes128gcm-ip4routing-scale-avf-{test_type}"
+    title: "2n-icx-xxv710-64b-ethip4--ethip4udpgeneve-avf-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 3n-icx-e810cq-1518b-ipsec-aes128gcm-ip4routing-scale-avf-{test_type}-tsa"
+  title: "Speedup: 2n-icx-xxv710-78b-ip6routing-base-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: "vpp-3n-icx-curr-iter"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-78b-ip6routing-base-scale-avf-{test_type}-tsa"
+  data: "vpp-2n-icx-curr-iter"
   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"
+    - "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"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale200K-ndrpdr.78B-.t.c-avf-ethip6-ip6scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale200K-Rnd-ndrpdr.78B-.t.c-avf-ethip6-ip6scale200k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale2M-ndrpdr.78B-.t.c-avf-ethip6-ip6scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale2M-Rnd-ndrpdr.78B-.t.c-avf-ethip6-ip6scale2m-rnd-ndrpdr"
   layout:
-    title: "3n-icx-e810cq-1518b-ipsec-aes128gcm-ip4routing-scale-avf-{test_type}"
+    title: "2n-icx-xxv710-64b-ip6routing-base-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"
+  title: "Speedup: 2n-icx-xxv710-78b-ip6routing-base-scale-dpdk-{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: "vpp-3n-icx-curr-iter"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-78b-ip6routing-base-scale-dpdk-{test_type}-tsa"
+  data: "vpp-2n-icx-curr-iter"
   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"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Base-ndrpdr.78B-.t.c-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale20K-ndrpdr.78B-.t.c-ethip6-ip6scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale20K-Rnd-ndrpdr.78B-.t.c-ethip6-ip6scale20k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale200K-ndrpdr.78B-.t.c-ethip6-ip6scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale200K-Rnd-ndrpdr.78B-.t.c-ethip6-ip6scale200k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale2M-ndrpdr.78B-.t.c-ethip6-ip6scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale2M-Rnd-ndrpdr.78B-.t.c-ethip6-ip6scale2m-rnd-ndrpdr"
   layout:
-    title: "3n-icx-e810cq-imix-ipsec-aes128gcm-ip4routing-scale-avf-{test_type}"
+    title: "2n-icx-xxv710-64b-ip6routing-base-scale-dpdk-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 3n-icx-e810cq-64b-ipsec-aes256gcm-ip4routing-scale-avf-{test_type}-tsa"
+  title: "Speedup: 2n-icx-xxv710-78b-ip6routing-base-scale-af_xdp-{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: "vpp-3n-icx-curr-iter"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-78b-ip6routing-base-scale-af_xdp-{test_type}-tsa"
+  data: "vpp-2n-icx-curr-iter"
   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"
+    - "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"
   layout:
-    title: "3n-icx-e810cq-64b-ipsec-aes256gcm-ip4routing-scale-avf-{test_type}"
+    title: "2n-icx-xxv710-64b-ip6routing-base-scale-af_xdp-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 3n-icx-e810cq-1518b-ipsec-aes256gcm-ip4routing-scale-avf-{test_type}-tsa"
+  title: "Speedup: 2n-icx-xxv710-64b-l2switching-base-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: "vpp-3n-icx-curr-iter"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-l2switching-base-scale-avf-{test_type}-tsa"
+  data: "vpp-2n-icx-curr-iter"
   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"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-ndrpdr.64B-.t.c-avf-dot1q-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Patch-ndrpdr.64B-.t.c-avf-eth-l2patch-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-ndrpdr.64B-.t.c-avf-eth-l2xcbase-ndrpdr"
+    - "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"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale100Kmaclrn-ndrpdr.64B-.t.c-avf-eth-l2bdscale100kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale1Mmaclrn-ndrpdr.64B-.t.c-avf-eth-l2bdscale1mmaclrn-ndrpdr"
   layout:
-    title: "3n-icx-e810cq-1518b-ipsec-aes256gcm-ip4routing-scale-avf-{test_type}"
+    title: "2n-icx-xxv710-64b-l2switching-base-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"
+  title: "Speedup: 2n-icx-xxv710-64b-l2switching-base-scale-dpdk-{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: "vpp-3n-icx-curr-iter"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-l2switching-base-scale-dpdk-{test_type}-tsa"
+  data: "vpp-2n-icx-curr-iter"
   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"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Patch-ndrpdr.64B-.t.c-eth-l2patch-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-ndrpdr.64B-.t.c-eth-l2xcbase-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-icx-e810cq-imix-ipsec-aes256gcm-ip4routing-scale-avf-{test_type}"
+    title: "2n-icx-xxv710-64b-l2switching-base-scale-dpdk-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 3n-icx-e810cq-64b-ip4tunnel-base-avf-{test_type}-tsa"
+  title: "Speedup: 2n-icx-xxv710-64b-vhost-base-{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"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-vhost-base-{test_type}-tsa"
+  data: "vpp-2n-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"
+    - "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-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-ndrpdr.64B-.t.c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-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-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-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"
   layout:
-    title: "3n-icx-e810cq-64b-ip4tunnel-base-avf-{test_type}"
+    title: "2n-icx-xxv710-64b-vhost-base-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
+# Packet Throughput - DPDK
+
+# 2n-icx
+
+- type: "plot"
+  title: "DPDK Throughput: 2n-icx-xxv710-64b-{core}-base-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,DPDK]}/2n-icx-xxv710-64b-{core}-base-{test_type}"
+  data: "dpdk-2n-icx-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"
+  layout:
+    title: "2n-icx-xxv710-64b-{core}-base-{test_type}"
+    layout: "plot-throughput"
+
 - type: "plot"
-  title: "Speedup: 3n-icx-e810cq-1518b-ip4tunnel-base-avf-{test_type}-tsa"
+  title: "Speedup: 2n-icx-xxv710-64b-base-{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"
+  output-file: "{DIR[STATIC,DPDK]}/2n-icx-xxv710-64b-base-{test_type}-tsa"
+  data: "dpdk-2n-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"
+    - "tests.dpdk.perf.2n1l-25ge2p1xxv710-eth-l2xcbase-testpmd-ndrpdr.64b-.t.c-eth-l2xcbase-testpmd-ndrpdr"
+    - "tests.dpdk.perf.2n1l-25ge2p1xxv710-ethip4-ip4base-l3fwd-ndrpdr.64b-.t.c-ethip4-ip4base-l3fwd-ndrpdr"
   layout:
-    title: "3n-icx-e810cq-1518b-ip4tunnel-base-avf-{test_type}"
+    title: "2n-icx-xxv710-64b-base-{test_type}-tsa"
     layout: "plot-throughput-speedup-analysis"
 
+# 3n-icx
+
 - type: "plot"
-  title: "Speedup: 3n-icx-e810cq-imix-ip4tunnel-base-avf-{test_type}-tsa"
+  title: "DPDK Throughput: 3n-icx-xxv710-64b-{core}-base-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,DPDK]}/3n-icx-xxv710-64b-{core}-base-{test_type}"
+  data: "dpdk-3n-icx-curr-iter"
+  core: ["2t1c", "4t2c"]
+  include:
+    - "tests.dpdk.perf.25ge2p1xxv710-eth-l2xcbase-testpmd-ndrpdr.64b-{core}-eth-l2xcbase-testpmd-ndrpdr"
+    - "tests.dpdk.perf.25ge2p1xxv710-ethip4-ip4base-l3fwd-ndrpdr.64b-{core}-ethip4-ip4base-l3fwd-ndrpdr"
+  layout:
+    title: "3n-icx-xxv710-64b-{core}-base-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Speedup: 3n-icx-xxv710-64b-base-{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"
+  output-file: "{DIR[STATIC,DPDK]}/3n-icx-xxv710-64b-base-{test_type}-tsa"
+  data: "dpdk-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"
+    - "tests.dpdk.perf.25ge2p1xxv710-eth-l2xcbase-testpmd-ndrpdr.64b-.t.c-eth-l2xcbase-testpmd-ndrpdr"
+    - "tests.dpdk.perf.25ge2p1xxv710-ethip4-ip4base-l3fwd-ndrpdr.64b-.t.c-ethip4-ip4base-l3fwd-ndrpdr"
   layout:
-    title: "3n-icx-e810cq-imix-ip4tunnel-base-avf-{test_type}"
+    title: "3n-icx-xxv710-64b-base-{test_type}-tsa"
     layout: "plot-throughput-speedup-analysis"
 
-# Packet Throughput - DPDK
-
 # 2n-clx
 
 - type: "plot"
@@ -10716,7 +12406,7 @@
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,DPDK]}/2n-clx-xxv710-64b-{core}-base-{test_type}"
   data: "dpdk-2n-clx-curr-iter"
-  core: ["1t1c", "4t2c"]
+  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"
@@ -10729,7 +12419,7 @@
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,DPDK]}/2n-clx-x710-64b-{core}-base-{test_type}"
   data: "dpdk-2n-clx-curr-iter"
-  core: ["1t1c", "4t2c"]
+  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"
@@ -10737,6 +12427,30 @@
     title: "2n-clx-x710-64b-{core}-base-{test_type}"
     layout: "plot-throughput"
 
+- type: "plot"
+  title: "Speedup: 2n-clx-xxv710-64b-base-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,DPDK]}/2n-clx-xxv710-64b-base-{test_type}-tsa"
+  data: "dpdk-2n-clx-curr-iter"
+  include:
+    - "tests.dpdk.perf.2n1l-25ge2p1xxv710-eth-l2xcbase-testpmd-ndrpdr.64b-.t.c-eth-l2xcbase-testpmd-ndrpdr"
+    - "tests.dpdk.perf.2n1l-25ge2p1xxv710-ethip4-ip4base-l3fwd-ndrpdr.64b-.t.c-ethip4-ip4base-l3fwd-ndrpdr"
+  layout:
+    title: "2n-clx-xxv710-64b-base-{test_type}-tsa"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 2n-clx-x710-64b-base-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,DPDK]}/2n-clx-x710-64b-base-{test_type}-tsa"
+  data: "dpdk-2n-clx-curr-iter"
+  include:
+    - "tests.dpdk.perf.2n1l-10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.64b-.t.c-eth-l2xcbase-testpmd-ndrpdr"
+    - "tests.dpdk.perf.2n1l-10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.64b-.t.c-ethip4-ip4base-l3fwd-ndrpdr"
+  layout:
+    title: "2n-clx-x710-64b-base-{test_type}-tsa"
+    layout: "plot-throughput-speedup-analysis"
+
 ###############################################################################
 
 # 2n-zn2
@@ -10789,20 +12503,16 @@
     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-[avf,dpdk]-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-zn2-x710-64b-{core}-ip4routing-base-scale-[avf,dpdk]-{test_type}"
+  output-file: "{DIR[STATIC,VPP]}/2n-zn2-x710-64b-{core}-ip4routing-base-[avf,dpdk]-{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"
   layout:
-    title: "2n-zn2-x710-64b-{core}-ip4routing-base-scale-[avf,dpdk]-{test_type}"
+    title: "2n-zn2-x710-64b-{core}-ip4routing-base-[avf,dpdk]-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
@@ -10996,23 +12706,6 @@
     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: "vpp-2n-zn2-curr-iter"
-  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"
@@ -11066,21 +12759,16 @@
     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-[avf,dpdk]-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-zn2-x710-78b-{core}-ip6routing-base-scale-[avf,dpdk]-{test_type}"
+  output-file: "{DIR[STATIC,VPP]}/2n-zn2-x710-78b-{core}-ip6routing-base-[avf,dpdk]-{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"
   layout:
-    title: "2n-zn2-x710-78b-{core}-ip6routing-base-scale-[avf,dpdk]-{test_type}"
+    title: "2n-zn2-x710-78b-{core}-ip6routing-base-[avf,dpdk]-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
@@ -11090,7 +12778,6 @@
   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"
@@ -11138,35 +12825,16 @@
     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-[avf,dpdk]-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-zn2-x710-64b-{core}-l2switching-base-scale-avf-{test_type}"
+  output-file: "{DIR[STATIC,VPP]}/2n-zn2-x710-64b-{core}-l2switching-base-{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: "vpp-2n-zn2-curr-iter"
-  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-zn2-x710-64b-{core}-l2switching-base-scale-dpdk-{test_type}"
+    title: "2n-zn2-x710-64b-{core}-l2switching-base-[avf,dpdk]-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
@@ -11266,67 +12934,33 @@
     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}"
+  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: "vpp-2n-zn2-curr-iter"
-  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: "vpp-2n-zn2-curr-iter"
-  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}"
+  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"
@@ -11336,44 +12970,12 @@
   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: "vpp-2n-zn2-curr-iter"
-  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: "vpp-2n-zn2-curr-iter"
-  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"
 
 ################################################################################
@@ -11423,19 +13025,15 @@
     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-[avf,dpdk]-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-zn2-x710-64b-ip4routing-base-scale-[avf,dpdk]-{test_type}-tsa"
+  output-file: "{DIR[STATIC,VPP]}/2n-zn2-x710-64b-ip4routing-base-[avf,dpdk]-{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"
   layout:
-    title: "2n-zn2-x710-64b-ip4routing-base-scale-[avf,dpdk]-{test_type}"
+    title: "2n-zn2-x710-64b-ip4routing-base-[avf,dpdk]-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
@@ -11600,391 +13198,748 @@
 #    layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 2n-zn2-xxv710-64b-features-ip4routing-base-dpdk-{test_type}-tsa"
+  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: "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"
+    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4-Ip4Scale20K-Ndrpdr.64B-.t.c-rdma-ethip4-ip4scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4-Ip4Scale20K-Rnd-Ndrpdr.64B-.t.c-rdma-ethip4-ip4scale20k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4-Ip4Scale200K-Ndrpdr.64B-.t.c-rdma-ethip4-ip4scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4-Ip4Scale200K-Rnd-Ndrpdr.64B-.t.c-rdma-ethip4-ip4scale200k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4-Ip4Scale2M-Ndrpdr.64B-.t.c-rdma-ethip4-ip4scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4-Ip4Scale2M-Rnd-Ndrpdr.64B-.t.c-rdma-ethip4-ip4scale2m-rnd-ndrpdr"
+  layout:
+    title: "2n-zn2-cx556a-64b-rdma-ip4base-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  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: "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"
+    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-.t.c-rdma-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-.t.c-rdma-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-ethip4udp-nat44det-h1-p1-s1-Ndrpdr.64B-.t.c-rdma-ethip4udp-nat44det-h1-p1-s1-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-ethip4udp-nat44det-h1024-p63-s64512-Ndrpdr.64B-.t.c-rdma-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr"
+  layout:
+    title: "2n-zn2-cx556a-64b-rdma-ethip4-features-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  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: "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"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-16Tun-Ip4Base-Ndrpdr.64B-.t.c-avf-ethip4--ethip4udpgeneve-16tun-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-64Tun-Ip4Base-Ndrpdr.64B-.t.c-avf-ethip4--ethip4udpgeneve-64tun-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-256Tun-Ip4Base-Ndrpdr.64B-.t.c-avf-ethip4--ethip4udpgeneve-256tun-ip4base-ndrpdr"
+  layout:
+    title: "2n-zn2-xxv710-64b-ethip4--ethip4udpgeneve-avf-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 2n-zn2-x710-78b-ip6routing-base-[avf,dpdk]-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-zn2-x710-78b-ip6routing-base-[avf,dpdk]-{test_type}-tsa"
+  data: "vpp-2n-zn2-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-avf-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-ethip6-ip6base-ndrpdr"
+  layout:
+    title: "2n-zn2-x710-78b-ip6routing-base-[avf,dpdk]-{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: "vpp-2n-zn2-curr-iter"
+  include:
+    - "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"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale200K-Ndrpdr.78B-.t.c-avf-ethip6-ip6scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale200K-rnd-Ndrpdr.78B-.t.c-avf-ethip6-ip6scale200k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale2M-Ndrpdr.78B-.t.c-avf-ethip6-ip6scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale2M-rnd-Ndrpdr.78B-.t.c-avf-ethip6-ip6scale2m-rnd-ndrpdr"
+  layout:
+    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-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: "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"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale20K-Ndrpdr.78B-.t.c-ethip6-ip6scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale20K-rnd-Ndrpdr.78B-.t.c-ethip6-ip6scale20k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale200K-Ndrpdr.78B-.t.c-ethip6-ip6scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale200K-rnd-Ndrpdr.78B-.t.c-ethip6-ip6scale200k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale2M-Ndrpdr.78B-.t.c-ethip6-ip6scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale2M-rnd-Ndrpdr.78B-.t.c-ethip6-ip6scale2m-rnd-ndrpdr"
+  layout:
+    title: "2n-zn2-xxv710-78b-ip6routing-base-scale-dpdk-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  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: "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"
+    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1Cx556A-Rdma-Ethip6-Ip6Scale20K-Ndrpdr.78B-.t.c-rdma-ethip6-ip6scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1Cx556A-Rdma-Ethip6-Ip6Scale200K-Ndrpdr.78B-.t.c-rdma-ethip6-ip6scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1Cx556A-Rdma-Ethip6-Ip6Scale2M-Ndrpdr.78B-.t.c-rdma-ethip6-ip6scale2m-ndrpdr"
+  layout:
+    title: "2n-zn2-cx556a-78b-rdma-ip6routing-base-scale-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 2n-zn2-x710-64b-l2switching-base-[avf,dpdk]-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-zn2-x710-64b-l2switching-base-{test_type}-tsa"
+  data: "vpp-2n-zn2-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-avf-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-ndrpdr"
+  layout:
+    title: "2n-zn2-x710-64b-l2switching-base-[avf,dpdk]-{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: "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"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Gbp-Ndrpdr.64B-.t.c-avf-dot1q-l2bdbasemaclrn-gbp-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Patch-Ndrpdr.64B-.t.c-avf-eth-l2patch-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Ndrpdr.64B-.t.c-avf-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-avf-eth-l2bdbasemaclrn-ndrpdr"
+  layout:
+    title: "2n-zn2-xxv710-64b-l2switching-base-avf-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  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-features-ip4routing-base-dpdk-{test_type}-tsa"
+  output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-64b-l2switching-base-scale-avf-{test_type}-tsa"
   data: "vpp-2n-zn2-curr-iter"
   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"
+    - "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"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-.t.c-avf-eth-l2bdscale100kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-.t.c-avf-eth-l2bdscale1mmaclrn-ndrpdr"
   layout:
-    title: "2n-zn2-xxv710-64b-features-ip4routing-base-dpdk-{test_type}"
+    title: "2n-zn2-xxv710-64b-l2switching-base-scale-avf-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 2n-zn2-cx556a-64b-rdma-ip4base-{test_type}-tsa"
+  title: "Speedup: 2n-zn2-xxv710-64b-l2switching-base-dpdk-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-zn2-cx556a-64b-rdma-ip4base-{test_type}-tsa"
+  output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-64b-l2switching-base-dpdk-{test_type}-tsa"
   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"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4-Ip4Scale20K-Ndrpdr.64B-.t.c-rdma-ethip4-ip4scale20k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4-Ip4Scale20K-Rnd-Ndrpdr.64B-.t.c-rdma-ethip4-ip4scale20k-rnd-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4-Ip4Scale200K-Ndrpdr.64B-.t.c-rdma-ethip4-ip4scale200k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4-Ip4Scale200K-Rnd-Ndrpdr.64B-.t.c-rdma-ethip4-ip4scale200k-rnd-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4-Ip4Scale2M-Ndrpdr.64B-.t.c-rdma-ethip4-ip4scale2m-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4-Ip4Scale2M-Rnd-Ndrpdr.64B-.t.c-rdma-ethip4-ip4scale2m-rnd-ndrpdr"
+    - "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"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Gbp-Ndrpdr.64B-.t.c-dot1q-l2bdbasemaclrn-gbp-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Patch-Ndrpdr.64B-.t.c-eth-l2patch-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Ndrpdr.64B-.t.c-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-ndrpdr"
   layout:
-    title: "2n-zn2-cx556a-64b-rdma-ip4base-{test_type}"
+    title: "2n-zn2-xxv710-64b-l2switching-base-dpdk-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 2n-zn2-cx556a-64b-rdma-ethip4-features-{test_type}-tsa"
+  title: "Speedup: 2n-zn2-xxv710-64b-l2switching-base-scale-dpdk-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-zn2-cx556a-64b-rdma-ethip4-features-{test_type}-tsa"
+  output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-64b-l2switching-base-scale-dpdk-{test_type}-tsa"
   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"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-.t.c-rdma-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-.t.c-rdma-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-ethip4udp-nat44det-h1-p1-s1-Ndrpdr.64B-.t.c-rdma-ethip4udp-nat44det-h1-p1-s1-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-ethip4udp-nat44det-h1024-p63-s64512-Ndrpdr.64B-.t.c-rdma-ethip4udp-nat44det-h1024-p63-s64512-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: "2n-zn2-cx556a-64b-rdma-ethip4-features-{test_type}"
+    title: "2n-zn2-xxv710-64b-l2switching-base-scale-dpdk-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 2n-zn2-xxv710-64b-ethip4--ethip4udpgeneve-avf-{test_type}-tsa"
+  title: "Speedup: 2n-zn2-cx556a-64b-rdma-l2switching-base-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-64b-ethip4--ethip4udpgeneve-avf-{test_type}-tsa"
+  output-file: "{DIR[STATIC,VPP]}/2n-zn2-cx556a-64b-rdma-l2switching-base-{test_type}-tsa"
   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"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-16Tun-Ip4Base-Ndrpdr.64B-.t.c-avf-ethip4--ethip4udpgeneve-16tun-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-64Tun-Ip4Base-Ndrpdr.64B-.t.c-avf-ethip4--ethip4udpgeneve-64tun-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-256Tun-Ip4Base-Ndrpdr.64B-.t.c-avf-ethip4--ethip4udpgeneve-256tun-ip4base-ndrpdr"
+    - "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"
+    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Bdbasemaclrn-Gbp-Ndrpdr.64B-.t.c-rdma-dot1q-l2bdbasemaclrn-gbp-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Patch-Ndrpdr.64B-.t.c-rdma-eth-l2patch-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Xcbase-Ndrpdr.64B-.t.c-rdma-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-rdma-eth-l2bdbasemaclrn-ndrpdr"
   layout:
-    title: "2n-zn2-xxv710-64b-ethip4--ethip4udpgeneve-avf-{test_type}"
+    title: "2n-zn2-cx556a-64b-rdma-l2switching-base-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  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: "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"
+    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-.t.c-rdma-eth-l2bdscale100kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-.t.c-rdma-eth-l2bdscale1mmaclrn-ndrpdr"
+  layout:
+    title: "2n-zn2-cx556a-64b-rdma-l2switching-scale-{test_type}"
     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-xxv710-64b-vhost-base-[avf,dpdk]-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-zn2-x710-78b-ip6routing-base-scale-[avf,dpdk]-{test_type}-tsa"
+  output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-64b-vhost-base-{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.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-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"
   layout:
-    title: "2n-zn2-x710-78b-ip6routing-base-scale-[avf,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-78b-ip6routing-base-scale-avf-{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-78b-ip6routing-base-scale-avf-{test_type}-tsa"
+  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.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"
-    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale200K-Ndrpdr.78B-.t.c-avf-ethip6-ip6scale200k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale200K-rnd-Ndrpdr.78B-.t.c-avf-ethip6-ip6scale200k-rnd-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale2M-Ndrpdr.78B-.t.c-avf-ethip6-ip6scale2m-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale2M-rnd-Ndrpdr.78B-.t.c-avf-ethip6-ip6scale2m-rnd-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"
   layout:
-    title: "2n-zn2-xxv710-78b-ip6routing-base-scale-avf-{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-xxv710-78b-ip6routing-base-scale-dpdk-{test_type}-tsa"
+  title: "Speedup: 2n-zn2-cx556a-64b-rdma-l2-vhost-base-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-78b-ip6routing-base-scale-dpdk-{test_type}-tsa"
+  output-file: "{DIR[STATIC,VPP]}/2n-zn2-cx556a-64b-rdma-l2-vhost-base-{test_type}-tsa"
   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"
-    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale20K-Ndrpdr.78B-.t.c-ethip6-ip6scale20k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale20K-rnd-Ndrpdr.78B-.t.c-ethip6-ip6scale20k-rnd-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale200K-Ndrpdr.78B-.t.c-ethip6-ip6scale200k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale200K-rnd-Ndrpdr.78B-.t.c-ethip6-ip6scale200k-rnd-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale2M-Ndrpdr.78B-.t.c-ethip6-ip6scale2m-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale2M-rnd-Ndrpdr.78B-.t.c-ethip6-ip6scale2m-rnd-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"
+    - "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-rdma-l2-vhost-base-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+# Packet Throughput - DPDK
+
+# 2n-zn2
+
+- type: "plot"
+  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: "dpdk-2n-zn2-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"
+  layout:
+    title: "2n-zn2-xxv710-64b-{core}-base-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  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: "dpdk-2n-zn2-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"
+  layout:
+    title: "2n-zn2-x710-64b-{core}-base-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Speedup: 2n-zn2-xxv710-64b-base-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,DPDK]}/2n-zn2-xxv710-64b-base-{test_type}-tsa"
+  data: "dpdk-2n-zn2-curr-iter"
+  include:
+    - "tests.dpdk.perf.2n1l-25ge2p1xxv710-eth-l2xcbase-testpmd-ndrpdr.64b-.t.c-eth-l2xcbase-testpmd-ndrpdr"
+    - "tests.dpdk.perf.2n1l-25ge2p1xxv710-ethip4-ip4base-l3fwd-ndrpdr.64b-.t.c-ethip4-ip4base-l3fwd-ndrpdr"
+  layout:
+    title: "2n-zn2-xxv710-64b-base-{test_type}-tsa"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 2n-zn2-x710-64b-base-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,DPDK]}/2n-zn2-x710-64b-base-{test_type}-tsa"
+  data: "dpdk-2n-zn2-curr-iter"
+  include:
+    - "tests.dpdk.perf.2n1l-10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.64b-.t.c-eth-l2xcbase-testpmd-ndrpdr"
+    - "tests.dpdk.perf.2n1l-10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.64b-.t.c-ethip4-ip4base-l3fwd-ndrpdr"
+  layout:
+    title: "2n-zn2-x710-64b-base-{test_type}-tsa"
+    layout: "plot-throughput-speedup-analysis"
+
+################################################################################
+
+# 3n-icx Throughput
+
+- type: "plot"
+  title: "Throughput: 3n-icx-xxv710-1518b-{core}-ipsec-aes128cbc-ip4routing-base-scale-sw-avf-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-1518b-{core}-ipsec-aes128cbc-ip4routing-base-scale-sw-avf-{test_type}"
+  data: "vpp-3n-icx-curr-iter"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.1518B-{core}-avf-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.1518B-{core}-avf-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.1518B-{core}-avf-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.1518B-{core}-avf-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+  layout:
+    title: "3n-icx-xxv710-1518b-{core}-ipsec-aes128cbc-ip4routing-base-scale-sw-avf-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 3n-icx-xxv710-1518b-{core}-ipsec-aes256gcm-ip4routing-base-scale-sw-avf-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-1518b-{core}-ipsec-aes256gcm-ip4routing-base-scale-sw-avf-{test_type}"
+  data: "vpp-3n-icx-curr-iter"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.1518B-{core}-avf-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.1518B-{core}-avf-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.1518B-{core}-avf-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.1518B-{core}-avf-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+  layout:
+    title: "3n-icx-xxv710-1518b-{core}-ipsec-aes256gcm-ip4routing-base-scale-sw-avf-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 3n-icx-xxv710-1518b-{core}-ipsec-scheduler-ip4routing-base-scale-sw-avf-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-1518b-{core}-ipsec-scheduler-ip4routing-base-scale-sw-avf-{test_type}"
+  data: "vpp-3n-icx-curr-iter"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1Tnlswasync-Scheduler-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.1518B-{core}-avf-ethip4ipsec1tnlswasync-scheduler-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec8Tnlswasync-Scheduler-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.1518B-{core}-avf-ethip4ipsec8tnlswasync-scheduler-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1Tnlswasync-Scheduler-Ip4Base-Int-Aes256Gcm-ndrpdr.1518B-{core}-avf-ethip4ipsec1tnlswasync-scheduler-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec8Tnlswasync-Scheduler-Ip4Base-Int-Aes256Gcm-ndrpdr.1518B-{core}-avf-ethip4ipsec8tnlswasync-scheduler-ip4base-int-aes256gcm-ndrpdr"
+  layout:
+    title: "3n-icx-xxv710-1518b-{core}-ipsec-scheduler-ip4routing-base-scale-sw-avf-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 3n-icx-xxv710-1518b-{core}-ipsec-ip4routing-base-scale-sw-dpdk-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-1518b-{core}-ipsec-ip4routing-base-scale-sw-dpdk-{test_type}"
+  data: "vpp-3n-icx-curr-iter"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.1518B-{core}-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.1518B-{core}-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.1518B-{core}-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+  layout:
+    title: "3n-icx-xxv710-1518b-{core}-ipsec-ip4routing-base-scale-sw-dpdk-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 3n-icx-xxv710-1518b-{core}-ipsec-scheduler-ip4routing-base-scale-sw-dpdk-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-1518b-{core}-ipsec-scheduler-ip4routing-base-scale-sw-dpdk-{test_type}"
+  data: "vpp-3n-icx-curr-iter"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec1Tnlswasync-Scheduler-Ip4Base-Int-Aes256Gcm-ndrpdr.1518B-{core}-ethip4ipsec1tnlswasync-scheduler-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec8Tnlswasync-Scheduler-Ip4Base-Int-Aes256Gcm-ndrpdr.1518B-{core}-ethip4ipsec8tnlswasync-scheduler-ip4base-int-aes256gcm-ndrpdr"
+  layout:
+    title: "3n-icx-xxv710-1518b-{core}-ipsec-scheduler-ip4routing-base-scale-sw-dpdk-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 3n-icx-xxv710-imix-{core}-ipsec-aes128cbc-ip4routing-base-scale-sw-avf-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-imix-{core}-ipsec-aes128cbc-ip4routing-base-scale-sw-avf-{test_type}"
+  data: "vpp-3n-icx-curr-iter"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.imix-{core}-avf-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.imix-{core}-avf-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.imix-{core}-avf-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.imix-{core}-avf-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+  layout:
+    title: "3n-icx-xxv710-imix-{core}-ipsec-aes128cbc-ip4routing-base-scale-sw-avf-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 3n-icx-xxv710-imix-{core}-ipsec-aes256gcm-ip4routing-base-scale-sw-avf-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-imix-{core}-ipsec-aes256gcm-ip4routing-base-scale-sw-avf-{test_type}"
+  data: "vpp-3n-icx-curr-iter"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.imix-{core}-avf-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.imix-{core}-avf-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.imix-{core}-avf-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.imix-{core}-avf-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+  layout:
+    title: "3n-icx-xxv710-imix-{core}-ipsec-aes256gcm-ip4routing-base-scale-sw-avf-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 3n-icx-xxv710-imix-{core}-ipsec-scheduler-ip4routing-base-scale-sw-avf-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-imix-{core}-ipsec-scheduler-ip4routing-base-scale-sw-avf-{test_type}"
+  data: "vpp-3n-icx-curr-iter"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1Tnlswasync-Scheduler-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.imix-{core}-avf-ethip4ipsec1tnlswasync-scheduler-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec8Tnlswasync-Scheduler-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.imix-{core}-avf-ethip4ipsec8tnlswasync-scheduler-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1Tnlswasync-Scheduler-Ip4Base-Int-Aes256Gcm-ndrpdr.imix-{core}-avf-ethip4ipsec1tnlswasync-scheduler-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec8Tnlswasync-Scheduler-Ip4Base-Int-Aes256Gcm-ndrpdr.imix-{core}-avf-ethip4ipsec8tnlswasync-scheduler-ip4base-int-aes256gcm-ndrpdr"
+  layout:
+    title: "3n-icx-xxv710-imix-{core}-ipsec-scheduler-ip4routing-base-scale-sw-avf-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 3n-icx-xxv710-imix-{core}-ipsec-ip4routing-base-scale-sw-dpdk-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-imix-{core}-ipsec-ip4routing-base-scale-sw-dpdk-{test_type}"
+  data: "vpp-3n-icx-curr-iter"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.imix-{core}-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.imix-{core}-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.imix-{core}-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+  layout:
+    title: "3n-icx-xxv710-imix-{core}-ipsec-ip4routing-base-scale-sw-dpdk-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 3n-icx-xxv710-imix-{core}-ipsec-scheduler-ip4routing-base-scale-sw-dpdk-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-imix-{core}-ipsec-scheduler-ip4routing-base-scale-sw-dpdk-{test_type}"
+  data: "vpp-3n-icx-curr-iter"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec1Tnlswasync-Scheduler-Ip4Base-Int-Aes256Gcm-ndrpdr.imix-{core}-ethip4ipsec1tnlswasync-scheduler-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec8Tnlswasync-Scheduler-Ip4Base-Int-Aes256Gcm-ndrpdr.imix-{core}-ethip4ipsec8tnlswasync-scheduler-ip4base-int-aes256gcm-ndrpdr"
+  layout:
+    title: "3n-icx-xxv710-imix-{core}-ipsec-scheduler-ip4routing-base-scale-sw-dpdk-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 3n-icx-xxv710-64b-{core}-ip4routing-base-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-64b-{core}-ip4routing-base-{test_type}"
+  data: "vpp-3n-icx-curr-iter"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-ndrpdr.64B-{core}-avf-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Base-ndrpdr.64B-{core}-ethip4-ip4base-ndrpdr"
+  layout:
+    title: "3n-icx-xxv710-64b-{core}-ip4routing-base-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 3n-icx-xxv710-64b-{core}-ip4tunnel-base-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-64b-{core}-ip4tunnel-base-{test_type}"
+  data: "vpp-3n-icx-curr-iter"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Avf-Ethip4Gtpusw-Ip4Base-ndrpdr.64B-{core}-avf-ethip4gtpusw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-ndrpdr.64B-{core}-avf-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Xcbase-ndrpdr.64B-{core}-avf-ethip4vxlan-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Gtpusw-Ip4Base-ndrpdr.64B-{core}-ethip4gtpusw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-ndrpdr.64B-{core}-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Vxlan-L2Xcbase-ndrpdr.64B-{core}-ethip4vxlan-l2xcbase-ndrpdr"
   layout:
-    title: "2n-zn2-xxv710-78b-ip6routing-base-scale-dpdk-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
+    title: "3n-icx-xxv710-64b-{core}-ip4tunnel-base-{test_type}"
+    layout: "plot-throughput"
 
 - type: "plot"
-  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: "vpp-2n-zn2-curr-iter"
+  title: "Throughput: 3n-icx-xxv710-78b-{core}-ip6routing-base-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-78b-{core}-ip6routing-base-{test_type}"
+  data: "vpp-3n-icx-curr-iter"
+  core: ["2t1c", ]
   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"
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1Cx556A-Rdma-Ethip6-Ip6Scale20K-Ndrpdr.78B-.t.c-rdma-ethip6-ip6scale20k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1Cx556A-Rdma-Ethip6-Ip6Scale200K-Ndrpdr.78B-.t.c-rdma-ethip6-ip6scale200k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1Cx556A-Rdma-Ethip6-Ip6Scale2M-Ndrpdr.78B-.t.c-rdma-ethip6-ip6scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Avf-Ethip6-Ip6Base-ndrpdr.78B-{core}-avf-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Ethip6-Ip6Base-ndrpdr.78B-{core}-ethip6-ip6base-ndrpdr"
   layout:
-    title: "2n-zn2-cx556a-78b-rdma-ip6routing-base-scale-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
+    title: "3n-icx-xxv710-78b-{core}-ip6routing-base-{test_type}"
+    layout: "plot-throughput"
 
 - type: "plot"
-  title: "Speedup: 2n-zn2-x710-64b-l2switching-base-scale-avf-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-zn2-x710-64b-l2switching-base-scale-avf-{test_type}-tsa"
-  data: "vpp-2n-zn2-curr-iter"
+  title: "Throughput: 3n-icx-xxv710-64b-{core}-l2switching-base-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-64b-{core}-l2switching-base-{test_type}"
+  data: "vpp-3n-icx-curr-iter"
+  core: ["2t1c", ]
   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.25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-ndrpdr.64B-{core}-avf-dot1q-l2bdbasemaclrn-ndrpdr"
+    - "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"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Patch-ndrpdr.64B-{core}-eth-l2patch-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Xcbase-ndrpdr.64B-{core}-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-ndrpdr.64B-{core}-eth-l2bdbasemaclrn-ndrpdr"
   layout:
-    title: "2n-zn2-x710-64b-l2switching-base-scale-avf-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
+    title: "3n-icx-xxv710-64b-{core}-l2switching-base-{test_type}"
+    layout: "plot-throughput"
 
 - 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: "vpp-2n-zn2-curr-iter"
+  title: "Throughput: 3n-icx-xxv710-78b-{core}-srv6-ip6routing-base-avf-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-78b-{core}-srv6-ip6routing-base-avf-{test_type}"
+  data: "vpp-3n-icx-curr-iter"
+  core: ["2t1c", ]
   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.Srv6.25Ge2P1Xxv710-Avf-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-ndrpdr.78B-{core}-avf-ethip6ip6-ip6base-srv6enc1sid-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-ndrpdr.78B-{core}-avf-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Nodecaps-ndrpdr.78B-{core}-avf-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Proxy-Dyn-ndrpdr.78B-{core}-avf-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Proxy-Masq-ndrpdr.78B-{core}-avf-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Proxy-Stat-ndrpdr.78B-{core}-avf-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr"
   layout:
-    title: "2n-zn2-x710-64b-l2switching-base-scale-dpdk-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
+    title: "3n-icx-xxv710-78b-{core}-srv6-ip6routing-base-avf-{test_type}"
+    layout: "plot-throughput"
+
+# 3n-icx Speedup
 
 - type: "plot"
-  title: "Speedup: 2n-zn2-xxv710-64b-l2switching-base-avf-{test_type}-tsa"
+  title: "Speedup: 3n-icx-xxv710-1518b-ipsec-aes128cbc-ip4routing-base-scale-sw-avf-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-64b-l2switching-base-avf-{test_type}-tsa"
-  data: "vpp-2n-zn2-curr-iter"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-1518b-ipsec-aes128cbc-ip4routing-base-scale-sw-avf-{test_type}-tsa"
+  data: "vpp-3n-icx-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"
-    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Gbp-Ndrpdr.64B-.t.c-avf-dot1q-l2bdbasemaclrn-gbp-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Patch-Ndrpdr.64B-.t.c-avf-eth-l2patch-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Ndrpdr.64B-.t.c-avf-eth-l2xcbase-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-avf-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.1518B-.t.c-avf-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.1518B-.t.c-avf-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.1518B-.t.c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.1518B-.t.c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
   layout:
-    title: "2n-zn2-xxv710-64b-l2switching-base-avf-{test_type}"
+    title: "3n-icx-xxv710-1518b-ipsec-aes128cbc-ip4routing-base-scale-sw-avf-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 2n-zn2-xxv710-64b-l2switching-base-scale-avf-{test_type}-tsa"
+  title: "Speedup: 3n-icx-xxv710-1518b-ipsec-aes256gcm-ip4routing-base-scale-sw-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: "vpp-2n-zn2-curr-iter"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-1518b-ipsec-aes256gcm-ip4routing-base-scale-sw-avf-{test_type}-tsa"
+  data: "vpp-3n-icx-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"
-    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-.t.c-avf-eth-l2bdscale100kmaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-.t.c-avf-eth-l2bdscale1mmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.1518B-.t.c-avf-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.1518B-.t.c-avf-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.1518B-.t.c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.1518B-.t.c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
   layout:
-    title: "2n-zn2-xxv710-64b-l2switching-base-scale-avf-{test_type}"
+    title: "3n-icx-xxv710-1518b-ipsec-aes256gcm-ip4routing-base-scale-sw-avf-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 2n-zn2-xxv710-64b-l2switching-base-dpdk-{test_type}-tsa"
+  title: "Speedup: 3n-icx-xxv710-1518b-ipsec-scheduler-ip4routing-base-scale-sw-avf-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-64b-l2switching-base-dpdk-{test_type}-tsa"
-  data: "vpp-2n-zn2-curr-iter"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-1518b-ipsec-scheduler-ip4routing-base-scale-sw-avf-{test_type}-tsa"
+  data: "vpp-3n-icx-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"
-    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Gbp-Ndrpdr.64B-.t.c-dot1q-l2bdbasemaclrn-gbp-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Patch-Ndrpdr.64B-.t.c-eth-l2patch-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Ndrpdr.64B-.t.c-eth-l2xcbase-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1Tnlswasync-Scheduler-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.1518B-.t.c-avf-ethip4ipsec1tnlswasync-scheduler-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec8Tnlswasync-Scheduler-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.1518B-.t.c-avf-ethip4ipsec8tnlswasync-scheduler-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1Tnlswasync-Scheduler-Ip4Base-Int-Aes256Gcm-ndrpdr.1518B-.t.c-avf-ethip4ipsec1tnlswasync-scheduler-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec8Tnlswasync-Scheduler-Ip4Base-Int-Aes256Gcm-ndrpdr.1518B-.t.c-avf-ethip4ipsec8tnlswasync-scheduler-ip4base-int-aes256gcm-ndrpdr"
   layout:
-    title: "2n-zn2-xxv710-64b-l2switching-base-dpdk-{test_type}"
+    title: "3n-icx-xxv710-1518b-ipsec-scheduler-ip4routing-base-scale-sw-avf-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 2n-zn2-xxv710-64b-l2switching-base-scale-dpdk-{test_type}-tsa"
+  title: "Speedup: 3n-icx-xxv710-1518b-ipsec-ip4routing-base-scale-sw-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: "vpp-2n-zn2-curr-iter"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-1518b-ipsec-ip4routing-base-scale-sw-dpdk-{test_type}-tsa"
+  data: "vpp-3n-icx-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.Crypto.25Ge2P1Xxv710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.1518B-.t.c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.1518B-.t.c-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.1518B-.t.c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
   layout:
-    title: "2n-zn2-xxv710-64b-l2switching-base-scale-dpdk-{test_type}"
+    title: "3n-icx-xxv710-1518b-ipsec-ip4routing-base-scale-sw-dpdk-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 2n-zn2-cx556a-64b-rdma-l2switching-base-{test_type}-tsa"
+  title: "Speedup: 3n-icx-xxv710-1518b-ipsec-scheduler-ip4routing-base-scale-sw-dpdk-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-zn2-cx556a-64b-rdma-l2switching-base-{test_type}-tsa"
-  data: "vpp-2n-zn2-curr-iter"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-1518b-ipsec-scheduler-ip4routing-base-scale-sw-dpdk-{test_type}-tsa"
+  data: "vpp-3n-icx-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"
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Bdbasemaclrn-Gbp-Ndrpdr.64B-.t.c-rdma-dot1q-l2bdbasemaclrn-gbp-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Patch-Ndrpdr.64B-.t.c-rdma-eth-l2patch-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Xcbase-Ndrpdr.64B-.t.c-rdma-eth-l2xcbase-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-rdma-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec1Tnlswasync-Scheduler-Ip4Base-Int-Aes256Gcm-ndrpdr.1518B-.t.c-ethip4ipsec1tnlswasync-scheduler-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec8Tnlswasync-Scheduler-Ip4Base-Int-Aes256Gcm-ndrpdr.1518B-.t.c-ethip4ipsec8tnlswasync-scheduler-ip4base-int-aes256gcm-ndrpdr"
   layout:
-    title: "2n-zn2-cx556a-64b-rdma-l2switching-base-{test_type}"
+    title: "3n-icx-xxv710-1518b-ipsec-scheduler-ip4routing-base-scale-sw-dpdk-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 2n-zn2-cx556a-64b-rdma-l2switching-scale-{test_type}-tsa"
+  title: "Speedup: 3n-icx-xxv710-imix-ipsec-aes128cbc-ip4routing-base-scale-sw-avf-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-zn2-cx556a-64b-rdma-l2switching-scale-{test_type}-tsa"
-  data: "vpp-2n-zn2-curr-iter"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-imix-ipsec-aes128cbc-ip4routing-base-scale-sw-avf-{test_type}-tsa"
+  data: "vpp-3n-icx-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"
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-.t.c-rdma-eth-l2bdscale100kmaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-.t.c-rdma-eth-l2bdscale1mmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.imix-.t.c-avf-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.imix-.t.c-avf-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.imix-.t.c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.imix-.t.c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
   layout:
-    title: "2n-zn2-cx556a-64b-rdma-l2switching-scale-{test_type}"
+    title: "3n-icx-xxv710-imix-ipsec-aes128cbc-ip4routing-base-scale-sw-avf-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 2n-zn2-xxv710-64b-vhost-base-avf-{test_type}-tsa"
+  title: "Speedup: 3n-icx-xxv710-imix-ipsec-aes256gcm-ip4routing-base-scale-sw-avf-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-64b-vhost-base-avf-{test_type}-tsa"
-  data: "vpp-2n-zn2-curr-iter"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-imix-ipsec-aes256gcm-ip4routing-base-scale-sw-avf-{test_type}-tsa"
+  data: "vpp-3n-icx-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"
+    - "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-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.imix-.t.c-avf-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.imix-.t.c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.imix-.t.c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
   layout:
-    title: "2n-zn2-xxv710-64b-vhost-base-avf-{test_type}"
+    title: "3n-icx-xxv710-imix-ipsec-aes256gcm-ip4routing-base-scale-sw-avf-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 2n-zn2-xxv710-64b-vhost-base-avf-vpp-{test_type}-tsa"
+  title: "Speedup: 3n-icx-xxv710-imix-ipsec-scheduler-ip4routing-base-scale-sw-avf-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-64b-vhost-base-avf-vpp-{test_type}-tsa"
-  data: "vpp-2n-zn2-curr-iter"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-imix-ipsec-scheduler-ip4routing-base-scale-sw-avf-{test_type}-tsa"
+  data: "vpp-3n-icx-curr-iter"
   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"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1Tnlswasync-Scheduler-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.imix-.t.c-avf-ethip4ipsec1tnlswasync-scheduler-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec8Tnlswasync-Scheduler-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.imix-.t.c-avf-ethip4ipsec8tnlswasync-scheduler-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1Tnlswasync-Scheduler-Ip4Base-Int-Aes256Gcm-ndrpdr.imix-.t.c-avf-ethip4ipsec1tnlswasync-scheduler-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec8Tnlswasync-Scheduler-Ip4Base-Int-Aes256Gcm-ndrpdr.imix-.t.c-avf-ethip4ipsec8tnlswasync-scheduler-ip4base-int-aes256gcm-ndrpdr"
   layout:
-    title: "2n-zn2-xxv710-64b-vhost-base-avf-vpp-{test_type}"
+    title: "3n-icx-xxv710-imix-ipsec-scheduler-ip4routing-base-scale-sw-avf-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 2n-zn2-xxv710-64b-vhost-base-dpdk-{test_type}-tsa"
+  title: "Speedup: 3n-icx-xxv710-imix-ipsec-ip4routing-base-scale-sw-dpdk-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-64b-vhost-base-dpdk-{test_type}-tsa"
-  data: "vpp-2n-zn2-curr-iter"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-imix-ipsec-ip4routing-base-scale-sw-dpdk-{test_type}-tsa"
+  data: "vpp-3n-icx-curr-iter"
   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"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.imix-.t.c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.imix-.t.c-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.imix-.t.c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
   layout:
-    title: "2n-zn2-xxv710-64b-vhost-base-dpdk-{test_type}"
+    title: "3n-icx-xxv710-imix-ipsec-ip4routing-base-scale-sw-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: 3n-icx-xxv710-imix-ipsec-scheduler-ip4routing-base-scale-sw-dpdk-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-64b-vhost-base-dpdk-vpp-{test_type}-tsa"
-  data: "vpp-2n-zn2-curr-iter"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-imix-ipsec-scheduler-ip4routing-base-scale-sw-dpdk-{test_type}-tsa"
+  data: "vpp-3n-icx-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-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"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec1Tnlswasync-Scheduler-Ip4Base-Int-Aes256Gcm-ndrpdr.imix-.t.c-ethip4ipsec1tnlswasync-scheduler-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec8Tnlswasync-Scheduler-Ip4Base-Int-Aes256Gcm-ndrpdr.imix-.t.c-ethip4ipsec8tnlswasync-scheduler-ip4base-int-aes256gcm-ndrpdr"
   layout:
-    title: "2n-zn2-xxv710-64b-vhost-base-dpdk-vpp-{test_type}"
+    title: "3n-icx-xxv710-imix-ipsec-scheduler-ip4routing-base-scale-sw-dpdk-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 2n-zn2-cx556a-64b-rdma-l2-vhost-base-{test_type}-tsa"
+  title: "Speedup: 3n-icx-xxv710-64b-ip4routing-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: "vpp-2n-zn2-curr-iter"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-64b-ip4routing-base-{test_type}-tsa"
+  data: "vpp-3n-icx-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"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-ndrpdr.64B-.t.c-avf-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Base-ndrpdr.64B-.t.c-ethip4-ip4base-ndrpdr"
   layout:
-    title: "2n-zn2-cx556a-64b-rdma-l2-vhost-base-{test_type}"
+    title: "3n-icx-xxv710-64b-ip4routing-base-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 2n-zn2-cx556a-64b-rdma-l2-vhost-vppl2xc-base-{test_type}-tsa"
+  title: "Speedup: 3n-icx-xxv710-64b-ip4tunnel-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: "vpp-2n-zn2-curr-iter"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-64b-ip4tunnel-base-{test_type}-tsa"
+  data: "vpp-3n-icx-curr-iter"
   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"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Avf-Ethip4Gtpusw-Ip4Base-ndrpdr.64B-.t.c-avf-ethip4gtpusw-ip4base-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-Ethip4Vxlan-L2Xcbase-ndrpdr.64B-.t.c-avf-ethip4vxlan-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Gtpusw-Ip4Base-ndrpdr.64B-.t.c-ethip4gtpusw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-ndrpdr.64B-.t.c-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Vxlan-L2Xcbase-ndrpdr.64B-.t.c-ethip4vxlan-l2xcbase-ndrpdr"
   layout:
-    title: "2n-zn2-cx556a-64b-2t1c-l2-vhost-vppl2xc-base-{test_type}"
+    title: "3n-icx-xxv710-64b-ip4tunnel-base-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 2n-zn2-xxv710-114b-vts-l2switching-base-dpdk-{test_type}-tsa"
+  title: "Speedup: 3n-icx-xxv710-78b-ip6routing-base-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-114b-vts-l2switching-base-dpdk-{test_type}-tsa"
-  data: "vpp-2n-zn2-curr-iter"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-78b-ip6routing-base-{test_type}-tsa"
+  data: "vpp-3n-icx-curr-iter"
   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"
+    - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Avf-Ethip6-Ip6Base-ndrpdr.78B-.t.c-avf-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Ethip6-Ip6Base-ndrpdr.78B-.t.c-ethip6-ip6base-ndrpdr"
   layout:
-    title: "2n-zn2-xxv710-114b-vts-l2switching-base-[avf,dpdk]-{test_type}"
+    title: "3n-icx-xxv710-78b-ip6routing-base-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
-# Packet Throughput - DPDK
-
-# 2n-zn2
-
 - type: "plot"
-  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: "dpdk-2n-zn2-curr-iter"
-  core: ["2t1c", "4t2c"]
+  title: "Speedup: 3n-icx-xxv710-64b-l2switching-base-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-64b-l2switching-base-{test_type}-tsa"
+  data: "vpp-3n-icx-curr-iter"
   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"
+    - "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"
+    - "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"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-ndrpdr"
   layout:
-    title: "2n-zn2-xxv710-64b-{core}-base-{test_type}"
-    layout: "plot-throughput"
+    title: "3n-icx-xxv710-64b-l2switching-base-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  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: "dpdk-2n-zn2-curr-iter"
-  core: ["2t1c", "4t2c"]
+  title: "Speedup: 3n-icx-xxv710-78b-srv6-ip6routing-base-avf-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-78b-srv6-ip6routing-base-avf-{test_type}-tsa"
+  data: "vpp-3n-icx-curr-iter"
   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"
+    - "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"
+    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Nodecaps-ndrpdr.78B-.t.c-avf-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Proxy-Dyn-ndrpdr.78B-.t.c-avf-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Proxy-Masq-ndrpdr.78B-.t.c-avf-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Proxy-Stat-ndrpdr.78B-.t.c-avf-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr"
   layout:
-    title: "2n-zn2-x710-64b-{core}-base-{test_type}"
-    layout: "plot-throughput"
+    title: "3n-icx-xxv710-78b-srv6-ip6routing-base-avf-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
 
 ################################################################################
 
@@ -11999,6 +13954,17 @@
   layout:
     layout: "plot-hdrh-latency-percentile-x-log"
 
+- type: "plot"
+  title: "Latency by percentile: TRex 2n-skx"
+  algorithm: "plot_hdrh_lat_by_percentile_x_log"
+  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"
+
 - type: "plot"
   title: "Latency by percentile: 2n-zn2"
   algorithm: "plot_hdrh_lat_by_percentile_x_log"
@@ -12032,6 +13998,17 @@
   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: "vpp-2n-clx-curr-iter-best"
+  filter: "'2T1C' and 'NIC_Mellanox-CX556A'"
+  layout:
+    layout: "plot-hdrh-latency-percentile-x-log"
+
 - type: "plot"
   title: "Latency by percentile: 2n-icx"
   algorithm: "plot_hdrh_lat_by_percentile_x_log"
@@ -12039,7 +14016,7 @@
   output-file-links: "{DIR[LAT,VPP]}/2n_icx.rst"
   target-links: "../../_static/vpp"
   data: "vpp-2n-icx-curr-iter-best"
-  filter: "'2T1C' and 'NIC_Intel-E810CQ' and 'NDRPDR'"
+  filter: "'2T1C' and 'NIC_Intel-XXV710' and 'NDRPDR'"
   layout:
     layout: "plot-hdrh-latency-percentile-x-log"
 
@@ -12050,7 +14027,7 @@
   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'"
+  filter: "'2T1C' and 'NIC_Intel-XXV710' and 'NDRPDR'"
   layout:
     layout: "plot-hdrh-latency-percentile-x-log"
 
@@ -12076,6 +14053,50 @@
   layout:
     layout: "plot-hdrh-latency-percentile-x-log"
 
+- type: "plot"
+  title: "Latency by percentile: 2n-aws"
+  algorithm: "plot_hdrh_lat_by_percentile_x_log"
+  output-file: "{DIR[STATIC,VPP]}/hdrh-lat-percentile-2n-aws"
+  output-file-links: "{DIR[LAT,VPP]}/2n_aws.rst"
+  target-links: "../../_static/vpp"
+  data: "vpp-2n-aws-curr-iter-best"
+  filter: "'2T1C'"
+  layout:
+    layout: "plot-hdrh-latency-percentile-x-log"
+
+- type: "plot"
+  title: "Latency by percentile: 3n-aws"
+  algorithm: "plot_hdrh_lat_by_percentile_x_log"
+  output-file: "{DIR[STATIC,VPP]}/hdrh-lat-percentile-3n-aws"
+  output-file-links: "{DIR[LAT,VPP]}/3n_aws.rst"
+  target-links: "../../_static/vpp"
+  data: "vpp-3n-aws-curr-iter-best"
+  filter: "'2T1C'"
+  layout:
+    layout: "plot-hdrh-latency-percentile-x-log"
+
+- type: "plot"
+  title: "Latency by percentile: DPDK 2n-icx"
+  algorithm: "plot_hdrh_lat_by_percentile_x_log"
+  output-file: "{DIR[STATIC,DPDK]}/hdrh-lat-percentile-2n-icx"
+  output-file-links: "{DIR[LAT,DPDK]}/2n_icx.rst"
+  target-links: "../../_static/dpdk"
+  data: "dpdk-2n-icx-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-icx"
+  algorithm: "plot_hdrh_lat_by_percentile_x_log"
+  output-file: "{DIR[STATIC,DPDK]}/hdrh-lat-percentile-3n-icx"
+  output-file-links: "{DIR[LAT,DPDK]}/3n_icx.rst"
+  target-links: "../../_static/dpdk"
+  data: "dpdk-3n-icx-curr-iter-best"
+  filter: "'2T1C' and 'NIC_Intel-XXV710'"
+  layout:
+    layout: "plot-hdrh-latency-percentile-x-log"
+
 - type: "plot"
   title: "Latency by percentile: DPDK 2n-skx"
   algorithm: "plot_hdrh_lat_by_percentile_x_log"
@@ -12131,24 +14152,41 @@
   layout:
     layout: "plot-hdrh-latency-percentile-x-log"
 
-# - type: "plot"
-#   title: "Latency by percentile: DPDK 2n-tx2"
-#   algorithm: "plot_hdrh_lat_by_percentile_x_log"
-#   output-file: "{DIR[STATIC,DPDK]}/hdrh-lat-percentile-2n-tx2"
-#   output-file-links: "{DIR[LAT,DPDK]}/2n-tx2.rst"
-#   target-links: "../../_static/dpdk"
-#   data: "dpdk-2n-tx2-curr-iter-best"
-#   filter: "'1T1C' and 'NIC_Intel-XL710'"
-#   layout:
-#     layout: "plot-hdrh-latency-percentile-x-log"
+- type: "plot"
+  title: "Latency by percentile: DPDK 2n-tx2"
+  algorithm: "plot_hdrh_lat_by_percentile_x_log"
+  output-file: "{DIR[STATIC,DPDK]}/hdrh-lat-percentile-2n-tx2"
+  output-file-links: "{DIR[LAT,DPDK]}/2n-tx2.rst"
+  target-links: "../../_static/dpdk"
+  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-icx-128kb-{core}-ip4routing-iperf3"
+  algorithm: "plot_mrr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-128kb-{core}-ip4routing-iperf3"
+  data: "vpp-2n-icx-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"
+    - "Tests.Vpp.Perf.Gso.2N1L-10Ge2P1X710-Ethip4-Ip4Base-2Tap-Iperf3-Mrr.128KB-{core}-ethip4-ip4base-2tap-iperf3-mrr"
+    - "Tests.Vpp.Perf.Gso.2N1L-10Ge2P1X710-Ethip4-Ip4Base-2Vhost-Gso-Iperf3-Mrr.128KB-{core}-ethip4-ip4base-2vhost-gso-iperf3-mrr"
+    - "Tests.Vpp.Perf.Gso.2N1L-10Ge2P1X710-Ethip4-Ip4Base-2Vhost-Iperf3-Mrr.128KB-{core}-ethip4-ip4base-2vhost-iperf3-mrr"
+  layout:
+    title: "2n-icx-128kb-{core}-ip4routing-iperf3"
+    layout: "plot-throughput-gbps"
+
 - 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: "vpp-2n-skx-curr-gso"
+  data: "vpp-2n-skx-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"
@@ -12188,3 +14226,75 @@
   layout:
     title: "2n-zn2-128kb-{core}-ip4routing-iperf3"
     layout: "plot-throughput-gbps"
+
+###############################################################################
+
+# 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"