Report: Fix bug in 3n-alt comparison tables
[csit.git] / resources / tools / presentation / specifications / report / elements.yaml
index 4a328a8..6ae7c47 100644 (file)
     # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
     - '2302.0-11 vs 2210.0-11: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
+# VPP Performance Changes 3n-icx-e810xxv 2t1c pdr
+- type: "table"
+  title: "VPP Performance Changes 3n-icx-e810xxv 2t1c pdr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-icx-e810xxv-2t1c-pdr"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-E810XXV'"
+  columns:
+    - title: "2206.0-10"
+      data-set: "vpp-3n-icx-hist-iter"
+    - title: "2210.0-11"
+      data-set: "vpp-3n-icx-prev-iter-old-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-3n-icx-prev-iter-new-env"
+    - title: "2302.0-11"
+      data-set: "vpp-3n-icx-curr-iter"
+  comparisons:
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2302.0-11 vs 2210.0-11"
+      reference: 2
+      compare: 3
+  legend:
+    - ''
+    - 'Test Case:              Test cases executed for: PDR throughput on 3n-icx with e810xxv.'
+    - 'YYMM.V-E:               [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "10" for CSIT rls2206, "11" for CSIT rls2210 and rls2302).'
+    - 'YYMM.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-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2302.0-11 vs 2210.0-11: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
+
+# VPP Performance Changes 3n-icx-e810xxv 4t2c pdr
+- type: "table"
+  title: "VPP Performance Changes 3n-icx-e810xxv 4t2c pdr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-icx-e810xxv-4t2c-pdr"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-E810XXV'"
+  columns:
+    - title: "2206.0-10"
+      data-set: "vpp-3n-icx-hist-iter"
+    - title: "2210.0-11"
+      data-set: "vpp-3n-icx-prev-iter-old-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-3n-icx-prev-iter-new-env"
+    - title: "2302.0-11"
+      data-set: "vpp-3n-icx-curr-iter"
+  comparisons:
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2302.0-11 vs 2210.0-11"
+      reference: 2
+      compare: 3
+  legend:
+    - ''
+    - 'Test Case:              Test cases executed for: PDR throughput on 3n-icx with e810xxv.'
+    - 'YYMM.V-E:               [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "10" for CSIT rls2206, "11" for CSIT rls2210 and rls2302).'
+    - 'YYMM.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-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2302.0-11 vs 2210.0-11: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
+
+# VPP Performance Changes 3n-icx-e810xxv 2t1c ndr
+- type: "table"
+  title: "VPP Performance Changes 3n-icx-e810xxv 2t1c ndr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-icx-e810xxv-2t1c-ndr"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-E810XXV'"
+  columns:
+    - title: "2206.0-10"
+      data-set: "vpp-3n-icx-hist-iter"
+    - title: "2210.0-11"
+      data-set: "vpp-3n-icx-prev-iter-old-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-3n-icx-prev-iter-new-env"
+    - title: "2302.0-11"
+      data-set: "vpp-3n-icx-curr-iter"
+  comparisons:
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2302.0-11 vs 2210.0-11"
+      reference: 2
+      compare: 3
+  legend:
+    - ''
+    - 'Test Case:              Test cases executed for: NDR throughput on 3n-icx with e810xxv.'
+    - 'YYMM.V-E:               [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "10" for CSIT rls2206, "11" for CSIT rls2210 and rls2302).'
+    - 'YYMM.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-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2302.0-11 vs 2210.0-11: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
+
+# VPP Performance Changes 3n-icx-e810xxv 4t2c ndr
+- type: "table"
+  title: "VPP Performance Changes 3n-icx-e810xxv 4t2c ndr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-icx-e810xxv-4t2c-ndr"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-E810XXV'"
+  columns:
+    - title: "2206.0-10"
+      data-set: "vpp-3n-icx-hist-iter"
+    - title: "2210.0-11"
+      data-set: "vpp-3n-icx-prev-iter-old-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-3n-icx-prev-iter-new-env"
+    - title: "2302.0-11"
+      data-set: "vpp-3n-icx-curr-iter"
+  comparisons:
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2302.0-11 vs 2210.0-11"
+      reference: 2
+      compare: 3
+  legend:
+    - ''
+    - 'Test Case:              Test cases executed for: NDR throughput on 3n-icx with e810xxv.'
+    - 'YYMM.V-E:               [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "10" for CSIT rls2206, "11" for CSIT rls2210 and rls2302).'
+    - 'YYMM.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-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2302.0-11 vs 2210.0-11: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
+
+
 # VPP Performance Changes 2n-icx 2t1c pdr
 - type: "table"
   title: "VPP Performance Changes 2n-icx 2t1c pdr"
     #   reference: 3
     #   compare: 4
     - title: "2302.0-11 vs 2210.0-11"
