X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fspecifications%2Ftrending%2Felements.yaml;h=c7f9c969d4531d5a54fef15a00220f58cdc95122;hp=b549948a4f8247f80037a275f382ed474a27129a;hb=3d629c4e670186a8506bfd9f50c85453c4fa7acd;hpb=a4fe771848907ee4a551cf06432f1ec6da496608

diff --git a/resources/tools/presentation/specifications/trending/elements.yaml b/resources/tools/presentation/specifications/trending/elements.yaml
index b549948a4f..c7f9c969d4 100644
--- a/resources/tools/presentation/specifications/trending/elements.yaml
+++ b/resources/tools/presentation/specifications/trending/elements.yaml
@@ -2,6 +2,14 @@
 ###                                P L O T S                                 ###
 ################################################################################
 
+- type: "plot"
+  title: "Statistics: 2n-icx mrr"
+  algorithm: "plot_statistics"
+  output-file: "{DIR[STATIC,VPP]}/stats-2n-icx-mrr"
+  data: "plot-performance-trending-vpp-2n-icx"
+  layout:
+    layout: "plot-statistics"
+
 - type: "plot"
   title: "Statistics: 3n-skx mrr"
   algorithm: "plot_statistics"
@@ -50,6 +58,14 @@
   layout:
     layout: "plot-statistics"
 
+- type: "plot"
+  title: "Statistics: TRex 2n-skx ndrpdr"
+  algorithm: "plot_statistics"
+  output-file: "{DIR[STATIC,VPP]}/stats-trex-2n-skx-ndrpdr"
+  data: "plot-ndrpdr-trending-trex-2n-skx"
+  layout:
+    layout: "plot-statistics"
+
 - type: "plot"
   title: "Statistics: 2n-clx mrr"
   algorithm: "plot_statistics"
@@ -138,6 +154,22 @@
   layout:
     layout: "plot-statistics"
 
+- type: "plot"
+  title: "Statistics: 3n-aws mrr"
+  algorithm: "plot_statistics"
+  output-file: "{DIR[STATIC,VPP]}/stats-3n-aws-mrr"
+  data: "plot-performance-trending-vpp-3n-aws"
+  layout:
+    layout: "plot-statistics"
+
+- type: "plot"
+  title: "Statistics: 2n-aws mrr"
+  algorithm: "plot_statistics"
+  output-file: "{DIR[STATIC,VPP]}/stats-2n-aws-mrr"
+  data: "plot-performance-trending-vpp-2n-aws"
+  layout:
+    layout: "plot-statistics"
+
 ################################################################################
 ###                               T A B L E S                                ###
 ################################################################################
@@ -232,6 +264,21 @@
     - reference: -2
       compare: -1
 
+# Last failed tests
+
+- type: "table"
+  title: "Last failed tests (last builds) VPP 2n-icx"
+  algorithm: "table_last_failed_tests"
+  output-file-ext: ".txt"
+  output-file: "{DIR[STATIC,VPP]}/last-failed-tests-vpp-2n-icx-mrr"
+  data: "table-last-failed-tests-2n-icx"
+  filter: "'MRR'"
+  parameters:
+    - "name"
+    - "parent"
+    - "status"
+    - "msg"
+
 - type: "table"
   title: "Last failed tests (last builds) VPP 3n-skx"
   algorithm: "table_last_failed_tests"
@@ -243,6 +290,7 @@
     - "name"
     - "parent"
     - "status"
+    - "msg"
 
 - type: "table"
   title: "Last failed tests (last builds) VPP 2n-skx"
@@ -255,6 +303,7 @@
     - "name"
     - "parent"
     - "status"
+    - "msg"
 
 - type: "table"
   title: "Last failed tests (last builds) VPP 2n-clx"
@@ -267,6 +316,7 @@
     - "name"
     - "parent"
     - "status"
+    - "msg"
 
 - type: "table"
   title: "Last failed tests (last builds) VPP 2n-zn2"
@@ -279,6 +329,7 @@
     - "name"
     - "parent"
     - "status"
+    - "msg"
 
 - type: "table"
   title: "Last failed tests (last builds) VPP 3n-tsh"
@@ -291,6 +342,7 @@
     - "name"
     - "parent"
     - "status"
+    - "msg"
 
 - type: "table"
   title: "Last failed tests (last builds) VPP 2n-tx2"
@@ -303,6 +355,7 @@
     - "name"
     - "parent"
     - "status"
+    - "msg"
 
 - type: "table"
   title: "Last failed tests (last builds) VPP 3n-dnv"
@@ -315,6 +368,7 @@
     - "name"
     - "parent"
     - "status"
+    - "msg"
 
 - type: "table"
   title: "Last failed tests (last builds) VPP 2n-dnv"
@@ -327,6 +381,33 @@
     - "name"
     - "parent"
     - "status"
+    - "msg"
+
+- type: "table"
+  title: "Last failed tests (last builds) VPP 3n-aws"
+  algorithm: "table_last_failed_tests"
+  output-file-ext: ".txt"
+  output-file: "{DIR[STATIC,VPP]}/last-failed-tests-vpp-3n-aws-mrr"
+  data: "table-last-failed-tests-3n-aws"
+  filter: "'MRR'"
+  parameters:
+    - "name"
+    - "parent"
+    - "status"
+    - "msg"
+
+- type: "table"
+  title: "Last failed tests (last builds) VPP 2n-aws"
+  algorithm: "table_last_failed_tests"
+  output-file-ext: ".txt"
+  output-file: "{DIR[STATIC,VPP]}/last-failed-tests-vpp-2n-aws-mrr"
+  data: "table-last-failed-tests-2n-aws"
+  filter: "'MRR'"
+  parameters:
+    - "name"
+    - "parent"
+    - "status"
+    - "msg"
 
 - type: "table"
   title: "Last failed tests (last builds) VPP 3n-skx-ndrpdr"
@@ -339,6 +420,7 @@
     - "name"
     - "parent"
     - "status"
+    - "msg"
 
 - type: "table"
   title: "Last failed tests (last builds) VPP 2n-skx-ndrpdr"
@@ -351,6 +433,7 @@
     - "name"
     - "parent"
     - "status"
+    - "msg"
 
 - type: "table"
   title: "Last failed tests (last builds) VPP 2n-clx-ndrpdr"
@@ -363,6 +446,7 @@
     - "name"
     - "parent"
     - "status"
+    - "msg"
 
 - type: "table"
   title: "Last failed tests (last builds) DPDK 3n-tsh"
@@ -375,6 +459,7 @@
     - "name"
     - "parent"
     - "status"
+    - "msg"
 
 - type: "table"
   title: "Last failed tests (last builds) DPDK 2n-tx2"
@@ -387,6 +472,7 @@
     - "name"
     - "parent"
     - "status"
+    - "msg"
 
 - type: "table"
   title: "Last failed tests (last builds) DPDK 3n-skx"
@@ -399,6 +485,7 @@
     - "name"
     - "parent"
     - "status"
+    - "msg"
 
 - type: "table"
   title: "Last failed tests (last builds) DPDK 2n-skx"
@@ -411,6 +498,7 @@
     - "name"
     - "parent"
     - "status"
+    - "msg"
 
 - type: "table"
   title: "Last failed tests (last builds) DPDK 2n-clx"
@@ -423,6 +511,7 @@
     - "name"
     - "parent"
     - "status"
+    - "msg"
 
 # 3n-skx
 - type: "table"
@@ -647,6 +736,7 @@
     - "name"
     - "parent"
     - "status"
+    - "msg"
   window: 7  # days
 
 - type: "table"
@@ -667,6 +757,7 @@
     - "name"
     - "parent"
     - "status"
+    - "msg"
   window: 30  # days
 
 - type: "table"
@@ -753,6 +844,7 @@
     - "name"
     - "parent"
     - "status"
+    - "msg"
   window: 7  # days
 
 - type: "table"
@@ -773,6 +865,7 @@
     - "name"
     - "parent"
     - "status"
+    - "msg"
   window: 30  # days
 
 - type: "table"
@@ -859,6 +952,7 @@
     - "name"
     - "parent"
     - "status"
+    - "msg"
   window: 7  # days
 
 - type: "table"
@@ -879,6 +973,7 @@
     - "name"
     - "parent"
     - "status"
+    - "msg"
   window: 30  # days
 
 - type: "table"
@@ -965,6 +1060,7 @@
     - "name"
     - "parent"
     - "status"
+    - "msg"
   window: 7  # days
 
 - type: "table"
@@ -974,6 +1070,92 @@
   output-file: "{DIR[STATIC,VPP]}/failed-tests-2n-zn2.rst"
   testbed: "2n-zn2"
 
+################################################################################
+# 2n-icx
+- type: "table"
+  title: "Performance trending dashboard 2t1c-2n-icx"
+  algorithm: "table_perf_trending_dash"
+  output-file-ext: ".csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t1c-2n-icx"
+  data: "plot-performance-trending-vpp-2n-icx"
+  filter: "'MRR' and '2T1C'"
+  parameters:
+    - "name"
+    - "parent"
+    - "result"
+  window: 14
+  long-trend-window: 180
+
+- type: "table"
+  title: "Performance trending dashboard 4t2c-2n-icx"
+  algorithm: "table_perf_trending_dash"
+  output-file-ext: ".csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-4t2c-2n-icx"
+  data: "plot-performance-trending-vpp-2n-icx"
+  filter: "'MRR' and '4T2C'"
+  parameters:
+    - "name"
+    - "parent"
+    - "result"
+  window: 14
+  long-trend-window: 180
+
+- type: "table"
+  title: "Performance trending dashboard 8t4c-2n-icx"
+  algorithm: "table_perf_trending_dash"
+  output-file-ext: ".csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-8t4c-2n-icx"
+  data: "plot-performance-trending-vpp-2n-icx"
+  filter: "'MRR' and '8T4C'"
+  parameters:
+    - "name"
+    - "parent"
+    - "result"
+  window: 14
+  long-trend-window: 180
+
+- type: "table"
+  title: "HTML performance trending dashboard 2t1c-2n-icx"
+  algorithm: "table_perf_trending_dash_html"
+  input-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t1c-2n-icx.csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t1c-2n-icx.rst"
+  testbed: "2n-icx"
+
+- type: "table"
+  title: "HTML performance trending dashboard 4t2c-2n-icx"
+  algorithm: "table_perf_trending_dash_html"
+  input-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-4t2c-2n-icx.csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-4t2c-2n-icx.rst"
+  testbed: "2n-icx"
+
+- type: "table"
+  title: "HTML performance trending dashboard 8t4c-2n-icx"
+  algorithm: "table_perf_trending_dash_html"
+  input-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-8t4c-2n-icx.csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-8t4c-2n-icx.rst"
+  testbed: "2n-icx"
+
+- type: "table"
+  title: "Failed MRR tests 2n-icx"
+  algorithm: "table_failed_tests"
+  output-file-ext: ".csv"
+  output-file: "{DIR[STATIC,VPP]}/failed-tests-2n-icx"
+  data: "plot-performance-trending-vpp-2n-icx"
+  filter: "'MRR'"
+  parameters:
+    - "name"
+    - "parent"
+    - "status"
+    - "msg"
+  window: 7  # days
+
+- type: "table"
+  title: "HTML Failed MRR tests 2n-icx"
+  algorithm: "table_failed_tests_html"
+  input-file: "{DIR[STATIC,VPP]}/failed-tests-2n-icx.csv"
+  output-file: "{DIR[STATIC,VPP]}/failed-tests-2n-icx.rst"
+  testbed: "2n-icx"
+
 ################################################################################
 # 3n-tsh
 - type: "table"
@@ -1050,6 +1232,7 @@
     - "name"
     - "parent"
     - "status"
+    - "msg"
   window: 7  # days
 
 - type: "table"
@@ -1135,6 +1318,7 @@
     - "name"
     - "parent"
     - "status"
+    - "msg"
   window: 7  # days
 
 - type: "table"
@@ -1220,6 +1404,7 @@
     - "name"
     - "parent"
     - "status"
+    - "msg"
   window: 7  # days
 
 - type: "table"
@@ -1305,6 +1490,7 @@
     - "name"
     - "parent"
     - "status"
+    - "msg"
   window: 7  # days
 
 - type: "table"
@@ -1314,6 +1500,137 @@
   output-file: "{DIR[STATIC,VPP]}/failed-tests-2n-dnv.rst"
   testbed: "2n-dnv"
 
+
+################################################################################
+# 3n-aws
+- type: "table"
+  title: "Performance trending dashboard 2t1c-3n-aws"
+  algorithm: "table_perf_trending_dash"
+  output-file-ext: ".csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t1c-3n-aws"
+  data: "plot-performance-trending-vpp-3n-aws"
+  filter: "'MRR' and '2T1C'"
+  parameters:
+    - "name"
+    - "parent"
+    - "result"
+  window: 5
+  long-trend-window: 26
+
+- type: "table"
+  title: "Performance trending dashboard 4t2c-3n-aws"
+  algorithm: "table_perf_trending_dash"
+  output-file-ext: ".csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-4t2c-3n-aws"
+  data: "plot-performance-trending-vpp-3n-aws"
+  filter: "'MRR' and '4T2C'"
+  parameters:
+    - "name"
+    - "parent"
+    - "result"
+  window: 5
+  long-trend-window: 26
+
+- type: "table"
+  title: "HTML performance trending dashboard 2t1c-3n-aws"
+  algorithm: "table_perf_trending_dash_html"
+  input-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t1c-3n-aws.csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t1c-3n-aws.rst"
+  testbed: "3n-aws"
+
+- type: "table"
+  title: "HTML performance trending dashboard 4t2c-3n-aws"
+  algorithm: "table_perf_trending_dash_html"
+  input-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-4t2c-3n-aws.csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-4t2c-3n-aws.rst"
+  testbed: "3n-aws"
+
+- type: "table"
+  title: "Failed MRR tests 3n-aws"
+  algorithm: "table_failed_tests"
+  output-file-ext: ".csv"
+  output-file: "{DIR[STATIC,VPP]}/failed-tests-3n-aws"
+  data: "plot-performance-trending-vpp-3n-aws"
+  filter: "'MRR'"
+  parameters:
+    - "name"
+    - "parent"
+    - "status"
+    - "msg"
+  window: 7  # days
+
+- type: "table"
+  title: "HTML Failed MRR tests 3n-aws"
+  algorithm: "table_failed_tests_html"
+  input-file: "{DIR[STATIC,VPP]}/failed-tests-3n-aws.csv"
+  output-file: "{DIR[STATIC,VPP]}/failed-tests-3n-aws.rst"
+  testbed: "3n-aws"
+
+################################################################################
+# 2n-aws
+- type: "table"
+  title: "Performance trending dashboard 2t1c-2n-aws"
+  algorithm: "table_perf_trending_dash"
+  output-file-ext: ".csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t1c-2n-aws"
+  data: "plot-performance-trending-vpp-2n-aws"
+  filter: "'MRR' and '2T1C'"
+  parameters:
+    - "name"
+    - "parent"
+    - "result"
+  window: 5
+  long-trend-window: 26
+
+- type: "table"
+  title: "Performance trending dashboard 4t2c-2n-aws"
+  algorithm: "table_perf_trending_dash"
+  output-file-ext: ".csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-4t2c-2n-aws"
+  data: "plot-performance-trending-vpp-2n-aws"
+  filter: "'MRR' and '4T2C'"
+  parameters:
+    - "name"
+    - "parent"
+    - "result"
+  window: 5
+  long-trend-window: 26
+
+- type: "table"
+  title: "HTML performance trending dashboard 2t1c-2n-aws"
+  algorithm: "table_perf_trending_dash_html"
+  input-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t1c-2n-aws.csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t1c-2n-aws.rst"
+  testbed: "2n-aws"
+
+- type: "table"
+  title: "HTML performance trending dashboard 4t2c-2n-aws"
+  algorithm: "table_perf_trending_dash_html"
+  input-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-4t2c-2n-aws.csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-4t2c-2n-aws.rst"
+  testbed: "2n-aws"
+
+- type: "table"
+  title: "Failed MRR tests 2n-aws"
+  algorithm: "table_failed_tests"
+  output-file-ext: ".csv"
+  output-file: "{DIR[STATIC,VPP]}/failed-tests-2n-aws"
+  data: "plot-performance-trending-vpp-2n-aws"
+  filter: "'MRR'"
+  parameters:
+    - "name"
+    - "parent"
+    - "status"
+    - "msg"
+  window: 7  # days
+
+- type: "table"
+  title: "HTML Failed MRR tests 2n-aws"
+  algorithm: "table_failed_tests_html"
+  input-file: "{DIR[STATIC,VPP]}/failed-tests-2n-aws.csv"
+  output-file: "{DIR[STATIC,VPP]}/failed-tests-2n-aws.rst"
+  testbed: "2n-aws"
+
 ################################################################################
 ###                                 C P T A                                  ###
 ################################################################################
