Report: 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 9734ca2..b3ab98c 100644 (file)
--- a/resources/tools/presentation/specifications/report/elements.yaml
+++ b/resources/tools/presentation/specifications/report/elements.yaml
@@ -4,28 +4,30 @@
 
 # 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-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"
+#     - job-spec: "trex-mlr-00"
+#       data-set: "trex-2n-icx-curr-iter"
 
 # - type: "table"
 #   title: "Job Specification Duration: 2n-icx-coverage"
@@ -35,13 +37,13 @@
 #   data: "vpp-2n-icx-curr-cov"
 #   lines:
 #     - job-spec: "gso-00"
-#       build: "1"
-#     - job-spec: "ip4-00"
 #       build: "2"
+#     - job-spec: "ip4-00"
+#       build: "8"
 #     - job-spec: "ip4-01"
 #       build: "3"
 #     - job-spec: "ip4-02"
-#       build: "4"
+#       build: "17"
 #     - job-spec: "ip4-03"
 #       build: "5"
 #     - job-spec: "ip4-04"
@@ -49,40 +51,40 @@
 #     - job-spec: "ip4-05"
 #       build: "7"
 #     - job-spec: "ip4-06"
-#       build: "8"
+#       build: "18"
 #     - job-spec: "ip4-07"
 #       build: "9"
 #     - job-spec: "ip4tun-00"
 #       build: "10"
 #     - job-spec: "ip6-00"
-#       build: "11"
+#       build: "14"
 #     - job-spec: "ip6-01"
-#       build: "12"
+#       build: "20"
 #     - job-spec: "l2-00"
-#       build: "13"
+#       build: "25"
 #     - job-spec: "l2-01"
-#       build: "14"
+#       build: "21"
 #     - job-spec: "lb-00"
-#       build: "15"
+#       build: "22"
 #     - job-spec: "memif-00"
-#       build: "16"
+#       build: "23"
 #     - job-spec: "vhost-00"
-#       build: "17"
+#       build: "24"
 
-- 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: "hoststack-00"
-      data-set: "vpp-3n-icx-curr-iter-hoststack"
-    - job-spec: "dpdk-mlr-00"
-      data-set: "dpdk-3n-icx-curr-iter"
+# - 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: "hoststack-00"
+#       data-set: "vpp-3n-icx-curr-iter-hoststack"
+#     - job-spec: "dpdk-mlr-00"
+#       data-set: "dpdk-3n-icx-curr-iter"
 
 # - type: "table"
 #   title: "Job Specification Duration: 3n-icx-coverage"
@@ -92,37 +94,37 @@
 #   data: "vpp-3n-icx-curr-cov"
 #   lines:
 #     - job-spec: "crypto-00"
-#       build: "1"
+#       build: "7"
 #     - job-spec: "crypto-01"
-#       build: "2"
+#       build: "8"
 #     - job-spec: "crypto-02"
-#       build: "3"
+#       build: "10"
 #     - job-spec: "crypto-03"
-#       build: "35"
+#       build: "9"
 #     - job-spec: "crypto-04"
-#       build: "4"
+#       build: "12"
 #     - job-spec: "crypto-05"
-#       build: "34"
+#       build: "11"
 #     - job-spec: "ip4-00"
-#       build: "5"
+#       build: "13"
 #     - job-spec: "ip4-01"
-#       build: "6"
+#       build: "14"
 #     - job-spec: "ip4-02"
-#       build: "7"
+#       build: "15"
 #     - job-spec: "ip4-03"
-#       build: "8"
+#       build: "16"
 #     - job-spec: "ip4-04"
-#       build: "9"
+#       build: "17"
 #     - job-spec: "ip4-05"
-#       build: "10"
+#       build: "18"
 #     - job-spec: "ip4-06"
-#       build: "11"
+#       build: "19"
 #     - job-spec: "ip4-07"
-#       build: "12"
+#       build: "20"
 #     - job-spec: "ip4tun-00"
-#       build: "13"
+#       build: "21"
 #     - job-spec: "ip4tun-02"
-#       build: "14"
+#       build: "22"
 #     - job-spec: "ip6-00"
 #       build: "15"
 #     - job-spec: "ip6-01"
@@ -162,30 +164,28 @@
 #     - job-spec: "vhost-01"
 #       build: "33"
 
-- type: "table"
-  title: "Job Specification Duration: 2n-clx-iterative"
-  algorithm: "table_job_spec_duration"
-  output-file: "{DIR[STATIC,VPP]}/job-spec-duration-2n-clx-iter"
-  jb-type: "iterative"
-  lines:
-    - job-spec: "vpp-mrr-00"
-      data-set: "vpp-2n-clx-curr-iter-mrr"
-    - job-spec: "vpp-mlr-00"
-      data-set: "vpp-2n-clx-curr-iter"
-    - job-spec: "vpp-gso-mrr-00"
-      data-set: "vpp-2n-clx-curr-iter-gso"
-    - job-spec: "soak-00"
-      data-set: "vpp-2n-clx-curr-soak"
-    # - job-spec: "vsap-00"
-    #   data-set: "vpp-2n-clx-curr-iter-vsap"
-    - job-spec: "nfv-density-mrr-00"
-      data-set: "vpp-2n-clx-curr-nfv-mrr"
-    - job-spec: "nfv-density-mlr-00"
-      data-set: "vpp-2n-clx-curr-nfv-ndrpdr"
-    - job-spec: "reconf-00"
-      data-set: "vpp-2n-clx-curr-nfv-reconf"
-    - job-spec: "dpdk-mlr-00"
-      data-set: "dpdk-2n-clx-curr-iter"
+# - type: "table"
+#   title: "Job Specification Duration: 2n-clx-iterative"
+#   algorithm: "table_job_spec_duration"
+#   output-file: "{DIR[STATIC,VPP]}/job-spec-duration-2n-clx-iter"
+#   jb-type: "iterative"
+#   lines:
+#     - job-spec: "vpp-mrr-00"
+#       data-set: "vpp-2n-clx-curr-iter-mrr"
+#     - job-spec: "vpp-mlr-00"
+#       data-set: "vpp-2n-clx-curr-iter"
+#     - job-spec: "vpp-gso-mrr-00"
+#       data-set: "vpp-2n-clx-curr-iter-gso"
+#     - job-spec: "soak-00"
+#       data-set: "vpp-2n-clx-curr-soak"
+#     - job-spec: "nfv-density-mrr-00"
+#       data-set: "vpp-2n-clx-curr-nfv-mrr"
+#     - job-spec: "nfv-density-mlr-00"
+#       data-set: "vpp-2n-clx-curr-nfv-ndrpdr"
+#     - job-spec: "reconf-00"
+#       data-set: "vpp-2n-clx-curr-nfv-reconf"
+#     - job-spec: "dpdk-mlr-00"
+#       data-set: "dpdk-2n-clx-curr-iter"
 
 # - type: "table"
 #   title: "Job Specification Duration: 2n-clx-coverage"
@@ -195,50 +195,50 @@
 #   data: "vpp-2n-clx-curr-cov"
 #   lines:
 #     - job-spec: "gso-00"