-      reference: 1
-      compare: 2
+      reference: 2
+      compare: 3
   legend:
     - ''
     - 'Test Case:              Test cases executed for: PDR throughput on 3n-alt with xl710.'
     #   reference: 3
     #   compare: 4
     - title: "2302.0-11 vs 2210.0-11"
-      reference: 1
-      compare: 2
+      reference: 2
+      compare: 3
   legend:
     - ''
     - 'Test Case:              Test cases executed for: NDR throughput on 3n-alt with xl710.'
     # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
     - '2302.0-11 vs 2210.0-11: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
-
 # VPP Performance Changes 3n-icx 2t1c mrr
 - type: "table"
   title: "VPP Performance Changes 3n-icx 2t1c mrr"
     # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
     - '2302.0-11 vs 2210.0-11: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
+
+# VPP Performance Changes 3n-icx-e810xxv 2t1c mrr
+- type: "table"
+  title: "VPP Performance Changes 3n-icx-e810xxv 2t1c mrr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-icx-e810xxv-2t1c-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T1C' and 'MRR' and 'NIC_Intel-E810XXV'"
+  columns:
+    - title: "2206.0-10"
+      data-set: "vpp-3n-icx-hist-iter-mrr"
+    - title: "2210.0-11"
+      data-set: "vpp-3n-icx-prev-iter-mrr-old-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-3n-icx-prev-iter-mrr-new-env"
+    - title: "2302.0-11"
+      data-set: "vpp-3n-icx-curr-iter-mrr"
+  comparisons:
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2302.0-11 vs 2210.0-11"
+      reference: 2
+      compare: 3
+  legend:
+    - ''
+    - 'Test Case:              Test cases executed for: MRR throughput on 3n-icx with e810xxv.'
+    - 'YYMM.V-E:               [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "10" for CSIT rls2206, "11" for CSIT rls2210 and rls2302).'
+    - 'YYMM.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-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2302.0-11 vs 2210.0-11: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
+
+# VPP Performance Changes 3n-icx-e810xxv 4t2c mrr
+- type: "table"
+  title: "VPP Performance Changes 3n-icx-e810xxv 4t2c mrr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-icx-e810xxv-4t2c-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T2C' and 'MRR' and 'NIC_Intel-E810XXV'"
+  columns:
+    - title: "2206.0-10"
+      data-set: "vpp-3n-icx-hist-iter-mrr"
+    - title: "2210.0-11"
+      data-set: "vpp-3n-icx-prev-iter-mrr-old-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-3n-icx-prev-iter-mrr-new-env"
+    - title: "2302.0-11"
+      data-set: "vpp-3n-icx-curr-iter-mrr"
+  comparisons:
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2302.0-11 vs 2210.0-11"
+      reference: 2
+      compare: 3
+  legend:
+    - ''
+    - 'Test Case:              Test cases executed for: MRR throughput on 3n-icx with e810xxv.'
+    - 'YYMM.V-E:               [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "10" for CSIT rls2206, "11" for CSIT rls2210 and rls2302).'
+    - 'YYMM.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-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2302.0-11 vs 2210.0-11: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
+
+# VPP Performance Changes 3n-icx-e810xxv 8t4c mrr
+- type: "table"
+  title: "VPP Performance Changes 3n-icx-e810xxv 8t4c mrr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-icx-e810xxv-8t4c-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'8T4C' and 'MRR' and 'NIC_Intel-E810XXV'"
+  columns:
+    - title: "2206.0-10"
+      data-set: "vpp-3n-icx-hist-iter-mrr"
+    - title: "2210.0-11"
+      data-set: "vpp-3n-icx-prev-iter-mrr-old-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-3n-icx-prev-iter-mrr-new-env"
+    - title: "2302.0-11"
+      data-set: "vpp-3n-icx-curr-iter-mrr"
+  comparisons:
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2302.0-11 vs 2210.0-11"
+      reference: 2
+      compare: 3
+  legend:
+    - ''
+    - 'Test Case:              Test cases executed for: MRR throughput on 3n-icx with e810xxv.'
+    - 'YYMM.V-E:               [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "10" for CSIT rls2206, "11" for CSIT rls2210 and rls2302).'
+    - 'YYMM.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-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2302.0-11 vs 2210.0-11: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
+
 # VPP Performance Changes 2n-icx 2t1c mrr
 - type: "table"
   title: "VPP Performance Changes 2n-icx 2t1c mrr"
       - "vts"
       - "lb"
       - "nfv_density"