@@ -1533,7 +1850,6 @@
       core: ["2t1c", "4t2c", "8t4c"]
       include:
         - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Memif-1Dcr-mrr.64B-{core}-avf-eth-l2xcbase-eth-2memif-1dcr-mrr"
-        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-mrr.64B-{core}-avf-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-mrr"
         - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-mrr.64B-{core}-avf-eth-l2bdbasemaclrn-eth-2memif-1dcr-mrr"
         - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Eth-2Memif-1Dcr-mrr.64B-{core}-avf-ethip4-ip4base-eth-2memif-1dcr-mrr"
       layout: "plot-cpta"
@@ -1544,7 +1860,6 @@
       core: ["2t1c", "4t2c", "8t4c"]
       include:
         - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Memif-1Dcr-mrr.64B-{core}-eth-l2xcbase-eth-2memif-1dcr-mrr"
-        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-mrr.64B-{core}-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-mrr"
         - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-mrr.64B-{core}-eth-l2bdbasemaclrn-eth-2memif-1dcr-mrr"
         - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Memif-1Dcr-mrr.64B-{core}-ethip4-ip4base-eth-2memif-1dcr-mrr"
       layout: "plot-cpta"
@@ -1554,7 +1869,6 @@
       data: "plot-performance-trending-vpp-2n-clx"
       core: ["2t1c", "4t2c", "8t4c"]
       include:
-        - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Mrr.64B-{core}-rdma-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-mrr"
         - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Mrr.64B-{core}-rdma-eth-l2bdbasemaclrn-eth-2memif-1dcr-mrr"
         - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Xcbase-Eth-2Memif-1Dcr-Mrr.64B-{core}-rdma-eth-l2xcbase-eth-2memif-1dcr-mrr"
         - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1Cx556A-Rdma-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Mrr.64B-{core}-rdma-ethip4-ip4base-eth-2memif-1dcr-mrr"
@@ -1566,7 +1880,6 @@
       core: ["2t1c", "4t2c", "8t4c"]
       include:
         - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Memif-1Dcr-mrr.64B-{core}-avf-eth-l2xcbase-eth-2memif-1dcr-mrr"
-        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-mrr.64B-{core}-avf-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-mrr"
         - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-mrr.64B-{core}-avf-eth-l2bdbasemaclrn-eth-2memif-1dcr-mrr"
         - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Eth-2Memif-1Dcr-mrr.64B-{core}-avf-ethip4-ip4base-eth-2memif-1dcr-mrr"
       layout: "plot-cpta"
@@ -1577,7 +1890,6 @@
       core: ["2t1c", "4t2c", "8t4c"]
       include:
         - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Memif-1Dcr-mrr.64B-{core}-eth-l2xcbase-eth-2memif-1dcr-mrr"
-        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-mrr.64B-{core}-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-mrr"
         - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-mrr.64B-{core}-eth-l2bdbasemaclrn-eth-2memif-1dcr-mrr"
         - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Memif-1Dcr-mrr.64B-{core}-ethip4-ip4base-eth-2memif-1dcr-mrr"
       layout: "plot-cpta"
@@ -1589,7 +1901,6 @@
       include:
         - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Memif-1Dcr-mrr.64B-{core}-avf-eth-l2xcbase-eth-2memif-1dcr-mrr"
         - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Memif-1Lxc-mrr.64B-{core}-avf-eth-l2xcbase-eth-2memif-1lxc-mrr"
-        - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-mrr.64B-{core}-avf-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-mrr"
         - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Memif-1Lxc-mrr.64B-{core}-avf-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr"
         - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Eth-2Memif-1Dcr-mrr.64B-{core}-avf-ethip4-ip4base-eth-2memif-1dcr-mrr"
       layout: "plot-cpta"
@@ -1605,14 +1916,13 @@
         - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Memif-1Dcr-mrr.64B-{core}-ethip4-ip4base-eth-2memif-1dcr-mrr"
       layout: "plot-cpta"
 
-    - title: "3n-tsh-xxv710-64b-{core}-memif-base-dpdk"
-      output-file-name: "3n-tsh-xxv710-64b-{core}-memif-base-dpdk"
+    - title: "3n-tsh-x520-64b-{core}-memif-base-dpdk"
+      output-file-name: "3n-tsh-x520-64b-{core}-memif-base-dpdk"
       data: "plot-performance-trending-vpp-3n-tsh"
-      core: ["2t1c", "4t2c", "8t4c"]
+      core: ["1t1c", "2t2c", "4t4c"]
       include:
         - "Tests.Vpp.Perf.Container Memif.10ge2p1x520-Eth-L2Xcbase-Eth-2Memif-1Dcr-mrr.64B-{core}-eth-l2xcbase-eth-2memif-1dcr-mrr"
         - "Tests.Vpp.Perf.Container Memif.10ge2p1x520-Eth-L2Xcbase-Eth-2Memif-1Lxc-mrr.64B-{core}-eth-l2xcbase-eth-2memif-1lxc-mrr"
-        - "Tests.Vpp.Perf.Container Memif.10ge2p1x520-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-mrr.64B-{core}-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-mrr"
         - "Tests.Vpp.Perf.Container Memif.10ge2p1x520-Eth-L2Bdbasemaclrn-Eth-2Memif-1Lxc-mrr.64B-{core}-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr"
         - "Tests.Vpp.Perf.Container Memif.10ge2p1x520-Ethip4-Ip4Base-Eth-2Memif-1Dcr-mrr.64B-{core}-ethip4-ip4base-eth-2memif-1dcr-mrr"
       layout: "plot-cpta"
@@ -1626,6 +1936,7 @@
         - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-mrr.64B-{core}-avf-ethip4-ip4scale2m-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-Rnd-Mrr.64B-{core}-avf-ethip4-ip4scale2m-rnd-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Base-mrr.64B-{core}-ethip4-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-af-xdp-Ethip4-Ip4Base-mrr.64B-{core}-af-xdp-ethip4-ip4base-mrr"
       layout: "plot-cpta"
 
     - title: "2n-clx-xxv710-64b-{core}-ip4routing-base-avf-dpdk"
@@ -1633,7 +1944,6 @@
       data: "plot-performance-trending-vpp-2n-clx"
       core: ["2t1c", "4t2c", "8t4c"]
       include:
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-Ip4Base-Mrr.64B-{core}-avf-dot1q-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-mrr.64B-{core}-avf-ethip4-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-mrr.64B-{core}-ethip4-ip4base-mrr"
       layout: "plot-cpta"
@@ -1651,6 +1961,20 @@
         - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale2M-Rnd-Mrr.64B-{core}-avf-ethip4-ip4scale2m-rnd-mrr"
       layout: "plot-cpta"
 
+    - title: "2n-clx-xxv710-64b-{core}-ip4routing-base-scale-af_xdp"
+      output-file-name: "2n-clx-xxv710-64b-{core}-ip4-base-scale-af_xdp"
+      data: "plot-performance-trending-vpp-2n-clx"
+      core: ["2t1c", "4t2c", "8t4c"]
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-af-xdp-Ethip4-Ip4Base-mrr.64B-{core}-af-xdp-ethip4-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-af-xdp-Ethip4-Ip4Scale20K-mrr.64B-{core}-af-xdp-ethip4-ip4scale20k-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-af-xdp-Ethip4-Ip4Scale20K-Rnd-mrr.64B-{core}-af-xdp-ethip4-ip4scale20k-rnd-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-af-xdp-Ethip4-Ip4Scale200K-mrr.64B-{core}-af-xdp-ethip4-ip4scale200k-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-af-xdp-Ethip4-Ip4Scale200K-Rnd-mrr.64B-{core}-af-xdp-ethip4-ip4scale200k-rnd-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-af-xdp-Ethip4-Ip4Scale2M-mrr.64B-{core}-af-xdp-ethip4-ip4scale2m-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-af-xdp-Ethip4-Ip4Scale2M-Rnd-mrr.64B-{core}-af-xdp-ethip4-ip4scale2m-rnd-mrr"
+      layout: "plot-cpta"
+
     - title: "2n-clx-xxv710-64b-{core}-ip4routing-scale-dpdk"
       output-file-name: "2n-clx-xxv710-64b-{core}-ip4-scale-dpdk"
       data: "plot-performance-trending-vpp-2n-clx"
@@ -1808,7 +2132,6 @@
       data: "plot-performance-trending-vpp-2n-clx"
       core: ["2t1c", "4t2c", "8t4c"]
       include:
-        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-Ip4Base-Mrr.64B-{core}-rdma-dot1q-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4-Ip4Base-Mrr.64B-{core}-rdma-ethip4-ip4base-mrr"
       layout: "plot-cpta"
 
@@ -1853,9 +2176,8 @@
     - title: "2n-dnv-x553-64b-{core}-ip4routing-base-scale-ixgbe"
       output-file-name: "2n-dnv-x553-64b-{core}-ip4-ixgbe"
       data: "plot-performance-trending-vpp-2n-dnv"
-      core: ["2t1c", "4t2c", "8t4c"]
+      core: ["1t1c", "2t2c", "4t4c"]
       include:
-        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Dot1Q-Ip4Base-mrr.64B-{core}-dot1q-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4-Ip4Base-mrr.64B-{core}-ethip4-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4-Ip4Scale20K-mrr.64B-{core}-ethip4-ip4scale20k-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4-Ip4Scale200K-mrr.64B-{core}-ethip4-ip4scale200k-mrr"
@@ -1863,6 +2185,46 @@
         - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4-Ip4Scale20K-rnd-mrr.64B-{core}-ethip4-ip4scale20k-rnd-mrr"
       layout: "plot-cpta"
 
+    - title: "2n-aws-nitro50g-64b-{core}-ip4routing-base-scale-ena"
+      output-file-name: "2n-aws-nitro50g-64b-{core}-ip4-ena"
+      data: "plot-performance-trending-vpp-2n-aws"
+      core: ["2t1c", "4t2c"]
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-50Ge1P1Ena-Ethip4-Ip4Base-Mrr.64B-{core}-ethip4-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-50Ge1P1Ena-Ethip4-Ip4Scale20K-Mrr.64B-{core}-ethip4-ip4scale20k-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-50Ge1P1Ena-Ethip4-Ip4Scale20K-Rnd-Mrr.64B-{core}-ethip4-ip4scale20k-rnd-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-aws-nitro50g-1518b-{core}-ip4routing-base-scale-ena"
+      output-file-name: "2n-aws-nitro50g-1518b-{core}-ip4-ena"
+      data: "plot-performance-trending-vpp-2n-aws"
+      core: ["2t1c", "4t2c"]
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-50Ge1P1Ena-Ethip4-Ip4Base-Mrr.1518b-{core}-ethip4-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-50Ge1P1Ena-Ethip4-Ip4Scale20K-Mrr.1518b-{core}-ethip4-ip4scale20k-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-50Ge1P1Ena-Ethip4-Ip4Scale20K-Rnd-Mrr.1518b-{core}-ethip4-ip4scale20k-rnd-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-aws-nitro50g-78b-{core}-ip6routing-base-scale-ena"
+      output-file-name: "2n-aws-nitro50g-78b-{core}-ip6-ena"
+      data: "plot-performance-trending-vpp-2n-aws"
+      core: ["2t1c", "4t2c"]
+      include:
+        - "Tests.Vpp.Perf.Ip6.2N1L-50Ge1P1Ena-Ethip6-Ip6Base-Mrr.78B-{core}-ethip6-ip6base-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-50Ge1P1Ena-Ethip6-Ip6Scale20K-Mrr.78B-{core}-ethip6-ip6scale20k-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-50Ge1P1Ena-Ethip6-Ip6Scale20K-Rnd-Mrr.78B-{core}-ethip6-ip6scale20k-rnd-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-aws-nitro50g-1518b-{core}-ip6routing-base-scale-ena"
+      output-file-name: "2n-aws-nitro50g-1518b-{core}-ip6-ena"
+      data: "plot-performance-trending-vpp-2n-aws"
+      core: ["2t1c", "4t2c"]
+      include:
+        - "Tests.Vpp.Perf.Ip6.2N1L-50Ge1P1Ena-Ethip6-Ip6Base-Mrr.1518b-{core}-ethip6-ip6base-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-50Ge1P1Ena-Ethip6-Ip6Scale20K-Mrr.1518b-{core}-ethip6-ip6scale20k-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-50Ge1P1Ena-Ethip6-Ip6Scale20K-Rnd-Mrr.1518b-{core}-ethip6-ip6scale20k-rnd-mrr"
+      layout: "plot-cpta"
+
     - title: "2n-skx-x710-64b-{core}-ip4routing-base-scale-avf-dpdk"
       output-file-name: "2n-skx-x710-64b-{core}-ip4-avf-dpdk"
       data: "plot-performance-trending-vpp-2n-skx"
@@ -1872,6 +2234,7 @@
         - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-mrr.64B-{core}-avf-ethip4-ip4scale2m-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-Rnd-Mrr.64B-{core}-avf-ethip4-ip4scale2m-rnd-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Base-mrr.64B-{core}-ethip4-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-af-xdp-Ethip4-Ip4Base-mrr.64B-{core}-af-xdp-ethip4-ip4base-mrr"
       layout: "plot-cpta"
 
     - title: "2n-skx-xxv710-64b-{core}-ip4routing-base-scale-avf"
@@ -1879,7 +2242,6 @@
       data: "plot-performance-trending-vpp-2n-skx"
       core: ["2t1c", "4t2c", "8t4c"]
       include:
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-Ip4Base-Mrr.64B-{core}-avf-dot1q-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-mrr.64B-{core}-avf-ethip4-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale20K-mrr.64B-{core}-avf-ethip4-ip4scale20k-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale200K-mrr.64B-{core}-avf-ethip4-ip4scale200k-mrr"
@@ -1901,7 +2263,6 @@
       data: "plot-performance-trending-vpp-2n-skx"
       core: ["2t1c", "4t2c", "8t4c"]
       include:
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Dot1Q-Ip4Base-mrr.64B-{core}-dot1q-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-mrr.64B-{core}-ethip4-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale20K-mrr.64B-{core}-ethip4-ip4scale20k-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale200K-mrr.64B-{core}-ethip4-ip4scale200k-mrr"
@@ -1931,6 +2292,20 @@
         - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1024-p63-s64512-Mrr.64B-{core}-avf-ethip4udp-nat44det-h1024-p63-s64512-mrr"
       layout: "plot-cpta"
 
+    - title: "2n-skx-xxv710-64b-{core}-ip4routing-base-scale-af_xdp"
+      output-file-name: "2n-skx-xxv710-64b-{core}-ip4-base-scale-af_xdp"
+      data: "plot-performance-trending-vpp-2n-skx"
+      core: ["2t1c", "4t2c", "8t4c"]
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-af-xdp-Ethip4-Ip4Base-mrr.64B-{core}-af-xdp-ethip4-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-af-xdp-Ethip4-Ip4Scale20K-mrr.64B-{core}-af-xdp-ethip4-ip4scale20k-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-af-xdp-Ethip4-Ip4Scale20K-Rnd-mrr.64B-{core}-af-xdp-ethip4-ip4scale20k-rnd-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-af-xdp-Ethip4-Ip4Scale200K-mrr.64B-{core}-af-xdp-ethip4-ip4scale200k-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-af-xdp-Ethip4-Ip4Scale200K-Rnd-mrr.64B-{core}-af-xdp-ethip4-ip4scale200k-rnd-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-af-xdp-Ethip4-Ip4Scale2M-mrr.64B-{core}-af-xdp-ethip4-ip4scale2m-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-af-xdp-Ethip4-Ip4Scale2M-Rnd-mrr.64B-{core}-af-xdp-ethip4-ip4scale2m-rnd-mrr"
+      layout: "plot-cpta"
+
     - title: "2n-skx-xxv710-64b-{core}-nat44det-ip4routing-stl-bidir-avf"
       output-file-name: "2n-skx-xxv710-64b-{core}-nat44det-ip4routing-stl-bidir-avf"
       data: "plot-performance-trending-vpp-2n-skx"
@@ -2083,7 +2458,6 @@
       data: "plot-performance-trending-vpp-3n-dnv"
       core: ["1t1c", "2t2c", "4t4c"]
       include:
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Dot1Q-Ip4Base-mrr.64B-{core}-dot1q-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4-Ip4Base-mrr.64B-{core}-ethip4-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4-Ip4Scale20K-mrr.64B-{core}-ethip4-ip4scale20k-mrr"
         - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4-Ip4Scale200K-mrr.64B-{core}-ethip4-ip4scale200k-mrr"