-#       build: "4"
+#       build: "2"
 #     - job-spec: "ip4-00"
-#       build: "5"
+#       build: "3"
 #     - job-spec: "ip4-01"
-#       build: "6"
+#       build: "4"
 #     - job-spec: "ip4-02"
-#       build: "7"
+#       build: "5"
 #     - job-spec: "ip4-03"
-#       build: "8"
+#       build: "6"
 #     - job-spec: "ip4-04"
-#       build: "9"
+#       build: "7"
 #     - job-spec: "ip4-05"
-#       build: "10"
+#       build: "12"
 #     - job-spec: "ip4-06"
-#       build: "11"
+#       build: "9"
 #     - job-spec: "ip4-07"
-#       build: "12"
+#       build: "10"
 #     - job-spec: "ip4tun-00"
-#       build: "13"
+#       build: "11"
 #     - job-spec: "ip6-00"
-#       build: "14"
+#       build: "13"
 #     - job-spec: "ip6-01"
-#       build: "15"
+#       build: "14"
 #     - job-spec: "l2-00"
-#       build: "16"
+#       build: "15"
 #     - job-spec: "l2-01"
-#       build: "17"
+#       build: "16"
 #     - job-spec: "lb-00"
-#       build: "18"
+#       build: "17"
 #     - job-spec: "memif-00"
-#       build: "19"
+#       build: "18"
 #     - job-spec: "vhost-00"
-#       build: "20"
+#       build: "19"
 
-- type: "table"
-  title: "Job Specification Duration: 2n-dnv-iterative"
-  algorithm: "table_job_spec_duration"
-  output-file: "{DIR[STATIC,VPP]}/job-spec-duration-2n-dnv-iter"
-  jb-type: "iterative"
-  lines:
-    - job-spec: "vpp-mrr-00"
-      data-set: "vpp-2n-dnv-curr-iter-mrr"
-    - job-spec: "vpp-mlr-00"
-      data-set: "vpp-2n-dnv-curr-iter"
+# - type: "table"
+#   title: "Job Specification Duration: 2n-dnv-iterative"
+#   algorithm: "table_job_spec_duration"
+#   output-file: "{DIR[STATIC,VPP]}/job-spec-duration-2n-dnv-iter"
+#   jb-type: "iterative"
+#   lines:
+#     - job-spec: "vpp-mrr-00"
+#       data-set: "vpp-2n-dnv-curr-iter-mrr"
+#     - job-spec: "vpp-mlr-00"
+#       data-set: "vpp-2n-dnv-curr-iter"
 
 # - type: "table"
 #   title: "Job Specification Duration: 2n-dnv-coverage"
@@ -248,28 +248,28 @@
 #   data: "vpp-2n-dnv-curr-cov"
 #   lines:
 #     - job-spec: "ip4-00"
-#       build: "1"
+#       build: "2"
 #     - job-spec: "ip4-01"
-#       build: "7"
-#     - job-spec: "ip6-00"
 #       build: "3"
-#     - job-spec: "ip6-01"
+#     - job-spec: "ip6-00"
 #       build: "4"
-#     - job-spec: "l2-00"
+#     - job-spec: "ip6-01"
 #       build: "5"
-#     - job-spec: "l2-01"
+#     - job-spec: "l2-00"
 #       build: "6"
+#     - job-spec: "l2-01"
+#       build: "7"
 
-- type: "table"
-  title: "Job Specification Duration: 2n-aws-iterative"
-  algorithm: "table_job_spec_duration"
-  output-file: "{DIR[STATIC,VPP]}/job-spec-duration-2n-aws-iter"
-  jb-type: "iterative"
-  lines:
-    - job-spec: "vpp-mrr-00"
-      data-set: "vpp-2n-aws-curr-iter-mrr"
-    - job-spec: "vpp-mlr-00"
-      data-set: "vpp-2n-aws-curr-iter"
+# - type: "table"
+#   title: "Job Specification Duration: 2n-aws-iterative"
+#   algorithm: "table_job_spec_duration"
+#   output-file: "{DIR[STATIC,VPP]}/job-spec-duration-2n-aws-iter"
+#   jb-type: "iterative"
+#   lines:
+#     - job-spec: "vpp-mrr-00"
+#       data-set: "vpp-2n-aws-curr-iter-mrr"
+#     - job-spec: "vpp-mlr-00"
+#       data-set: "vpp-2n-aws-curr-iter"
 
 # - type: "table"
 #   title: "Job Specification Duration: 2n-aws-coverage"
@@ -281,16 +281,16 @@
 #     - job-spec: "vpp-00"
 #       build: "1"
 
-- type: "table"
-  title: "Job Specification Duration: 2n-tx2-iterative"
-  algorithm: "table_job_spec_duration"
-  output-file: "{DIR[STATIC,VPP]}/job-spec-duration-2n-tx2-iter"
-  jb-type: "iterative"
-  lines:
-    - job-spec: "vpp-mrr-00"
-      data-set: "vpp-2n-tx2-curr-iter-mrr"
-    - job-spec: "vpp-mlr-00"
-      data-set: "vpp-2n-tx2-curr-iter"
+# - type: "table"
+#   title: "Job Specification Duration: 2n-tx2-iterative"
+#   algorithm: "table_job_spec_duration"
+#   output-file: "{DIR[STATIC,VPP]}/job-spec-duration-2n-tx2-iter"
+#   jb-type: "iterative"
+#   lines:
+#     - job-spec: "vpp-mrr-00"
+#       data-set: "vpp-2n-tx2-curr-iter-mrr"
+#     - job-spec: "vpp-mlr-00"
+#       data-set: "vpp-2n-tx2-curr-iter"
 
 # - type: "table"
 #   title: "Job Specification Duration: 2n-tx2-coverage"
@@ -300,48 +300,48 @@
 #   data: "vpp-2n-tx2-curr-cov"
 #   lines:
 #     - job-spec: "ip4-00"
-#       build: "1"
-#     - job-spec: "ip4-01"
 #       build: "2"
-#     - job-spec: "ip4-02"
+#     - job-spec: "ip4-01"
 #       build: "3"
-#     - job-spec: "ip4-03"
+#     - job-spec: "ip4-02"
 #       build: "4"
-#     - job-spec: "ip4-04"
+#     - job-spec: "ip4-03"
 #       build: "5"
-#     - job-spec: "ip4-05"
+#     - job-spec: "ip4-04"
 #       build: "6"
-#     - job-spec: "ip4-06"
+#     - job-spec: "ip4-05"
 #       build: "7"
-#     - job-spec: "ip6-00"
+#     - job-spec: "ip4-06"
 #       build: "8"
-#     - job-spec: "ip6-01"
+#     - job-spec: "ip6-00"
 #       build: "9"
-#     - job-spec: "l2-00"
+#     - job-spec: "ip6-01"
 #       build: "10"
-#     - job-spec: "l2-01"
+#     - job-spec: "l2-00"
 #       build: "11"