-      - "hoststack"
+      - "hoststack"
     level-2:
       - "2n-clx"
       - "2n-icx"
       - "vts"
       - "lb"
       - "nfv_density"
-      - "hoststack"
+      - "hoststack"
     level-2:
       - "2n-clx"
       - "2n-icx"
       - "vts"
       - "lb"
       - "nfv_density"
-      - "hoststack"
+      - "hoststack"
     level-2:
       - "2n-clx"
       - "2n-icx"
       - "vts"
       - "lb"
       - "nfv_density"
-      - "hoststack"
+      - "hoststack"
     level-2:
       - "2n-clx"
       - "2n-icx"
       - "vts"
       - "lb"
       - "nfv_density"
-      - "hoststack"
+      - "hoststack"
     level-2:
       - "2n-clx"
       - "2n-icx"
   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: ["1t1c", "1t2c"]
+  core: ["1t1c", "2t2c"]
   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"
 
 # 3n-icx Throughput
 
+- type: "plot"
+  title: "Throughput: 3n-icx-e810xxv-1518b-{core}-ipsec-fixtnlip-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810xxv-1518b-{core}-ipsec-fixtnlip-{test_type}"
+  data: "vpp-3n-icx-curr-iter"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1E810Xxv-Ethip4Ipsec1000Tnlsw-Fixtnlip-Ip4Base-Policy-Aes256Gcm-Ndrpdr.1518B-{core}-ethip4ipsec1000tnlsw-fixtnlip-ip4base-policy-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1E810Xxv-Ethip4Ipsec1000Tnlsw-Fixtnlip-Ip4Base-Policy-Flow-Dir-Aes256Gcm-Ndrpdr.1518B-{core}-ethip4ipsec1000tnlsw-fixtnlip-ip4base-policy-flow-dir-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1E810Xxv-Ethip4Ipsec1000Tnlsw-Fixtnlip-Ip4Base-Policy-Flow-Rss-Aes256Gcm-Ndrpdr.1518B-{core}-ethip4ipsec1000tnlsw-fixtnlip-ip4base-policy-flow-rss-aes256gcm-ndrpdr"
+  layout:
+    title: "3n-icx-e810xxv-1518b-{core}-ipsec-fixtnlip-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 3n-icx-e810xxv-imix-{core}-ipsec-fixtnlip-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810xxv-imix-{core}-ipsec-fixtnlip-{test_type}"
+  data: "vpp-3n-icx-curr-iter"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1E810Xxv-Ethip4Ipsec1000Tnlsw-Fixtnlip-Ip4Base-Policy-Aes256Gcm-Ndrpdr.IMIX-{core}-ethip4ipsec1000tnlsw-fixtnlip-ip4base-policy-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1E810Xxv-Ethip4Ipsec1000Tnlsw-Fixtnlip-Ip4Base-Policy-Flow-Dir-Aes256Gcm-Ndrpdr.IMIX-{core}-ethip4ipsec1000tnlsw-fixtnlip-ip4base-policy-flow-dir-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1E810Xxv-Ethip4Ipsec1000Tnlsw-Fixtnlip-Ip4Base-Policy-Flow-Rss-Aes256Gcm-Ndrpdr.IMIX-{core}-ethip4ipsec1000tnlsw-fixtnlip-ip4base-policy-flow-rss-aes256gcm-ndrpdr"
+  layout:
+    title: "3n-icx-e810xxv-imix-{core}-ipsec-fixtnlip-{test_type}"
+    layout: "plot-throughput"
+
 - type: "plot"
   title: "Throughput: 3n-icx-xxv710-1518b-{core}-ipsec-aes128cbc-ip4routing-base-scale-sw-avf-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   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", ]