@@ -2091,6 +2465,42 @@
         - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4-Ip4Scale20K-rnd-mrr.64B-{core}-ethip4-ip4scale20k-rnd-mrr"
       layout: "plot-cpta"
 
+    - title: "3n-aws-nitro50g-64b-{core}-ip4routing-base-scale-ena"
+      output-file-name: "3n-aws-nitro50g-64b-{core}-ip4-ena"
+      data: "plot-performance-trending-vpp-3n-aws"
+      core: ["2t1c", "4t2c"]
+      include:
+        - "Tests.Vpp.Perf.Ip4.50Ge1P1Ena-Ethip4-Ip4Base-Mrr.64B-{core}-ethip4-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.50Ge1P1Ena-Ethip4-Ip4Scale20K-Mrr.64B-{core}-ethip4-ip4scale20k-mrr"
+        - "Tests.Vpp.Perf.Ip4.50Ge1P1Ena-Ethip4-Ip4Scale20K-Rnd-Mrr.64B-{core}-ethip4-ip4scale20k-rnd-mrr"
+      layout: "plot-cpta"
+
+    - title: "3n-aws-nitro50g-1518b-{core}-ip4routing-base-scale-ena"
+      output-file-name: "3n-aws-nitro50g-1518b-{core}-ip4-ena"
+      data: "plot-performance-trending-vpp-3n-aws"
+      core: ["2t1c", "4t2c"]
+      include:
+        - "Tests.Vpp.Perf.Ip4.50Ge1P1Ena-Ethip4-Ip4Base-Mrr.1518b-{core}-ethip4-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.50Ge1P1Ena-Ethip4-Ip4Scale20K-Mrr.1518b-{core}-ethip4-ip4scale20k-mrr"
+        - "Tests.Vpp.Perf.Ip4.50Ge1P1Ena-Ethip4-Ip4Scale20K-Rnd-Mrr.1518b-{core}-ethip4-ip4scale20k-rnd-mrr"
+      layout: "plot-cpta"
+
+    - title: "3n-aws-nitro50g-1518b-{core}-ipsec-ip4routing-scale-ena"
+      output-file-name: "3n-aws-nitro50g-1518b-{core}-ipsec-ip4routing-scale-ena"
+      data: "plot-performance-trending-vpp-3n-aws"
+      core: ["2t1c", "4t2c"]
+      include:
+        - "Tests.Vpp.Perf.Crypto.50Ge1P1Ena-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes256Gcm-Mrr.1518B-{core}-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-mrr"
+      layout: "plot-cpta"
+
+    - title: "3n-aws-nitro50g-imix-{core}-ipsec-ip4routing-scale-ena"
+      output-file-name: "3n-aws-nitro50g-imix-{core}-ipsec-ip4routing-scale-ena"
+      data: "plot-performance-trending-vpp-3n-aws"
+      core: ["2t1c", "4t2c"]
+      include:
+        - "Tests.Vpp.Perf.Crypto.50Ge1P1Ena-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes256Gcm-Mrr.imix-{core}-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-mrr"
+      layout: "plot-cpta"
+
     - title: "3n-skx-x710-64b-{core}-ip4routing-base-scale-avf"
       output-file-name: "3n-skx-x710-64b-{core}-ip4-base-scale-avf"
       data: "plot-performance-trending-vpp-3n-skx"
@@ -2105,7 +2515,6 @@
       data: "plot-performance-trending-vpp-3n-skx"
       core: ["2t1c", "4t2c", "8t4c"]
       include:
-        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Dot1Q-Ip4Base-Mrr.64B-{core}-avf-dot1q-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Mrr.64B-{core}-avf-ethip4-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale20K-mrr.64B-{core}-avf-ethip4-ip4scale20k-mrr"
         - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale200K-mrr.64B-{core}-avf-ethip4-ip4scale200k-mrr"
@@ -2126,7 +2535,6 @@
       data: "plot-performance-trending-vpp-3n-tsh"
       core: ["1t1c", "2t2c", "4t4c"]
       include:
-        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Dot1Q-Ip4Base-mrr.64B-{core}-dot1q-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4-Ip4Base-mrr.64B-{core}-ethip4-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4-Ip4Scale20K-mrr.64B-{core}-ethip4-ip4scale20k-mrr"
         - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4-Ip4Scale200K-mrr.64B-{core}-ethip4-ip4scale200k-mrr"
@@ -2151,8 +2559,6 @@
       include:
         - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X553-Ethip4Vxlan-L2Xcbase-mrr.64B-{core}-ethip4vxlan-l2xcbase-mrr"
         - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X553-Ethip4Vxlan-L2Bdbasemaclrn-mrr.64B-{core}-ethip4vxlan-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X553-Dot1Q--Ethip4Vxlan-L2Bdscale1L2Bd1Vlan1Vxlan-mrr.64B-{core}-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-mrr"
-        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X553-Dot1Q--Ethip4Vxlan-L2Bdscale100L2Bd100Vlan100Vxlan-mrr.64B-{core}-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-mrr"
       layout: "plot-cpta"
 
     - title: "3n-skx-xxv710-64b-{core}-ip4tunnel-base-scale-avf-dpdk"
@@ -2160,8 +2566,6 @@
       data: "plot-performance-trending-vpp-3n-skx"
       core: ["2t1c", "4t2c", "8t4c"]
       include:
-        - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Avf-Dot1Q--Ethip4Vxlan-L2Bdscale100L2Bd100Vlan100Vxlan-Mrr.64B-{core}-avf-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-mrr"
-        - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Avf-Dot1Q--Ethip4Vxlan-L2Bdscale1L2Bd1Vlan1Vxlan-Mrr.64B-{core}-avf-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-mrr"
         - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Mrr.64B-{core}-avf-ethip4vxlan-l2bdbasemaclrn-mrr"
         - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Xcbase-Mrr.64B-{core}-avf-ethip4vxlan-l2xcbase-mrr"
         - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Mrr.64B-{core}-ethip4vxlan-l2bdbasemaclrn-mrr"
@@ -2175,8 +2579,6 @@
       include:
         - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X520-Ethip4Vxlan-L2Xcbase-mrr.64B-{core}-ethip4vxlan-l2xcbase-mrr"
         - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X520-Ethip4Vxlan-L2Bdbasemaclrn-mrr.64B-{core}-ethip4vxlan-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X520-Dot1Q--Ethip4Vxlan-L2Bdscale1L2Bd1Vlan1Vxlan-mrr.64B-{core}-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-mrr"
-        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X520-Dot1Q--Ethip4Vxlan-L2Bdscale100L2Bd100Vlan100Vxlan-mrr.64B-{core}-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-mrr"
       layout: "plot-cpta"
 
     - title: "2n-clx-x710-78b-{core}-ip6routing-base-scale-avf-dpdk"
@@ -2188,6 +2590,7 @@
         - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-Mrr.78B-{core}-avf-ethip6-ip6scale2m-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-rnd-Mrr.78B-{core}-avf-ethip6-ip6scale2m-rnd-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Base-mrr.78B-{core}-ethip6-ip6base-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-af-xdp-Ethip6-Ip6Base-mrr.78B-{core}-af-xdp-ethip6-ip6base-mrr"
       layout: "plot-cpta"
 
     - title: "2n-clx-xxv710-78b-{core}-ip6routing-base-scale-avf"
@@ -2195,7 +2598,6 @@
       data: "plot-performance-trending-vpp-2n-clx"
       core: ["2t1c", "4t2c", "8t4c"]
       include:
-        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-Ip6Base-mrr.78B-{core}-avf-dot1q-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Base-mrr.78B-{core}-avf-ethip6-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale20K-mrr.78B-{core}-avf-ethip6-ip6scale20k-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale200K-mrr.78B-{core}-avf-ethip6-ip6scale200k-mrr"
@@ -2235,12 +2637,25 @@
         - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale2M-rnd-mrr.78B-{core}-ethip6-ip6scale2m-rnd-mrr"
       layout: "plot-cpta"
 
+    - title: "2n-clx-xxv710-78b-{core}-ip6routing-base-scale-af_xdp"
+      output-file-name: "2n-clx-xxv710-78b-{core}-ip6-base-scale-af_xdp"
+      data: "plot-performance-trending-vpp-2n-clx"
+      core: ["2t1c", "4t2c", "8t4c"]
+      include:
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-af-xdp-Ethip6-Ip6Base-mrr.78B-{core}-af-xdp-ethip6-ip6base-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-af-xdp-Ethip6-Ip6Scale20K-mrr.78B-{core}-af-xdp-ethip6-ip6scale20k-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-af-xdp-Ethip6-Ip6Scale20K-rnd-mrr.78B-{core}-af-xdp-ethip6-ip6scale20k-rnd-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-af-xdp-Ethip6-Ip6Scale200K-mrr.78B-{core}-af-xdp-ethip6-ip6scale200k-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-af-xdp-Ethip6-Ip6Scale200K-rnd-mrr.78B-{core}-af-xdp-ethip6-ip6scale200k-rnd-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-af-xdp-Ethip6-Ip6Scale2M-mrr.78B-{core}-af-xdp-ethip6-ip6scale2m-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-af-xdp-Ethip6-Ip6Scale2M-rnd-mrr.78B-{core}-af-xdp-ethip6-ip6scale2m-rnd-mrr"
+      layout: "plot-cpta"
+
     - title: "2n-clx-cx556a-78b-{core}-rdma-ip6routing-base-scale"
       output-file-name: "2n-clx-cx556a-78b-{core}-rdma-ip6routing-base-scale"
       data: "plot-performance-trending-vpp-2n-clx"
       core: ["2t1c", "4t2c", "8t4c"]
       include:
-        - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-Ip6Base-Mrr.78B-{core}-rdma-dot1q-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1Cx556A-Rdma-Ethip6-Ip6Base-Mrr.78B-{core}-rdma-ethip6-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1Cx556A-Rdma-Ethip6-Ip6Scale20K-Mrr.78B-{core}-rdma-ethip6-ip6scale20k-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1Cx556A-Rdma-Ethip6-Ip6Scale200K-Mrr.78B-{core}-rdma-ethip6-ip6scale200k-mrr"
@@ -2252,7 +2667,6 @@
       data: "plot-performance-trending-vpp-2n-dnv"
       core: ["1t1c", "2t2c", "4t4c"]
       include:
-        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X553-Dot1Q-Ip6Base-mrr.78B-{core}-dot1q-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X553-Ethip6-Ip6Base-mrr.78B-{core}-ethip6-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X553-Ethip6-Ip6Scale20K-mrr.78B-{core}-ethip6-ip6scale20k-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X553-Ethip6-Ip6Scale200K-mrr.78B-{core}-ethip6-ip6scale200k-mrr"
@@ -2268,6 +2682,7 @@
         - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-Mrr.78B-{core}-avf-ethip6-ip6scale2m-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-rnd-Mrr.78B-{core}-avf-ethip6-ip6scale2m-rnd-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Base-mrr.78B-{core}-ethip6-ip6base-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-af-xdp-Ethip6-Ip6Base-mrr.78B-{core}-af-xdp-ethip6-ip6base-mrr"
       layout: "plot-cpta"
 
     - title: "2n-skx-xxv710-78b-{core}-ip6routing-base-scale-avf"
@@ -2319,7 +2734,6 @@
       data: "plot-performance-trending-vpp-3n-dnv"
       core: ["1t1c", "2t2c", "4t4c"]
       include:
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X553-Dot1Q-Ip6Base-mrr.78B-{core}-dot1q-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.10Ge2P1X553-Ethip6-Ip6Base-mrr.78B-{core}-ethip6-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.10Ge2P1X553-Ethip6-Ip6Scale20K-mrr.78B-{core}-ethip6-ip6scale20k-mrr"
         - "Tests.Vpp.Perf.Ip6.10Ge2P1X553-Ethip6-Ip6Scale200K-mrr.78B-{core}-ethip6-ip6scale200k-mrr"
@@ -2340,7 +2754,6 @@
       data: "plot-performance-trending-vpp-3n-skx"
       core: ["2t1c", "4t2c", "8t4c"]
       include:
-        - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Avf-Dot1Q-Ip6Base-mrr.78B-{core}-avf-dot1q-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Avf-Ethip6-Ip6Base-mrr.78B-{core}-avf-ethip6-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale20K-mrr.78B-{core}-avf-ethip6-ip6scale20k-mrr"
         - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale200K-mrr.78B-{core}-avf-ethip6-ip6scale200k-mrr"
@@ -2361,7 +2774,6 @@
       data: "plot-performance-trending-vpp-3n-tsh"
       core: ["1t1c", "2t2c", "4t4c"]
       include:
-        - "Tests.Vpp.Perf.Ip6.10Ge2P1X520-Dot1Q-Ip6Base-mrr.78B-{core}-dot1q-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.10Ge2P1X520-Ethip6-Ip6Base-mrr.78B-{core}-ethip6-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.10Ge2P1X520-Ethip6-Ip6Scale20K-mrr.78B-{core}-ethip6-ip6scale20k-mrr"
         - "Tests.Vpp.Perf.Ip6.10Ge2P1X520-Ethip6-Ip6Scale200K-mrr.78B-{core}-ethip6-ip6scale200k-mrr"
@@ -2472,6 +2884,7 @@
         - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Bdbasemaclrn-mrr.64B-{core}-avf-eth-l2bdbasemaclrn-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdbasemaclrn-mrr.64B-{core}-eth-l2bdbasemaclrn-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-avf-Eth-L2Bdscale1Mmaclrn-Mrr.64B-{core}-avf-eth-l2bdscale1mmaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-af-xdp-Eth-L2Bdbasemaclrn-mrr.64B-{core}-af-xdp-eth-l2bdbasemaclrn-mrr"
       layout: "plot-cpta"
 
     - title: "2n-clx-xxv710-64b-{core}-l2switching-base-avf"
@@ -2482,7 +2895,6 @@
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Patch-mrr.64B-{core}-avf-eth-l2patch-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-mrr.64B-{core}-avf-eth-l2xcbase-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-mrr.64B-{core}-avf-eth-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-mrr.64B-{core}-avf-dot1q-l2xcbase-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-mrr.64B-{core}-avf-dot1q-l2bdbasemaclrn-mrr"
       layout: "plot-cpta"
 
@@ -2518,12 +2930,24 @@
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale1Mmaclrn-mrr.64B-{core}-eth-l2bdscale1mmaclrn-mrr"
       layout: "plot-cpta"
 
+    - title: "2n-clx-xxv710-64b-{core}-l2switching-base-scale-af_xdp"
+      output-file-name: "2n-clx-xxv710-64b-{core}-l2-base-scale-af_xdp"
+      data: "plot-performance-trending-vpp-2n-clx"
+      core: ["2t1c", "4t2c", "8t4c"]
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-af-xdp-Eth-L2Patch-mrr.64B-{core}-af-xdp-eth-l2patch-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-af-xdp-Eth-L2Xcbase-mrr.64B-{core}-af-xdp-eth-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-af-xdp-Eth-L2Bdbasemaclrn-mrr.64B-{core}-af-xdp-eth-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-af-xdp-Eth-L2Bdscale10Kmaclrn-mrr.64B-{core}-af-xdp-eth-l2bdscale10kmaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-af-xdp-Eth-L2Bdscale100Kmaclrn-mrr.64B-{core}-af-xdp-eth-l2bdscale100kmaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-af-xdp-Eth-L2Bdscale1Mmaclrn-mrr.64B-{core}-af-xdp-eth-l2bdscale1mmaclrn-mrr"
+      layout: "plot-cpta"
+
     - title: "2n-clx-cx556a-64b-{core}-rdma-l2switching-base"
       output-file-name: "2n-clx-cx556a-64b-{core}-rdma-l2switching-base"
       data: "plot-performance-trending-vpp-2n-clx"
       core: ["2t1c", "4t2c", "8t4c"]
       include:
-        - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Xcbase-Mrr.64B-{core}-rdma-dot1q-l2xcbase-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Bdbasemaclrn-Mrr.64B-{core}-rdma-dot1q-l2bdbasemaclrn-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Patch-Mrr.64B-{core}-rdma-eth-l2patch-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Xcbase-Mrr.64B-{core}-rdma-eth-l2xcbase-mrr"
@@ -2576,12 +3000,19 @@
         - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdscale1Mmaclrn-mrr.64B-{core}-eth-l2bdscale1mmaclrn-mrr"
       layout: "plot-cpta"
 