-#     - job-spec: "l2-02"
+#     - job-spec: "l2-01"
 #       build: "12"
-#     - job-spec: "l2-03"
+#     - job-spec: "l2-02"
 #       build: "13"
-#     - job-spec: "l2-04"
+#     - job-spec: "l2-03"
 #       build: "14"
+#     - job-spec: "l2-04"
+#       build: "15"
 
-- type: "table"
-  title: "Job Specification Duration: 2n-zn2-iterative"
-  algorithm: "table_job_spec_duration"
-  output-file: "{DIR[STATIC,VPP]}/job-spec-duration-2n-zn2-iter"
-  jb-type: "iterative"
-  lines:
-    - job-spec: "vpp-mrr-00"
-      data-set: "vpp-2n-zn2-curr-iter-mrr"
-    - job-spec: "vpp-mlr-00"
-      data-set: "vpp-2n-zn2-curr-iter"
-    - job-spec: "vpp-gso-mrr-00"
-      data-set: "vpp-2n-zn2-curr-iter-gso"
-    - job-spec: "dpdk-mlr-00"
-      data-set: "dpdk-2n-zn2-curr-iter"
+# - type: "table"
+#   title: "Job Specification Duration: 2n-zn2-iterative"
+#   algorithm: "table_job_spec_duration"
+#   output-file: "{DIR[STATIC,VPP]}/job-spec-duration-2n-zn2-iter"
+#   jb-type: "iterative"
+#   lines:
+#     - job-spec: "vpp-mrr-00"
+#       data-set: "vpp-2n-zn2-curr-iter-mrr"
+#     - job-spec: "vpp-mlr-00"
+#       data-set: "vpp-2n-zn2-curr-iter"
+#     - job-spec: "vpp-gso-mrr-00"
+#       data-set: "vpp-2n-zn2-curr-iter-gso"
+#     - job-spec: "dpdk-mlr-00"
+#       data-set: "dpdk-2n-zn2-curr-iter"
 
 # - type: "table"
 #   title: "Job Specification Duration: 2n-zn2-coverage"
@@ -351,46 +351,46 @@
 #   data: "vpp-2n-zn2-curr-cov"
 #   lines:
 #     - job-spec: "gso-00"
-#       build: "1"
-#     - job-spec: "ip4-00"
 #       build: "2"
-#     - job-spec: "ip4-01"
+#     - job-spec: "ip4-00"
 #       build: "3"
-#     - job-spec: "ip4-02"
+#     - job-spec: "ip4-01"
 #       build: "4"
-#     - job-spec: "ip4-03"
+#     - job-spec: "ip4-02"
 #       build: "5"
-#     - job-spec: "ip4-04"
+#     - job-spec: "ip4-03"
 #       build: "6"
-#     - job-spec: "ip4-05"
+#     - job-spec: "ip4-04"
 #       build: "7"
-#     - job-spec: "ip4tun-00"
+#     - job-spec: "ip4-05"
 #       build: "8"
-#     - job-spec: "ip6-00"
+#     - job-spec: "ip4tun-00"
 #       build: "9"
-#     - job-spec: "ip6-01"
+#     - job-spec: "ip6-00"
 #       build: "10"
-#     - job-spec: "l2-00"
+#     - job-spec: "ip6-01"
 #       build: "11"
-#     - job-spec: "l2-01"
+#     - job-spec: "l2-00"
 #       build: "12"
-#     - job-spec: "lb-00"
+#     - job-spec: "l2-01"
 #       build: "13"
-#     - job-spec: "memif-00"
+#     - job-spec: "lb-00"
 #       build: "14"
-#     - job-spec: "vhost-00"
+#     - job-spec: "memif-00"
 #       build: "15"
+#     - job-spec: "vhost-00"
+#       build: "16"
 
-- type: "table"
-  title: "Job Specification Duration: 3n-dnv-iterative"
-  algorithm: "table_job_spec_duration"
-  output-file: "{DIR[STATIC,VPP]}/job-spec-duration-3n-dnv-iter"
-  jb-type: "iterative"
-  lines:
-    - job-spec: "vpp-mrr-00"
-      data-set: "vpp-3n-dnv-curr-iter-mrr"
-    - job-spec: "vpp-mlr-00"
-      data-set: "vpp-3n-dnv-curr-iter"
+# - type: "table"
+#   title: "Job Specification Duration: 3n-dnv-iterative"
+#   algorithm: "table_job_spec_duration"
+#   output-file: "{DIR[STATIC,VPP]}/job-spec-duration-3n-dnv-iter"
+#   jb-type: "iterative"
+#   lines:
+#     - job-spec: "vpp-mrr-00"
+#       data-set: "vpp-3n-dnv-curr-iter-mrr"
+#     - job-spec: "vpp-mlr-00"
+#       data-set: "vpp-3n-dnv-curr-iter"
 
 # - type: "table"
 #   title: "Job Specification Duration: 3n-dnv-coverage"
@@ -400,38 +400,38 @@
 #   data: "vpp-3n-dnv-curr-cov"
 #   lines:
 #     - job-spec: "crypto-00"
-#       build: "1"
-#     - job-spec: "crypto-01"
 #       build: "2"
-#     - job-spec: "crypto-02"
+#     - job-spec: "crypto-01"
 #       build: "3"
-#     - job-spec: "ip4-00"
+#     - job-spec: "crypto-02"
 #       build: "4"
-#     - job-spec: "ip4-01"
+#     - job-spec: "ip4-00"
 #       build: "5"
-#     - job-spec: "ip4tun-00"
+#     - job-spec: "ip4-01"
 #       build: "6"
-#     - job-spec: "ip6-00"
+#     - job-spec: "ip4tun-00"
 #       build: "7"
-#     - job-spec: "ip6-01"
+#     - job-spec: "ip6-00"
 #       build: "8"
-#     - job-spec: "l2-00"
+#     - job-spec: "ip6-01"
 #       build: "9"
-#     - job-spec: "l2-01"
+#     - job-spec: "l2-00"
 #       build: "10"
+#     - job-spec: "l2-01"
+#       build: "11"
 
-- type: "table"
-  title: "Job Specification Duration: 3n-snr-iterative"
-  algorithm: "table_job_spec_duration"
-  output-file: "{DIR[STATIC,VPP]}/job-spec-duration-3n-snr-iter"
-  jb-type: "iterative"
-  lines:
-    - job-spec: "vpp-mrr-00"
-      data-set: "vpp-3n-snr-curr-iter-mrr"
-    - job-spec: "vpp-mlr-00"
-      data-set: "vpp-3n-snr-curr-iter"
-    - job-spec: "dpdk-mlr-00"
-      data-set: "dpdk-3n-snr-curr-iter"
+# - type: "table"
+#   title: "Job Specification Duration: 3n-snr-iterative"
+#   algorithm: "table_job_spec_duration"
+#   output-file: "{DIR[STATIC,VPP]}/job-spec-duration-3n-snr-iter"
+#   jb-type: "iterative"
+#   lines:
+#     - job-spec: "vpp-mrr-00"
+#       data-set: "vpp-3n-snr-curr-iter-mrr"
+#     - job-spec: "vpp-mlr-00"
+#       data-set: "vpp-3n-snr-curr-iter"
+#     - job-spec: "dpdk-mlr-00"
+#       data-set: "dpdk-3n-snr-curr-iter"
 
 # - type: "table"
 #   title: "Job Specification Duration: 3n-snr-coverage"
