Report: Add 4t2c graphs for aws

[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 a48f41d..bd6f00a 100644 (file)
--- a/resources/tools/presentation/specifications/report/elements.yaml
+++ b/resources/tools/presentation/specifications/report/elements.yaml
@@ -28,47 +28,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: "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-clx-coverage"
+  algorithm: "table_job_spec_duration"
+  output-file: "{DIR[STATIC,VPP]}/job-spec-duration-2n-clx-cov"
+  jb-type: "coverage"
+  data: "vpp-2n-clx-curr-cov"
+  lines:
+    - job-spec: "gso-00"
+      build: "18"
+    - job-spec: "ip4-00"
+      build: "19"
+    - job-spec: "ip4-01"
+      build: "20"
+    - job-spec: "ip4-02"
+      build: "21"
+    - job-spec: "ip4-03"
+      build: "22"
+    - job-spec: "ip4-04"
+      build: "23"
+    - job-spec: "ip4-05"
+      build: "24"
+    - job-spec: "ip4-06"
+      build: "25"
+    - job-spec: "ip4-07"
+      build: "26"
+    - job-spec: "ip4tun-00"
+      build: "27"
+    - job-spec: "ip6-00"
+      build: "28"
+    - job-spec: "ip6-01"
+      build: "29"
+    - job-spec: "l2-00"
+      build: "30"
+    - job-spec: "l2-01"
+      build: "31"
+    - job-spec: "lb-00"
+      build: "32"
+    - job-spec: "memif-00"
+      build: "33"
+    - job-spec: "vhost-00"
+      build: "34"
 
 - type: "table"
   title: "Job Specification Duration: 2n-dnv-iterative"
@@ -221,41 +221,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:
+- 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"
+    - 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"
@@ -272,39 +272,39 @@
     - 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"
+- 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-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: "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: "lb-00"
+      build: "13"
 #     - job-spec: "memif-00"
 #       build: "14"
 #     - job-spec: "vhost-00"
@@ -364,81 +364,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: "1"
-#     - job-spec: "crypto-01"
-#       build: "3"
-#     - job-spec: "crypto-02"
-#       build: "4"
-#     - job-spec: "crypto-03"
-#       build: "36"
-#     - job-spec: "crypto-04"
-#       build: "6"
-#     - job-spec: "ip4-00"
-#       build: "7"
-#     - job-spec: "ip4-01"
-#       build: "8"
-#     - job-spec: "ip4-02"
-#       build: "9"
-#     - job-spec: "ip4-03"
-#       build: "10"
-#     - job-spec: "ip4-04"
-#       build: "11"
-#     - job-spec: "ip4-05"
-#       build: "12"
-#     - job-spec: "ip4-06"
-#       build: "13"
-#     - job-spec: "ip4-07"
-#       build: "14"
-#     - job-spec: "ip4tun-00"
-#       build: "15"
-#     - job-spec: "ip4tun-02"
-#       build: "16"
-#     - job-spec: "ip6-00"
-#       build: "17"
-#     - job-spec: "ip6-01"
-#       build: "18"
-#     - job-spec: "ip6tun-00"
-#       build: "19"
-#     - job-spec: "l2-00"
-#       build: "20"
-#     - job-spec: "l2-01"
-#       build: "21"
-#     - job-spec: "l2-02"
-#       build: "22"
-#     - job-spec: "l2-03"
-#       build: "23"
-#     - job-spec: "l2-04"
-#       build: "24"
-#     - job-spec: "l2-05"
-#       build: "25"
-#     - job-spec: "l2-06"
-#       build: "26"
-#     - job-spec: "l2-07"
-#       build: "27"
-#     - job-spec: "l2-08"
-#       build: "28"
-#     - job-spec: "l2-09"
-#       build: "29"
-#     - job-spec: "l2-10"
-#       build: "30"
-#     - job-spec: "memif-00"
-#       build: "31"
-#     - job-spec: "srv6-00"
-#       build: "32"
-#     - job-spec: "srv6-01"
-#       build: "33"
-#     - job-spec: "vhost-00"
-#       build: "34"
-#     - job-spec: "vhost-01"
-#       build: "35"
+- type: "table"
+  title: "Job Specification Duration: 3n-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"
+      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-tsh-iterative"
@@ -453,47 +453,47 @@
     - job-spec: "dpdk-mlr-00"
       data-set: "dpdk-3n-tsh-curr-iter"
 
-# - type: "table"
-#   title: "Job Specification Duration: 3n-tsh-coverage"
-#   algorithm: "table_job_spec_duration"
-#   output-file: "{DIR[STATIC,VPP]}/job-spec-duration-3n-tsh-cov"
-#   jb-type: "coverage"
-#   data: "vpp-3n-tsh-curr-cov"
-#   lines:
-#     - job-spec: "ip4-00"
-#       build: "7"
-#     - job-spec: "ip4-01"
-#       build: "8"
-#     - job-spec: "ip4-02"
-#       build: "9"
-#     - job-spec: "ip4-03"
-#       build: "10"
-#     - job-spec: "ip4tun-00"
-#       build: "15"
-#     - job-spec: "ip6-00"
-#       build: "17"
-#     - job-spec: "ip6-01"
-#       build: "18"
-#     - job-spec: "l2-00"
-#       build: "20"
-#     - job-spec: "l2-01"
-#       build: "21"
-#     - job-spec: "l2-02"
-#       build: "22"
-#     - job-spec: "l2-03"
-#       build: "23"
-#     - job-spec: "l2-04"
-#       build: "24"
-#     - job-spec: "memif-00"
-#       build: "31"
-#     - job-spec: "srv6-00"
-#       build: "32"
-#     - job-spec: "srv6-01"
-#       build: "33"
-#     - job-spec: "vhost-00"
-#       build: "34"
-#     - job-spec: "vhost-01"
-#       build: "35"
+- 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"
 
 # VPP Latency Changes 3n-skx 2t1c
 - type: "table"
@@ -7327,10 +7327,11 @@
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-aws-nitro50g-64b-{core}-ip4routing-base-scale-{test_type}"
   data: "vpp-2n-aws-curr-iter"
-  core: ["2t1c", ]
+  core: ["2t1c", 4t2c]
   include:
     - "Tests.Vpp.Perf.Ip4.2n1l-50ge1p1ENA-ethip4-ip4base-ndrpdr.64B-{core}-ethip4-ip4base-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2n1l-50ge1p1ENA-ethip4-ip4scale20k-ndrpdr.64B-{core}-ethip4-ip4scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2n1l-50ge1p1ENA-ethip4-ip4scale20k-rnd-ndrpdr.64B-{core}-ethip4-ip4scale20k-rnd-ndrpdr"
   layout:
     title: "2n-aws-nitro50g-64b-{core}-ip4routing-base-scale-ena-{test_type}"
     layout: "plot-throughput"
@@ -7340,23 +7341,39 @@
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-aws-nitro50g-1518b-{core}-ip4routing-base-scale-{test_type}"
   data: "vpp-2n-aws-curr-iter"
-  core: ["2t1c", ]
+  core: ["2t1c", 4t2c]
   include:
     - "Tests.Vpp.Perf.Ip4.2n1l-50ge1p1ENA-ethip4-ip4base-ndrpdr.1518b-{core}-ethip4-ip4base-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2n1l-50ge1p1ENA-ethip4-ip4scale20k-ndrpdr.1518b-{core}-ethip4-ip4scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2n1l-50ge1p1ENA-ethip4-ip4scale20k-rnd-ndrpdr.1518b-{core}-ethip4-ip4scale20k-rnd-ndrpdr"
   layout:
     title: "2n-aws-nitro50g-1518b-{core}-ip4routing-base-scale-ena-{test_type}"
     layout: "plot-throughput"
 
+- type: "plot"
+  title: "Throughput: 2n-aws-nitro50g-78b-{core}-ip6routing-base-scale-ena-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-aws-nitro50g-78b-{core}-ip6routing-base-scale-{test_type}"
+  data: "vpp-2n-aws-curr-iter"
+  core: ["2t1c", 4t2c]
+  include:
+    - "Tests.Vpp.Perf.Ip6.2n1l-50ge1p1ENA-ethip6-ip6base-ndrpdr.78b-{core}-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2n1l-50ge1p1ENA-ethip6-ip6scale20k-ndrpdr.78b-{core}-ethip6-ip6scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2n1l-50ge1p1ENA-ethip6-ip6scale20k-rnd-ndrpdr.78b-{core}-ethip6-ip6scale20k-rnd-ndrpdr"
+  layout:
+    title: "2n-aws-nitro50g-78b-{core}-ip6routing-base-scale-ena-{test_type}"
+    layout: "plot-throughput"
+
 - type: "plot"
   title: "Throughput: 2n-aws-nitro50g-1518b-{core}-ip6routing-base-scale-ena-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-aws-nitro50g-1518b-{core}-ip6routing-base-scale-{test_type}"
   data: "vpp-2n-aws-curr-iter"
-  core: ["2t1c", ]
+  core: ["2t1c", 4t2c]
   include:
     - "Tests.Vpp.Perf.Ip6.2n1l-50ge1p1ENA-ethip6-ip6base-ndrpdr.1518B-{core}-ethip6-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2n1l-50ge1p1ENA-ethip6-ip6scale20k-ndrpdr.1518B-{core}-ethip6-ip6scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2n1l-50ge1p1ENA-ethip6-ip6scale20k-rnd-ndrpdr.1518B-{core}-ethip6-ip6scale20k-rnd-ndrpdr"
   layout:
     title: "2n-aws-nitro50g-1518b-{core}-ip6routing-base-scale-ena-{test_type}"
     layout: "plot-throughput"
@@ -7366,10 +7383,11 @@
   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", ]
+  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"
@@ -7379,10 +7397,11 @@
   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", ]
+  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"
@@ -7392,7 +7411,7 @@
   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", ]
+  core: ["2t1c", 4t2c]
   include:
     - "Tests.Vpp.Perf.Crypto.50ge1p1ENA-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr.1518B-{core}-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr"
   layout:
@@ -7404,7 +7423,7 @@
   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", ]
+  core: ["2t1c", 4t2c]
   include:
     - "Tests.Vpp.Perf.Crypto.50ge1p1ENA-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr.imix-{core}-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr"
   layout:
@@ -8622,6 +8641,24 @@
     title: "3n-skx-xxv710-imix-ipsec-ip4routing-base-scale-avf-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
+- type: "plot"
+  title: "Speedup: 3n-skx-xxv710-1518b-ipsec-ip4routing-base-scale-avf-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-1518b-ipsec-ip4routing-base-scale-avf-{test_type}-tsa"
+  data: "vpp-3n-skx-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518b-.t.c-avf-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.1518b-.t.c-avf-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518b-.t.c-avf-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.1518b-.t.c-avf-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518b-.t.c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.1518b-.t.c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518b-.t.c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.1518b-.t.c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+  layout:
+    title: "3n-skx-xxv710-1518b-ipsec-ip4routing-base-scale-avf-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
 - type: "plot"
   title: "Speedup: 3n-skx-xxv710-imix-ipsec-ip4routing-base-scale-dpdk-{test_type}-tsa"
   algorithm: "plot_tsa_name"
@@ -9813,7 +9850,7 @@
 - type: "plot"
   title: "Throughput: 2n-clx-x710-64b-{core}-l2switching-base-avf-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-x710-64b-{core}-l2switching-base-avf]-{test_type}"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-x710-64b-{core}-l2switching-base-avf-{test_type}"
   data: "vpp-2n-clx-curr-iter"
   core: ["2t1c", ]
   include:
@@ -10802,9 +10839,9 @@
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 2n-icx-e810cq-64b-features-ip4routing-base-scale-avf-{test_type}-tsa"
+  title: "Speedup: 2n-icx-e810cq-64b-features-ip4routing-base-avf-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-features-ip4routing-base-scale-avf-{test_type}-tsa"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-features-ip4routing-base-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"
@@ -10812,7 +10849,7 @@
     - "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-icx-e810cq-64b-features-ip4routing-base-scale-avf-{test_type}"
+    title: "2n-icx-e810cq-64b-features-ip4routing-base-avf-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"