+    - title: "2n-skx-x710-64b-{core}-l2switching-base-scale-af_xdp"
+      output-file-name: "2n-skx-x710-64b-{core}-l2-base-scale-af_xdp"
+      data: "plot-performance-trending-vpp-2n-skx"
+      core: ["2t1c", "4t2c", "8t4c"]
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-af-xdp-Eth-L2Bdbasemaclrn-mrr.64B-{core}-af-xdp-eth-l2bdbasemaclrn-mrr"
+      layout: "plot-cpta"
+
     - title: "2n-skx-xxv710-64b-{core}-l2switching-base-avf"
       output-file-name: "2n-skx-xxv710-64b-{core}-l2-base-avf"
       data: "plot-performance-trending-vpp-2n-skx"
       core: ["2t1c", "4t2c", "8t4c"]
       include:
-        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Mrr.64B-{core}-avf-dot1q-l2xcbase-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-mrr.64B-{core}-avf-dot1q-l2bdbasemaclrn-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Patch-mrr.64B-{core}-avf-eth-l2patch-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-mrr.64B-{core}-avf-eth-l2xcbase-mrr"
@@ -2620,6 +3051,19 @@
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale1Mmaclrn-mrr.64B-{core}-eth-l2bdscale1mmaclrn-mrr"
       layout: "plot-cpta"
 
+    - title: "2n-skx-xxv710-64b-{core}-l2switching-base-scale-af_xdp"
+      output-file-name: "2n-skx-xxv710-64b-{core}-l2-base-scale-af_xdp"
+      data: "plot-performance-trending-vpp-2n-skx"
+      core: ["2t1c", "4t2c", "8t4c"]
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-af-xdp-Eth-L2Patch-mrr.64B-{core}-af-xdp-eth-l2patch-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-af-xdp-Eth-L2Xcbase-mrr.64B-{core}-af-xdp-eth-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-af-xdp-Eth-L2Bdbasemaclrn-mrr.64B-{core}-af-xdp-eth-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-af-xdp-Eth-L2Bdscale10Kmaclrn-mrr.64B-{core}-af-xdp-eth-l2bdscale10kmaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-af-xdp-Eth-L2Bdscale100Kmaclrn-mrr.64B-{core}-af-xdp-eth-l2bdscale100kmaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-af-xdp-Eth-L2Bdscale1Mmaclrn-mrr.64B-{core}-af-xdp-eth-l2bdscale1mmaclrn-mrr"
+      layout: "plot-cpta"
+
     - title: "3n-dnv-x553-64b-{core}-l2switching-base-scale-ixgbe"
       output-file-name: "3n-dnv-x553-64b-{core}-l2-base-scale-ixgbe"
       data: "plot-performance-trending-vpp-3n-dnv"
@@ -2649,7 +3093,6 @@
       data: "plot-performance-trending-vpp-3n-skx"
       core: ["2t1c", "4t2c", "8t4c"]
       include:
-        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Mrr.64B-{core}-avf-dot1q-l2xcbase-mrr"
         - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Mrr.64B-{core}-avf-dot1q-l2bdbasemaclrn-mrr"
         - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Patch-Mrr.64B-{core}-avf-eth-l2patch-mrr"
         - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Mrr.64B-{core}-avf-eth-l2xcbase-mrr"
@@ -2683,7 +3126,6 @@
       data: "plot-performance-trending-vpp-3n-tsh"
       core: ["1t1c", "2t2c", "4t4c"]
       include:
-        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Dot1Q-L2Xcbase-mrr.64B-{core}-dot1q-l2xcbase-mrr"
         - "Tests.Vpp.Perf.L2.10Ge2P1X520-Dot1Q-L2Bdbasemaclrn-mrr.64B-{core}-dot1q-l2bdbasemaclrn-mrr"
         - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Patch-Mrr.64B-{core}-eth-l2patch-mrr"
         - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Xcbase-mrr.64B-{core}-eth-l2xcbase-mrr"
@@ -2747,8 +3189,6 @@
       data: "plot-performance-trending-vpp-2n-clx"
       core: ["2t1c", "4t2c", "8t4c"]
       include:
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Mrr.64B-{core}-avf-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Mrr.64B-{core}-avf-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Mrr.64B-{core}-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Mrr.64B-{core}-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
       layout: "plot-cpta"
@@ -2758,8 +3198,6 @@
       data: "plot-performance-trending-vpp-2n-clx"
       core: ["2t1c", "4t2c", "8t4c"]
       include:
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-{core}-avf-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-{core}-avf-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-{core}-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-{core}-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
       layout: "plot-cpta"
@@ -2785,8 +3223,6 @@
       data: "plot-performance-trending-vpp-2n-clx"
       core: ["2t1c", "4t2c", "8t4c"]
       include:
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Mrr.64B-{core}-rdma-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Mrr.64B-{core}-rdma-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Mrr.64B-{core}-rdma-eth-l2xcbase-eth-2vhostvr1024-1vm-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Mrr.64B-{core}-rdma-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
       layout: "plot-cpta"
@@ -2796,8 +3232,6 @@
       data: "plot-performance-trending-vpp-2n-clx"
       core: ["2t1c", "4t2c", "8t4c"]
       include:
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-{core}-rdma-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-{core}-rdma-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-{core}-rdma-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-{core}-rdma-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
       layout: "plot-cpta"
@@ -2817,8 +3251,6 @@
       data: "plot-performance-trending-vpp-2n-skx"
       core: ["2t1c", "4t2c", "8t4c"]
       include:
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Mrr.64B-{core}-avf-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-{core}-avf-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-mrr.64B-{core}-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-{core}-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
       layout: "plot-cpta"
@@ -2828,8 +3260,6 @@
       data: "plot-performance-trending-vpp-2n-skx"
       core: ["2t1c", "4t2c", "8t4c"]
       include:
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-{core}-avf-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-mrr.64B-{core}-avf-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-mrr.64B-{core}-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-mrr.64B-{core}-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
       layout: "plot-cpta"
@@ -2839,7 +3269,6 @@
       data: "plot-performance-trending-vpp-2n-skx"
       core: ["2t1c", "4t2c", "8t4c"]
       include:
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-{core}-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-mrr.64B-{core}-eth-l2xcbase-eth-2vhostvr1024-1vm-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-{core}-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
       layout: "plot-cpta"
@@ -2849,7 +3278,6 @@
       data: "plot-performance-trending-vpp-2n-skx"
       core: ["2t1c", "4t2c", "8t4c"]
       include:
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-mrr.64B-{core}-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-mrr.64B-{core}-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-mrr.64B-{core}-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
       layout: "plot-cpta"
@@ -2877,7 +3305,6 @@
       data: "plot-performance-trending-vpp-3n-skx"
       core: ["2t1c", "4t2c", "8t4c"]
       include:
-        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-{core}-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-mrr.64B-{core}-eth-l2xcbase-eth-2vhostvr1024-1vm-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-{core}-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-mrr.64B-{core}-ethip4-ip4base-eth-2vhostvr1024-1vm-mrr"
@@ -2889,8 +3316,6 @@
       data: "plot-performance-trending-vpp-3n-skx"
       core: ["2t1c", "4t2c", "8t4c"]
       include:
-        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-mrr.64B-{core}-avf-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-{core}-avf-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-mrr.64B-{core}-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-{core}-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-mrr.64B-{core}-avf-ethip4-ip4base-eth-2vhostvr1024-1vm-mrr"
@@ -2902,39 +3327,17 @@
       data: "plot-performance-trending-vpp-3n-skx"
       core: ["2t1c", "4t2c", "8t4c"]
       include:
-        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-{core}-avf-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-{core}-avf-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-{core}-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-{core}-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-{core}-avf-ethip4-ip4base-eth-2vhostvr1024-1vm-vppl2xc-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-{core}-avf-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
       layout: "plot-cpta"
 
-    - title: "3n-skx-xxv710-64b-{core}-link-bonding-vhost-base-avf-testpmd"
-      output-file-name: "3n-skx-xxv710-64b-{core}-link-bonding-vhost-base-avf-testpmd"
-      data: "plot-performance-trending-vpp-3n-skx"
-      core: ["2t1c", "4t2c", "8t4c"]
-      include:
-        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-1Lbvpplacp-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-mrr.64B-{core}-avf-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-1Lbvpplacp-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-{core}-avf-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
-      layout: "plot-cpta"
-
-    - title: "3n-skx-xxv710-64b-{core}-link-bonding-vhost-base-avf-vpp"
-      output-file-name: "3n-skx-xxv710-64b-{core}-link-bonding-vhost-base-avf-vpp"
-      data: "plot-performance-trending-vpp-3n-skx"
-      core: ["2t1c", "4t2c", "8t4c"]
-      include:
-        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-1Lbvpplacp-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-mrr.64B-{core}-avf-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-1Lbvpplacp-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-mrr.64B-{core}-avf-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
-      layout: "plot-cpta"
-
     - title: "3n-tsh-x520-64b-{core}-vhost-base-ixgbe-testpmd"
       output-file-name: "3n-tsh-x520-64b-{core}-vhost-base-ixgbe-testpmd"
       data: "plot-performance-trending-vpp-3n-tsh"
       core: ["1t1c", "2t2c", "4t4c"]
       include:
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-mrr.64B-{core}-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-{core}-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-mrr.64B-{core}-eth-l2xcbase-eth-2vhostvr1024-1vm-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-{core}-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-mrr.64B-{core}-ethip4-ip4base-eth-2vhostvr1024-1vm-mrr"
@@ -2946,8 +3349,6 @@
       data: "plot-performance-trending-vpp-3n-tsh"
       core: ["1t1c", "2t2c", "4t4c"]
       include:
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-{core}-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
-        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-{core}-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-{core}-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-{core}-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-{core}-ethip4-ip4base-eth-2vhostvr1024-1vm-vppl2xc-mrr"
@@ -3035,7 +3436,6 @@
       core: ["2t1c", "4t2c", "8t4c"]
       include:
         - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Memif-1Dcr-mrr.64B-{core}-avf-eth-l2xcbase-eth-2memif-1dcr-mrr"
-        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-mrr.64B-{core}-avf-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-mrr"
         - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-mrr.64B-{core}-avf-eth-l2bdbasemaclrn-eth-2memif-1dcr-mrr"
         - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Eth-2Memif-1Dcr-mrr.64B-{core}-avf-ethip4-ip4base-eth-2memif-1dcr-mrr"
       layout: "plot-cpta"
@@ -3046,7 +3446,6 @@
       core: ["2t1c", "4t2c", "8t4c"]
       include:
         - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Memif-1Dcr-mrr.64B-{core}-eth-l2xcbase-eth-2memif-1dcr-mrr"
-        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-mrr.64B-{core}-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-mrr"
         - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-mrr.64B-{core}-eth-l2bdbasemaclrn-eth-2memif-1dcr-mrr"
         - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Memif-1Dcr-mrr.64B-{core}-ethip4-ip4base-eth-2memif-1dcr-mrr"
       layout: "plot-cpta"
@@ -3056,7 +3455,6 @@
       data: "plot-performance-trending-vpp-2n-zn2"
       core: ["2t1c", "4t2c", "8t4c"]
       include:
-        - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Mrr.64B-{core}-rdma-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-mrr"
         - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Mrr.64B-{core}-rdma-eth-l2bdbasemaclrn-eth-2memif-1dcr-mrr"
         - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Xcbase-Eth-2Memif-1Dcr-Mrr.64B-{core}-rdma-eth-l2xcbase-eth-2memif-1dcr-mrr"
         - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1Cx556A-Rdma-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Mrr.64B-{core}-rdma-ethip4-ip4base-eth-2memif-1dcr-mrr"
@@ -3071,6 +3469,7 @@
         - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-mrr.64B-{core}-avf-ethip4-ip4scale2m-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-Rnd-Mrr.64B-{core}-avf-ethip4-ip4scale2m-rnd-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Base-mrr.64B-{core}-ethip4-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-af-xdp-Ethip4-Ip4Base-mrr.64B-{core}-af-xdp-ethip4-ip4base-mrr"
       layout: "plot-cpta"
 
     - title: "2n-zn2-xxv710-64b-{core}-ip4routing-base-avf-dpdk"
@@ -3078,7 +3477,6 @@
       data: "plot-performance-trending-vpp-2n-zn2"
       core: ["2t1c", "4t2c", "8t4c"]
       include:
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-Ip4Base-Mrr.64B-{core}-avf-dot1q-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-mrr.64B-{core}-avf-ethip4-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-mrr.64B-{core}-ethip4-ip4base-mrr"
       layout: "plot-cpta"
@@ -3109,6 +3507,20 @@
         - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale2M-Rnd-Mrr.64B-{core}-ethip4-ip4scale2m-rnd-mrr"
       layout: "plot-cpta"
 
+    - title: "2n-zn2-xxv710-64b-{core}-ip4routing-scale-af_xdp"
+      output-file-name: "2n-zn2-xxv710-64b-{core}-ip4-scale-af_xdp"
+      data: "plot-performance-trending-vpp-2n-zn2"
+      core: ["2t1c", "4t2c", "8t4c"]
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-af-xdp-Ethip4-Ip4Base-mrr.64B-{core}-af-xdp-ethip4-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-af-xdp-Ethip4-Ip4Scale20K-mrr.64B-{core}-af-xdp-ethip4-ip4scale20k-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-af-xdp-Ethip4-Ip4Scale20K-Rnd-mrr.64B-{core}-af-xdp-ethip4-ip4scale20k-rnd-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-af-xdp-Ethip4-Ip4Scale200K-mrr.64B-{core}-af-xdp-ethip4-ip4scale200k-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-af-xdp-Ethip4-Ip4Scale200K-Rnd-mrr.64B-{core}-af-xdp-ethip4-ip4scale200k-rnd-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-af-xdp-Ethip4-Ip4Scale2M-mrr.64B-{core}-af-xdp-ethip4-ip4scale2m-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-af-xdp-Ethip4-Ip4Scale2M-Rnd-mrr.64B-{core}-af-xdp-ethip4-ip4scale2m-rnd-mrr"
+      layout: "plot-cpta"
+
     - title: "2n-zn2-xxv710-64b-{core}-features-ip4routing-base-avf"
       output-file-name: "2n-zn2-xxv710-64b-{core}-ip4-features-avf"
       data: "plot-performance-trending-vpp-2n-zn2"
@@ -3128,98 +3540,16 @@
       core: ["2t1c", "4t2c", "8t4c"]
       include:
         - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h1024-p63-s64512-mrr.64b-{core}-avf-ethip4udp-nat44det-h1024-p63-s64512-mrr"
-        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h4096-p63-s258048-mrr.64b-{core}-avf-ethip4udp-nat44det-h4096-p63-s258048-mrr"
         - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h16384-p63-s1032192-mrr.64b-{core}-avf-ethip4udp-nat44det-h16384-p63-s1032192-mrr"
         - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h65536-p63-s4128758-mrr.64b-{core}-avf-ethip4udp-nat44det-h65536-p63-s4128758-mrr"
         - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h262144-p63-s16515072-mrr.64b-{core}-avf-ethip4udp-nat44det-h262144-p63-s16515072-mrr"
       layout: "plot-cpta"
 