@@ -452,6 +452,8 @@
 #       build: "5"
 #     - job-spec: "ip4tun-00"
 #       build: "6"
+#     - job-spec: "ip4tun-01"
+#       build: "11"
 #     - job-spec: "ip6-00"
 #       build: "7"
 #     - job-spec: "ip6-01"
@@ -461,18 +463,18 @@
 #     - job-spec: "l2-01"
 #       build: "10"
 
-- type: "table"
-  title: "Job Specification Duration: 3n-tsh-iterative"
-  algorithm: "table_job_spec_duration"
-  output-file: "{DIR[STATIC,VPP]}/job-spec-duration-3n-tsh-iter"
-  jb-type: "iterative"
-  lines:
-    - job-spec: "vpp-mrr-00"
-      data-set: "vpp-3n-tsh-curr-iter-mrr"
-    - job-spec: "vpp-mlr-00"
-      data-set: "vpp-3n-tsh-curr-iter"
-    - job-spec: "dpdk-mlr-00"
-      data-set: "dpdk-3n-tsh-curr-iter"
+# - type: "table"
+#   title: "Job Specification Duration: 3n-tsh-iterative"
+#   algorithm: "table_job_spec_duration"
+#   output-file: "{DIR[STATIC,VPP]}/job-spec-duration-3n-tsh-iter"
+#   jb-type: "iterative"
+#   lines:
+#     - job-spec: "vpp-mrr-00"
+#       data-set: "vpp-3n-tsh-curr-iter-mrr"
+#     - job-spec: "vpp-mlr-00"
+#       data-set: "vpp-3n-tsh-curr-iter"
+#     - job-spec: "dpdk-mlr-00"
+#       data-set: "dpdk-3n-tsh-curr-iter"
 
 # - type: "table"
 #   title: "Job Specification Duration: 3n-tsh-coverage"
@@ -516,18 +518,18 @@
 #     - 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"
+# - 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"
 
 # - type: "table"
 #   title: "Job Specification Duration: 3n-alt-coverage"
@@ -537,17 +539,17 @@
 #   data: "vpp-3n-alt-curr-cov"
 #   lines:
 #     - job-spec: "ip4-00"
-#       build: "1"
-#     - job-spec: "ip4-01"
 #       build: "2"
-#     - job-spec: "ip4-02"
+#     - job-spec: "ip4-01"
 #       build: "3"
-#     - job-spec: "ip4-03"
+#     - job-spec: "ip4-02"
 #       build: "4"
+#     - job-spec: "ip4-03"
+#       build: "6"
 #     - job-spec: "ip4tun-00"
 #       build: "5"
 #     - job-spec: "ip6-00"
-#       build: "6"
+#       build: "12"
 #     - job-spec: "ip6-01"
 #       build: "7"
 #     - job-spec: "l2-00"
@@ -559,17 +561,17 @@
 #     - job-spec: "l2-03"
 #       build: "11"
 #     - job-spec: "l2-04"
-#       build: "12"
-#     - job-spec: "memif-00"
 #       build: "13"
-#     - job-spec: "srv6-00"
+#     - job-spec: "memif-00"
 #       build: "14"
-#     - job-spec: "srv6-01"
+#     - job-spec: "srv6-00"
 #       build: "15"
-#     - job-spec: "vhost-00"
+#     - job-spec: "srv6-01"
 #       build: "16"
-#     - job-spec: "vhost-01"
+#     - job-spec: "vhost-00"
 #       build: "17"
+#     - job-spec: "vhost-01"
+#       build: "18"
 
 # VPP Normalized Comparison Across Testbeds 2n-clx to 2n-icx 1c ndr
 - type: "table"
@@ -5922,6 +5924,42 @@
   - "parent"
   - "msg"
 
+# Detailed Test Results - TRex Performance Results 2n-icx
+- type: "table"
+  title: "Detailed Test Results - TRex Performance Results 2n-icx"
+  algorithm: "table_merged_details"
+  output-file: "{DIR[DTR,PERF,TREX,2N,ICX]}/trex_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: "trex-2n-icx-curr-cov"
+  filter: "all"
+  remove-ndr: False
+  parameters:
+  - "name"
+  - "parent"
+  - "msg"
+
+# Detailed Test Results - TRex Performance Results 1n-aws
+- type: "table"
+  title: "Detailed Test Results - TRex Performance Results 1n-aws"
+  algorithm: "table_merged_details"
+  output-file: "{DIR[DTR,PERF,TREX,1N,AWS]}/trex_performance_results_1n_aws"
+  columns:
+    - title: " |prein| Test Name |preout| "
+      data: "data name"
+    - title: " |prein| Throughput: |br| 1.  Mpps       Gbps (NDR) |br| 2.  Mpps       Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, |br| one set per each direction: |br| 3.  P50  P90  P99       P50  P90  P99 (10% PDR) |br| 4.  P50  P90  P99       P50  P90  P99 (50% PDR) |br| 5.  P50  P90  P99       P50  P90  P99 (90% PDR) |preout| "
+      data: "data msg"
+  data: "trex-1n-aws-curr-cov"
+  filter: "all"
+  remove-ndr: False
+  parameters:
+  - "name"
+  - "parent"
+  - "msg"
+
 ################################################################################
 ###                                F I L E S                                 ###
 ################################################################################
@@ -6376,6 +6414,26 @@
   filter: "all"
   data-start-level: 4
 
+# TRex Performance Results 2n-icx
+- type: "file"
+  title: "TRex Performance Results 2n-icx"
+  algorithm: "file_test_results"
+  output-file: "{DIR[DTR,PERF,TREX,2N,ICX]}"
+  dir-tables: "{DIR[DTR,PERF,TREX,2N,ICX]}"
+  data: "trex-2n-icx-curr-cov"
+  filter: "all"
+  data-start-level: 4
+
+# TRex Performance Results 1n-aws
+- type: "file"
+  title: "TRex Performance Results 1n-aws"
+  algorithm: "file_test_results"
+  output-file: "{DIR[DTR,PERF,TREX,1N,AWS]}"
+  dir-tables: "{DIR[DTR,PERF,TREX,1N,AWS]}"
+  data: "trex-1n-aws-curr-cov"
+  filter: "all"
+  data-start-level: 4
+
 ################################################################################
 ###                                P L O T S                                 ###
 ################################################################################
@@ -7021,6 +7079,40 @@
     title: "2n-dnv-x553-78b-{core}-ip6routing-base-scale-ixgbe-{test_type}"
     layout: "plot-throughput"
 