+  core: ["2t2c", ]
   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"
   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", ]
+  core: ["2t2c", ]
   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"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-imix-{core}-ipsec-scheduler-ip4routing-base-scale-sw-avf-{test_type}"
   data: "vpp-3n-icx-curr-iter"
-  core: ["2t1c", ]
+  core: ["2t2c", ]
   include:
     - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1Tnlswasync-Scheduler-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.imix-{core}-avf-ethip4ipsec1tnlswasync-scheduler-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
     - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec8Tnlswasync-Scheduler-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.imix-{core}-avf-ethip4ipsec8tnlswasync-scheduler-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-imix-{core}-ipsec-scheduler-ip4routing-base-scale-sw-dpdk-{test_type}"
   data: "vpp-3n-icx-curr-iter"
-  core: ["2t1c", ]
+  core: ["2t2c", ]
   include:
     - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec1Tnlswasync-Scheduler-Ip4Base-Int-Aes256Gcm-ndrpdr.imix-{core}-ethip4ipsec1tnlswasync-scheduler-ip4base-int-aes256gcm-ndrpdr"
     - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec8Tnlswasync-Scheduler-Ip4Base-Int-Aes256Gcm-ndrpdr.imix-{core}-ethip4ipsec8tnlswasync-scheduler-ip4base-int-aes256gcm-ndrpdr"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-1518b-{core}-ipsec-scheduler-ip4routing-base-scale-sw-avf-{test_type}"
   data: "vpp-3n-icx-curr-iter"
-  core: ["2t1c", ]
+  core: ["2t2c", ]
   include:
     - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec1Tnlswasync-Scheduler-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.1518B-{core}-avf-ethip4ipsec1tnlswasync-scheduler-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
     - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec8Tnlswasync-Scheduler-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.1518B-{core}-avf-ethip4ipsec8tnlswasync-scheduler-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-1518b-{core}-ipsec-scheduler-ip4routing-base-scale-sw-dpdk-{test_type}"
   data: "vpp-3n-icx-curr-iter"
-  core: ["2t1c", ]
+  core: ["2t2c", ]
   include:
     - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Ethip4Ipsec1Tnlswasync-Scheduler-Ip4Base-Int-Aes256Gcm-ndrpdr.1518B-{core}-ethip4ipsec1tnlswasync-scheduler-ip4base-int-aes256gcm-ndrpdr"
     - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Ethip4Ipsec8Tnlswasync-Scheduler-Ip4Base-Int-Aes256Gcm-ndrpdr.1518B-{core}-ethip4ipsec8tnlswasync-scheduler-ip4base-int-aes256gcm-ndrpdr"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-imix-{core}-ipsec-scheduler-ip4routing-base-scale-sw-avf-{test_type}"
   data: "vpp-3n-icx-curr-iter"
-  core: ["2t1c", ]
+  core: ["2t2c", ]
   include:
     - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec1Tnlswasync-Scheduler-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.imix-{core}-avf-ethip4ipsec1tnlswasync-scheduler-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
     - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec8Tnlswasync-Scheduler-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.imix-{core}-avf-ethip4ipsec8tnlswasync-scheduler-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-imix-{core}-ipsec-scheduler-ip4routing-base-scale-sw-dpdk-{test_type}"
   data: "vpp-3n-icx-curr-iter"
-  core: ["2t1c", ]
+  core: ["2t2c", ]
   include:
     - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Ethip4Ipsec1Tnlswasync-Scheduler-Ip4Base-Int-Aes256Gcm-ndrpdr.imix-{core}-ethip4ipsec1tnlswasync-scheduler-ip4base-int-aes256gcm-ndrpdr"
     - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Ethip4Ipsec8Tnlswasync-Scheduler-Ip4Base-Int-Aes256Gcm-ndrpdr.imix-{core}-ethip4ipsec8tnlswasync-scheduler-ip4base-int-aes256gcm-ndrpdr"
 
 # 3n-icx Speedup
 