-#    - title: "2n-zn2-xxv710-64b-{core}-nat44ed-ip4routing-stl-unidir-avf"
-#      output-file-name: "2n-zn2-xxv710-64b-{core}-nat44ed-ip4routing-stl-unidir-avf"
-#      data: "plot-performance-trending-vpp-2n-zn2"
-#      core: ["2t1c", "4t2c", "8t4c"]
-#      include:
-#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-mrr.64b-{core}-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-mrr"
-#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-udir-mrr.64b-{core}-avf-ethip4udp-nat44ed-h4096-p63-s258048-udir-mrr"
-#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-udir-mrr.64b-{core}-avf-ethip4udp-nat44ed-h16384-p63-s1032192-udir-mrr"
-#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-udir-mrr.64b-{core}-avf-ethip4udp-nat44ed-h65536-p63-s4128768-udir-mrr"
-#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-udir-mrr.64b-{core}-avf-ethip4udp-nat44ed-h262144-p63-s16515072-udir-mrr"
-#      layout: "plot-cpta"
-#
-#    - title: "2n-zn2-xxv710-64b-{core}-nat44ed-ip4routing-udp-stf-cps-avf"
-#      output-file-name: "2n-zn2-xxv710-64b-{core}-nat44ed-ip4routing-udp-stf-cps-avf"
-#      data: "plot-performance-trending-vpp-2n-zn2"
-#      core: ["2t1c", "4t2c", "8t4c"]
-#      include:
-#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-mrr.64b-{core}-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-mrr"
-#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-cps-mrr.64b-{core}-avf-ethip4udp-nat44ed-h4096-p63-s258048-cps-mrr"
-#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-cps-mrr.64b-{core}-avf-ethip4udp-nat44ed-h16384-p63-s1032192-cps-mrr"
-#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-cps-mrr.64b-{core}-avf-ethip4udp-nat44ed-h65536-p63-s4128768-cps-mrr"
-#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-cps-mrr.64b-{core}-avf-ethip4udp-nat44ed-h262144-p63-s16515072-cps-mrr"
-#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h1024-p63-s64512-cps-mrr.64b-{core}-avf-ethip4udp-ip4base-h1024-p63-s64512-cps-mrr"
-#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h4096-p63-s258048-cps-mrr.64b-{core}-avf-ethip4udp-ip4base-h4096-p63-s258048-cps-mrr"
-#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h16384-p63-s1032192-cps-mrr.64b-{core}-avf-ethip4udp-ip4base-h16384-p63-s1032192-cps-mrr"
-#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h65536-p63-s4128768-cps-mrr.64b-{core}-avf-ethip4udp-ip4base-h65536-p63-s4128768-cps-mrr"
-#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h262144-p63-s16515072-cps-mrr.64b-{core}-avf-ethip4udp-ip4base-h262144-p63-s16515072-cps-mrr"
-#      layout: "plot-cpta-cps"
-#
-#    - title: "2n-zn2-xxv710-64b-{core}-nat44ed-ip4routing-udp-stf-pps-avf"
-#      output-file-name: "2n-zn2-xxv710-64b-{core}-nat44ed-ip4routing-udp-stf-pps-avf"
-#      data: "plot-performance-trending-vpp-2n-zn2"
-#      core: ["2t1c", "4t2c", "8t4c"]
-#      include:
-#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-mrr.64b-{core}-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-mrr"
-#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-pps-mrr.64b-{core}-avf-ethip4udp-nat44ed-h4096-p63-s258048-pps-mrr"
-#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-pps-mrr.64b-{core}-avf-ethip4udp-nat44ed-h16384-p63-s1032192-pps-mrr"
-#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-pps-mrr.64b-{core}-avf-ethip4udp-nat44ed-h65536-p63-s4128768-pps-mrr"
-#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-pps-mrr.64b-{core}-avf-ethip4udp-nat44ed-h262144-p63-s16515072-pps-mrr"
-#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h1024-p63-s64512-pps-mrr.64b-{core}-avf-ethip4udp-ip4base-h1024-p63-s64512-pps-mrr"
-#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h4096-p63-s258048-pps-mrr.64b-{core}-avf-ethip4udp-ip4base-h4096-p63-s258048-pps-mrr"
-#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h16384-p63-s1032192-pps-mrr.64b-{core}-avf-ethip4udp-ip4base-h16384-p63-s1032192-pps-mrr"
-#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h65536-p63-s4128768-pps-mrr.64b-{core}-avf-ethip4udp-ip4base-h65536-p63-s4128768-pps-mrr"
-#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h262144-p63-s16515072-pps-mrr.64b-{core}-avf-ethip4udp-ip4base-h262144-p63-s16515072-pps-mrr"
-#      layout: "plot-cpta"
-#
-#    - title: "2n-zn2-xxv710-64b-{core}-nat44ed-ip4routing-tcp-stf-cps-avf"
-#      output-file-name: "2n-zn2-xxv710-64b-{core}-nat44ed-ip4routing-tcp-stf-cps-avf"
-#      data: "plot-performance-trending-vpp-2n-zn2"
-#      core: ["2t1c", "4t2c", "8t4c"]
-#      include:
-#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-mrr.64b-{core}-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-mrr"
-#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h4096-p63-s258048-cps-mrr.64b-{core}-avf-ethip4tcp-nat44ed-h4096-p63-s258048-cps-mrr"
-#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-mrr.64b-{core}-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-mrr"
-#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-mrr.64b-{core}-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-mrr"
-#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-mrr.64b-{core}-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-mrr"
-#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h1024-p63-s64512-cps-mrr.64b-{core}-avf-ethip4tcp-ip4base-h1024-p63-s64512-cps-mrr"
-#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h4096-p63-s258048-cps-mrr.64b-{core}-avf-ethip4tcp-ip4base-h4096-p63-s258048-cps-mrr"
-#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h16384-p63-s1032192-cps-mrr.64b-{core}-avf-ethip4tcp-ip4base-h16384-p63-s1032192-cps-mrr"
-#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h65536-p63-s4128768-cps-mrr.64b-{core}-avf-ethip4tcp-ip4base-h65536-p63-s4128768-cps-mrr"
-#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h262144-p63-s16515072-cps-mrr.64b-{core}-avf-ethip4tcp-ip4base-h262144-p63-s16515072-cps-mrr"
-#      layout: "plot-cpta-cps"
-#
-#    - title: "2n-zn2-xxv710-64b-{core}-nat44ed-ip4routing-tcp-stf-pps-avf"
-#      output-file-name: "2n-zn2-xxv710-64b-{core}-nat44ed-ip4routing-tcp-stf-pps-avf"
-#      data: "plot-performance-trending-vpp-2n-zn2"
-#      core: ["2t1c", "4t2c", "8t4c"]
-#      include:
-#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-mrr.64b-{core}-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-mrr"
-#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h4096-p63-s258048-pps-mrr.64b-{core}-avf-ethip4tcp-nat44ed-h4096-p63-s258048-pps-mrr"
-#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-mrr.64b-{core}-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-mrr"
-#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-mrr.64b-{core}-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-mrr"
-#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-mrr.64b-{core}-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-mrr"
-#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h1024-p63-s64512-pps-mrr.64b-{core}-avf-ethip4tcp-ip4base-h1024-p63-s64512-pps-mrr"
-#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h4096-p63-s258048-pps-mrr.64b-{core}-avf-ethip4tcp-ip4base-h4096-p63-s258048-pps-mrr"
-#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h16384-p63-s1032192-pps-mrr.64b-{core}-avf-ethip4tcp-ip4base-h16384-p63-s1032192-pps-mrr"
-#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h65536-p63-s4128768-pps-mrr.64b-{core}-avf-ethip4tcp-ip4base-h65536-p63-s4128768-pps-mrr"
-#        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h262144-p63-s16515072-pps-mrr.64b-{core}-avf-ethip4tcp-ip4base-h262144-p63-s16515072-pps-mrr"
-#      layout: "plot-cpta"
-
     - title: "2n-zn2-cx556a-64b-{core}-rdma-ip4base"
       output-file-name: "2n-zn2-cx556a-64b-{core}-rdma-ip4base"
       data: "plot-performance-trending-vpp-2n-zn2"
       core: ["2t1c", "4t2c", "8t4c"]
       include:
-        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-Ip4Base-Mrr.64B-{core}-rdma-dot1q-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4-Ip4Base-Mrr.64B-{core}-rdma-ethip4-ip4base-mrr"
       layout: "plot-cpta"
 
@@ -3249,7 +3579,7 @@
         - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-ethip4udp-nat44det-h1024-p63-s64512-Mrr.64B-{core}-rdma-ethip4udp-nat44det-h1024-p63-s64512-mrr"
       layout: "plot-cpta"
 
-    - title: "2n-skx-xxv710-64b-{core}-ethip4--ethip4udpgeneve-avf"
+    - title: "2n-zn2-xxv710-64b-{core}-ethip4--ethip4udpgeneve-avf"
       output-file-name: "2n-zn2-xxv710-64b-{core}-ethip4--ethip4udpgeneve-avf"
       data: "plot-performance-trending-vpp-2n-zn2"
       core: ["2t1c", "4t2c", "8t4c"]
@@ -3270,6 +3600,7 @@
         - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-Mrr.78B-{core}-avf-ethip6-ip6scale2m-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-rnd-Mrr.78B-{core}-avf-ethip6-ip6scale2m-rnd-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Base-mrr.78B-{core}-ethip6-ip6base-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-af-xdp-Ethip6-Ip6Base-mrr.78B-{core}-af-xdp-ethip6-ip6base-mrr"
       layout: "plot-cpta"
 
     - title: "2n-zn2-xxv710-78b-{core}-ip6routing-base-scale-avf"
@@ -3277,7 +3608,6 @@
       data: "plot-performance-trending-vpp-2n-zn2"
       core: ["2t1c", "4t2c", "8t4c"]
       include:
-        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-Ip6Base-mrr.78B-{core}-avf-dot1q-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Base-mrr.78B-{core}-avf-ethip6-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale20K-mrr.78B-{core}-avf-ethip6-ip6scale20k-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale200K-mrr.78B-{core}-avf-ethip6-ip6scale200k-mrr"
@@ -3317,12 +3647,25 @@
         - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale2M-rnd-mrr.78B-{core}-ethip6-ip6scale2m-rnd-mrr"
       layout: "plot-cpta"
 
+    - title: "2n-zn2-xxv710-78b-{core}-ip6routing-base-scale-af_xdp"
+      output-file-name: "2n-zn2-xxv710-78b-{core}-ip6-base-scale-af_xdp"
+      data: "plot-performance-trending-vpp-2n-zn2"
+      core: ["2t1c", "4t2c", "8t4c"]
+      include:
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-af-xdp-Ethip6-Ip6Base-mrr.78B-{core}-af-xdp-ethip6-ip6base-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-af-xdp-Ethip6-Ip6Scale20K-mrr.78B-{core}-af-xdp-ethip6-ip6scale20k-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-af-xdp-Ethip6-Ip6Scale20K-rnd-mrr.78B-{core}-af-xdp-ethip6-ip6scale20k-rnd-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-af-xdp-Ethip6-Ip6Scale200K-mrr.78B-{core}-af-xdp-ethip6-ip6scale200k-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-af-xdp-Ethip6-Ip6Scale200K-rnd-mrr.78B-{core}-af-xdp-ethip6-ip6scale200k-rnd-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-af-xdp-Ethip6-Ip6Scale2M-mrr.78B-{core}-af-xdp-ethip6-ip6scale2m-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-af-xdp-Ethip6-Ip6Scale2M-rnd-mrr.78B-{core}-af-xdp-ethip6-ip6scale2m-rnd-mrr"
+      layout: "plot-cpta"
+
     - title: "2n-zn2-cx556a-78b-{core}-rdma-ip6routing-base-scale"
       output-file-name: "2n-zn2-cx556a-78b-{core}-rdma-ip6routing-base-scale"
       data: "plot-performance-trending-vpp-2n-zn2"
       core: ["2t1c", "4t2c", "8t4c"]
       include:
-        - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-Ip6Base-Mrr.78B-{core}-rdma-dot1q-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1Cx556A-Rdma-Ethip6-Ip6Base-Mrr.78B-{core}-rdma-ethip6-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1Cx556A-Rdma-Ethip6-Ip6Scale20K-Mrr.78B-{core}-rdma-ethip6-ip6scale20k-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1Cx556A-Rdma-Ethip6-Ip6Scale200K-Mrr.78B-{core}-rdma-ethip6-ip6scale200k-mrr"
@@ -3337,6 +3680,7 @@
         - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Bdbasemaclrn-mrr.64B-{core}-avf-eth-l2bdbasemaclrn-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdbasemaclrn-mrr.64B-{core}-eth-l2bdbasemaclrn-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-avf-Eth-L2Bdscale1Mmaclrn-Mrr.64B-{core}-avf-eth-l2bdscale1mmaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-af-xdp-Eth-L2Bdbasemaclrn-mrr.64B-{core}-af-xdp-eth-l2bdbasemaclrn-mrr"
       layout: "plot-cpta"
 
     - title: "2n-zn2-xxv710-64b-{core}-l2switching-base-avf"
@@ -3347,7 +3691,6 @@
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Patch-mrr.64B-{core}-avf-eth-l2patch-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-mrr.64B-{core}-avf-eth-l2xcbase-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-mrr.64B-{core}-avf-eth-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-mrr.64B-{core}-avf-dot1q-l2xcbase-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-mrr.64B-{core}-avf-dot1q-l2bdbasemaclrn-mrr"
       layout: "plot-cpta"
 
@@ -3383,12 +3726,24 @@
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale1Mmaclrn-mrr.64B-{core}-eth-l2bdscale1mmaclrn-mrr"
       layout: "plot-cpta"
 
+    - title: "2n-zn2-xxv710-64b-{core}-l2switching-base-scale-af_xdp"
+      output-file-name: "2n-zn2-xxv710-64b-{core}-l2-base-scale-af_xdp"
+      data: "plot-performance-trending-vpp-2n-zn2"
+      core: ["2t1c", "4t2c", "8t4c"]
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-af-xdp-Eth-L2Patch-mrr.64B-{core}-af-xdp-eth-l2patch-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-af-xdp-Eth-L2Xcbase-mrr.64B-{core}-af-xdp-eth-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-af-xdp-Eth-L2Bdbasemaclrn-mrr.64B-{core}-af-xdp-eth-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-af-xdp-Eth-L2Bdscale10Kmaclrn-mrr.64B-{core}-af-xdp-eth-l2bdscale10kmaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-af-xdp-Eth-L2Bdscale100Kmaclrn-mrr.64B-{core}-af-xdp-eth-l2bdscale100kmaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-af-xdp-Eth-L2Bdscale1Mmaclrn-mrr.64B-{core}-af-xdp-eth-l2bdscale1mmaclrn-mrr"
+      layout: "plot-cpta"
+
     - title: "2n-zn2-cx556a-64b-{core}-rdma-l2switching-base"
       output-file-name: "2n-zn2-cx556a-64b-{core}-rdma-l2switching-base"
       data: "plot-performance-trending-vpp-2n-zn2"
       core: ["2t1c", "4t2c", "8t4c"]
       include:
-        - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Xcbase-Mrr.64B-{core}-rdma-dot1q-l2xcbase-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Bdbasemaclrn-Mrr.64B-{core}-rdma-dot1q-l2bdbasemaclrn-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Patch-Mrr.64B-{core}-rdma-eth-l2patch-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Xcbase-Mrr.64B-{core}-rdma-eth-l2xcbase-mrr"
@@ -3411,7 +3766,6 @@
       data: "plot-performance-trending-vpp-2n-zn2"
       core: ["2t1c", "4t2c", "8t4c"]
       include:
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Mrr.64B-{core}-avf-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Mrr.64B-{core}-avf-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Mrr.64B-{core}-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Mrr.64B-{core}-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
@@ -3422,7 +3776,6 @@
       data: "plot-performance-trending-vpp-2n-zn2"
       core: ["2t1c", "4t2c", "8t4c"]
       include:
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-{core}-avf-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-{core}-avf-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-{core}-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-{core}-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
@@ -3449,7 +3802,6 @@
       data: "plot-performance-trending-vpp-2n-zn2"
       core: ["2t1c", "4t2c", "8t4c"]
       include:
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Mrr.64B-8t4c-rdma-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Mrr.64B-8t4c-rdma-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Mrr.64B-8t4c-rdma-eth-l2xcbase-eth-2vhostvr1024-1vm-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Mrr.64B-8t4c-rdma-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
@@ -3460,7 +3812,6 @@
       data: "plot-performance-trending-vpp-2n-zn2"
       core: ["2t1c", "4t2c", "8t4c"]
       include:
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-{core}-rdma-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-{core}-rdma-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-{core}-rdma-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-{core}-rdma-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
@@ -3496,6 +3847,224 @@
         - "tests.dpdk.perf.2n1l-25ge2p1xxv710-ethip4-ip4base-l3fwd-mrr.64b-{core}-ethip4-ip4base-l3fwd-mrr"
       layout: "plot-cpta"
 