+- type: "plot"
+  title: "Throughput: 2n-dnv-x553-100b-{core}-nat44ed-ip4routing-tcp-tput-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-dnv-x553-100b-{core}-nat44ed-ip4routing-tcp-tput-{test_type}"
+  data: "vpp-2n-dnv-curr-iter"
+  core: ["1t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4Tcp-Ip4Base-H1024-P63-S64512-Tput-Ndrpdr.100B-{core}-ethip4tcp-ip4base-h1024-p63-s64512-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4Tcp-Ip4Base-H16384-P63-S1032192-Tput-Ndrpdr.100B-{core}-ethip4tcp-ip4base-h16384-p63-s1032192-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4Tcp-Ip4Base-H65536-P63-S4128768-Tput-Ndrpdr.100B-{core}-ethip4tcp-ip4base-h65536-p63-s4128768-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4Tcp-Nat44Ed-H1024-P63-S64512-Tput-Ndrpdr.100B-{core}-ethip4tcp-nat44ed-h1024-p63-s64512-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4Tcp-Nat44Ed-H16384-P63-S1032192-Tput-Ndrpdr.100B-{core}-ethip4tcp-nat44ed-h16384-p63-s1032192-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4Tcp-Nat44Ed-H65536-P63-S4128768-Tput-Ndrpdr.100B-{core}-ethip4tcp-nat44ed-h65536-p63-s4128768-tput-ndrpdr"
+  layout:
+    title: "2n-dnv-x553-100b-{core}-nat44ed-ip4routing-tcp-tput-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 2n-dnv-x553-1518b-{core}-nat44ed-ip4routing-tcp-tput-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-dnv-x553-1518b-{core}-nat44ed-ip4routing-tcp-tput-{test_type}"
+  data: "vpp-2n-dnv-curr-iter"
+  core: ["1t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4Tcp-Ip4Base-H1024-P63-S64512-Tput-Ndrpdr.1518b-{core}-ethip4tcp-ip4base-h1024-p63-s64512-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4Tcp-Ip4Base-H16384-P63-S1032192-Tput-Ndrpdr.1518b-{core}-ethip4tcp-ip4base-h16384-p63-s1032192-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4Tcp-Ip4Base-H65536-P63-S4128768-Tput-Ndrpdr.1518b-{core}-ethip4tcp-ip4base-h65536-p63-s4128768-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4Tcp-Nat44Ed-H1024-P63-S64512-Tput-Ndrpdr.1518b-{core}-ethip4tcp-nat44ed-h1024-p63-s64512-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4Tcp-Nat44Ed-H16384-P63-S1032192-Tput-Ndrpdr.1518b-{core}-ethip4tcp-nat44ed-h16384-p63-s1032192-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4Tcp-Nat44Ed-H65536-P63-S4128768-Tput-Ndrpdr.1518b-{core}-ethip4tcp-nat44ed-h65536-p63-s4128768-tput-ndrpdr"
+  layout:
+    title: "2n-dnv-x553-1518b-{core}-nat44ed-ip4routing-tcp-tput-{test_type}"
+    layout: "plot-throughput"
+
 - type: "plot"
   title: "Throughput: 3n-dnv-x553-78b-{core}-ip6routing-base-scale-ixgbe-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
@@ -8042,6 +8134,38 @@
     title: "2n-dnv-x553-64b-ip4routing-base-scale-ixgbe-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
+- type: "plot"
+  title: "Speedup: 2n-dnv-x553-100b-nat44ed-ip4routing-tcp-tput-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-dnv-x553-100b-nat44ed-ip4routing-tcp-tput-{test_type}-tsa"
+  data: "vpp-2n-dnv-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4Tcp-Ip4Base-H1024-P63-S64512-Tput-Ndrpdr.100B-.t.c-ethip4tcp-ip4base-h1024-p63-s64512-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4Tcp-Ip4Base-H16384-P63-S1032192-Tput-Ndrpdr.100B-.t.c-ethip4tcp-ip4base-h16384-p63-s1032192-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4Tcp-Ip4Base-H65536-P63-S4128768-Tput-Ndrpdr.100B-.t.c-ethip4tcp-ip4base-h65536-p63-s4128768-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4Tcp-Nat44Ed-H1024-P63-S64512-Tput-Ndrpdr.100B-.t.c-ethip4tcp-nat44ed-h1024-p63-s64512-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4Tcp-Nat44Ed-H16384-P63-S1032192-Tput-Ndrpdr.100B-.t.c-ethip4tcp-nat44ed-h16384-p63-s1032192-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4Tcp-Nat44Ed-H65536-P63-S4128768-Tput-Ndrpdr.100B-.t.c-ethip4tcp-nat44ed-h65536-p63-s4128768-tput-ndrpdr"
+  layout:
+    title: "2n-dnv-x553-100b-nat44ed-ip4routing-tcp-tput-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 2n-dnv-x553-1518b-nat44ed-ip4routing-tcp-tput-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-dnv-x553-1518b-nat44ed-ip4routing-tcp-tput-{test_type}-tsa"
+  data: "vpp-2n-dnv-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4Tcp-Ip4Base-H1024-P63-S64512-Tput-Ndrpdr.1518b-.t.c-ethip4tcp-ip4base-h1024-p63-s64512-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4Tcp-Ip4Base-H16384-P63-S1032192-Tput-Ndrpdr.1518b-.t.c-ethip4tcp-ip4base-h16384-p63-s1032192-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4Tcp-Ip4Base-H65536-P63-S4128768-Tput-Ndrpdr.1518b-.t.c-ethip4tcp-ip4base-h65536-p63-s4128768-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4Tcp-Nat44Ed-H1024-P63-S64512-Tput-Ndrpdr.1518b-.t.c-ethip4tcp-nat44ed-h1024-p63-s64512-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4Tcp-Nat44Ed-H16384-P63-S1032192-Tput-Ndrpdr.1518b-.t.c-ethip4tcp-nat44ed-h16384-p63-s1032192-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4Tcp-Nat44Ed-H65536-P63-S4128768-Tput-Ndrpdr.1518b-.t.c-ethip4tcp-nat44ed-h65536-p63-s4128768-tput-ndrpdr"
+  layout:
+    title: "2n-dnv-x553-1518b-nat44ed-ip4routing-tcp-tput-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
 - type: "plot"
   title: "Speedup: 2n-dnv-x553-78b-ip6routing-base-scale-[ixgbe,af_xdp]-{test_type}-tsa"
   algorithm: "plot_tsa_name"
@@ -9943,7 +10067,7 @@
     - "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"
+    layout: "plot-cps"
 
 - type: "plot"
   title: "Throughput: 2n-icx-xxv710-64b-{core}-nat44ed-ip4routing-tcp-stf-cps-avf-{test_type}"
@@ -9960,7 +10084,7 @@
     - "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"
+    layout: "plot-cps"
 
 - type: "plot"
   title: "Throughput: 2n-icx-xxv710-100b-{core}-nat44ed-ip4routing-udp-tput-avf-{test_type}"
@@ -10229,7 +10353,7 @@
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H65536-P63-S4128768-Cps-ndrpdr.64B-.t.c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-cps-ndrpdr"
   layout:
     title: "2n-icx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
+    layout: "plot-throughput-speedup-analysis-cps"
 
 - type: "plot"
   title: "Speedup: 2n-icx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-{test_type}-tsa"
@@ -10245,7 +10369,7 @@
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H65536-P63-S4128768-Cps-ndrpdr.64B-.t.c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-ndrpdr"
   layout:
     title: "2n-icx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-{test_type}"
-    layout: "plot-throughput-speedup-analysis"
+    layout: "plot-throughput-speedup-analysis-cps"
 
 - type: "plot"
   title: "Speedup: 2n-icx-xxv710-100b-nat44ed-ip4routing-tcp-tput-avf-{test_type}-tsa"
@@ -10399,7 +10523,7 @@
   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"]
+  core: ["1t1c", "2t2c"]
   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"
@@ -10426,7 +10550,7 @@
   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"]
+  core: ["1t1c", "1t2c"]
   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"
@@ -10453,7 +10577,7 @@
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,DPDK]}/2n-clx-xxv710-64b-{core}-base-{test_type}"
   data: "dpdk-2n-clx-curr-iter"
