Code Review / csit.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Report: Add rls data, fixes
[csit.git] / resources / tools / presentation / specifications / report / elements.yaml
diff --git a/resources/tools/presentation/specifications/report/elements.yaml b/resources/tools/presentation/specifications/report/elements.yaml
index 9188da3..f4c7727 100644 (file)
--- a/resources/tools/presentation/specifications/report/elements.yaml
+++ b/resources/tools/presentation/specifications/report/elements.yaml
@@ -4,6 +4,162 @@
 
 # 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:
+    - job-spec: "gso-00"
+      build: "1"
+    - job-spec: "ip4-00"
+      build: "2"
+    - job-spec: "ip4-01"
+      build: "3"
+    - job-spec: "ip4-02"
+      build: "4"
+    - job-spec: "ip4-03"
+      build: "5"
+    - job-spec: "ip4-04"
+      build: "6"
+    - job-spec: "ip4-05"
+      build: "7"
+    - job-spec: "ip4-06"
+      build: "8"
+    - job-spec: "ip4-07"
+      build: "9"
+    - job-spec: "ip4tun-00"
+      build: "10"
+    - job-spec: "ip6-00"
+      build: "11"
+    - job-spec: "ip6-01"
+      build: "12"
+    - job-spec: "l2-00"
+      build: "13"
+    - job-spec: "l2-01"
+      build: "14"
+    - job-spec: "lb-00"
+      build: "15"
+    - job-spec: "memif-00"
+      build: "16"
+    - job-spec: "vhost-00"
+      build: "17"
+
+- type: "table"
+  title: "Job Specification Duration: 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: "1"
+    - job-spec: "crypto-01"
+      build: "2"
+    - job-spec: "crypto-02"
+      build: "3"
+    - job-spec: "crypto-03"
+      build: "35"
+    - job-spec: "crypto-04"
+      build: "4"
+    - job-spec: "crypto-05"
+      build: "34"
+    - job-spec: "ip4-00"
+      build: "5"
+    - job-spec: "ip4-01"
+      build: "6"
+    - job-spec: "ip4-02"
+      build: "7"
+    - job-spec: "ip4-03"
+      build: "8"
+    - job-spec: "ip4-04"
+      build: "9"
+    - job-spec: "ip4-05"
+      build: "10"
+    - job-spec: "ip4-06"
+      build: "11"
+    - job-spec: "ip4-07"
+      build: "12"
+    - job-spec: "ip4tun-00"
+      build: "13"
+    - job-spec: "ip4tun-02"
+      build: "14"
+    - job-spec: "ip6-00"
+      build: "15"
+    - job-spec: "ip6-01"
+      build: "16"
+    - job-spec: "ip6tun-00"
+      build: "17"
+    - job-spec: "l2-00"
+      build: "18"
+    - job-spec: "l2-01"
+      build: "19"
+    - job-spec: "l2-02"
+      build: "20"
+    - job-spec: "l2-03"
+      build: "21"
+    - job-spec: "l2-04"
+      build: "22"
+    - job-spec: "l2-05"
+      build: "23"
+    - job-spec: "l2-06"
+      build: "24"
+    - job-spec: "l2-07"
+      build: "25"
+    - job-spec: "l2-08"
+      build: "26"
+    - job-spec: "l2-09"
+      build: "27"
+    - job-spec: "l2-10"
+      build: "28"
+    - job-spec: "memif-00"
+      build: "29"
+    - job-spec: "srv6-00"
+      build: "30"
+    - job-spec: "srv6-01"
+      build: "31"
+    - job-spec: "vhost-00"
+      build: "32"
+    - job-spec: "vhost-01"
+      build: "33"
+
 - type: "table"
   title: "Job Specification Duration: 2n-clx-iterative"
   algorithm: "table_job_spec_duration"
@@ -29,47 +185,47 @@
     - 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-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: "4"
+    - job-spec: "ip4-00"
+      build: "5"
+    - job-spec: "ip4-01"
+      build: "6"
+    - job-spec: "ip4-02"
+      build: "7"
+    - job-spec: "ip4-03"
+      build: "8"
+    - job-spec: "ip4-04"
+      build: "9"
+    - job-spec: "ip4-05"
+      build: "10"
+    - job-spec: "ip4-06"
+      build: "11"
+    - job-spec: "ip4-07"
+      build: "12"
+    - job-spec: "ip4tun-00"
+      build: "13"
+    - job-spec: "ip6-00"
+      build: "14"
+    - job-spec: "ip6-01"
+      build: "15"
+    - job-spec: "l2-00"
+      build: "16"
+    - job-spec: "l2-01"
+      build: "17"
+    - job-spec: "lb-00"
+      build: "18"
+    - job-spec: "memif-00"
+      build: "19"
+    - job-spec: "vhost-00"
+      build: "20"
 
 - type: "table"
   title: "Job Specification Duration: 2n-dnv-iterative"
@@ -82,25 +238,25 @@
     - job-spec: "vpp-mlr-00"
       data-set: "vpp-2n-dnv-curr-iter"
 
-# - type: "table"
-#   title: "Job Specification Duration: 2n-dnv-coverage"
-#   algorithm: "table_job_spec_duration"
-#   output-file: "{DIR[STATIC,VPP]}/job-spec-duration-2n-dnv-cov"
-#   jb-type: "coverage"
-#   data: "vpp-2n-dnv-curr-cov"
-#   lines:
-#     - job-spec: "ip4-00"
-#       build: "7"
-#     - job-spec: "ip4-01"
-#       build: "8"
-#     - job-spec: "ip6-00"
-#       build: "9"
-#     - job-spec: "ip6-01"
-#       build: "10"
-#     - job-spec: "l2-00"
-#       build: "11"
-#     - job-spec: "l2-01"
-#       build: "12"
+- 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: "1"
+    - job-spec: "ip4-01"
+      build: "7"
+    - job-spec: "ip6-00"
+      build: "3"
+    - job-spec: "ip6-01"
+      build: "4"
+    - job-spec: "l2-00"
+      build: "5"
+    - job-spec: "l2-01"
+      build: "6"
 
 - type: "table"
   title: "Job Specification Duration: 2n-aws-iterative"
@@ -113,26 +269,26 @@
     - 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: "26"
-
 - type: "table"
-  title: "Job Specification Duration: 3n-aws-iterative"
+  title: "Job Specification Duration: 2n-aws-coverage"
   algorithm: "table_job_spec_duration"
-  output-file: "{DIR[STATIC,VPP]}/job-spec-duration-3n-aws-iter"
-  jb-type: "iterative"
+  output-file: "{DIR[STATIC,VPP]}/job-spec-duration-2n-aws-cov"
+  jb-type: "coverage"
+  data: "vpp-2n-aws-curr-cov"
   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"
+    - 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"
@@ -142,7 +298,7 @@
 #   data: "vpp-3n-aws-curr-cov"
 #   lines:
 #     - job-spec: "vpp-00"
-#       build: "34"
+#       build: "1"
 
 - type: "table"
   title: "Job Specification Duration: 2n-skx-iterative"
@@ -155,7 +311,7 @@
     - job-spec: "vpp-mlr-00"
       data-set: "vpp-2n-skx-curr-iter"
     - job-spec: "vpp-gso-mrr-00"
-      data-set: "vpp-2n-skx-curr-gso"
+      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"
@@ -169,47 +325,47 @@
     - 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-skx-coverage"
+  algorithm: "table_job_spec_duration"
+  output-file: "{DIR[STATIC,VPP]}/job-spec-duration-2n-skx-cov"
+  jb-type: "coverage"
+  data: "vpp-2n-skx-curr-cov"
+  lines:
+    - job-spec: "gso-00"
+      build: "1"
+    - job-spec: "ip4-00"
+      build: "2"
+    - job-spec: "ip4-01"
+      build: "3"
+    - job-spec: "ip4-02"
+      build: "4"
+    - job-spec: "ip4-03"
+      build: "5"
+    - job-spec: "ip4-04"
+      build: "6"
+    - job-spec: "ip4-05"
+      build: "7"
+    - job-spec: "ip4-06"
+      build: "8"
+    - job-spec: "ip4-07"
+      build: "9"
+    - job-spec: "ip4tun-00"
+      build: "10"
+    - job-spec: "ip6-00"
+      build: "11"
+    - job-spec: "ip6-01"
+      build: "12"
+    - job-spec: "l2-00"
+      build: "13"
+    - job-spec: "l2-01"
+      build: "14"
+    - job-spec: "lb-00"
+      build: "15"
+    - job-spec: "memif-00"
+      build: "16"
+    - job-spec: "vhost-00"
+      build: "17"
 
 - type: "table"
   title: "Job Specification Duration: 2n-tx2-iterative"
@@ -222,41 +378,41 @@
     - job-spec: "vpp-mlr-00"
       data-set: "vpp-2n-tx2-curr-iter"
 
-# - type: "table"
-#   title: "Job Specification Duration: 2n-tx2-coverage"
-#   algorithm: "table_job_spec_duration"
-#   output-file: "{DIR[STATIC,VPP]}/job-spec-duration-2n-tx2-cov"
-#   jb-type: "coverage"
-#   data: "vpp-2n-tx2-curr-cov"
-#   lines:
-#     - job-spec: "ip4-00"
-#       build: "1"
-#     - job-spec: "ip4-01"
-#       build: "2"
-#     - job-spec: "ip4-02"
-#       build: "3"
-#     - job-spec: "ip4-03"
-#       build: "4"
-#     - job-spec: "ip4-04"
-#       build: "5"
-#     - job-spec: "ip4-05"
-#       build: "6"
-#     - job-spec: "ip4-06"
-#       build: "7"
-#     - job-spec: "ip6-00"
-#       build: "8"
-#     - job-spec: "ip6-01"
-#       build: "9"
-#     - job-spec: "l2-00"
-#       build: "10"
-#     - job-spec: "l2-01"
-#       build: "11"
-#     - job-spec: "l2-02"
-#       build: "12"
-#     - job-spec: "l2-03"
-#       build: "13"
-#     - job-spec: "l2-04"
-#       build: "14"
+- type: "table"
+  title: "Job Specification Duration: 2n-tx2-coverage"
+  algorithm: "table_job_spec_duration"
+  output-file: "{DIR[STATIC,VPP]}/job-spec-duration-2n-tx2-cov"
+  jb-type: "coverage"
+  data: "vpp-2n-tx2-curr-cov"
+  lines:
+    - job-spec: "ip4-00"
+      build: "1"
+    - job-spec: "ip4-01"
+      build: "2"
+    - job-spec: "ip4-02"
+      build: "3"
+    - job-spec: "ip4-03"
+      build: "4"
+    - job-spec: "ip4-04"
+      build: "5"
+    - job-spec: "ip4-05"
+      build: "6"
+    - job-spec: "ip4-06"
+      build: "7"
+    - job-spec: "ip6-00"
+      build: "8"
+    - job-spec: "ip6-01"
+      build: "9"
+    - job-spec: "l2-00"
+      build: "10"
+    - job-spec: "l2-01"
+      build: "11"
+    - job-spec: "l2-02"
+      build: "12"
+    - job-spec: "l2-03"
+      build: "13"
+    - job-spec: "l2-04"
+      build: "14"
 
 - type: "table"
   title: "Job Specification Duration: 2n-zn2-iterative"
@@ -273,43 +429,43 @@
     - job-spec: "dpdk-mlr-00"
       data-set: "dpdk-2n-zn2-curr-iter"
 
-# - type: "table"
-#   title: "Job Specification Duration: 2n-zn2-coverage"
-#   algorithm: "table_job_spec_duration"
-#   output-file: "{DIR[STATIC,VPP]}/job-spec-duration-2n-zn2-cov"
-#   jb-type: "coverage"
-#   data: "vpp-2n-zn2-curr-cov"
-#   lines:
-#     - job-spec: "gso-00"
-#       build: "1"
-#     - job-spec: "ip4-00"
-#       build: "2"
-#     - job-spec: "ip4-01"
-#       build: "3"
-#     - job-spec: "ip4-02"
-#       build: "4"
-#     - job-spec: "ip4-03"
-#       build: "18"
-#     - job-spec: "ip4-04"
-#       build: "6"
-#     - job-spec: "ip4-05"
-#       build: "7"
-#     - job-spec: "ip4tun-00"
-#       build: "8"
-#     - job-spec: "ip6-00"
-#       build: "9"
-#     - job-spec: "ip6-01"
-#       build: "19"
-#     - job-spec: "l2-00"
-#       build: "11"
-#     - job-spec: "l2-01"
-#       build: "12"
-#     - job-spec: "lb-00"
-#       build: "13"
-#     - job-spec: "memif-00"
-#       build: "14"
-#     - job-spec: "vhost-00"
-#       build: "15"
+- type: "table"
+  title: "Job Specification Duration: 2n-zn2-coverage"
+  algorithm: "table_job_spec_duration"
+  output-file: "{DIR[STATIC,VPP]}/job-spec-duration-2n-zn2-cov"
+  jb-type: "coverage"
+  data: "vpp-2n-zn2-curr-cov"
+  lines:
+    # - job-spec: "gso-00"
+    #   build: "1"
+    - job-spec: "ip4-00"
+      build: "2"
+    - job-spec: "ip4-01"
+      build: "3"
+    - job-spec: "ip4-02"
+      build: "4"
+    - job-spec: "ip4-03"
+      build: "5"
+    - job-spec: "ip4-04"
+      build: "6"
+    - job-spec: "ip4-05"
+      build: "7"
+    # - job-spec: "ip4tun-00"
+    #   build: "8"
+    - job-spec: "ip6-00"
+      build: "9"
+    # - job-spec: "ip6-01"
+    #   build: "10"
+    - job-spec: "l2-00"
+      build: "11"
+    - job-spec: "l2-01"
+      build: "12"
+    # - job-spec: "lb-00"
+    #   build: "13"
+    # - job-spec: "memif-00"
+    #   build: "14"
+    # - job-spec: "vhost-00"
+    #   build: "15"
 
 - type: "table"
   title: "Job Specification Duration: 3n-dnv-iterative"
@@ -322,33 +478,33 @@
     - 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: "12"
-#     - job-spec: "crypto-01"
-#       build: "13"
-#     - job-spec: "crypto-02"
-#       build: "14"
-#     - job-spec: "ip4-00"
-#       build: "15"
-#     - job-spec: "ip4-01"
-#       build: "16"
-#     - job-spec: "ip4tun-00"
-#       build: "17"
-#     - job-spec: "ip6-00"
-#       build: "18"
-#     - job-spec: "ip6-01"
-#       build: "19"
-#     - job-spec: "l2-00"
-#       build: "20"
-#     - job-spec: "l2-01"
-#       build: "21"
+- 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: "1"
+    - job-spec: "crypto-01"
+      build: "2"
+    - job-spec: "crypto-02"
+      build: "3"
+    - job-spec: "ip4-00"
+      build: "4"
+    - job-spec: "ip4-01"
+      build: "5"
+    - job-spec: "ip4tun-00"
+      build: "6"
+    - job-spec: "ip6-00"
+      build: "7"
+    - job-spec: "ip6-01"
+      build: "8"
+    - job-spec: "l2-00"
+      build: "9"
+    - job-spec: "l2-01"
+      build: "10"
 
 - type: "table"
   title: "Job Specification Duration: 3n-skx-iterative"
@@ -365,81 +521,81 @@
     - 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: "38"
-#     - job-spec: "crypto-04"
-#       build: "39"
-#     - job-spec: "ip4-00"
-#       build: "40"
-#     - job-spec: "ip4-01"
-#       build: "41"
-#     - job-spec: "ip4-02"
-#       build: "42"
-#     - job-spec: "ip4-03"
-#       build: "43"
-#     - job-spec: "ip4-04"
-#       build: "44"
-#     - job-spec: "ip4-05"
-#       build: "45"
-#     - job-spec: "ip4-06"
-#       build: "46"
-#     - job-spec: "ip4-07"
-#       build: "47"
-#     - job-spec: "ip4tun-00"
-#       build: "48"
-#     - job-spec: "ip4tun-02"
-#       build: "49"
-#     - job-spec: "ip6-00"
-#       build: "50"
-#     - job-spec: "ip6-01"
-#       build: "51"
-#     - job-spec: "ip6tun-00"
-#       build: "52"
-#     - job-spec: "l2-00"
-#       build: "53"
-#     - job-spec: "l2-01"
-#       build: "54"
-#     - job-spec: "l2-02"
-#       build: "55"
-#     - job-spec: "l2-03"
-#       build: "56"
-#     - job-spec: "l2-04"
-#       build: "57"
-#     - job-spec: "l2-05"
-#       build: "58"
-#     - job-spec: "l2-06"
-#       build: "59"
-#     - job-spec: "l2-07"
-#       build: "60"
-#     - job-spec: "l2-08"
-#       build: "61"
-#     - job-spec: "l2-09"
-#       build: "62"
-#     - job-spec: "l2-10"
-#       build: "63"
-#     - job-spec: "memif-00"
-#       build: "64"
-#     - job-spec: "srv6-00"
-#       build: "65"
-#     - job-spec: "srv6-01"
-#       build: "66"
-#     - job-spec: "vhost-00"
-#       build: "67"
-#     - job-spec: "vhost-01"
-#       build: "68"
+- type: "table"
+  title: "Job Specification Duration: 3n-skx-coverage"
+  algorithm: "table_job_spec_duration"
+  output-file: "{DIR[STATIC,VPP]}/job-spec-duration-3n-skx-cov"
+  jb-type: "coverage"
+  data: "vpp-3n-skx-curr-cov"
+  lines:
+    - job-spec: "crypto-00"
+      build: "1"
+    - job-spec: "crypto-01"
+      build: "2"
+    - job-spec: "crypto-02"
+      build: "3"
+    - job-spec: "crypto-03"
+      build: "34"
+    - job-spec: "crypto-04"
+      build: "4"
+    - job-spec: "ip4-00"
+      build: "5"
+    - job-spec: "ip4-01"
+      build: "6"
+    - job-spec: "ip4-02"
+      build: "7"
+    - job-spec: "ip4-03"
+      build: "8"
+    - job-spec: "ip4-04"
+      build: "9"
+    - job-spec: "ip4-05"
+      build: "10"
+    - job-spec: "ip4-06"
+      build: "11"
+    - job-spec: "ip4-07"
+      build: "12"
+    - job-spec: "ip4tun-00"
+      build: "13"
+    - job-spec: "ip4tun-02"
+      build: "14"
+    - job-spec: "ip6-00"
+      build: "15"
+    - job-spec: "ip6-01"
+      build: "16"
+    - job-spec: "ip6tun-00"
+      build: "17"
+    - job-spec: "l2-00"
+      build: "18"
+    - job-spec: "l2-01"
+      build: "19"
+    - job-spec: "l2-02"
+      build: "20"
+    - job-spec: "l2-03"
+      build: "21"
+    - job-spec: "l2-04"
+      build: "22"
+    - job-spec: "l2-05"
+      build: "23"
+    - job-spec: "l2-06"
+      build: "24"
+    - job-spec: "l2-07"
+      build: "25"
+    - job-spec: "l2-08"
+      build: "26"
+    - job-spec: "l2-09"
+      build: "27"
+    - job-spec: "l2-10"
+      build: "28"
+    - job-spec: "memif-00"
+      build: "29"
+    - job-spec: "srv6-00"
+      build: "30"
+    - job-spec: "srv6-01"
+      build: "31"
+    - job-spec: "vhost-00"
+      build: "32"
+    - job-spec: "vhost-01"
+      build: "33"
 
 - type: "table"
   title: "Job Specification Duration: 3n-tsh-iterative"
@@ -454,233 +610,1296 @@
     - 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: "1"
-#     - job-spec: "ip4-01"
-#       build: "2"
-#     - job-spec: "ip4-02"
-#       build: "3"
-#     - job-spec: "ip4-03"
-#       build: "4"
-#     - job-spec: "ip4tun-00"
-#       build: "5"
-#     - job-spec: "ip6-00"
-#       build: "6"
-#     - job-spec: "ip6-01"
-#       build: "7"
-#     - job-spec: "l2-00"
-#       build: "8"
-#     - job-spec: "l2-01"
-#       build: "9"
-#     - job-spec: "l2-02"
-#       build: "10"
-#     - job-spec: "l2-03"
-#       build: "11"
-#     - job-spec: "l2-04"
-#       build: "12"
-#     - job-spec: "memif-00"
-#       build: "13"
-#     - job-spec: "srv6-00"
-#       build: "14"
-#     - job-spec: "srv6-01"
-#       build: "15"
-#     - job-spec: "vhost-00"
-#       build: "16"
-#     - job-spec: "vhost-01"
-#       build: "17"
+- 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: "1"
+    - job-spec: "ip4-01"
+      build: "2"
+    - job-spec: "ip4-02"
+      build: "3"
+    - job-spec: "ip4-03"
+      build: "4"
+    - job-spec: "ip4tun-00"
+      build: "5"
+    - job-spec: "ip6-00"
+      build: "6"
+    - job-spec: "ip6-01"
+      build: "7"
+    - job-spec: "l2-00"
+      build: "8"
+    - job-spec: "l2-01"
+      build: "9"
+    - job-spec: "l2-02"
+      build: "10"
+    - job-spec: "l2-03"
+      build: "11"
+    - job-spec: "l2-04"
+      build: "12"
+    - job-spec: "memif-00"
+      build: "13"
+    - job-spec: "srv6-00"
+      build: "14"
+    - job-spec: "srv6-01"
+      build: "15"
+    - job-spec: "vhost-00"
+      build: "16"
+    - job-spec: "vhost-01"
+      build: "17"
+
+- type: "table"
+  title: "Job Specification Duration: 3n-alt-iterative"
+  algorithm: "table_job_spec_duration"
+  output-file: "{DIR[STATIC,VPP]}/job-spec-duration-3n-alt-iter"
+  jb-type: "iterative"
+  lines:
+    - job-spec: "vpp-mrr-00"
+      data-set: "vpp-3n-alt-curr-iter-mrr"
+    - job-spec: "vpp-mlr-00"
+      data-set: "vpp-3n-alt-curr-iter"
+    - job-spec: "dpdk-mlr-00"
+      data-set: "dpdk-3n-alt-curr-iter"
 
-# VPP Latency Changes 3n-skx 2t1c
 - type: "table"
-  title: "VPP Latency Changes 3n-skx 2t1c PDR50-direction1-avg"
+  title: "Job Specification Duration: 3n-alt-coverage"
+  algorithm: "table_job_spec_duration"
+  output-file: "{DIR[STATIC,VPP]}/job-spec-duration-3n-alt-cov"
+  jb-type: "coverage"
+  data: "vpp-3n-alt-curr-cov"
+  lines:
+    # - job-spec: "ip4-00"
+    #   build: "1"
+    - job-spec: "ip4-01"
+      build: "2"
+    - job-spec: "ip4-02"
+      build: "3"
+    # - job-spec: "ip4-03"
+    #   build: "4"
+    - job-spec: "ip4tun-00"
+      build: "5"
+    - job-spec: "ip6-00"
+      build: "6"
+    # - job-spec: "ip6-01"
+    #   build: "7"
+    # - job-spec: "l2-00"
+    #   build: "8"
+    # - job-spec: "l2-01"
+    #   build: "9"
+    - job-spec: "l2-02"
+      build: "10"
+    - job-spec: "l2-03"
+      build: "11"
+    - job-spec: "l2-04"
+      build: "12"
+    # - job-spec: "memif-00"
+    #   build: "13"
+    # - job-spec: "srv6-00"
+    #   build: "14"
+    # - job-spec: "srv6-01"
+    #   build: "15"
+    # - job-spec: "vhost-00"
+    #   build: "16"
+    # - job-spec: "vhost-01"
+    #   build: "17"
+
+# VPP Normalized Comparison Across Testbeds 2n-skx to 2n-clx 2t1c ndr
+- type: "table"
+  title: "VPP Normalized Comparison Across Testbeds 2n-skx to 2n-clx 2t1c ndr"
   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'"
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-2n-skx-2n-clx-2t1c-ndr"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T1C' and 'NIC_Intel-XXV710'"
   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"
+    - title: "2n-skx xxv710"
+      data-set: "vpp-2n-skx-curr-iter"
+    - title: "2n-clx xxv710"
+      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
+    - title: "2n-clx vs 2n-skx"
+      reference: 1
+      compare: 2
+    - title: "Normalized 2n-clx vs 2n-skx"
+      reference: 1
+      compare: 2
+      norm-ref: "2n-skx"
+      norm-cmp: "2n-clx"
   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.'
+    - 'Test Case:                   Test cases executed for: NDR throughput on 2n-skx and 2n-clx with xxv710.'
+    - '2n-skx, 2n-clx:              [Mpps +- StDev] results for VPP tested in CSIT'
+    - '2n-clx vs 2n-skx:            [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - 'Normalized 2n-clx vs 2n-skx: [% +- StDev] Normalized relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
 
-# VPP Latency Changes 3n-skx 2t1c
+# VPP Normalized Comparison Across Testbeds 2n-skx to 2n-clx 4t2c ndr
 - type: "table"
-  title: "VPP Latency Changes 3n-skx 2t1c PDR90-direction1-avg"
+  title: "VPP Normalized Comparison Across Testbeds 2n-skx to 2n-clx 4t2c ndr"
   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'"
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-2n-skx-2n-clx-4t2c-ndr"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T2C' and 'NIC_Intel-XXV710'"
   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"
+    - title: "2n-skx xxv710"
+      data-set: "vpp-2n-skx-curr-iter"
+    - title: "2n-clx xxv710"
+      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
+    - title: "2n-clx vs 2n-skx"
+      reference: 1
+      compare: 2
+    - title: "Normalized 2n-clx vs 2n-skx"
+      reference: 1
+      compare: 2
+      norm-ref: "2n-skx"
+      norm-cmp: "2n-clx"
   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.'
+    - 'Test Case:                   Test cases executed for: NDR throughput on 2n-skx and 2n-clx with xxv710.'
+    - '2n-skx, 2n-clx:              [Mpps +- StDev] results for VPP tested in CSIT'
+    - '2n-clx vs 2n-skx:            [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - 'Normalized 2n-clx vs 2n-skx: [% +- StDev] Normalized relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
 
-# VPP Latency Changes 3n-skx 2t1c
+# VPP Normalized Comparison Across Testbeds 2n-skx to 2n-clx 2t1c pdr
 - type: "table"
-  title: "VPP Latency Changes 3n-skx 2t1c PDR90-direction1-max"
+  title: "VPP Normalized Comparison Across Testbeds 2n-skx to 2n-clx 2t1c pdr"
   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'"
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-2n-skx-2n-clx-2t1c-pdr"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T1C' and 'NIC_Intel-XXV710'"
   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"
+    - title: "2n-skx xxv710"
+      data-set: "vpp-2n-skx-curr-iter"
+    - title: "2n-clx xxv710"
+      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
+    - title: "2n-clx vs 2n-skx"
+      reference: 1
+      compare: 2
+    - title: "Normalized 2n-clx vs 2n-skx"
+      reference: 1
+      compare: 2
+      norm-ref: "2n-skx"
+      norm-cmp: "2n-clx"
   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.'
+    - 'Test Case:                   Test cases executed for: PDR throughput on 2n-skx and 2n-clx with xxv710.'
+    - '2n-skx, 2n-clx:              [Mpps +- StDev] results for VPP tested in CSIT'
+    - '2n-clx vs 2n-skx:            [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - 'Normalized 2n-clx vs 2n-skx: [% +- StDev] Normalized relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
 
-# VPP Latency Changes 2n-skx 2t1c
+# VPP Normalized Comparison Across Testbeds 2n-skx to 2n-clx 4t2c pdr
 - type: "table"
-  title: "VPP Latency Changes 2n-skx 2t1c PDR50-direction1-avg"
+  title: "VPP Normalized Comparison Across Testbeds 2n-skx to 2n-clx 4t2c pdr"
   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'"
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-2n-skx-2n-clx-4t2c-pdr"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T2C' and 'NIC_Intel-XXV710'"
   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"
+    - title: "2n-skx xxv710"
       data-set: "vpp-2n-skx-curr-iter"
+    - title: "2n-clx xxv710"
+      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
+    - title: "2n-clx vs 2n-skx"
+      reference: 1
+      compare: 2
+    - title: "Normalized 2n-clx vs 2n-skx"
+      reference: 1
+      compare: 2
+      norm-ref: "2n-skx"
+      norm-cmp: "2n-clx"
   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.'
+    - 'Test Case:                   Test cases executed for: PDR throughput on 2n-skx and 2n-clx with xxv710.'
+    - '2n-skx, 2n-clx:              [Mpps +- StDev] results for VPP tested in CSIT'
+    - '2n-clx vs 2n-skx:            [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - 'Normalized 2n-clx vs 2n-skx: [% +- StDev] Normalized relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
 
-# VPP Latency Changes 2n-skx 2t1c
+# VPP Normalized Comparison Across Testbeds 2n-clx to 2n-icx 1c ndr
 - type: "table"
-  title: "VPP Latency Changes 2n-skx 2t1c PDR90-direction1-avg"
+  title: "VPP Normalized Comparison Across Testbeds 2n-clx to 2n-icx 1c ndr"
   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'"
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-2n-clx-2n-icx-1c-ndr"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'NIC_Intel-XXV710' and 'NDRPDR' and '1C'"
   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"
+    - title: "2n-clx xxv710"
+      data-set: "vpp-2n-clx-curr-iter"
+    - title: "2n-icx xxv710"
+      data-set: "vpp-2n-icx-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
+    - title: "2n-icx vs 2n-clx"
+      reference: 1
+      compare: 2
+    - title: "Normalized 2n-icx vs 2n-clx"
+      reference: 1
+      compare: 2
+      norm-ref: "2n-clx"
+      norm-cmp: "2n-icx"
   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.'
+    - 'Test Case:                   Test cases executed for: NDR throughput on 2n-clx and 2n-icx with xxv710.'
+    - '2n-clx, 2n-icx:              [Mpps +- StDev] results for VPP tested in CSIT'
+    - '2n-icx vs 2n-clx:            [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - 'Normalized 2n-icx vs 2n-clx: [% +- StDev] Normalized relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
 
-# VPP Latency Changes 2n-skx 2t1c
+# VPP Normalized Comparison Across Testbeds 2n-clx to 2n-icx 2c ndr
 - type: "table"
-  title: "VPP Latency Changes 2n-skx 2t1c PDR90-direction1-max"
+  title: "VPP Normalized Comparison Across Testbeds 2n-clx to 2n-icx 2c ndr"
   algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/latency-changes-2n-skx-xxv710-2t1c-pdr90-d1-max"
-  include-tests: "latency-PDR90-direction1-max"
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-2n-clx-2n-icx-2c-ndr"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'NIC_Intel-XXV710' and 'NDRPDR' and '2C'"
+  columns:
+    - title: "2n-clx xxv710"
+      data-set: "vpp-2n-clx-curr-iter"
+    - title: "2n-icx xxv710"
+      data-set: "vpp-2n-icx-curr-iter"
+  comparisons:
+    - title: "2n-icx vs 2n-clx"
+      reference: 1
+      compare: 2
+    - title: "Normalized 2n-icx vs 2n-clx"
+      reference: 1
+      compare: 2
+      norm-ref: "2n-clx"
+      norm-cmp: "2n-icx"
+  legend:
+    - ''
+    - 'Test Case:                   Test cases executed for: NDR throughput on 2n-clx and 2n-icx with xxv710.'
+    - '2n-clx, 2n-icx:              [Mpps +- StDev] results for VPP tested in CSIT'
+    - '2n-icx vs 2n-clx:            [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - 'Normalized 2n-icx vs 2n-clx: [% +- StDev] Normalized relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+
+# VPP Normalized Comparison Across Testbeds 2n-clx to 2n-icx 1c pdr
+- type: "table"
+  title: "VPP Normalized Comparison Across Testbeds 2n-clx to 2n-icx 1c pdr"
+  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' and 'NDRPDR' and '1C'"
+  columns:
+    - title: "2n-clx xxv710"
+      data-set: "vpp-2n-clx-curr-iter"
+    - title: "2n-icx xxv710"
+      data-set: "vpp-2n-icx-curr-iter"
+  comparisons:
+    - title: "2n-icx vs 2n-clx"
+      reference: 1
+      compare: 2
+    - title: "Normalized 2n-icx vs 2n-clx"
+      reference: 1
+      compare: 2
+      norm-ref: "2n-clx"
+      norm-cmp: "2n-icx"
+  legend:
+    - ''
+    - 'Test Case:                   Test cases executed for: PDR throughput on 2n-clx and 2n-icx with xxv710.'
+    - '2n-clx, 2n-icx:              [Mpps +- StDev] results for VPP tested in CSIT'
+    - '2n-icx vs 2n-clx:            [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - 'Normalized 2n-icx vs 2n-clx: [% +- StDev] Normalized relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+
+# VPP Normalized Comparison Across Testbeds 2n-clx to 2n-icx 2c pdr
+- type: "table"
+  title: "VPP Normalized Comparison Across Testbeds 2n-clx to 2n-icx 2c pdr"
+  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' and 'NDRPDR' and '2C'"
+  columns:
+    - title: "2n-clx xxv710"
+      data-set: "vpp-2n-clx-curr-iter"
+    - title: "2n-icx xxv710"
+      data-set: "vpp-2n-icx-curr-iter"
+  comparisons:
+    - title: "2n-icx vs 2n-clx"
+      reference: 1
+      compare: 2
+    - title: "Normalized 2n-icx vs 2n-clx"
+      reference: 1
+      compare: 2
+      norm-ref: "2n-clx"
+      norm-cmp: "2n-icx"
+  legend:
+    - ''
+    - 'Test Case:                   Test cases executed for: PDR throughput on 2n-clx and 2n-icx with xxv710.'
+    - '2n-clx, 2n-icx:              [Mpps +- StDev] results for VPP tested in CSIT'
+    - '2n-icx vs 2n-clx:            [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - 'Normalized 2n-icx vs 2n-clx: [% +- StDev] Normalized relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+
+# VPP Normalized Comparison Across Testbeds 2n-skx to 2n-icx 1c ndr
+- type: "table"
+  title: "VPP Normalized Comparison Across Testbeds 2n-skx to 2n-icx 1c ndr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-2n-skx-2n-icx-1c-ndr"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'NIC_Intel-XXV710' and 'NDRPDR' and '1C'"
+  columns:
+    - title: "2n-skx xxv710"
+      data-set: "vpp-2n-skx-curr-iter"
+    - title: "2n-icx xxv710"
+      data-set: "vpp-2n-icx-curr-iter"
+  comparisons:
+    - title: "2n-icx vs 2n-skx"
+      reference: 1
+      compare: 2
+    - title: "Normalized 2n-icx vs 2n-skx"
+      reference: 1
+      compare: 2
+      norm-ref: "2n-skx"
+      norm-cmp: "2n-icx"
+  legend:
+    - ''
+    - 'Test Case:                   Test cases executed for: NDR throughput on 2n-skx and 2n-icx with xxv710.'
+    - '2n-skx, 2n-icx:              [Mpps +- StDev] results for VPP tested in CSIT'
+    - '2n-icx vs 2n-skx:            [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - 'Normalized 2n-icx vs 2n-skx: [% +- StDev] Normalized relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+
+# VPP Normalized Comparison Across Testbeds 2n-skx to 2n-icx 2c ndr
+- type: "table"
+  title: "VPP Normalized Comparison Across Testbeds 2n-skx to 2n-icx 2c ndr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-2n-skx-2n-icx-2c-ndr"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'NIC_Intel-XXV710' and 'NDRPDR' and '2C'"
+  columns:
+    - title: "2n-skx xxv710"
+      data-set: "vpp-2n-skx-curr-iter"
+    - title: "2n-icx xxv710"
+      data-set: "vpp-2n-icx-curr-iter"
+  comparisons:
+    - title: "2n-icx vs 2n-skx"
+      reference: 1
+      compare: 2
+    - title: "Normalized 2n-icx vs 2n-skx"
+      reference: 1
+      compare: 2
+      norm-ref: "2n-skx"
+      norm-cmp: "2n-icx"
+  legend:
+    - ''
+    - 'Test Case:                   Test cases executed for: NDR throughput on 2n-skx and 2n-icx with xxv710.'
+    - '2n-skx, 2n-icx:              [Mpps +- StDev] results for VPP tested in CSIT'
+    - '2n-icx vs 2n-skx:            [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - 'Normalized 2n-icx vs 2n-skx: [% +- StDev] Normalized relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+
+# VPP Normalized Comparison Across Testbeds 2n-skx to 2n-icx 1c pdr
+- type: "table"
+  title: "VPP Normalized Comparison Across Testbeds 2n-skx to 2n-icx 1c pdr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-2n-skx-2n-icx-1c-pdr"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'NIC_Intel-XXV710' and 'NDRPDR' and '1C'"
+  columns:
+    - title: "2n-skx xxv710"
+      data-set: "vpp-2n-skx-curr-iter"
+    - title: "2n-icx xxv710"
+      data-set: "vpp-2n-icx-curr-iter"
+  comparisons:
+    - title: "2n-icx vs 2n-skx"
+      reference: 1
+      compare: 2
+    - title: "Normalized 2n-icx vs 2n-skx"
+      reference: 1
+      compare: 2
+      norm-ref: "2n-skx"
+      norm-cmp: "2n-icx"
+  legend:
+    - ''
+    - 'Test Case:                   Test cases executed for: PDR throughput on 2n-skx and 2n-icx with xxv710.'
+    - '2n-skx, 2n-icx:              [Mpps +- StDev] results for VPP tested in CSIT'
+    - '2n-icx vs 2n-skx:            [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - 'Normalized 2n-icx vs 2n-skx: [% +- StDev] Normalized relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+
+# VPP Normalized Comparison Across Testbeds 2n-skx to 2n-icx 2c pdr
+- type: "table"
+  title: "VPP Normalized Comparison Across Testbeds 2n-skx to 2n-icx 2c pdr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-2n-skx-2n-icx-2c-pdr"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'NIC_Intel-XXV710' and 'NDRPDR' and '2C'"
+  columns:
+    - title: "2n-skx xxv710"
+      data-set: "vpp-2n-skx-curr-iter"
+    - title: "2n-icx xxv710"
+      data-set: "vpp-2n-icx-curr-iter"
+  comparisons:
+    - title: "2n-icx vs 2n-skx"
+      reference: 1
+      compare: 2
+    - title: "Normalized 2n-icx vs 2n-skx"
+      reference: 1
+      compare: 2
+      norm-ref: "2n-skx"
+      norm-cmp: "2n-icx"
+  legend:
+    - ''
+    - 'Test Case:                   Test cases executed for: PDR throughput on 2n-skx and 2n-icx with xxv710.'
+    - '2n-skx, 2n-icx:              [Mpps +- StDev] results for VPP tested in CSIT'
+    - '2n-icx vs 2n-skx:            [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - 'Normalized 2n-icx vs 2n-skx: [% +- StDev] Normalized relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+
+# VPP Normalized Comparison Across Testbeds 3n-skx to 3n-icx 1c ndr
+- type: "table"
+  title: "VPP Normalized Comparison Across Testbeds 3n-skx to 3n-icx 1c ndr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-skx-3n-icx-1c-ndr"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'NIC_Intel-XXV710' and 'NDRPDR' and '1C'"
+  columns:
+    - title: "3n-skx xxv710"
+      data-set: "vpp-3n-skx-curr-iter"
+    - title: "3n-icx xxv710"
+      data-set: "vpp-3n-icx-curr-iter"
+  comparisons:
+    - title: "3n-icx vs 3n-skx"
+      reference: 1
+      compare: 2
+    - title: "Normalized 3n-icx vs 3n-skx"
+      reference: 1
+      compare: 2
+      norm-ref: "3n-skx"
+      norm-cmp: "3n-icx"
+  legend:
+    - ''
+    - 'Test Case:                   Test cases executed for: NDR throughput on 3n-skx and 3n-icx with xxv710.'
+    - '3n-skx, 3n-icx:              [Mpps +- StDev] results for VPP tested in CSIT'
+    - '3n-icx vs 3n-skx:            [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - 'Normalized 3n-icx vs 3n-skx: [% +- StDev] Normalized relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+
+# VPP Normalized Comparison Across Testbeds 3n-skx to 3n-icx 2c ndr
+- type: "table"
+  title: "VPP Normalized Comparison Across Testbeds 3n-skx to 3n-icx ndr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-skx-3n-icx-2c-ndr"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'NIC_Intel-XXV710' and 'NDRPDR' and '2C'"
+  columns:
+    - title: "3n-skx xxv710"
+      data-set: "vpp-3n-skx-curr-iter"
+    - title: "3n-icx xxv710"
+      data-set: "vpp-3n-icx-curr-iter"
+  comparisons:
+    - title: "3n-icx vs 3n-skx"
+      reference: 1
+      compare: 2
+    - title: "Normalized 3n-icx vs 3n-skx"
+      reference: 1
+      compare: 2
+      norm-ref: "3n-skx"
+      norm-cmp: "3n-icx"
+  legend:
+    - ''
+    - 'Test Case:                   Test cases executed for: NDR throughput on 3n-skx and 3n-icx with xxv710.'
+    - '3n-skx, 3n-icx:              [Mpps +- StDev] results for VPP tested in CSIT'
+    - '3n-icx vs 3n-skx:            [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - 'Normalized 3n-icx vs 3n-skx: [% +- StDev] Normalized relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+
+# VPP Normalized Comparison Across Testbeds 3n-skx to 3n-icx 1c pdr
+- type: "table"
+  title: "VPP Normalized Comparison Across Testbeds 3n-skx to 3n-icx 1c pdr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-skx-3n-icx-1c-pdr"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'NIC_Intel-XXV710' and 'NDRPDR' and '1C'"
+  columns:
+    - title: "3n-skx xxv710"
+      data-set: "vpp-3n-skx-curr-iter"
+    - title: "3n-icx xxv710"
+      data-set: "vpp-3n-icx-curr-iter"
+  comparisons:
+    - title: "3n-icx vs 3n-skx"
+      reference: 1
+      compare: 2
+    - title: "Normalized 3n-icx vs 3n-skx"
+      reference: 1
+      compare: 2
+      norm-ref: "3n-skx"
+      norm-cmp: "3n-icx"
+  legend:
+    - ''
+    - 'Test Case:                   Test cases executed for: PDR throughput on 3n-skx and 3n-icx with xxv710.'
+    - '3n-skx, 3n-icx:              [Mpps +- StDev] results for VPP tested in CSIT'
+    - '3n-icx vs 3n-skx:            [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - 'Normalized 3n-icx vs 3n-skx: [% +- StDev] Normalized relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+
+# VPP Normalized Comparison Across Testbeds 3n-skx to 3n-icx 2c pdr
+- type: "table"
+  title: "VPP Normalized Comparison Across Testbeds 3n-skx to 3n-icx 2c pdr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-skx-3n-icx-2c-pdr"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'NIC_Intel-XXV710' and 'NDRPDR' and '2C'"
+  columns:
+    - title: "3n-skx xxv710"
+      data-set: "vpp-3n-skx-curr-iter"
+    - title: "3n-icx xxv710"
+      data-set: "vpp-3n-icx-curr-iter"
+  comparisons:
+    - title: "3n-icx vs 3n-skx"
+      reference: 1
+      compare: 2
+    - title: "Normalized 3n-icx vs 3n-skx"
+      reference: 1
+      compare: 2
+      norm-ref: "3n-skx"
+      norm-cmp: "3n-icx"
+  legend:
+    - ''
+    - 'Test Case:                   Test cases executed for: PDR throughput on 3n-skx and 3n-icx with xxv710.'
+    - '3n-skx, 3n-icx:              [Mpps +- StDev] results for VPP tested in CSIT'
+    - '3n-icx vs 3n-skx:            [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - 'Normalized 3n-icx vs 3n-skx: [% +- StDev] Normalized relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+
+# VPP Normalized Comparison Across Testbeds 2n-skx to 2n-clx 2t1c mrr
+- type: "table"
+  title: "VPP Normalized Comparison Across Testbeds 2n-skx to 2n-clx 2t1c mrr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-2n-skx-2n-clx-2t1c-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T1C' and 'NIC_Intel-XXV710'"
+  columns:
+    - title: "2n-skx xxv710"
+      data-set: "vpp-2n-skx-curr-iter-mrr"
+    - title: "2n-clx xxv710"
+      data-set: "vpp-2n-clx-curr-iter-mrr"
+  comparisons:
+    - title: "2n-clx vs 2n-skx"
+      reference: 1
+      compare: 2
+    - title: "Normalized 2n-clx vs 2n-skx"
+      reference: 1
+      compare: 2
+      norm-ref: "2n-skx"
+      norm-cmp: "2n-clx"
+  legend:
+    - ''
+    - 'Test Case:                   Test cases executed for: MRR throughput on 2n-skx and 2n-clx with xxv710.'
+    - '2n-skx, 2n-clx:              [Mpps +- StDev] results for VPP tested in CSIT'
+    - '2n-clx vs 2n-skx:            [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - 'Normalized 2n-clx vs 2n-skx: [% +- StDev] Normalized relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+
+# VPP Normalized Comparison Across Testbeds 2n-skx to 2n-clx 4t2c mrr
+- type: "table"
+  title: "VPP Normalized Comparison Across Testbeds 2n-skx to 2n-clx 4t2c mrr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-2n-skx-2n-clx-4t2c-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T2C' and 'NIC_Intel-XXV710'"
+  columns:
+    - title: "2n-skx xxv710"
+      data-set: "vpp-2n-skx-curr-iter-mrr"
+    - title: "2n-clx xxv710"
+      data-set: "vpp-2n-clx-curr-iter-mrr"
+  comparisons:
+    - title: "2n-clx vs 2n-skx"
+      reference: 1
+      compare: 2
+    - title: "Normalized 2n-clx vs 2n-skx"
+      reference: 1
+      compare: 2
+      norm-ref: "2n-skx"
+      norm-cmp: "2n-clx"
+  legend:
+    - ''
+    - 'Test Case:                   Test cases executed for: MRR throughput on 2n-skx and 2n-clx with xxv710.'
+    - '2n-skx, 2n-clx:              [Mpps +- StDev] results for VPP tested in CSIT'
+    - '2n-clx vs 2n-skx:            [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - 'Normalized 2n-clx vs 2n-skx: [% +- StDev] Normalized relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+
+# VPP Normalized Comparison Across Testbeds 2n-skx to 2n-clx 8t4c mrr
+- type: "table"
+  title: "VPP Normalized Comparison Across Testbeds 2n-skx to 2n-clx 8t4c mrr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-2n-skx-2n-clx-8t4c-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'8T4C' and 'NIC_Intel-XXV710'"
+  columns:
+    - title: "2n-skx xxv710"
+      data-set: "vpp-2n-skx-curr-iter-mrr"
+    - title: "2n-clx xxv710"
+      data-set: "vpp-2n-clx-curr-iter-mrr"
+  comparisons:
+    - title: "2n-clx vs 2n-skx"
+      reference: 1
+      compare: 2
+    - title: "Normalized 2n-clx vs 2n-skx"
+      reference: 1
+      compare: 2
+      norm-ref: "2n-skx"
+      norm-cmp: "2n-clx"
+  legend:
+    - ''
+    - 'Test Case:                   Test cases executed for: MRR throughput on 2n-skx and 2n-clx with xxv710.'
+    - '2n-skx, 2n-clx:              [Mpps +- StDev] results for VPP tested in CSIT'
+    - '2n-clx vs 2n-skx:            [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - 'Normalized 2n-clx vs 2n-skx: [% +- StDev] Normalized relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+
+# VPP Normalized Comparison Across Testbeds 2n-clx to 2n-icx 1c mrr
+- type: "table"
+  title: "VPP Normalized 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: "2n-icx vs 2n-clx"
+      reference: 1
+      compare: 2
+    - title: "Normalized 2n-icx vs 2n-clx"
+      reference: 1
+      compare: 2
+      norm-ref: "2n-clx"
+      norm-cmp: "2n-icx"
+  legend:
+    - ''
+    - 'Test Case:                   Test cases executed for: MRR throughput on 2n-clx and 2n-icx with xxv710.'
+    - '2n-clx, 2n-icx:              [Mpps +- StDev] results for VPP tested in CSIT'
+    - '2n-icx vs 2n-clx:            [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - 'Normalized 2n-icx vs 2n-clx: [% +- StDev] Normalized relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+
+# VPP Normalized Comparison Across Testbeds 2n-clx to 2n-icx 2c mrr
+- type: "table"
+  title: "VPP Normalized 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: "2n-icx vs 2n-clx"
+      reference: 1
+      compare: 2
+    - title: "Normalized 2n-icx vs 2n-clx"
+      reference: 1
+      compare: 2
+      norm-ref: "2n-clx"
+      norm-cmp: "2n-icx"
+  legend:
+    - ''
+    - 'Test Case:                   Test cases executed for: MRR throughput on 2n-clx and 2n-icx with xxv710.'
+    - '2n-clx, 2n-icx:              [Mpps +- StDev] results for VPP tested in CSIT'
+    - '2n-icx vs 2n-clx:            [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - 'Normalized 2n-icx vs 2n-clx: [% +- StDev] Normalized relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+
+# VPP Normalized Comparison Across Testbeds 2n-clx to 2n-icx 4c mrr
+- type: "table"
+  title: "VPP Normalized 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: "2n-icx vs 2n-clx"
+      reference: 1
+      compare: 2
+    - title: "Normalized 2n-icx vs 2n-clx"
+      reference: 1
+      compare: 2
+      norm-ref: "2n-clx"
+      norm-cmp: "2n-icx"
+  legend:
+    - ''
+    - 'Test Case:                   Test cases executed for: MRR throughput on 2n-clx and 2n-icx with xxv710.'
+    - '2n-clx, 2n-icx:              [Mpps +- StDev] results for VPP tested in CSIT'
+    - '2n-icx vs 2n-clx:            [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - 'Normalized 2n-icx vs 2n-clx: [% +- StDev] Normalized relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+
+# VPP Normalized Comparison Across Testbeds 2n-skx to 2n-icx 1c mrr
+- type: "table"
+  title: "VPP Normalized Comparison Across Testbeds 2n-skx to 2n-icx 1c mrr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-2n-skx-2n-icx-1c-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'NIC_Intel-XXV710' and 'MRR' and '1C'"
+  columns:
+    - title: "2n-skx xxv710"
+      data-set: "vpp-2n-skx-curr-iter-mrr"
+    - title: "2n-icx xxv710"
+      data-set: "vpp-2n-icx-curr-iter-mrr"
+  comparisons:
+    - title: "2n-icx vs 2n-clx"
+      reference: 1
+      compare: 2
+    - title: "Normalized 2n-icx vs 2n-skx"
+      reference: 1
+      compare: 2
+      norm-ref: "2n-skx"
+      norm-cmp: "2n-icx"
+  legend:
+    - ''
+    - 'Test Case:                   Test cases executed for: MRR throughput on 2n-skx and 2n-icx with xxv710.'
+    - '2n-skx, 2n-icx:              [Mpps +- StDev] results for VPP tested in CSIT'
+    - '2n-icx vs 2n-skx:            [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - 'Normalized 2n-icx vs 2n-skx: [% +- StDev] Normalized relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+
+# VPP Normalized Comparison Across Testbeds 2n-skx to 2n-icx 2c mrr
+- type: "table"
+  title: "VPP Normalized Comparison Across Testbeds 2n-skx to 2n-icx 2c mrr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-2n-skx-2n-icx-2c-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'NIC_Intel-XXV710' and 'MRR' and '2C'"
+  columns:
+    - title: "2n-skx xxv710"
+      data-set: "vpp-2n-skx-curr-iter-mrr"
+    - title: "2n-icx xxv710"
+      data-set: "vpp-2n-icx-curr-iter-mrr"
+  comparisons:
+    - title: "2n-icx vs 2n-skx"
+      reference: 1
+      compare: 2
+    - title: "Normalized 2n-icx vs 2n-skx"
+      reference: 1
+      compare: 2
+      norm-ref: "2n-skx"
+      norm-cmp: "2n-icx"
+  legend:
+    - ''
+    - 'Test Case:                   Test cases executed for: MRR throughput on 2n-skx and 2n-icx with xxv710.'
+    - '2n-skx, 2n-icx:              [Mpps +- StDev] results for VPP tested in CSIT'
+    - '2n-icx vs 2n-skx:            [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - 'Normalized 2n-icx vs 2n-skx: [% +- StDev] Normalized relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+
+# VPP Normalized Comparison Across Testbeds 2n-skx to 2n-icx 4c mrr
+- type: "table"
+  title: "VPP Normalized Comparison Across Testbeds 2n-skx to 2n-icx 4c mrr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-2n-skx-2n-icx-4c-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'NIC_Intel-XXV710' and 'MRR' and '4C'"
+  columns:
+    - title: "2n-skx xxv710"
+      data-set: "vpp-2n-skx-curr-iter-mrr"
+    - title: "2n-icx xxv710"
+      data-set: "vpp-2n-icx-curr-iter-mrr"
+  comparisons:
+    - title: "2n-icx vs 2n-skx"
+      reference: 1
+      compare: 2
+    - title: "Normalized 2n-icx vs 2n-skx"
+      reference: 1
+      compare: 2
+      norm-ref: "2n-skx"
+      norm-cmp: "2n-icx"
+  legend:
+    - ''
+    - 'Test Case:                   Test cases executed for: MRR throughput on 2n-skx and 2n-icx with xxv710.'
+    - '2n-skx, 2n-icx:              [Mpps +- StDev] results for VPP tested in CSIT'
+    - '2n-icx vs 2n-skx:            [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - 'Normalized 2n-icx vs 2n-skx: [% +- StDev] Normalized relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+
+# VPP Normalized Comparison Across Testbeds 3n-skx to 3n-icx 1c mrr
+- type: "table"
+  title: "VPP Normalized 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: "3n-icx vs 3n-skx"
+      reference: 1
+      compare: 2
+    - title: "Normalized 3n-icx vs 3n-skx"
+      reference: 1
+      compare: 2
+      norm-ref: "3n-skx"
+      norm-cmp: "3n-icx"
+  legend:
+    - ''
+    - 'Test Case:                   Test cases executed for: MRR throughput on 3n-skx and 3n-icx with xxv710.'
+    - '3n-skx, 3n-icx:              [Mpps +- StDev] results for VPP tested in CSIT'
+    - '3n-icx vs 3n-skx:            [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - 'Normalized 3n-icx vs 3n-skx: [% +- StDev] Normalized relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+
+# VPP Normalized Comparison Across Testbeds 3n-skx to 3n-icx 2c mrr
+- type: "table"
+  title: "VPP Normalized 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: "3n-icx vs 3n-skx"
+      reference: 1
+      compare: 2
+    - title: "Normalized 3n-icx vs 3n-skx"
+      reference: 1
+      compare: 2
+      norm-ref: "3n-skx"
+      norm-cmp: "3n-icx"
+  legend:
+    - ''
+    - 'Test Case:                   Test cases executed for: MRR throughput on 3n-skx and 3n-icx with xxv710.'
+    - '3n-skx, 3n-icx:              [Mpps +- StDev] results for VPP tested in CSIT'
+    - '3n-icx vs 3n-skx:            [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - 'Normalized 3n-icx vs TB3n-skxR: [% +- StDev] Normalized relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+
+# VPP Normalized Comparison Across Testbeds 3n-skx to 3n-icx 4c mrr
+- type: "table"
+  title: "VPP Normalized 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: "3n-icx vs 3n-skx"
+      reference: 1
+      compare: 2
+    - title: "Normalized 3n-icx vs 3n-skx"
+      reference: 1
+      compare: 2
+      norm-ref: "3n-skx"
+      norm-cmp: "3n-icx"
+  legend:
+    - ''
+    - 'Test Case:                   Test cases executed for: MRR throughput on 3n-skx and 3n-icx with xxv710.'
+    - '3n-skx, 3n-icx:              [Mpps +- StDev] results for VPP tested in CSIT'
+    - '3n-icx vs 3n-skx:            [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - 'Normalized 3n-icx vs 3n-skx: [% +- StDev] Normalized relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+
+# DPDK Normalized Comparison Across Testbeds 2n-skx to 2n-clx ndr
+- type: "table"
+  title: "DPDK Normalized Comparison Across Testbeds 2n-skx to 2n-clx ndr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-compare-testbeds-2n-skx-2n-clx-ndr"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'NIC_Intel-XXV710'"
+  columns:
+    - title: "2n-skx xxv710"
+      data-set: "dpdk-2n-skx-curr-iter"
+    - title: "2n-clx xxv710"
+      data-set: "dpdk-2n-clx-curr-iter"
+  comparisons:
+    - title: "2n-clx vs 2n-skx"
+      reference: 1
+      compare: 2
+    - title: "Normalized 2n-clx vs 2n-skx"
+      reference: 1
+      compare: 2
+      norm-ref: "2n-skx"
+      norm-cmp: "2n-clx"
+  legend:
+    - ''
+    - 'Test Case:                   Test cases executed for: NDR throughput on 2n-skx and 2n-clx with xxv710.'
+    - '2n-skx, 2n-clx:              [Mpps +- StDev] results for DPDK tested in CSIT'
+    - '2n-clx vs 2n-skx:            [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - 'Normalized 2n-clx vs 2n-skx: [% +- StDev] Normalized relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+
+# DPDK Normalized Comparison Across Testbeds 2n-skx to 2n-clx pdr
+- type: "table"
+  title: "DPDK Normalized Comparison Across Testbeds 2n-skx to 2n-clx pdr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-compare-testbeds-2n-skx-2n-clx-pdr"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'NIC_Intel-XXV710'"
+  columns:
+    - title: "2n-skx xxv710"
+      data-set: "dpdk-2n-skx-curr-iter"
+    - title: "2n-clx xxv710"
+      data-set: "dpdk-2n-clx-curr-iter"
+  comparisons:
+    - title: "2n-clx vs 2n-skx"
+      reference: 1
+      compare: 2
+    - title: "Normalized 2n-clx vs 2n-skx"
+      reference: 1
+      compare: 2
+      norm-ref: "2n-skx"
+      norm-cmp: "2n-clx"
+  legend:
+    - ''
+    - 'Test Case:                   Test cases executed for: PDR throughput on 2n-skx and 2n-clx with xxv710.'
+    - '2n-skx, 2n-clx:              [Mpps +- StDev] results for DPDK tested in CSIT'
+    - '2n-clx vs 2n-skx:            [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - 'Normalized 2n-clx vs 2n-skx: [% +- StDev] Normalized relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+
+# DPDK Normalized Comparison Across Testbeds 2n-clx to 2n-icx ndr
+- type: "table"
+  title: "DPDK Normalized 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: "2n-icx vs 2n-clx"
+      reference: 1
+      compare: 2
+    - title: "Normalized 2n-icx vs 2n-clx"
+      reference: 1
+      compare: 2
+      norm-ref: "2n-clx"
+      norm-cmp: "2n-icx"
+  legend:
+    - ''
+    - 'Test Case:                   Test cases executed for: NDR throughput on 2n-clx and 2n-icx with xxv710.'
+    - '2n-clx, 2n-icx:              [Mpps +- StDev] results for DPDK tested in CSIT'
+    - '2n-icx vs 2n-clx:            [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - 'Normalized 2n-icx vs 2n-clx: [% +- StDev] Normalized relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+
+# DPDK Normalized Comparison Across Testbeds 2n-clx to 2n-icx pdr
+- type: "table"
+  title: "DPDK Normalized 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: "2n-icx vs 2n-clx"
+      reference: 1
+      compare: 2
+    - title: "Normalized 2n-icx vs 2n-clx"
+      reference: 1
+      compare: 2
+      norm-ref: "2n-clx"
+      norm-cmp: "2n-icx"
+  legend:
+    - ''
+    - 'Test Case:                   Test cases executed for: PDR throughput on 2n-clx and 2n-icx with xxv710.'
+    - '2n-clx, 2n-icx:              [Mpps +- StDev] results for DPDK tested in CSIT'
+    - '2n-icx vs 2n-clx:            [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - 'Normalized 2n-icx vs 2n-clx: [% +- StDev] Normalized relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+
+# DPDK Normalized Comparison Across Testbeds 2n-skx to 2n-icx ndr
+- type: "table"
+  title: "DPDK Normalized Comparison Across Testbeds 2n-skx to 2n-icx ndr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-compare-testbeds-2n-skx-2n-icx-ndr"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'NIC_Intel-XXV710'"
+  columns:
+    - title: "2n-skx xxv710"
+      data-set: "dpdk-2n-skx-curr-iter"
+    - title: "2n-icx xxv710"
+      data-set: "dpdk-2n-icx-curr-iter"
+  comparisons:
+    - title: "2n-icx vs 2n-skx"
+      reference: 1
+      compare: 2
+    - title: "Normalized 2n-icx vs 2n-clx"
+      reference: 1
+      compare: 2
+      norm-ref: "2n-skx"
+      norm-cmp: "2n-icx"
+  legend:
+    - ''
+    - 'Test Case:                   Test cases executed for: NDR throughput on 2n-icx and 2n-icx with xxv710.'
+    - '2n-icx, 2n-icx:              [Mpps +- StDev] results for DPDK tested in CSIT'
+    - '2n-icx vs 2n-icx:            [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - 'Normalized 2n-icx vs 2n-icx: [% +- StDev] Normalized relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+
+# DPDK Normalized Comparison Across Testbeds 2n-skx to 2n-icx pdr
+- type: "table"
+  title: "DPDK Normalized Comparison Across Testbeds 2n-skx to 2n-icx pdr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-compare-testbeds-2n-skx-2n-icx-pdr"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'NIC_Intel-XXV710'"
+  columns:
+    - title: "2n-skx xxv710"
+      data-set: "dpdk-2n-skx-curr-iter"
+    - title: "2n-icx xxv710"
+      data-set: "dpdk-2n-icx-curr-iter"
+  comparisons:
+    - title: "2n-icx vs 2n-skx"
+      reference: 1
+      compare: 2
+    - title: "Normalized 2n-icx vs 2n-clx"
+      reference: 1
+      compare: 2
+      norm-ref: "2n-skx"
+      norm-cmp: "2n-icx"
+  legend:
+    - ''
+    - 'Test Case:                   Test cases executed for: PDR throughput on 2n-icx and T2n-icxBC with xxv710.'
+    - '2n-icx, 2n-icx:              [Mpps +- StDev] results for DPDK tested in CSIT'
+    - '2n-icx vs 2n-icx:            [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - 'Normalized 2n-icx vs 2n-icx: [% +- StDev] Normalized relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+
+# DPDK Normalized Comparison Across Testbeds 3n-skx to 3n-icx ndr
+- type: "table"
+  title: "DPDK Normalized 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: "3n-icx vs 3n-skx"
+      reference: 1
+      compare: 2
+    - title: "Normalized 3n-icx vs 3n-clx"
+      reference: 1
+      compare: 2
+      norm-ref: "3n-skx"
+      norm-cmp: "3n-icx"
+  legend:
+    - ''
+    - 'Test Case:                   Test cases executed for: NDR throughput on 3n-skx and 3n-icx with xxv710.'
+    - '3n-skx, 3n-icx:              [Mpps +- StDev] results for DPDK tested in CSIT'
+    - '3n-icx vs 3n-skx:            [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - 'Normalized 3n-icx vs 3n-skx: [% +- StDev] Normalized relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+
+# DPDK Normalized Comparison Across Testbeds 3n-skx to 3n-icx pdr
+- type: "table"
+  title: "DPDK Normalized 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: "3n-icx vs 3n-skx"
+      reference: 1
+      compare: 2
+    - title: "Normalized 3n-icx vs 3n-clx"
+      reference: 1
+      compare: 2
+      norm-ref: "3n-skx"
+      norm-cmp: "3n-icx"
+  legend:
+    - ''
+    - 'Test Case:                   Test cases executed for: PDR throughput on 3n-skx and 3n-icx with xxv710.'
+    - '3n-skx, 3n-icx:              [Mpps +- StDev] results for DPDK tested in CSIT'
+    - '3n-icx vs 3n-skx:            [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - 'Normalized 3n-icx vs 3n-skx: [% +- StDev] Normalized relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+
+# 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: "2110.0-9"
+      data-set: "vpp-3n-skx-hist-iter-new-env"
+    - title: "2202.0-9"
+      data-set: "vpp-3n-skx-prev-iter-old-env"
+    - title: "2202.0-10"
+      data-set: "vpp-3n-skx-prev-iter-new-env"
+    - title: "2206.0-10"
+      data-set: "vpp-3n-skx-curr-iter"
+  comparisons:
+    - title: "2202.0-10 vs 2202.0-9"
+      reference: 2
+      compare: 3
+    - title: "2206.0-10 vs 2202.0-10"
+      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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: 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: "2110.0-9"
+      data-set: "vpp-3n-skx-hist-iter-new-env"
+    - title: "2202.0-9"
+      data-set: "vpp-3n-skx-prev-iter-old-env"
+    - title: "2202.0-10"
+      data-set: "vpp-3n-skx-prev-iter-new-env"
+    - title: "2206.0-10"
+      data-set: "vpp-3n-skx-curr-iter"
+  comparisons:
+    - title: "2202.0-10 vs 2202.0-9"
+      reference: 2
+      compare: 3
+    - title: "2206.0-10 vs 2202.0-10"
+      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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: 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: "2110.0-9"
+      data-set: "vpp-3n-skx-hist-iter-new-env"
+    - title: "2202.0-9"
+      data-set: "vpp-3n-skx-prev-iter-old-env"
+    - title: "2202.0-10"
+      data-set: "vpp-3n-skx-prev-iter-new-env"
+    - title: "2206.0-10"
+      data-set: "vpp-3n-skx-curr-iter"
+  comparisons:
+    - title: "2202.0-10 vs 2202.0-9"
+      reference: 2
+      compare: 3
+    - title: "2206.0-10 vs 2202.0-10"
+      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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: 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"
+    - title: "2110.0-9"
       data-set: "vpp-2n-skx-hist-iter-new-env"
-    - title: "2110.0-8"
+    - title: "2202.0-9"
       data-set: "vpp-2n-skx-prev-iter-old-env"
+    - title: "2202.0-10"
+      data-set: "vpp-2n-skx-prev-iter-new-env"
+    - title: "2206.0-10"
+      data-set: "vpp-2n-skx-curr-iter"
+  comparisons:
+    - title: "2202.0-10 vs 2202.0-9"
+      reference: 2
+      compare: 3
+    - title: "2206.0-10 vs 2202.0-10"
+      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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: 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: "2110.0-9"
+      data-set: "vpp-2n-skx-hist-iter-new-env"
+    - title: "2202.0-9"
+      data-set: "vpp-2n-skx-prev-iter-old-env"
+    - title: "2202.0-10"
       data-set: "vpp-2n-skx-prev-iter-new-env"
+    - title: "2206.0-10"
+      data-set: "vpp-2n-skx-curr-iter"
+  comparisons:
+    - title: "2202.0-10 vs 2202.0-9"
+      reference: 2
+      compare: 3
+    - title: "2206.0-10 vs 2202.0-10"
+      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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: 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: "2110.0-9"
+      data-set: "vpp-2n-skx-hist-iter-new-env"
     - title: "2202.0-9"
+      data-set: "vpp-2n-skx-prev-iter-old-env"
+    - title: "2202.0-10"
+      data-set: "vpp-2n-skx-prev-iter-new-env"
+    - title: "2206.0-10"
       data-set: "vpp-2n-skx-curr-iter"
   comparisons:
-    - title: "2110.0-9 vs 2110.0-8"
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 2
       compare: 3
-    - title: "2202.0-9 vs 2110.0-9"
+    - title: "2206.0-10 vs 2202.0-10"
       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.'
+    - '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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Latency Changes 2n-clx 2t1c
 - type: "table"
@@ -690,28 +1909,28 @@
   include-tests: "latency-PDR50-direction1-avg"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2106.0-8"
+    - title: "2110.0-9"
       data-set: "vpp-2n-clx-hist-iter-new-env"
-    - title: "2110.0-8"
+    - title: "2202.0-9"
       data-set: "vpp-2n-clx-prev-iter-old-env"
-    - title: "2110.0-9"
+    - title: "2202.0-10"
       data-set: "vpp-2n-clx-prev-iter-new-env"
-    - title: "2202.0-9"
+    - title: "2206.0-10"
       data-set: "vpp-2n-clx-curr-iter"
   comparisons:
-    - title: "2110.0-9 vs 2110.0-8"
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 2
       compare: 3
-    - title: "2202.0-9 vs 2110.0-9"
+    - title: "2206.0-10 vs 2202.0-10"
       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.'
+    - '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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Latency Changes 2n-clx 2t1c
 - type: "table"
@@ -721,28 +1940,28 @@
   include-tests: "latency-PDR90-direction1-avg"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2106.0-8"
+    - title: "2110.0-9"
       data-set: "vpp-2n-clx-hist-iter-new-env"
-    - title: "2110.0-8"
+    - title: "2202.0-9"
       data-set: "vpp-2n-clx-prev-iter-old-env"
-    - title: "2110.0-9"
+    - title: "2202.0-10"
       data-set: "vpp-2n-clx-prev-iter-new-env"
-    - title: "2202.0-9"
+    - title: "2206.0-10"
       data-set: "vpp-2n-clx-curr-iter"
   comparisons:
-    - title: "2110.0-9 vs 2110.0-8"
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 2
       compare: 3
-    - title: "2202.0-9 vs 2110.0-9"
+    - title: "2206.0-10 vs 2202.0-10"
       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.'
+    - '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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Latency Changes 2n-clx 2t1c
 - type: "table"
@@ -752,28 +1971,28 @@
   include-tests: "latency-PDR90-direction1-max"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2106.0-8"
+    - title: "2110.0-9"
       data-set: "vpp-2n-clx-hist-iter-new-env"
-    - title: "2110.0-8"
+    - title: "2202.0-9"
       data-set: "vpp-2n-clx-prev-iter-old-env"
-    - title: "2110.0-9"
+    - title: "2202.0-10"
       data-set: "vpp-2n-clx-prev-iter-new-env"
-    - title: "2202.0-9"
+    - title: "2206.0-10"
       data-set: "vpp-2n-clx-curr-iter"
   comparisons:
-    - title: "2110.0-9 vs 2110.0-8"
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 2
       compare: 3
-    - title: "2202.0-9 vs 2110.0-9"
+    - title: "2206.0-10 vs 2202.0-10"
       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.'
+    - '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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Latency Changes 2n-clx 2t1c
 - type: "table"
@@ -783,28 +2002,28 @@
   include-tests: "latency-PDR50-direction1-avg"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Mellanox-CX556A' and not 'NF_DENSITY'"
   columns:
-    - title: "2106.0-8"
+    - title: "2110.0-9"
       data-set: "vpp-2n-clx-hist-iter-new-env"
-    - title: "2110.0-8"
+    - title: "2202.0-9"
       data-set: "vpp-2n-clx-prev-iter-old-env"
-    - title: "2110.0-9"
+    - title: "2202.0-10"
       data-set: "vpp-2n-clx-prev-iter-new-env"
-    - title: "2202.0-9"
+    - title: "2206.0-10"
       data-set: "vpp-2n-clx-curr-iter"
   comparisons:
-    - title: "2110.0-9 vs 2110.0-8"
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 2
       compare: 3
-    - title: "2202.0-9 vs 2110.0-9"
+    - title: "2206.0-10 vs 2202.0-10"
       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.'
+    - '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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Latency Changes 2n-clx 2t1c
 - type: "table"
@@ -814,28 +2033,28 @@
   include-tests: "latency-PDR90-direction1-avg"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Mellanox-CX556A' and not 'NF_DENSITY'"
   columns:
-    - title: "2106.0-8"
+    - title: "2110.0-9"
       data-set: "vpp-2n-clx-hist-iter-new-env"
-    - title: "2110.0-8"
+    - title: "2202.0-9"
       data-set: "vpp-2n-clx-prev-iter-old-env"
-    - title: "2110.0-9"
+    - title: "2202.0-10"
       data-set: "vpp-2n-clx-prev-iter-new-env"
-    - title: "2202.0-9"
+    - title: "2206.0-10"
       data-set: "vpp-2n-clx-curr-iter"
   comparisons:
-    - title: "2110.0-9 vs 2110.0-8"
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 2
       compare: 3
-    - title: "2202.0-9 vs 2110.0-9"
+    - title: "2206.0-10 vs 2202.0-10"
       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.'
+    - '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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Latency Changes 2n-clx 2t1c
 - type: "table"
@@ -845,28 +2064,28 @@
   include-tests: "latency-PDR90-direction1-max"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Mellanox-CX556A' and not 'NF_DENSITY'"
   columns:
-    - title: "2106.0-8"
+    - title: "2110.0-9"
       data-set: "vpp-2n-clx-hist-iter-new-env"
-    - title: "2110.0-8"
+    - title: "2202.0-9"
       data-set: "vpp-2n-clx-prev-iter-old-env"
-    - title: "2110.0-9"
+    - title: "2202.0-10"
       data-set: "vpp-2n-clx-prev-iter-new-env"
-    - title: "2202.0-9"
+    - title: "2206.0-10"
       data-set: "vpp-2n-clx-curr-iter"
   comparisons:
-    - title: "2110.0-9 vs 2110.0-8"
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 2
       compare: 3
-    - title: "2202.0-9 vs 2110.0-9"
+    - title: "2206.0-10 vs 2202.0-10"
       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.'
+    - '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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Latency Changes 2n-zn2 2t1c
 - type: "table"
@@ -876,28 +2095,28 @@
   include-tests: "latency-PDR50-direction1-avg"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "2106.0-8"
+    - title: "2110.0-9"
       data-set: "vpp-2n-zn2-hist-iter-new-env"
-    - title: "2110.0-8"
+    - title: "2202.0-9"
       data-set: "vpp-2n-zn2-prev-iter-old-env"
-    - title: "2110.0-9"
+    - title: "2202.0-10"
       data-set: "vpp-2n-zn2-prev-iter-new-env"
-    - title: "2202.0-9"
+    - title: "2206.0-10"
       data-set: "vpp-2n-zn2-curr-iter"
   comparisons:
-    - title: "2110.0-9 vs 2110.0-8"
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 2
       compare: 3
-    - title: "2202.0-9 vs 2110.0-9"
+    - title: "2206.0-10 vs 2202.0-10"
       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.'
+    - '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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Latency Changes 2n-zn2 2t1c
 - type: "table"
@@ -907,28 +2126,28 @@
   include-tests: "latency-PDR90-direction1-avg"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "2106.0-8"
+    - title: "2110.0-9"
       data-set: "vpp-2n-zn2-hist-iter-new-env"
-    - title: "2110.0-8"
+    - title: "2202.0-9"
       data-set: "vpp-2n-zn2-prev-iter-old-env"
-    - title: "2110.0-9"
+    - title: "2202.0-10"
       data-set: "vpp-2n-zn2-prev-iter-new-env"
-    - title: "2202.0-9"
+    - title: "2206.0-10"
       data-set: "vpp-2n-zn2-curr-iter"
   comparisons:
-    - title: "2110.0-9 vs 2110.0-8"
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 2
       compare: 3
-    - title: "2202.0-9 vs 2110.0-9"
+    - title: "2206.0-10 vs 2202.0-10"
       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.'
+    - '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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Latency Changes 2n-zn2 2t1c
 - type: "table"
@@ -938,28 +2157,28 @@
   include-tests: "latency-PDR90-direction1-max"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "2106.0-8"
+    - title: "2110.0-9"
       data-set: "vpp-2n-zn2-hist-iter-new-env"
-    - title: "2110.0-8"
+    - title: "2202.0-9"
       data-set: "vpp-2n-zn2-prev-iter-old-env"
-    - title: "2110.0-9"
+    - title: "2202.0-10"
       data-set: "vpp-2n-zn2-prev-iter-new-env"
-    - title: "2202.0-9"
+    - title: "2206.0-10"
       data-set: "vpp-2n-zn2-curr-iter"
   comparisons:
-    - title: "2110.0-9 vs 2110.0-8"
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 2
       compare: 3
-    - title: "2202.0-9 vs 2110.0-9"
+    - title: "2206.0-10 vs 2202.0-10"
       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.'
+    - '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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Latency Changes 2n-tx2 1t1c
 - type: "table"
@@ -969,28 +2188,28 @@
   include-tests: "latency-PDR50-direction1-avg"
   filter: "'1T1C' and 'NDRPDR'"
   columns:
-    - title: "2106.0-8"
+    - title: "2110.0-9"
       data-set: "vpp-2n-tx2-hist-iter-new-env"
-    - title: "2110.0-8"
+    - title: "2202.0-9"
       data-set: "vpp-2n-tx2-prev-iter-old-env"
-    - title: "2110.0-9"
+    - title: "2202.0-10"
       data-set: "vpp-2n-tx2-prev-iter-new-env"
-    - title: "2202.0-9"
+    - title: "2206.0-10"
       data-set: "vpp-2n-tx2-curr-iter"
   comparisons:
-    - title: "2110.0-9 vs 2110.0-8"
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 2
       compare: 3
-    - title: "2202.0-9 vs 2110.0-9"
+    - title: "2206.0-10 vs 2202.0-10"
       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.'
+    - '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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Latency Changes 2n-tx2 1t1c
 - type: "table"
@@ -1000,28 +2219,28 @@
   include-tests: "latency-PDR90-direction1-avg"
   filter: "'1T1C' and 'NDRPDR'"
   columns:
-    - title: "2106.0-8"
+    - title: "2110.0-9"
       data-set: "vpp-2n-tx2-hist-iter-new-env"
-    - title: "2110.0-8"
+    - title: "2202.0-9"
       data-set: "vpp-2n-tx2-prev-iter-old-env"
-    - title: "2110.0-9"
+    - title: "2202.0-10"
       data-set: "vpp-2n-tx2-prev-iter-new-env"
-    - title: "2202.0-9"
+    - title: "2206.0-10"
       data-set: "vpp-2n-tx2-curr-iter"
   comparisons:
-    - title: "2110.0-9 vs 2110.0-8"
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 2
       compare: 3
-    - title: "2202.0-9 vs 2110.0-9"
+    - title: "2206.0-10 vs 2202.0-10"
       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.'
+    - '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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Latency Changes 2n-tx2 1t1c
 - type: "table"
@@ -1031,28 +2250,28 @@
   include-tests: "latency-PDR90-direction1-max"
   filter: "'1T1C' and 'NDRPDR'"
   columns:
-    - title: "2106.0-8"
+    - title: "2110.0-9"
       data-set: "vpp-2n-tx2-hist-iter-new-env"
-    - title: "2110.0-8"
+    - title: "2202.0-9"
       data-set: "vpp-2n-tx2-prev-iter-old-env"
-    - title: "2110.0-9"
+    - title: "2202.0-10"
       data-set: "vpp-2n-tx2-prev-iter-new-env"
-    - title: "2202.0-9"
+    - title: "2206.0-10"
       data-set: "vpp-2n-tx2-curr-iter"
   comparisons:
-    - title: "2110.0-9 vs 2110.0-8"
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 2
       compare: 3
-    - title: "2202.0-9 vs 2110.0-9"
+    - title: "2206.0-10 vs 2202.0-10"
       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.'
+    - '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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Latency Changes 3n-tsh 1t1c
 - type: "table"
@@ -1062,90 +2281,295 @@
   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: "2110.0-9"
+      data-set: "vpp-3n-tsh-hist-iter-new-env"
+    - title: "2202.0-9"
+      data-set: "vpp-3n-tsh-prev-iter-old-env"
+    - title: "2202.0-10"
+      data-set: "vpp-3n-tsh-prev-iter-new-env"
+    - title: "2206.0-10"
+      data-set: "vpp-3n-tsh-curr-iter"
+  comparisons:
+    - title: "2202.0-10 vs 2202.0-9"
+      reference: 2
+      compare: 3
+    - title: "2206.0-10 vs 2202.0-10"
+      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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: 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: "2110.0-9"
+      data-set: "vpp-3n-tsh-hist-iter-new-env"
+    - title: "2202.0-9"
+      data-set: "vpp-3n-tsh-prev-iter-old-env"
+    - title: "2202.0-10"
+      data-set: "vpp-3n-tsh-prev-iter-new-env"
+    - title: "2206.0-10"
+      data-set: "vpp-3n-tsh-curr-iter"
+  comparisons:
+    - title: "2202.0-10 vs 2202.0-9"
+      reference: 2
+      compare: 3
+    - title: "2206.0-10 vs 2202.0-10"
+      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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: 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: "2110.0-9"
+      data-set: "vpp-3n-tsh-hist-iter-new-env"
+    - title: "2202.0-9"
+      data-set: "vpp-3n-tsh-prev-iter-old-env"
+    - title: "2202.0-10"
+      data-set: "vpp-3n-tsh-prev-iter-new-env"
+    - title: "2206.0-10"
+      data-set: "vpp-3n-tsh-curr-iter"
+  comparisons:
+    - title: "2202.0-10 vs 2202.0-9"
+      reference: 2
+      compare: 3
+    - title: "2206.0-10 vs 2202.0-10"
+      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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
+
+# VPP Latency Changes 3n-icx 2t1c
+- type: "table"
+  title: "VPP Latency Changes 3n-icx 2t1c PDR50-direction1-avg"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/latency-changes-3n-icx-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: "2110.0-9"
+    #   data-set: "vpp-3n-icx-hist-iter-new-env"
+    - title: "2202.0-9"
+      data-set: "vpp-3n-icx-prev-iter-old-env"
+    - title: "2202.0-10"
+      data-set: "vpp-3n-icx-prev-iter-new-env"
+    - title: "2206.0-10"
+      data-set: "vpp-3n-icx-curr-iter"
+  comparisons:
+    - title: "2202.0-10 vs 2202.0-9"
+      reference: 1
+      compare: 2
+    - title: "2206.0-10 vs 2202.0-10"
+      reference: 2
+      compare: 3
+  legend:
+    - ''
+    - 'Test Case:              Test cases executed for: PDR throughput on 3n-icx with xxv710.'
+    - 'YYMM.V-E:               [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
+
+# VPP Latency Changes 3n-icx 2t1c
+- type: "table"
+  title: "VPP Latency Changes 3n-icx 2t1c PDR90-direction1-avg"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/latency-changes-3n-icx-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: "2110.0-9"
+    #   data-set: "vpp-3n-icx-hist-iter-new-env"
+    - title: "2202.0-9"
+      data-set: "vpp-3n-icx-prev-iter-old-env"
+    - title: "2202.0-10"
+      data-set: "vpp-3n-icx-prev-iter-new-env"
+    - title: "2206.0-10"
+      data-set: "vpp-3n-icx-curr-iter"
+  comparisons:
+    - title: "2202.0-10 vs 2202.0-9"
+      reference: 1
+      compare: 2
+    - title: "2206.0-10 vs 2202.0-10"
+      reference: 2
+      compare: 3
+  legend:
+    - ''
+    - 'Test Case:              Test cases executed for: PDR throughput on 3n-icx with xxv710.'
+    - 'YYMM.V-E:               [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
+
+# VPP Latency Changes 3n-icx 2t1c
+- type: "table"
+  title: "VPP Latency Changes 3n-icx 2t1c PDR90-direction1-max"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/latency-changes-3n-icx-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: "2110.0-9"
+    #   data-set: "vpp-3n-icx-hist-iter-new-env"
+    - title: "2202.0-9"
+      data-set: "vpp-3n-icx-prev-iter-old-env"
+    - title: "2202.0-10"
+      data-set: "vpp-3n-icx-prev-iter-new-env"
+    - title: "2206.0-10"
+      data-set: "vpp-3n-icx-curr-iter"
+  comparisons:
+    - title: "2202.0-10 vs 2202.0-9"
+      reference: 1
+      compare: 2
+    - title: "2206.0-10 vs 2202.0-10"
+      reference: 2
+      compare: 3
+  legend:
+    - ''
+    - 'Test Case:              Test cases executed for: PDR throughput on 3n-icx with xxv710.'
+    - 'YYMM.V-E:               [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
+
+# VPP Latency Changes 2n-icx 2t1c
+- type: "table"
+  title: "VPP Latency Changes 2n-icx 2t1c PDR50-direction1-avg"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/latency-changes-2n-icx-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: "2110.0-9"
+    #   data-set: "vpp-2n-icx-hist-iter-new-env"
     - title: "2202.0-9"
-      data-set: "vpp-3n-tsh-curr-iter"
+      data-set: "vpp-2n-icx-prev-iter-old-env"
+    - title: "2202.0-10"
+      data-set: "vpp-2n-icx-prev-iter-new-env"
+    - title: "2206.0-10"
+      data-set: "vpp-2n-icx-curr-iter"
   comparisons:
-    - title: "2110.0-9 vs 2110.0-8"
+    - title: "2202.0-10 vs 2202.0-9"
+      reference: 1
+      compare: 2
+    - title: "2206.0-10 vs 2202.0-10"
       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.'
+    - 'Test Case:              Test cases executed for: PDR throughput on 2n-icx with xxv710.'
+    - 'YYMM.V-E:               [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
-# VPP Latency Changes 3n-tsh 1t1c
+# VPP Latency Changes 2n-icx 2t1c
 - type: "table"
-  title: "VPP Latency Changes 3n-tsh 1t1c PDR90-direction1-avg"
+  title: "VPP Latency Changes 2n-icx 2t1c PDR90-direction1-avg"
   algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/latency-changes-3n-tsh-x520-1t1c-pdr90-d1-avg"
+  output-file: "{DIR[STATIC,VPP]}/latency-changes-2n-icx-xxv710-2t1c-pdr90-d1-avg"
   include-tests: "latency-PDR90-direction1-avg"
-  filter: "'1T1C' and 'NDRPDR'"
+  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   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: "2110.0-9"
+    #   data-set: "vpp-2n-icx-hist-iter-new-env"
     - title: "2202.0-9"
-      data-set: "vpp-3n-tsh-curr-iter"
+      data-set: "vpp-2n-icx-prev-iter-old-env"
+    - title: "2202.0-10"
+      data-set: "vpp-2n-icx-prev-iter-new-env"
+    - title: "2206.0-10"
+      data-set: "vpp-2n-icx-curr-iter"
   comparisons:
-    - title: "2110.0-9 vs 2110.0-8"
+    - title: "2202.0-10 vs 2202.0-9"
+      reference: 1
+      compare: 2
+    - title: "2206.0-10 vs 2202.0-10"
       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.'
+    - 'Test Case:              Test cases executed for: PDR throughput on 2n-icx with xxv710.'
+    - 'YYMM.V-E:               [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
-# VPP Latency Changes 3n-tsh 1t1c
+# VPP Latency Changes 2n-icx 2t1c
 - type: "table"
-  title: "VPP Latency Changes 3n-tsh 1t1c PDR90-direction1-max"
+  title: "VPP Latency Changes 2n-icx 2t1c PDR90-direction1-max"
   algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/latency-changes-3n-tsh-x520-1t1c-pdr90-d1-max"
+  output-file: "{DIR[STATIC,VPP]}/latency-changes-2n-icx-xxv710-2t1c-pdr90-d1-max"
   include-tests: "latency-PDR90-direction1-max"
-  filter: "'1T1C' and 'NDRPDR'"
+  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   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: "2110.0-9"
+    #   data-set: "vpp-2n-icx-hist-iter-new-env"
     - title: "2202.0-9"
-      data-set: "vpp-3n-tsh-curr-iter"
+      data-set: "vpp-2n-icx-prev-iter-old-env"
+    - title: "2202.0-10"
+      data-set: "vpp-2n-icx-prev-iter-new-env"
+    - title: "2206.0-10"
+      data-set: "vpp-2n-icx-curr-iter"
   comparisons:
-    - title: "2110.0-9 vs 2110.0-8"
+    - title: "2202.0-10 vs 2202.0-9"
+      reference: 1
+      compare: 2
+    - title: "2206.0-10 vs 2202.0-10"
       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.'
+    - 'Test Case:              Test cases executed for: PDR throughput on 2n-icx with xxv710.'
+    - 'YYMM.V-E:               [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: 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"
@@ -1202,13 +2626,14 @@
       data-set: "vpp-3n-skx-curr-iter"
       tag: "NIC_Intel-XXV710"
   comparisons:
-    - title: "Diff"
+    - title: "xxv710 vs x710"
       reference: 1
       compare: 2
   legend:
-    - ""
-    - "x710, xxv710 - NICs tested."
-    - "Diff - difference between x710 and xxv710 NIC."
+    - ''
+    - 'Test Case:      Test cases executed for: NDR throughput on 3n-skx with x710 and xxv710.'
+    - 'x710, xxv710:   [Mpps +- StDev] results for VPP tested in CSIT'
+    - 'xxv710 vs x710: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
 
 # VPP Compare NICs 3n-skx 4t2c ndr
 - type: "table"
@@ -1225,13 +2650,14 @@
       data-set: "vpp-3n-skx-curr-iter"
       tag: "NIC_Intel-XXV710"
   comparisons:
-    - title: "Diff"
+    - title: "xxv710 vs x710"
       reference: 1
       compare: 2
   legend:
-    - ""
-    - "x710, xxv710 - NICs tested."
-    - "Diff - difference between x710 and xxv710 NIC."
+    - ''
+    - 'Test Case:      Test cases executed for: NDR throughput on 3n-skx with x710 and xxv710.'
+    - 'x710, xxv710:   [Mpps +- StDev] results for VPP tested in CSIT'
+    - 'xxv710 vs x710: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
 
 # VPP Compare NICs 3n-skx 2t1c pdr
 - type: "table"
@@ -1248,13 +2674,14 @@
       data-set: "vpp-3n-skx-curr-iter"
       tag: "NIC_Intel-XXV710"
   comparisons:
-    - title: "Diff"
+    - title: "xxv710 vs x710"
       reference: 1
       compare: 2
   legend:
-    - ""
-    - "x710, xxv710 - NICs tested."
-    - "Diff - difference between x710 and xxv710 NIC."
+    - ''
+    - 'Test Case:      Test cases executed for: PDR throughput on 3n-skx with x710 and xxv710.'
+    - 'x710, xxv710:   [Mpps +- StDev] results for VPP tested in CSIT'
+    - 'xxv710 vs x710: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
 
 # VPP Compare NICs 3n-skx 4t2c pdr
 - type: "table"
@@ -1271,13 +2698,14 @@
       data-set: "vpp-3n-skx-curr-iter"
       tag: "NIC_Intel-XXV710"
   comparisons:
-    - title: "Diff"
+    - title: "xxv710 vs x710"
       reference: 1
       compare: 2
   legend:
-    - ""
-    - "x710, xxv710 - NICs tested."
-    - "Diff - difference between x710 and xxv710 NIC."
+    - ''
+    - 'Test Case:      Test cases executed for: PDR throughput on 3n-skx with x710 and xxv710.'
+    - 'x710, xxv710:   [Mpps +- StDev] results for VPP tested in CSIT'
+    - 'xxv710 vs x710: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
 
 # VPP Compare NICs 3n-skx 2t1c mrr
 - type: "table"
@@ -1294,13 +2722,14 @@
       data-set: "vpp-3n-skx-curr-iter-mrr"
       tag: "NIC_Intel-XXV710"
   comparisons:
-    - title: "Diff"
+    - title: "xxv710 vs x710"
       reference: 1
       compare: 2
   legend:
-    - ""
-    - "x710, xxv710 - NICs tested."
-    - "Diff - difference between x710 and xxv710 NIC."
+    - ''
+    - 'Test Case:      Test cases executed for: MRR throughput on 3n-skx with x710 and xxv710.'
+    - 'x710, xxv710:   [Mpps +- StDev] results for VPP tested in CSIT'
+    - 'xxv710 vs x710: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
 
 # VPP Compare NICs 3n-skx 4t2c mrr
 - type: "table"
@@ -1317,13 +2746,14 @@
       data-set: "vpp-3n-skx-curr-iter-mrr"
       tag: "NIC_Intel-XXV710"
   comparisons:
-    - title: "Diff"
+    - title: "xxv710 vs x710"
       reference: 1
       compare: 2
   legend:
-    - ""
-    - "x710, xxv710 - NICs tested."
-    - "Diff - difference between x710 and xxv710 NIC."
+    - ''
+    - 'Test Case:      Test cases executed for: MRR throughput on 3n-skx with x710 and xxv710.'
+    - 'x710, xxv710:   [Mpps +- StDev] results for VPP tested in CSIT'
+    - 'xxv710 vs x710: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
 
 # VPP Compare NICs 3n-skx 8t4c mrr
 - type: "table"
@@ -1340,177 +2770,483 @@
       data-set: "vpp-3n-skx-curr-iter-mrr"
       tag: "NIC_Intel-XXV710"
   comparisons:
-    - title: "Diff"
+    - title: "xxv710 vs x710"
+      reference: 1
+      compare: 2
+  legend:
+    - ''
+    - 'Test Case:      Test cases executed for: MRR throughput on 3n-skx with x710 and xxv710.'
+    - 'x710, xxv710:   [Mpps +- StDev] results for VPP tested in CSIT'
+    - 'xxv710 vs x710: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+
+# VPP Compare NICs 2n-skx 2t1c ndr
+- type: "table"
+  title: "VPP Compare NICs 2n-skx 2t1c ndr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-2t1c-nics-ndr"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T1C' and 'NDRPDR' and not 'NF_DENSITY'"
+  columns:
+    - title: "x710"
+      data-set: "vpp-2n-skx-curr-iter"
+      tag: "NIC_Intel-X710"
+    - title: "xxv710"
+      data-set: "vpp-2n-skx-curr-iter"
+      tag: "NIC_Intel-XXV710"
+  comparisons:
+    - title: "xxv710 vs x710"
+      reference: 1
+      compare: 2
+  legend:
+    - ''
+    - 'Test Case:      Test cases executed for: NDR throughput on 2n-skx with x710 and xxv710.'
+    - 'x710, xxv710:   [Mpps +- StDev] results for VPP tested in CSIT'
+    - 'xxv710 vs x710: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+
+# VPP Compare NICs 2n-skx 4t2c ndr
+- type: "table"
+  title: "VPP Compare NICs 2n-skx 4t2c ndr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-4t2c-nics-ndr"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T2C' and 'NDRPDR' and not 'NF_DENSITY'"
+  columns:
+    - title: "x710"
+      data-set: "vpp-2n-skx-curr-iter"
+      tag: "NIC_Intel-X710"
+    - title: "xxv710"
+      data-set: "vpp-2n-skx-curr-iter"
+      tag: "NIC_Intel-XXV710"
+  comparisons:
+    - title: "xxv710 vs x710"
+      reference: 1
+      compare: 2
+  legend:
+    - ''
+    - 'Test Case:      Test cases executed for: NDR throughput on 2n-skx with x710 and xxv710.'
+    - 'x710, xxv710:   [Mpps +- StDev] results for VPP tested in CSIT'
+    - 'xxv710 vs x710: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+
+# VPP Compare NICs 2n-skx 2t1c pdr
+- type: "table"
+  title: "VPP Compare NICs 2n-skx 2t1c pdr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-2t1c-nics-pdr"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T1C' and 'NDRPDR' and not 'NF_DENSITY'"
+  columns:
+    - title: "x710"
+      data-set: "vpp-2n-skx-curr-iter"
+      tag: "NIC_Intel-X710"
+    - title: "xxv710"
+      data-set: "vpp-2n-skx-curr-iter"
+      tag: "NIC_Intel-XXV710"
+  comparisons:
+    - title: "xxv710 vs x710"
+      reference: 1
+      compare: 2
+  legend:
+    - ''
+    - 'Test Case:      Test cases executed for: PDR throughput on 2n-skx with x710 and xxv710.'
+    - 'x710, xxv710:   [Mpps +- StDev] results for VPP tested in CSIT'
+    - 'xxv710 vs x710: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+
+# VPP Compare NICs 2n-skx 4t2c pdr
+- type: "table"
+  title: "VPP Compare NICs 2n-skx 4t2c pdr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-4t2c-nics-pdr"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T2C' and 'NDRPDR' and not 'NF_DENSITY'"
+  columns:
+    - title: "x710"
+      data-set: "vpp-2n-skx-curr-iter"
+      tag: "NIC_Intel-X710"
+    - title: "xxv710"
+      data-set: "vpp-2n-skx-curr-iter"
+      tag: "NIC_Intel-XXV710"
+  comparisons:
+    - title: "xxv710 vs x710"
+      reference: 1
+      compare: 2
+  legend:
+    - ''
+    - 'Test Case:      Test cases executed for: PDR throughput on 2n-skx with x710 and xxv710.'
+    - 'x710, xxv710:   [Mpps +- StDev] results for VPP tested in CSIT'
+    - 'xxv710 vs x710: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+
+# VPP Compare NICs 2n-skx 2t1c mrr
+- type: "table"
+  title: "VPP Compare NICs 2n-skx 2t1c mrr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-2t1c-nics-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T1C' and 'MRR' and not 'NF_DENSITY'"
+  columns:
+    - title: "x710"
+      data-set: "vpp-2n-skx-curr-iter-mrr"
+      tag: "NIC_Intel-X710"
+    - title: "xxv710"
+      data-set: "vpp-2n-skx-curr-iter-mrr"
+      tag: "NIC_Intel-XXV710"
+  comparisons:
+    - title: "xxv710 vs x710"
+      reference: 1
+      compare: 2
+  legend:
+    - ''
+    - 'Test Case:      Test cases executed for: MRR throughput on 2n-skx with x710 and xxv710.'
+    - 'x710, xxv710:   [Mpps +- StDev] results for VPP tested in CSIT'
+    - 'xxv710 vs x710: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+
+# VPP Compare NICs 2n-skx 4t2c mrr
+- type: "table"
+  title: "VPP Compare NICs 2n-skx 4t2c mrr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-4t2c-nics-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T2C' and 'MRR' and not 'NF_DENSITY'"
+  columns:
+    - title: "x710"
+      data-set: "vpp-2n-skx-curr-iter-mrr"
+      tag: "NIC_Intel-X710"
+    - title: "xxv710"
+      data-set: "vpp-2n-skx-curr-iter-mrr"
+      tag: "NIC_Intel-XXV710"
+  comparisons:
+    - title: "xxv710 vs x710"
+      reference: 1
+      compare: 2
+  legend:
+    - ''
+    - 'Test Case:      Test cases executed for: MRR throughput on 2n-skx with x710 and xxv710.'
+    - 'x710, xxv710:   [Mpps +- StDev] results for VPP tested in CSIT'
+    - 'xxv710 vs x710: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+
+# VPP Compare NICs 2n-skx 8t4c mrr
+- type: "table"
+  title: "VPP Compare NICs 2n-skx 8t4c mrr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-8t4c-nics-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'8T4C' and 'MRR' and not 'NF_DENSITY'"
+  columns:
+    - title: "x710"
+      data-set: "vpp-2n-skx-curr-iter-mrr"
+      tag: "NIC_Intel-X710"
+    - title: "xxv710"
+      data-set: "vpp-2n-skx-curr-iter-mrr"
+      tag: "NIC_Intel-XXV710"
+  comparisons:
+    - title: "xxv710 vs x710"
+      reference: 1
+      compare: 2
+  legend:
+    - ''
+    - 'Test Case:      Test cases executed for: MRR throughput on 2n-skx with x710 and xxv710.'
+    - 'x710, xxv710:   [Mpps +- StDev] results for VPP tested in CSIT'
+    - 'xxv710 vs x710: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+
+################################################################################
+# 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-hist-iter-hoststack-new-env"
+    - title: "2202.0-9"
+      data-set: "vpp-3n-skx-prev-iter-hoststack-old-env"
+    - title: "2206.0-10"
+      data-set: "vpp-3n-skx-curr-iter-hoststack"
+  comparisons:
+    - title: "2206.0-10 vs 2202.0-9"
+      reference: 2
+      compare: 3
+  legend:
+    - ''
+    - 'Test Case:             Test cases executed for: Hoststack on 3n-skx with xxv710.'
+    - 'YYMM.V-E:              [Mbps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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.'
+    - '2206.0-10 vs 2202.0-9: 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-hist-iter-vsap-new-env"
+    - title: "2202.0-9"
+      data-set: "vpp-2n-clx-curr-iter-vsap-old-env"
+    - title: "2206.0-10"
+      data-set: "vpp-2n-clx-curr-iter-vsap"
+  comparisons:
+    - title: "2206.0-10 vs 2202.0-9"
+      reference: 2
+      compare: 3
+  legend:
+    - ''
+    - 'Test Case:             Test cases executed for: VSAP on 2n-clx with cx556a.'
+    - 'YYMM.V-E:              [Mcps/Mrps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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.'
+    - '2206.0-10 vs 2202.0-9: Compares VPP code current vs previous.'
+
+# VPP Performance Changes 3n-icx 2t1c pdr
+- type: "table"
+  title: "VPP Performance Changes 3n-icx 2t1c pdr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-icx-2t1c-pdr"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
+  columns:
+    # - title: "2110.0-9"
+    #   data-set: "vpp-3n-icx-hist-iter-new-env"
+    - title: "2202.0-9"
+      data-set: "vpp-3n-icx-prev-iter-old-env"
+    - title: "2202.0-10"
+      data-set: "vpp-3n-icx-prev-iter-new-env"
+    - title: "2206.0-10"
+      data-set: "vpp-3n-icx-curr-iter"
+  comparisons:
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 1
       compare: 2
+    - title: "2206.0-10 vs 2202.0-10"
+      reference: 2
+      compare: 3
   legend:
-    - ""
-    - "x710, xxv710 - NICs tested."
-    - "Diff - difference between x710 and xxv710 NIC."
+    - ''
+    - 'Test Case:              Test cases executed for: PDR throughput on 3n-icx with xxv710.'
+    - 'YYMM.V-E:               [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
-# VPP Compare NICs 2n-skx 2t1c ndr
+# VPP Performance Changes 3n-icx 4t2c pdr
 - type: "table"
-  title: "VPP Compare NICs 2n-skx 2t1c ndr"
+  title: "VPP Performance Changes 3n-icx 4t2c pdr"
   algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-2t1c-nics-ndr"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'NDRPDR' and not 'NF_DENSITY'"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-icx-4t2c-pdr"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "x710"
-      data-set: "vpp-2n-skx-curr-iter"
-      tag: "NIC_Intel-X710"
-    - title: "xxv710"
-      data-set: "vpp-2n-skx-curr-iter"
-      tag: "NIC_Intel-XXV710"
+    # - title: "2110.0-9"
+    #   data-set: "vpp-3n-icx-hist-iter-new-env"
+    - title: "2202.0-9"
+      data-set: "vpp-3n-icx-prev-iter-old-env"
+    - title: "2202.0-10"
+      data-set: "vpp-3n-icx-prev-iter-new-env"
+    - title: "2206.0-10"
+      data-set: "vpp-3n-icx-curr-iter"
   comparisons:
-    - title: "Diff"
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 1
       compare: 2
+    - title: "2206.0-10 vs 2202.0-10"
+      reference: 2
+      compare: 3
   legend:
-    - ""
-    - "x710, xxv710 - NICs tested."
-    - "Diff - difference between x710 and xxv710 NIC."
+    - ''
+    - 'Test Case:              Test cases executed for: PDR throughput on 3n-icx with xxv710.'
+    - 'YYMM.V-E:               [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
-# VPP Compare NICs 2n-skx 4t2c ndr
+# VPP Performance Changes 3n-icx 2t1c ndr
 - type: "table"
-  title: "VPP Compare NICs 2n-skx 4t2c ndr"
+  title: "VPP Performance Changes 3n-icx 2t1c ndr"
   algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-4t2c-nics-ndr"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-icx-2t1c-ndr"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'NDRPDR' and not 'NF_DENSITY'"
+  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "x710"
-      data-set: "vpp-2n-skx-curr-iter"
-      tag: "NIC_Intel-X710"
-    - title: "xxv710"
-      data-set: "vpp-2n-skx-curr-iter"
-      tag: "NIC_Intel-XXV710"
+    # - title: "2110.0-9"
+    #   data-set: "vpp-3n-icx-hist-iter-new-env"
+    - title: "2202.0-9"
+      data-set: "vpp-3n-icx-prev-iter-old-env"
+    - title: "2202.0-10"
+      data-set: "vpp-3n-icx-prev-iter-new-env"
+    - title: "2206.0-10"
+      data-set: "vpp-3n-icx-curr-iter"
   comparisons:
-    - title: "Diff"
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 1
       compare: 2
+    - title: "2206.0-10 vs 2202.0-10"
+      reference: 2
+      compare: 3
   legend:
-    - ""
-    - "x710, xxv710 - NICs tested."
-    - "Diff - difference between x710 and xxv710 NIC."
+    - ''
+    - 'Test Case:              Test cases executed for: NDR throughput on 3n-icx with xxv710.'
+    - 'YYMM.V-E:               [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
-# VPP Compare NICs 2n-skx 2t1c pdr
+# VPP Performance Changes 3n-icx 4t2c ndr
 - type: "table"
-  title: "VPP Compare NICs 2n-skx 2t1c pdr"
+  title: "VPP Performance Changes 3n-icx 4t2c ndr"
   algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-2t1c-nics-pdr"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'NDRPDR' and not 'NF_DENSITY'"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-icx-4t2c-ndr"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "x710"
-      data-set: "vpp-2n-skx-curr-iter"
-      tag: "NIC_Intel-X710"
-    - title: "xxv710"
-      data-set: "vpp-2n-skx-curr-iter"
-      tag: "NIC_Intel-XXV710"
+    # - title: "2110.0-9"
+    #   data-set: "vpp-3n-icx-hist-iter-new-env"
+    - title: "2202.0-9"
+      data-set: "vpp-3n-icx-prev-iter-old-env"
+    - title: "2202.0-10"
+      data-set: "vpp-3n-icx-prev-iter-new-env"
+    - title: "2206.0-10"
+      data-set: "vpp-3n-icx-curr-iter"
   comparisons:
-    - title: "Diff"
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 1
       compare: 2
+    - title: "2206.0-10 vs 2202.0-10"
+      reference: 2
+      compare: 3
   legend:
-    - ""
-    - "x710, xxv710 - NICs tested."
-    - "Diff - difference between x710 and xxv710 NIC."
+    - ''
+    - 'Test Case:              Test cases executed for: NDR throughput on 3n-icx with xxv710.'
+    - 'YYMM.V-E:               [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
-# VPP Compare NICs 2n-skx 4t2c pdr
+# VPP Performance Changes 2n-icx 2t1c pdr
 - type: "table"
-  title: "VPP Compare NICs 2n-skx 4t2c pdr"
+  title: "VPP Performance Changes 2n-icx 2t1c pdr"
   algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-4t2c-nics-pdr"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-icx-2t1c-pdr"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'NDRPDR' and not 'NF_DENSITY'"
+  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "x710"
-      data-set: "vpp-2n-skx-curr-iter"
-      tag: "NIC_Intel-X710"
-    - title: "xxv710"
-      data-set: "vpp-2n-skx-curr-iter"
-      tag: "NIC_Intel-XXV710"
+    # - title: "2110.0-9"
+    #   data-set: "vpp-2n-icx-hist-iter-new-env"
+    - title: "2202.0-9"
+      data-set: "vpp-2n-icx-prev-iter-old-env"
+    - title: "2202.0-10"
+      data-set: "vpp-2n-icx-prev-iter-new-env"
+    - title: "2206.0-10"
+      data-set: "vpp-2n-icx-curr-iter"
   comparisons:
-    - title: "Diff"
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 1
       compare: 2
+    - title: "2206.0-10 vs 2202.0-10"
+      reference: 2
+      compare: 3
   legend:
-    - ""
-    - "x710, xxv710 - NICs tested."
-    - "Diff - difference between x710 and xxv710 NIC."
+    - ''
+    - 'Test Case:              Test cases executed for: PDR throughput on 2n-icx with xxv710.'
+    - 'YYMM.V-E:               [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
-# VPP Compare NICs 2n-skx 2t1c mrr
+# VPP Performance Changes 2n-icx 4t2c pdr
 - type: "table"
-  title: "VPP Compare NICs 2n-skx 2t1c mrr"
+  title: "VPP Performance Changes 2n-icx 4t2c pdr"
   algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-2t1c-nics-mrr"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'MRR' and not 'NF_DENSITY'"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-icx-4t2c-pdr"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "x710"
-      data-set: "vpp-2n-skx-curr-iter-mrr"
-      tag: "NIC_Intel-X710"
-    - title: "xxv710"
-      data-set: "vpp-2n-skx-curr-iter-mrr"
-      tag: "NIC_Intel-XXV710"
+    # - title: "2110.0-9"
+    #   data-set: "vpp-2n-icx-hist-iter-new-env"
+    - title: "2202.0-9"
+      data-set: "vpp-2n-icx-prev-iter-old-env"
+    - title: "2202.0-10"
+      data-set: "vpp-2n-icx-prev-iter-new-env"
+    - title: "2206.0-10"
+      data-set: "vpp-2n-icx-curr-iter"
   comparisons:
-    - title: "Diff"
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 1
       compare: 2
+    - title: "2206.0-10 vs 2202.0-10"
+      reference: 2
+      compare: 3
   legend:
-    - ""
-    - "x710, xxv710 - NICs tested."
-    - "Diff - difference between x710 and xxv710 NIC."
+    - ''
+    - 'Test Case:              Test cases executed for: PDR throughput on 2n-icx with xxv710.'
+    - 'YYMM.V-E:               [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
-# VPP Compare NICs 2n-skx 4t2c mrr
+# VPP Performance Changes 2n-icx 2t1c ndr
 - type: "table"
-  title: "VPP Compare NICs 2n-skx 4t2c mrr"
+  title: "VPP Performance Changes 2n-icx 2t1c ndr"
   algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-4t2c-nics-mrr"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'MRR' and not 'NF_DENSITY'"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-icx-2t1c-ndr"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "x710"
-      data-set: "vpp-2n-skx-curr-iter-mrr"
-      tag: "NIC_Intel-X710"
-    - title: "xxv710"
-      data-set: "vpp-2n-skx-curr-iter-mrr"
-      tag: "NIC_Intel-XXV710"
+    # - title: "2110.0-9"
+    #   data-set: "vpp-2n-icx-hist-iter-new-env"
+    - title: "2202.0-9"
+      data-set: "vpp-2n-icx-prev-iter-old-env"
+    - title: "2202.0-10"
+      data-set: "vpp-2n-icx-prev-iter-new-env"
+    - title: "2206.0-10"
+      data-set: "vpp-2n-icx-curr-iter"
   comparisons:
-    - title: "Diff"
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 1
       compare: 2
+    - title: "2206.0-10 vs 2202.0-10"
+      reference: 2
+      compare: 3
   legend:
-    - ""
-    - "x710, xxv710 - NICs tested."
-    - "Diff - difference between x710 and xxv710 NIC."
+    - ''
+    - 'Test Case:              Test cases executed for: NDR throughput on 2n-icx with xxv710.'
+    - 'YYMM.V-E:               [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
-# VPP Compare NICs 2n-skx 8t4c mrr
+# VPP Performance Changes 2n-icx 4t2c ndr
 - type: "table"
-  title: "VPP Compare NICs 2n-skx 8t4c mrr"
+  title: "VPP Performance Changes 2n-icx 4t2c ndr"
   algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-8t4c-nics-mrr"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'8T4C' and 'MRR' and not 'NF_DENSITY'"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-icx-4t2c-ndr"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "x710"
-      data-set: "vpp-2n-skx-curr-iter-mrr"
-      tag: "NIC_Intel-X710"
-    - title: "xxv710"
-      data-set: "vpp-2n-skx-curr-iter-mrr"
-      tag: "NIC_Intel-XXV710"
+    # - title: "2110.0-9"
+    #   data-set: "vpp-2n-icx-hist-iter-new-env"
+    - title: "2202.0-9"
+      data-set: "vpp-2n-icx-prev-iter-old-env"
+    - title: "2202.0-10"
+      data-set: "vpp-2n-icx-prev-iter-new-env"
+    - title: "2206.0-10"
+      data-set: "vpp-2n-icx-curr-iter"
   comparisons:
-    - title: "Diff"
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 1
       compare: 2
+    - title: "2206.0-10 vs 2202.0-10"
+      reference: 2
+      compare: 3
   legend:
-    - ""
-    - "x710, xxv710 - NICs tested."
-    - "Diff - difference between x710 and xxv710 NIC."
-
-################################################################################
-# VPP
+    - ''
+    - 'Test Case:              Test cases executed for: NDR throughput on 2n-icx with xxv710.'
+    - 'YYMM.V-E:               [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-skx 2t1c pdr
 - type: "table"
@@ -1520,28 +3256,28 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2106.0-8"
+    - title: "2110.0-9"
       data-set: "vpp-3n-skx-hist-iter-new-env"
-    - title: "2110.0-8"
+    - title: "2202.0-9"
       data-set: "vpp-3n-skx-prev-iter-old-env"
-    - title: "2110.0-9"
+    - title: "2202.0-10"
       data-set: "vpp-3n-skx-prev-iter-new-env"
-    - title: "2202.0-9"
+    - title: "2206.0-10"
       data-set: "vpp-3n-skx-curr-iter"
   comparisons:
-    - title: "2110.0-9 vs 2110.0-8"
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 2
       compare: 3
-    - title: "2202.0-9 vs 2110.0-9"
+    - title: "2206.0-10 vs 2202.0-10"
       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.'
+    - '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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-skx 4t2c pdr
 - type: "table"
@@ -1551,28 +3287,28 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2106.0-8"
+    - title: "2110.0-9"
       data-set: "vpp-3n-skx-hist-iter-new-env"
-    - title: "2110.0-8"
+    - title: "2202.0-9"
       data-set: "vpp-3n-skx-prev-iter-old-env"
-    - title: "2110.0-9"
+    - title: "2202.0-10"
       data-set: "vpp-3n-skx-prev-iter-new-env"
-    - title: "2202.0-9"
+    - title: "2206.0-10"
       data-set: "vpp-3n-skx-curr-iter"
   comparisons:
-    - title: "2110.0-9 vs 2110.0-8"
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 2
       compare: 3
-    - title: "2202.0-9 vs 2110.0-9"
+    - title: "2206.0-10 vs 2202.0-10"
       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.'
+    - '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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-skx 2t1c ndr
 - type: "table"
@@ -1582,28 +3318,28 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2106.0-8"
+    - title: "2110.0-9"
       data-set: "vpp-3n-skx-hist-iter-new-env"
-    - title: "2110.0-8"
+    - title: "2202.0-9"
       data-set: "vpp-3n-skx-prev-iter-old-env"
-    - title: "2110.0-9"
+    - title: "2202.0-10"
       data-set: "vpp-3n-skx-prev-iter-new-env"
-    - title: "2202.0-9"
+    - title: "2206.0-10"
       data-set: "vpp-3n-skx-curr-iter"
   comparisons:
-    - title: "2110.0-9 vs 2110.0-8"
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 2
       compare: 3
-    - title: "2202.0-9 vs 2110.0-9"
+    - title: "2206.0-10 vs 2202.0-10"
       reference: 3
       compare: 4
   legend:
     - ''
     - 'Test Case:            Test cases executed for: NDR 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:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "9" for CSIT rls2202, "10" for CSIT rls2206).'
     - '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.'
+    - '2202.0-10 vs 2202.0-9: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-skx 4t2c ndr
 - type: "table"
@@ -1613,28 +3349,28 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2106.0-8"
+    - title: "2110.0-9"
       data-set: "vpp-3n-skx-hist-iter-new-env"
-    - title: "2110.0-8"
+    - title: "2202.0-9"
       data-set: "vpp-3n-skx-prev-iter-old-env"
-    - title: "2110.0-9"
+    - title: "2202.0-10"
       data-set: "vpp-3n-skx-prev-iter-new-env"
-    - title: "2202.0-9"
+    - title: "2206.0-10"
       data-set: "vpp-3n-skx-curr-iter"
   comparisons:
-    - title: "2110.0-9 vs 2110.0-8"
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 2
       compare: 3
-    - title: "2202.0-9 vs 2110.0-9"
+    - title: "2206.0-10 vs 2202.0-10"
       reference: 3
       compare: 4
   legend:
     - ''
-    - 'Test Case:            Test cases executed for: NDR 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.'
+    - '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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-skx 2t1c pdr
 - type: "table"
@@ -1644,28 +3380,28 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2106.0-8"
+    - title: "2110.0-9"
       data-set: "vpp-2n-skx-hist-iter-new-env"
-    - title: "2110.0-8"
+    - title: "2202.0-9"
       data-set: "vpp-2n-skx-prev-iter-old-env"
-    - title: "2110.0-9"
+    - title: "2202.0-10"
       data-set: "vpp-2n-skx-prev-iter-new-env"
-    - title: "2202.0-9"
+    - title: "2206.0-10"
       data-set: "vpp-2n-skx-curr-iter"
   comparisons:
-    - title: "2110.0-9 vs 2110.0-8"
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 2
       compare: 3
-    - title: "2202.0-9 vs 2110.0-9"
+    - title: "2206.0-10 vs 2202.0-10"
       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.'
+    - '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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-skx 4t2c pdr
 - type: "table"
@@ -1675,28 +3411,28 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2106.0-8"
+    - title: "2110.0-9"
       data-set: "vpp-2n-skx-hist-iter-new-env"
-    - title: "2110.0-8"
+    - title: "2202.0-9"
       data-set: "vpp-2n-skx-prev-iter-old-env"
-    - title: "2110.0-9"
+    - title: "2202.0-10"
       data-set: "vpp-2n-skx-prev-iter-new-env"
-    - title: "2202.0-9"
+    - title: "2206.0-10"
       data-set: "vpp-2n-skx-curr-iter"
   comparisons:
-    - title: "2110.0-9 vs 2110.0-8"
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 2
       compare: 3
-    - title: "2202.0-9 vs 2110.0-9"
+    - title: "2206.0-10 vs 2202.0-10"
       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.'
+    - '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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-skx 2t1c ndr
 - type: "table"
@@ -1706,28 +3442,28 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2106.0-8"
+    - title: "2110.0-9"
       data-set: "vpp-2n-skx-hist-iter-new-env"
-    - title: "2110.0-8"
+    - title: "2202.0-9"
       data-set: "vpp-2n-skx-prev-iter-old-env"
-    - title: "2110.0-9"
+    - title: "2202.0-10"
       data-set: "vpp-2n-skx-prev-iter-new-env"
-    - title: "2202.0-9"
+    - title: "2206.0-10"
       data-set: "vpp-2n-skx-curr-iter"
   comparisons:
-    - title: "2110.0-9 vs 2110.0-8"
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 2
       compare: 3
-    - title: "2202.0-9 vs 2110.0-9"
+    - title: "2206.0-10 vs 2202.0-10"
       reference: 3
       compare: 4
   legend:
     - ''
-    - 'Test Case:            Test cases executed for: NDR 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.'
+    - '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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-skx 4t2c ndr
 - type: "table"
@@ -1737,28 +3473,28 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2106.0-8"
+    - title: "2110.0-9"
       data-set: "vpp-2n-skx-hist-iter-new-env"
-    - title: "2110.0-8"
+    - title: "2202.0-9"
       data-set: "vpp-2n-skx-prev-iter-old-env"
-    - title: "2110.0-9"
+    - title: "2202.0-10"
       data-set: "vpp-2n-skx-prev-iter-new-env"
-    - title: "2202.0-9"
+    - title: "2206.0-10"
       data-set: "vpp-2n-skx-curr-iter"
   comparisons:
-    - title: "2110.0-9 vs 2110.0-8"
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 2
       compare: 3
-    - title: "2202.0-9 vs 2110.0-9"
+    - title: "2206.0-10 vs 2202.0-10"
       reference: 3
       compare: 4
   legend:
     - ''
-    - 'Test Case:            Test cases executed for: NDR 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.'
+    - '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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-xxv710 2t1c pdr
 - type: "table"
@@ -1768,28 +3504,28 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2106.0-8"
+    - title: "2110.0-9"
       data-set: "vpp-2n-clx-hist-iter-new-env"
-    - title: "2110.0-8"
+    - title: "2202.0-9"
       data-set: "vpp-2n-clx-prev-iter-old-env"
-    - title: "2110.0-9"
+    - title: "2202.0-10"
       data-set: "vpp-2n-clx-prev-iter-new-env"
-    - title: "2202.0-9"
+    - title: "2206.0-10"
       data-set: "vpp-2n-clx-curr-iter"
   comparisons:
-    - title: "2110.0-9 vs 2110.0-8"
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 2
       compare: 3
-    - title: "2202.0-9 vs 2110.0-9"
+    - title: "2206.0-10 vs 2202.0-10"
       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.'
+    - '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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-xxv710 4t2c pdr
 - type: "table"
@@ -1799,28 +3535,28 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2106.0-8"
+    - title: "2110.0-9"
       data-set: "vpp-2n-clx-hist-iter-new-env"
-    - title: "2110.0-8"
+    - title: "2202.0-9"
       data-set: "vpp-2n-clx-prev-iter-old-env"
-    - title: "2110.0-9"
+    - title: "2202.0-10"
       data-set: "vpp-2n-clx-prev-iter-new-env"
-    - title: "2202.0-9"
+    - title: "2206.0-10"
       data-set: "vpp-2n-clx-curr-iter"
   comparisons:
-    - title: "2110.0-9 vs 2110.0-8"
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 2
       compare: 3
-    - title: "2202.0-9 vs 2110.0-9"
+    - title: "2206.0-10 vs 2202.0-10"
       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.'
+    - '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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-xxv710 2t1c ndr
 - type: "table"
@@ -1830,28 +3566,28 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2106.0-8"
+    - title: "2110.0-9"
       data-set: "vpp-2n-clx-hist-iter-new-env"
-    - title: "2110.0-8"
+    - title: "2202.0-9"
       data-set: "vpp-2n-clx-prev-iter-old-env"
-    - title: "2110.0-9"
+    - title: "2202.0-10"
       data-set: "vpp-2n-clx-prev-iter-new-env"
-    - title: "2202.0-9"
+    - title: "2206.0-10"
       data-set: "vpp-2n-clx-curr-iter"
   comparisons:
-    - title: "2110.0-9 vs 2110.0-8"
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 2
       compare: 3
-    - title: "2202.0-9 vs 2110.0-9"
+    - title: "2206.0-10 vs 2202.0-10"
       reference: 3
       compare: 4
   legend:
     - ''
-    - 'Test Case:            Test cases executed for: NDR 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.'
+    - '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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-xxv710 4t2c ndr
 - type: "table"
@@ -1861,28 +3597,28 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2106.0-8"
+    - title: "2110.0-9"
       data-set: "vpp-2n-clx-hist-iter-new-env"
-    - title: "2110.0-8"
+    - title: "2202.0-9"
       data-set: "vpp-2n-clx-prev-iter-old-env"
-    - title: "2110.0-9"
+    - title: "2202.0-10"
       data-set: "vpp-2n-clx-prev-iter-new-env"
-    - title: "2202.0-9"
+    - title: "2206.0-10"
       data-set: "vpp-2n-clx-curr-iter"
   comparisons:
-    - title: "2110.0-9 vs 2110.0-8"
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 2
       compare: 3
-    - title: "2202.0-9 vs 2110.0-9"
+    - title: "2206.0-10 vs 2202.0-10"
       reference: 3
       compare: 4
   legend:
     - ''
-    - 'Test Case:            Test cases executed for: NDR 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.'
+    - '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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-cx556a 2t1c pdr
 - type: "table"
@@ -1892,28 +3628,28 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Mellanox-CX556A' and not 'NF_DENSITY'"
   columns:
-    - title: "2106.0-8"
+    - title: "2110.0-9"
       data-set: "vpp-2n-clx-hist-iter-new-env"
-    - title: "2110.0-8"
+    - title: "2202.0-9"
       data-set: "vpp-2n-clx-prev-iter-old-env"
-    - title: "2110.0-9"
+    - title: "2202.0-10"
       data-set: "vpp-2n-clx-prev-iter-new-env"
-    - title: "2202.0-9"
+    - title: "2206.0-10"
       data-set: "vpp-2n-clx-curr-iter"
   comparisons:
-    - title: "2110.0-9 vs 2110.0-8"
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 2
       compare: 3
-    - title: "2202.0-9 vs 2110.0-9"
+    - title: "2206.0-10 vs 2202.0-10"
       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.'
+    - '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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-cx556a 4t2c pdr
 - type: "table"
@@ -1923,28 +3659,28 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Mellanox-CX556A' and not 'NF_DENSITY'"
   columns:
-    - title: "2106.0-8"
+    - title: "2110.0-9"
       data-set: "vpp-2n-clx-hist-iter-new-env"
-    - title: "2110.0-8"
+    - title: "2202.0-9"
       data-set: "vpp-2n-clx-prev-iter-old-env"
-    - title: "2110.0-9"
+    - title: "2202.0-10"
       data-set: "vpp-2n-clx-prev-iter-new-env"
-    - title: "2202.0-9"
+    - title: "2206.0-10"
       data-set: "vpp-2n-clx-curr-iter"
   comparisons:
-    - title: "2110.0-9 vs 2110.0-8"
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 2
       compare: 3
-    - title: "2202.0-9 vs 2110.0-9"
+    - title: "2206.0-10 vs 2202.0-10"
       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.'
+    - '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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-cx556a 2t1c ndr
 - type: "table"
@@ -1954,28 +3690,28 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Mellanox-CX556A' and not 'NF_DENSITY'"
   columns:
-    - title: "2106.0-8"
+    - title: "2110.0-9"
       data-set: "vpp-2n-clx-hist-iter-new-env"
-    - title: "2110.0-8"
+    - title: "2202.0-9"
       data-set: "vpp-2n-clx-prev-iter-old-env"
-    - title: "2110.0-9"
+    - title: "2202.0-10"
       data-set: "vpp-2n-clx-prev-iter-new-env"
-    - title: "2202.0-9"
+    - title: "2206.0-10"
       data-set: "vpp-2n-clx-curr-iter"
   comparisons:
-    - title: "2110.0-9 vs 2110.0-8"
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 2
       compare: 3
-    - title: "2202.0-9 vs 2110.0-9"
+    - title: "2206.0-10 vs 2202.0-10"
       reference: 3
       compare: 4
   legend:
     - ''
-    - 'Test Case:            Test cases executed for: NDR 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.'
+    - '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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-cx556a 4t2c ndr
 - type: "table"
@@ -1985,28 +3721,28 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Mellanox-CX556A' and not 'NF_DENSITY'"
   columns:
-    - title: "2106.0-8"
+    - title: "2110.0-9"
       data-set: "vpp-2n-clx-hist-iter-new-env"
-    - title: "2110.0-8"
+    - title: "2202.0-9"
       data-set: "vpp-2n-clx-prev-iter-old-env"
-    - title: "2110.0-9"
+    - title: "2202.0-10"
       data-set: "vpp-2n-clx-prev-iter-new-env"
-    - title: "2202.0-9"
+    - title: "2206.0-10"
       data-set: "vpp-2n-clx-curr-iter"
   comparisons:
-    - title: "2110.0-9 vs 2110.0-8"
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 2
       compare: 3
-    - title: "2202.0-9 vs 2110.0-9"
+    - title: "2206.0-10 vs 2202.0-10"
       reference: 3
       compare: 4
   legend:
     - ''
-    - 'Test Case:            Test cases executed for: NDR 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.'
+    - '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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-zn2-xxv710 2t1c pdr
 - type: "table"
@@ -2016,28 +3752,28 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "2106.0-8"
+    - title: "2110.0-9"
       data-set: "vpp-2n-zn2-hist-iter-new-env"
-    - title: "2110.0-8"
+    - title: "2202.0-9"
       data-set: "vpp-2n-zn2-prev-iter-old-env"
-    - title: "2110.0-9"
+    - title: "2202.0-10"
       data-set: "vpp-2n-zn2-prev-iter-new-env"
-    - title: "2202.0-9"
+    - title: "2206.0-10"
       data-set: "vpp-2n-zn2-curr-iter"
   comparisons:
-    - title: "2110.0-9 vs 2110.0-8"
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 2
       compare: 3
-    - title: "2202.0-9 vs 2110.0-9"
+    - title: "2206.0-10 vs 2202.0-10"
       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.'
+    - '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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-zn2-xxv710 4t2c pdr
 - type: "table"
@@ -2047,28 +3783,28 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "2106.0-8"
+    - title: "2110.0-9"
       data-set: "vpp-2n-zn2-hist-iter-new-env"
-    - title: "2110.0-8"
+    - title: "2202.0-9"
       data-set: "vpp-2n-zn2-prev-iter-old-env"
-    - title: "2110.0-9"
+    - title: "2202.0-10"
       data-set: "vpp-2n-zn2-prev-iter-new-env"
-    - title: "2202.0-9"
+    - title: "2206.0-10"
       data-set: "vpp-2n-zn2-curr-iter"
   comparisons:
-    - title: "2110.0-9 vs 2110.0-8"
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 2
       compare: 3
-    - title: "2202.0-9 vs 2110.0-9"
+    - title: "2206.0-10 vs 2202.0-10"
       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.'
+    - '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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-zn2-xxv710 2t1c ndr
 - type: "table"
@@ -2078,28 +3814,28 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "2106.0-8"
+    - title: "2110.0-9"
       data-set: "vpp-2n-zn2-hist-iter-new-env"
-    - title: "2110.0-8"
+    - title: "2202.0-9"
       data-set: "vpp-2n-zn2-prev-iter-old-env"
-    - title: "2110.0-9"
+    - title: "2202.0-10"
       data-set: "vpp-2n-zn2-prev-iter-new-env"
-    - title: "2202.0-9"
+    - title: "2206.0-10"
       data-set: "vpp-2n-zn2-curr-iter"
   comparisons:
-    - title: "2110.0-9 vs 2110.0-8"
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 2
       compare: 3
-    - title: "2202.0-9 vs 2110.0-9"
+    - title: "2206.0-10 vs 2202.0-10"
       reference: 3
       compare: 4
   legend:
     - ''
-    - 'Test Case:            Test cases executed for: NDR 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.'
+    - '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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-zn2-xxv710 4t2c ndr
 - type: "table"
@@ -2109,28 +3845,28 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "2106.0-8"
+    - title: "2110.0-9"
       data-set: "vpp-2n-zn2-hist-iter-new-env"
-    - title: "2110.0-8"
+    - title: "2202.0-9"
       data-set: "vpp-2n-zn2-prev-iter-old-env"
-    - title: "2110.0-9"
+    - title: "2202.0-10"
       data-set: "vpp-2n-zn2-prev-iter-new-env"
-    - title: "2202.0-9"
+    - title: "2206.0-10"
       data-set: "vpp-2n-zn2-curr-iter"
   comparisons:
-    - title: "2110.0-9 vs 2110.0-8"
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 2
       compare: 3
-    - title: "2202.0-9 vs 2110.0-9"
+    - title: "2206.0-10 vs 2202.0-10"
       reference: 3
       compare: 4
   legend:
     - ''
-    - 'Test Case:            Test cases executed for: NDR 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.'
+    - '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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-dnv 1t1c pdr
 - type: "table"
@@ -2140,28 +3876,28 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C'"
   columns:
-    - title: "2106.0-8"
+    - title: "2110.0-9"
       data-set: "vpp-2n-dnv-hist-iter-new-env"
-    - title: "2110.0-8"
+    - title: "2202.0-9"
       data-set: "vpp-2n-dnv-prev-iter-old-env"
-    - title: "2110.0-9"
+    - title: "2202.0-10"
       data-set: "vpp-2n-dnv-prev-iter-new-env"
-    - title: "2202.0-9"
+    - title: "2206.0-10"
       data-set: "vpp-2n-dnv-curr-iter"
   comparisons:
-    - title: "2110.0-9 vs 2110.0-8"
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 2
       compare: 3
-    - title: "2202.0-9 vs 2110.0-9"
+    - title: "2206.0-10 vs 2202.0-10"
       reference: 3
       compare: 4
   legend:
     - ''
-    - 'Test Case:            Test cases executed for: PDR throughput on 2n-dnv with x553.'
-    - '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.'
+    - '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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-dnv 2t2c pdr
 - type: "table"
@@ -2171,28 +3907,28 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C'"
   columns:
-    - title: "2106.0-8"
+    - title: "2110.0-9"
       data-set: "vpp-2n-dnv-hist-iter-new-env"
-    - title: "2110.0-8"
+    - title: "2202.0-9"
       data-set: "vpp-2n-dnv-prev-iter-old-env"
-    - title: "2110.0-9"
+    - title: "2202.0-10"
       data-set: "vpp-2n-dnv-prev-iter-new-env"
-    - title: "2202.0-9"
+    - title: "2206.0-10"
       data-set: "vpp-2n-dnv-curr-iter"
   comparisons:
-    - title: "2110.0-9 vs 2110.0-8"
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 2
       compare: 3
-    - title: "2202.0-9 vs 2110.0-9"
+    - title: "2206.0-10 vs 2202.0-10"
       reference: 3
       compare: 4
   legend:
     - ''
-    - 'Test Case:            Test cases executed for: PDR throughput on 2n-dnv with x553.'
-    - '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.'
+    - '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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-dnv 1t1c ndr
 - type: "table"
@@ -2202,28 +3938,28 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C'"
   columns:
-    - title: "2106.0-8"
+    - title: "2110.0-9"
       data-set: "vpp-2n-dnv-hist-iter-new-env"
-    - title: "2110.0-8"
+    - title: "2202.0-9"
       data-set: "vpp-2n-dnv-prev-iter-old-env"
-    - title: "2110.0-9"
+    - title: "2202.0-10"
       data-set: "vpp-2n-dnv-prev-iter-new-env"
-    - title: "2202.0-9"
+    - title: "2206.0-10"
       data-set: "vpp-2n-dnv-curr-iter"
   comparisons:
-    - title: "2110.0-9 vs 2110.0-8"
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 2
       compare: 3
-    - title: "2202.0-9 vs 2110.0-9"
+    - title: "2206.0-10 vs 2202.0-10"
       reference: 3
       compare: 4
   legend:
     - ''
-    - 'Test Case:            Test cases executed for: NDR throughput on 2n-dnv with x553.'
-    - '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.'
+    - '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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-dnv 2t2c ndr
 - type: "table"
@@ -2233,28 +3969,28 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C'"
   columns:
-    - title: "2106.0-8"
+    - title: "2110.0-9"
       data-set: "vpp-2n-dnv-hist-iter-new-env"
-    - title: "2110.0-8"
+    - title: "2202.0-9"
       data-set: "vpp-2n-dnv-prev-iter-old-env"
-    - title: "2110.0-9"
+    - title: "2202.0-10"
       data-set: "vpp-2n-dnv-prev-iter-new-env"
-    - title: "2202.0-9"
+    - title: "2206.0-10"
       data-set: "vpp-2n-dnv-curr-iter"
   comparisons:
-    - title: "2110.0-9 vs 2110.0-8"
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 2
       compare: 3
-    - title: "2202.0-9 vs 2110.0-9"
+    - title: "2206.0-10 vs 2202.0-10"
       reference: 3
       compare: 4
   legend:
     - ''
-    - 'Test Case:            Test cases executed for: NDR throughput on 2n-dnv with x553.'
-    - '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.'
+    - '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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-dnv 1t1c pdr
 - type: "table"
@@ -2264,28 +4000,28 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C'"
   columns:
-    - title: "2106.0-8"
+    - title: "2110.0-9"
       data-set: "vpp-3n-dnv-hist-iter-new-env"
-    - title: "2110.0-8"
+    - title: "2202.0-9"
       data-set: "vpp-3n-dnv-prev-iter-old-env"
-    - title: "2110.0-9"
+    - title: "2202.0-10"
       data-set: "vpp-3n-dnv-prev-iter-new-env"
-    - title: "2202.0-9"
+    - title: "2206.0-10"
       data-set: "vpp-3n-dnv-curr-iter"
   comparisons:
-    - title: "2110.0-9 vs 2110.0-8"
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 2
       compare: 3
-    - title: "2202.0-9 vs 2110.0-9"
+    - title: "2206.0-10 vs 2202.0-10"
       reference: 3
       compare: 4
   legend:
     - ''
-    - 'Test Case:            Test cases executed for: PDR throughput on 3n-dnv with x553.'
-    - '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.'
+    - '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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-dnv 2t2c pdr
 - type: "table"
@@ -2295,28 +4031,28 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C'"
   columns:
-    - title: "2106.0-8"
+    - title: "2110.0-9"
       data-set: "vpp-3n-dnv-hist-iter-new-env"
-    - title: "2110.0-8"
+    - title: "2202.0-9"
       data-set: "vpp-3n-dnv-prev-iter-old-env"
-    - title: "2110.0-9"
+    - title: "2202.0-10"
       data-set: "vpp-3n-dnv-prev-iter-new-env"
-    - title: "2202.0-9"
+    - title: "2206.0-10"
       data-set: "vpp-3n-dnv-curr-iter"
   comparisons:
-    - title: "2110.0-9 vs 2110.0-8"
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 2
       compare: 3
-    - title: "2202.0-9 vs 2110.0-9"
+    - title: "2206.0-10 vs 2202.0-10"
       reference: 3
       compare: 4
   legend:
     - ''
-    - 'Test Case:            Test cases executed for: PDR throughput on 3n-dnv with x553.'
-    - '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.'
+    - '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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-dnv 1t1c ndr
 - type: "table"
@@ -2326,28 +4062,28 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C'"
   columns:
-    - title: "2106.0-8"
+    - title: "2110.0-9"
       data-set: "vpp-3n-dnv-hist-iter-new-env"
-    - title: "2110.0-8"
+    - title: "2202.0-9"
       data-set: "vpp-3n-dnv-prev-iter-old-env"
-    - title: "2110.0-9"
+    - title: "2202.0-10"
       data-set: "vpp-3n-dnv-prev-iter-new-env"
-    - title: "2202.0-9"
+    - title: "2206.0-10"
       data-set: "vpp-3n-dnv-curr-iter"
   comparisons:
-    - title: "2110.0-9 vs 2110.0-8"
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 2
       compare: 3
-    - title: "2202.0-9 vs 2110.0-9"
+    - title: "2206.0-10 vs 2202.0-10"
       reference: 3
       compare: 4
   legend:
     - ''
-    - 'Test Case:            Test cases executed for: NDR throughput on 3n-dnv with x553.'
-    - '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.'
+    - '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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-dnv 2t2c ndr
 - type: "table"
@@ -2357,28 +4093,28 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C'"
   columns:
-    - title: "2106.0-8"
+    - title: "2110.0-9"
       data-set: "vpp-3n-dnv-hist-iter-new-env"
-    - title: "2110.0-8"
+    - title: "2202.0-9"
       data-set: "vpp-3n-dnv-prev-iter-old-env"
-    - title: "2110.0-9"
+    - title: "2202.0-10"
       data-set: "vpp-3n-dnv-prev-iter-new-env"
-    - title: "2202.0-9"
+    - title: "2206.0-10"
       data-set: "vpp-3n-dnv-curr-iter"
   comparisons:
-    - title: "2110.0-9 vs 2110.0-8"
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 2
       compare: 3
-    - title: "2202.0-9 vs 2110.0-9"
+    - title: "2206.0-10 vs 2202.0-10"
       reference: 3
       compare: 4
   legend:
     - ''
-    - 'Test Case:            Test cases executed for: NDR throughput on 3n-dnv with x553.'
-    - '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.'
+    - '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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-tsh 1t1c pdr
 - type: "table"
@@ -2388,28 +4124,28 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C'"
   columns:
-    - title: "2106.0-8"
+    - title: "2110.0-9"
       data-set: "vpp-3n-tsh-hist-iter-new-env"
-    - title: "2110.0-8"
+    - title: "2202.0-9"
       data-set: "vpp-3n-tsh-prev-iter-old-env"
-    - title: "2110.0-9"
+    - title: "2202.0-10"
       data-set: "vpp-3n-tsh-prev-iter-new-env"
-    - title: "2202.0-9"
+    - title: "2206.0-10"
       data-set: "vpp-3n-tsh-curr-iter"
   comparisons:
-    - title: "2110.0-9 vs 2110.0-8"
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 2
       compare: 3
-    - title: "2202.0-9 vs 2110.0-9"
+    - title: "2206.0-10 vs 2202.0-10"
       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.'
+    - '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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-tsh 2t2c pdr
 - type: "table"
@@ -2419,28 +4155,28 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C'"
   columns:
-    - title: "2106.0-8"
+    - title: "2110.0-9"
       data-set: "vpp-3n-tsh-hist-iter-new-env"
-    - title: "2110.0-8"
+    - title: "2202.0-9"
       data-set: "vpp-3n-tsh-prev-iter-old-env"
-    - title: "2110.0-9"
+    - title: "2202.0-10"
       data-set: "vpp-3n-tsh-prev-iter-new-env"
-    - title: "2202.0-9"
+    - title: "2206.0-10"
       data-set: "vpp-3n-tsh-curr-iter"
   comparisons:
-    - title: "2110.0-9 vs 2110.0-8"
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 2
       compare: 3
-    - title: "2202.0-9 vs 2110.0-9"
+    - title: "2206.0-10 vs 2202.0-10"
       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.'
+    - '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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-tsh 1t1c ndr
 - type: "table"
@@ -2450,28 +4186,28 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C'"
   columns:
-    - title: "2106.0-8"
+    - title: "2110.0-9"
       data-set: "vpp-3n-tsh-hist-iter-new-env"
-    - title: "2110.0-8"
+    - title: "2202.0-9"
       data-set: "vpp-3n-tsh-prev-iter-old-env"
-    - title: "2110.0-9"
+    - title: "2202.0-10"
       data-set: "vpp-3n-tsh-prev-iter-new-env"
-    - title: "2202.0-9"
+    - title: "2206.0-10"
       data-set: "vpp-3n-tsh-curr-iter"
   comparisons:
-    - title: "2110.0-9 vs 2110.0-8"
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 2
       compare: 3
-    - title: "2202.0-9 vs 2110.0-9"
+    - title: "2206.0-10 vs 2202.0-10"
       reference: 3
       compare: 4
   legend:
     - ''
-    - 'Test Case:            Test cases executed for: NDR 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.'
+    - '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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-tsh 2t2c ndr
 - type: "table"
@@ -2481,28 +4217,28 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C'"
   columns:
-    - title: "2106.0-8"
+    - title: "2110.0-9"
       data-set: "vpp-3n-tsh-hist-iter-new-env"
-    - title: "2110.0-8"
+    - title: "2202.0-9"
       data-set: "vpp-3n-tsh-prev-iter-old-env"
-    - title: "2110.0-9"
+    - title: "2202.0-10"
       data-set: "vpp-3n-tsh-prev-iter-new-env"
-    - title: "2202.0-9"
+    - title: "2206.0-10"
       data-set: "vpp-3n-tsh-curr-iter"
   comparisons:
-    - title: "2110.0-9 vs 2110.0-8"
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 2
       compare: 3
-    - title: "2202.0-9 vs 2110.0-9"
+    - title: "2206.0-10 vs 2202.0-10"
       reference: 3
       compare: 4
   legend:
     - ''
-    - 'Test Case:            Test cases executed for: NDR 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.'
+    - '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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-tx2 1t1c pdr
 - type: "table"
@@ -2512,28 +4248,28 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C'"
   columns:
-    - title: "2106.0-8"
+    - title: "2110.0-9"
       data-set: "vpp-2n-tx2-hist-iter-new-env"
-    - title: "2110.0-8"
+    - title: "2202.0-9"
       data-set: "vpp-2n-tx2-prev-iter-old-env"
-    - title: "2110.0-9"
+    - title: "2202.0-10"
       data-set: "vpp-2n-tx2-prev-iter-new-env"
-    - title: "2202.0-9"
+    - title: "2206.0-10"
       data-set: "vpp-2n-tx2-curr-iter"
   comparisons:
-    - title: "2110.0-9 vs 2110.0-8"
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 2
       compare: 3
-    - title: "2202.0-9 vs 2110.0-9"
+    - title: "2206.0-10 vs 2202.0-10"
       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.'
+    - '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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-tx2 2t2c pdr
 - type: "table"
@@ -2543,28 +4279,28 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C'"
   columns:
-    - title: "2106.0-8"
+    - title: "2110.0-9"
       data-set: "vpp-2n-tx2-hist-iter-new-env"
-    - title: "2110.0-8"
+    - title: "2202.0-9"
       data-set: "vpp-2n-tx2-prev-iter-old-env"
-    - title: "2110.0-9"
+    - title: "2202.0-10"
       data-set: "vpp-2n-tx2-prev-iter-new-env"
-    - title: "2202.0-9"
+    - title: "2206.0-10"
       data-set: "vpp-2n-tx2-curr-iter"
   comparisons:
-    - title: "2110.0-9 vs 2110.0-8"
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 2
       compare: 3
-    - title: "2202.0-9 vs 2110.0-9"
+    - title: "2206.0-10 vs 2202.0-10"
       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.'
+    - '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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-tx2 1t1c ndr
 - type: "table"
@@ -2574,28 +4310,28 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C'"
   columns:
-    - title: "2106.0-8"
+    - title: "2110.0-9"
       data-set: "vpp-2n-tx2-hist-iter-new-env"
-    - title: "2110.0-8"
+    - title: "2202.0-9"
       data-set: "vpp-2n-tx2-prev-iter-old-env"
-    - title: "2110.0-9"
+    - title: "2202.0-10"
       data-set: "vpp-2n-tx2-prev-iter-new-env"
-    - title: "2202.0-9"
+    - title: "2206.0-10"
       data-set: "vpp-2n-tx2-curr-iter"
   comparisons:
-    - title: "2110.0-9 vs 2110.0-8"
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 2
       compare: 3
-    - title: "2202.0-9 vs 2110.0-9"
+    - title: "2206.0-10 vs 2202.0-10"
       reference: 3
       compare: 4
   legend:
     - ''
-    - 'Test Case:            Test cases executed for: NDR 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.'
+    - '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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-tx2 2t2c ndr
 - type: "table"
@@ -2605,564 +4341,502 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C'"
   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: NDR 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 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:             [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.'
-    - '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:             [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.'
-    - '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:             [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.'
-    - '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:             [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.'
-    - '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:             [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.'
-    - '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:             [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.'
-    - '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:             [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.'
-    - '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:             [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.'
-    - '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"
-  title: "VPP Comparison Across Testbeds 2n-skx to 2n-clx 2t1c ndr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-2n-skx-2n-clx-2t1c-ndr"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'NIC_Intel-XXV710'"
-  columns:
-    - title: "2n-skx"
-      data-set: "vpp-2n-skx-curr-iter"
-    - title: "2n-clx"
-      data-set: "vpp-2n-clx-curr-iter"
-  comparisons:
-    - title: "Diff"
-      reference: 1
-      compare: 2
-  legend:
-    - ""
-    - "2n-skx, 2n-clx - testbeds and NICs tested."
-    - "Diff - difference between 2n-skx and 2n-clx testbeds."
-
-# VPP Comparison Across Testbeds 2n-skx to 2n-clx 4t2c ndr
-- type: "table"
-  title: "VPP Comparison Across Testbeds 2n-skx to 2n-clx 4t2c ndr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-2n-skx-2n-clx-4t2c-ndr"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'NIC_Intel-XXV710'"
-  columns:
-    - title: "2n-skx"
-      data-set: "vpp-2n-skx-curr-iter"
-    - title: "2n-clx"
-      data-set: "vpp-2n-clx-curr-iter"
+      data-set: "vpp-2n-tx2-hist-iter-new-env"
+    - title: "2202.0-9"
+      data-set: "vpp-2n-tx2-prev-iter-old-env"
+    - title: "2202.0-10"
+      data-set: "vpp-2n-tx2-prev-iter-new-env"
+    - title: "2206.0-10"
+      data-set: "vpp-2n-tx2-curr-iter"
   comparisons:
-    - title: "Diff"
-      reference: 1
-      compare: 2
+    - title: "2202.0-10 vs 2202.0-9"
+      reference: 2
+      compare: 3
+    - title: "2206.0-10 vs 2202.0-10"
+      reference: 3
+      compare: 4
   legend:
-    - ""
-    - "2n-skx, 2n-clx - testbeds and NICs tested."
-    - "Diff - difference between 2n-skx and 2n-clx testbeds."
+    - ''
+    - '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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
-# VPP Comparison Across Testbeds 2n-skx to 2n-clx 2t1c pdr
+# VPP Performance Changes 2n-aws 2t1c pdr
 - type: "table"
-  title: "VPP Comparison Across Testbeds 2n-skx to 2n-clx 2t1c pdr"
+  title: "VPP Performance Changes 2n-aws 2t1c pdr"
   algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-2n-skx-2n-clx-2t1c-pdr"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-aws-2t1c-pdr"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'NIC_Intel-XXV710'"
+  filter: "'2T1C' and 'NDRPDR'"
   columns:
-    - title: "2n-skx"
-      data-set: "vpp-2n-skx-curr-iter"
-    - title: "2n-clx"
-      data-set: "vpp-2n-clx-curr-iter"
+    - title: "2110.0-8"
+      data-set: "vpp-2n-aws-hist-iter"
+    - title: "2202.0-9"
+      data-set: "vpp-2n-aws-prev-iter"
+    - title: "2206.0-10"
+      data-set: "vpp-2n-aws-curr-iter"
   comparisons:
-    - title: "Diff"
-      reference: 1
-      compare: 2
+    - title: "2206.0-10 vs 2202.0-9"
+      reference: 2
+      compare: 3
   legend:
-    - ""
-    - "2n-skx, 2n-clx - testbeds and NICs tested."
-    - "Diff - difference between 2n-skx and 2n-clx testbeds."
+    - ''
+    - '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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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.'
+    - '2206.0-10 vs 2202.0-9: Compares VPP code current vs previous.'
 
-# VPP Comparison Across Testbeds 2n-skx to 2n-clx 4t2c pdr
+# VPP Performance Changes 2n-aws 4t2c pdr
 - type: "table"
-  title: "VPP Comparison Across Testbeds 2n-skx to 2n-clx 4t2c pdr"
+  title: "VPP Performance Changes 2n-aws 4t2c pdr"
   algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-2n-skx-2n-clx-4t2c-pdr"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-aws-4t2c-pdr"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'NIC_Intel-XXV710'"
+  filter: "'4T2C' and 'NDRPDR'"
   columns:
-    - title: "2n-skx"
-      data-set: "vpp-2n-skx-curr-iter"
-    - title: "2n-clx"
-      data-set: "vpp-2n-clx-curr-iter"
+    - title: "2110.0-8"
+      data-set: "vpp-2n-aws-hist-iter"
+    - title: "2202.0-9"
+      data-set: "vpp-2n-aws-prev-iter"
+    - title: "2206.0-10"
+      data-set: "vpp-2n-aws-curr-iter"
   comparisons:
-    - title: "Diff"
-      reference: 1
-      compare: 2
+    - title: "2206.0-10 vs 2202.0-9"
+      reference: 2
+      compare: 3
   legend:
-    - ""
-    - "2n-skx, 2n-clx - testbeds and NICs tested."
-    - "Diff - difference between 2n-skx and 2n-clx testbeds."
+    - ''
+    - '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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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.'
+    - '2206.0-10 vs 2202.0-9: Compares VPP code current vs previous.'
 
-# VPP Comparison Across Testbeds 2n-clx to 2n-icx 1c ndr
+# VPP Performance Changes 2n-aws 2t1c ndr
 - type: "table"
-  title: "VPP Comparison Across Testbeds 2n-clx to 2n-icx 1c ndr"
+  title: "VPP Performance Changes 2n-aws 2t1c ndr"
   algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-2n-clx-2n-icx-1c-ndr"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-aws-2t1c-ndr"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "('NIC_Intel-XXV710' or 'NIC_Intel-E810CQ') and 'NDRPDR' and '1C'"
+  filter: "'2T1C' and 'NDRPDR'"
   columns:
-    - title: "2n-clx xxv710"
-      data-set: "vpp-2n-clx-curr-iter"
-      tag: "NIC_Intel-XXV710"
-    - title: "2n-icx e810cq"
-      data-set: "vpp-2n-icx-curr-iter"
-      tag: "NIC_Intel-E810CQ"
+    - title: "2110.0-8"
+      data-set: "vpp-2n-aws-hist-iter"
+    - title: "2202.0-9"
+      data-set: "vpp-2n-aws-prev-iter"
+    - title: "2206.0-10"
+      data-set: "vpp-2n-aws-curr-iter"
   comparisons:
-    - title: "Diff"
-      reference: 1
-      compare: 2
+    - title: "2206.0-10 vs 2202.0-9"
+      reference: 2
+      compare: 3
   legend:
-    - ""
-    - "2n-clx xxv710, 2n-icx e810cq - testbeds and NICs tested."
-    - "Diff - difference between 2n-clx xxv710 and 2n-icx e810cq testbeds."
+    - ''
+    - '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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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.'
+    - '2206.0-10 vs 2202.0-9: Compares VPP code current vs previous.'
 
-# VPP Comparison Across Testbeds 2n-clx to 2n-icx 2c ndr
+# VPP Performance Changes 2n-aws 4t2c ndr
 - type: "table"
-  title: "VPP Comparison Across Testbeds 2n-clx to 2n-icx 2c ndr"
+  title: "VPP Performance Changes 2n-aws 4t2c ndr"
   algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-2n-clx-2n-icx-2c-ndr"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-aws-4t2c-ndr"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "('NIC_Intel-XXV710' or 'NIC_Intel-E810CQ') and 'NDRPDR' and '2C'"
+  filter: "'4T2C' and 'NDRPDR'"
   columns:
-    - title: "2n-clx xxv710"
-      data-set: "vpp-2n-clx-curr-iter"
-      tag: "NIC_Intel-XXV710"
-    - title: "2n-icx e810cq"
-      data-set: "vpp-2n-icx-curr-iter"
-      tag: "NIC_Intel-E810CQ"
+    - title: "2110.0-8"
+      data-set: "vpp-2n-aws-hist-iter"
+    - title: "2202.0-9"
+      data-set: "vpp-2n-aws-prev-iter"
+    - title: "2206.0-10"
+      data-set: "vpp-2n-aws-curr-iter"
   comparisons:
-    - title: "Diff"
-      reference: 1
-      compare: 2
+    - title: "2206.0-10 vs 2202.0-9"
+      reference: 2
+      compare: 3
   legend:
-    - ""
-    - "2n-clx xxv710, 2n-icx e810cq - testbeds and NICs tested."
-    - "Diff - difference between 2n-clx xxv710 and 2n-icx e810cq testbeds."
+    - ''
+    - '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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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.'
+    - '2206.0-10 vs 2202.0-9: 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-hist-iter"
+#     - title: "2202.0-9"
+#       data-set: "vpp-3n-aws-prev-iter"
+#     - title: "2206.0-10"
+#       data-set: "vpp-3n-aws-curr-iter"
+#   comparisons:
+#     - title: "2206.0-10 vs 2202.0-9"
+#       reference: 2
+#       compare: 3
+#   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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+#     - '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.'
+#     - '2206.0-10 vs 2202.0-9: 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-hist-iter"
+#     - title: "2202.0-9"
+#       data-set: "vpp-3n-aws-prev-iter"
+#     - title: "2206.0-10"
+#       data-set: "vpp-3n-aws-curr-iter"
+#   comparisons:
+#     - title: "2206.0-10 vs 2202.0-9"
+#       reference: 2
+#       compare: 3
+#   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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+#     - '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.'
+#     - '2206.0-10 vs 2202.0-9: 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-hist-iter"
+#     - title: "2202.0-9"
+#       data-set: "vpp-3n-aws-prev-iter"
+#     - title: "2206.0-10"
+#       data-set: "vpp-3n-aws-curr-iter"
+#   comparisons:
+#     - title: "2206.0-10 vs 2202.0-9"
+#       reference: 2
+#       compare: 3
+#   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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+#     - '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.'
+#     - '2206.0-10 vs 2202.0-9: 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-hist-iter"
+#     - title: "2202.0-9"
+#       data-set: "vpp-3n-aws-prev-iter"
+#     - title: "2206.0-10"
+#       data-set: "vpp-3n-aws-curr-iter"
+#   comparisons:
+#     - title: "2206.0-10 vs 2202.0-9"
+#       reference: 2
+#       compare: 3
+#   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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+#     - '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.'
+#     - '2206.0-10 vs 2202.0-9: Compares VPP code current vs previous.'
 
-# VPP Comparison Across Testbeds 2n-clx to 2n-icx 1c pdr
+# VPP Comparison Across Topologies 3n-skx to 2n-skx 1c ndr
 - type: "table"
-  title: "VPP Comparison Across Testbeds 2n-clx to 2n-icx 1c pdr"
+  title: "VPP Comparison Across Topologies 3n-skx to 2n-skx 1c ndr"
   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'"
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-topologies-3n-skx-2n-skx-1c-ndr"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'NDRPDR' and '1C' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "2n-clx xxv710"
-      data-set: "vpp-2n-clx-curr-iter"
-      tag: "NIC_Intel-XXV710"
-    - title: "2n-icx e810cq"
-      data-set: "vpp-2n-icx-curr-iter"
-      tag: "NIC_Intel-E810CQ"
+    - title: "3n-skx xxv710"
+      data-set: "vpp-3n-skx-curr-iter"
+    - title: "2n-skx xxv710"
+      data-set: "vpp-2n-skx-curr-iter"
   comparisons:
-    - title: "Diff"
+    - title: "2n-skx vs 3n-skx"
       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."
+    - ''
+    - 'Test Case:                    Test cases executed for: NDR throughput on 3n-skx xxv710 and 2n-skx xxv710.'
+    - '3n-skx xxv710, 2n-skx xxv710: [Mpps +- StDev] results for VPP tested in CSIT'
+    - '2n-skx vs 3n-skx:             [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
 
-# VPP Comparison Across Testbeds 2n-clx to 2n-icx 2c pdr
+# VPP Comparison Across Topologies 3n-skx to 2n-skx 2c ndr
 - type: "table"
-  title: "VPP Comparison Across Testbeds 2n-clx to 2n-icx 2c pdr"
+  title: "VPP Comparison Across Topologies 3n-skx to 2n-skx 2c ndr"
   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'"
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-topologies-3n-skx-2n-skx-2c-ndr"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'NDRPDR' and '2C' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "2n-clx xxv710"
+    - title: "3n-skx xxv710"
       data-set: "vpp-3n-skx-curr-iter"
-      tag: "NIC_Intel-XXV710"
-    - title: "2n-icx e810cq"
-      data-set: "vpp-2n-icx-curr-iter"
-      tag: "NIC_Intel-E810CQ"
+    - title: "2n-skx xxv710"
+      data-set: "vpp-2n-skx-curr-iter"
   comparisons:
-    - title: "Diff"
+    - title: "2n-skx vs 3n-skx"
       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."
+    - ''
+    - 'Test Case:                    Test cases executed for: NDR throughput on 3n-skx xxv710 and 2n-skx xxv710.'
+    - '3n-skx xxv710, 2n-skx xxv710: [Mpps +- StDev] results for VPP tested in CSIT'
+    - '2n-skx vs 3n-skx:             [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
 
-# VPP Comparison Across Testbeds 3n-skx to 3n-icx 1c ndr
+# VPP Comparison Across Topologies 3n-skx to 2n-skx 1c pdr
 - type: "table"
-  title: "VPP Comparison Across Testbeds 3n-skx to 3n-icx 1c ndr"
+  title: "VPP Comparison Across Topologies 3n-skx to 2n-skx 1c pdr"
   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'"
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-topologies-3n-skx-2n-skx-1c-pdr"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'NDRPDR' and '1C' and 'NIC_Intel-XXV710'"
   columns:
     - title: "3n-skx xxv710"
       data-set: "vpp-3n-skx-curr-iter"
-      tag: "NIC_Intel-XXV710"
-    - title: "3n-icx e810cq"
-      data-set: "vpp-3n-icx-curr-iter"
-      tag: "NIC_Intel-E810CQ"
+    - title: "2n-skx xxv710"
+      data-set: "vpp-2n-skx-curr-iter"
   comparisons:
-    - title: "Diff"
+    - title: "2n-skx vs 3n-skx"
       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."
+    - ''
+    - 'Test Case:                    Test cases executed for: PDR throughput on 3n-skx xxv710 and 2n-skx xxv710.'
+    - '3n-skx xxv710, 2n-skx xxv710: [Mpps +- StDev] results for VPP tested in CSIT'
+    - '2n-skx vs 3n-skx:             [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
 
-# VPP Comparison Across Testbeds 3n-skx to 3n-icx 2c ndr
+# VPP Comparison Across Topologies 3n-skx to 2n-skx 2c pdr
 - type: "table"
-  title: "VPP Comparison Across Testbeds 3n-skx to 3n-icx ndr"
+  title: "VPP Comparison Across Topologies 3n-skx to 2n-skx 2c pdr"
   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'"
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-topologies-3n-skx-2n-skx-2c-pdr"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'NDRPDR' and '2C' and 'NIC_Intel-XXV710'"
   columns:
     - title: "3n-skx xxv710"
       data-set: "vpp-3n-skx-curr-iter"
-      tag: "NIC_Intel-XXV710"
-    - title: "3n-icx e810cq"
-      data-set: "vpp-3n-icx-curr-iter"
-      tag: "NIC_Intel-E810CQ"
+    - title: "2n-skx xxv710"
+      data-set: "vpp-2n-skx-curr-iter"
   comparisons:
-    - title: "Diff"
+    - title: "2n-skx vs 3n-skx"
       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."
+    - ''
+    - 'Test Case:                    Test cases executed for: PDR throughput on 3n-skx xxv710 and 2n-skx xxv710.'
+    - '3n-skx xxv710, 2n-skx xxv710: [Mpps +- StDev] results for VPP tested in CSIT'
+    - '2n-skx vs 3n-skx:             [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
 
-# VPP Comparison Across Testbeds 3n-skx to 3n-icx 1c pdr
+# VPP Performance Changes 3n-icx 2t1c mrr
 - type: "table"
-  title: "VPP Comparison Across Testbeds 3n-skx to 3n-icx 1c pdr"
+  title: "VPP Performance Changes 3n-icx 2t1c mrr"
   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'"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-icx-2t1c-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T1C' and 'MRR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "3n-skx xxv710"
-      data-set: "vpp-3n-skx-curr-iter"
-      tag: "NIC_Intel-XXV710"
-    - title: "3n-icx e810cq"
-      data-set: "vpp-3n-icx-curr-iter"
-      tag: "NIC_Intel-E810CQ"
+    # - title: "2110.0-9"
+    #   data-set: "vpp-3n-icx-hist-iter-mrr-new-env"
+    - title: "2202.0-9"
+      data-set: "vpp-3n-icx-prev-iter-mrr-old-env"
+    - title: "2202.0-10"
+      data-set: "vpp-3n-icx-prev-iter-mrr-new-env"
+    - title: "2206.0-10"
+      data-set: "vpp-3n-icx-curr-iter-mrr"
   comparisons:
-    - title: "Diff"
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 1
       compare: 2
+    - title: "2206.0-10 vs 2202.0-10"
+      reference: 2
+      compare: 3
   legend:
-    - ""
-    - "3n-skx xxv710, 3n-icx e810cq - testbeds and NICs tested."
-    - "Diff - difference between 3n-skx xxv710 and 3n-icx e810cq testbeds."
+    - ''
+    - 'Test Case:              Test cases executed for: MRR throughput on 3n-icx with xxv710.'
+    - 'YYMM.V-E:               [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
-# VPP Comparison Across Testbeds 3n-skx to 3n-icx 2c pdr
+# VPP Performance Changes 3n-icx 4t2c mrr
 - type: "table"
-  title: "VPP Comparison Across Testbeds 3n-skx to 3n-icx 2c pdr"
+  title: "VPP Performance Changes 3n-icx 4t2c mrr"
   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'"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-icx-4t2c-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T2C' and 'MRR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "3n-skx xxv710"
-      data-set: "vpp-3n-skx-curr-iter"
-      tag: "NIC_Intel-XXV710"
-    - title: "3n-icx e810cq"
-      data-set: "vpp-3n-icx-curr-iter"
-      tag: "NIC_Intel-E810CQ"
+    # - title: "2110.0-9"
+    #   data-set: "vpp-3n-icx-hist-iter-mrr-new-env"
+    - title: "2202.0-9"
+      data-set: "vpp-3n-icx-prev-iter-mrr-old-env"
+    - title: "2202.0-10"
+      data-set: "vpp-3n-icx-prev-iter-mrr-new-env"
+    - title: "2206.0-10"
+      data-set: "vpp-3n-icx-curr-iter-mrr"
   comparisons:
-    - title: "Diff"
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 1
       compare: 2
+    - title: "2206.0-10 vs 2202.0-10"
+      reference: 2
+      compare: 3
   legend:
-    - ""
-    - "3n-skx xxv710, 3n-icx e810cq - testbeds and NICs tested."
-    - "Diff - difference between 3n-skx xxv710 and 3n-icx e810cq testbeds."
+    - ''
+    - 'Test Case:              Test cases executed for: MRR throughput on 3n-icx with xxv710.'
+    - 'YYMM.V-E:               [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
-# VPP Comparison Across Topologies 3n-skx to 2n-skx 1c ndr
+# VPP Performance Changes 3n-icx 8t4c mrr
 - type: "table"
-  title: "VPP Comparison Across Topologies 3n-skx to 2n-skx 1c ndr"
+  title: "VPP Performance Changes 3n-icx 8t4c mrr"
   algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-compare-topologies-3n-skx-2n-skx-1c-ndr"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'NDRPDR' and '1C' and 'NIC_Intel-XXV710'"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-icx-8t4c-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'8T4C' and 'MRR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "3n-skx"
-      data-set: "vpp-3n-skx-curr-iter"
-    - title: "2n-skx"
-      data-set: "vpp-2n-skx-curr-iter"
+    # - title: "2110.0-9"
+    #   data-set: "vpp-3n-icx-hist-iter-mrr-new-env"
+    - title: "2202.0-9"
+      data-set: "vpp-3n-icx-prev-iter-mrr-old-env"
+    - title: "2202.0-10"
+      data-set: "vpp-3n-icx-prev-iter-mrr-new-env"
+    - title: "2206.0-10"
+      data-set: "vpp-3n-icx-curr-iter-mrr"
   comparisons:
-    - title: "Diff"
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 1
       compare: 2
+    - title: "2206.0-10 vs 2202.0-10"
+      reference: 2
+      compare: 3
   legend:
-    - ""
-    - "3n-skx, 2n-skx - topologies tested."
-    - "Diff - difference between 3n-skx and 2n-skx topologies."
+    - ''
+    - 'Test Case:              Test cases executed for: MRR throughput on 3n-icx with xxv710.'
+    - 'YYMM.V-E:               [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
-# VPP Comparison Across Topologies 3n-skx to 2n-skx 2c ndr
+# VPP Performance Changes 2n-icx 2t1c mrr
 - type: "table"
-  title: "VPP Comparison Across Topologies 3n-skx to 2n-skx 2c ndr"
+  title: "VPP Performance Changes 2n-icx 2t1c mrr"
   algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-compare-topologies-3n-skx-2n-skx-2c-ndr"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'NDRPDR' and '2C' and 'NIC_Intel-XXV710'"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-icx-2t1c-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T1C' and 'MRR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "3n-skx"
-      data-set: "vpp-3n-skx-curr-iter"
-    - title: "2n-skx"
-      data-set: "vpp-2n-skx-curr-iter"
+    # - title: "2110.0-9"
+    #   data-set: "vpp-2n-icx-hist-iter-mrr-new-env"
+    - title: "2202.0-9"
+      data-set: "vpp-2n-icx-prev-iter-mrr-old-env"
+    - title: "2202.0-10"
+      data-set: "vpp-2n-icx-prev-iter-mrr-new-env"
+    - title: "2206.0-10"
+      data-set: "vpp-2n-icx-curr-iter-mrr"
   comparisons:
-    - title: "Diff"
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 1
       compare: 2
+    - title: "2206.0-10 vs 2202.0-10"
+      reference: 2
+      compare: 3
   legend:
-    - ""
-    - "3n-skx, 2n-skx - topologies tested."
-    - "Diff - difference between 3n-skx and 2n-skx topologies."
+    - ''
+    - 'Test Case:              Test cases executed for: MRR throughput on 2n-icx with xxv710.'
+    - 'YYMM.V-E:               [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
-# VPP Comparison Across Topologies 3n-skx to 2n-skx 1c pdr
+# VPP Performance Changes 2n-icx 4t2c mrr
 - type: "table"
-  title: "VPP Comparison Across Topologies 3n-skx to 2n-skx 1c pdr"
+  title: "VPP Performance Changes 2n-icx 4t2c mrr"
   algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-compare-topologies-3n-skx-2n-skx-1c-pdr"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'NDRPDR' and '1C' and 'NIC_Intel-XXV710'"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-icx-4t2c-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T2C' and 'MRR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "3n-skx"
-      data-set: "vpp-3n-skx-curr-iter"
-    - title: "2n-skx"
-      data-set: "vpp-2n-skx-curr-iter"
+    # - title: "2110.0-9"
+    #   data-set: "vpp-2n-icx-hist-iter-mrr-new-env"
+    - title: "2202.0-9"
+      data-set: "vpp-2n-icx-prev-iter-mrr-old-env"
+    - title: "2202.0-10"
+      data-set: "vpp-2n-icx-prev-iter-mrr-new-env"
+    - title: "2206.0-10"
+      data-set: "vpp-2n-icx-curr-iter-mrr"
   comparisons:
-    - title: "Diff"
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 1
       compare: 2
+    - title: "2206.0-10 vs 2202.0-10"
+      reference: 2
+      compare: 3
   legend:
-    - ""
-    - "3n-skx, 2n-skx - topologies tested."
-    - "Diff - difference between 3n-skx and 2n-skx topologies."
+    - ''
+    - 'Test Case:              Test cases executed for: MRR throughput on 2n-icx with xxv710.'
+    - 'YYMM.V-E:               [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
-# VPP Comparison Across Topologies 3n-skx to 2n-skx 2c pdr
+# VPP Performance Changes 2n-icx 8t4c mrr
 - type: "table"
-  title: "VPP Comparison Across Topologies 3n-skx to 2n-skx 2c pdr"
+  title: "VPP Performance Changes 2n-icx 8t4c mrr"
   algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-compare-topologies-3n-skx-2n-skx-2c-pdr"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'NDRPDR' and '2C' and 'NIC_Intel-XXV710'"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-icx-8t4c-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'8T4C' and 'MRR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "3n-skx"
-      data-set: "vpp-3n-skx-curr-iter"
-    - title: "2n-skx"
-      data-set: "vpp-2n-skx-curr-iter"
+    # - title: "2110.0-9"
+    #   data-set: "vpp-2n-icx-hist-iter-mrr-new-env"
+    - title: "2202.0-9"
+      data-set: "vpp-2n-icx-prev-iter-mrr-old-env"
+    - title: "2202.0-10"
+      data-set: "vpp-2n-icx-prev-iter-mrr-new-env"
+    - title: "2206.0-10"
+      data-set: "vpp-2n-icx-curr-iter-mrr"
   comparisons:
-    - title: "Diff"
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 1
       compare: 2
+    - title: "2206.0-10 vs 2202.0-10"
+      reference: 2
+      compare: 3
   legend:
-    - ""
-    - "3n-skx, 2n-skx - topologies tested."
-    - "Diff - difference between 3n-skx and 2n-skx topologies."
+    - ''
+    - 'Test Case:              Test cases executed for: MRR throughput on 2n-icx with xxv710.'
+    - 'YYMM.V-E:               [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-skx 2t1c mrr
 - type: "table"
@@ -3172,28 +4846,28 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'MRR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2106.0-8"
+    - title: "2110.0-9"
       data-set: "vpp-3n-skx-hist-iter-mrr-new-env"
-    - title: "2110.0-8"
+    - title: "2202.0-9"
       data-set: "vpp-3n-skx-prev-iter-mrr-old-env"
-    - title: "2110.0-9"
+    - title: "2202.0-10"
       data-set: "vpp-3n-skx-prev-iter-mrr-new-env"
-    - title: "2202.0-9"
+    - title: "2206.0-10"
       data-set: "vpp-3n-skx-curr-iter-mrr"
   comparisons:
-    - title: "2110.0-9 vs 2110.0-8"
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 2
       compare: 3
-    - title: "2202.0-9 vs 2110.0-9"
+    - title: "2206.0-10 vs 2202.0-10"
       reference: 3
       compare: 4
   legend:
     - ''
-    - 'Test Case:            Test cases executed for: MRR 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.'
+    - '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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-skx 4t2c mrr
 - type: "table"
@@ -3203,28 +4877,28 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'MRR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2106.0-8"
+    - title: "2110.0-9"
       data-set: "vpp-3n-skx-hist-iter-mrr-new-env"
-    - title: "2110.0-8"
+    - title: "2202.0-9"
       data-set: "vpp-3n-skx-prev-iter-mrr-old-env"
-    - title: "2110.0-9"
+    - title: "2202.0-10"
       data-set: "vpp-3n-skx-prev-iter-mrr-new-env"
-    - title: "2202.0-9"
+    - title: "2206.0-10"
       data-set: "vpp-3n-skx-curr-iter-mrr"
   comparisons:
-    - title: "2110.0-9 vs 2110.0-8"
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 2
       compare: 3
-    - title: "2202.0-9 vs 2110.0-9"
+    - title: "2206.0-10 vs 2202.0-10"
       reference: 3
       compare: 4
   legend:
     - ''
-    - 'Test Case:            Test cases executed for: MRR 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.'
+    - '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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-skx 8t4c mrr
 - type: "table"
@@ -3234,28 +4908,28 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'8T4C' and 'MRR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2106.0-8"
+    - title: "2110.0-9"
       data-set: "vpp-3n-skx-hist-iter-mrr-new-env"
-    - title: "2110.0-8"
+    - title: "2202.0-9"
       data-set: "vpp-3n-skx-prev-iter-mrr-old-env"
-    - title: "2110.0-9"
+    - title: "2202.0-10"
       data-set: "vpp-3n-skx-prev-iter-mrr-new-env"
-    - title: "2202.0-9"
+    - title: "2206.0-10"
       data-set: "vpp-3n-skx-curr-iter-mrr"
   comparisons:
-    - title: "2110.0-9 vs 2110.0-8"
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 2
       compare: 3
-    - title: "2202.0-9 vs 2110.0-9"
+    - title: "2206.0-10 vs 2202.0-10"
       reference: 3
       compare: 4
   legend:
     - ''
-    - 'Test Case:            Test cases executed for: MRR 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.'
+    - '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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-skx 2t1c mrr
 - type: "table"
@@ -3265,28 +4939,28 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'MRR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2106.0-8"
+    - title: "2110.0-9"
       data-set: "vpp-2n-skx-hist-iter-mrr-new-env"
-    - title: "2110.0-8"
+    - title: "2202.0-9"
       data-set: "vpp-2n-skx-prev-iter-mrr-old-env"
-    - title: "2110.0-9"
+    - title: "2202.0-10"
       data-set: "vpp-2n-skx-prev-iter-mrr-new-env"
-    - title: "2202.0-9"
+    - title: "2206.0-10"
       data-set: "vpp-2n-skx-curr-iter-mrr"
   comparisons:
-    - title: "2110.0-9 vs 2110.0-8"
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 2
       compare: 3
-    - title: "2202.0-9 vs 2110.0-9"
+    - title: "2206.0-10 vs 2202.0-10"
       reference: 3
       compare: 4
   legend:
     - ''
-    - 'Test Case:            Test cases executed for: MRR 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.'
+    - '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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-skx 4t2c mrr
 - type: "table"
@@ -3296,28 +4970,28 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'MRR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2106.0-8"
+    - title: "2110.0-9"
       data-set: "vpp-2n-skx-hist-iter-mrr-new-env"
-    - title: "2110.0-8"
+    - title: "2202.0-9"
       data-set: "vpp-2n-skx-prev-iter-mrr-old-env"
-    - title: "2110.0-9"
+    - title: "2202.0-10"
       data-set: "vpp-2n-skx-prev-iter-mrr-new-env"
-    - title: "2202.0-9"
+    - title: "2206.0-10"
       data-set: "vpp-2n-skx-curr-iter-mrr"
   comparisons:
-    - title: "2110.0-9 vs 2110.0-8"
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 2
       compare: 3
-    - title: "2202.0-9 vs 2110.0-9"
+    - title: "2206.0-10 vs 2202.0-10"
       reference: 3
       compare: 4
   legend:
     - ''
-    - 'Test Case:            Test cases executed for: MRR 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.'
+    - '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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-skx 8t4c mrr
 - type: "table"
@@ -3327,28 +5001,28 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'8T4C' and 'MRR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2106.0-8"
+    - title: "2110.0-9"
       data-set: "vpp-2n-skx-hist-iter-mrr-new-env"
-    - title: "2110.0-8"
+    - title: "2202.0-9"
       data-set: "vpp-2n-skx-prev-iter-mrr-old-env"
-    - title: "2110.0-9"
+    - title: "2202.0-10"
       data-set: "vpp-2n-skx-prev-iter-mrr-new-env"
-    - title: "2202.0-9"
+    - title: "2206.0-10"
       data-set: "vpp-2n-skx-curr-iter-mrr"
   comparisons:
-    - title: "2110.0-9 vs 2110.0-8"
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 2
       compare: 3
-    - title: "2202.0-9 vs 2110.0-9"
+    - title: "2206.0-10 vs 2202.0-10"
       reference: 3
       compare: 4
   legend:
     - ''
-    - 'Test Case:            Test cases executed for: MRR 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.'
+    - '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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-xxv710 2t1c mrr
 - type: "table"
@@ -3358,28 +5032,28 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'MRR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2106.0-8"
+    - title: "2110.0-9"
       data-set: "vpp-2n-clx-hist-iter-mrr-new-env"
-    - title: "2110.0-8"
+    - title: "2202.0-9"
       data-set: "vpp-2n-clx-prev-iter-mrr-old-env"
-    - title: "2110.0-9"
+    - title: "2202.0-10"
       data-set: "vpp-2n-clx-prev-iter-mrr-new-env"
-    - title: "2202.0-9"
+    - title: "2206.0-10"
       data-set: "vpp-2n-clx-curr-iter-mrr"
   comparisons:
-    - title: "2110.0-9 vs 2110.0-8"
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 2
       compare: 3
-    - title: "2202.0-9 vs 2110.0-9"
+    - title: "2206.0-10 vs 2202.0-10"
       reference: 3
       compare: 4
   legend:
     - ''
-    - 'Test Case:            Test cases executed for: MRR 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.'
+    - '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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-xxv710 4t2c mrr
 - type: "table"
@@ -3389,28 +5063,28 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'MRR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2106.0-8"
+    - title: "2110.0-9"
       data-set: "vpp-2n-clx-hist-iter-mrr-new-env"
-    - title: "2110.0-8"
+    - title: "2202.0-9"
       data-set: "vpp-2n-clx-prev-iter-mrr-old-env"
-    - title: "2110.0-9"
+    - title: "2202.0-10"
       data-set: "vpp-2n-clx-prev-iter-mrr-new-env"
-    - title: "2202.0-9"
+    - title: "2206.0-10"
       data-set: "vpp-2n-clx-curr-iter-mrr"
   comparisons:
-    - title: "2110.0-9 vs 2110.0-8"
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 2
       compare: 3
-    - title: "2202.0-9 vs 2110.0-9"
+    - title: "2206.0-10 vs 2202.0-10"
       reference: 3
       compare: 4
   legend:
     - ''
-    - 'Test Case:            Test cases executed for: MRR 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.'
+    - '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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-xxv710 8t4c mrr
 - type: "table"
@@ -3420,28 +5094,28 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'8T4C' and 'MRR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2106.0-8"
+    - title: "2110.0-9"
       data-set: "vpp-2n-clx-hist-iter-mrr-new-env"
-    - title: "2110.0-8"
+    - title: "2202.0-9"
       data-set: "vpp-2n-clx-prev-iter-mrr-old-env"
-    - title: "2110.0-9"
+    - title: "2202.0-10"
       data-set: "vpp-2n-clx-prev-iter-mrr-new-env"
-    - title: "2202.0-9"
+    - title: "2206.0-10"
       data-set: "vpp-2n-clx-curr-iter-mrr"
   comparisons:
-    - title: "2110.0-9 vs 2110.0-8"
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 2
       compare: 3
-    - title: "2202.0-9 vs 2110.0-9"
+    - title: "2206.0-10 vs 2202.0-10"
       reference: 3
       compare: 4
   legend:
     - ''
-    - 'Test Case:            Test cases executed for: MRR 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.'
+    - '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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-cx556a 2t1c mrr
 - type: "table"
@@ -3451,28 +5125,28 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'MRR' and 'NIC_Mellanox-CX556A' and not 'NF_DENSITY'"
   columns:
-    - title: "2106.0-8"
+    - title: "2110.0-9"
       data-set: "vpp-2n-clx-hist-iter-mrr-new-env"
-    - title: "2110.0-8"
+    - title: "2202.0-9"
       data-set: "vpp-2n-clx-prev-iter-mrr-old-env"
-    - title: "2110.0-9"
+    - title: "2202.0-10"
       data-set: "vpp-2n-clx-prev-iter-mrr-new-env"
-    - title: "2202.0-9"
+    - title: "2206.0-10"
       data-set: "vpp-2n-clx-curr-iter-mrr"
   comparisons:
-    - title: "2110.0-9 vs 2110.0-8"
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 2
       compare: 3
-    - title: "2202.0-9 vs 2110.0-9"
+    - title: "2206.0-10 vs 2202.0-10"
       reference: 3
       compare: 4
   legend:
     - ''
-    - 'Test Case:            Test cases executed for: MRR 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.'
+    - '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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-cx556a 4t2c mrr
 - type: "table"
@@ -3482,28 +5156,28 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'MRR' and 'NIC_Mellanox-CX556A' and not 'NF_DENSITY'"
   columns:
-    - title: "2106.0-8"
+    - title: "2110.0-9"
       data-set: "vpp-2n-clx-hist-iter-mrr-new-env"
-    - title: "2110.0-8"
+    - title: "2202.0-9"
       data-set: "vpp-2n-clx-prev-iter-mrr-old-env"
-    - title: "2110.0-9"
+    - title: "2202.0-10"
       data-set: "vpp-2n-clx-prev-iter-mrr-new-env"
-    - title: "2202.0-9"
+    - title: "2206.0-10"
       data-set: "vpp-2n-clx-curr-iter-mrr"
   comparisons:
-    - title: "2110.0-9 vs 2110.0-8"
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 2
       compare: 3
-    - title: "2202.0-9 vs 2110.0-9"
+    - title: "2206.0-10 vs 2202.0-10"
       reference: 3
       compare: 4
   legend:
     - ''
-    - 'Test Case:            Test cases executed for: MRR 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.'
+    - '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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-cx556a 8t4c mrr
 - type: "table"
@@ -3513,28 +5187,28 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'8T4C' and 'MRR' and 'NIC_Mellanox-CX556A' and not 'NF_DENSITY'"
   columns:
-    - title: "2106.0-8"
+    - title: "2110.0-9"
       data-set: "vpp-2n-clx-hist-iter-mrr-new-env"
-    - title: "2110.0-8"
+    - title: "2202.0-9"
       data-set: "vpp-2n-clx-prev-iter-mrr-old-env"
-    - title: "2110.0-9"
+    - title: "2202.0-10"
       data-set: "vpp-2n-clx-prev-iter-mrr-new-env"
-    - title: "2202.0-9"
+    - title: "2206.0-10"
       data-set: "vpp-2n-clx-curr-iter-mrr"
   comparisons:
-    - title: "2110.0-9 vs 2110.0-8"
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 2
       compare: 3
-    - title: "2202.0-9 vs 2110.0-9"
+    - title: "2206.0-10 vs 2202.0-10"
       reference: 3
       compare: 4
   legend:
     - ''
-    - 'Test Case:            Test cases executed for: MRR 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.'
+    - '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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-zn2-xxv710 2t1c mrr
 - type: "table"
@@ -3544,28 +5218,28 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'MRR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "2106.0-8"
+    - title: "2110.0-9"
       data-set: "vpp-2n-zn2-hist-iter-mrr-new-env"
-    - title: "2110.0-8"
+    - title: "2202.0-9"
       data-set: "vpp-2n-zn2-prev-iter-mrr-old-env"
-    - title: "2110.0-9"
+    - title: "2202.0-10"
       data-set: "vpp-2n-zn2-prev-iter-mrr-new-env"
-    - title: "2202.0-9"
+    - title: "2206.0-10"
       data-set: "vpp-2n-zn2-curr-iter-mrr"
   comparisons:
-    - title: "2110.0-9 vs 2110.0-8"
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 2
       compare: 3
-    - title: "2202.0-9 vs 2110.0-9"
+    - title: "2206.0-10 vs 2202.0-10"
       reference: 3
       compare: 4
   legend:
     - ''
-    - 'Test Case:            Test cases executed for: MRR 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.'
+    - '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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-zn2-xxv710 4t2c mrr
 - type: "table"
@@ -3575,28 +5249,28 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'MRR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "2106.0-8"
+    - title: "2110.0-9"
       data-set: "vpp-2n-zn2-hist-iter-mrr-new-env"
-    - title: "2110.0-8"
+    - title: "2202.0-9"
       data-set: "vpp-2n-zn2-prev-iter-mrr-old-env"
-    - title: "2110.0-9"
+    - title: "2202.0-10"
       data-set: "vpp-2n-zn2-prev-iter-mrr-new-env"
-    - title: "2202.0-9"
+    - title: "2206.0-10"
       data-set: "vpp-2n-zn2-curr-iter-mrr"
   comparisons:
-    - title: "2110.0-9 vs 2110.0-8"
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 2
       compare: 3
-    - title: "2202.0-9 vs 2110.0-9"
+    - title: "2206.0-10 vs 2202.0-10"
       reference: 3
       compare: 4
   legend:
     - ''
-    - 'Test Case:            Test cases executed for: MRR 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.'
+    - '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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-zn2-xxv710 8t4c mrr
 - type: "table"
@@ -3606,28 +5280,28 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'8T4C' and 'MRR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "2106.0-8"
+    - title: "2110.0-9"
       data-set: "vpp-2n-zn2-hist-iter-mrr-new-env"
-    - title: "2110.0-8"
+    - title: "2202.0-9"
       data-set: "vpp-2n-zn2-prev-iter-mrr-old-env"
-    - title: "2110.0-9"
+    - title: "2202.0-10"
       data-set: "vpp-2n-zn2-prev-iter-mrr-new-env"
-    - title: "2202.0-9"
+    - title: "2206.0-10"
       data-set: "vpp-2n-zn2-curr-iter-mrr"
   comparisons:
-    - title: "2110.0-9 vs 2110.0-8"
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 2
       compare: 3
-    - title: "2202.0-9 vs 2110.0-9"
+    - title: "2206.0-10 vs 2202.0-10"
       reference: 3
       compare: 4
   legend:
     - ''
-    - 'Test Case:            Test cases executed for: MRR 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.'
+    - '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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-dnv 1t1c mrr
 - type: "table"
@@ -3637,28 +5311,28 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C'"
   columns:
-    - title: "2106.0-8"
+    - title: "2110.0-9"
       data-set: "vpp-2n-dnv-hist-iter-mrr-new-env"
-    - title: "2110.0-8"
+    - title: "2202.0-9"
       data-set: "vpp-2n-dnv-prev-iter-mrr-old-env"
-    - title: "2110.0-9"
+    - title: "2202.0-10"
       data-set: "vpp-2n-dnv-prev-iter-mrr-new-env"
-    - title: "2202.0-9"
+    - title: "2206.0-10"
       data-set: "vpp-2n-dnv-curr-iter-mrr"
   comparisons:
-    - title: "2110.0-9 vs 2110.0-8"
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 2
       compare: 3
-    - title: "2202.0-9 vs 2110.0-9"
+    - title: "2206.0-10 vs 2202.0-10"
       reference: 3
       compare: 4
   legend:
     - ''
-    - 'Test Case:            Test cases executed for: MRR throughput on 2n-dnv with x553.'
-    - '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.'
+    - '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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-dnv 2t2c mrr
 - type: "table"
@@ -3668,28 +5342,28 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C'"
   columns:
-    - title: "2106.0-8"
+    - title: "2110.0-9"
       data-set: "vpp-2n-dnv-hist-iter-mrr-new-env"
-    - title: "2110.0-8"
+    - title: "2202.0-9"
       data-set: "vpp-2n-dnv-prev-iter-mrr-old-env"
-    - title: "2110.0-9"
+    - title: "2202.0-10"
       data-set: "vpp-2n-dnv-prev-iter-mrr-new-env"
-    - title: "2202.0-9"
+    - title: "2206.0-10"
       data-set: "vpp-2n-dnv-curr-iter-mrr"
   comparisons:
-    - title: "2110.0-9 vs 2110.0-8"
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 2
       compare: 3
-    - title: "2202.0-9 vs 2110.0-9"
+    - title: "2206.0-10 vs 2202.0-10"
       reference: 3
       compare: 4
   legend:
     - ''
-    - 'Test Case:            Test cases executed for: MRR throughput on 2n-dnv with x553.'
-    - '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.'
+    - '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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-dnv 4t4c mrr
 - type: "table"
@@ -3699,28 +5373,28 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'4T4C'"
   columns:
-    - title: "2106.0-8"
+    - title: "2110.0-9"
       data-set: "vpp-2n-dnv-hist-iter-mrr-new-env"
-    - title: "2110.0-8"
+    - title: "2202.0-9"
       data-set: "vpp-2n-dnv-prev-iter-mrr-old-env"
-    - title: "2110.0-9"
+    - title: "2202.0-10"
       data-set: "vpp-2n-dnv-prev-iter-mrr-new-env"
-    - title: "2202.0-9"
+    - title: "2206.0-10"
       data-set: "vpp-2n-dnv-curr-iter-mrr"
   comparisons:
-    - title: "2110.0-9 vs 2110.0-8"
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 2
       compare: 3
-    - title: "2202.0-9 vs 2110.0-9"
+    - title: "2206.0-10 vs 2202.0-10"
       reference: 3
       compare: 4
   legend:
     - ''
-    - 'Test Case:            Test cases executed for: MRR throughput on 2n-dnv with x553.'
-    - '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.'
+    - '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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-dnv 1t1c mrr
 - type: "table"
@@ -3730,28 +5404,28 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C'"
   columns:
-    - title: "2106.0-8"
+    - title: "2110.0-9"
       data-set: "vpp-3n-dnv-hist-iter-mrr-new-env"
-    - title: "2110.0-8"
+    - title: "2202.0-9"
       data-set: "vpp-3n-dnv-prev-iter-mrr-old-env"
-    - title: "2110.0-9"
+    - title: "2202.0-10"
       data-set: "vpp-3n-dnv-prev-iter-mrr-new-env"
-    - title: "2202.0-9"
+    - title: "2206.0-10"
       data-set: "vpp-3n-dnv-curr-iter-mrr"
   comparisons:
-    - title: "2110.0-9 vs 2110.0-8"
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 2
       compare: 3
-    - title: "2202.0-9 vs 2110.0-9"
+    - title: "2206.0-10 vs 2202.0-10"
       reference: 3
       compare: 4
   legend:
     - ''
-    - 'Test Case:            Test cases executed for: MRR throughput on 3n-dnv with x553.'
-    - '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.'
+    - '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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-dnv 2t2c mrr
 - type: "table"
@@ -3761,28 +5435,28 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C'"
   columns:
-    - title: "2106.0-8"
+    - title: "2110.0-9"
       data-set: "vpp-3n-dnv-hist-iter-mrr-new-env"
-    - title: "2110.0-8"
+    - title: "2202.0-9"
       data-set: "vpp-3n-dnv-prev-iter-mrr-old-env"
-    - title: "2110.0-9"
+    - title: "2202.0-10"
       data-set: "vpp-3n-dnv-prev-iter-mrr-new-env"
-    - title: "2202.0-9"
+    - title: "2206.0-10"
       data-set: "vpp-3n-dnv-curr-iter-mrr"
   comparisons:
-    - title: "2110.0-9 vs 2110.0-8"
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 2
       compare: 3
-    - title: "2202.0-9 vs 2110.0-9"
+    - title: "2206.0-10 vs 2202.0-10"
       reference: 3
       compare: 4
   legend:
     - ''
-    - 'Test Case:            Test cases executed for: MRR throughput on 3n-dnv with x553.'
-    - '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.'
+    - '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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-dnv 4t4c mrr
 - type: "table"
@@ -3792,28 +5466,28 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'4T4C'"
   columns:
-    - title: "2106.0-8"
+    - title: "2110.0-9"
       data-set: "vpp-3n-dnv-hist-iter-mrr-new-env"
-    - title: "2110.0-8"
+    - title: "2202.0-9"
       data-set: "vpp-3n-dnv-prev-iter-mrr-old-env"
-    - title: "2110.0-9"
+    - title: "2202.0-10"
       data-set: "vpp-3n-dnv-prev-iter-mrr-new-env"
-    - title: "2202.0-9"
+    - title: "2206.0-10"
       data-set: "vpp-3n-dnv-curr-iter-mrr"
   comparisons:
-    - title: "2110.0-9 vs 2110.0-8"
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 2
       compare: 3
-    - title: "2202.0-9 vs 2110.0-9"
+    - title: "2206.0-10 vs 2202.0-10"
       reference: 3
       compare: 4
   legend:
     - ''
-    - 'Test Case:            Test cases executed for: MRR throughput on 3n-dnv with x553.'
-    - '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.'
+    - '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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-tsh 1t1c mrr
 - type: "table"
@@ -3823,28 +5497,28 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C'"
   columns:
-    - title: "2106.0-8"
+    - title: "2110.0-9"
       data-set: "vpp-3n-tsh-hist-iter-mrr-new-env"
-    - title: "2110.0-8"
+    - title: "2202.0-9"
       data-set: "vpp-3n-tsh-prev-iter-mrr-old-env"
-    - title: "2110.0-9"
+    - title: "2202.0-10"
       data-set: "vpp-3n-tsh-prev-iter-mrr-new-env"
-    - title: "2202.0-9"
+    - title: "2206.0-10"
       data-set: "vpp-3n-tsh-curr-iter-mrr"
   comparisons:
-    - title: "2110.0-9 vs 2110.0-8"
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 2
       compare: 3
-    - title: "2202.0-9 vs 2110.0-9"
+    - title: "2206.0-10 vs 2202.0-10"
       reference: 3
       compare: 4
   legend:
     - ''
-    - 'Test Case:            Test cases executed for: MRR 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.'
+    - '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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-tsh 2t2c mrr
 - type: "table"
@@ -3854,28 +5528,28 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C'"
   columns:
-    - title: "2106.0-8"
+    - title: "2110.0-9"
       data-set: "vpp-3n-tsh-hist-iter-mrr-new-env"
-    - title: "2110.0-8"
+    - title: "2202.0-9"
       data-set: "vpp-3n-tsh-prev-iter-mrr-old-env"
-    - title: "2110.0-9"
+    - title: "2202.0-10"
       data-set: "vpp-3n-tsh-prev-iter-mrr-new-env"
-    - title: "2202.0-9"
+    - title: "2206.0-10"
       data-set: "vpp-3n-tsh-curr-iter-mrr"
   comparisons:
-    - title: "2110.0-9 vs 2110.0-8"
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 2
       compare: 3
-    - title: "2202.0-9 vs 2110.0-9"
+    - title: "2206.0-10 vs 2202.0-10"
       reference: 3
       compare: 4
   legend:
     - ''
-    - 'Test Case:            Test cases executed for: MRR 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.'
+    - '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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-tsh 4t4c mrr
 - type: "table"
@@ -3885,28 +5559,28 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'4T4C'"
   columns:
-    - title: "2106.0-8"
+    - title: "2110.0-9"
       data-set: "vpp-3n-tsh-hist-iter-mrr-new-env"
-    - title: "2110.0-8"
+    - title: "2202.0-9"
       data-set: "vpp-3n-tsh-prev-iter-mrr-old-env"
-    - title: "2110.0-9"
+    - title: "2202.0-10"
       data-set: "vpp-3n-tsh-prev-iter-mrr-new-env"
-    - title: "2202.0-9"
+    - title: "2206.0-10"
       data-set: "vpp-3n-tsh-curr-iter-mrr"
   comparisons:
-    - title: "2110.0-9 vs 2110.0-8"
+    - title: "2202.0-10 vs 2202.0-9"
       reference: 2
       compare: 3
-    - title: "2202.0-9 vs 2110.0-9"
+    - title: "2206.0-10 vs 2202.0-10"
       reference: 3
       compare: 4
   legend:
     - ''
-    - 'Test Case:            Test cases executed for: MRR 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.'
+    - '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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-tx2 1t1c mrr
 - type: "table"
@@ -3916,291 +5590,190 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C'"
   columns:
-    - title: "2106.0-8"
-      data-set: "vpp-2n-tx2-hist-iter-mrr-new-env"
-    - title: "2110.0-8"
-      data-set: "vpp-2n-tx2-prev-iter-mrr-old-env"
     - title: "2110.0-9"
-      data-set: "vpp-2n-tx2-prev-iter-mrr-new-env"
-    - title: "2202.0-9"
-      data-set: "vpp-2n-tx2-curr-iter-mrr"
-  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: MRR 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 Performance Changes 2n-tx2 2t2c mrr
-- type: "table"
-  title: "VPP Performance Changes 2n-tx2 2t2c mrr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-tx2-2t2c-mrr"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T2C'"
-  columns:
-    - title: "2106.0-8"
       data-set: "vpp-2n-tx2-hist-iter-mrr-new-env"
-    - title: "2110.0-8"
-      data-set: "vpp-2n-tx2-prev-iter-mrr-old-env"
-    - title: "2110.0-9"
-      data-set: "vpp-2n-tx2-prev-iter-mrr-new-env"
     - title: "2202.0-9"
-      data-set: "vpp-2n-tx2-curr-iter-mrr"
-  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: MRR 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 Performance Changes 2n-tx2 4t4c mrr
-- type: "table"
-  title: "VPP Performance Changes 2n-tx2 4t4c mrr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-tx2-4t4c-mrr"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T4C'"
-  columns:
-    - title: "2106.0-8"
-      data-set: "vpp-2n-tx2-hist-iter-mrr-new-env"
-    - title: "2110.0-8"
       data-set: "vpp-2n-tx2-prev-iter-mrr-old-env"
-    - title: "2110.0-9"
+    - title: "2202.0-10"
       data-set: "vpp-2n-tx2-prev-iter-mrr-new-env"
-    - title: "2202.0-9"
+    - title: "2206.0-10"
       data-set: "vpp-2n-tx2-curr-iter-mrr"
   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: MRR 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 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:             [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.'
-    - '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:             [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.'
-    - '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:             [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.'
-    - '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:             [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.'
-    - '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
+    - title: "2202.0-10 vs 2202.0-9"
+      reference: 2
+      compare: 3
+    - title: "2206.0-10 vs 2202.0-10"
+      reference: 3
+      compare: 4
   legend:
     - ''
-    - 'Test Case:            Test cases executed for: MRR throughput on 3n-aws with nitro50g.'
-    - '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.'
-    - '2202.0-9 vs 2110.0-8: Compares VPP code current vs previous.'
+    - '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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
-# VPP Performance Changes 3n-aws 8t4c mrr
+# VPP Performance Changes 2n-tx2 2t2c mrr
 - type: "table"
-  title: "VPP Performance Changes 3n-aws 8t4c mrr"
+  title: "VPP Performance Changes 2n-tx2 2t2c mrr"
   algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-aws-8t4c-mrr"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-tx2-2t2c-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'8T4C'"
+  filter: "'2T2C'"
   columns:
-    - title: "2110.0-8"
-      data-set: "vpp-3n-aws-prev-iter-mrr"
+    - title: "2110.0-9"
+      data-set: "vpp-2n-tx2-hist-iter-mrr-new-env"
     - title: "2202.0-9"
-      data-set: "vpp-3n-aws-curr-iter-mrr"
+      data-set: "vpp-2n-tx2-prev-iter-mrr-old-env"
+    - title: "2202.0-10"
+      data-set: "vpp-2n-tx2-prev-iter-mrr-new-env"
+    - title: "2206.0-10"
+      data-set: "vpp-2n-tx2-curr-iter-mrr"
   comparisons:
-    - title: "2202.0-9 vs 2110.0-8"
-      reference: 1
-      compare: 2
+    - title: "2202.0-10 vs 2202.0-9"
+      reference: 2
+      compare: 3
+    - title: "2206.0-10 vs 2202.0-10"
+      reference: 3
+      compare: 4
   legend:
     - ''
-    - 'Test Case:            Test cases executed for: MRR throughput on 3n-aws with nitro50g.'
-    - '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.'
-    - '2202.0-9 vs 2110.0-8: Compares VPP code current vs previous.'
+    - '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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
-# VPP Comparison Across Testbeds 2n-skx to 2n-clx 2t1c mrr
+# VPP Performance Changes 2n-tx2 4t4c mrr
 - type: "table"
-  title: "VPP Comparison Across Testbeds 2n-skx to 2n-clx 2t1c mrr"
+  title: "VPP Performance Changes 2n-tx2 4t4c mrr"
   algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-2n-skx-2n-clx-2t1c-mrr"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-tx2-4t4c-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'NIC_Intel-XXV710'"
+  filter: "'4T4C'"
   columns:
-    - title: "2n-skx"
-      data-set: "vpp-2n-skx-curr-iter-mrr"
-    - title: "2n-clx"
-      data-set: "vpp-2n-clx-curr-iter-mrr"
+    - title: "2110.0-9"
+      data-set: "vpp-2n-tx2-hist-iter-mrr-new-env"
+    - title: "2202.0-9"
+      data-set: "vpp-2n-tx2-prev-iter-mrr-old-env"
+    - title: "2202.0-10"
+      data-set: "vpp-2n-tx2-prev-iter-mrr-new-env"
+    - title: "2206.0-10"
+      data-set: "vpp-2n-tx2-curr-iter-mrr"
   comparisons:
-    - title: "Diff"
-      reference: 1
-      compare: 2
+    - title: "2202.0-10 vs 2202.0-9"
+      reference: 2
+      compare: 3
+    - title: "2206.0-10 vs 2202.0-10"
+      reference: 3
+      compare: 4
   legend:
-    - ""
-    - "2n-skx, 2n-clx - testbeds and NICs tested."
-    - "Diff - difference between 2n-skx and 2n-clx testbeds."
+    - ''
+    - '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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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-10 vs 2202.0-9:  Compares CSIT environment current vs previous with previous VPP code.'
+    - '2206.0-10 vs 2202.0-10: Compares VPP code current vs previous in the current CSIT environment.'
 
-# VPP Comparison Across Testbeds 2n-skx to 2n-clx 4t2c mrr
+# VPP Performance Changes 2n-aws 2t1c mrr
 - type: "table"
-  title: "VPP Comparison Across Testbeds 2n-skx to 2n-clx 4t2c mrr"
+  title: "VPP Performance Changes 2n-aws 2t1c mrr"
   algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-2n-skx-2n-clx-4t2c-mrr"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-aws-2t1c-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'NIC_Intel-XXV710'"
+  filter: "'2T1C'"
   columns:
-    - title: "2n-skx"
-      data-set: "vpp-2n-skx-curr-iter-mrr"
-    - title: "2n-clx"
-      data-set: "vpp-2n-clx-curr-iter-mrr"
+    - title: "2110.0-8"
+      data-set: "vpp-2n-aws-hist-iter-mrr"
+    - title: "2202.0-9"
+      data-set: "vpp-2n-aws-prev-iter-mrr"
+    - title: "2206.0-10"
+      data-set: "vpp-2n-aws-curr-iter-mrr"
   comparisons:
-    - title: "Diff"
-      reference: 1
-      compare: 2
+    - title: "2206.0-10 vs 2202.0-9"
+      reference: 2
+      compare: 3
   legend:
-    - ""
-    - "2n-skx, 2n-clx - testbeds and NICs tested."
-    - "Diff - difference between 2n-skx and 2n-clx testbeds."
+    - ''
+    - '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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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.'
+    - '2206.0-10 vs 2202.0-9:  Compares VPP code current vs previous.'
 
-# VPP Comparison Across Testbeds 2n-skx to 2n-clx 8t4c mrr
+# VPP Performance Changes 2n-aws 4t2c mrr
 - type: "table"
-  title: "VPP Comparison Across Testbeds 2n-skx to 2n-clx 8t4c mrr"
+  title: "VPP Performance Changes 2n-aws 4t2c mrr"
   algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-2n-skx-2n-clx-8t4c-mrr"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-aws-4t2c-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'8T4C' and 'NIC_Intel-XXV710'"
+  filter: "'4T2C'"
   columns:
-    - title: "2n-skx"
-      data-set: "vpp-2n-skx-curr-iter-mrr"
-    - title: "2n-clx"
-      data-set: "vpp-2n-clx-curr-iter-mrr"
+    - title: "2110.0-8"
+      data-set: "vpp-2n-aws-hist-iter-mrr"
+    - title: "2202.0-9"
+      data-set: "vpp-2n-aws-prev-iter-mrr"
+    - title: "2206.0-10"
+      data-set: "vpp-2n-aws-curr-iter-mrr"
   comparisons:
-    - title: "Diff"
-      reference: 1
-      compare: 2
+    - title: "2206.0-10 vs 2202.0-9"
+      reference: 2
+      compare: 3
   legend:
-    - ""
-    - "2n-skx, 2n-clx - testbeds and NICs tested."
-    - "Diff - difference between 2n-skx and 2n-clx testbeds."
+    - ''
+    - '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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+    - '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.'
+    - '2206.0-10 vs 2202.0-9: 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-hist-iter-mrr"
+#     - title: "2202.0-9"
+#       data-set: "vpp-3n-aws-prev-iter-mrr"
+#     - title: "2206.0-10"
+#       data-set: "vpp-3n-aws-curr-iter-mrr"
+#   comparisons:
+#     - title: "2206.0-10 vs 2202.0-9"
+#       reference: 2
+#       compare: 3
+#   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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+#     - '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.'
+#     - '2206.0-10 vs 2202.0-9: 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-hist-iter-mrr"
+#     - title: "2202.0-9"
+#       data-set: "vpp-3n-aws-prev-iter-mrr"
+#     - title: "2206.0-10"
+#       data-set: "vpp-3n-aws-curr-iter-mrr"
+#   comparisons:
+#     - title: "2206.0-10 vs 2202.0-9"
+#       reference: 2
+#       compare: 3
+#   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, "9" for CSIT rls2202, "10" for CSIT rls2206).'
+#     - '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.'
+#     - '2206.0-10 vs 2202.0-9: Compares VPP code current vs previous.'
 
 # VPP Comparison Across Topologies 3n-skx to 2n-skx 1c mrr
 - type: "table"
@@ -4210,18 +5783,19 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'MRR' and '1C' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "3n-skx"
+    - title: "3n-skx xxv710"
       data-set: "vpp-3n-skx-curr-iter-mrr"
-    - title: "2n-skx"
+    - title: "2n-skx xxv710"
       data-set: "vpp-2n-skx-curr-iter-mrr"
   comparisons:
-    - title: "Diff"
+    - title: "2n-skx vs 3n-skx"
       reference: 1
       compare: 2
   legend:
-    - ""
-    - "3n-skx, 2n-skx - topologies tested."
-    - "Diff - difference between 3n-skx and 2n-skx topologies."
+    - ''
+    - 'Test Case:                    Test cases executed for: MRR throughput on 3n-skx xxv710 and 2n-skx xxv710.'
+    - '3n-skx xxv710, 2n-skx xxv710: [Mpps +- StDev] results for VPP tested in CSIT'
+    - '2n-skx vs 3n-skx:             [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
 
 # VPP Comparison Across Topologies 3n-skx to 2n-skx 2c mrr
 - type: "table"
@@ -4231,18 +5805,19 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'MRR' and '2C' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "3n-skx"
+    - title: "3n-skx xxv710"
       data-set: "vpp-3n-skx-curr-iter-mrr"
-    - title: "2n-skx"
+    - title: "2n-skx xxv710"
       data-set: "vpp-2n-skx-curr-iter-mrr"
   comparisons:
-    - title: "Diff"
+    - title: "2n-skx vs 3n-skx"
       reference: 1
       compare: 2
   legend:
-    - ""
-    - "3n-skx, 2n-skx - topologies tested."
-    - "Diff - difference between 3n-skx and 2n-skx topologies."
+    - ''
+    - 'Test Case:                    Test cases executed for: MRR throughput on 3n-skx xxv710 and 2n-skx xxv710.'
+    - '3n-skx xxv710, 2n-skx xxv710: [Mpps +- StDev] results for VPP tested in CSIT'
+    - '2n-skx vs 3n-skx:             [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
 
 # VPP Comparison Across Topologies 3n-skx to 2n-skx 4c mrr
 - type: "table"
@@ -4252,87 +5827,19 @@
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'MRR' and '4C' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "3n-skx"
+    - title: "3n-skx xxv710"
       data-set: "vpp-3n-skx-curr-iter-mrr"
-    - title: "2n-skx"
+    - title: "2n-skx xxv710"
       data-set: "vpp-2n-skx-curr-iter-mrr"
   comparisons:
-    - title: "Diff"
-      reference: 1
-      compare: 2
-  legend:
-    - ""
-    - "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"
+    - title: "2n-skx vs 3n-skx"
       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."
+    - ''
+    - 'Test Case:                    Test cases executed for: MRR throughput on 3n-skx xxv710 and 2n-skx xxv710.'
+    - '3n-skx xxv710, 2n-skx xxv710: [Mpps +- StDev] results for VPP tested in CSIT'
+    - '2n-skx vs 3n-skx:             [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
 
 # Detailed Test Results - VPP Performance Results 3n-skx
 - type: "table"
@@ -4415,7 +5922,7 @@
       data: "data name"
     - title: " |prein| Throughput: |br| 1.  Mpps       Gbps (NDR) |br| 2.  Mpps       Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, |br| one set per each direction: |br| 3.  P50  P90  P99       P50  P90  P99 (10% PDR) |br| 4.  P50  P90  P99       P50  P90  P99 (50% PDR) |br| 5.  P50  P90  P99       P50  P90  P99 (90% PDR) |preout| "
       data: "data msg"
-  data: "vpp-2n-icx-curr-iter-best"
+  data: "vpp-2n-icx-curr-cov"
   filter: "'NDRPDR'"
 #   remove-ndr: True
   parameters:
@@ -4433,7 +5940,7 @@
       data: "data name"
     - title: " |prein| Throughput: |br| 1.  Mpps       Gbps (NDR) |br| 2.  Mpps       Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, |br| one set per each direction: |br| 3.  P50  P90  P99       P50  P90  P99 (10% PDR) |br| 4.  P50  P90  P99       P50  P90  P99 (50% PDR) |br| 5.  P50  P90  P99       P50  P90  P99 (90% PDR) |preout| "
       data: "data msg"
-  data: "vpp-3n-icx-curr-iter-best"
+  data: "vpp-3n-icx-curr-cov"
   filter: "'NDRPDR'"
   # remove-ndr: True
   parameters:
@@ -4458,6 +5965,23 @@
   - "parent"
   - "msg"
 
+# Detailed Test Results - VPP Performance Results 3n-alt
+- type: "table"
+  title: "Detailed Test Results - VPP Performance Results 3n-alt"
+  algorithm: "table_merged_details"
+  output-file: "{DIR[DTR,PERF,VPP,3N,ALT]}/"
+  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-alt-curr-cov"
+  filter: "all"
+  parameters:
+  - "name"
+  - "parent"
+  - "msg"
+
 # Detailed Test Results - VPP Performance Results 2n-tx2
 - type: "table"
   title: "Detailed Test Results - VPP Performance Results 2n-tx2"
@@ -4526,22 +6050,22 @@
   - "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"
+# # 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"
@@ -4621,7 +6145,7 @@
       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"
+  data: "vpp-2n-icx-curr-cov"
   filter: "'NDRPDR'"
 #   remove-ndr: True
   parameters:
@@ -4639,7 +6163,7 @@
       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"
+  data: "vpp-3n-icx-curr-cov"
   filter: "'NDRPDR'"
   # remove-ndr: True
   parameters:
@@ -4664,6 +6188,23 @@
   - "name"
   - "conf-history"
 
+# Test configuration - VPP Performance Test Configs 3n-alt
+- type: "table"
+  title: "Test configuration - VPP Performance Test Configs 3n-alt"
+  algorithm: "table_merged_details"
+  output-file: "{DIR[DTC,PERF,VPP,3N,ALT]}/"
+  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-alt-curr-cov"
+  filter: "all"
+  parameters:
+  - "parent"
+  - "name"
+  - "conf-history"
+
 # Test configuration - VPP Performance Test Configs 2n-tx2
 - type: "table"
   title: "Test configuration - VPP Performance Test Configs 2n-tx2"
@@ -4732,22 +6273,22 @@
   - "name"
   - "conf-history"
 
-# Test configuration - VPP Performance Test Configs 3n-aws
-- type: "table"
-  title: "Test configuration - VPP Performance Test Configs 3n-aws"
-  algorithm: "table_merged_details"
-  output-file: "{DIR[DTC,PERF,VPP,3N,AWS]}/"
-  columns:
-    - title: " |prein| Test Name |preout| "
-      data: "data name"
-    - title: " |prein| VPP API Test Commands History - Commands Used Per Test Case |preout| "
-      data: "data conf-history"
-  data: "vpp-3n-aws-curr-cov"
-  filter: "all"
-  parameters:
-  - "parent"
-  - "name"
-  - "conf-history"
+# # Test configuration - VPP Performance Test Configs 3n-aws
+# - type: "table"
+#   title: "Test configuration - VPP Performance Test Configs 3n-aws"
+#   algorithm: "table_merged_details"
+#   output-file: "{DIR[DTC,PERF,VPP,3N,AWS]}/"
+#   columns:
+#     - title: " |prein| Test Name |preout| "
+#       data: "data name"
+#     - title: " |prein| VPP API Test Commands History - Commands Used Per Test Case |preout| "
+#       data: "data conf-history"
+#   data: "vpp-3n-aws-curr-cov"
+#   filter: "all"
+#   parameters:
+#   - "parent"
+#   - "name"
+#   - "conf-history"
 
 # Test Operational Data - VPP Performance Operational Data 3n-skx
 - type: "table"
@@ -4786,7 +6327,7 @@
   title: "Test Operational Data - VPP Performance Operational Data 2n-icx"
   algorithm: "table_oper_data_html"
   output-file: "{DIR[DTO,PERF,VPP,2N,ICX]}/"
-  data: "vpp-2n-icx-curr-iter-best"
+  data: "vpp-2n-icx-curr-cov"
   filter: "'NDRPDR'"
 
 # Test Operational Data - VPP Performance Operational Data 3n-icx
@@ -4794,7 +6335,7 @@
   title: "Test Operational Data - VPP Performance Operational Data 3n-icx"
   algorithm: "table_oper_data_html"
   output-file: "{DIR[DTO,PERF,VPP,3N,ICX]}/"
-  data: "vpp-3n-icx-curr-iter-best"
+  data: "vpp-3n-icx-curr-cov"
   filter: "'NDRPDR'"
 
 # Test Operational Data - VPP Performance Operational Data 3n-tsh
@@ -4805,6 +6346,14 @@
   data: "vpp-3n-tsh-curr-cov"
   filter: "all"
 
+# Test Operational Data - VPP Performance Operational Data 3n-alt
+- type: "table"
+  title: "Test Operational Data - VPP Performance Operational Data 3n-alt"
+  algorithm: "table_oper_data_html"
+  output-file: "{DIR[DTO,PERF,VPP,3N,ALT]}/"
+  data: "vpp-3n-alt-curr-cov"
+  filter: "all"
+
 # Test Operational Data - VPP Performance Operational Data 2n-tx2
 - type: "table"
   title: "Test Operational Data - VPP Performance Operational Data 2n-tx2"
@@ -4837,13 +6386,13 @@
   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"
+# # 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"
@@ -4913,51 +6462,68 @@
   - "parent"
   - "msg"
 
-# Detailed Test Results - VPP MRR Results 2n-icx
+# 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"
-  title: "Detailed Test Results - VPP MRR Results 2n-icx"
+  title: "Detailed Test Results - VPP MRR Results 3n-tsh"
   algorithm: "table_merged_details"
-  output-file: "{DIR[DTR,MRR,VPP,2N,ICX]}/"
+  output-file: "{DIR[DTR,MRR,VPP,3N,TSH]}/"
   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'"
+  data: "vpp-3n-tsh-curr-iter-mrr"
+  filter: "all"
   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 3n-tsh
+# Detailed Test Results - VPP MRR Results 3n-alt
 - type: "table"
-  title: "Detailed Test Results - VPP MRR Results 3n-tsh"
+  title: "Detailed Test Results - VPP MRR Results 3n-alt"
   algorithm: "table_merged_details"
-  output-file: "{DIR[DTR,MRR,VPP,3N,TSH]}/"
+  output-file: "{DIR[DTR,MRR,VPP,3N,ALT]}/"
   columns:
     - title: " |prein| Test Name |preout| "
       data: "data name"
     - title: " |prein| Maximum Receive Rate trial [Mpps] |preout| "
       data: "data msg"
-  data: "vpp-3n-tsh-curr-iter-mrr"
+  data: "vpp-3n-alt-curr-iter-mrr"
   filter: "all"
   parameters:
   - "name"
@@ -5032,22 +6598,22 @@
   - "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"
+# # 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"
@@ -5134,22 +6700,22 @@
   - "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 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"
@@ -5168,6 +6734,23 @@
   - "name"
   - "conf-history"
 
+# Test configuration - VPP MRR Test Configs 3n-alt
+- type: "table"
+  title: "Test configuration - VPP MRR Test Configs 3n-alt"
+  algorithm: "table_merged_details"
+  output-file: "{DIR[DTC,MRR,VPP,3N,ALT]}/"
+  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-alt-curr-iter-mrr"
+  filter: "all"
+  parameters:
+  - "parent"
+  - "name"
+  - "conf-history"
+
 # Test configuration - VPP MRR Test Configs 2n-tx2
 - type: "table"
   title: "Test configuration - VPP MRR Test Configs 2n-tx2"
@@ -5236,22 +6819,22 @@
   - "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"
+# # 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"
@@ -5290,6 +6873,198 @@
 
 ################################################################################
 
+# DPDK Performance Changes 3n-icx 2t1c pdr
+- type: "table"
+  title: "DPDK Performance Changes 3n-icx 2t1c pdr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-icx-2t1c-pdr"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
+  columns:
+    # - title: "21.08"
+    #   data-set: "dpdk-3n-icx-hist-iter"
+    - title: "21.11"
+      data-set: "dpdk-3n-icx-prev-iter"
+    - title: "22.03"
+      data-set: "dpdk-3n-icx-curr-iter"
+  comparisons:
+    - title: "22.03 vs 21.11"
+      reference: 1
+      compare: 2
+  legend:
+    - ''
+    - 'Test Case:      Test cases executed for: PDR throughput on 3n-icx with xxv710.'
+    - '21.11, 22.03:   [Mpps +- StDev] results for DPDK tested in CSIT.'
+    - '22.03 vs 21.11: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+
+# DPDK Performance Changes 3n-icx 4t2c pdr
+- type: "table"
+  title: "DPDK Performance Changes 3n-icx 4t2c pdr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-icx-4t2c-pdr"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
+  columns:
+    # - title: "21.08"
+    #   data-set: "dpdk-3n-icx-hist-iter"
+    - title: "21.11"
+      data-set: "dpdk-3n-icx-prev-iter"
+    - title: "22.03"
+      data-set: "dpdk-3n-icx-curr-iter"
+  comparisons:
+    - title: "22.03 vs 21.11"
+      reference: 1
+      compare: 2
+  legend:
+    - ''
+    - 'Test Case:      Test cases executed for: PDR throughput on 3n-icx with xxv710.'
+    - '21.11, 22.03:   [Mpps +- StDev] results for DPDK tested in CSIT.'
+    - '22.03 vs 21.11: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+
+# DPDK Performance Changes 3n-icx 2t1c ndr
+- type: "table"
+  title: "DPDK Performance Changes 3n-icx 2t1c ndr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-icx-2t1c-ndr"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
+  columns:
+    # - title: "21.08"
+    #   data-set: "dpdk-3n-icx-hist-iter"
+    - title: "21.11"
+      data-set: "dpdk-3n-icx-prev-iter"
+    - title: "22.03"
+      data-set: "dpdk-3n-icx-curr-iter"
+  comparisons:
+    - title: "22.03 vs 21.11"
+      reference: 1
+      compare: 2
+  legend:
+    - ''
+    - 'Test Case:      Test cases executed for: NDR throughput on 3n-icx with xxv710.'
+    - '21.11, 22.03:   [Mpps +- StDev] results for DPDK tested in CSIT.'
+    - '22.03 vs 21.11: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+
+# DPDK Performance Changes 3n-icx 4t2c ndr
+- type: "table"
+  title: "DPDK Performance Changes 3n-icx 4t2c ndr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-icx-4t2c-ndr"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
+  columns:
+    # - title: "21.08"
+    #   data-set: "dpdk-3n-icx-hist-iter"
+    - title: "21.11"
+      data-set: "dpdk-3n-icx-prev-iter"
+    - title: "22.03"
+      data-set: "dpdk-3n-icx-curr-iter"
+  comparisons:
+    - title: "22.03 vs 21.11"
+      reference: 1
+      compare: 2
+  legend:
+    - ''
+    - 'Test Case:      Test cases executed for: NDR throughput on 3n-icx with xxv710.'
+    - '21.11, 22.03:   [Mpps +- StDev] results for DPDK tested in CSIT.'
+    - '22.03 vs 21.11: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+
+# DPDK Performance Changes 2n-icx 2t1c pdr
+- type: "table"
+  title: "DPDK Performance Changes 2n-icx 2t1c pdr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-icx-2t1c-pdr"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
+  columns:
+    # - title: "21.08"
+    #   data-set: "dpdk-2n-icx-hist-iter"
+    - title: "21.11"
+      data-set: "dpdk-2n-icx-prev-iter"
+    - title: "22.03"
+      data-set: "dpdk-2n-icx-curr-iter"
+  comparisons:
+    - title: "22.03 vs 21.11"
+      reference: 1
+      compare: 2
+  legend:
+    - ''
+    - 'Test Case:      Test cases executed for: PDR throughput on 2n-icx with xxv710.'
+    - '21.11, 22.03:   [Mpps +- StDev] results for DPDK tested in CSIT.'
+    - '22.03 vs 21.11: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+
+# DPDK Performance Changes 2n-icx 4t2c pdr
+- type: "table"
+  title: "DPDK Performance Changes 2n-icx 4t2c pdr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-icx-4t2c-pdr"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
+  columns:
+    # - title: "21.08"
+    #   data-set: "dpdk-2n-icx-hist-iter"
+    - title: "21.11"
+      data-set: "dpdk-2n-icx-prev-iter"
+    - title: "22.03"
+      data-set: "dpdk-2n-icx-curr-iter"
+  comparisons:
+    - title: "22.03 vs 21.11"
+      reference: 1
+      compare: 2
+  legend:
+    - ''
+    - 'Test Case:      Test cases executed for: PDR throughput on 2n-icx with xxv710.'
+    - '21.11, 22.03:   [Mpps +- StDev] results for DPDK tested in CSIT.'
+    - '22.03 vs 21.11: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+
+# DPDK Performance Changes 2n-icx 2t1c ndr
+- type: "table"
+  title: "DPDK Performance Changes 2n-icx 2t1c ndr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-icx-2t1c-ndr"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
+  columns:
+    # - title: "21.08"
+    #   data-set: "dpdk-2n-icx-hist-iter"
+    - title: "21.11"
+      data-set: "dpdk-2n-icx-prev-iter"
+    - title: "22.03"
+      data-set: "dpdk-2n-icx-curr-iter"
+  comparisons:
+    - title: "22.03 vs 21.11"
+      reference: 1
+      compare: 2
+  legend:
+    - ''
+    - 'Test Case:      Test cases executed for: NDR throughput on 2n-icx with xxv710.'
+    - '21.11, 22.03:   [Mpps +- StDev] results for DPDK tested in CSIT.'
+    - '22.03 vs 21.11: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+
+# DPDK Performance Changes 2n-icx 4t2c ndr
+- type: "table"
+  title: "DPDK Performance Changes 2n-icx 4t2c ndr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-icx-4t2c-ndr"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
+  columns:
+    # - title: "21.08"
+    #   data-set: "dpdk-2n-icx-hist-iter"
+    - title: "21.11"
+      data-set: "dpdk-2n-icx-prev-iter"
+    - title: "22.03"
+      data-set: "dpdk-2n-icx-curr-iter"
+  comparisons:
+    - title: "22.03 vs 21.11"
+      reference: 1
+      compare: 2
+  legend:
+    - ''
+    - 'Test Case:      Test cases executed for: NDR throughput on 2n-icx with xxv710.'
+    - '21.11, 22.03:   [Mpps +- StDev] results for DPDK tested in CSIT.'
+    - '22.03 vs 21.11: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+
 # DPDK Performance Changes 3n-skx 2t1c pdr
 - type: "table"
   title: "DPDK Performance Changes 3n-skx 2t1c pdr"
@@ -5298,20 +7073,21 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "21.02"
-      data-set: "dpdk-3n-skx-hist-iter"
     - title: "21.08"
-      data-set: "dpdk-3n-skx-prev-iter"
+      data-set: "dpdk-3n-skx-hist-iter"
     - title: "21.11"
+      data-set: "dpdk-3n-skx-prev-iter"
+    - title: "22.03"
       data-set: "dpdk-3n-skx-curr-iter"
   comparisons:
-    - title: "Diff"
+    - title: "22.03 vs 21.11"
       reference: 2
       compare: 3
   legend:
-    - ""
-    - "21.02, 21.08, 21.11 - DPDK versions tested."
-    - "Diff - difference between 21.08 and 21.11 DPDK version."
+    - ''
+    - 'Test Case:           Test cases executed for: PDR throughput on 3n-skx with xxv710.'
+    - '21.08, 21.11, 22.03: [Mpps +- StDev] results for DPDK tested in CSIT.'
+    - '22.03 vs 21.11:      [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
 
 # DPDK Performance Changes 3n-skx 4t2c pdr
 - type: "table"
@@ -5321,20 +7097,21 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "21.02"
-      data-set: "dpdk-3n-skx-hist-iter"
     - title: "21.08"
-      data-set: "dpdk-3n-skx-prev-iter"
+      data-set: "dpdk-3n-skx-hist-iter"
     - title: "21.11"
+      data-set: "dpdk-3n-skx-prev-iter"
+    - title: "22.03"
       data-set: "dpdk-3n-skx-curr-iter"
   comparisons:
-    - title: "Diff"
+    - title: "22.03 vs 21.11"
       reference: 2
       compare: 3
   legend:
-    - ""
-    - "21.02, 21.08, 21.11 - DPDK versions tested."
-    - "Diff - difference between 21.08 and 21.11 DPDK version."
+    - ''
+    - 'Test Case:           Test cases executed for: PDR throughput on 3n-skx with xxv710.'
+    - '21.08, 21.11, 22.03: [Mpps +- StDev] results for DPDK tested in CSIT.'
+    - '22.03 vs 21.11:      [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
 
 # DPDK Performance Changes 3n-skx 2t1c ndr
 - type: "table"
@@ -5344,20 +7121,21 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "21.02"
-      data-set: "dpdk-3n-skx-hist-iter"
     - title: "21.08"
-      data-set: "dpdk-3n-skx-prev-iter"
+      data-set: "dpdk-3n-skx-hist-iter"
     - title: "21.11"
+      data-set: "dpdk-3n-skx-prev-iter"
+    - title: "22.03"
       data-set: "dpdk-3n-skx-curr-iter"
   comparisons:
-    - title: "Diff"
+    - title: "22.03 vs 21.11"
       reference: 2
       compare: 3
   legend:
-    - ""
-    - "21.02, 21.08, 21.11 - DPDK versions tested."
-    - "Diff - difference between 21.08 and 21.11 DPDK version."
+    - ''
+    - 'Test Case:           Test cases executed for: NDR throughput on 3n-skx with xxv710.'
+    - '21.08, 21.11, 22.03: [Mpps +- StDev] results for DPDK tested in CSIT.'
+    - '22.03 vs 21.11:      [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
 
 # DPDK Performance Changes 3n-skx 4t2c ndr
 - type: "table"
@@ -5367,20 +7145,21 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "21.02"
-      data-set: "dpdk-3n-skx-hist-iter"
     - title: "21.08"
-      data-set: "dpdk-3n-skx-prev-iter"
+      data-set: "dpdk-3n-skx-hist-iter"
     - title: "21.11"
+      data-set: "dpdk-3n-skx-prev-iter"
+    - title: "22.03"
       data-set: "dpdk-3n-skx-curr-iter"
   comparisons:
-    - title: "Diff"
+    - title: "22.03 vs 21.11"
       reference: 2
       compare: 3
   legend:
-    - ""
-    - "21.02, 21.08, 21.11 - DPDK versions tested."
-    - "Diff - difference between 21.08 and 21.11 DPDK version."
+    - ''
+    - 'Test Case:           Test cases executed for: NDR throughput on 3n-skx with xxv710.'
+    - '21.08, 21.11, 22.03: [Mpps +- StDev] results for DPDK tested in CSIT.'
+    - '22.03 vs 21.11:      [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
 
 # DPDK Performance Changes 2n-skx 2t1c pdr
 - type: "table"
@@ -5390,20 +7169,21 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "21.02"
-      data-set: "dpdk-2n-skx-hist-iter"
     - title: "21.08"
-      data-set: "dpdk-2n-skx-prev-iter"
+      data-set: "dpdk-2n-skx-hist-iter"
     - title: "21.11"
+      data-set: "dpdk-2n-skx-prev-iter"
+    - title: "22.03"
       data-set: "dpdk-2n-skx-curr-iter"
   comparisons:
-    - title: "Diff"
+    - title: "22.03 vs 21.11"
       reference: 2
       compare: 3
   legend:
-    - ""
-    - "21.02, 21.08, 21.11 - DPDK versions tested."
-    - "Diff - difference between 21.08 and 21.11 DPDK version."
+    - ''
+    - 'Test Case:           Test cases executed for: PDR throughput on 2n-skx with xxv710.'
+    - '21.08, 21.11, 22.03: [Mpps +- StDev] results for DPDK tested in CSIT.'
+    - '22.03 vs 21.11:      [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
 
 # DPDK Performance Changes 2n-skx 4t2c pdr
 - type: "table"
@@ -5413,20 +7193,21 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "21.02"
-      data-set: "dpdk-2n-skx-hist-iter"
     - title: "21.08"
-      data-set: "dpdk-2n-skx-prev-iter"
+      data-set: "dpdk-2n-skx-hist-iter"
     - title: "21.11"
+      data-set: "dpdk-2n-skx-prev-iter"
+    - title: "22.03"
       data-set: "dpdk-2n-skx-curr-iter"
   comparisons:
-    - title: "Diff"
+    - title: "22.03 vs 21.11"
       reference: 2
       compare: 3
   legend:
-    - ""
-    - "21.02, 21.08, 21.11 - DPDK versions tested."
-    - "Diff - difference between 21.08 and 21.11 DPDK version."
+    - ''
+    - 'Test Case:           Test cases executed for: PDR throughput on 2n-skx with xxv710.'
+    - '21.08, 21.11, 22.03: [Mpps +- StDev] results for DPDK tested in CSIT.'
+    - '22.03 vs 21.11:      [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
 
 # DPDK Performance Changes 2n-skx 2t1c ndr
 - type: "table"
@@ -5436,20 +7217,21 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "21.02"
-      data-set: "dpdk-2n-skx-hist-iter"
     - title: "21.08"
-      data-set: "dpdk-2n-skx-prev-iter"
+      data-set: "dpdk-2n-skx-hist-iter"
     - title: "21.11"
+      data-set: "dpdk-2n-skx-prev-iter"
+    - title: "22.03"
       data-set: "dpdk-2n-skx-curr-iter"
   comparisons:
-    - title: "Diff"
+    - title: "22.03 vs 21.11"
       reference: 2
       compare: 3
   legend:
-    - ""
-    - "21.02, 21.08, 21.11 - DPDK versions tested."
-    - "Diff - difference between 21.08 and 21.11 DPDK version."
+    - ''
+    - 'Test Case:           Test cases executed for: NDR throughput on 2n-skx with xxv710.'
+    - '21.08, 21.11, 22.03: [Mpps +- StDev] results for DPDK tested in CSIT.'
+    - '22.03 vs 21.11:      [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
 
 # DPDK Performance Changes 2n-skx 4t2c ndr
 - type: "table"
@@ -5459,20 +7241,21 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "21.02"
-      data-set: "dpdk-2n-skx-hist-iter"
     - title: "21.08"
-      data-set: "dpdk-2n-skx-prev-iter"
+      data-set: "dpdk-2n-skx-hist-iter"
     - title: "21.11"
+      data-set: "dpdk-2n-skx-prev-iter"
+    - title: "22.03"
       data-set: "dpdk-2n-skx-curr-iter"
   comparisons:
-    - title: "Diff"
+    - title: "22.03 vs 21.11"
       reference: 2
       compare: 3
   legend:
-    - ""
-    - "21.02, 21.08, 21.11 - DPDK versions tested."
-    - "Diff - difference between 21.08 and 21.11 DPDK version."
+    - ''
+    - 'Test Case:           Test cases executed for: NDR throughput on 2n-skx with xxv710.'
+    - '21.08, 21.11, 22.03: [Mpps +- StDev] results for DPDK tested in CSIT.'
+    - '22.03 vs 21.11:      [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
 
 # DPDK Performance Changes 2n-clx 2t1c pdr
 - type: "table"
@@ -5482,20 +7265,21 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "21.02"
-      data-set: "dpdk-2n-clx-hist-iter"
     - title: "21.08"
-      data-set: "dpdk-2n-clx-prev-iter"
+      data-set: "dpdk-2n-clx-hist-iter"
     - title: "21.11"
+      data-set: "dpdk-2n-clx-prev-iter"
+    - title: "22.03"
       data-set: "dpdk-2n-clx-curr-iter"
   comparisons:
-    - title: "Diff"
+    - title: "22.03 vs 21.11"
       reference: 2
       compare: 3
   legend:
-    - ""
-    - "21.02, 21.08, 21.11 - DPDK versions tested."
-    - "Diff - difference between 21.08 and 21.11 DPDK version."
+    - ''
+    - 'Test Case:           Test cases executed for: PDR throughput on 2n-clx with xxv710.'
+    - '21.08, 21.11, 22.03: [Mpps +- StDev] results for DPDK tested in CSIT.'
+    - '22.03 vs 21.11:      [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
 
 # DPDK Performance Changes 2n-clx 4t2c pdr
 - type: "table"
@@ -5505,20 +7289,21 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "21.02"
-      data-set: "dpdk-2n-clx-hist-iter"
     - title: "21.08"
-      data-set: "dpdk-2n-clx-prev-iter"
+      data-set: "dpdk-2n-clx-hist-iter"
     - title: "21.11"
+      data-set: "dpdk-2n-clx-prev-iter"
+    - title: "22.03"
       data-set: "dpdk-2n-clx-curr-iter"
   comparisons:
-    - title: "Diff"
+    - title: "22.03 vs 21.11"
       reference: 2
       compare: 3
   legend:
-    - ""
-    - "21.02, 21.08, 21.11 - DPDK versions tested."
-    - "Diff - difference between 21.08 and 21.11 DPDK version."
+    - ''
+    - 'Test Case:           Test cases executed for: PDR throughput on 2n-clx with xxv710.'
+    - '21.08, 21.11, 22.03: [Mpps +- StDev] results for DPDK tested in CSIT.'
+    - '22.03 vs 21.11:      [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
 
 # DPDK Performance Changes 2n-clx 2t1c ndr
 - type: "table"
@@ -5528,20 +7313,21 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "21.02"
-      data-set: "dpdk-2n-clx-hist-iter"
     - title: "21.08"
-      data-set: "dpdk-2n-clx-prev-iter"
+      data-set: "dpdk-2n-clx-hist-iter"
     - title: "21.11"
+      data-set: "dpdk-2n-clx-prev-iter"
+    - title: "22.03"
       data-set: "dpdk-2n-clx-curr-iter"
   comparisons:
-    - title: "Diff"
+    - title: "22.03 vs 21.11"
       reference: 2
       compare: 3
   legend:
-    - ""
-    - "21.02, 21.08, 21.11 - DPDK versions tested."
-    - "Diff - difference between 21.08 and 21.11 DPDK version."
+    - ''
+    - 'Test Case:           Test cases executed for: NDR throughput on 2n-clx with xxv710.'
+    - '21.08, 21.11, 22.03: [Mpps +- StDev] results for DPDK tested in CSIT.'
+    - '22.03 vs 21.11:      [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
 
 # DPDK Performance Changes 2n-clx 4t2c ndr
 - type: "table"
@@ -5551,20 +7337,21 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "21.02"
-      data-set: "dpdk-2n-clx-hist-iter"
     - title: "21.08"
-      data-set: "dpdk-2n-clx-prev-iter"
+      data-set: "dpdk-2n-clx-hist-iter"
     - title: "21.11"
+      data-set: "dpdk-2n-clx-prev-iter"
+    - title: "22.03"
       data-set: "dpdk-2n-clx-curr-iter"
   comparisons:
-    - title: "Diff"
+    - title: "22.03 vs 21.11"
       reference: 2
       compare: 3
   legend:
-    - ""
-    - "21.02, 21.08, 21.11 - DPDK versions tested."
-    - "Diff - difference between 21.08 and 21.11 DPDK version."
+    - ''
+    - 'Test Case:           Test cases executed for: NDR throughput on 2n-clx with xxv710.'
+    - '21.08, 21.11, 22.03: [Mpps +- StDev] results for DPDK tested in CSIT.'
+    - '22.03 vs 21.11:      [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
 
 # DPDK Performance Changes 2n-zn2 2t1c pdr
 - type: "table"
@@ -5574,20 +7361,21 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "21.02"
-      data-set: "dpdk-2n-zn2-hist-iter"
     - title: "21.08"
-      data-set: "dpdk-2n-zn2-prev-iter"
+      data-set: "dpdk-2n-zn2-hist-iter"
     - title: "21.11"
+      data-set: "dpdk-2n-zn2-prev-iter"
+    - title: "22.03"
       data-set: "dpdk-2n-zn2-curr-iter"
   comparisons:
-    - title: "Diff"
+    - title: "22.03 vs 21.11"
       reference: 2
       compare: 3
   legend:
-    - ""
-    - "21.02, 21.08, 21.11 - DPDK versions tested."
-    - "Diff - difference between 21.08 and 21.11 DPDK version."
+    - ''
+    - 'Test Case:           Test cases executed for: PDR throughput on 2n-zn2 with xxv710.'
+    - '21.08, 21.11, 22.03: [Mpps +- StDev] results for DPDK tested in CSIT.'
+    - '22.03 vs 21.11:      [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
 
 # DPDK Performance Changes 2n-zn2 4t2c pdr
 - type: "table"
@@ -5597,20 +7385,21 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "21.02"
-      data-set: "dpdk-2n-zn2-hist-iter"
     - title: "21.08"
-      data-set: "dpdk-2n-zn2-prev-iter"
+      data-set: "dpdk-2n-zn2-hist-iter"
     - title: "21.11"
+      data-set: "dpdk-2n-zn2-prev-iter"
+    - title: "22.03"
       data-set: "dpdk-2n-zn2-curr-iter"
   comparisons:
-    - title: "Diff"
+    - title: "22.03 vs 21.11"
       reference: 2
       compare: 3
   legend:
-    - ""
-    - "21.02, 21.08, 21.11 - DPDK versions tested."
-    - "Diff - difference between 21.08 and 21.11 DPDK version."
+    - ''
+    - 'Test Case:           Test cases executed for: PDR throughput on 2n-zn2 with xxv710.'
+    - '21.08, 21.11, 22.03: [Mpps +- StDev] results for DPDK tested in CSIT.'
+    - '22.03 vs 21.11:      [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
 
 # DPDK Performance Changes 2n-zn2 2t1c ndr
 - type: "table"
@@ -5620,20 +7409,21 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "21.02"
-      data-set: "dpdk-2n-zn2-hist-iter"
     - title: "21.08"
-      data-set: "dpdk-2n-zn2-prev-iter"
+      data-set: "dpdk-2n-zn2-hist-iter"
     - title: "21.11"
+      data-set: "dpdk-2n-zn2-prev-iter"
+    - title: "22.03"
       data-set: "dpdk-2n-zn2-curr-iter"
   comparisons:
-    - title: "Diff"
+    - title: "22.03 vs 21.11"
       reference: 2
       compare: 3
   legend:
-    - ""
-    - "21.02, 21.08, 21.11 - DPDK versions tested."
-    - "Diff - difference between 21.08 and 21.11 DPDK version."
+    - ''
+    - 'Test Case:           Test cases executed for: NDR throughput on 2n-zn2 with xxv710.'
+    - '21.08, 21.11, 22.03: [Mpps +- StDev] results for DPDK tested in CSIT.'
+    - '22.03 vs 21.11:      [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
 
 # DPDK Performance Changes 2n-zn2 4t2c ndr
 - type: "table"
@@ -5643,204 +7433,21 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "21.02"
-      data-set: "dpdk-2n-zn2-hist-iter"
     - title: "21.08"
-      data-set: "dpdk-2n-zn2-prev-iter"
+      data-set: "dpdk-2n-zn2-hist-iter"
     - title: "21.11"
+      data-set: "dpdk-2n-zn2-prev-iter"
+    - title: "22.03"
       data-set: "dpdk-2n-zn2-curr-iter"
   comparisons:
-    - title: "Diff"
+    - title: "22.03 vs 21.11"
       reference: 2
       compare: 3
   legend:
-    - ""
-    - "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"
-#  title: "DPDK Performance Changes 2n-dnv 1t1c pdr"
-#  algorithm: "table_comparison"
-#  output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-dnv-1t1c-pdr"
-#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  filter: "'1T1C' and 'NDRPDR' and 'NIC_Intel-X553'"
-#  columns:
-#    - title: "2001"
-#      data-set: "dpdk-performance-changes-2n-dnv-h1"
-#    - title: "2005"
-#      data-set: "dpdk-performance-changes-2n-dnv-ref"
-#    - title: "2009"
-#      data-set: "dpdk-performance-changes-2n-dnv-cmp"
-#  comparisons:
-#    - title: "Diff"
-#      reference: 2
-#      compare: 3
-#  legend:
-#    - ""
-#    - "2001, 2005, 2009 - DPDK versions tested."
-#    - "Diff - difference between 2005 and 2009 DPDK version."
-#
-## DPDK Performance Changes 2n-dnv 2t2c pdr
-#- type: "table"
-#  title: "DPDK Performance Changes 2n-dnv 2t2c pdr"
-#  algorithm: "table_comparison"
-#  output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-dnv-2t2c-pdr"
-#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  filter: "'2T2C' and 'NDRPDR' and 'NIC_Intel-X553'"
-#  columns:
-#    - title: "2001"
-#      data-set: "dpdk-performance-changes-2n-dnv-h1"
-#    - title: "2005"
-#      data-set: "dpdk-performance-changes-2n-dnv-ref"
-#    - title: "2009"
-#      data-set: "dpdk-performance-changes-2n-dnv-cmp"
-#  comparisons:
-#    - title: "Diff"
-#      reference: 2
-#      compare: 3
-#  legend:
-#    - ""
-#    - "2001, 2005, 2009 - DPDK versions tested."
-#    - "Diff - difference between 2005 and 2009 DPDK version."
-#
-## DPDK Performance Changes 2n-dnv 1t1c ndr
-#- type: "table"
-#  title: "DPDK Performance Changes 2n-dnv 1t1c ndr"
-#  algorithm: "table_comparison"
-#  output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-dnv-1t1c-ndr"
-#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  filter: "'1T1C' and 'NDRPDR' and 'NIC_Intel-X553'"
-#  columns:
-#    - title: "2001"
-#      data-set: "dpdk-performance-changes-2n-dnv-h1"
-#    - title: "2005"
-#      data-set: "dpdk-performance-changes-2n-dnv-ref"
-#    - title: "2009"
-#      data-set: "dpdk-performance-changes-2n-dnv-cmp"
-#  comparisons:
-#    - title: "Diff"
-#      reference: 2
-#      compare: 3
-#  legend:
-#    - ""
-#    - "2001, 2005, 2009 - DPDK versions tested."
-#    - "Diff - difference between 2005 and 2009 DPDK version."
-#
-## DPDK Performance Changes 2n-dnv 2t2c ndr
-#- type: "table"
-#  title: "DPDK Performance Changes 2n-dnv 2t2c ndr"
-#  algorithm: "table_comparison"
-#  output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-dnv-2t2c-ndr"
-#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  filter: "'2T2C' and 'NDRPDR' and 'NIC_Intel-X553'"
-#  columns:
-#    - title: "2001"
-#      data-set: "dpdk-performance-changes-2n-dnv-h1"
-#    - title: "2005"
-#      data-set: "dpdk-performance-changes-2n-dnv-ref"
-#    - title: "2009"
-#      data-set: "dpdk-performance-changes-2n-dnv-cmp"
-#  comparisons:
-#    - title: "Diff"
-#      reference: 2
-#      compare: 3
-#  legend:
-#    - ""
-#    - "2001, 2005, 2009 - DPDK versions tested."
-#    - "Diff - difference between 2005 and 2009 DPDK version."
-#
-## DPDK Performance Changes 3n-dnv 1t1c pdr
-#- type: "table"
-#  title: "DPDK Performance Changes 3n-dnv 1t1c pdr"
-#  algorithm: "table_comparison"
-#  output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-dnv-1t1c-pdr"
-#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  filter: "'1T1C' and 'NDRPDR' and 'NIC_Intel-X553'"
-#  columns:
-#    - title: "2001"
-#      data-set: "dpdk-performance-changes-3n-dnv-h1"
-#    - title: "2005"
-#      data-set: "dpdk-performance-changes-3n-dnv-ref"
-#    - title: "2009"
-#      data-set: "dpdk-performance-changes-3n-dnv-cmp"
-#  comparisons:
-#    - title: "Diff"
-#      reference: 2
-#      compare: 3
-#  legend:
-#    - ""
-#    - "2001, 2005, 2009 - DPDK versions tested."
-#    - "Diff - difference between 2005 and 2009 DPDK version."
-#
-## DPDK Performance Changes 3n-dnv 2t2c pdr
-#- type: "table"
-#  title: "DPDK Performance Changes 3n-dnv 2t2c pdr"
-#  algorithm: "table_comparison"
-#  output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-dnv-2t2c-pdr"
-#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  filter: "'2T2C' and 'NDRPDR' and 'NIC_Intel-X553'"
-#  columns:
-#    - title: "2001"
-#      data-set: "dpdk-performance-changes-3n-dnv-h1"
-#    - title: "2005"
-#      data-set: "dpdk-performance-changes-3n-dnv-ref"
-#    - title: "2009"
-#      data-set: "dpdk-performance-changes-3n-dnv-cmp"
-#  comparisons:
-#    - title: "Diff"
-#      reference: 2
-#      compare: 3
-#  legend:
-#    - ""
-#    - "2001, 2005, 2009 - DPDK versions tested."
-#    - "Diff - difference between 2005 and 2009 DPDK version."
-#
-## DPDK Performance Changes 3n-dnv 1t1c ndr
-#- type: "table"
-#  title: "DPDK Performance Changes 3n-dnv 1t1c ndr"
-#  algorithm: "table_comparison"
-#  output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-dnv-1t1c-ndr"
-#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  filter: "'1T1C' and 'NDRPDR' and 'NIC_Intel-X553'"
-#  columns:
-#    - title: "2001"
-#      data-set: "dpdk-performance-changes-3n-dnv-h1"
-#    - title: "2005"
-#      data-set: "dpdk-performance-changes-3n-dnv-ref"
-#    - title: "2009"
-#      data-set: "dpdk-performance-changes-3n-dnv-cmp"
-#  comparisons:
-#    - title: "Diff"
-#      reference: 2
-#      compare: 3
-#  legend:
-#    - ""
-#    - "2001, 2005, 2009 - DPDK versions tested."
-#    - "Diff - difference between 2005 and 2009 DPDK version."
-#
-## DPDK Performance Changes 3n-dnv 2t2c ndr
-#- type: "table"
-#  title: "DPDK Performance Changes 3n-dnv 2t2c ndr"
-#  algorithm: "table_comparison"
-#  output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-dnv-2t2c-ndr"
-#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  filter: "'2T2C' and 'NDRPDR' and 'NIC_Intel-X553'"
-#  columns:
-#    - title: "2001"
-#      data-set: "dpdk-performance-changes-3n-dnv-h1"
-#    - title: "2005"
-#      data-set: "dpdk-performance-changes-3n-dnv-ref"
-#    - title: "2009"
-#      data-set: "dpdk-performance-changes-3n-dnv-cmp"
-#  comparisons:
-#    - title: "Diff"
-#      reference: 2
-#      compare: 3
-#  legend:
-#    - ""
-#    - "2001, 2005, 2009 - DPDK versions tested."
-#    - "Diff - difference between 2005 and 2009 DPDK version."
+    - ''
+    - 'Test Case:           Test cases executed for: NDR throughput on 2n-zn2 with xxv710.'
+    - '21.08, 21.11, 22.03: [Mpps +- StDev] results for DPDK tested in CSIT.'
+    - '22.03 vs 21.11:      [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
 
 # DPDK Performance Changes 3n-tsh 1t1c pdr
 - type: "table"
@@ -5848,22 +7455,23 @@
   algorithm: "table_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-tsh-1t1c-pdr"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'1T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
+  filter: "'1T1C' and 'NDRPDR'"
   columns:
-    - title: "21.02"
-      data-set: "dpdk-3n-tsh-hist-iter"
     - title: "21.08"
-      data-set: "dpdk-3n-tsh-prev-iter"
+      data-set: "dpdk-3n-tsh-hist-iter"
     - title: "21.11"
+      data-set: "dpdk-3n-tsh-prev-iter"
+    - title: "22.03"
       data-set: "dpdk-3n-tsh-curr-iter"
   comparisons:
-    - title: "Diff"
+    - title: "22.03 vs 21.11"
       reference: 2
       compare: 3
   legend:
-    - ""
-    - "21.02, 21.08, 21.11 - DPDK versions tested."
-    - "Diff - difference between 21.08 and 21.11 DPDK version."
+    - ''
+    - 'Test Case:           Test cases executed for: PDR throughput on 3n-tsh with x520.'
+    - '21.08, 21.11, 22.03: [Mpps +- StDev] results for DPDK tested in CSIT.'
+    - '22.03 vs 21.11:      [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
 
 # DPDK Performance Changes 3n-tsh 2t2c pdr
 - type: "table"
@@ -5871,22 +7479,23 @@
   algorithm: "table_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-tsh-2t2c-pdr"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
+  filter: "'2T2C' and 'NDRPDR'"
   columns:
-    - title: "21.02"
-      data-set: "dpdk-3n-tsh-hist-iter"
     - title: "21.08"
-      data-set: "dpdk-3n-tsh-prev-iter"
+      data-set: "dpdk-3n-tsh-hist-iter"
     - title: "21.11"
+      data-set: "dpdk-3n-tsh-prev-iter"
+    - title: "22.03"
       data-set: "dpdk-3n-tsh-curr-iter"
   comparisons:
-    - title: "Diff"
+    - title: "22.03 vs 21.11"
       reference: 2
       compare: 3
   legend:
-    - ""
-    - "21.02, 21.08, 21.11 - DPDK versions tested."
-    - "Diff - difference between 21.08 and 21.11 DPDK version."
+    - ''
+    - 'Test Case:           Test cases executed for: PDR throughput on 3n-tsh with x520.'
+    - '21.08, 21.11, 22.03: [Mpps +- StDev] results for DPDK tested in CSIT.'
+    - '22.03 vs 21.11:      [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
 
 # DPDK Performance Changes 3n-tsh 1t1c ndr
 - type: "table"
@@ -5894,22 +7503,23 @@
   algorithm: "table_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-tsh-1t1c-ndr"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'1T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
+  filter: "'1T1C' and 'NDRPDR'"
   columns:
-    - title: "21.02"
-      data-set: "dpdk-3n-tsh-hist-iter"
     - title: "21.08"
-      data-set: "dpdk-3n-tsh-prev-iter"
+      data-set: "dpdk-3n-tsh-hist-iter"
     - title: "21.11"
+      data-set: "dpdk-3n-tsh-prev-iter"
+    - title: "22.03"
       data-set: "dpdk-3n-tsh-curr-iter"
   comparisons:
-    - title: "Diff"
+    - title: "22.03 vs 21.11"
       reference: 2
       compare: 3
   legend:
-    - ""
-    - "21.02, 21.08, 21.11 - DPDK versions tested."
-    - "Diff - difference between 21.08 and 21.11 DPDK version."
+    - ''
+    - 'Test Case:           Test cases executed for: NDR throughput on 3n-tsh with x520.'
+    - '21.08, 21.11, 22.03: [Mpps +- StDev] results for DPDK tested in CSIT.'
+    - '22.03 vs 21.11:      [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
 
 # DPDK Performance Changes 3n-tsh 2t2c ndr
 - type: "table"
@@ -5917,22 +7527,23 @@
   algorithm: "table_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-tsh-2t2c-ndr"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
+  filter: "'2T2C' and 'NDRPDR'"
   columns:
-    - title: "21.02"
-      data-set: "dpdk-3n-tsh-hist-iter"
     - title: "21.08"
-      data-set: "dpdk-3n-tsh-prev-iter"
+      data-set: "dpdk-3n-tsh-hist-iter"
     - title: "21.11"
+      data-set: "dpdk-3n-tsh-prev-iter"
+    - title: "22.03"
       data-set: "dpdk-3n-tsh-curr-iter"
   comparisons:
-    - title: "Diff"
+    - title: "22.03 vs 21.11"
       reference: 2
       compare: 3
   legend:
-    - ""
-    - "21.02, 21.08, 21.11 - DPDK versions tested."
-    - "Diff - difference between 21.08 and 21.11 DPDK version."
+    - ''
+    - 'Test Case:           Test cases executed for: NDR throughput on 3n-tsh with x520.'
+    - '21.08, 21.11, 22.03: [Mpps +- StDev] results for DPDK tested in CSIT.'
+    - '22.03 vs 21.11:      [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
 
 # DPDK Performance Changes 2n-tx2 1t1c pdr
 - type: "table"
@@ -5943,17 +7554,20 @@
   filter: "'1T1C' and 'NDRPDR'"
   columns:
     - title: "21.08"
-      data-set: "dpdk-2n-tx2-prev-iter"
+      data-set: "dpdk-2n-tx2-hist-iter"
     - title: "21.11"
+      data-set: "dpdk-2n-tx2-prev-iter"
+    - title: "22.03"
       data-set: "dpdk-2n-tx2-curr-iter"
   comparisons:
-    - title: "Diff"
-      reference: 1
-      compare: 2
+    - title: "22.03 vs 21.11"
+      reference: 2
+      compare: 3
   legend:
-    - ""
-    - "21.08, 21.11 - DPDK versions tested."
-    - "Diff - difference between 21.08 and 21.11 DPDK version."
+    - ''
+    - 'Test Case:           Test cases executed for: PDR throughput on 2n-tx2.'
+    - '21.08, 21.11, 22.03: [Mpps +- StDev] results for DPDK tested in CSIT.'
+    - '22.03 vs 21.11:      [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
 
 # DPDK Performance Changes 2n-tx2 2t2c pdr
 - type: "table"
@@ -5964,17 +7578,20 @@
   filter: "'2T2C' and 'NDRPDR'"
   columns:
     - title: "21.08"
-      data-set: "dpdk-2n-tx2-prev-iter"
+      data-set: "dpdk-2n-tx2-hist-iter"
     - title: "21.11"
+      data-set: "dpdk-2n-tx2-prev-iter"
+    - title: "22.03"
       data-set: "dpdk-2n-tx2-curr-iter"
   comparisons:
-    - title: "Diff"
-      reference: 1
-      compare: 2
+    - title: "22.03 vs 21.11"
+      reference: 2
+      compare: 3
   legend:
-    - ""
-    - "21.08, 21.11 - DPDK versions tested."
-    - "Diff - difference between 21.08 and 21.11 DPDK version."
+    - ''
+    - 'Test Case:           Test cases executed for: PDR throughput on 2n-tx2.'
+    - '21.08, 21.11, 22.03: [Mpps +- StDev] results for DPDK tested in CSIT.'
+    - '22.03 vs 21.11:      [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
 
 # DPDK Performance Changes 2n-tx2 1t1c ndr
 - type: "table"
@@ -5985,17 +7602,20 @@
   filter: "'1T1C' and 'NDRPDR'"
   columns:
     - title: "21.08"
-      data-set: "dpdk-2n-tx2-prev-iter"
+      data-set: "dpdk-2n-tx2-hist-iter"
     - title: "21.11"
+      data-set: "dpdk-2n-tx2-prev-iter"
+    - title: "22.03"
       data-set: "dpdk-2n-tx2-curr-iter"
   comparisons:
-    - title: "Diff"
-      reference: 1
-      compare: 2
+    - title: "22.03 vs 21.11"
+      reference: 2
+      compare: 3
   legend:
-    - ""
-    - "21.08, 21.11 - DPDK versions tested."
-    - "Diff - difference between 21.08 and 21.11 DPDK version."
+    - ''
+    - 'Test Case:           Test cases executed for: NDR throughput on 2n-tx2.'
+    - '21.08, 21.11, 22.03: [Mpps +- StDev] results for DPDK tested in CSIT.'
+    - '22.03 vs 21.11:      [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
 
 # DPDK Performance Changes 2n-tx2 2t2c ndr
 - type: "table"
@@ -6006,59 +7626,20 @@
   filter: "'2T2C' and 'NDRPDR'"
   columns:
     - title: "21.08"
-      data-set: "dpdk-2n-tx2-prev-iter"
+      data-set: "dpdk-2n-tx2-hist-iter"
     - title: "21.11"
+      data-set: "dpdk-2n-tx2-prev-iter"
+    - title: "22.03"
       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"
-  title: "DPDK Comparison Across Testbeds 2n-skx to 2n-clx ndr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-compare-testbeds-2n-skx-2n-clx-ndr"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'NIC_Intel-XXV710'"
-  columns:
-    - title: "2n-skx"
-      data-set: "dpdk-2n-skx-curr-iter"
-    - title: "2n-clx"
-      data-set: "dpdk-2n-clx-curr-iter"
-  comparisons:
-    - title: "Diff"
-      reference: 1
-      compare: 2
-  legend:
-    - ""
-    - "2n-skx, 2n-clx - testbeds and NICs tested."
-    - "Diff - difference between 2n-skx and 2n-clx testbeds."
-
-# DPDK Comparison Across Testbeds 2n-skx to 2n-clx pdr
-- type: "table"
-  title: "DPDK Comparison Across Testbeds 2n-skx to 2n-clx pdr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-compare-testbeds-2n-skx-2n-clx-pdr"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'NIC_Intel-XXV710'"
-  columns:
-    - title: "2n-skx"
-      data-set: "dpdk-2n-skx-curr-iter"
-    - title: "2n-clx"
-      data-set: "dpdk-2n-clx-curr-iter"
-  comparisons:
-    - title: "Diff"
-      reference: 1
-      compare: 2
+      reference: 2
+      compare: 3
   legend:
-    - ""
-    - "2n-skx, 2n-clx - testbeds and NICs tested."
-    - "Diff - difference between 2n-skx and 2n-clx testbeds."
+    - ''
+    - 'Test Case:           Test cases executed for: NDR throughput on 2n-tx2.'
+    - '21.08, 21.11, 22.03: [Mpps +- StDev] results for DPDK tested in CSIT.'
+    - '22.03 vs 21.11:      [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
 
 # DPDK Comparison Across Topologies 3n-skx to 2n-skx ndr
 - type: "table"
@@ -6068,18 +7649,19 @@
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'NIC_Intel-XXV710'"
   columns:
-    - title: "3n-skx"
+    - title: "3n-skx xxv710"
       data-set: "dpdk-3n-skx-curr-iter"
-    - title: "2n-skx"
+    - title: "2n-skx xxv710"
       data-set: "dpdk-2n-skx-curr-iter"
   comparisons:
-    - title: "Diff"
+    - title: "2n-skx vs 3n-skx"
       reference: 1
       compare: 2
   legend:
-    - ""
-    - "3n-skx, 2n-skx - topologies tested."
-    - "Diff - difference between 3n-skx and 2n-skx topologies."
+    - ''
+    - 'Test Case:                    Test cases executed for: NDR throughput on 3n-skx xxv710 and 2n-skx xxv710.'
+    - '3n-skx xxv710, 2n-skx xxv710: [Mpps +- StDev] results for DPDK tested in CSIT'
+    - '2n-skx vs 3n-skx:             [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
 
 # DPDK Comparison Across Topologies 3n-skx to 2n-skx pdr
 - type: "table"
@@ -6089,18 +7671,19 @@
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'NIC_Intel-XXV710'"
   columns:
-    - title: "3n-skx"
+    - title: "3n-skx xxv710"
       data-set: "dpdk-3n-skx-curr-iter"
-    - title: "2n-skx"
+    - title: "2n-skx xxv710"
       data-set: "dpdk-2n-skx-curr-iter"
   comparisons:
-    - title: "Diff"
+    - title: "2n-skx vs 3n-skx"
       reference: 1
       compare: 2
   legend:
-    - ""
-    - "3n-skx, 2n-skx - topologies tested."
-    - "Diff - difference between 3n-skx and 2n-skx topologies."
+    - ''
+    - 'Test Case:                    Test cases executed for: PDR throughput on 3n-skx xxv710 and 2n-skx xxv710.'
+    - '3n-skx xxv710, 2n-skx xxv710: [Mpps +- StDev] results for DPDK tested in CSIT'
+    - '2n-skx vs 3n-skx:             [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
 
 # Detailed Test Results - DPDK Performance Results 3n-skx
 - type: "table"
@@ -6173,39 +7756,39 @@
   - "parent"
   - "msg"
 
-## Detailed Test Results - DPDK Performance Results 2n-dnv
-#- type: "table"
-#  title: "Detailed Test Results - DPDK Performance Results 2n-dnv"
-#  algorithm: "table_merged_details"
-#  output-file: "{DIR[DTR,PERF,DPDK,2N,DNV]}/dpdk_performance_results_2n_dnv"
-#  columns:
-#    - title: " |prein| Test Name |preout| "
-#      data: "data name"
-#    - title: " |prein| Throughput: |br| 1.  Mpps       Gbps (NDR) |br| 2.  Mpps       Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, |br| one set per each direction: |br| 3.  P50  P90  P99       P50  P90  P99 (10% PDR) |br| 4.  P50  P90  P99       P50  P90  P99 (50% PDR) |br| 5.  P50  P90  P99       P50  P90  P99 (90% PDR) |preout| "
-#      data: "data msg"
-#  data: "dpdk-perf-results-2n-dnv"
-#  filter: "all"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "msg"
-#
-## Detailed Test Results - DPDK Performance Results 3n-dnv
-#- type: "table"
-#  title: "Detailed Test Results - DPDK Performance Results 3n-dnv"
-#  algorithm: "table_merged_details"
-#  output-file: "{DIR[DTR,PERF,DPDK,3N,DNV]}/dpdk_performance_results_3n_dnv"
-#  columns:
-#    - title: " |prein| Test Name |preout| "
-#      data: "data name"
-#    - title: " |prein| Throughput: |br| 1.  Mpps       Gbps (NDR) |br| 2.  Mpps       Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, |br| one set per each direction: |br| 3.  P50  P90  P99       P50  P90  P99 (10% PDR) |br| 4.  P50  P90  P99       P50  P90  P99 (50% PDR) |br| 5.  P50  P90  P99       P50  P90  P99 (90% PDR) |preout| "
-#      data: "data msg"
-#  data: "dpdk-perf-results-3n-dnv"
-#  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-icx-curr-iter-best"
+  filter: "all"
+  parameters:
+  - "name"
+  - "parent"
+  - "msg"
+
+# Detailed Test Results - DPDK Performance Results 3n-icx
+- type: "table"
+  title: "Detailed Test Results - DPDK Performance Results 3n-icx"
+  algorithm: "table_merged_details"
+  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-3n-icx-curr-iter-best"
+  filter: "all"
+  parameters:
+  - "name"
+  - "parent"
+  - "msg"
 
 # Detailed Test Results - DPDK Performance Results 3n-tsh
 - type: "table"
@@ -6224,6 +7807,23 @@
   - "parent"
   - "msg"
 
+# Detailed Test Results - DPDK Performance Results 3n-alt
+- type: "table"
+  title: "Detailed Test Results - DPDK Performance Results 3n-alt"
+  algorithm: "table_merged_details"
+  output-file: "{DIR[DTR,PERF,DPDK,3N,ALT]}/dpdk_performance_results_3n_alt"
+  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-3n-alt-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"
@@ -6275,25 +7875,27 @@
     - "{DIR[DTR,PERF,VPP,2N,ICX]}"
     - "{DIR[DTR,PERF,VPP,3N,ICX]}"
     - "{DIR[DTR,PERF,VPP,2N,ZN2]}"
+    - "{DIR[DTR,PERF,VPP,3N,ALT]}"
     - "{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]}"
+    # - "{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-alt-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"
+    # - "vpp-3n-aws-curr-cov"
   filter: "'NDRPDR'"
   data-start-level: 4
   order-chapters:
@@ -6318,12 +7920,13 @@
       - "2n-icx"
       - "3n-icx"
       - "2n-zn2"
+      - "3n-alt"
       - "3n-tsh"
       - "2n-tx2"
       - "2n-dnv"
       - "3n-dnv"
       - "2n-aws"
-      - "3n-aws"
+      # - "3n-aws"
     level-3:
       - "xl710"
       - "x520"
@@ -6348,25 +7951,27 @@
     - "{DIR[DTC,PERF,VPP,2N,ICX]}"
     - "{DIR[DTC,PERF,VPP,3N,ICX]}"
     - "{DIR[DTC,PERF,VPP,2N,ZN2]}"
+    - "{DIR[DTC,PERF,VPP,3N,ALT]}"
     - "{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]}"
+    # - "{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-alt-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"
+    # - "vpp-3n-aws-curr-cov"
   filter: "'NDRPDR'"
   data-start-level: 4
   order-chapters:
@@ -6391,12 +7996,13 @@
       - "2n-icx"
       - "3n-icx"
       - "2n-zn2"
+      - "3n-alt"
       - "3n-tsh"
       - "2n-tx2"
       - "2n-dnv"
       - "3n-dnv"
       - "2n-aws"
-      - "3n-aws"
+      # - "3n-aws"
     level-3:
       - "xl710"
       - "x520"
@@ -6421,25 +8027,27 @@
     - "{DIR[DTO,PERF,VPP,2N,ICX]}"
     - "{DIR[DTO,PERF,VPP,3N,ICX]}"
     - "{DIR[DTO,PERF,VPP,2N,ZN2]}"
+    - "{DIR[DTO,PERF,VPP,3N,ALT]}"
     - "{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]}"
+    # - "{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-alt-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"
+    # - "vpp-3n-aws-curr-cov"
   filter: "'NDRPDR'"
   data-start-level: 4
   order-chapters:
@@ -6464,12 +8072,13 @@
       - "2n-icx"
       - "3n-icx"
       - "2n-zn2"
+      - "3n-alt"
       - "3n-tsh"
       - "2n-tx2"
       - "2n-dnv"
       - "3n-dnv"
       - "2n-aws"
-      - "3n-aws"
+      # - "3n-aws"
     level-3:
       - "xl710"
       - "x520"
@@ -6492,27 +8101,29 @@
     - "{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,3N,ICX]}"
     - "{DIR[DTR,MRR,VPP,2N,ZN2]}"
+    - "{DIR[DTR,MRR,VPP,3N,ALT]}"
     - "{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]}"
+    # - "{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-3n-icx-curr-iter-mrr"
     - "vpp-2n-zn2-curr-iter-mrr"
+    - "vpp-3n-alt-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"
+    # - "vpp-3n-aws-curr-iter-mrr"
   filter: "'MRR'"
   data-start-level: 4
   order-chapters:
@@ -6535,14 +8146,15 @@
       - "3n-skx"
       - "2n-clx"
       - "2n-icx"
-#       - "3n-icx"
+      - "3n-icx"
       - "2n-zn2"
+      - "3n-alt"
       - "3n-tsh"
       - "2n-tx2"
       - "2n-dnv"
       - "3n-dnv"
       - "2n-aws"
-      - "3n-aws"
+      # - "3n-aws"
     level-3:
       - "xl710"
       - "x520"
@@ -6565,27 +8177,29 @@
     - "{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,3N,ICX]}"
     - "{DIR[DTC,MRR,VPP,2N,ZN2]}"
+    - "{DIR[DTC,MRR,VPP,3N,ALT]}"
     - "{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]}"
+    # - "{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-3n-icx-curr-iter-mrr"
     - "vpp-2n-zn2-curr-iter-mrr"
+    - "vpp-3n-alt-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"
+    # - "vpp-3n-aws-curr-iter-mrr"
   filter: "'MRR'"
   data-start-level: 4
   order-chapters:
@@ -6608,14 +8222,15 @@
       - "3n-skx"
       - "2n-clx"
       - "2n-icx"
-#       - "3n-icx"
+      - "3n-icx"
       - "2n-zn2"
+      - "3n-alt"
       - "3n-tsh"
       - "2n-tx2"
       - "2n-dnv"
       - "3n-dnv"
       - "2n-aws"
-      - "3n-aws"
+      # - "3n-aws"
     level-3:
       - "xl710"
       - "x520"
@@ -6688,6 +8303,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"
@@ -6718,6 +8353,16 @@
   filter: "all"
   data-start-level: 4
 
+# DPDK Performance Results 3n-alt
+- type: "file"
+  title: "DPDK Performance Results 3n-alt"
+  algorithm: "file_test_results"
+  output-file: "{DIR[DTR,PERF,DPDK,3N,ALT]}"
+  dir-tables: "{DIR[DTR,PERF,DPDK,3N,ALT]}"
+  data: "dpdk-3n-alt-curr-iter-best"
+  filter: "all"
+  data-start-level: 4
+
 # DPDK Performance Results 2n-tx2
 - type: "file"
   title: "DPDK Performance Results 2n-tx2"
@@ -6728,108 +8373,196 @@
   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
+# 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                                 ###
+################################################################################
+
+# VSAP tests 2n-clx
+
+- type: "plot"
+  title: "2n-clx-cx556a-0B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-cx556a-0B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps"
+  data: "vpp-2n-clx-curr-iter-vsap"
+  include:
+    - "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-cx556a-0B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0"
+    layout: "plot-hoststack"
+
+- type: "plot"
+  title: "2n-clx-cx556a-64B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-cx556a-64B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps"
+  data: "vpp-2n-clx-curr-iter-vsap"
+  include:
+    - "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-cx556a-64B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0"
+    layout: "plot-hoststack"
+
+- type: "plot"
+  title: "2n-clx-cx556a-1024B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-cx556a-1024B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps"
+  data: "vpp-2n-clx-curr-iter-vsap"
+  include:
+    - "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-cx556a-1024B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0"
+    layout: "plot-hoststack"
+
+- type: "plot"
+  title: "2n-clx-cx556a-2048B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-cx556a-2048B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps"
+  data: "vpp-2n-clx-curr-iter-vsap"
+  include:
+    - "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-cx556a-2048B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0"
+    layout: "plot-hoststack"
+
+- type: "plot"
+  title: "2n-clx-cx556a-0B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-cx556a-0B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps"
+  data: "vpp-2n-clx-curr-iter-vsap"
+  include:
+    - "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-cx556a-0B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0"
+    layout: "plot-hoststack"
+
+- type: "plot"
+  title: "2n-clx-cx556a-64B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-cx556a-64B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps"
+  data: "vpp-2n-clx-curr-iter-vsap"
+  include:
+    - "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-cx556a-64B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0"
+    layout: "plot-hoststack"
 
-################################################################################
-###                                P L O T S                                 ###
-################################################################################
+- type: "plot"
+  title: "2n-clx-cx556a-1024B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-cx556a-1024B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps"
+  data: "vpp-2n-clx-curr-iter-vsap"
+  include:
+    - "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-cx556a-1024B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0"
+    layout: "plot-hoststack"
 
-# VSAP tests 2n-clx
+- type: "plot"
+  title: "2n-clx-cx556a-2048B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-cx556a-2048B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps"
+  data: "vpp-2n-clx-curr-iter-vsap"
+  include:
+    - "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-cx556a-2048B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0"
+    layout: "plot-hoststack"
 
 - type: "plot"
-  title: "2n-clx-cx556a-0b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps"
+  title: "2n-clx-e810cq-0B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps"
   algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-cx556a-0b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-e810cq-0B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps"
   data: "vpp-2n-clx-curr-iter-vsap"
   include:
-    - "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"
+    - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1E810Cq-Eth-Ip4Tcphttp-Ldpreload-Nginx-1 15 0-Cps.0B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps"
   layout:
-    title: "2n-clx-cx556a-0b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
+    title: "2n-clx-e810cq-0B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0"
     layout: "plot-hoststack"
 
 - type: "plot"
-  title: "2n-clx-cx556a-64b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps"
+  title: "2n-clx-e810cq-64B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps"
   algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-cx556a-64b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-e810cq-64B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps"
   data: "vpp-2n-clx-curr-iter-vsap"
   include:
-    - "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"
+    - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1E810Cq-Eth-Ip4Tcphttp-Ldpreload-Nginx-1 15 0-Cps.64B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps"
   layout:
-    title: "2n-clx-cx556a-64b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
+    title: "2n-clx-e810cq-64B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0"
     layout: "plot-hoststack"
 
 - type: "plot"
-  title: "2n-clx-cx556a-1024b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps"
+  title: "2n-clx-e810cq-1024B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps"
   algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-cx556a-1024b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-e810cq-1024B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps"
   data: "vpp-2n-clx-curr-iter-vsap"
   include:
-    - "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"
+    - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1E810Cq-Eth-Ip4Tcphttp-Ldpreload-Nginx-1 15 0-Cps.1024B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps"
   layout:
-    title: "2n-clx-cx556a-1024b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
+    title: "2n-clx-e810cq-1024B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0"
     layout: "plot-hoststack"
 
 - type: "plot"
-  title: "2n-clx-cx556a-2048b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps"
+  title: "2n-clx-e810cq-2048B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps"
   algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-cx556a-2048b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-e810cq-2048B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps"
   data: "vpp-2n-clx-curr-iter-vsap"
   include:
-    - "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"
+    - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1E810Cq-Eth-Ip4Tcphttp-Ldpreload-Nginx-1 15 0-Cps.2048B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps"
   layout:
-    title: "2n-clx-cx556a-2048b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
+    title: "2n-clx-e810cq-2048B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0"
     layout: "plot-hoststack"
 
 - type: "plot"
-  title: "2n-clx-cx556a-0b-2t1c-eth-ip4tcphttp-ldpreload-nginx-rps"
+  title: "2n-clx-e810cq-0B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps"
   algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-cx556a-0b-2t1c-eth-ip4tcphttp-ldpreload-nginx-rps"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-e810cq-0B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps"
   data: "vpp-2n-clx-curr-iter-vsap"
   include:
-    - "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"
+    - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1E810Cq-Eth-Ip4Tcphttp-Ldpreload-Nginx-1 15 0-Rps.0B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps"
   layout:
-    title: "2n-clx-cx556a-0b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
+    title: "2n-clx-e810cq-0B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0"
     layout: "plot-hoststack"
 
 - type: "plot"
-  title: "2n-clx-cx556a-64b-2t1c-eth-ip4tcphttp-ldpreload-nginx-rps"
+  title: "2n-clx-e810cq-64B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps"
   algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-cx556a-64b-2t1c-eth-ip4tcphttp-ldpreload-nginx-rps"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-e810cq-64B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps"
   data: "vpp-2n-clx-curr-iter-vsap"
   include:
-    - "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"
+    - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1E810Cq-Eth-Ip4Tcphttp-Ldpreload-Nginx-1 15 0-Rps.64B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps"
   layout:
-    title: "2n-clx-cx556a-64b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
+    title: "2n-clx-e810cq-64B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0"
     layout: "plot-hoststack"
 
 - type: "plot"
-  title: "2n-clx-cx556a-1024b-2t1c-eth-ip4tcphttp-ldpreload-nginx-rps"
+  title: "2n-clx-e810cq-1024B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps"
   algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-cx556a-1024b-2t1c-eth-ip4tcphttp-ldpreload-nginx-rps"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-e810cq-1024B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps"
   data: "vpp-2n-clx-curr-iter-vsap"
   include:
-    - "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"
+    - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1E810Cq-Eth-Ip4Tcphttp-Ldpreload-Nginx-1 15 0-Rps.1024B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps"
   layout:
-    title: "2n-clx-cx556a-1024b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
+    title: "2n-clx-e810cq-1024B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0"
     layout: "plot-hoststack"
 
 - type: "plot"
-  title: "2n-clx-cx556a-2048b-2t1c-eth-ip4tcphttp-ldpreload-nginx-rps"
+  title: "2n-clx-e810cq-2048B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps"
   algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-cx556a-2048b-2t1c-eth-ip4tcphttp-ldpreload-nginx-rps"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-e810cq-2048B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps"
   data: "vpp-2n-clx-curr-iter-vsap"
   include:
-    - "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"
+    - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1E810Cq-Eth-Ip4Tcphttp-Ldpreload-Nginx-1 15 0-Rps.2048B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps"
   layout:
-    title: "2n-clx-cx556a-2048b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
+    title: "2n-clx-e810cq-2048B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0"
     layout: "plot-hoststack"
 
 # Hoststack tests 3n-skx
@@ -6874,6 +8607,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)"
@@ -6948,6 +8717,27 @@
 
 ###############################################################################
 
+# 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"
@@ -6983,8 +8773,194 @@
     - "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"
+    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.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: "<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: "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.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: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-test_type"
+    layout: "plot-service-density"
 
 ###############################################################################
 
@@ -7561,15 +9537,13 @@
   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-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-H1024-P63-S64512-Tput-Ndrpdr.100B-{core}-avf-ethip4tcp-nat44ed-h1024-p63-s64512-tput-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-Nat44Ed-H4096-P63-S258048-Tput-Ndrpdr.64B-{core}-avf-ethip4tcp-nat44ed-h4096-p63-s258048-tput-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-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-H16384-P63-S1032192-Tput-Ndrpdr.100B-{core}-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-tput-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-Nat44Ed-H65536-P63-S4128768-Tput-Ndrpdr.64B-{core}-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H65536-P63-S4128768-Tput-Ndrpdr.100B-{core}-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-tput-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-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"
@@ -7582,15 +9556,13 @@
   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-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-H1024-P63-S64512-Tput-Ndrpdr.100B-{core}-avf-ethip4udp-nat44ed-h1024-p63-s64512-tput-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-Nat44Ed-H4096-P63-S258048-Tput-Ndrpdr.64B-{core}-avf-ethip4udp-nat44ed-h4096-p63-s258048-tput-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-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-H16384-P63-S1032192-Tput-Ndrpdr.100B-{core}-avf-ethip4udp-nat44ed-h16384-p63-s1032192-tput-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-Nat44Ed-H65536-P63-S4128768-Tput-Ndrpdr.64B-{core}-avf-ethip4udp-nat44ed-h65536-p63-s4128768-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H65536-P63-S4128768-Tput-Ndrpdr.100B-{core}-avf-ethip4udp-nat44ed-h65536-p63-s4128768-tput-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-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"
@@ -7667,22 +9639,6 @@
 #     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-ixgbe-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-tsh-x520-64b-{core}-ip4routing-base-ixgbe-{test_type}"
-  data: "vpp-3n-tsh-curr-iter"
-  core: ["1t1c", ]
-  include:
-    - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Dot1Q-Ip4Base-Ndrpdr.64B-{core}-dot1q-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4-Ip4Base-Ndrpdr.64B-{core}-ethip4-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4-Ip4Scale20K-Ndrpdr.64B-{core}-ethip4-ip4scale20k-ndrpdr"
-    - "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-ixgbe-{test_type}"
-    layout: "plot-throughput"
-
 - type: "plot"
   title: "Throughput: 3n-tsh-x520-64b-{core}-features-ip4routing-base-ixgbe-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
@@ -7690,6 +9646,7 @@
   data: "vpp-3n-tsh-curr-iter"
   core: ["1t1c", ]
   include:
+    - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4-Ip4Base-Ndrpdr.64B-{core}-ethip4-ip4base-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-{core}-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-{core}-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-{core}-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
@@ -7785,57 +9742,57 @@
     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-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}-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-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-aws-nitro50g-imix-{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-aws-nitro50g-imix-{core}-ipsec-ip4routing-scale-ena-{test_type}"
+#     layout: "plot-throughput"
 
 - type: "plot"
   title: "Throughput: 3n-skx-xxv710-64b-{core}-ip4tunnel-base-[avf,dpdk]-{test_type}"
@@ -8388,9 +10345,9 @@
     - "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"
+    - "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: "3n-skx-xxv710-78b-{core}-srv6-ip6routing-base-avf-{test_type}"
     layout: "plot-throughput"
@@ -8730,6 +10687,207 @@
     title: "2n-tx2-xl710-64b-{core}-features-l2switching-base-{test_type}"
     layout: "plot-throughput"
 
+# 3n-alt
+
+- type: "plot"
+  title: "Throughput: 3n-alt-xl710-1518b-{core}-ipsec-aes128cbc-ip4routing-scale-sw-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-alt-xl710-1518b-{core}-ipsec-aes128cbc-ip4routing-scale-sw-{test_type}"
+  data: "vpp-3n-alt-curr-iter"
+  core: ["1t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.1518B-{core}-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Gcm-ndrpdr.1518B-{core}-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.1518B-{core}-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Gcm-ndrpdr.1518B-{core}-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.1518B-{core}-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Gcm-ndrpdr.1518B-{core}-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-ndrpdr"
+  layout:
+    title: "3n-alt-xl710-1518b-{core}-ipsec-aes128cbc-ip4routing-scale-sw-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 3n-alt-xl710-1518b-{core}-ipsec-aes256gcm-ip4routing-scale-sw-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-alt-xl710-1518b-{core}-ipsec-aes256gcm-ip4routing-scale-sw-{test_type}"
+  data: "vpp-3n-alt-curr-iter"
+  core: ["1t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.1518B-{core}-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.1518B-{core}-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.1518B-{core}-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+  layout:
+    title: "3n-alt-xl710-1518b-{core}-ipsec-aes256gcm-ip4routing-scale-sw-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 3n-alt-xl710-imix-{core}-ipsec-aes128cbc-ip4routing-scale-sw-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-alt-xl710-imix-{core}-ipsec-aes128cbc-ip4routing-scale-sw-{test_type}"
+  data: "vpp-3n-alt-curr-iter"
+  core: ["1t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.imix-{core}-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Gcm-ndrpdr.imix-{core}-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.imix-{core}-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Gcm-ndrpdr.imix-{core}-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.imix-{core}-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Gcm-ndrpdr.imix-{core}-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-ndrpdr"
+  layout:
+    title: "3n-alt-xl710-imix-{core}-ipsec-aes128cbc-ip4routing-scale-sw-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 3n-alt-xl710-imix-{core}-ipsec-aes256gcm-ip4routing-scale-sw-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-alt-xl710-imix-{core}-ipsec-aes256gcm-ip4routing-scale-sw-{test_type}"
+  data: "vpp-3n-alt-curr-iter"
+  core: ["1t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.imix-{core}-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.imix-{core}-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.imix-{core}-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+  layout:
+    title: "3n-alt-xl710-imix-{core}-ipsec-aes256gcm-ip4routing-scale-sw-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 3n-alt-xl710-64b-{core}-ipsec-ip4base-policy-outbound-nocrypto-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-alt-xl710-64b-{core}-ipsec-ip4base-policy-outbound-nocrypto-{test_type}"
+  data: "vpp-3n-alt-curr-iter"
+  core: ["1t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1Spe-Cache-Ip4Base-Policy-Outbound-Nocrypto-ndrpdr.64B-{core}-ethip4ipsec1spe-cache-ip4base-policy-outbound-nocrypto-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1Spe-Ip4Base-Policy-Outbound-Nocrypto-ndrpdr.64B-{core}-ethip4ipsec1spe-ip4base-policy-outbound-nocrypto-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec100Spe-Cache-Ip4Base-Policy-Outbound-Nocrypto-ndrpdr.64B-{core}-ethip4ipsec100spe-cache-ip4base-policy-outbound-nocrypto-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec100Spe-Ip4Base-Policy-Outbound-Nocrypto-ndrpdr.64B-{core}-ethip4ipsec100spe-ip4base-policy-outbound-nocrypto-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Spe-Cache-Ip4Base-Policy-Outbound-Nocrypto-ndrpdr.64B-{core}-ethip4ipsec1000spe-cache-ip4base-policy-outbound-nocrypto-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Spe-Ip4Base-Policy-Outbound-Nocrypto-ndrpdr.64B-{core}-ethip4ipsec1000spe-ip4base-policy-outbound-nocrypto-ndrpdr"
+  layout:
+    title: "3n-alt-xl710-64b-{core}-ipsec-ip4base-policy-outbound-nocrypto-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 3n-alt-xl710-64b-{core}-ipsec-ip4base-policy-aes256gcm-sw-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-alt-xl710-64b-{core}-ipsec-ip4base-policy-aes256gcm-sw-{test_type}"
+  data: "vpp-3n-alt-curr-iter"
+  core: ["1t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1Tnlsw-Ip4Base-Policy-Aes256Gcm-ndrpdr.64B-{core}-ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec40Tnlsw-Ip4Base-Policy-Aes256Gcm-ndrpdr.64B-{core}-ethip4ipsec40tnlsw-ip4base-policy-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-Ip4Base-Policy-Aes256Gcm-ndrpdr.64B-{core}-ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-ndrpdr"
+  layout:
+    title: "3n-alt-xl710-64b-{core}-ipsec-ip4base-policy-aes256gcm-sw-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 3n-alt-xl710-64b-{core}-ip4-base-scale-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-alt-xl710-64b-{core}-ip4-base-scale-{test_type}"
+  data: "vpp-3n-alt-curr-iter"
+  core: ["1t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4-Ip4Base-ndrpdr.64B-{core}-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4-Ip4Scale20K-ndrpdr.64B-{core}-ethip4-ip4scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4-Ip4Scale200K-ndrpdr.64B-{core}-ethip4-ip4scale200k-ndrpdr"
+  layout:
+    title: "3n-alt-xl710-64b-{core}-ip4-base-scale-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 3n-alt-xl710-64b-{core}-ip4-feature-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-alt-xl710-64b-{core}-ip4-feature-{test_type}"
+  data: "vpp-3n-alt-curr-iter"
+  core: ["1t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4-Ip4Base-Iacldstbase-ndrpdr.64B-{core}-ethip4-ip4base-iacldstbase-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-ndrpdr.64B-{core}-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-ndrpdr.64B-{core}-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-ndrpdr.64B-{core}-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-ndrpdr.64B-{core}-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
+  layout:
+    title: "3n-alt-xl710-64b-{core}-ip4-feature-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 3n-alt-xl710-64b-{core}-ip4-tunnels-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-alt-xl710-64b-{core}-ip4-tunnels-{test_type}"
+  data: "vpp-3n-alt-curr-iter"
+  core: ["1t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Ip4 Tunnels.40Ge2P1Xl710-Ethip4Vxlan-L2Xcbase-ndrpdr.64B-{core}-ethip4vxlan-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.40Ge2P1Xl710-Ethip4Vxlan-L2Bdbasemaclrn-ndrpdr.64B-{core}-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
+  layout:
+    title: "3n-alt-xl710-64b-{core}-ip4-tunnels-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 3n-alt-xl710-78b-{core}-ip6-base-scale-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-alt-xl710-78b-{core}-ip6-base-scale-{test_type}"
+  data: "vpp-3n-alt-curr-iter"
+  core: ["1t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Ethip6-Ip6Base-ndrpdr.78B-{core}-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Ethip6-Ip6Scale20K-ndrpdr.78B-{core}-ethip6-ip6scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Ethip6-Ip6Scale200K-ndrpdr.78B-{core}-ethip6-ip6scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Ethip6-Ip6Base-Iacldstbase-ndrpdr.78B-{core}-ethip6-ip6base-iacldstbase-ndrpdr"
+  layout:
+    title: "3n-alt-xl710-78b-{core}-ip6-base-scale-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 3n-alt-xl710-64b-{core}-l2-base-scale-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-alt-xl710-64b-{core}-l2-base-scale-{test_type}"
+  data: "vpp-3n-alt-curr-iter"
+  core: ["1t1c", ]
+  include:
+    - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Dot1Q-L2Bdbasemaclrn-ndrpdr.64B-{core}-dot1q-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Xcbase-ndrpdr.64B-{core}-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Patch-ndrpdr.64B-{core}-eth-l2patch-ndrpdr"
+    - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Bdbasemaclrn-ndrpdr.64B-{core}-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Bdscale10Kmaclrn-ndrpdr.64B-{core}-eth-l2bdscale10kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Bdscale100Kmaclrn-ndrpdr.64B-{core}-eth-l2bdscale100kmaclrn-ndrpdr"
+  layout:
+    title: "3n-alt-xl710-64b-{core}-l2-base-scale-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 3n-alt-xl710-64b-{core}-l2-feature-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-alt-xl710-64b-{core}-l2-feature-{test_type}"
+  data: "vpp-3n-alt-curr-iter"
+  core: ["1t1c", ]
+  include:
+    - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Macip-Iacl50Sl-10Kflows-ndrpdr.64B-{core}-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Iacl50Sf-10Kflows-ndrpdr.64B-{core}-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Iacl50Sl-10Kflows-ndrpdr.64B-{core}-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Oacl50Sf-10Kflows-ndrpdr.64B-{core}-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Oacl50Sl-10Kflows-ndrpdr.64B-{core}-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr"
+  layout:
+    title: "3n-alt-xl710-64b-{core}-l2-feature-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 3n-alt-xl710-64b-{core}-vhost-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-alt-xl710-64b-{core}-vhost-{test_type}"
+  data: "vpp-3n-alt-curr-iter"
+  core: ["1t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-ndrpdr.64B-{core}-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-ndrpdr.64B-{core}-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-ndrpdr.64B-{core}-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Vppip4-ndrpdr.64B-{core}-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr"
+  layout:
+    title: "3n-alt-xl710-64b-{core}-vhost-{test_type}"
+    layout: "plot-throughput"
+
 ################################################################################
 
 # Packet Speedup
@@ -8922,15 +11080,13 @@
   data: "vpp-2n-skx-curr-iter"
   include:
     - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-Ethip4Tcp-nat44ed-h1024-p63-s64512-pps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H1024-P63-S64512-Tput-Ndrpdr.64B-.t.c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H1024-P63-S64512-Tput-Ndrpdr.100B-.t.c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-tput-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-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-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-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-H16384-P63-S1032192-Tput-Ndrpdr.100B-.t.c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-tput-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-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-H65536-P63-S4128768-Tput-Ndrpdr.100B-.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"
@@ -8942,15 +11098,13 @@
   data: "vpp-2n-skx-curr-iter"
   include:
     - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-Ethip4Udp-nat44ed-h1024-p63-s64512-pps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H1024-P63-S64512-Tput-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44ed-h1024-p63-s64512-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H1024-P63-S64512-Tput-Ndrpdr.100B-.t.c-avf-ethip4udp-nat44ed-h1024-p63-s64512-tput-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-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-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-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-H16384-P63-S1032192-Tput-Ndrpdr.100B-.t.c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-tput-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-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-H65536-P63-S4128768-Tput-Ndrpdr.100B-.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"
@@ -9342,27 +11496,13 @@
     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-ixgbe-{test_type}-tsa"
-  algorithm: "plot_tsa_name"
-  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"
-    - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4-Ip4Base-Ndrpdr.64B-.t.c-ethip4-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4-Ip4Scale20K-Ndrpdr.64B-.t.c-ethip4-ip4scale20k-ndrpdr"
-    - "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-ixgbe-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
-
 - type: "plot"
   title: "Speedup: 3n-tsh-x520-64b-features-ip4routing-base-ixgbe-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/3n-tsh-x520-64b-features-ip4routing-base-ixgbe-{test_type}-tsa"
   data: "vpp-3n-tsh-curr-iter"
   include:
+    - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4-Ip4Base-Ndrpdr.64B-.t.c-ethip4-ip4base-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
@@ -9506,6 +11646,192 @@
 #    title: "3n-tsh-x520-64b-link-bonding-vhost-base-ixgbe-{test_type}"
 #    layout: "plot-throughput-speedup-analysis"
 
+- type: "plot"
+  title: "Speedup: 3n-alt-xl710-1518b-ipsec-aes128cbc-ip4routing-scale-sw-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-alt-xl710-1518b-ipsec-aes128cbc-ip4routing-scale-sw-{test_type}-tsa"
+  data: "vpp-3n-alt-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.1518B-.t.c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Gcm-ndrpdr.1518B-.t.c-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.1518B-.t.c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Gcm-ndrpdr.1518B-.t.c-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.1518B-.t.c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Gcm-ndrpdr.1518B-.t.c-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-ndrpdr"
+  layout:
+    title: "3n-alt-xl710-1518b-ipsec-aes128cbc-ip4routing-scale-sw-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 3n-alt-xl710-1518b-ipsec-aes256gcm-ip4routing-scale-sw-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-alt-xl710-1518b-ipsec-aes256gcm-ip4routing-scale-sw-{test_type}-tsa"
+  data: "vpp-3n-alt-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.1518B-.t.c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.1518B-.t.c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.1518B-.t.c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+  layout:
+    title: "3n-alt-xl710-1518b-ipsec-aes256gcm-ip4routing-scale-sw-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 3n-alt-xl710-imix-ipsec-aes128cbc-ip4routing-scale-sw-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-alt-xl710-imix-ipsec-aes128cbc-ip4routing-scale-sw-{test_type}-tsa"
+  data: "vpp-3n-alt-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.imix-.t.c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Gcm-ndrpdr.imix-.t.c-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.imix-.t.c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Gcm-ndrpdr.imix-.t.c-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.imix-.t.c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Gcm-ndrpdr.imix-.t.c-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-ndrpdr"
+  layout:
+    title: "3n-alt-xl710-imix-ipsec-aes128cbc-ip4routing-scale-sw-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 3n-alt-xl710-imix-ipsec-aes256gcm-ip4routing-scale-sw-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-alt-xl710-imix-ipsec-aes256gcm-ip4routing-scale-sw-{test_type}-tsa"
+  data: "vpp-3n-alt-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.imix-.t.c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.imix-.t.c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.imix-.t.c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+  layout:
+    title: "3n-alt-xl710-imix-ipsec-aes256gcm-ip4routing-scale-sw-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 3n-alt-xl710-64b-ipsec-ip4base-policy-outbound-nocrypto-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-alt-xl710-64b-ipsec-ip4base-policy-outbound-nocrypto-{test_type}-tsa"
+  data: "vpp-3n-alt-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1Spe-Cache-Ip4Base-Policy-Outbound-Nocrypto-ndrpdr.64B-.t.c-ethip4ipsec1spe-cache-ip4base-policy-outbound-nocrypto-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1Spe-Ip4Base-Policy-Outbound-Nocrypto-ndrpdr.64B-.t.c-ethip4ipsec1spe-ip4base-policy-outbound-nocrypto-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec100Spe-Cache-Ip4Base-Policy-Outbound-Nocrypto-ndrpdr.64B-.t.c-ethip4ipsec100spe-cache-ip4base-policy-outbound-nocrypto-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec100Spe-Ip4Base-Policy-Outbound-Nocrypto-ndrpdr.64B-.t.c-ethip4ipsec100spe-ip4base-policy-outbound-nocrypto-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Spe-Cache-Ip4Base-Policy-Outbound-Nocrypto-ndrpdr.64B-.t.c-ethip4ipsec1000spe-cache-ip4base-policy-outbound-nocrypto-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Spe-Ip4Base-Policy-Outbound-Nocrypto-ndrpdr.64B-.t.c-ethip4ipsec1000spe-ip4base-policy-outbound-nocrypto-ndrpdr"
+  layout:
+    title: "3n-alt-xl710-64b-ipsec-ip4base-policy-outbound-nocrypto-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 3n-alt-xl710-64b-ipsec-ip4base-policy-aes256gcm-sw-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-alt-xl710-64b-ipsec-ip4base-policy-aes256gcm-sw-{test_type}-tsa"
+  data: "vpp-3n-alt-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1Tnlsw-Ip4Base-Policy-Aes256Gcm-ndrpdr.64B-.t.c-ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec40Tnlsw-Ip4Base-Policy-Aes256Gcm-ndrpdr.64B-.t.c-ethip4ipsec40tnlsw-ip4base-policy-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-Ip4Base-Policy-Aes256Gcm-ndrpdr.64B-.t.c-ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-ndrpdr"
+  layout:
+    title: "3n-alt-xl710-64b-ipsec-ip4base-policy-aes256gcm-sw-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 3n-alt-xl710-64b-ip4-base-scale-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-alt-xl710-64b-ip4-base-scale-{test_type}-tsa"
+  data: "vpp-3n-alt-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4-Ip4Base-ndrpdr.64B-.t.c-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4-Ip4Scale20K-ndrpdr.64B-.t.c-ethip4-ip4scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4-Ip4Scale200K-ndrpdr.64B-.t.c-ethip4-ip4scale200k-ndrpdr"
+  layout:
+    title: "3n-alt-xl710-64b-ip4-base-scale-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 3n-alt-xl710-64b-ip4-feature-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-alt-xl710-64b-ip4-feature-{test_type}-tsa"
+  data: "vpp-3n-alt-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4-Ip4Base-Iacldstbase-ndrpdr.64B-.t.c-ethip4-ip4base-iacldstbase-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-ndrpdr.64B-.t.c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-ndrpdr.64B-.t.c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-ndrpdr.64B-.t.c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-ndrpdr.64B-.t.c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
+  layout:
+    title: "3n-alt-xl710-64b-ip4-feature-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 3n-alt-xl710-64b-ip4-tunnels-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-alt-xl710-64b-ip4-tunnels-{test_type}-tsa"
+  data: "vpp-3n-alt-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.Ip4 Tunnels.40Ge2P1Xl710-Ethip4Vxlan-L2Xcbase-ndrpdr.64B-.t.c-ethip4vxlan-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.40Ge2P1Xl710-Ethip4Vxlan-L2Bdbasemaclrn-ndrpdr.64B-.t.c-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
+  layout:
+    title: "3n-alt-xl710-64b-ip4-tunnels-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 3n-alt-xl710-78b-ip6-base-scale-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-alt-xl710-78b-ip6-base-scale-{test_type}-tsa"
+  data: "vpp-3n-alt-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Ethip6-Ip6Base-ndrpdr.78B-.t.c-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Ethip6-Ip6Scale20K-ndrpdr.78B-.t.c-ethip6-ip6scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Ethip6-Ip6Scale200K-ndrpdr.78B-.t.c-ethip6-ip6scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Ethip6-Ip6Base-Iacldstbase-ndrpdr.78B-.t.c-ethip6-ip6base-iacldstbase-ndrpdr"
+  layout:
+    title: "3n-alt-xl710-78b-ip6-base-scale-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 3n-alt-xl710-64b-l2-base-scale-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-alt-xl710-64b-l2-base-scale-{test_type}-tsa"
+  data: "vpp-3n-alt-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Dot1Q-L2Bdbasemaclrn-ndrpdr.64B-.t.c-dot1q-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Xcbase-ndrpdr.64B-.t.c-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Patch-ndrpdr.64B-.t.c-eth-l2patch-ndrpdr"
+    - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Bdbasemaclrn-ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Bdscale10Kmaclrn-ndrpdr.64B-.t.c-eth-l2bdscale10kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Bdscale100Kmaclrn-ndrpdr.64B-.t.c-eth-l2bdscale100kmaclrn-ndrpdr"
+  layout:
+    title: "3n-alt-xl710-64b-l2-base-scale-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 3n-alt-xl710-64b-l2-feature-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-alt-xl710-64b-l2-feature-{test_type}-tsa"
+  data: "vpp-3n-alt-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Macip-Iacl50Sl-10Kflows-ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Iacl50Sf-10Kflows-ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Iacl50Sl-10Kflows-ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Oacl50Sf-10Kflows-ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Oacl50Sl-10Kflows-ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr"
+  layout:
+    title: "3n-alt-xl710-64b-l2-feature-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 3n-alt-xl710-64b-vhost-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-alt-xl710-64b-vhost-{test_type}-tsa"
+  data: "vpp-3n-alt-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-ndrpdr.64B-.t.c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Vppip4-ndrpdr.64B-.t.c-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr"
+  layout:
+    title: "3n-alt-xl710-64b-vhost-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
 - type: "plot"
   title: "Speedup: 2n-dnv-x553-64b-ip4routing-base-scale-ixgbe-{test_type}-tsa"
   algorithm: "plot_tsa_name"
@@ -10024,41 +12350,9 @@
   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"
-#  title: "DPDK Throughput: 2n-dnv-x553-64b-{core}-base-{test_type}"
-#  algorithm: "plot_ndrpdr_box_name"
-#  output-file: "{DIR[STATIC,DPDK]}/2n-dnv-x553-64b-{core}-base-{test_type}"
-#  data: "plot-dpdk-throughput-latency-2n-dnv"
-#  core: ["1t1c", "2t2c"]
-#  test-type: ["ndr", "pdr"]
-#  include:
-#    - "tests.dpdk.perf.2N1L-10Ge2P1X553-eth-l2xcbase-testpmd-ndrpdr.64b-{core}-eth-l2xcbase-testpmd-ndrpdr"
-#    - "tests.dpdk.perf.2N1L-10Ge2P1X553-ethip4-ip4base-l3fwd-ndrpdr.64b-{core}-ethip4-ip4base-l3fwd-ndrpdr"
-#  layout:
-#    title: "2n-dnv-x553-64b-{core}-base-{test_type}"
-#    layout: "plot-throughput"
-#
-## 3n-dnv-x553
-#
-#- type: "plot"
-#  title: "DPDK Throughput: 3n-dnv-x553-64b-{core}-base-{test_type}"
-#  algorithm: "plot_ndrpdr_box_name"
-#  output-file: "{DIR[STATIC,DPDK]}/3n-dnv-x553-64b-{core}-base-{test_type}"
-#  data: "plot-dpdk-throughput-latency-3n-dnv"
-#  core: ["1t1c", "2t2c"]
-#  test-type: ["ndr", "pdr"]
-#  include:
-#    - "tests.dpdk.perf.10Ge2P1X553-eth-l2xcbase-testpmd-ndrpdr.64b-{core}-eth-l2xcbase-testpmd-ndrpdr"
-#    - "tests.dpdk.perf.10Ge2P1X553-ethip4-ip4base-l3fwd-ndrpdr.64b-{core}-ethip4-ip4base-l3fwd-ndrpdr"
-#  layout:
-#    title: "3n-dnv-x553-64b-{core}-base-{test_type}"
-#    layout: "plot-throughput"
+  layout:
+    title: "3n-skx-x710-64b-base-{test_type}-tsa"
+    layout: "plot-throughput-speedup-analysis"
 
 # 3n-tsh-x520
 
@@ -10087,6 +12381,33 @@
     title: "3n-tsh-x520-64b-base-{test_type}-tsa"
     layout: "plot-throughput-speedup-analysis"
 
+# 3n-alt-xl710
+
+- type: "plot"
+  title: "DPDK Throughput: 3n-alt-xl710-64b-{core}-base-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,DPDK]}/3n-alt-xl710-64b-{core}-base-{test_type}"
+  data: "dpdk-3n-alt-curr-iter"
+  core: ["1t1c", "2t2c"]
+  include:
+    - "tests.dpdk.perf.40ge2p1xl710-eth-l2xcbase-testpmd-ndrpdr.64b-{core}-eth-l2xcbase-testpmd-ndrpdr"
+    - "tests.dpdk.perf.40ge2p1xl710-ethip4-ip4base-l3fwd-ndrpdr.64b-{core}-ethip4-ip4base-l3fwd-ndrpdr"
+  layout:
+    title: "3n-alt-xl710-64b-{core}-base-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Speedup: 3n-alt-xl710-64b-base-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,DPDK]}/3n-alt-xl710-64b-base-{test_type}-tsa"
+  data: "dpdk-3n-alt-curr-iter"
+  include:
+    - "tests.dpdk.perf.40ge2p1xl710-eth-l2xcbase-testpmd-ndrpdr.64b-.t.c-eth-l2xcbase-testpmd-ndrpdr"
+    - "tests.dpdk.perf.40ge2p1xl710-ethip4-ip4base-l3fwd-ndrpdr.64b-.t.c-ethip4-ip4base-l3fwd-ndrpdr"
+  layout:
+    title: "3n-alt-xl710-64b-base-{test_type}-tsa"
+    layout: "plot-throughput-speedup-analysis"
+
 # 2n-tx2-xl710
 
 - type: "plot"
@@ -10335,15 +12656,13 @@
   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-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-H1024-P63-S64512-Tput-Ndrpdr.100B-{core}-avf-ethip4tcp-nat44ed-h1024-p63-s64512-tput-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-Nat44Ed-H4096-P63-S258048-Tput-Ndrpdr.64B-{core}-avf-ethip4tcp-nat44ed-h4096-p63-s258048-tput-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-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-H16384-P63-S1032192-Tput-Ndrpdr.100B-{core}-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-tput-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-Nat44Ed-H65536-P63-S4128768-Tput-Ndrpdr.64B-{core}-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H65536-P63-S4128768-Tput-Ndrpdr.100B-{core}-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-tput-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-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"
@@ -10356,15 +12675,13 @@
   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-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-H1024-P63-S64512-Tput-Ndrpdr.100B-{core}-avf-ethip4udp-nat44ed-h1024-p63-s64512-tput-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-Nat44Ed-H4096-P63-S258048-Tput-Ndrpdr.64B-{core}-avf-ethip4udp-nat44ed-h4096-p63-s258048-tput-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-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-H16384-P63-S1032192-Tput-Ndrpdr.100B-{core}-avf-ethip4udp-nat44ed-h16384-p63-s1032192-tput-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-Nat44Ed-H65536-P63-S4128768-Tput-Ndrpdr.64B-{core}-avf-ethip4udp-nat44ed-h65536-p63-s4128768-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H65536-P63-S4128768-Tput-Ndrpdr.100B-{core}-avf-ethip4udp-nat44ed-h65536-p63-s4128768-tput-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-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"
@@ -10662,6 +12979,134 @@
     title: "2n-clx-cx556a-64b-{core}-rdma-l2-vhost-base-{test_type}"
     layout: "plot-throughput"
 
+- type: "plot"
+  title: "Throughput: 2n-clx-e810cq-64b-{core}-memif-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-e810cq-64b-{core}-memif-{test_type}"
+  data: "vpp-2n-clx-curr-iter"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Xcbase-Eth-2Memif-1Dcr-ndrpdr.64B-{core}-avf-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1E810Cq-Avf-Ethip4-Ip4Base-Eth-2Memif-1Dcr-ndrpdr.64B-{core}-avf-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1E810Cq-Eth-L2Xcbase-Eth-2Memif-1Dcr-ndrpdr.64B-{core}-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1E810Cq-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-ndrpdr.64B-{core}-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1E810Cq-Ethip4-Ip4Base-Eth-2Memif-1Dcr-ndrpdr.64B-{core}-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
+  layout:
+    title: "2n-clx-e810cq-64b-{core}-memif-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 2n-clx-e810cq-64b-{core}-ip4-base-scale-avf-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-e810cq-64b-{core}-ip4-base-scale-avf-{test_type}"
+  data: "vpp-2n-clx-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-Ip4Scale20K-Rnd-ndrpdr.64B-{core}-avf-ethip4-ip4scale20k-rnd-ndrpdr"
+  layout:
+    title: "2n-clx-e810cq-64b-{core}-ip4-base-scale-avf-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 2n-clx-e810cq-64b-{core}-ip4-base-scale-dpdk-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-e810cq-64b-{core}-ip4-base-scale-dpdk-{test_type}"
+  data: "vpp-2n-clx-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-Ip4Scale20K-Rnd-ndrpdr.64B-{core}-ethip4-ip4scale20k-rnd-ndrpdr"
+  layout:
+    title: "2n-clx-e810cq-64b-{core}-ip4-base-scale-dpdk-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 2n-clx-e810cq-64b-{core}-ip4-features-avf-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-e810cq-64b-{core}-ip4-features-avf-{test_type}"
+  data: "vpp-2n-clx-curr-iter"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-ndrpdr.64B-{core}-avf-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-ndrpdr.64B-{core}-avf-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-ndrpdr.64B-{core}-avf-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-ndrpdr.64B-{core}-avf-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
+  layout:
+    title: "2n-clx-e810cq-64b-{core}-ip4-features-avf-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 2n-clx-e810cq-78b-{core}-ip6-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-e810cq-78b-{core}-ip6-{test_type}"
+  data: "vpp-2n-clx-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-Ip6Scale20K-Rnd-ndrpdr.78B-{core}-avf-ethip6-ip6scale20k-rnd-ndrpdr"
+    - "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-Ip6Scale20K-Rnd-ndrpdr.78B-{core}-ethip6-ip6scale20k-rnd-ndrpdr"
+  layout:
+    title: "2n-clx-e810cq-78b-{core}-ip6-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 2n-clx-e810cq-64b-{core}-l2-avf-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-e810cq-64b-{core}-l2-avf-{test_type}"
+  data: "vpp-2n-clx-curr-iter"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Dot1Q-L2Bdbasemaclrn-ndrpdr.64B-{core}-avf-dot1q-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Patch-ndrpdr.64B-{core}-avf-eth-l2patch-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Xcbase-ndrpdr.64B-{core}-avf-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Bdbasemaclrn-ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Bdscale10Kmaclrn-ndrpdr.64B-{core}-avf-eth-l2bdscale10kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Bdscale100Kmaclrn-ndrpdr.64B-{core}-avf-eth-l2bdscale100kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Bdscale1Mmaclrn-ndrpdr.64B-{core}-avf-eth-l2bdscale1mmaclrn-ndrpdr"
+  layout:
+    title: "2n-clx-e810cq-64b-{core}-l2-avf-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 2n-clx-e810cq-64b-{core}-l2-dpdk-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-e810cq-64b-{core}-l2-dpdk-{test_type}"
+  data: "vpp-2n-clx-curr-iter"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Dot1Q-L2Bdbasemaclrn-ndrpdr.64B-{core}-dot1q-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Eth-L2Patch-ndrpdr.64B-{core}-eth-l2patch-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Eth-L2Xcbase-ndrpdr.64B-{core}-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Eth-L2Bdbasemaclrn-ndrpdr.64B-{core}-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Eth-L2Bdscale10Kmaclrn-ndrpdr.64B-{core}-eth-l2bdscale10kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Eth-L2Bdscale100Kmaclrn-ndrpdr.64B-{core}-eth-l2bdscale100kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Eth-L2Bdscale1Mmaclrn-ndrpdr.64B-{core}-eth-l2bdscale1mmaclrn-ndrpdr"
+  layout:
+    title: "2n-clx-e810cq-64b-{core}-l2-dpdk-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 2n-clx-e810cq-64b-{core}-vhost-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-e810cq-64b-{core}-vhost-{test_type}"
+  data: "vpp-2n-clx-curr-iter"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1E810Cq-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-ndrpdr.64B-{core}-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1E810Cq-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-ndrpdr.64B-{core}-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+  layout:
+    title: "2n-clx-e810cq-64b-{core}-vhost-{test_type}"
+    layout: "plot-throughput"
+
 ################################################################################
 
 # Packet Speedup
@@ -10868,15 +13313,13 @@
   data: "vpp-2n-clx-curr-iter"
   include:
     - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-Ethip4Tcp-nat44ed-h1024-p63-s64512-pps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H1024-P63-S64512-Tput-Ndrpdr.64B-.t.c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H1024-P63-S64512-Tput-Ndrpdr.100B-.t.c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-tput-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-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-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-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-H16384-P63-S1032192-Tput-Ndrpdr.100B-.t.c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-tput-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-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-H65536-P63-S4128768-Tput-Ndrpdr.100B-.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"
@@ -10888,15 +13331,13 @@
   data: "vpp-2n-clx-curr-iter"
   include:
     - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-Ethip4Udp-nat44ed-h1024-p63-s64512-pps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H1024-P63-S64512-Tput-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44ed-h1024-p63-s64512-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H1024-P63-S64512-Tput-Ndrpdr.100B-.t.c-avf-ethip4udp-nat44ed-h1024-p63-s64512-tput-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-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-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-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-H16384-P63-S1032192-Tput-Ndrpdr.100B-.t.c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-tput-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-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-H65536-P63-S4128768-Tput-Ndrpdr.100B-.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"
@@ -11176,556 +13617,742 @@
     title: "2n-clx-cx556a-64b-rdma-l2-vhost-base-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
+- type: "plot"
+  title: "Speedup: 2n-clx-e810cq-64b-memif-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-e810cq-64b-memif-{test_type}-tsa"
+  data: "vpp-2n-clx-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Xcbase-Eth-2Memif-1Dcr-ndrpdr.64B-.t.c-avf-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-ndrpdr.64B-.t.c-avf-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1E810Cq-Avf-Ethip4-Ip4Base-Eth-2Memif-1Dcr-ndrpdr.64B-.t.c-avf-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1E810Cq-Eth-L2Xcbase-Eth-2Memif-1Dcr-ndrpdr.64B-.t.c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1E810Cq-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1E810Cq-Ethip4-Ip4Base-Eth-2Memif-1Dcr-ndrpdr.64B-.t.c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
+  layout:
+    title: "2n-clx-e810cq-64b-memif-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 2n-clx-e810cq-64b-ip4-base-scale-avf-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-e810cq-64b-ip4-base-scale-avf-{test_type}-tsa"
+  data: "vpp-2n-clx-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4-Ip4Base-ndrpdr.64B-.t.c-avf-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4-Ip4Scale20K-ndrpdr.64B-.t.c-avf-ethip4-ip4scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4-Ip4Scale20K-Rnd-ndrpdr.64B-.t.c-avf-ethip4-ip4scale20k-rnd-ndrpdr"
+  layout:
+    title: "2n-clx-e810cq-64b-ip4-base-scale-avf-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 2n-clx-e810cq-64b-ip4-base-scale-dpdk-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-e810cq-64b-ip4-base-scale-dpdk-{test_type}-tsa"
+  data: "vpp-2n-clx-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Ethip4-Ip4Base-ndrpdr.64B-.t.c-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Ethip4-Ip4Scale20K-ndrpdr.64B-.t.c-ethip4-ip4scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Ethip4-Ip4Scale20K-Rnd-ndrpdr.64B-.t.c-ethip4-ip4scale20k-rnd-ndrpdr"
+  layout:
+    title: "2n-clx-e810cq-64b-ip4-base-scale-dpdk-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 2n-clx-e810cq-64b-ip4-features-avf-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-e810cq-64b-ip4-features-avf-{test_type}-tsa"
+  data: "vpp-2n-clx-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
+  layout:
+    title: "2n-clx-e810cq-64b-ip4-features-avf-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 2n-clx-e810cq-78b-ip6-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-e810cq-78b-ip6-{test_type}-tsa"
+  data: "vpp-2n-clx-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Avf-Ethip6-Ip6Base-ndrpdr.78B-.t.c-avf-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Avf-Ethip6-Ip6Scale20K-ndrpdr.78B-.t.c-avf-ethip6-ip6scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Avf-Ethip6-Ip6Scale20K-Rnd-ndrpdr.78B-.t.c-avf-ethip6-ip6scale20k-rnd-ndrpdr"
+    - "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-Ip6Scale20K-Rnd-ndrpdr.78B-.t.c-ethip6-ip6scale20k-rnd-ndrpdr"
+  layout:
+    title: "2n-clx-e810cq-78b-ip6-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 2n-clx-e810cq-64b-l2-avf-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-e810cq-64b-l2-avf-{test_type}-tsa"
+  data: "vpp-2n-clx-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Dot1Q-L2Bdbasemaclrn-ndrpdr.64B-.t.c-avf-dot1q-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Patch-ndrpdr.64B-.t.c-avf-eth-l2patch-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Xcbase-ndrpdr.64B-.t.c-avf-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Bdbasemaclrn-ndrpdr.64B-.t.c-avf-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Bdscale10Kmaclrn-ndrpdr.64B-.t.c-avf-eth-l2bdscale10kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Bdscale100Kmaclrn-ndrpdr.64B-.t.c-avf-eth-l2bdscale100kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Bdscale1Mmaclrn-ndrpdr.64B-.t.c-avf-eth-l2bdscale1mmaclrn-ndrpdr"
+  layout:
+    title: "2n-clx-e810cq-64b-l2-avf-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 2n-clx-e810cq-64b-l2-dpdk-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-e810cq-64b-l2-dpdk-{test_type}-tsa"
+  data: "vpp-2n-clx-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Dot1Q-L2Bdbasemaclrn-ndrpdr.64B-.t.c-dot1q-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Eth-L2Patch-ndrpdr.64B-.t.c-eth-l2patch-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Eth-L2Xcbase-ndrpdr.64B-.t.c-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Eth-L2Bdbasemaclrn-ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Eth-L2Bdscale10Kmaclrn-ndrpdr.64B-.t.c-eth-l2bdscale10kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Eth-L2Bdscale100Kmaclrn-ndrpdr.64B-.t.c-eth-l2bdscale100kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Eth-L2Bdscale1Mmaclrn-ndrpdr.64B-.t.c-eth-l2bdscale1mmaclrn-ndrpdr"
+  layout:
+    title: "2n-clx-e810cq-64b-l2-dpdk-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 2n-clx-e810cq-64b-vhost-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-e810cq-64b-vhost-{test_type}-tsa"
+  data: "vpp-2n-clx-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-ndrpdr.64B-.t.c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1E810Cq-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-100Ge2P1E810Cq-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1E810Cq-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+  layout:
+    title: "2n-clx-e810cq-64b-vhost-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
 # 2n-icx
 
 - type: "plot"
-  title: "Throughput: 2n-icx-e810cq-64b-{core}-memif-base-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}-memif-base-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.Container Memif.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-{core}-avf-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
-    - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
-    - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1E810Cq-Avf-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Ndrpdr.64B-{core}-avf-ethip4-ip4base-eth-2memif-1dcr-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}-memif-base-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}-memif-base-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}-memif-base-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.Container Memif.2N1L-100Ge2P1E810Cq-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-{core}-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
-    - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1E810Cq-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-{core}-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
-    - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1E810Cq-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Ndrpdr.64B-{core}-ethip4-ip4base-eth-2memif-1dcr-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}-memif-base-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-64b-{core}-ip4routing-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-64b-{core}-ip4routing-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.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-Ip4Scale20K-Rnd-Ndrpdr.64B-{core}-avf-ethip4-ip4scale20k-rnd-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-Ip4Scale200K-Rnd-Ndrpdr.64B-{core}-avf-ethip4-ip4scale200k-rnd-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-{core}-avf-ethip4-ip4scale2m-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4-Ip4Scale2M-Rnd-Ndrpdr.64B-{core}-avf-ethip4-ip4scale2m-rnd-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-64b-{core}-ip4routing-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-64b-{core}-ip4routing-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-64b-{core}-ip4routing-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.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-Ip4Scale20K-Rnd-Ndrpdr.64B-{core}-ethip4-ip4scale20k-rnd-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Ethip4-Ip4Scale200K-Ndrpdr.64B-{core}-ethip4-ip4scale200k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Ethip4-Ip4Scale200K-Rnd-Ndrpdr.64B-{core}-ethip4-ip4scale200k-rnd-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Ethip4-Ip4Scale2M-Ndrpdr.64B-{core}-ethip4-ip4scale2m-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Ethip4-Ip4Scale2M-Rnd-Ndrpdr.64B-{core}-ethip4-ip4scale2m-rnd-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-64b-{core}-ip4routing-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}-features-ip4routing-base-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}-features-ip4routing-base-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.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-{core}-avf-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-{core}-avf-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-{core}-avf-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-{core}-avf-ethip4udp-ip4base-oacl50sl-10kflows-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}-features-ip4routing-base-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}-nat44det-ip4routing-stl-bidir-avf-{test_type}"
-#   algorithm: "plot_ndrpdr_box_name"
-#   output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-{core}-nat44det-ip4routing-stl-bidir-avf-{test_type}"
-#   data: "vpp-2n-icx-curr-iter"
-#   core: ["2t1c", ]
-#   include:
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Nat44Det-H1024-P63-S64512-Ndrpdr.64B-{core}-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Nat44Det-H16384-P63-S1032192-Ndrpdr.64B-{core}-avf-ethip4udp-nat44det-h16384-p63-s1032192-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Nat44Det-H65536-P63-S4128758-Ndrpdr.64B-{core}-avf-ethip4udp-nat44det-h65536-p63-s4128758-ndrpdr"
-#   layout:
-#     title: "2n-icx-e810cq-64b-{core}-nat44det-ip4routing-stl-bidir-avf-{test_type}"
-#     layout: "plot-throughput"
-#
-# - type: "plot"
-#   title: "Throughput: 2n-icx-e810cq-64b-{core}-nat44ed-ip4routing-stl-unidir-avf-{test_type}"
-#   algorithm: "plot_ndrpdr_box_name"
-#   output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-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-Ethip4Udp-Nat44Ed-H1024-P63-S64512-Udir-Ndrpdr.64B-{core}-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-ndrpdr"
-#   layout:
-#     title: "2n-icx-e810cq-64b-{core}-nat44ed-ip4routing-stl-unidir-avf-{test_type}"
-#     layout: "plot-throughput"
-#
-# - type: "plot"
-#   title: "Throughput: 2n-icx-e810cq-64b-{core}-nat44ed-ip4routing-udp-stf-cps-avf-{test_type}"
-#   algorithm: "plot_ndrpdr_box_name"
-#   output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-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-Avf-Ethip4Udp-Nat44Ed-H1024-P63-S64512-Cps-Ndrpdr.64B-{core}-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Ip4Base-H1024-P63-S64512-Cps-Ndrpdr.64B-{core}-avf-ethip4udp-ip4base-h1024-p63-s64512-cps-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Nat44Ed-H16384-P63-S1032192-Cps-Ndrpdr.64B-{core}-avf-ethip4udp-nat44ed-h16384-p63-s1032192-cps-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Ip4Base-H16384-P63-S1032192-Cps-Ndrpdr.64B-{core}-avf-ethip4udp-ip4base-h16384-p63-s1032192-cps-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Nat44Ed-H65536-P63-S4128768-Cps-Ndrpdr.64B-{core}-avf-ethip4udp-nat44ed-h65536-p63-s4128768-cps-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Ip4Base-H65536-P63-S4128768-Cps-Ndrpdr.64B-{core}-avf-ethip4udp-ip4base-h65536-p63-s4128768-cps-ndrpdr"
-#   layout:
-#     title: "2n-icx-e810cq-64b-{core}-nat44ed-ip4routing-udp-stf-cps-avf-{test_type}"
-#     layout: "plot-throughput"
-#
-# - type: "plot"
-#   title: "Throughput: 2n-icx-e810cq-64b-{core}-nat44ed-ip4routing-tcp-stf-cps-avf-{test_type}"
-#   algorithm: "plot_ndrpdr_box_name"
-#   output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-{core}-nat44ed-ip4routing-tcp-stf-cps-avf-{test_type}"
-#   data: "vpp-2n-icx-curr-iter"
-#   core: ["2t1c", ]
-#   include:
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Tcp-Nat44Ed-H1024-P63-S64512-Cps-Ndrpdr.64B-{core}-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Tcp-Ip4Base-H1024-P63-S64512-Cps-Ndrpdr.64B-{core}-avf-ethip4tcp-ip4base-h1024-p63-s64512-cps-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Tcp-Nat44Ed-H16384-P63-S1032192-Cps-Ndrpdr.64B-{core}-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Tcp-Ip4Base-H16384-P63-S1032192-Cps-Ndrpdr.64B-{core}-avf-ethip4tcp-ip4base-h16384-p63-s1032192-cps-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Tcp-Nat44Ed-H65536-P63-S4128768-Cps-Ndrpdr.64B-{core}-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Tcp-Ip4Base-H65536-P63-S4128768-Cps-Ndrpdr.64B-{core}-avf-ethip4tcp-ip4base-h65536-p63-s4128768-cps-ndrpdr"
-#   layout:
-#     title: "2n-icx-e810cq-64b-{core}-nat44ed-ip4routing-tcp-stf-cps-avf-{test_type}"
-#     layout: "plot-throughput"
-#
-# - type: "plot"
-#   title: "Throughput: 2n-icx-e810cq-64b-{core}-nat44ed-ip4routing-udp-tput-avf-{test_type}"
-#   algorithm: "plot_ndrpdr_box_name"
-#   output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-{core}-nat44ed-ip4routing-udp-tput-avf-{test_type}"
-#   data: "vpp-2n-icx-curr-iter"
-#   core: ["2t1c", ]
-#   include:
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Nat44Ed-H1024-P63-S64512-Tput-Ndrpdr.64B-{core}-avf-ethip4udp-nat44ed-h1024-p63-s64512-tput-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Nat44Ed-H16384-P63-S1032192-Tput-Ndrpdr.64B-{core}-avf-ethip4udp-nat44ed-h16384-p63-s1032192-tput-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Nat44Ed-H65536-P63-S4128768-Tput-Ndrpdr.64B-{core}-avf-ethip4udp-nat44ed-h65536-p63-s4128768-tput-ndrpdr"
-#   layout:
-#     title: "2n-icx-e810cq-64b-{core}-nat44ed-ip4routing-udp-tput-avf-{test_type}"
-#     layout: "plot-throughput"
-#
-# - type: "plot"
-#   title: "Throughput: 2n-icx-e810cq-64b-{core}-nat44ed-ip4routing-tcp-tput-avf-{test_type}"
-#   algorithm: "plot_ndrpdr_box_name"
-#   output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-{core}-nat44ed-ip4routing-tcp-tput-avf-{test_type}"
-#   data: "vpp-2n-icx-curr-iter"
-#   core: ["2t1c", ]
-#   include:
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Tcp-Nat44Ed-H1024-P63-S64512-Tput-Ndrpdr.64B-{core}-avf-ethip4tcp-nat44ed-h1024-p63-s64512-tput-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Tcp-Nat44Ed-H16384-P63-S1032192-Tput-Ndrpdr.64B-{core}-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-tput-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Tcp-Nat44Ed-H65536-P63-S4128768-Tput-Ndrpdr.64B-{core}-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-tput-ndrpdr"
-#   layout:
-#     title: "2n-icx-e810cq-64b-{core}-nat44ed-ip4routing-tcp-tput-avf-{test_type}"
-#     layout: "plot-throughput"
+- type: "plot"
+  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-xxv710-64b-{core}-nat44det-ip4routing-stl-bidir-avf-{test_type}"
+  data: "vpp-2n-icx-curr-iter"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Det-H1024-P63-S64512-ndrpdr.64B-{core}-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr"
+    - "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-xxv710-64b-{core}-nat44det-ip4routing-stl-bidir-avf-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  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-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H1024-P63-S64512-Udir-ndrpdr.64B-{core}-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-ndrpdr"
+  layout:
+    title: "2n-icx-xxv710-64b-{core}-nat44ed-ip4routing-stl-unidir-avf-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  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-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-xxv710-64b-{core}-nat44ed-ip4routing-udp-stf-cps-avf-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  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.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-xxv710-64b-{core}-nat44ed-ip4routing-tcp-stf-cps-avf-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  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.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H1024-P63-S64512-Tput-ndrpdr.100B-{core}-avf-ethip4udp-nat44ed-h1024-p63-s64512-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H16384-P63-S1032192-Tput-ndrpdr.100B-{core}-avf-ethip4udp-nat44ed-h16384-p63-s1032192-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H65536-P63-S4128768-Tput-ndrpdr.100B-{core}-avf-ethip4udp-nat44ed-h65536-p63-s4128768-tput-ndrpdr"
+  layout:
+    title: "2n-icx-xxv710-64b-{core}-nat44ed-ip4routing-udp-tput-avf-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  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.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H1024-P63-S64512-Tput-ndrpdr.100B-{core}-avf-ethip4tcp-nat44ed-h1024-p63-s64512-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H16384-P63-S1032192-Tput-ndrpdr.100B-{core}-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H65536-P63-S4128768-Tput-ndrpdr.100B-{core}-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-tput-ndrpdr"
+  layout:
+    title: "2n-icx-xxv710-64b-{core}-nat44ed-ip4routing-tcp-tput-avf-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  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.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-xxv710-64b-{core}-ethip4--ethip4udpgeneve-avf-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 2n-icx-xxv710-78b-{core}-ip6routing-base-scale-avf-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  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.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: "2n-icx-xxv710-78b-{core}-ip6routing-base-scale-avf-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 2n-icx-xxv710-78b-{core}-ip6routing-base-scale-dpdk-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  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.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: "2n-icx-xxv710-78b-{core}-ip6routing-base-scale-dpdk-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 2n-icx-xxv710-78b-{core}-ip6routing-base-scale-af_xdp-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  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.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: "2n-icx-xxv710-78b-{core}-ip6routing-base-scale-af_xdp-{test_type}"
+    layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 2n-icx-e810cq-64b-{core}-ethip4--ethip4udpgeneve-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]}/2n-icx-e810cq-64b-{core}-ethip4--ethip4udpgeneve-avf-{test_type}"
+  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.Ip4 Tunnels.2N1L-100Ge2P1E810Cq-Avf-Ethip4--Ethip4Udpgeneve-1Tun-Ip4Base-Ndrpdr.64B-{core}-avf-ethip4--ethip4udpgeneve-1tun-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-100Ge2P1E810Cq-Avf-Ethip4--Ethip4Udpgeneve-4Tun-Ip4Base-Ndrpdr.64B-{core}-avf-ethip4--ethip4udpgeneve-4tun-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-100Ge2P1E810Cq-Avf-Ethip4--Ethip4Udpgeneve-16Tun-Ip4Base-Ndrpdr.64B-{core}-avf-ethip4--ethip4udpgeneve-16tun-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-100Ge2P1E810Cq-Avf-Ethip4--Ethip4Udpgeneve-64Tun-Ip4Base-Ndrpdr.64B-{core}-avf-ethip4--ethip4udpgeneve-64tun-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-100Ge2P1E810Cq-Avf-Ethip4--Ethip4Udpgeneve-256Tun-Ip4Base-Ndrpdr.64B-{core}-avf-ethip4--ethip4udpgeneve-256tun-ip4base-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: "2n-icx-e810cq-64b-{core}-ethip4--ethip4udpgeneve-avf-{test_type}"
+    title: "2n-icx-xxv710-64b-{core}-l2switching-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}-l2switching-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}-l2switching-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-Ip6Scale20K-Rnd-Ndrpdr.78B-{core}-avf-ethip6-ip6scale20k-rnd-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-Ip6Scale200K-Rnd-Ndrpdr.78B-{core}-avf-ethip6-ip6scale200k-rnd-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Avf-Ethip6-Ip6Scale2M-Ndrpdr.78B-{core}-avf-ethip6-ip6scale2m-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Avf-Ethip6-Ip6Scale2M-Rnd-Ndrpdr.78B-{core}-avf-ethip6-ip6scale2m-rnd-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: "2n-icx-e810cq-78b-{core}-ip6routing-base-scale-avf-{test_type}"
+    title: "2n-icx-xxv710-64b-{core}-l2switching-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}-vhost-base-{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}-vhost-base-{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-Ip6Scale20K-Rnd-Ndrpdr.78B-{core}-ethip6-ip6scale20k-rnd-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Ethip6-Ip6Scale200K-Ndrpdr.78B-{core}-ethip6-ip6scale200k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Ethip6-Ip6Scale200K-Rnd-Ndrpdr.78B-{core}-ethip6-ip6scale200k-rnd-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Ethip6-Ip6Scale2M-Ndrpdr.78B-{core}-ethip6-ip6scale2m-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Ethip6-Ip6Scale2M-Rnd-Ndrpdr.78B-{core}-ethip6-ip6scale2m-rnd-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: "2n-icx-e810cq-78b-{core}-ip6routing-base-scale-dpdk-{test_type}"
+    title: "2n-icx-xxv710-64b-{core}-vhost-base-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 2n-icx-e810cq-64b-{core}-l2switching-base-scale-avf-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-{core}-l2switching-base-scale-avf-{test_type}"
+  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"
-  core: ["2t1c", ]
   include:
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-{core}-avf-dot1q-l2bdbasemaclrn-ndrpdr"
-    - "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.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: "2n-icx-e810cq-64b-{core}-l2switching-base-scale-avf-{test_type}"
-    layout: "plot-throughput"
+    title: "2n-icx-xxv710-64b-memif-base-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Throughput: 2n-icx-e810cq-64b-{core}-l2switching-base-scale-dpdk-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-{core}-l2switching-base-scale-dpdk-{test_type}"
+  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"
-  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-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: "2n-icx-e810cq-64b-{core}-l2switching-base-scale-dpdk-{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: 2n-icx-e810cq-64b-{core}-vhost-base-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-{core}-vhost-base-{test_type}"
+  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"
-  core: ["2t1c", ]
   include:
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1E810Cq-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+    - "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-e810cq-64b-{core}-vhost-base-{test_type}"
-    layout: "plot-throughput"
+    title: "2n-icx-xxv710-64b-ip4routing-base-scale-dpdk-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Throughput: 2n-icx-e810cq-64b-{core}-vhost-base-vpp-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-{core}-vhost-base-vpp-{test_type}"
+  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"
-  core: ["2t1c", ]
   include:
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1E810Cq-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+    - "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-e810cq-64b-{core}-vhost-base-vpp-{test_type}"
-    layout: "plot-throughput"
+    title: "2n-icx-xxv710-64b-ip4routing-base-scale-af_xdp-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 2n-icx-e810cq-64b-memif-base-avf-{test_type}-tsa"
+  title: "Speedup: 2n-icx-xxv710-64b-features-ip4routing-base-avf-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-memif-base-avf-{test_type}-tsa"
+  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.Container Memif.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-.t.c-avf-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
-    - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-.t.c-avf-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
-    - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1E810Cq-Avf-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Ndrpdr.64B-.t.c-avf-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
+    - "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-e810cq-64b-memif-base-avf-{test_type}"
+    title: "2n-icx-xxv710-64b-features-ip4routing-base-avf-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 2n-icx-e810cq-64b-memif-base-dpdk-{test_type}-tsa"
+  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-e810cq-64b-memif-base-dpdk-{test_type}-tsa"
+  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.Container Memif.2N1L-100Ge2P1E810Cq-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-.t.c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
-    - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1E810Cq-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
-    - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1E810Cq-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Ndrpdr.64B-.t.c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
+    - "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-e810cq-64b-memif-base-dpdk-{test_type}"
+    title: "2n-icx-xxv710-64b-nat44det-ip4routing-stl-bidir-avf-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 2n-icx-e810cq-64b-ip4routing-base-scale-avf-{test_type}-tsa"
+  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-e810cq-64b-ip4routing-base-scale-avf-{test_type}-tsa"
+  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-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-Ip4Scale20K-Rnd-Ndrpdr.64B-.t.c-avf-ethip4-ip4scale20k-rnd-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-Ip4Scale200K-Rnd-Ndrpdr.64B-.t.c-avf-ethip4-ip4scale200k-rnd-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-.t.c-avf-ethip4-ip4scale2m-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4-Ip4Scale2M-Rnd-Ndrpdr.64B-.t.c-avf-ethip4-ip4scale2m-rnd-ndrpdr"
+    - "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-e810cq-64b-ip4routing-base-scale-avf-{test_type}"
+    title: "2n-icx-xxv710-64b-nat44ed-ip4routing-stl-unidir-avf-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 2n-icx-e810cq-64b-features-ip4routing-base-avf-{test_type}-tsa"
+  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-e810cq-64b-features-ip4routing-base-avf-{test_type}-tsa"
+  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-100Ge2P1E810Cq-Avf-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-H1024-P63-S64512-Cps-ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-h1024-p63-s64512-cps-ndrpdr"
+    - "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-e810cq-64b-features-ip4routing-base-avf-{test_type}"
+    title: "2n-icx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 2n-icx-e810cq-64b-ip4routing-base-scale-dpdk-{test_type}-tsa"
+  title: "Speedup: 2n-icx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-ip4routing-base-scale-dpdk-{test_type}-tsa"
+  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-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-Ip4Scale20K-Rnd-Ndrpdr.64B-.t.c-ethip4-ip4scale20k-rnd-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Ethip4-Ip4Scale200K-Ndrpdr.64B-.t.c-ethip4-ip4scale200k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Ethip4-Ip4Scale200K-Rnd-Ndrpdr.64B-.t.c-ethip4-ip4scale200k-rnd-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Ethip4-Ip4Scale2M-Ndrpdr.64B-.t.c-ethip4-ip4scale2m-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Ethip4-Ip4Scale2M-Rnd-Ndrpdr.64B-.t.c-ethip4-ip4scale2m-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Ip4Base-H1024-P63-S64512-Cps-ndrpdr.64B-.t.c-avf-ethip4tcp-ip4base-h1024-p63-s64512-cps-ndrpdr"
+    - "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-e810cq-64b-ip4routing-base-scale-dpdk-{test_type}"
+    title: "2n-icx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
-# - type: "plot"
-#   title: "Speedup: 2n-icx-e810cq-64b-nat44det-ip4routing-stl-bidir-avf-{test_type}-tsa"
-#   algorithm: "plot_tsa_name"
-#   output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-nat44det-ip4routing-stl-bidir-avf-{test_type}-tsa"
-#   data: "vpp-2n-icx-curr-iter"
-#   include:
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Nat44Det-H1024-P63-S64512-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Nat44Det-H16384-P63-S1032192-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44det-h16384-p63-s1032192-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Nat44Det-H65536-P63-S4128758-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44det-h65536-p63-s4128758-ndrpdr"
-#   layout:
-#     title: "2n-icx-e810cq-64b-nat44det-ip4routing-stl-bidir-avf-{test_type}"
-#     layout: "plot-throughput-speedup-analysis"
-#
-# - type: "plot"
-#   title: "Speedup: 2n-icx-e810cq-64b-nat44ed-ip4routing-stl-unidir-avf-{test_type}-tsa"
-#   algorithm: "plot_tsa_name"
-#   output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-nat44ed-ip4routing-stl-unidir-avf-{test_type}-tsa"
-#   data: "vpp-2n-icx-curr-iter"
-#   include:
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Nat44Ed-H1024-P63-S64512-Udir-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-ndrpdr"
-#   layout:
-#     title: "2n-icx-e810cq-64b-nat44ed-ip4routing-stl-unidir-avf-{test_type}"
-#     layout: "plot-throughput-speedup-analysis"
-#
-# - type: "plot"
-#   title: "Speedup: 2n-icx-e810cq-64b-nat44ed-ip4routing-udp-stf-cps-avf-{test_type}-tsa"
-#   algorithm: "plot_tsa_name"
-#   output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-nat44ed-ip4routing-udp-stf-cps-avf-{test_type}-tsa"
-#   data: "vpp-2n-icx-curr-iter"
-#   include:
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Nat44Ed-H1024-P63-S64512-Cps-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Ip4Base-H1024-P63-S64512-Cps-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-h1024-p63-s64512-cps-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Nat44Ed-H16384-P63-S1032192-Cps-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-cps-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Ip4Base-H16384-P63-S1032192-Cps-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-h16384-p63-s1032192-cps-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Nat44Ed-H65536-P63-S4128768-Cps-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-cps-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Ip4Base-H65536-P63-S4128768-Cps-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-h65536-p63-s4128768-cps-ndrpdr"
-#   layout:
-#     title: "2n-icx-e810cq-64b-nat44ed-ip4routing-udp-stf-cps-avf-{test_type}"
-#     layout: "plot-throughput-speedup-analysis"
-#
-# - type: "plot"
-#   title: "Speedup: 2n-icx-e810cq-64b-nat44ed-ip4routing-tcp-stf-cps-avf-{test_type}-tsa"
-#   algorithm: "plot_tsa_name"
-#   output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-nat44ed-ip4routing-tcp-stf-cps-avf-{test_type}-tsa"
-#   data: "vpp-2n-icx-curr-iter"
-#   include:
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Tcp-Nat44Ed-H1024-P63-S64512-Cps-Ndrpdr.64B-.t.c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Tcp-Ip4Base-H1024-P63-S64512-Cps-Ndrpdr.64B-.t.c-avf-ethip4tcp-ip4base-h1024-p63-s64512-cps-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Tcp-Nat44Ed-H16384-P63-S1032192-Cps-Ndrpdr.64B-.t.c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Tcp-Ip4Base-H16384-P63-S1032192-Cps-Ndrpdr.64B-.t.c-avf-ethip4tcp-ip4base-h16384-p63-s1032192-cps-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Tcp-Nat44Ed-H65536-P63-S4128768-Cps-Ndrpdr.64B-.t.c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Tcp-Ip4Base-H65536-P63-S4128768-Cps-Ndrpdr.64B-.t.c-avf-ethip4tcp-ip4base-h65536-p63-s4128768-cps-ndrpdr"
-#   layout:
-#     title: "2n-icx-e810cq-64b-nat44ed-ip4routing-tcp-stf-cps-avf-{test_type}"
-#     layout: "plot-throughput-speedup-analysis"
-#
-# - type: "plot"
-#   title: "Speedup: 2n-icx-e810cq-64b-nat44ed-ip4routing-udp-tput-avf-{test_type}-tsa"
-#   algorithm: "plot_tsa_name"
-#   output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-nat44ed-ip4routing-udp-tput-avf-{test_type}-tsa"
-#   data: "vpp-2n-icx-curr-iter"
-#   include:
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Nat44Ed-H1024-P63-S64512-Tput-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44ed-h1024-p63-s64512-tput-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Nat44Ed-H16384-P63-S1032192-Tput-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-tput-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Nat44Ed-H65536-P63-S4128768-Tput-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-tput-ndrpdr"
-#   layout:
-#     title: "2n-icx-e810cq-64b-nat44ed-ip4routing-udp-tput-avf-{test_type}"
-#     layout: "plot-throughput-speedup-analysis"
-#
-# - type: "plot"
-#   title: "Speedup: 2n-icx-e810cq-64b-nat44ed-ip4routing-tcp-tput-avf-{test_type}-tsa"
-#   algorithm: "plot_tsa_name"
-#   output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-nat44ed-ip4routing-tcp-tput-avf-{test_type}-tsa"
-#   data: "vpp-2n-icx-curr-iter"
-#   include:
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Tcp-Nat44Ed-H1024-P63-S64512-Tput-Ndrpdr.64B-.t.c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-tput-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Tcp-Nat44Ed-H16384-P63-S1032192-Tput-Ndrpdr.64B-.t.c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-tput-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Tcp-Nat44Ed-H65536-P63-S4128768-Tput-Ndrpdr.64B-.t.c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-tput-ndrpdr"
-#   layout:
-#     title: "2n-icx-e810cq-64b-nat44ed-ip4routing-udp-tput-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.100B-.t.c-avf-ethip4udp-nat44ed-h1024-p63-s64512-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H16384-P63-S1032192-Tput-ndrpdr.100B-.t.c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H65536-P63-S4128768-Tput-ndrpdr.100B-.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.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H1024-P63-S64512-Tput-ndrpdr.100B-.t.c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H16384-P63-S1032192-Tput-ndrpdr.100B-.t.c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H65536-P63-S4128768-Tput-ndrpdr.100B-.t.c-avf-ethip4tcp-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-e810cq-64b-ethip4--ethip4udpgeneve-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]}/2n-icx-e810cq-64b-ethip4--ethip4udpgeneve-avf-{test_type}-tsa"
+  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.Ip4 Tunnels.2N1L-100Ge2P1E810Cq-Avf-Ethip4--Ethip4Udpgeneve-1Tun-Ip4Base-Ndrpdr.64B-.t.c-avf-ethip4--ethip4udpgeneve-1tun-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-100Ge2P1E810Cq-Avf-Ethip4--Ethip4Udpgeneve-4Tun-Ip4Base-Ndrpdr.64B-.t.c-avf-ethip4--ethip4udpgeneve-4tun-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-100Ge2P1E810Cq-Avf-Ethip4--Ethip4Udpgeneve-16Tun-Ip4Base-Ndrpdr.64B-.t.c-avf-ethip4--ethip4udpgeneve-16tun-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-100Ge2P1E810Cq-Avf-Ethip4--Ethip4Udpgeneve-64Tun-Ip4Base-Ndrpdr.64B-.t.c-avf-ethip4--ethip4udpgeneve-64tun-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-100Ge2P1E810Cq-Avf-Ethip4--Ethip4Udpgeneve-256Tun-Ip4Base-Ndrpdr.64B-.t.c-avf-ethip4--ethip4udpgeneve-256tun-ip4base-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: "2n-icx-e810cq-64b-ethip4--ethip4udpgeneve-avf-{test_type}"
+    title: "2n-icx-xxv710-64b-ethip4--ethip4udpgeneve-avf-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 2n-icx-e810cq-78b-ip6routing-base-scale-avf-{test_type}-tsa"
+  title: "Speedup: 2n-icx-xxv710-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"
+  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.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-Ip6Scale20K-Rnd-Ndrpdr.78B-.t.c-avf-ethip6-ip6scale20k-rnd-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-Ip6Scale200K-Rnd-Ndrpdr.78B-.t.c-avf-ethip6-ip6scale200k-rnd-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Avf-Ethip6-Ip6Scale2M-Ndrpdr.78B-.t.c-avf-ethip6-ip6scale2m-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Avf-Ethip6-Ip6Scale2M-Rnd-Ndrpdr.78B-.t.c-avf-ethip6-ip6scale2m-rnd-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: "2n-icx-e810cq-64b-ip6routing-base-scale-avf-{test_type}"
+    title: "2n-icx-xxv710-64b-ip6routing-base-scale-avf-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 2n-icx-e810cq-78b-ip6routing-base-scale-dpdk-{test_type}-tsa"
+  title: "Speedup: 2n-icx-xxv710-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"
+  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.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-Ip6Scale20K-Rnd-Ndrpdr.78B-.t.c-ethip6-ip6scale20k-rnd-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Ethip6-Ip6Scale200K-Ndrpdr.78B-.t.c-ethip6-ip6scale200k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Ethip6-Ip6Scale200K-Rnd-Ndrpdr.78B-.t.c-ethip6-ip6scale200k-rnd-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Ethip6-Ip6Scale2M-Ndrpdr.78B-.t.c-ethip6-ip6scale2m-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Ethip6-Ip6Scale2M-Rnd-Ndrpdr.78B-.t.c-ethip6-ip6scale2m-rnd-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-icx-e810cq-64b-ip6routing-base-scale-dpdk-{test_type}"
+    title: "2n-icx-xxv710-64b-ip6routing-base-scale-dpdk-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 2n-icx-e810cq-64b-l2switching-base-scale-avf-{test_type}-tsa"
+  title: "Speedup: 2n-icx-xxv710-78b-ip6routing-base-scale-af_xdp-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-l2switching-base-scale-avf-{test_type}-tsa"
+  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.L2.2N1L-100Ge2P1E810Cq-Avf-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-avf-dot1q-l2bdbasemaclrn-ndrpdr"
-    - "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.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-icx-e810cq-64b-l2switching-base-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: 2n-icx-e810cq-64b-l2switching-base-scale-dpdk-{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]}/2n-icx-e810cq-64b-l2switching-base-scale-dpdk-{test_type}-tsa"
+  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.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.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: "2n-icx-e810cq-64b-l2switching-base-scale-dpdk-{test_type}"
+    title: "2n-icx-xxv710-64b-l2switching-base-scale-avf-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 2n-icx-e810cq-64b-vhost-base-{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]}/2n-icx-e810cq-64b-vhost-base-{test_type}-tsa"
+  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.Vm Vhost.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1E810Cq-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-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: "2n-icx-e810cq-64b-vhost-base-{test_type}"
+    title: "2n-icx-xxv710-64b-l2switching-base-scale-dpdk-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 2n-icx-e810cq-64b-vhost-base-vpp-{test_type}-tsa"
+  title: "Speedup: 2n-icx-xxv710-64b-vhost-base-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-vhost-base-vpp-{test_type}-tsa"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-vhost-base-{test_type}-tsa"
   data: "vpp-2n-icx-curr-iter"
   include:
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1E810Cq-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-100Ge2P1E810Cq-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-100Ge2P1E810Cq-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-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: "2n-icx-e810cq-64b-vhost-base-vpp-{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: 2n-icx-xxv710-64b-base-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,DPDK]}/2n-icx-xxv710-64b-base-{test_type}-tsa"
+  data: "dpdk-2n-icx-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-icx-xxv710-64b-base-{test_type}-tsa"
+    layout: "plot-throughput-speedup-analysis"
+
+# 3n-icx
+
+- type: "plot"
+  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,DPDK]}/3n-icx-xxv710-64b-base-{test_type}-tsa"
+  data: "dpdk-3n-icx-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-icx-xxv710-64b-base-{test_type}-tsa"
+    layout: "plot-throughput-speedup-analysis"
+
 # 2n-clx
 
 - type: "plot"
@@ -12838,284 +15465,461 @@
 # 3n-icx Throughput
 
 - type: "plot"
-  title: "Throughput: 3n-icx-e810cq-imix-{core}-ipsec-ip4routing-base-scale-avf-{test_type}"
+  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-e810cq-imix-{core}-ipsec-ip4routing-base-scale-avf-{test_type}"
+  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.100Ge2P1E810Cq-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.imix-{core}-avf-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.imix-{core}-avf-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-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-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.imix-{core}-avf-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-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-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.imix-{core}-avf-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.imix-{core}-avf-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.imix-{core}-avf-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "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-e810cq-imix-{core}-ipsec-ip4routing-base-scale-avf-{test_type}"
+    title: "3n-icx-xxv710-imix-{core}-ipsec-scheduler-ip4routing-base-scale-sw-avf-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 3n-icx-e810cq-imix-{core}-ipsec-ip4routing-base-scale-dpdk-{test_type}"
+  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-e810cq-imix-{core}-ipsec-ip4routing-base-scale-dpdk-{test_type}"
+  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.100Ge2P1E810Cq-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.imix-{core}-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.imix-{core}-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.imix-{core}-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "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-e810cq-imix-{core}-ipsec-ip4routing-base-scale-dpdk-{test_type}"
+    title: "3n-icx-xxv710-imix-{core}-ipsec-ip4routing-base-scale-sw-dpdk-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 3n-icx-e810cq-1518b-{core}-ipsec-ip4routing-base-scale-avf-{test_type}"
+  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-e810cq-1518b-{core}-ipsec-ip4routing-base-scale-avf-{test_type}"
+  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.100Ge2P1E810Cq-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518B-{core}-avf-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.1518B-{core}-avf-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-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-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.1518B-{core}-avf-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-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-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.1518B-{core}-avf-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518B-{core}-avf-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.1518B-{core}-avf-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "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-e810cq-1518b-{core}-ipsec-ip4routing-base-scale-avf-{test_type}"
+    title: "3n-icx-xxv710-imix-{core}-ipsec-scheduler-ip4routing-base-scale-sw-dpdk-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 3n-icx-e810cq-1518b-{core}-ipsec-ip4routing-base-scale-dpdk-{test_type}"
+  title: "Throughput: 3n-icx-xxv710-64b-{core}-ip4routing-base-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-1518b-{core}-ipsec-ip4routing-base-scale-dpdk-{test_type}"
+  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.Crypto.100Ge2P1E810Cq-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518B-{core}-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518B-{core}-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518B-{core}-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "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-e810cq-1518b-{core}-ipsec-ip4routing-base-scale-dpdk-{test_type}"
+    title: "3n-icx-xxv710-64b-{core}-ip4routing-base-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 3n-icx-e810cq-64b-{core}-ip4routing-base-{test_type}"
+  title: "Throughput: 3n-icx-xxv710-64b-{core}-ip4tunnel-base-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-64b-{core}-ip4routing-base-{test_type}"
+  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.100Ge2P1E810Cq-Avf-Ethip4-Ip4Base-Ndrpdr.64B-{core}-avf-ethip4-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.100Ge2P1E810Cq-Ethip4-Ip4Base-Ndrpdr.64B-{core}-ethip4-ip4base-ndrpdr"
+    - "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: "3n-icx-e810cq-64b-{core}-ip4routing-base-{test_type}"
+    title: "3n-icx-xxv710-64b-{core}-ip4tunnel-base-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 3n-icx-e810cq-64b-{core}-ip4tunnel-base-[avf,dpdk]-{test_type}"
+  title: "Throughput: 3n-icx-e810xxv-64b-{core}-ip4tunnel-gtpu-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-64b-{core}-ip4tunnel-base-{test_type}"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810xxv-64b-{core}-ip4tunnel-gtpu-{test_type}"
   data: "vpp-3n-icx-curr-iter"
   core: ["2t1c", ]
   include:
-    - "Tests.Vpp.Perf.Ip4 Tunnels.100Ge2P1E810Cq-Avf-Ethip4Vxlan-L2Xcbase-Ndrpdr.64B-{core}-avf-ethip4vxlan-l2xcbase-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.100Ge2P1E810Cq-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Ndrpdr.64B-{core}-avf-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.100Ge2P1E810Cq-Avf-Ethip4Gtpusw-Ip4Base-Ndrpdr.64B-{core}-avf-ethip4gtpusw-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.100Ge2P1E810Cq-Ethip4Vxlan-L2Xcbase-Ndrpdr.64B-{core}-ethip4vxlan-l2xcbase-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.100Ge2P1E810Cq-Ethip4Vxlan-L2Bdbasemaclrn-Ndrpdr.64B-{core}-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.100Ge2P1E810Cq-Ethip4Gtpusw-Ip4Base-Ndrpdr.64B-{core}-ethip4gtpusw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1E810Xxv-Ethip4Gtpuhw-Ip4Base-Ndrpdr.64B-{core}-ethip4gtpuhw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1E810Xxv-Ethip4Gtpusw-Ip4Base-Ndrpdr.64B-{core}-ethip4gtpusw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1E810Xxv-Ethip4Udpwireguard1Tnlsw-Ip4Base-Ndrpdr.64B-{core}-ethip4udpwireguard1tnlsw-ip4base-ndrpdr"
   layout:
-    title: "3n-icx-e810cq-64b-{core}-ip4tunnel-base-[avf,dpdk]-{test_type}"
+    title: "3n-icx-e810xxv-64b-{core}-ip4tunnel-gtpu-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 3n-icx-e810cq-78b-{core}-ip6routing-base-{test_type}"
+  title: "Throughput: 3n-icx-xxv710-78b-{core}-ip6routing-base-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-78b-{core}-ip6routing-base-{test_type}"
+  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.100Ge2P1E810Cq-Avf-Ethip6-Ip6Base-Ndrpdr.78B-{core}-avf-ethip6-ip6base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.100Ge2P1E810Cq-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-Ethip6-Ip6Base-ndrpdr.78B-{core}-ethip6-ip6base-ndrpdr"
   layout:
-    title: "3n-icx-e810cq-78b-{core}-ip6routing-base-{test_type}"
+    title: "3n-icx-xxv710-78b-{core}-ip6routing-base-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 3n-icx-e810cq-64b-{core}-l2switching-base-[avf,dpdk]-{test_type}"
+  title: "Throughput: 3n-icx-xxv710-64b-{core}-l2switching-base-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-64b-{core}-l2switching-base-{test_type}"
+  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.100Ge2P1E810Cq-Avf-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-{core}-avf-dot1q-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.100Ge2P1E810Cq-Avf-Eth-L2Patch-Ndrpdr.64B-{core}-avf-eth-l2patch-ndrpdr"
-    - "Tests.Vpp.Perf.L2.100Ge2P1E810Cq-Avf-Eth-L2Xcbase-Ndrpdr.64B-{core}-avf-eth-l2xcbase-ndrpdr"
-    - "Tests.Vpp.Perf.L2.100Ge2P1E810Cq-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.100Ge2P1E810Cq-Eth-L2Patch-Ndrpdr.64B-{core}-eth-l2patch-ndrpdr"
-    - "Tests.Vpp.Perf.L2.100Ge2P1E810Cq-Eth-L2Xcbase-Ndrpdr.64B-{core}-eth-l2xcbase-ndrpdr"
-    - "Tests.Vpp.Perf.L2.100Ge2P1E810Cq-Eth-L2Bdbasemaclrn-Ndrpdr.64B-{core}-eth-l2bdbasemaclrn-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: "3n-icx-e810cq-64b-{core}-l2switching-base-[avf,dpdk]-{test_type}"
+    title: "3n-icx-xxv710-64b-{core}-l2switching-base-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 3n-icx-e810cq-78b-{core}-srv6-ip6routing-base-avf-{test_type}"
+  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-e810cq-78b-{core}-srv6-ip6routing-base-avf-{test_type}"
+  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.Srv6.100Ge2P1E810Cq-Avf-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-Ndrpdr.78B-{core}-avf-ethip6ip6-ip6base-srv6enc1sid-ndrpdr"
-    - "Tests.Vpp.Perf.Srv6.100Ge2P1E810Cq-Avf-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Ndrpdr.78B-{core}-avf-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr"
-    - "Tests.Vpp.Perf.Srv6.100Ge2P1E810Cq-Avf-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Nodecaps-Ndrpdr.78B-{core}-avf-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr"
-    - "Tests.Vpp.Perf.Srv6.100Ge2P1E810Cq-Avf-Ethip6Srhip6-Ip6Base-Srv6Proxy-Dyn-Ndrpdr.78B-{core}-avf-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr"
-    - "Tests.Vpp.Perf.Srv6.100Ge2P1E810Cq-Avf-Ethip6Srhip6-Ip6Base-Srv6Proxy-Masq-Ndrpdr.78B-{core}-avf-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr"
-    - "Tests.Vpp.Perf.Srv6.100Ge2P1E810Cq-Avf-Ethip6Srhip6-Ip6Base-Srv6Proxy-Stat-Ndrpdr.78B-{core}-avf-ethip6srhip6-ip6base-srv6proxy-stat-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: "3n-icx-e810cq-78b-{core}-srv6-ip6routing-base-avf-{test_type}"
+    title: "3n-icx-xxv710-78b-{core}-srv6-ip6routing-base-avf-{test_type}"
     layout: "plot-throughput"
 
 # 3n-icx Speedup
 
 - type: "plot"
-  title: "Speedup: 3n-icx-e810cq-imix-ipsec-ip4routing-base-scale-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]}/3n-icx-xxv710-1518b-ipsec-aes128cbc-ip4routing-base-scale-sw-avf-{test_type}-tsa"
+  data: "vpp-3n-icx-curr-iter"
+  include:
+    - "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: "3n-icx-xxv710-1518b-ipsec-aes128cbc-ip4routing-base-scale-sw-avf-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  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]}/3n-icx-xxv710-1518b-ipsec-aes256gcm-ip4routing-base-scale-sw-avf-{test_type}-tsa"
+  data: "vpp-3n-icx-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-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: "3n-icx-xxv710-1518b-ipsec-aes256gcm-ip4routing-base-scale-sw-avf-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  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]}/3n-icx-xxv710-1518b-ipsec-scheduler-ip4routing-base-scale-sw-avf-{test_type}-tsa"
+  data: "vpp-3n-icx-curr-iter"
+  include:
+    - "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: "3n-icx-xxv710-1518b-ipsec-scheduler-ip4routing-base-scale-sw-avf-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 3n-icx-xxv710-1518b-ipsec-ip4routing-base-scale-sw-dpdk-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  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.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: "3n-icx-xxv710-1518b-ipsec-ip4routing-base-scale-sw-dpdk-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  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]}/3n-icx-xxv710-1518b-ipsec-scheduler-ip4routing-base-scale-sw-dpdk-{test_type}-tsa"
+  data: "vpp-3n-icx-curr-iter"
+  include:
+    - "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: "3n-icx-xxv710-1518b-ipsec-scheduler-ip4routing-base-scale-sw-dpdk-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  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]}/3n-icx-xxv710-imix-ipsec-aes128cbc-ip4routing-base-scale-sw-avf-{test_type}-tsa"
+  data: "vpp-3n-icx-curr-iter"
+  include:
+    - "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: "3n-icx-xxv710-imix-ipsec-aes128cbc-ip4routing-base-scale-sw-avf-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  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]}/3n-icx-xxv710-imix-ipsec-aes256gcm-ip4routing-base-scale-sw-avf-{test_type}-tsa"
+  data: "vpp-3n-icx-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.imix-.t.c-avf-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-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: "3n-icx-xxv710-imix-ipsec-aes256gcm-ip4routing-base-scale-sw-avf-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  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]}/3n-icx-e810cq-imix-ipsec-ip4routing-base-scale-avf-{test_type}-tsa"
+  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.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.imix-.t.c-avf-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.imix-.t.c-avf-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-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-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.imix-.t.c-avf-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-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-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.imix-.t.c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.imix-.t.c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.imix-.t.c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-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: "3n-icx-e810cq-imix-ipsec-ip4routing-base-scale-avf-{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: 3n-icx-e810cq-imix-ipsec-ip4routing-base-scale-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]}/3n-icx-e810cq-imix-ipsec-ip4routing-base-scale-dpdk-{test_type}-tsa"
+  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.Crypto.100Ge2P1E810Cq-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.imix-.t.c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.imix-.t.c-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.imix-.t.c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-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: "3n-icx-e810cq-imix-ipsec-ip4routing-base-scale-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: 3n-icx-e810cq-1518b-ipsec-ip4routing-base-scale-avf-{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]}/3n-icx-e810cq-1518b-ipsec-ip4routing-base-scale-avf-{test_type}-tsa"
+  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.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518B-.t.c-avf-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.1518B-.t.c-avf-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-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-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.1518B-.t.c-avf-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-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-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.1518B-.t.c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518B-.t.c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.1518B-.t.c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-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: "3n-icx-e810cq-1518b-ipsec-ip4routing-base-scale-avf-{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: 3n-icx-e810cq-1518b-ipsec-ip4routing-base-scale-dpdk-{test_type}-tsa"
+  title: "Speedup: 3n-icx-xxv710-64b-ip4routing-base-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-1518b-ipsec-ip4routing-base-scale-dpdk-{test_type}-tsa"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-64b-ip4routing-base-{test_type}-tsa"
   data: "vpp-3n-icx-curr-iter"
   include:
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518B-.t.c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518B-.t.c-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518B-.t.c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-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: "3n-icx-e810cq-1518b-ipsec-ip4routing-base-scale-dpdk-{test_type}"
+    title: "3n-icx-xxv710-64b-ip4routing-base-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 3n-icx-e810cq-64b-ip4routing-base-{test_type}-tsa"
+  title: "Speedup: 3n-icx-xxv710-64b-ip4tunnel-base-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-64b-ip4routing-base-{test_type}-tsa"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-64b-ip4tunnel-base-{test_type}-tsa"
   data: "vpp-3n-icx-curr-iter"
   include:
-    - "Tests.Vpp.Perf.Ip4.100Ge2P1E810Cq-Avf-Ethip4-Ip4Base-Ndrpdr.64B-.t.c-avf-ethip4-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.100Ge2P1E810Cq-Ethip4-Ip4Base-Ndrpdr.64B-.t.c-ethip4-ip4base-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: "3n-icx-e810cq-64b-ip4routing-base-{test_type}"
+    title: "3n-icx-xxv710-64b-ip4tunnel-base-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 3n-icx-e810cq-64b-ip4tunnel-base-[avf,dpdk]-{test_type}-tsa"
+  title: "Speedup: 3n-icx-e810xxv-64b-ip4tunnel-gtpu-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-64b-ip4tunnel-base-{test_type}-tsa"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810xxv-64b-ip4tunnel-gtpu-{test_type}-tsa"
   data: "vpp-3n-icx-curr-iter"
   include:
-    - "Tests.Vpp.Perf.Ip4 Tunnels.100Ge2P1E810Cq-Avf-Ethip4Vxlan-L2Xcbase-Ndrpdr.64B-.t.c-avf-ethip4vxlan-l2xcbase-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.100Ge2P1E810Cq-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-avf-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.100Ge2P1E810Cq-Avf-Ethip4Gtpusw-Ip4Base-Ndrpdr.64B-.t.c-avf-ethip4gtpusw-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.100Ge2P1E810Cq-Ethip4Vxlan-L2Xcbase-Ndrpdr.64B-.t.c-ethip4vxlan-l2xcbase-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.100Ge2P1E810Cq-Ethip4Vxlan-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.100Ge2P1E810Cq-Ethip4Gtpusw-Ip4Base-Ndrpdr.64B-.t.c-ethip4gtpusw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1E810Xxv-Ethip4Gtpuhw-Ip4Base-Ndrpdr.64B-.t.c-ethip4gtpuhw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1E810Xxv-Ethip4Gtpusw-Ip4Base-Ndrpdr.64B-.t.c-ethip4gtpusw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1E810Xxv-Ethip4Udpwireguard1Tnlsw-Ip4Base-Ndrpdr.64B-.t.c-ethip4udpwireguard1tnlsw-ip4base-ndrpdr"
   layout:
-    title: "3n-icx-e810cq-64b-ip4tunnel-base-[avf,dpdk]-{test_type}"
+    title: "3n-icx-e810xxv-64b-ip4tunnel-gtpu-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 3n-icx-e810cq-78b-ip6routing-base-{test_type}-tsa"
+  title: "Speedup: 3n-icx-xxv710-78b-ip6routing-base-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-78b-ip6routing-base-{test_type}-tsa"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-78b-ip6routing-base-{test_type}-tsa"
   data: "vpp-3n-icx-curr-iter"
   include:
-    - "Tests.Vpp.Perf.Ip6.100Ge2P1E810Cq-Avf-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-avf-ethip6-ip6base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.100Ge2P1E810Cq-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-ethip6-ip6base-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: "3n-icx-e810cq-78b-ip6routing-base-{test_type}"
+    title: "3n-icx-xxv710-78b-ip6routing-base-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 3n-icx-e810cq-64b-l2switching-base-[avf,dpdk]-{test_type}-tsa"
+  title: "Speedup: 3n-icx-xxv710-64b-l2switching-base-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-64b-l2switching-base-{test_type}-tsa"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-64b-l2switching-base-{test_type}-tsa"
   data: "vpp-3n-icx-curr-iter"
   include:
-    - "Tests.Vpp.Perf.L2.100Ge2P1E810Cq-Avf-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-avf-dot1q-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.100Ge2P1E810Cq-Avf-Eth-L2Patch-Ndrpdr.64B-.t.c-avf-eth-l2patch-ndrpdr"
-    - "Tests.Vpp.Perf.L2.100Ge2P1E810Cq-Avf-Eth-L2Xcbase-Ndrpdr.64B-.t.c-avf-eth-l2xcbase-ndrpdr"
-    - "Tests.Vpp.Perf.L2.100Ge2P1E810Cq-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-avf-eth-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.100Ge2P1E810Cq-Eth-L2Patch-Ndrpdr.64B-.t.c-eth-l2patch-ndrpdr"
-    - "Tests.Vpp.Perf.L2.100Ge2P1E810Cq-Eth-L2Xcbase-Ndrpdr.64B-.t.c-eth-l2xcbase-ndrpdr"
-    - "Tests.Vpp.Perf.L2.100Ge2P1E810Cq-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-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: "3n-icx-e810cq-64b-l2switching-base-[avf,dpdk]-{test_type}"
+    title: "3n-icx-xxv710-64b-l2switching-base-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 3n-icx-e810cq-78b-srv6-ip6routing-base-avf-{test_type}-tsa"
+  title: "Speedup: 3n-icx-xxv710-78b-srv6-ip6routing-base-avf-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-78b-srv6-ip6routing-base-avf-{test_type}-tsa"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-78b-srv6-ip6routing-base-avf-{test_type}-tsa"
   data: "vpp-3n-icx-curr-iter"
   include:
-    - "Tests.Vpp.Perf.Srv6.100Ge2P1E810Cq-Avf-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-Ndrpdr.78B-.t.c-avf-ethip6ip6-ip6base-srv6enc1sid-ndrpdr"
-    - "Tests.Vpp.Perf.Srv6.100Ge2P1E810Cq-Avf-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Ndrpdr.78B-.t.c-avf-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr"
-    - "Tests.Vpp.Perf.Srv6.100Ge2P1E810Cq-Avf-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Nodecaps-Ndrpdr.78B-.t.c-avf-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr"
-    - "Tests.Vpp.Perf.Srv6.100Ge2P1E810Cq-Avf-Ethip6Srhip6-Ip6Base-Srv6Proxy-Dyn-Ndrpdr.78B-.t.c-avf-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr"
-    - "Tests.Vpp.Perf.Srv6.100Ge2P1E810Cq-Avf-Ethip6Srhip6-Ip6Base-Srv6Proxy-Masq-Ndrpdr.78B-.t.c-avf-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr"
-    - "Tests.Vpp.Perf.Srv6.100Ge2P1E810Cq-Avf-Ethip6Srhip6-Ip6Base-Srv6Proxy-Stat-Ndrpdr.78B-.t.c-avf-ethip6srhip6-ip6base-srv6proxy-stat-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: "3n-icx-e810cq-78b-srv6-ip6routing-base-avf-{test_type}"
+    title: "3n-icx-xxv710-78b-srv6-ip6routing-base-avf-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 ################################################################################
@@ -13186,6 +15990,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_Intel-E810CQ'"
+  layout:
+    layout: "plot-hdrh-latency-percentile-x-log"
+
 - type: "plot"
   title: "Latency by percentile: 2n-icx"
   algorithm: "plot_hdrh_lat_by_percentile_x_log"
@@ -13193,7 +16008,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"
 
@@ -13204,7 +16019,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"
 
@@ -13219,6 +16034,17 @@
   layout:
     layout: "plot-hdrh-latency-percentile-x-log"
 
+- type: "plot"
+  title: "Latency by percentile: 3n-alt"
+  algorithm: "plot_hdrh_lat_by_percentile_x_log"
+  output-file: "{DIR[STATIC,VPP]}/hdrh-lat-percentile-3n-alt"
+  output-file-links: "{DIR[LAT,VPP]}/3n_alt.rst"
+  target-links: "../../_static/vpp"
+  data: "vpp-3n-alt-curr-iter-best"
+  filter: "'1T1C' and 'NIC_Intel-XL710'"
+  layout:
+    layout: "plot-hdrh-latency-percentile-x-log"
+
 - type: "plot"
   title: "Latency by percentile: 2n-tx2"
   algorithm: "plot_hdrh_lat_by_percentile_x_log"
@@ -13241,14 +16067,36 @@
   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: 3n-aws"
+  title: "Latency by percentile: DPDK 2n-icx"
   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'"
+  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"
 
@@ -13307,6 +16155,17 @@
   layout:
     layout: "plot-hdrh-latency-percentile-x-log"
 
+- type: "plot"
+  title: "Latency by percentile: DPDK 3n-alt"
+  algorithm: "plot_hdrh_lat_by_percentile_x_log"
+  output-file: "{DIR[STATIC,DPDK]}/hdrh-lat-percentile-3n-alt"
+  output-file-links: "{DIR[LAT,DPDK]}/3n_alt.rst"
+  target-links: "../../_static/dpdk"
+  data: "dpdk-3n-alt-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"
@@ -13322,11 +16181,26 @@
 
 # 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-25Ge2P1Xxv710-Ethip4-Ip4Base-2Tap-Gso-Iperf3-Mrr.128KB-{core}-ethip4-ip4base-2tap-gso-iperf3-mrr"
+    - "Tests.Vpp.Perf.Gso.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-2Tap-Iperf3-Mrr.128KB-{core}-ethip4-ip4base-2tap-iperf3-mrr"
+    - "Tests.Vpp.Perf.Gso.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-2Vhost-Gso-Iperf3-Mrr.128KB-{core}-ethip4-ip4base-2vhost-gso-iperf3-mrr"
+    - "Tests.Vpp.Perf.Gso.2N1L-25Ge2P1Xxv710-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"
@@ -13406,10 +16280,10 @@
   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"
+    - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4Tcp-Ip4Base-H1024-P63-S64512-pps-Tg-Ndrpdr.100B--ethip4tcp-ip4base-h1024-p63-s64512-pps-tg-ndrpdr"
+    - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4Tcp-Ip4Base-H262144-P63-S16515072-pps-Tg-Ndrpdr.100B--ethip4tcp-ip4base-h262144-p63-s16515072-pps-tg-ndrpdr"
+    - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4Udp-Ip4Base-H1024-P63-S64512-pps-Tg-Ndrpdr.100B--ethip4udp-ip4base-h1024-p63-s64512-pps-tg-ndrpdr"
+    - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4Udp-Ip4Base-H262144-P63-S16515072-pps-Tg-Ndrpdr.100B--ethip4udp-ip4base-h262144-p63-s16515072-pps-tg-ndrpdr"
   layout:
     title: "2n-skx-x710-64b--ip4routing-stf-pps-{test_type}"
     layout: "plot-throughput"
Integration tests