+# 2n-icx
+
+    - title: "2n-icx-xxv710-64b-{core}-memif-base"
+      output-file-name: "2n-icx-xxv710-64b-{core}-memif-base"
+      data: "plot-performance-trending-vpp-2n-icx"
+      core: ["2t1c", "4t2c", "8t4c"]
+      include:
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Memif-1Dcr-Mrr.64B-{core}-avf-eth-l2xcbase-eth-2memif-1dcr-mrr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Mrr.64B-{core}-avf-eth-l2bdbasemaclrn-eth-2memif-1dcr-mrr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Mrr.64B-{core}-avf-ethip4-ip4base-eth-2memif-1dcr-mrr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Memif-1Dcr-Mrr.64B-{core}-eth-l2xcbase-eth-2memif-1dcr-mrr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Mrr.64B-{core}-eth-l2bdbasemaclrn-eth-2memif-1dcr-mrr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Mrr.64B-{core}-ethip4-ip4base-eth-2memif-1dcr-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-icx-xxv710-64b-{core}-ip4routing-base-scale-af-xdp"
+      output-file-name: "2n-icx-xxv710-64b-{core}-ip4-base-scale-af-xdp"
+      data: "plot-performance-trending-vpp-2n-icx"
+      core: ["2t1c", "4t2c", "8t4c"]
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Af-Xdp-Ethip4-Ip4Base-Mrr.64B-{core}-af-xdp-ethip4-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Af-Xdp-Ethip4-Ip4Scale20K-Mrr.64B-{core}-af-xdp-ethip4-ip4scale20k-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Af-Xdp-Ethip4-Ip4Scale20K-Rnd-Mrr.64B-{core}-af-xdp-ethip4-ip4scale20k-rnd-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-icx-xxv710-64b-{core}-ip4routing-base-scale-avf"
+      output-file-name: "2n-icx-xxv710-64b-{core}-ip4-base-scale-avf"
+      data: "plot-performance-trending-vpp-2n-icx"
+      core: ["2t1c", "4t2c", "8t4c"]
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Mrr.64B-{core}-avf-ethip4-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale20K-Mrr.64B-{core}-avf-ethip4-ip4scale20k-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale20K-Rnd-Mrr.64B-{core}-avf-ethip4-ip4scale20k-rnd-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale200K-Mrr.64B-{core}-avf-ethip4-ip4scale200k-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale200K-Rnd-Mrr.64B-{core}-avf-ethip4-ip4scale200k-rnd-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale2M-Mrr.64B-{core}-avf-ethip4-ip4scale2m-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale2M-Rnd-Mrr.64B-{core}-avf-ethip4-ip4scale2m-rnd-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-icx-xxv710-64b-{core}-ip4routing-base-scale-dpdk"
+      output-file-name: "2n-icx-xxv710-64b-{core}-ip4-base-scale-dpdk"
+      data: "plot-performance-trending-vpp-2n-icx"
+      core: ["2t1c", "4t2c", "8t4c"]
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Mrr.64B-{core}-ethip4-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale20K-Mrr.64B-{core}-ethip4-ip4scale20k-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale20K-Rnd-Mrr.64B-{core}-ethip4-ip4scale20k-rnd-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale200K-Mrr.64B-{core}-ethip4-ip4scale200k-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale200K-Rnd-Mrr.64B-{core}-ethip4-ip4scale200k-rnd-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale2M-Mrr.64B-{core}-ethip4-ip4scale2m-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale2M-Rnd-Mrr.64B-{core}-ethip4-ip4scale2m-rnd-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-icx-xxv710-64b-{core}-features-ip4routing-base-avf"
+      output-file-name: "2n-icx-xxv710-64b-{core}-ip4-features-avf"
+      data: "plot-performance-trending-vpp-2n-icx"
+      core: ["2t1c", "4t2c", "8t4c"]
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Mrr.64B-{core}-avf-ethip4udp-ip4base-iacl50sf-10kflows-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Mrr.64B-{core}-avf-ethip4udp-ip4base-iacl50sl-10kflows-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Mrr.64B-{core}-avf-ethip4udp-ip4base-oacl50sf-10kflows-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Mrr.64B-{core}-avf-ethip4udp-ip4base-oacl50sl-10kflows-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-icx-xxv710-64b-{core}-nat44det-ip4routing-stl-bidir-avf"
+      output-file-name: "2n-icx-xxv710-64b-{core}-nat44det-ip4routing-stl-bidir-avf"
+      data: "plot-performance-trending-vpp-2n-icx"
+      core: ["2t1c", "4t2c", "8t4c"]
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Det-H1024-P63-S64512-Mrr.64B-{core}-avf-ethip4udp-nat44det-h1024-p63-s64512-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Det-H16384-P63-S1032192-Mrr.64B-{core}-avf-ethip4udp-nat44det-h16384-p63-s1032192-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Det-H65536-P63-S4128758-Mrr.64B-{core}-avf-ethip4udp-nat44det-h65536-p63-s4128758-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-icx-xxv710-64b-{core}-nat44ed-ip4routing-stl-unidir-avf"
+      output-file-name: "2n-icx-xxv710-64b-{core}-nat44ed-ip4routing-stl-unidir-avf"
+      data: "plot-performance-trending-vpp-2n-icx"
+      core: ["2t1c", "4t2c", "8t4c"]
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H1024-P63-S64512-Udir-Mrr.64B-{core}-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-icx-xxv710-64b-{core}-nat44ed-ip4routing-udp-stf-cps-avf"
+      output-file-name: "2n-icx-xxv710-64b-{core}-nat44ed-ip4routing-udp-stf-cps-avf"
+      data: "plot-performance-trending-vpp-2n-icx"
+      core: ["2t1c", "4t2c", "8t4c"]
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-H1024-P63-S64512-Cps-Mrr.64B-{core}-avf-ethip4udp-ip4base-h1024-p63-s64512-cps-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-H16384-P63-S1032192-Cps-Mrr.64B-{core}-avf-ethip4udp-ip4base-h16384-p63-s1032192-cps-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-H65536-P63-S4128768-Cps-Mrr.64B-{core}-avf-ethip4udp-ip4base-h65536-p63-s4128768-cps-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H1024-P63-S64512-Cps-Mrr.64B-{core}-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H16384-P63-S1032192-Cps-Mrr.64B-{core}-avf-ethip4udp-nat44ed-h16384-p63-s1032192-cps-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H65536-P63-S4128768-Cps-Mrr.64B-{core}-avf-ethip4udp-nat44ed-h65536-p63-s4128768-cps-mrr"
+      layout: "plot-cpta-cps"
+
+    - title: "2n-icx-xxv710-64b-{core}-nat44ed-ip4routing-tcp-stf-cps-avf"
+      output-file-name: "2n-icx-xxv710-64b-{core}-nat44ed-ip4routing-tcp-stf-cps-avf"
+      data: "plot-performance-trending-vpp-2n-icx"
+      core: ["2t1c", "4t2c", "8t4c"]
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Ip4Base-H1024-P63-S64512-Cps-Mrr.64B-{core}-avf-ethip4tcp-ip4base-h1024-p63-s64512-cps-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Ip4Base-H16384-P63-S1032192-Cps-Mrr.64B-{core}-avf-ethip4tcp-ip4base-h16384-p63-s1032192-cps-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Ip4Base-H65536-P63-S4128768-Cps-Mrr.64B-{core}-avf-ethip4tcp-ip4base-h65536-p63-s4128768-cps-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H1024-P63-S64512-Cps-Mrr.64B-{core}-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H16384-P63-S1032192-Cps-Mrr.64B-{core}-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H65536-P63-S4128768-Cps-Mrr.64B-{core}-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-mrr"
+      layout: "plot-cpta-cps"
+
+    - title: "2n-icx-xxv710-64b-{core}-nat44ed-ip4routing-tcp-tput-avf"
+      output-file-name: "2n-icx-xxv710-64b-{core}-nat44ed-ip4routing-tcp-tput-avf"
+      data: "plot-performance-trending-vpp-2n-icx"
+      core: ["2t1c", "4t2c", "8t4c"]
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H1024-P63-S64512-Tput-Mrr.64B-{core}-avf-ethip4tcp-nat44ed-h1024-p63-s64512-tput-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H16384-P63-S1032192-Tput-Mrr.64B-{core}-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-tput-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H65536-P63-S4128768-Tput-Mrr.64B-{core}-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-tput-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-icx-xxv710-64b-{core}-nat44ed-ip4routing-udp-tput-avf"
+      output-file-name: "2n-icx-xxv710-64b-{core}-nat44ed-ip4routing-udp-tput-avf"
+      data: "plot-performance-trending-vpp-2n-icx"
+      core: ["2t1c", "4t2c", "8t4c"]
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H1024-P63-S64512-Tput-Mrr.64B-{core}-avf-ethip4udp-nat44ed-h1024-p63-s64512-tput-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H16384-P63-S1032192-Tput-Mrr.64B-{core}-avf-ethip4udp-nat44ed-h16384-p63-s1032192-tput-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H65536-P63-S4128768-Tput-Mrr.64B-{core}-avf-ethip4udp-nat44ed-h65536-p63-s4128768-tput-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-icx-xxv710-64b-{core}-ethip4--ethip4udpgeneve-avf"
+      output-file-name: "2n-icx-xxv710-64b-{core}-ethip4--ethip4udpgeneve-avf"
+      data: "plot-performance-trending-vpp-2n-icx"
+      core: ["2t1c", "4t2c", "8t4c"]
+      include:
+        - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-1Tun-Ip4Base-Mrr.64B-{core}-avf-ethip4--ethip4udpgeneve-1tun-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-4Tun-Ip4Base-Mrr.64B-{core}-avf-ethip4--ethip4udpgeneve-4tun-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-16Tun-Ip4Base-Mrr.64B-{core}-avf-ethip4--ethip4udpgeneve-16tun-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-64Tun-Ip4Base-Mrr.64B-{core}-avf-ethip4--ethip4udpgeneve-64tun-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-256Tun-Ip4Base-Mrr.64B-{core}-avf-ethip4--ethip4udpgeneve-256tun-ip4base-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-icx-xxv710-78b-{core}-ip6routing-base-scale-af-xdp"
+      output-file-name: "2n-icx-xxv710-78b-{core}-ip6-base-scale-af-xdp"
+      data: "plot-performance-trending-vpp-2n-icx"
+      core: ["2t1c", "4t2c", "8t4c"]
+      include:
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Af-Xdp-Ethip6-Ip6Base-Mrr.78B-{core}-af-xdp-ethip6-ip6base-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Af-Xdp-Ethip6-Ip6Scale20K-Mrr.78B-{core}-af-xdp-ethip6-ip6scale20k-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Af-Xdp-Ethip6-Ip6Scale20K-Rnd-Mrr.78B-{core}-af-xdp-ethip6-ip6scale20k-rnd-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-icx-xxv710-78b-{core}-ip6routing-base-scale-avf"
+      output-file-name: "2n-icx-xxv710-78b-{core}-ip6-base-scale-avf"
+      data: "plot-performance-trending-vpp-2n-icx"
+      core: ["2t1c", "4t2c", "8t4c"]
+      include:
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Base-Mrr.78B-{core}-avf-ethip6-ip6base-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale20K-Mrr.78B-{core}-avf-ethip6-ip6scale20k-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale20K-Rnd-Mrr.78B-{core}-avf-ethip6-ip6scale20k-rnd-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale200K-Mrr.78B-{core}-avf-ethip6-ip6scale200k-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale200K-Rnd-Mrr.78B-{core}-avf-ethip6-ip6scale200k-rnd-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale2M-Mrr.78B-{core}-avf-ethip6-ip6scale2m-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale2M-Rnd-Mrr.78B-{core}-avf-ethip6-ip6scale2m-rnd-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-icx-xxv710-78b-{core}-ip6routing-base-scale-dpdk"
+      output-file-name: "2n-icx-xxv710-78b-{core}-ip6-base-scale-dpdk"
+      data: "plot-performance-trending-vpp-2n-icx"
+      core: ["2t1c", "4t2c", "8t4c"]
+      include:
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Base-Mrr.78B-{core}-ethip6-ip6base-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale20K-Mrr.78B-{core}-ethip6-ip6scale20k-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale20K-Rnd-Mrr.78B-{core}-ethip6-ip6scale20k-rnd-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale200K-Mrr.78B-{core}-ethip6-ip6scale200k-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale200K-Rnd-Mrr.78B-{core}-ethip6-ip6scale200k-rnd-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale2M-Mrr.78B-{core}-ethip6-ip6scale2m-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale2M-Rnd-Mrr.78B-{core}-ethip6-ip6scale2m-rnd-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-icx-xxv710-64b-{core}-l2switching-base-scale-avf"
+      output-file-name: "2n-icx-xxv710-64b-{core}-l2-base-scale-avf"
+      data: "plot-performance-trending-vpp-2n-icx"
+      core: ["2t1c", "4t2c", "8t4c"]
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Mrr.64B-{core}-avf-dot1q-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Patch-Mrr.64B-{core}-avf-eth-l2patch-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Mrr.64B-{core}-avf-eth-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Mrr.64B-{core}-avf-eth-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale10Kmaclrn-Mrr.64B-{core}-avf-eth-l2bdscale10kmaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale100Kmaclrn-Mrr.64B-{core}-avf-eth-l2bdscale100kmaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale1Mmaclrn-Mrr.64B-{core}-avf-eth-l2bdscale1mmaclrn-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-icx-xxv710-64b-{core}-l2switching-base-scale-dpdk"
+      output-file-name: "2n-icx-xxv710-64b-{core}-l2-base-scale-dpdk"
+      data: "plot-performance-trending-vpp-2n-icx"
+      core: ["2t1c", "4t2c", "8t4c"]
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Patch-Mrr.64B-{core}-eth-l2patch-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Mrr.64B-{core}-eth-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Mrr.64B-{core}-eth-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale10Kmaclrn-Mrr.64B-{core}-eth-l2bdscale10kmaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale100Kmaclrn-Mrr.64B-{core}-eth-l2bdscale100kmaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale1Mmaclrn-Mrr.64B-{core}-eth-l2bdscale1mmaclrn-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-icx-xxv710-64b-{core}-vhost-base"
+      output-file-name: "2n-icx-xxv710-64b-{core}-vhost-base"
+      data: "plot-performance-trending-vpp-2n-icx"
+      core: ["2t1c", "4t2c", "8t4c"]
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Mrr.64B-{core}-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-{core}-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Mrr.64B-{core}-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-{core}-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Mrr.64B-{core}-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-{core}-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+      layout: "plot-cpta"
+
 # 2n-tx2
 
     - title: "2n-tx2-xl710-64b-{core}-ipsec-base-scale-sw-policy-dpdk"
@@ -3511,6 +4080,19 @@
         - "Tests.Vpp.Perf.Crypto.2N1L-40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-Ip4Base-Policy-Aes128Cbc-Hmac512Sha-Udir-Mrr.64B-{core}-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac512sha-udir-mrr"
       layout: "plot-cpta"
 
+    - title: "2n-tx2-xl710-64b-{core}-ipsec-spe-base-scale-dpdk"
+      output-file-name: "2n-tx2-xl710-64b-{core}-ipsec-spe-base-scale-dpdk"
+      data: "plot-performance-trending-vpp-2n-tx2"
+      core: ["1t1c", "2t2c", "4t4c"]
+      include:
+        - "Tests.Vpp.Perf.Crypto.2N1L-40Ge2P1Xl710-Ethip4Ipsec1Spe-Ip4Base-Policy-Outbound-Nocrypto-Mrr.64B-{core}-ethip4ipsec1spe-ip4base-policy-outbound-nocrypto-mrr"
+        - "Tests.Vpp.Perf.Crypto.2N1L-40Ge2P1Xl710-Ethip4Ipsec1Spe-Cache-Ip4Base-Policy-Outbound-Nocrypto-Mrr.64B-{core}-ethip4ipsec1spe-cache-ip4base-policy-outbound-nocrypto-mrr"
+        - "Tests.Vpp.Perf.Crypto.2N1L-40Ge2P1Xl710-Ethip4Ipsec100Spe-Ip4Base-Policy-Outbound-Nocrypto-Mrr.64B-{core}-ethip4ipsec100spe-ip4base-policy-outbound-nocrypto-mrr"
+        - "Tests.Vpp.Perf.Crypto.2N1L-40Ge2P1Xl710-Ethip4Ipsec100Spe-Cache-Ip4Base-Policy-Outbound-Nocrypto-Mrr.64B-{core}-ethip4ipsec100spe-cache-ip4base-policy-outbound-nocrypto-mrr"
+        - "Tests.Vpp.Perf.Crypto.2N1L-40Ge2P1Xl710-Ethip4Ipsec1000Spe-Ip4Base-Policy-Outbound-Nocrypto-Mrr.64B-{core}-ethip4ipsec1000spe-ip4base-policy-outbound-nocrypto-mrr"
+        - "Tests.Vpp.Perf.Crypto.2N1L-40Ge2P1Xl710-Ethip4Ipsec1000Spe-Cache-Ip4Base-Policy-Outbound-Nocrypto-Mrr.64B-{core}-ethip4ipsec1000spe-cache-ip4base-policy-outbound-nocrypto-mrr"
+      layout: "plot-cpta"
+
     - title: "2n-tx2-xl710-1518b-{core}-ipsec-base-scale-sw-cbc-dpdk"
       output-file-name: "2n-tx2-xl710-1518b-{core}-ipsec-base-scale-sw-cbc-dpdk"
       data: "plot-performance-trending-vpp-2n-tx2"
@@ -3562,13 +4144,23 @@
       data: "plot-performance-trending-vpp-2n-tx2"
       core: ["1t1c", "2t2c", "4t4c"]
       include:
-        - "Tests.Vpp.Perf.Ip4.2N1L-40Ge2P1Xl710-Dot1Q-Ip4Base-Mrr.64B-{core}-dot1q-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-40Ge2P1Xl710-Ethip4-Ip4Base-Mrr.64B-{core}-ethip4-ip4base-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-40Ge2P1Xl710-Ethip4-Ip4Scale20K-Mrr.64B-{core}-ethip4-ip4scale20k-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-40Ge2P1Xl710-Ethip4-Ip4Scale200K-Mrr.64B-{core}-ethip4-ip4scale200k-mrr"
         - "Tests.Vpp.Perf.Ip4.2N1L-40Ge2P1Xl710-Ethip4-Ip4Scale2M-Mrr.64B-{core}-ethip4-ip4scale2m-mrr"
       layout: "plot-cpta"
 
+    - title: "2n-tx2-xl710-64b-{core}-ip4routing-base-scale-af_xdp"
+      output-file-name: "2n-tx2-xl710-64b-{core}-ip4routing-base-scale-af_xdp"
+      data: "plot-performance-trending-vpp-2n-tx2"
+      core: ["1t1c", "2t2c", "4t4c"]
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-40Ge2P1Xl710-af-xdp-Ethip4-Ip4Base-mrr.64B-{core}-af-xdp-ethip4-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-40Ge2P1Xl710-af-xdp-Ethip4-Ip4Scale20K-mrr.64B-{core}-af-xdp-ethip4-ip4scale20k-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-40Ge2P1Xl710-af-xdp-Ethip4-Ip4Scale200K-mrr.64B-{core}-af-xdp-ethip4-ip4scale200k-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-40Ge2P1Xl710-af-xdp-Ethip4-Ip4Scale2M-mrr.64B-{core}-af-xdp-ethip4-ip4scale2m-mrr"
+      layout: "plot-cpta"
+
     - title: "2n-tx2-xl710-64b-{core}-features-ip4routing-base-scale-dpdk"
       output-file-name: "2n-tx2-xl710-64b-{core}-features-ip4routing-base-scale-dpdk"
       data: "plot-performance-trending-vpp-2n-tx2"
@@ -3586,7 +4178,6 @@
       data: "plot-performance-trending-vpp-2n-tx2"
       core: ["1t1c", "2t2c", "4t4c"]
       include:
-        - "Tests.Vpp.Perf.Ip6.2N1L-40Ge2P1Xl710-Dot1Q-Ip6Base-Mrr.78B-{core}-dot1q-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-40Ge2P1Xl710-Ethip6-Ip6Base-Mrr.78B-{core}-ethip6-ip6base-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-40Ge2P1Xl710-Ethip6-Ip6Scale20K-Mrr.78B-{core}-ethip6-ip6scale20k-mrr"
         - "Tests.Vpp.Perf.Ip6.2N1L-40Ge2P1Xl710-Ethip6-Ip6Scale200K-Mrr.78B-{core}-ethip6-ip6scale200k-mrr"
@@ -3594,12 +4185,22 @@
         - "Tests.Vpp.Perf.Ip6.2N1L-40Ge2P1Xl710-Ethip6-Ip6Base-Iacldstbase-Mrr.78B-{core}-ethip6-ip6base-iacldstbase-mrr"
       layout: "plot-cpta"
 
+    - title: "2n-tx2-xl710-78b-{core}-ip6routing-base-scale-af_xdp"
+      output-file-name: "2n-tx2-xl710-78b-{core}-ip6routing-base-scale-af_xdp"
+      data: "plot-performance-trending-vpp-2n-tx2"
+      core: ["1t1c", "2t2c", "4t4c"]
+      include:
+        - "Tests.Vpp.Perf.Ip6.2N1L-40Ge2P1Xl710-af-xdp-Ethip6-Ip6Base-mrr.78B-{core}-af-xdp-ethip6-ip6base-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-40Ge2P1Xl710-af-xdp-Ethip6-Ip6Scale20K-mrr.78B-{core}-af-xdp-ethip6-ip6scale20k-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-40Ge2P1Xl710-af-xdp-Ethip6-Ip6Scale200K-mrr.78B-{core}-af-xdp-ethip6-ip6scale200k-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-40Ge2P1Xl710-af-xdp-Ethip6-Ip6Scale2M-mrr.78B-{core}-af-xdp-ethip6-ip6scale2m-mrr"
+      layout: "plot-cpta"
+
     - title: "2n-tx2-xl710-64b-{core}-l2switching-base-dpdk"
       output-file-name: "2n-tx2-xl710-64b-{core}-l2switching-base-dpdk"
       data: "plot-performance-trending-vpp-2n-tx2"
       core: ["1t1c", "2t2c", "4t4c"]
       include:
-        - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-Dot1Q-L2Xcbase-Mrr.64B-{core}-dot1q-l2xcbase-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-Dot1Q-L2Bdbasemaclrn-Mrr.64B-{core}-dot1q-l2bdbasemaclrn-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-Eth-L2Patch-Mrr.64B-{core}-eth-l2patch-mrr"
         - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-Eth-L2Xcbase-Mrr.64B-{core}-eth-l2xcbase-mrr"
@@ -3617,6 +4218,19 @@
         - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-Eth-L2Bdscale1Mmaclrn-Mrr.64B-{core}-eth-l2bdscale1mmaclrn-mrr"
       layout: "plot-cpta"
 
+    - title: "2n-tx2-xl710-64b-{core}-l2switching-scale-af_xdp"
+      output-file-name: "2n-tx2-xl710-64b-{core}-l2switching-scale-af_xdp"
+      data: "plot-performance-trending-vpp-2n-tx2"
+      core: ["1t1c", "2t2c", "4t4c"]
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-af-xdp-Eth-L2Patch-mrr.64B-{core}-af-xdp-eth-l2patch-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-af-xdp-Eth-L2Xcbase-mrr.64B-{core}-af-xdp-eth-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-af-xdp-Eth-L2Bdbasemaclrn-mrr.64B-{core}-af-xdp-eth-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-af-xdp-Eth-L2Bdscale10Kmaclrn-mrr.64B-{core}-af-xdp-eth-l2bdscale10kmaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-af-xdp-Eth-L2Bdscale100Kmaclrn-mrr.64B-{core}-eth-l2bdscale100kmaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-af-xdp-Eth-L2Bdscale1Mmaclrn-mrr.64B-{core}-af-xdp-eth-l2bdscale1mmaclrn-mrr"
+      layout: "plot-cpta"
+
     - title: "2n-tx2-xl710-64b-{core}-features-l2switching-base-dpdk"
       output-file-name: "2n-tx2-xl710-64b-{core}-features-l2switching-base-dpdk"
       data: "plot-performance-trending-vpp-2n-tx2"
@@ -3651,7 +4265,6 @@
       test-type: ["ndr", "pdr"]
       include:
         - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-{core}-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
-        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-{core}-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
         - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-{core}-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
         - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Ndrpdr.64B-{core}-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
       layout: "plot-cpta"
@@ -3663,7 +4276,6 @@
       test-type: ["ndr", "pdr"]
       include:
         - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-{core}-avf-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
-        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-{core}-avf-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
         - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
         - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Ndrpdr.64B-{core}-avf-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
       layout: "plot-cpta"
@@ -3674,7 +4286,6 @@
       core: ["2t1c", ]
       test-type: ["ndr", "pdr"]
       include:
-        - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-{core}-rdma-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
         - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-{core}-rdma-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
         - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-{core}-rdma-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
         - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1Cx556A-Rdma-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Ndrpdr.64B-{core}-rdma-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
@@ -3692,6 +4303,7 @@
         - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Base-Ndrpdr.64B-{core}-avf-ethip4-ip4base-ndrpdr"
         - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-{core}-avf-ethip4-ip4scale2m-ndrpdr"
         - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-Rnd-Ndrpdr.64B-{core}-avf-ethip4-ip4scale2m-rnd-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-af-xdp-Ethip4-Ip4Base-Ndrpdr.64B-{core}-af-xdp-ethip4-ip4base-ndrpdr"
       layout: "plot-cpta"
 
     - title: "2n-clx-cx556a-64b-{core}-ip4-base-rdma-{test_type}"
@@ -3700,7 +4312,6 @@
       core: ["2t1c", ]
       test-type: ["ndr", "pdr"]
       include:
-        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-Ip4Base-Ndrpdr.64B-{core}-rdma-dot1q-ip4base-ndrpdr"
         - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4-Ip4Base-Ndrpdr.64B-{core}-rdma-ethip4-ip4base-ndrpdr"
       layout: "plot-cpta"
 
@@ -3738,7 +4349,6 @@
       core: ["2t1c", ]
       test-type: ["ndr", "pdr"]
       include:
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-Ip4Base-Ndrpdr.64B-{core}-avf-dot1q-ip4base-ndrpdr"
         - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Ndrpdr.64B-{core}-avf-ethip4-ip4base-ndrpdr"
         - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale20K-Ndrpdr.64B-{core}-avf-ethip4-ip4scale20k-ndrpdr"
         - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale200K-Ndrpdr.64B-{core}-avf-ethip4-ip4scale200k-ndrpdr"
@@ -3770,6 +4380,21 @@
         - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1024-p63-s64512-Ndrpdr.64B-{core}-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr"
       layout: "plot-cpta"
 
+    - title: "2n-clx-xxv710-64b-{core}-ip4-base-scale-af_xdp-{test_type}"
+      output-file-name: "2n-clx-xxv710-64b-{core}-ip4-base-scale-af_xdp-{test_type}"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      core: ["2t1c", ]
+      test-type: ["ndr", "pdr"]
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-af-xdp-Ethip4-Ip4Base-Ndrpdr.64B-{core}-af-xdp-ethip4-ip4base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-af-xdp-Ethip4-Ip4Scale20K-Ndrpdr.64B-{core}-af-xdp-ethip4-ip4scale20k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-af-xdp-Ethip4-Ip4Scale20K-Rnd-Ndrpdr.64B-{core}-af-xdp-ethip4-ip4scale20k-rnd-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-af-xdp-Ethip4-Ip4Scale200K-Ndrpdr.64B-{core}-af-xdp-ethip4-ip4scale200k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-af-xdp-Ethip4-Ip4Scale200K-Rnd-Ndrpdr.64B-{core}-af-xdp-ethip4-ip4scale200k-rnd-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-af-xdp-Ethip4-Ip4Scale2M-Ndrpdr.64B-{core}-af-xdp-ethip4-ip4scale2m-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-af-xdp-Ethip4-Ip4Scale2M-Rnd-Ndrpdr.64B-{core}-af-xdp-ethip4-ip4scale2m-rnd-ndrpdr"
+      layout: "plot-cpta"
+
     - title: "2n-clx-xxv710-64b-{core}-nat44det-ip4routing-stl-bidir-avf-{test_type}"
       output-file-name: "2n-clx-xxv710-64b-{core}-nat44det-ip4routing-stl-bidir-avf-{test_type}"
       data: "plot-ndrpdr-comparison-2n-clx"
@@ -3945,7 +4570,6 @@
       core: ["2t1c", ]
       test-type: ["ndr", "pdr"]
       include:
-        - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-Ip6Base-Ndrpdr.78B-{core}-rdma-dot1q-ip6base-ndrpdr"
         - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1Cx556A-Rdma-Ethip6-Ip6Base-Ndrpdr.78B-{core}-rdma-ethip6-ip6base-ndrpdr"
         - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1Cx556A-Rdma-Ethip6-Ip6Scale20K-Ndrpdr.78B-{core}-rdma-ethip6-ip6scale20k-ndrpdr"
         - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1Cx556A-Rdma-Ethip6-Ip6Scale200K-Ndrpdr.78B-{core}-rdma-ethip6-ip6scale200k-ndrpdr"
@@ -3962,6 +4586,7 @@
         - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-Ndrpdr.78B-{core}-avf-ethip6-ip6scale2m-ndrpdr"
         - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-rnd-Ndrpdr.78B-{core}-avf-ethip6-ip6scale2m-rnd-ndrpdr"
         - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Base-Ndrpdr.78B-{core}-ethip6-ip6base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-af-xdp-Ethip6-Ip6Base-Ndrpdr.78B-{core}-af-xdp-ethip6-ip6base-ndrpdr"
       layout: "plot-cpta"
 
     - title: "2n-clx-xxv710-78b-{core}-ip6-base-scale-avf-{test_type}"
@@ -3970,7 +4595,6 @@
       core: ["2t1c", ]
       test-type: ["ndr", "pdr"]
       include:
-        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-Ip6Base-Ndrpdr.78B-{core}-avf-dot1q-ip6base-ndrpdr"
         - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Base-Ndrpdr.78B-{core}-avf-ethip6-ip6base-ndrpdr"
         - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale20K-Ndrpdr.78B-{core}-avf-ethip6-ip6scale20k-ndrpdr"
         - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale200K-Ndrpdr.78B-{core}-avf-ethip6-ip6scale200k-ndrpdr"
@@ -4013,6 +4637,21 @@
         - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale2M-rnd-Ndrpdr.78B-{core}-ethip6-ip6scale2m-rnd-ndrpdr"
       layout: "plot-cpta"
 
+    - title: "2n-clx-xxv710-78b-{core}-ip6-base-scale-af_xdp-{test_type}"
+      output-file-name: "2n-clx-xxv710-78b-{core}-ip6-base-scale-af_xdp-{test_type}"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      core: ["2t1c", ]
+      test-type: ["ndr", "pdr"]
+      include:
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-af-xdp-Ethip6-Ip6Base-Ndrpdr.78B-{core}-af-xdp-ethip6-ip6base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-af-xdp-Ethip6-Ip6Scale20K-Ndrpdr.78B-{core}-af-xdp-ethip6-ip6scale20k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-af-xdp-Ethip6-Ip6Scale20K-rnd-Ndrpdr.78B-{core}-af-xdp-ethip6-ip6scale20k-rnd-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-af-xdp-Ethip6-Ip6Scale200K-Ndrpdr.78B-{core}-af-xdp-ethip6-ip6scale200k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-af-xdp-Ethip6-Ip6Scale200K-rnd-Ndrpdr.78B-{core}-af-xdp-ethip6-ip6scale200k-rnd-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-af-xdp-Ethip6-Ip6Scale2M-Ndrpdr.78B-{core}-af-xdp-ethip6-ip6scale2m-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-af-xdp-Ethip6-Ip6Scale2M-rnd-Ndrpdr.78B-{core}-af-xdp-ethip6-ip6scale2m-rnd-ndrpdr"
+      layout: "plot-cpta"
+
 # 2n-clx L2
 
     - title: "2n-clx-cx556a-64b-{core}-l2-base-rdma-{test_type}"
@@ -4021,7 +4660,6 @@
       core: ["2t1c", ]
       test-type: ["ndr", "pdr"]
       include:
-        - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Xcbase-Ndrpdr.64B-{core}-rdma-dot1q-l2xcbase-ndrpdr"
         - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-{core}-rdma-dot1q-l2bdbasemaclrn-ndrpdr"
         - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Patch-Ndrpdr.64B-{core}-rdma-eth-l2patch-ndrpdr"
         - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Xcbase-Ndrpdr.64B-{core}-rdma-eth-l2xcbase-ndrpdr"
@@ -4049,6 +4687,7 @@
         - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-ndrpdr"
         - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-{core}-avf-eth-l2bdscale1mmaclrn-ndrpdr"
         - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-{core}-eth-l2bdbasemaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-af-xdp-Eth-L2Bdbasemaclrn-Ndrpdr.64B-{core}-af-xdp-eth-l2bdbasemaclrn-ndrpdr"
       layout: "plot-cpta"
 
     - title: "2n-clx-xxv710-64b-{core}-l2-base-avf-{test_type}"
@@ -4057,7 +4696,6 @@
       core: ["2t1c", ]
       test-type: ["ndr", "pdr"]
       include:
-        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Ndrpdr.64B-{core}-avf-dot1q-l2xcbase-ndrpdr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-{core}-avf-dot1q-l2bdbasemaclrn-ndrpdr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Patch-Ndrpdr.64B-{core}-avf-eth-l2patch-ndrpdr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Ndrpdr.64B-{core}-avf-eth-l2xcbase-ndrpdr"
@@ -4090,6 +4728,20 @@
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-{core}-eth-l2bdscale1mmaclrn-ndrpdr"
       layout: "plot-cpta"
 
+    - title: "2n-clx-xxv710-64b-{core}-l2-base-scale-af_xdp-{test_type}"
+      output-file-name: "2n-clx-xxv710-64b-{core}-l2-base-scale-af_xdp-{test_type}"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      core: ["2t1c", ]
+      test-type: ["ndr", "pdr"]
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-af-xdp-Eth-L2Patch-Ndrpdr.64B-{core}-af-xdp-eth-l2patch-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-af-xdp-Eth-L2Xcbase-Ndrpdr.64B-{core}-af-xdp-eth-l2xcbase-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-af-xdp-Eth-L2Bdbasemaclrn-Ndrpdr.64B-{core}-af-xdp-eth-l2bdbasemaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-af-xdp-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-{core}-af-xdp-eth-l2bdscale10kmaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-af-xdp-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-{core}-af-xdp-eth-l2bdscale100kmaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-af-xdp-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-{core}-af-xdp-eth-l2bdscale1mmaclrn-ndrpdr"
+      layout: "plot-cpta"
+
 # 2n-clx VHost
 
     - title: "2n-clx-cx556a-64b-{core}-vhost-base-rdma-testpmd-{test_type}"