-  core: ["2t1c", "4t2c"]
+  core: ["1t1c", "2t2c"]
   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"
@@ -10466,7 +10590,7 @@
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,DPDK]}/2n-clx-x710-64b-{core}-base-{test_type}"
   data: "dpdk-2n-clx-curr-iter"
-  core: ["2t1c", "4t2c"]
+  core: ["1t1c", "2t2c"]
   include:
     - "tests.dpdk.perf.2n1l-10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.64b-{core}-eth-l2xcbase-testpmd-ndrpdr"
     - "tests.dpdk.perf.2n1l-10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.64b-{core}-ethip4-ip4base-l3fwd-ndrpdr"
@@ -11508,7 +11632,7 @@
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,DPDK]}/2n-zn2-xxv710-64b-{core}-base-{test_type}"
   data: "dpdk-2n-zn2-curr-iter"
-  core: ["2t1c", "4t2c"]
+  core: ["1t1c", "2t2c"]
   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"
@@ -11521,7 +11645,7 @@
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,DPDK]}/2n-zn2-x710-64b-{core}-base-{test_type}"
   data: "dpdk-2n-zn2-curr-iter"
-  core: ["2t1c", "4t2c"]
+  core: ["1t1c", "2t2c"]
   include:
     - "tests.dpdk.perf.2n1l-10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.64b-{core}-eth-l2xcbase-testpmd-ndrpdr"
     - "tests.dpdk.perf.2n1l-10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.64b-{core}-ethip4-ip4base-l3fwd-ndrpdr"
@@ -11731,6 +11855,52 @@
     title: "3n-icx-xxv710-64b-{core}-ip4tunnel-base-{test_type}"
     layout: "plot-throughput"
 
+- type: "plot"
+  title: "Throughput: 3n-icx-xxv710-1518b-{core}-ip4tunnel-wireguard-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-1518b-{core}-ip4tunnel-wireguard-{test_type}"
+  data: "vpp-3n-icx-curr-iter"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Udpwireguard1Tnlsw-Ip4Base-Ndrpdr.1518B-{core}-ethip4udpwireguard1tnlsw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Udpwireguard2Tnlsw-Ip4Base-Ndrpdr.1518B-{core}-ethip4udpwireguard2tnlsw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Udpwireguard4Tnlsw-Ip4Base-Ndrpdr.1518B-{core}-ethip4udpwireguard4tnlsw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Udpwireguard8Tnlsw-Ip4Base-Ndrpdr.1518B-{core}-ethip4udpwireguard8tnlsw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Udpwireguard100Tnlsw-Ip4Base-Ndrpdr.1518B-{core}-ethip4udpwireguard100tnlsw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Udpwireguard1000Tnlsw-Ip4Base-Ndrpdr.1518B-{core}-ethip4udpwireguard1000tnlsw-ip4base-ndrpdr"
+  layout:
+    title: "3n-icx-xxv710-1518b-{core}-ip4tunnel-wireguard-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 3n-icx-xxv710-imix-{core}-ip4tunnel-wireguard-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-imix-{core}-ip4tunnel-wireguard-{test_type}"
+  data: "vpp-3n-icx-curr-iter"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Udpwireguard1Tnlsw-Ip4Base-Ndrpdr.imix-{core}-ethip4udpwireguard1tnlsw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Udpwireguard2Tnlsw-Ip4Base-Ndrpdr.imix-{core}-ethip4udpwireguard2tnlsw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Udpwireguard4Tnlsw-Ip4Base-Ndrpdr.imix-{core}-ethip4udpwireguard4tnlsw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Udpwireguard8Tnlsw-Ip4Base-Ndrpdr.imix-{core}-ethip4udpwireguard8tnlsw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Udpwireguard100Tnlsw-Ip4Base-Ndrpdr.imix-{core}-ethip4udpwireguard100tnlsw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Udpwireguard1000Tnlsw-Ip4Base-Ndrpdr.imix-{core}-ethip4udpwireguard1000tnlsw-ip4base-ndrpdr"
+  layout:
+    title: "3n-icx-xxv710-imix-{core}-ip4tunnel-wireguard-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 3n-icx-e810xxv-64b-{core}-ip4tunnel-wireguard-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810xxv-64b-{core}-ip4tunnel-wireguard-{test_type}"
+  data: "vpp-3n-icx-curr-iter"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1E810Xxv-Ethip4Udpwireguard1Tnlsw-Ip4Base-Ndrpdr.64B-{core}-ethip4udpwireguard1tnlsw-ip4base-ndrpdr"
+  layout:
+    title: "3n-icx-e810xxv-64b-{core}-ip4tunnel-wireguard-{test_type}"
+    layout: "plot-throughput"
+
 - type: "plot"
   title: "Throughput: 3n-icx-e810xxv-64b-{core}-ip4tunnel-gtpu-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
@@ -11970,6 +12140,49 @@
     title: "3n-icx-e810xxv-64b-ip4tunnel-gtpu-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