+- type: "plot"
+  title: "Speedup: 3n-icx-e810xxv-1518b-ipsec-fixtnlip-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810xxv-1518b-ipsec-fixtnlip-{test_type}-tsa"
+  data: "vpp-3n-icx-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1E810Xxv-Ethip4Ipsec1000Tnlsw-Fixtnlip-Ip4Base-Policy-Aes256Gcm-Ndrpdr.1518B-.t.c-ethip4ipsec1000tnlsw-fixtnlip-ip4base-policy-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1E810Xxv-Ethip4Ipsec1000Tnlsw-Fixtnlip-Ip4Base-Policy-Flow-Dir-Aes256Gcm-Ndrpdr.1518B-.t.c-ethip4ipsec1000tnlsw-fixtnlip-ip4base-policy-flow-dir-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1E810Xxv-Ethip4Ipsec1000Tnlsw-Fixtnlip-Ip4Base-Policy-Flow-Rss-Aes256Gcm-Ndrpdr.1518B-.t.c-ethip4ipsec1000tnlsw-fixtnlip-ip4base-policy-flow-rss-aes256gcm-ndrpdr"
+  layout:
+    title: "3n-icx-e810xxv-1518b-ipsec-fixtnlip-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 3n-icx-e810xxv-imix-ipsec-fixtnlip-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810xxv-imix-ipsec-fixtnlip-{test_type}-tsa"
+  data: "vpp-3n-icx-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1E810Xxv-Ethip4Ipsec1000Tnlsw-Fixtnlip-Ip4Base-Policy-Aes256Gcm-Ndrpdr.IMIX-.t.c-ethip4ipsec1000tnlsw-fixtnlip-ip4base-policy-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1E810Xxv-Ethip4Ipsec1000Tnlsw-Fixtnlip-Ip4Base-Policy-Flow-Dir-Aes256Gcm-Ndrpdr.IMIX-.t.c-ethip4ipsec1000tnlsw-fixtnlip-ip4base-policy-flow-dir-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1E810Xxv-Ethip4Ipsec1000Tnlsw-Fixtnlip-Ip4Base-Policy-Flow-Rss-Aes256Gcm-Ndrpdr.IMIX-.t.c-ethip4ipsec1000tnlsw-fixtnlip-ip4base-policy-flow-rss-aes256gcm-ndrpdr"
+  layout:
+    title: "3n-icx-e810xxv-imix-ipsec-fixtnlip-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
 - type: "plot"
   title: "Speedup: 3n-icx-xxv710-1518b-ipsec-aes128cbc-ip4routing-base-scale-sw-avf-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file-links: "{DIR[LAT,DPDK]}/2n_icx.rst"
   target-links: "../../_static/dpdk"
   data: "dpdk-2n-icx-curr-iter-best"
-  filter: "'1T1C' and 'NIC_Intel-XXV710'"
+  filter: "'2T1C' and 'NIC_Intel-XXV710'"
   layout:
     layout: "plot-hdrh-latency-percentile-x-log"
 
   output-file-links: "{DIR[LAT,DPDK]}/3n_icx.rst"
   target-links: "../../_static/dpdk"
   data: "dpdk-3n-icx-curr-iter-best"
-  filter: "'1T1C' and 'NIC_Intel-XXV710'"
+  filter: "'2T1C' and 'NIC_Intel-XXV710'"
   layout:
     layout: "plot-hdrh-latency-percentile-x-log"
 
   output-file-links: "{DIR[LAT,DPDK]}/2n_clx.rst"
   target-links: "../../_static/dpdk"
   data: "dpdk-2n-clx-curr-iter-best"
-  filter: "'1T1C' and 'NIC_Intel-XXV710'"
+  filter: "'2T1C' and 'NIC_Intel-XXV710'"
   layout:
     layout: "plot-hdrh-latency-percentile-x-log"
 
   output-file-links: "{DIR[LAT,DPDK]}/2n_zn2.rst"
   target-links: "../../_static/dpdk"
   data: "dpdk-2n-zn2-curr-iter-best"
-  filter: "'1T1C' and 'NIC_Intel-XXV710'"
+  filter: "'2T1C' and 'NIC_Intel-XXV710'"
   layout:
     layout: "plot-hdrh-latency-percentile-x-log"