@@ -4098,8 +4750,6 @@
       core: ["2t1c", ]
       test-type: ["ndr", "pdr"]
       include:
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-rdma-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-rdma-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-rdma-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-rdma-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
       layout: "plot-cpta"
@@ -4110,8 +4760,6 @@
       core: ["2t1c", ]
       test-type: ["ndr", "pdr"]
       include:
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-rdma-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-rdma-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-rdma-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-rdma-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
       layout: "plot-cpta"
@@ -4122,8 +4770,6 @@
       core: ["2t1c", ]
       test-type: ["ndr", "pdr"]
       include:
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-avf-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-avf-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
@@ -4135,8 +4781,6 @@
       core: ["2t1c", ]
       test-type: ["ndr", "pdr"]
       include:
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-avf-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-avf-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
@@ -4161,7 +4805,6 @@
       core: ["2t1c", ]
       test-type: ["ndr", "pdr"]
       include:
-        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-avf-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-{core}-avf-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
         - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-avf-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-{core}-avf-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
         - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-avf-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
         - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-avf-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Ndrpdr.64B-{core}-avf-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
@@ -4173,7 +4816,6 @@
       core: ["2t1c", ]
       test-type: ["ndr", "pdr"]
       include:
-        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-{core}-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
         - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-{core}-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
         - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-{core}-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
         - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Ndrpdr.64B-{core}-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
@@ -4191,6 +4833,7 @@
         - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-{core}-avf-ethip4-ip4scale2m-ndrpdr"
         - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-avf-Ethip4-Ip4Scale2M-Rnd-Ndrpdr.64B-{core}-avf-ethip4-ip4scale2m-rnd-ndrpdr"
         - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Base-Ndrpdr.64B-{core}-ethip4-ip4base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-af-xdp-Ethip4-Ip4Base-Ndrpdr.64B-{core}-af-xdp-ethip4-ip4base-ndrpdr"
       layout: "plot-cpta"
 
     - title: "2n-skx-xxv710-64b-{core}-ip4-base-avf-{test_type}"
@@ -4199,7 +4842,6 @@
       core: ["2t1c", ]
       test-type: ["ndr", "pdr"]
       include:
-        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-Ip4Base-Ndrpdr.64B-{core}-avf-dot1q-ip4base-ndrpdr"
         - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Ndrpdr.64B-{core}-avf-ethip4-ip4base-ndrpdr"
       layout: "plot-cpta"
 
@@ -4231,6 +4873,21 @@
         - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1024-p63-s64512-Ndrpdr.64B-{core}-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr"
       layout: "plot-cpta"
 
+    - title: "2n-skx-xxv710-64b-{core}-ip4-base-scale-af_xdp-{test_type}"
+      output-file-name: "2n-skx-xxv710-64b-{core}-ip4-base-af_xdp-{test_type}"
+      data: "plot-ndrpdr-comparison-2n-skx"
+      core: ["2t1c", ]
+      test-type: ["ndr", "pdr"]
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-af-xdp-Ethip4-Ip4Base-Ndrpdr.64B-{core}-af-xdp-ethip4-ip4base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-af-xdp-Ethip4-Ip4Scale20K-Ndrpdr.64B-{core}-af-xdp-ethip4-ip4scale20k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-af-xdp-Ethip4-Ip4Scale20K-Rnd-Ndrpdr.64B-{core}-af-xdp-ethip4-ip4scale20k-rnd-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-af-xdp-Ethip4-Ip4Scale200K-Ndrpdr.64B-{core}-af-xdp-ethip4-ip4scale200k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-af-xdp-Ethip4-Ip4Scale200K-Rnd-Ndrpdr.64B-{core}-af-xdp-ethip4-ip4scale200k-rnd-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-af-xdp-Ethip4-Ip4Scale2M-Ndrpdr.64B-{core}-af-xdp-ethip4-ip4scale2m-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-af-xdp-Ethip4-Ip4Scale2M-Rnd-Ndrpdr.64B-{core}-af-xdp-ethip4-ip4scale2m-rnd-ndrpdr"
+      layout: "plot-cpta"
+
     - title: "2n-skx-xxv710-64b-{core}-nat44det-ip4routing-stl-bidir-avf-{test_type}"
       output-file-name: "2n-skx-xxv710-64b-{core}-nat44det-ip4routing-stl-bidir-avf-{test_type}"
       data: "plot-ndrpdr-comparison-2n-skx"
@@ -4401,6 +5058,7 @@
         - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-Ndrpdr.78B-{core}-avf-ethip6-ip6scale2m-ndrpdr"
         - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-rnd-Ndrpdr.78B-{core}-avf-ethip6-ip6scale2m-rnd-ndrpdr"
         - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Base-Ndrpdr.78B-{core}-ethip6-ip6base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-af-xdp-Ethip6-Ip6Base-Ndrpdr.78B-{core}-af-xdp-ethip6-ip6base-ndrpdr"
       layout: "plot-cpta"
 
     - title: "2n-skx-xxv710-78b-{core}-ip6-base-scale-avf-{test_type}"
@@ -4477,6 +5135,15 @@
         - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-{core}-eth-l2bdscale1mmaclrn-ndrpdr"
       layout: "plot-cpta"
 
+    - title: "2n-skx-x710-64b-{core}-l2-base-scale-af_xdp-{test_type}"
+      output-file-name: "2n-skx-x710-64b-{core}-l2-base-scale-af_xdp-{test_type}"
+      data: "plot-ndrpdr-comparison-2n-skx"
+      core: ["2t1c", ]
+      test-type: ["ndr", "pdr"]
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-af-xdp-Eth-L2Bdbasemaclrn-Ndrpdr.64B-{core}-af-xdp-eth-l2bdbasemaclrn-ndrpdr"
+      layout: "plot-cpta"
+
     - title: "2n-skx-xxv710-64b-{core}-l2-base-avf-{test_type}"
       output-file-name: "2n-skx-xxv710-64b-{core}-l2-base-avf-{test_type}"
       data: "plot-ndrpdr-comparison-2n-skx"
@@ -4486,7 +5153,6 @@
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Patch-Ndrpdr.64B-{core}-avf-eth-l2patch-ndrpdr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Ndrpdr.64B-{core}-avf-eth-l2xcbase-ndrpdr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-ndrpdr"
-        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Ndrpdr.64B-{core}-avf-dot1q-l2xcbase-ndrpdr"
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-{core}-avf-dot1q-l2bdbasemaclrn-ndrpdr"
       layout: "plot-cpta"
 
@@ -4525,6 +5191,20 @@
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-{core}-eth-l2bdscale1mmaclrn-ndrpdr"
       layout: "plot-cpta"
 
+    - title: "2n-skx-xxv710-64b-{core}-l2-base-scale-af_xdp-{test_type}"
+      output-file-name: "2n-skx-xxv710-64b-{core}-l2-base-scale-af_xdp-{test_type}"
+      data: "plot-ndrpdr-comparison-2n-skx"
+      core: ["2t1c", ]
+      test-type: ["ndr", "pdr"]
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-af-xdp-Eth-L2Patch-Ndrpdr.64B-{core}-af-xdp-eth-l2patch-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-af-xdp-Eth-L2Xcbase-Ndrpdr.64B-{core}-af-xdp-eth-l2xcbase-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-af-xdp-Eth-L2Bdbasemaclrn-Ndrpdr.64B-{core}-af-xdp-eth-l2bdbasemaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-af-xdp-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-{core}-af-xdp-eth-l2bdscale10kmaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-af-xdp-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-{core}-af-xdp-eth-l2bdscale100kmaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-af-xdp-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-{core}-af-xdp-eth-l2bdscale1mmaclrn-ndrpdr"
+      layout: "plot-cpta"
+
 # 2n-skx VHost
 
     - title: "2n-skx-xxv710-64b-{core}-vhost-base-avf-testpmd-{test_type}"
@@ -4533,8 +5213,6 @@
       core: ["2t1c", ]
       test-type: ["ndr", "pdr"]
       include:
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-avf-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-avf-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
       layout: "plot-cpta"
@@ -4545,8 +5223,6 @@
       core: ["2t1c", ]
       test-type: ["ndr", "pdr"]
       include:
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-avf-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-avf-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
       layout: "plot-cpta"
@@ -4557,7 +5233,6 @@
       core: ["2t1c", ]
       test-type: ["ndr", "pdr"]
       include:
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
       layout: "plot-cpta"
@@ -4568,7 +5243,6 @@
       core: ["2t1c", ]
       test-type: ["ndr", "pdr"]
       include:
-        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
       layout: "plot-cpta"
@@ -4581,7 +5255,6 @@
       core: ["2t1c", ]
       test-type: ["ndr", "pdr"]
       include:
-        - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-{core}-avf-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
         - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Memif-1Lxc-Ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr"
         - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-{core}-avf-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
         - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Memif-1Lxc-Ndrpdr.64B-{core}-avf-eth-l2xcbase-eth-2memif-1lxc-ndrpdr"
@@ -4668,7 +5341,6 @@
       core: ["2t1c", ]
       test-type: ["ndr", "pdr"]
       include:
-        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Dot1Q-Ip4Base-Ndrpdr.64B-{core}-avf-dot1q-ip4base-ndrpdr"
         - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Ndrpdr.64B-{core}-avf-ethip4-ip4base-ndrpdr"
         - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale20K-Ndrpdr.64B-{core}-avf-ethip4-ip4scale20k-ndrpdr"
         - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale200K-Ndrpdr.64B-{core}-avf-ethip4-ip4scale200k-ndrpdr"
@@ -4695,8 +5367,6 @@
       include:
         - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Xcbase-Ndrpdr.64B-{core}-avf-ethip4vxlan-l2xcbase-ndrpdr"
         - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Ndrpdr.64B-{core}-avf-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Avf-Dot1Q--Ethip4Vxlan-L2Bdscale1L2Bd1Vlan1Vxlan-Ndrpdr.64B-{core}-avf-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr"
-        - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Avf-Dot1Q--Ethip4Vxlan-L2Bdscale100L2Bd100Vlan100Vxlan-Ndrpdr.64B-{core}-avf-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-ndrpdr"
       layout: "plot-cpta"
 
     - title: "3n-skx-xxv710-64b-{core}-ip4-tunnels-base-dpdk-{test_type}"
@@ -4727,7 +5397,6 @@
       core: ["2t1c", ]
       test-type: ["ndr", "pdr"]
       include:
-        - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Avf-Dot1Q-Ip6Base-Ndrpdr.78B-{core}-avf-dot1q-ip6base-ndrpdr"
         - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Avf-Ethip6-Ip6Base-Ndrpdr.78B-{core}-avf-ethip6-ip6base-ndrpdr"
         - "	Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale20K-Ndrpdr.78B-{core}-avf-ethip6-ip6scale20k-ndrpdr"
         - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale200K-Ndrpdr.78B-{core}-avf-ethip6-ip6scale200k-ndrpdr"
@@ -4764,7 +5433,6 @@
       core: ["2t1c", ]
       test-type: ["ndr", "pdr"]
       include:
-        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Ndrpdr.64B-{core}-avf-dot1q-l2xcbase-ndrpdr"
         - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-{core}-avf-dot1q-l2bdbasemaclrn-ndrpdr"
         - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Patch-Ndrpdr.64B-{core}-avf-eth-l2patch-ndrpdr"
         - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Ndrpdr.64B-{core}-avf-eth-l2xcbase-ndrpdr"
@@ -4839,7 +5507,6 @@
       core: ["2t1c", ]
       test-type: ["ndr", "pdr"]
       include:
-        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
         - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
         - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
         - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr"
@@ -4872,8 +5539,6 @@
       core: ["2t1c", ]
       test-type: ["ndr", "pdr"]
       include:
-        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-avf-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-avf-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
         - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
         - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
         - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-avf-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr"
@@ -4886,10 +5551,63 @@
       core: ["2t1c", ]
       test-type: ["ndr", "pdr"]
       include:
-        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-avf-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-avf-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
         - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
         - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
         - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Vppip4-Ndrpdr.64B-{core}-avf-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr"
         - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-avf-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
       layout: "plot-cpta"
+
+# TRex 2n-skx
+
+    - title: "2n-skx-x710-64b--ip4-base-scale-{test_type}"
+      output-file-name: "2n-skx-x710-64b--ip4-base-scale-{test_type}"
+      data: "plot-ndrpdr-trending-trex-2n-skx"
+      core: ["2t1c", ]
+      test-type: ["ndr", "pdr"]
+      include:
+        - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4-Ip4Base-Tg-Ndrpdr.64B--ethip4-ip4base-tg-ndrpdr"
+        - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4-Ip4Scale2M-Tg-Ndrpdr.64B--ethip4-ip4scale2m-tg-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-skx-x710-64b--ip4routing-stf-cps-{test_type}"
+      output-file-name: "2n-skx-x710-64b--ip4routing-stf-cps-{test_type}"
+      data: "plot-ndrpdr-trending-trex-2n-skx"
+      core: ["2t1c", ]
+      test-type: ["ndr", "pdr"]
+      include:
+        - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4Tcp-Ip4Base-H1024-P63-S64512-Cps-Tg-Ndrpdr.64B--ethip4tcp-ip4base-h1024-p63-s64512-cps-tg-ndrpdr"
+        - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4Tcp-Ip4Base-H262144-P63-S16515072-Cps-Tg-Ndrpdr.64B--ethip4tcp-ip4base-h262144-p63-s16515072-cps-tg-ndrpdr"
+        - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4Udp-Ip4Base-H1024-P63-S64512-Cps-Tg-Ndrpdr.64B--ethip4udp-ip4base-h1024-p63-s64512-cps-tg-ndrpdr"
+        - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4Udp-Ip4Base-H262144-P63-S16515072-Cps-Tg-Ndrpdr.64B--ethip4udp-ip4base-h262144-p63-s16515072-cps-tg-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-skx-x710-64b--ip4routing-stf-pps-{test_type}"
+      output-file-name: "2n-skx-x710-64b--ip4routing-stf-pps-{test_type}"
+      data: "plot-ndrpdr-trending-trex-2n-skx"
+      core: ["2t1c", ]
+      test-type: ["ndr", "pdr"]
+      include:
+        - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4Tcp-Ip4Base-H1024-P63-S64512-pps-Tg-Ndrpdr.64B--ethip4tcp-ip4base-h1024-p63-s64512-pps-tg-ndrpdr"
+        - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4Tcp-Ip4Base-H262144-P63-S16515072-pps-Tg-Ndrpdr.64B--ethip4tcp-ip4base-h262144-p63-s16515072-pps-tg-ndrpdr"
+        - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4Udp-Ip4Base-H1024-P63-S64512-pps-Tg-Ndrpdr.64B--ethip4udp-ip4base-h1024-p63-s64512-pps-tg-ndrpdr"
+        - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4Udp-Ip4Base-H262144-P63-S16515072-pps-Tg-Ndrpdr.64B--ethip4udp-ip4base-h262144-p63-s16515072-pps-tg-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-skx-x710-78b--ip6-base-scale-{test_type}"
+      output-file-name: "2n-skx-x710-78b--ip6-base-scale-{test_type}"
+      data: "plot-ndrpdr-trending-trex-2n-skx"
+      core: ["2t1c", ]
+      test-type: ["ndr", "pdr"]
+      include:
+        - "Tests.Trex.Perf.Ip6.1N1L-10Ge2P1X710-Ethip6-Ip6Base-Tg-Ndrpdr.78B--ethip6-ip6base-tg-ndrpdr"
+        - "Tests.Trex.Perf.Ip6.1N1L-10Ge2P1X710-Ethip6-Ip6Scale2M-Tg-Ndrpdr.78B--ethip6-ip6scale2m-tg-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-skx-x710-64b--l2-scale-{test_type}"
+      output-file-name: "2n-skx-x710-64b--l2-scale-{test_type}"
+      data: "plot-ndrpdr-trending-trex-2n-skx"
+      core: ["2t1c", ]
+      test-type: ["ndr", "pdr"]
+      include:
+        - "Tests.Trex.Perf.L2.1N1L-10Ge2P1X710-Eth-L2Bdscale1Mmaclrn-Tg-Ndrpdr.64B--eth-l2bdscale1mmaclrn-tg-ndrpdr"
+      layout: "plot-cpta"