+- type: "plot"
+  title: "Speedup: 3n-icx-xxv710-1518b-ip4tunnel-wireguard-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-1518b-ip4tunnel-wireguard-{test_type}-tsa"
+  data: "vpp-3n-icx-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Udpwireguard1Tnlsw-Ip4Base-Ndrpdr.1518B-.t.c-ethip4udpwireguard1tnlsw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Udpwireguard2Tnlsw-Ip4Base-Ndrpdr.1518B-.t.c-ethip4udpwireguard2tnlsw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Udpwireguard4Tnlsw-Ip4Base-Ndrpdr.1518B-.t.c-ethip4udpwireguard4tnlsw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Udpwireguard8Tnlsw-Ip4Base-Ndrpdr.1518B-.t.c-ethip4udpwireguard8tnlsw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Udpwireguard100Tnlsw-Ip4Base-Ndrpdr.1518B-.t.c-ethip4udpwireguard100tnlsw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Udpwireguard1000Tnlsw-Ip4Base-Ndrpdr.1518B-.t.c-ethip4udpwireguard1000tnlsw-ip4base-ndrpdr"
+  layout:
+    title: "3n-icx-xxv710-1518b-ip4tunnel-wireguard-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 3n-icx-xxv710-imix-ip4tunnel-wireguard-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-imix-ip4tunnel-wireguard-{test_type}-tsa"
+  data: "vpp-3n-icx-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Udpwireguard1Tnlsw-Ip4Base-Ndrpdr.imix-.t.c-ethip4udpwireguard1tnlsw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Udpwireguard2Tnlsw-Ip4Base-Ndrpdr.imix-.t.c-ethip4udpwireguard2tnlsw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Udpwireguard4Tnlsw-Ip4Base-Ndrpdr.imix-.t.c-ethip4udpwireguard4tnlsw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Udpwireguard8Tnlsw-Ip4Base-Ndrpdr.imix-.t.c-ethip4udpwireguard8tnlsw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Udpwireguard100Tnlsw-Ip4Base-Ndrpdr.imix-.t.c-ethip4udpwireguard100tnlsw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Udpwireguard1000Tnlsw-Ip4Base-Ndrpdr.imix-.t.c-ethip4udpwireguard1000tnlsw-ip4base-ndrpdr"
+  layout:
+    title: "3n-icx-xxv710-imix-ip4tunnel-wireguard-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 3n-icx-e810xxv-64b-ip4tunnel-wireguard-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810xxv-64b-ip4tunnel-wireguard-{test_type}-tsa"
+  data: "vpp-3n-icx-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1E810Xxv-Ethip4Udpwireguard1Tnlsw-Ip4Base-Ndrpdr.64B-.t.c-ethip4udpwireguard1tnlsw-ip4base-ndrpdr"
+  layout:
+    title: "3n-icx-e810xxv-64b-ip4tunnel-wireguard-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
 - type: "plot"
   title: "Speedup: 3n-icx-xxv710-78b-ip6routing-base-{test_type}-tsa"
   algorithm: "plot_tsa_name"
@@ -12044,6 +12257,40 @@
     title: "3n-snr-e822cq-64b-{core}-ip4tunnel-base-{test_type}"
     layout: "plot-throughput"
 
+- type: "plot"
+  title: "Throughput: 3n-snr-e822cq-1518b-{core}-ip4tunnel-wireguard-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-snr-e822cq-1518b-{core}-ip4tunnel-wireguard-{test_type}"
+  data: "vpp-3n-snr-curr-iter"
+  core: ["1t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1E822Cq-Ethip4Udpwireguard1Tnlsw-Ip4Base-Ndrpdr.1518B-{core}-ethip4udpwireguard1tnlsw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1E822Cq-Ethip4Udpwireguard2Tnlsw-Ip4Base-Ndrpdr.1518B-{core}-ethip4udpwireguard2tnlsw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1E822Cq-Ethip4Udpwireguard4Tnlsw-Ip4Base-Ndrpdr.1518B-{core}-ethip4udpwireguard4tnlsw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1E822Cq-Ethip4Udpwireguard8Tnlsw-Ip4Base-Ndrpdr.1518B-{core}-ethip4udpwireguard8tnlsw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1E822Cq-Ethip4Udpwireguard100Tnlsw-Ip4Base-Ndrpdr.1518B-{core}-ethip4udpwireguard100tnlsw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1E822Cq-Ethip4Udpwireguard1000Tnlsw-Ip4Base-Ndrpdr.1518B-{core}-ethip4udpwireguard1000tnlsw-ip4base-ndrpdr"
+  layout:
+    title: "3n-snr-e822cq-1518b-{core}-ip4tunnel-wireguard-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 3n-snr-e822cq-imix-{core}-ip4tunnel-wireguard-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-snr-e822cq-imix-{core}-ip4tunnel-wireguard-{test_type}"
+  data: "vpp-3n-snr-curr-iter"
+  core: ["1t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1E822Cq-Ethip4Udpwireguard1Tnlsw-Ip4Base-Ndrpdr.imix-{core}-ethip4udpwireguard1tnlsw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1E822Cq-Ethip4Udpwireguard2Tnlsw-Ip4Base-Ndrpdr.imix-{core}-ethip4udpwireguard2tnlsw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1E822Cq-Ethip4Udpwireguard4Tnlsw-Ip4Base-Ndrpdr.imix-{core}-ethip4udpwireguard4tnlsw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1E822Cq-Ethip4Udpwireguard8Tnlsw-Ip4Base-Ndrpdr.imix-{core}-ethip4udpwireguard8tnlsw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1E822Cq-Ethip4Udpwireguard100Tnlsw-Ip4Base-Ndrpdr.imix-{core}-ethip4udpwireguard100tnlsw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1E822Cq-Ethip4Udpwireguard1000Tnlsw-Ip4Base-Ndrpdr.imix-{core}-ethip4udpwireguard1000tnlsw-ip4base-ndrpdr"
+  layout:
+    title: "3n-snr-e822cq-imix-{core}-ip4tunnel-wireguard-{test_type}"
+    layout: "plot-throughput"
+
 - type: "plot"
   title: "Throughput: 3n-snr-e822cq-78b-{core}-ip6routing-base-scale-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
@@ -12154,6 +12401,38 @@
     title: "3n-snr-e822cq-64b-ip4tunnel-base-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
+- type: "plot"
+  title: "Speedup: 3n-snr-e822cq-1518b-ip4tunnel-wireguard-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-snr-e822cq-1518b-ip4tunnel-wireguard-{test_type}-tsa"
+  data: "vpp-3n-snr-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1E822Cq-Ethip4Udpwireguard1Tnlsw-Ip4Base-Ndrpdr.1518B-.t.c-ethip4udpwireguard1tnlsw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1E822Cq-Ethip4Udpwireguard2Tnlsw-Ip4Base-Ndrpdr.1518B-.t.c-ethip4udpwireguard2tnlsw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1E822Cq-Ethip4Udpwireguard4Tnlsw-Ip4Base-Ndrpdr.1518B-.t.c-ethip4udpwireguard4tnlsw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1E822Cq-Ethip4Udpwireguard8Tnlsw-Ip4Base-Ndrpdr.1518B-.t.c-ethip4udpwireguard8tnlsw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1E822Cq-Ethip4Udpwireguard100Tnlsw-Ip4Base-Ndrpdr.1518B-.t.c-ethip4udpwireguard100tnlsw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1E822Cq-Ethip4Udpwireguard1000Tnlsw-Ip4Base-Ndrpdr.1518B-.t.c-ethip4udpwireguard1000tnlsw-ip4base-ndrpdr"
+  layout:
+    title: "3n-snr-e822cq-1518b-ip4tunnel-wireguard-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 3n-snr-e822cq-imix-ip4tunnel-wireguard-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-snr-e822cq-imix-ip4tunnel-wireguard-{test_type}-tsa"
+  data: "vpp-3n-snr-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1E822Cq-Ethip4Udpwireguard1Tnlsw-Ip4Base-Ndrpdr.imix-.t.c-ethip4udpwireguard1tnlsw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1E822Cq-Ethip4Udpwireguard2Tnlsw-Ip4Base-Ndrpdr.imix-.t.c-ethip4udpwireguard2tnlsw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1E822Cq-Ethip4Udpwireguard4Tnlsw-Ip4Base-Ndrpdr.imix-.t.c-ethip4udpwireguard4tnlsw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1E822Cq-Ethip4Udpwireguard8Tnlsw-Ip4Base-Ndrpdr.imix-.t.c-ethip4udpwireguard8tnlsw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1E822Cq-Ethip4Udpwireguard100Tnlsw-Ip4Base-Ndrpdr.imix-.t.c-ethip4udpwireguard100tnlsw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1E822Cq-Ethip4Udpwireguard1000Tnlsw-Ip4Base-Ndrpdr.imix-.t.c-ethip4udpwireguard1000tnlsw-ip4base-ndrpdr"
+  layout:
+    title: "3n-snr-e822cq-imix-ip4tunnel-wireguard-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
 - type: "plot"
   title: "Speedup: 3n-snr-e822cq-78b-ip6routing-base-scale-{test_type}-tsa"
   algorithm: "plot_tsa_name"
@@ -12271,16 +12550,16 @@
   layout:
     layout: "plot-hdrh-latency-percentile-x-log"
 
-- type: "plot"
-  title: "Latency by percentile: TRex 1n-aws"
-  algorithm: "plot_hdrh_lat_by_percentile_x_log"
-  output-file: "{DIR[STATIC,TREX]}/hdrh-lat-percentile-1n-aws"
-  output-file-links: "{DIR[LAT,TREX]}/1n_aws.rst"
-  target-links: "../../_static/trex"
-  data: "trex-1n-aws-curr-iter-best"
-  filter: "'2T1C'"
-  layout:
-    layout: "plot-hdrh-latency-percentile-x-log"
+# - type: "plot"
+#   title: "Latency by percentile: TRex 1n-aws"
+#   algorithm: "plot_hdrh_lat_by_percentile_x_log"
+#   output-file: "{DIR[STATIC,TREX]}/hdrh-lat-percentile-1n-aws"
+#   output-file-links: "{DIR[LAT,TREX]}/1n_aws.rst"
+#   target-links: "../../_static/trex"
+#   data: "trex-1n-aws-curr-iter-best"
+#   filter: "'2T1C'"
+#   layout:
+#     layout: "plot-hdrh-latency-percentile-x-log"
 
 - type: "plot"
   title: "Latency by percentile: 2n-zn2"
@@ -12399,7 +12678,7 @@
   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'"
+  filter: "'1T1C' and 'NIC_Intel-XXV710'"
   layout:
     layout: "plot-hdrh-latency-percentile-x-log"
 
@@ -12410,7 +12689,7 @@
   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'"
+  filter: "'1T1C' and 'NIC_Intel-XXV710'"
   layout:
     layout: "plot-hdrh-latency-percentile-x-log"
 
@@ -12421,7 +12700,7 @@
   output-file-links: "{DIR[LAT,DPDK]}/2n_clx.rst"
   target-links: "../../_static/dpdk"
   data: "dpdk-2n-clx-curr-iter-best"
-  filter: "'2T1C' and 'NIC_Intel-XXV710'"
+  filter: "'1T1C' and 'NIC_Intel-XXV710'"
   layout:
     layout: "plot-hdrh-latency-percentile-x-log"
 
@@ -12432,7 +12711,7 @@
   output-file-links: "{DIR[LAT,DPDK]}/2n_zn2.rst"
   target-links: "../../_static/dpdk"
   data: "dpdk-2n-zn2-curr-iter-best"
-  filter: "'2T1C' and 'NIC_Intel-XXV710'"
+  filter: "'1T1C' and 'NIC_Intel-XXV710'"
   layout:
     layout: "plot-hdrh-latency-percentile-x-log"
 
@@ -12593,18 +12872,18 @@
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 2n-icx-e810cq-64b--ip4routing-stf-pps-{test_type}"
+  title: "Throughput: 2n-icx-e810cq-64b--ip4routing-stf-tput-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,TREX]}/2n-icx-e810cq-64b--ip4routing-stf-pps-{test_type}"
+  output-file: "{DIR[STATIC,TREX]}/2n-icx-e810cq-64b--ip4routing-stf-tput-{test_type}"
   data: "trex-2n-icx-curr-iter"
   core: ["2t1c", ]
   include:
-    - "Tests.Trex.Perf.Ip4.1N1L-100Ge2P1E810Cq-Ethip4Tcp-Ip4Base-H1024-P63-S64512-pps-Tg-Ndrpdr.100B--ethip4tcp-ip4base-h1024-p63-s64512-pps-tg-ndrpdr"
-    - "Tests.Trex.Perf.Ip4.1N1L-100Ge2P1E810Cq-Ethip4Tcp-Ip4Base-H262144-P63-S16515072-pps-Tg-Ndrpdr.100B--ethip4tcp-ip4base-h262144-p63-s16515072-pps-tg-ndrpdr"
-    - "Tests.Trex.Perf.Ip4.1N1L-100Ge2P1E810Cq-Ethip4Udp-Ip4Base-H1024-P63-S64512-pps-Tg-Ndrpdr.100B--ethip4udp-ip4base-h1024-p63-s64512-pps-tg-ndrpdr"
-    - "Tests.Trex.Perf.Ip4.1N1L-100Ge2P1E810Cq-Ethip4Udp-Ip4Base-H262144-P63-S16515072-pps-Tg-Ndrpdr.100B--ethip4udp-ip4base-h262144-p63-s16515072-pps-tg-ndrpdr"
+    - "Tests.Trex.Perf.Ip4.1N1L-100Ge2P1E810Cq-Ethip4Tcp-Ip4Base-H1024-P63-S64512-tput-Tg-Ndrpdr.100B--ethip4tcp-ip4base-h1024-p63-s64512-tput-tg-ndrpdr"
+    - "Tests.Trex.Perf.Ip4.1N1L-100Ge2P1E810Cq-Ethip4Tcp-Ip4Base-H262144-P63-S16515072-tput-Tg-Ndrpdr.100B--ethip4tcp-ip4base-h262144-p63-s16515072-tput-tg-ndrpdr"
+    - "Tests.Trex.Perf.Ip4.1N1L-100Ge2P1E810Cq-Ethip4Udp-Ip4Base-H1024-P63-S64512-tput-Tg-Ndrpdr.100B--ethip4udp-ip4base-h1024-p63-s64512-tput-tg-ndrpdr"
+    - "Tests.Trex.Perf.Ip4.1N1L-100Ge2P1E810Cq-Ethip4Udp-Ip4Base-H262144-P63-S16515072-tput-Tg-Ndrpdr.100B--ethip4udp-ip4base-h262144-p63-s16515072-tput-tg-ndrpdr"
   layout:
-    title: "2n-icx-e810cq-64b--ip4routing-stf-pps-{test_type}"
+    title: "2n-icx-e810cq-64b--ip4routing-stf-tput-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"