Trending: Add NAT44 tests
[csit.git] / resources / tools / presentation / specification_CPTA.yaml
index 43b5b3b..d3a883f 100644 (file)
@@ -1,4 +1,4 @@
-# Copyright (c) 2018 Cisco and/or its affiliates.
+# Copyright (c) 2020 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -45,8 +45,8 @@
   urls:
     URL[JENKINS,CSIT]: "https://jenkins.fd.io/view/csit/job"
     URL[NEXUS,LOG]: "https://logs.fd.io/production/vex-yul-rot-jenkins-1"
-    URL[NEXUS]: "https://docs.fd.io/csit"
-    DIR[NEXUS]: "trending/_static/archive"
+    URL[NEXUS,DOC]: "https://docs.fd.io/csit"
+    DIR[NEXUS,DOC]: "trending/_static/archive"
 
   make-dirs:
   # List the directories which are created while preparing the environment.
   # All directories MUST be defined in "paths" section.
   - "DIR[BUILD,HTML]"
 
+  testbeds:
+    "10.30.51.45": "LF-2n-SKX-21"
+    "10.30.51.53": "LF-2n-SKX-22"
+    "10.30.51.55": "LF-2n-SKX-23"
+    "10.30.51.57": "LF-2n-SKX-24"
+    "10.32.8.19": "LF-2n-CLX-27"
+    "10.32.8.21": "LF-2n-CLX-28"
+    "10.32.8.23": "LF-2n-CLX-29"
+    "10.30.51.16": "LF-3n-HSW-01"
+    "10.30.51.20": "LF-3n-HSW-02"
+    "10.30.51.24": "LF-3n-HSW-03"
+    "10.30.51.48": "LF-3n-SKX-31"
+    "10.30.51.60": "LF-3n-SKX-32"
+    "10.30.51.49": "LF-3n-TSH-33"
+    "10.32.8.10": "LF-DNV"
+
 -
   type: "configuration"
 
+  archive-inputs: False
+
   mapping-file: "mapping_tc_names.yaml"
 
   ignore-list: "ignored_tcs.yaml"
         type: "failed-tests"
         way: "jenkins"
         include:
-        - "failed-tests-3n-hsw"
-        - "failed-tests-3n-skx"
-        - "failed-tests-2n-skx"
-        url: "https://docs.fd.io/csit/master/trending/trending"
+          - "last-failed-tests-vpp-2n-skx-mrr"
+          - "last-failed-tests-vpp-3n-skx-mrr"
+          - "last-failed-tests-vpp-2n-clx-mrr"
+          - "last-failed-tests-vpp-3n-hsw-mrr"
+          - "last-failed-tests-vpp-3n-tsh-mrr"
+          - "last-failed-tests-vpp-2n-dnv-mrr"
+          - "last-failed-tests-vpp-3n-dnv-mrr"
+          - "last-failed-tests-dpdk-2n-skx-mrr"
+          - "last-failed-tests-dpdk-3n-skx-mrr"
+          - "last-failed-tests-dpdk-2n-clx-mrr"
+          - "last-failed-tests-dpdk-3n-hsw-mrr"
+          - "last-failed-tests-dpdk-3n-tsh-mrr"
+          - "last-failed-tests-vpp-2n-skx-ndrpdr"
+          - "last-failed-tests-vpp-3n-skx-ndrpdr"
+          - "last-failed-tests-vpp-2n-clx-ndrpdr"
+          - "last-failed-tests-vpp-3n-hsw-ndrpdr"
+        urls:
+          - "https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx"
+          - "https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx"
+          - "https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-clx"
+          - "https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master"
+          - "https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-tsh"
+          - "https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-dnv"
+          - "https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-dnv"
+          - "https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master-2n-skx"
+          - "https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master-3n-skx"
+          - "https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master-2n-clx"
+          - "https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master"
+          - "https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master-3n-tsh"
+          - "https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-skx"
+          - "https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-skx"
+          - "https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-clx"
+          - "https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-hsw"
+        url-details: "https://docs.fd.io/csit/master/trending/introduction/failures.html"
 
     configurations:
       # Configuration of the email notifications.
 
   data-sets:
 
+    # Compressed failed tests (last builds)
+    table-last-failed-tests-3n-hsw:
+      csit-vpp-perf-mrr-daily-master:
+        - "lastCompletedBuild"
+    table-last-failed-tests-3n-skx:
+      csit-vpp-perf-mrr-daily-master-3n-skx:
+        - "lastCompletedBuild"
+    table-last-failed-tests-2n-skx:
+      csit-vpp-perf-mrr-daily-master-2n-skx:
+        - "lastCompletedBuild"
+    table-last-failed-tests-2n-clx:
+      csit-vpp-perf-mrr-daily-master-2n-clx:
+        - "lastCompletedBuild"
+    table-last-failed-tests-3n-tsh:
+      csit-vpp-perf-mrr-daily-master-3n-tsh:
+        - "lastCompletedBuild"
+    table-last-failed-tests-3n-dnv:
+      csit-vpp-perf-mrr-daily-master-3n-dnv:
+        - "lastCompletedBuild"
+    table-last-failed-tests-2n-dnv:
+      csit-vpp-perf-mrr-daily-master-2n-dnv:
+        - "lastCompletedBuild"
+    table-last-failed-tests-3n-hsw-ndrpdr:
+      csit-vpp-perf-ndrpdr-weekly-master-3n-hsw:
+        - "lastCompletedBuild"
+    table-last-failed-tests-3n-skx-ndrpdr:
+      csit-vpp-perf-ndrpdr-weekly-master-3n-skx:
+        - "lastCompletedBuild"
+    table-last-failed-tests-2n-skx-ndrpdr:
+      csit-vpp-perf-ndrpdr-weekly-master-2n-skx:
+        - "lastCompletedBuild"
+    table-last-failed-tests-2n-clx-ndrpdr:
+      csit-vpp-perf-ndrpdr-weekly-master-2n-clx:
+        - "lastCompletedBuild"
+    table-last-failed-tests-dpdk-3n-hsw:
+      csit-dpdk-perf-mrr-weekly-master:
+        - "lastCompletedBuild"
+    table-last-failed-tests-dpdk-3n-skx:
+      csit-dpdk-perf-mrr-weekly-master-3n-skx:
+        - "lastCompletedBuild"
+    table-last-failed-tests-dpdk-2n-skx:
+      csit-dpdk-perf-mrr-weekly-master-2n-skx:
+        - "lastCompletedBuild"
+    table-last-failed-tests-dpdk-2n-clx:
+      csit-dpdk-perf-mrr-weekly-master-2n-clx:
+        - "lastCompletedBuild"
+    table-last-failed-tests-dpdk-3n-tsh:
+      csit-dpdk-perf-mrr-weekly-master-3n-tsh:
+        - "lastCompletedBuild"
+
     # 3n-hsw
     plot-performance-trending-all-3n-hsw:
       csit-vpp-perf-mrr-daily-master:
-        start: 240
+        start: 1100
         end: "lastCompletedBuild"
+        max-builds: 180
       csit-dpdk-perf-mrr-weekly-master:
-        start: 3
+        start: 107
         end: "lastCompletedBuild"
+        max-builds: 26
 
     plot-performance-trending-vpp-3n-hsw:
       csit-vpp-perf-mrr-daily-master:
-        start: 240
+        start: 1100
         end: "lastCompletedBuild"
+        max-builds: 180
 
     plot-performance-trending-dpdk-3n-hsw:
       csit-dpdk-perf-mrr-weekly-master:
-        start: 3
+        start: 107
         end: "lastCompletedBuild"
+        max-builds: 26
 
     # 3n-skx
     plot-performance-trending-all-3n-skx:
       csit-vpp-perf-mrr-daily-master-3n-skx:
-        start: 1
+        start: 834
         end: "lastCompletedBuild"
+        max-builds: 180
       csit-dpdk-perf-mrr-weekly-master-3n-skx:
-        start: 1
+        start: 72
         end: "lastCompletedBuild"
+        max-builds: 26
 
     plot-performance-trending-vpp-3n-skx:
       csit-vpp-perf-mrr-daily-master-3n-skx:
-        start: 1
+        start: 834
         end: "lastCompletedBuild"
+        max-builds: 180
 
     plot-performance-trending-dpdk-3n-skx:
       csit-dpdk-perf-mrr-weekly-master-3n-skx:
-        start: 1
+        start: 72
         end: "lastCompletedBuild"
+        max-builds: 26
 
     # 2n-skx
     plot-performance-trending-all-2n-skx:
       csit-vpp-perf-mrr-daily-master-2n-skx:
-        start: 1
+        start: 858
         end: "lastCompletedBuild"
+        max-builds: 180
       csit-dpdk-perf-mrr-weekly-master-2n-skx:
-        start: 1
+        start: 78
         end: "lastCompletedBuild"
+        max-builds: 26
 
     plot-performance-trending-vpp-2n-skx:
       csit-vpp-perf-mrr-daily-master-2n-skx:
-        start: 1
+        start: 858
         end: "lastCompletedBuild"
 
     plot-performance-trending-dpdk-2n-skx:
       csit-dpdk-perf-mrr-weekly-master-2n-skx:
-        start: 1
+        start: 78
+        end: "lastCompletedBuild"
+        max-builds: 26
+
+    plot-performance-trending-vpp-nfv-2n-skx:
+      csit-vpp-perf-mrr-weekly-master-2n-skx:
+        start: 66
+        end: "lastCompletedBuild"
+        max-builds: 26
+        skip:
+          - 68
+          - 72
+          - 73
+          - 75
+          - 76
+
+    # 2n-clx
+    plot-performance-trending-vpp-2n-clx:
+      csit-vpp-perf-mrr-daily-master-2n-clx:
+        start: 236
+        end: "lastCompletedBuild"
+        max-builds: 180
+
+    plot-performance-trending-vpp-nfv-2n-clx:
+      csit-vpp-perf-mrr-weekly-master-2n-clx:
+        start: 37
+        end: "lastCompletedBuild"
+        max-builds: 26
+        skip:
+          - 39
+          - 45
+          - 48
+
+    plot-performance-trending-dpdk-2n-clx:
+      csit-dpdk-perf-mrr-weekly-master-2n-clx:
+        start: 23
+        end: "lastCompletedBuild"
+        max-builds: 26
+
+    # 3n-tsh
+    plot-performance-trending-all-3n-tsh:
+      csit-vpp-perf-mrr-daily-master-3n-tsh:
+        start: 144
+        end: "lastCompletedBuild"
+        max-builds: 180
+
+    plot-performance-trending-vpp-3n-tsh:
+      csit-vpp-perf-mrr-daily-master-3n-tsh:
+        start: 144
+        end: "lastCompletedBuild"
+
+    plot-performance-trending-dpdk-3n-tsh:
+      csit-dpdk-perf-mrr-weekly-master-3n-tsh:
+        start: 4
+        end: "lastCompletedBuild"
+
+    # 3n-dnv
+    plot-performance-trending-vpp-3n-dnv:
+      csit-vpp-perf-mrr-daily-master-3n-dnv:
+        start: 329
+        end: "lastCompletedBuild"
+        max-builds: 180
+
+    # 2n-dnv
+    plot-performance-trending-vpp-2n-dnv:
+      csit-vpp-perf-mrr-daily-master-2n-dnv:
+        start: 335
+        end: "lastCompletedBuild"
+        max-builds: 180
+
+    # NDRPDR
+    plot-ndrpdr-comparison-2n-skx:
+      csit-vpp-perf-ndrpdr-weekly-master-2n-skx:
+        start: 76
+        end: "lastCompletedBuild"
+        max-builds: 26
+
+    plot-ndrpdr-comparison-3n-skx:
+      csit-vpp-perf-ndrpdr-weekly-master-3n-skx:
+        start: 76
+        end: "lastCompletedBuild"
+        max-builds: 26
+        skip:
+          - 87
+
+    plot-ndrpdr-comparison-2n-clx:
+      csit-vpp-perf-ndrpdr-weekly-master-2n-clx:
+        start: 21
+        end: "lastCompletedBuild"
+        max-builds: 26
+
+    plot-ndrpdr-comparison-3n-hsw:
+      csit-vpp-perf-ndrpdr-weekly-master-3n-hsw:
+        start: 76
+        end: "lastCompletedBuild"
+        max-builds: 26
+
+    table-ndrpdr-comparison-2n-skx:
+      csit-vpp-perf-ndrpdr-weekly-master-2n-skx:
+        start: 76
+        end: "lastCompletedBuild"
+        max-builds: 26
+        reverse: True  # Must be reversed
+
+    table-ndrpdr-comparison-3n-skx:
+      csit-vpp-perf-ndrpdr-weekly-master-3n-skx:
+        start: 76
+        end: "lastCompletedBuild"
+        max-builds: 26
+        reverse: True  # Must be reversed
+        skip:
+          - 87
+
+    table-ndrpdr-comparison-2n-clx:
+      csit-vpp-perf-ndrpdr-weekly-master-2n-clx:
+        start: 21
+        end: "lastCompletedBuild"
+        max-builds: 26
+        reverse: True  # Must be reversed
+
+    table-ndrpdr-comparison-3n-hsw:
+      csit-vpp-perf-ndrpdr-weekly-master-3n-hsw:
+        start: 76
         end: "lastCompletedBuild"
+        max-builds: 26
+        reverse: True  # Must be reversed
 
   plot-layouts:
 
     plot-cpta:
       title: ""
-      autosize: False
+      titlefont:
+        size: 16
+      autosize: True
+      showlegend: True
+      width: 1100
+      height: 800
+      yaxis:
+        showticklabels: True
+        tickformat: ".5s"
+        title: "Throughput [Mpps]"
+        hoverformat: ".5s"
+        gridcolor: "rgb(238, 238, 238)"
+        linecolor: "rgb(238, 238, 238)"
+        showline: True
+        zeroline: False
+        tickcolor: "rgb(238, 238, 238)"
+        linewidth: 1
+        showgrid: True
+      xaxis:
+        title: 'Date [MMDD]'
+        type: "date"
+        autorange: True
+        fixedrange: False
+        showgrid: True
+        gridcolor: "rgb(238, 238, 238)"
+        showline: True
+        linecolor: "rgb(238, 238, 238)"
+        zeroline: False
+        linewidth: 1
+        showticklabels: True
+        tickcolor: "rgb(238, 238, 238)"
+        tickmode: "auto"
+        tickformat: "%m%d"
+        rangeselector:
+          buttons:
+          - count: 14
+            label: "2w"
+            step: "day"
+            stepmode: "backward"
+          - count: 1
+            label: "1m"
+            step: "month"
+            stepmode: "backward"
+          - count: 2
+            label: "2m"
+            step: "month"
+            stepmode: "backward"
+          - count: 3
+            label: "3m"
+            step: "month"
+            stepmode: "backward"
+          - step: "all"
+      margin:
+        r: 20
+        b: 5
+        t: 5
+        l: 70
+      legend:
+        orientation: "h"
+        xanchor: "auto"
+        traceorder: "normal"  # "grouped" does not work: bug https://github.com/plotly/plotly.js/issues/1913
+        bordercolor: "rgb(238, 238, 238)"
+      paper_bgcolor: "#fff"
+      plot_bgcolor: "#fff"
+      hoverlabel:
+        namelength: -1
+
+    plot-cpta-cps:
+      title: ""
+      titlefont:
+        size: 16
+      autosize: True
       showlegend: True
       width: 1100
       height: 800
       yaxis:
         showticklabels: True
-        tickformat: ".4s"
-        title: "Throughput [pps]"
-        hoverformat: ".4s"
+        tickformat: ".5s"
+        title: "Connection Rate [Mcps]"
+        hoverformat: ".5s"
         gridcolor: "rgb(238, 238, 238)"
         linecolor: "rgb(238, 238, 238)"
         showline: True
         l: 70
       legend:
         orientation: "h"
-        xanchor: "center"
+        xanchor: "auto"
         traceorder: "normal"  # "grouped" does not work: bug https://github.com/plotly/plotly.js/issues/1913
-        tracegroupgap: 20
         bordercolor: "rgb(238, 238, 238)"
+      paper_bgcolor: "#fff"
+      plot_bgcolor: "#fff"
       hoverlabel:
         namelength: -1
 
 -
   type: "input"
   general:
-    file-name: "output.xml.gz"
+    file-name: "output_info.xml.gz"
     file-format: ".gz"
     download-path: "{job}/{build}/archives/{filename}"
     extract: "output.xml"
+    # Number of days from now to the past. Only files generated in this
+    # time period are used.
+    time-period: 180
+
+    zip-file-name: "robot-plugin.zip"
+    zip-file-format: ".zip"
+    zip-download-path: "{job}/{build}/robot/report/*zip*/{filename}"
+    zip-extract: "robot-plugin/output.xml"
 
   builds:
 
+    # 2n-skx ndrpdr
+    csit-vpp-perf-ndrpdr-weekly-master-2n-skx:
+      start: 76
+      end: "lastCompletedBuild"
+      max-builds: 26
+
+    # 3n-skx ndrpdr
+    csit-vpp-perf-ndrpdr-weekly-master-3n-skx:
+      start: 76
+      end: "lastCompletedBuild"
+      max-builds: 26
+      skip:
+        - 87
+
+    # 2n-clx ndrpdr
+    csit-vpp-perf-ndrpdr-weekly-master-2n-clx:
+      start: 21
+      end: "lastCompletedBuild"
+      max-builds: 26
+
+    # 3n-hsw ndrpdr
+    csit-vpp-perf-ndrpdr-weekly-master-3n-hsw:
+      start: 76
+      end: "lastCompletedBuild"
+      max-builds: 26
+
     # 3n-hsw
     csit-vpp-perf-mrr-daily-master:
-      start: 240
+      start: 1100
       end: "lastCompletedBuild"
+      max-builds: 180  # Max nr of builds to download
+      skip:
+        - 1102
+        - 1159
     csit-dpdk-perf-mrr-weekly-master:
-      start: 3
+      start: 113
       end: "lastCompletedBuild"
+      max-builds: 26  # Max nr of builds to download
+      skip:
+        - 114
 
     # 3n-skx
     csit-vpp-perf-mrr-daily-master-3n-skx:
-      start: 1
+      start: 834
       end: "lastCompletedBuild"
+      max-builds: 180  # Max nr of builds to download
+      skip:
+        - 849
+        - 851
+        - 862
+        - 864
+        - 865
+        - 866
+        - 867
     csit-dpdk-perf-mrr-weekly-master-3n-skx:
-      start: 1
+      start: 78
       end: "lastCompletedBuild"
+      max-builds: 26  # Max nr of builds to download
+      skip:
+        - 79
 
     # 2n-skx
     csit-vpp-perf-mrr-daily-master-2n-skx:
-      start: 1
+      start: 858
       end: "lastCompletedBuild"
+      max-builds: 180  # Max nr of builds to download
+      skip:
+        - 868
+        - 870
+        - 874
+        - 889
+    csit-vpp-perf-mrr-weekly-master-2n-skx:
+      start: 66
+      end: "lastCompletedBuild"
+      max-builds: 26  # Max nr of builds to download
+      skip:
+        - 68
+        - 72
+        - 73
+        - 75
+        - 76
+
     csit-dpdk-perf-mrr-weekly-master-2n-skx:
-      start: 1
+      start: 78
+      end: "lastCompletedBuild"
+      max-builds: 26  # Max nr of builds to download
+      skip:
+        - 79
+
+    csit-vpp-perf-mrr-daily-master-2n-clx:
+      start: 236
       end: "lastCompletedBuild"
+      max-builds: 180  # Max nr of builds to download
+      skip:
+        - 239
+        - 248
+        - 251
+        - 252
+        - 253
+        - 308
+    csit-vpp-perf-mrr-weekly-master-2n-clx:
+      start: 37
+      end: "lastCompletedBuild"
+      max-builds: 26  # Max nr of builds to download
+      skip:
+        - 39
+        - 45
+        - 48
+
+    csit-dpdk-perf-mrr-weekly-master-2n-clx:
+      start: 23
+      end: "lastCompletedBuild"
+      max-builds: 26  # Max nr of builds to download
+      skip:
+        - 24
+
+    # 3n-tsh
+    csit-vpp-perf-mrr-daily-master-3n-tsh:
+      start: 144
+      end: "lastCompletedBuild"
+      max-builds: 180  # Max nr of builds to download
+      skip:
+        - 149
+        - 150
+        - 152
+        - 153
+        - 154
+        - 155
+        - 156
+        - 157
+        - 192
+
+    csit-dpdk-perf-mrr-weekly-master-3n-tsh:
+      start: 4
+      end: "lastCompletedBuild"
+      max-builds: 26  # Max nr of builds to download
+
+    # 3n-dnv
+    csit-vpp-perf-mrr-daily-master-3n-dnv:
+      start: 329
+      end: "lastCompletedBuild"
+      max-builds: 180  # Max nr of builds to download
+      skip:
+        - 343
+        - 344
+        - 345
+        - 348
+        - 350
+        - 356
+        - 357
+        - 358
+        - 360
+        - 363
+        - 364
+        - 381
+        - 387
+        - 388
+        - 390
+        - 391
+        - 392
+        - 396
+
+    # 2n-dnv
+    csit-vpp-perf-mrr-daily-master-2n-dnv:
+      start: 335
+      end: "lastCompletedBuild"
+      max-builds: 180  # Max nr of builds to download
+      skip:
+        - 344
+        - 349
+        - 350
+        - 351
+        - 354
+        - 36
+        - 364
+        - 365
+        - 366
+        - 370
+        - 378
+        - 387
+        - 394
+        - 395
+        - 396
+        - 397
+        - 402
 
 -
   type: "output"
-  output:
-    "CPTA"  # Continuous Performance Trending and Analysis
+  output: "trending"
   format:
     html:
     - full
 ################################################################################
 
 ################################################################################
+
+# VPP NDRPDR weekly comparison 2n-skx-xxv710 2t1c ndr
+- type: "table"
+  title: "VPP NDRPDR weekly comparison 2n-skx-xxv710 2t1c ndr"
+  algorithm: "table_weekly_comparison"
+  output-file: "{DIR[STATIC,VPP]}/ndrpdr-weekly-comp-2n-skx-2t1c-ndr"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  data: "table-ndrpdr-comparison-2n-skx"
+  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
+  nr-of-data-columns: 3
+  comparisons:
+    - reference: -3
+      compare: -1
+    - reference: -2
+      compare: -1
+
+# VPP NDRPDR weekly comparison 2n-skx-xxv710 2t1c pdr
+- type: "table"
+  title: "VPP NDRPDR weekly comparison 2n-skx-xxv710 2t1c pdr"
+  algorithm: "table_weekly_comparison"
+  output-file: "{DIR[STATIC,VPP]}/ndrpdr-weekly-comp-2n-skx-2t1c-pdr"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  data: "table-ndrpdr-comparison-2n-skx"
+  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
+  nr-of-data-columns: 3
+  comparisons:
+    - reference: -3
+      compare: -1
+    - reference: -2
+      compare: -1
+
+# VPP NDRPDR weekly comparison 3n-skx-xxv710 2t1c ndr
+- type: "table"
+  title: "VPP NDRPDR weekly comparison 3n-skx-xxv710 2t1c ndr"
+  algorithm: "table_weekly_comparison"
+  output-file: "{DIR[STATIC,VPP]}/ndrpdr-weekly-comp-3n-skx-2t1c-ndr"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  data: "table-ndrpdr-comparison-3n-skx"
+  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
+  nr-of-data-columns: 3
+  comparisons:
+    - reference: -3
+      compare: -1
+    - reference: -2
+      compare: -1
+
+# VPP NDRPDR weekly comparison 3n-skx-xxv710 2t1c pdr
+- type: "table"
+  title: "VPP NDRPDR weekly comparison 3n-skx-xxv710 2t1c pdr"
+  algorithm: "table_weekly_comparison"
+  output-file: "{DIR[STATIC,VPP]}/ndrpdr-weekly-comp-3n-skx-2t1c-pdr"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  data: "table-ndrpdr-comparison-3n-skx"
+  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
+  nr-of-data-columns: 3
+  comparisons:
+    - reference: -3
+      compare: -1
+    - reference: -2
+      compare: -1
+
+# VPP NDRPDR weekly comparison 2n-clx-xxv710 2t1c ndr
+- type: "table"
+  title: "VPP NDRPDR weekly comparison 2n-clx-xxv710 2t1c ndr"
+  algorithm: "table_weekly_comparison"
+  output-file: "{DIR[STATIC,VPP]}/ndrpdr-weekly-comp-2n-clx-2t1c-ndr"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  data: "table-ndrpdr-comparison-2n-clx"
+  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
+  nr-of-data-columns: 3
+  comparisons:
+    - reference: -3
+      compare: -1
+    - reference: -2
+      compare: -1
+
+# VPP NDRPDR weekly comparison 2n-clx-xxv710 2t1c pdr
+- type: "table"
+  title: "VPP NDRPDR weekly comparison 2n-clx-xxv710 2t1c pdr"
+  algorithm: "table_weekly_comparison"
+  output-file: "{DIR[STATIC,VPP]}/ndrpdr-weekly-comp-2n-clx-2t1c-pdr"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  data: "table-ndrpdr-comparison-2n-clx"
+  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
+  nr-of-data-columns: 3
+  comparisons:
+    - reference: -3
+      compare: -1
+    - reference: -2
+      compare: -1
+
+# VPP NDRPDR weekly comparison 3n-hsw-xl710 2t1c ndr
+- type: "table"
+  title: "VPP NDRPDR weekly comparison 3n-hsw-xl710 1t1c ndr"
+  algorithm: "table_weekly_comparison"
+  output-file: "{DIR[STATIC,VPP]}/ndrpdr-weekly-comp-3n-hsw-1t1c-ndr"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  data: "table-ndrpdr-comparison-3n-hsw"
+  filter: "'1T1C' and 'NDRPDR' and 'NIC_Intel-XL710' and not 'NF_DENSITY'"
+  nr-of-data-columns: 3
+  comparisons:
+    - reference: -3
+      compare: -1
+    - reference: -2
+      compare: -1
+
+# VPP NDRPDR weekly comparison 3n-hsw-xl710 2t1c pdr
+- type: "table"
+  title: "VPP NDRPDR weekly comparison 3n-hsw-xl710 1t1c pdr"
+  algorithm: "table_weekly_comparison"
+  output-file: "{DIR[STATIC,VPP]}/ndrpdr-weekly-comp-3n-hsw-1t1c-pdr"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  data: "table-ndrpdr-comparison-3n-hsw"
+  filter: "'1T1C' and 'NDRPDR' and 'NIC_Intel-XL710' and not 'NF_DENSITY'"
+  nr-of-data-columns: 3
+  comparisons:
+    - reference: -3
+      compare: -1
+    - reference: -2
+      compare: -1
+
+# Compressed failed tests (last build)
+-
+  type: "table"
+  title: "Last failed tests (last builds) VPP 3n-hsw"
+  algorithm: "table_last_failed_tests"
+  output-file-ext: ".txt"
+  output-file: "{DIR[STATIC,VPP]}/last-failed-tests-vpp-3n-hsw-mrr"
+  data: "table-last-failed-tests-3n-hsw"
+  filter: "'MRR'"
+  parameters:
+    - "name"
+    - "parent"
+    - "status"
+
+-
+  type: "table"
+  title: "Last failed tests (last builds) VPP 3n-skx"
+  algorithm: "table_last_failed_tests"
+  output-file-ext: ".txt"
+  output-file: "{DIR[STATIC,VPP]}/last-failed-tests-vpp-3n-skx-mrr"
+  data: "table-last-failed-tests-3n-skx"
+  filter: "'MRR'"
+  parameters:
+    - "name"
+    - "parent"
+    - "status"
+
+-
+  type: "table"
+  title: "Last failed tests (last builds) VPP 2n-skx"
+  algorithm: "table_last_failed_tests"
+  output-file-ext: ".txt"
+  output-file: "{DIR[STATIC,VPP]}/last-failed-tests-vpp-2n-skx-mrr"
+  data: "table-last-failed-tests-2n-skx"
+  filter: "'MRR'"
+  parameters:
+    - "name"
+    - "parent"
+    - "status"
+
+-
+  type: "table"
+  title: "Last failed tests (last builds) VPP 2n-clx"
+  algorithm: "table_last_failed_tests"
+  output-file-ext: ".txt"
+  output-file: "{DIR[STATIC,VPP]}/last-failed-tests-vpp-2n-clx-mrr"
+  data: "table-last-failed-tests-2n-clx"
+  filter: "'MRR'"
+  parameters:
+    - "name"
+    - "parent"
+    - "status"
+
+-
+  type: "table"
+  title: "Last failed tests (last builds) VPP 3n-tsh"
+  algorithm: "table_last_failed_tests"
+  output-file-ext: ".txt"
+  output-file: "{DIR[STATIC,VPP]}/last-failed-tests-vpp-3n-tsh-mrr"
+  data: "table-last-failed-tests-3n-tsh"
+  filter: "'MRR'"
+  parameters:
+    - "name"
+    - "parent"
+    - "status"
+
+-
+  type: "table"
+  title: "Last failed tests (last builds) VPP 3n-dnv"
+  algorithm: "table_last_failed_tests"
+  output-file-ext: ".txt"
+  output-file: "{DIR[STATIC,VPP]}/last-failed-tests-vpp-3n-dnv-mrr"
+  data: "table-last-failed-tests-3n-dnv"
+  filter: "'MRR'"
+  parameters:
+    - "name"
+    - "parent"
+    - "status"
+
+-
+  type: "table"
+  title: "Last failed tests (last builds) VPP 2n-dnv"
+  algorithm: "table_last_failed_tests"
+  output-file-ext: ".txt"
+  output-file: "{DIR[STATIC,VPP]}/last-failed-tests-vpp-2n-dnv-mrr"
+  data: "table-last-failed-tests-2n-dnv"
+  filter: "'MRR'"
+  parameters:
+    - "name"
+    - "parent"
+    - "status"
+
+-
+  type: "table"
+  title: "Last failed tests (last builds) VPP 3n-hsw-ndrpdr"
+  algorithm: "table_last_failed_tests"
+  output-file-ext: ".txt"
+  output-file: "{DIR[STATIC,VPP]}/last-failed-tests-vpp-3n-hsw-ndrpdr"
+  data: "table-last-failed-tests-3n-hsw-ndrpdr"
+  filter: "'NDRPDR'"
+  parameters:
+    - "name"
+    - "parent"
+    - "status"
+
+-
+  type: "table"
+  title: "Last failed tests (last builds) VPP 3n-skx-ndrpdr"
+  algorithm: "table_last_failed_tests"
+  output-file-ext: ".txt"
+  output-file: "{DIR[STATIC,VPP]}/last-failed-tests-vpp-3n-skx-ndrpdr"
+  data: "table-last-failed-tests-3n-skx-ndrpdr"
+  filter: "'NDRPDR'"
+  parameters:
+    - "name"
+    - "parent"
+    - "status"
+
+-
+  type: "table"
+  title: "Last failed tests (last builds) VPP 2n-skx-ndrpdr"
+  algorithm: "table_last_failed_tests"
+  output-file-ext: ".txt"
+  output-file: "{DIR[STATIC,VPP]}/last-failed-tests-vpp-2n-skx-ndrpdr"
+  data: "table-last-failed-tests-2n-skx-ndrpdr"
+  filter: "'NDRPDR'"
+  parameters:
+    - "name"
+    - "parent"
+    - "status"
+
+-
+  type: "table"
+  title: "Last failed tests (last builds) VPP 2n-clx-ndrpdr"
+  algorithm: "table_last_failed_tests"
+  output-file-ext: ".txt"
+  output-file: "{DIR[STATIC,VPP]}/last-failed-tests-vpp-2n-clx-ndrpdr"
+  data: "table-last-failed-tests-2n-clx-ndrpdr"
+  filter: "'NDRPDR'"
+  parameters:
+    - "name"
+    - "parent"
+    - "status"
+
+-
+  type: "table"
+  title: "Last failed tests (last builds) DPDK 3n-hsw"
+  algorithm: "table_last_failed_tests"
+  output-file-ext: ".txt"
+  output-file: "{DIR[STATIC,VPP]}/last-failed-tests-dpdk-3n-hsw-mrr"
+  data: "table-last-failed-tests-dpdk-3n-hsw"
+  filter: "'MRR'"
+  parameters:
+    - "name"
+    - "parent"
+    - "status"
+
+-
+  type: "table"
+  title: "Last failed tests (last builds) DPDK 3n-tsh"
+  algorithm: "table_last_failed_tests"
+  output-file-ext: ".txt"
+  output-file: "{DIR[STATIC,VPP]}/last-failed-tests-dpdk-3n-tsh-mrr"
+  data: "table-last-failed-tests-dpdk-3n-tsh"
+  filter: "'MRR'"
+  parameters:
+    - "name"
+    - "parent"
+    - "status"
+
+-
+  type: "table"
+  title: "Last failed tests (last builds) DPDK 3n-skx"
+  algorithm: "table_last_failed_tests"
+  output-file-ext: ".txt"
+  output-file: "{DIR[STATIC,VPP]}/last-failed-tests-dpdk-3n-skx-mrr"
+  data: "table-last-failed-tests-dpdk-3n-skx"
+  filter: "'MRR'"
+  parameters:
+    - "name"
+    - "parent"
+    - "status"
+
+-
+  type: "table"
+  title: "Last failed tests (last builds) DPDK 2n-skx"
+  algorithm: "table_last_failed_tests"
+  output-file-ext: ".txt"
+  output-file: "{DIR[STATIC,VPP]}/last-failed-tests-dpdk-2n-skx-mrr"
+  data: "table-last-failed-tests-dpdk-2n-skx"
+  filter: "'MRR'"
+  parameters:
+    - "name"
+    - "parent"
+    - "status"
+
+-
+  type: "table"
+  title: "Last failed tests (last builds) DPDK 2n-clx"
+  algorithm: "table_last_failed_tests"
+  output-file-ext: ".txt"
+  output-file: "{DIR[STATIC,VPP]}/last-failed-tests-dpdk-2n-clx-mrr"
+  data: "table-last-failed-tests-dpdk-2n-clx"
+  filter: "'MRR'"
+  parameters:
+    - "name"
+    - "parent"
+    - "status"
+
 # 3n-hsw
 -
   type: "table"
   title: "Performance trending dashboard 1t1c-3n-hsw"
-  algorithm: "table_performance_trending_dashboard"
+  algorithm: "table_perf_trending_dash"
   output-file-ext: ".csv"
   output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-1t1c-3n-hsw"
   data: "plot-performance-trending-all-3n-hsw"
   filter: "'MRR' and '1T1C' and not 'NIC_Intel-XXV710'"
   parameters:
-  - "name"
-  - "parent"
-  - "result"
-  ignore-list:
-    # This test is "ndrdisc" test and was improperly tagged. It was fixed
-    # but it remains in the old output.xml files.
-  - "tests.vpp.perf.l2.10ge2p1x520-eth-l2bdscale1mmaclrn-mrr.tc01-64b-1t1c-eth-l2bdscale1mmaclrn-ndrdisc"
-  outlier-const: 1.5
+    - "name"
+    - "parent"
+    - "result"
   window: 14
-  evaluated-window: 14
   long-trend-window: 180
 
 -
   type: "table"
   title: "Performance trending dashboard 2t2c-3n-hsw"
-  algorithm: "table_performance_trending_dashboard"
+  algorithm: "table_perf_trending_dash"
   output-file-ext: ".csv"
   output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t2c-3n-hsw"
   data: "plot-performance-trending-all-3n-hsw"
   filter: "'MRR' and '2T2C' and not 'NIC_Intel-XXV710'"
   parameters:
-  - "name"
-  - "parent"
-  - "result"
-  ignore-list:
-    # This test is "ndrdisc" test and was improperly tagged. It was fixed
-    # but it remains in the old output.xml files.
-  - "tests.vpp.perf.l2.10ge2p1x520-eth-l2bdscale1mmaclrn-mrr.tc05-64b-2t2c-eth-l2bdscale1mmaclrn-ndrdisc"
-  outlier-const: 1.5
+    - "name"
+    - "parent"
+    - "result"
   window: 14
-  evaluated-window: 14
   long-trend-window: 180
 
 -
   type: "table"
   title: "Performance trending dashboard 4t4c-3n-hsw"
-  algorithm: "table_performance_trending_dashboard"
+  algorithm: "table_perf_trending_dash"
   output-file-ext: ".csv"
   output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-4t4c-3n-hsw"
   data: "plot-performance-trending-all-3n-hsw"
   filter: "'MRR' and '4T4C' and not 'NIC_Intel-XXV710'"
   parameters:
-  - "name"
-  - "parent"
-  - "result"
-  ignore-list:
-    # This test is "ndrdisc" test and was improperly tagged. It was fixed
-    # but it remains in the old output.xml files.
-  - "tests.vpp.perf.l2.10ge2p1x520-eth-l2bdscale1mmaclrn-mrr.tc09-64b-4t4c-eth-l2bdscale1mmaclrn-ndrdisc"
-  outlier-const: 1.5
+    - "name"
+    - "parent"
+    - "result"
   window: 14
-  evaluated-window: 14
   long-trend-window: 180
 
 -
   type: "table"
   title: "HTML performance trending dashboard 1t1c-3n-hsw"
-  algorithm: "table_performance_trending_dashboard_html"
+  algorithm: "table_perf_trending_dash_html"
   input-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-1t1c-3n-hsw.csv"
   output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-1t1c-3n-hsw.rst"
   testbed: "3n-hsw"
 -
   type: "table"
   title: "HTML performance trending dashboard 2t2c-3n-hsw"
-  algorithm: "table_performance_trending_dashboard_html"
+  algorithm: "table_perf_trending_dash_html"
   input-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t2c-3n-hsw.csv"
   output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t2c-3n-hsw.rst"
   testbed: "3n-hsw"
 -
   type: "table"
   title: "HTML performance trending dashboard 4t4c-3n-hsw"
-  algorithm: "table_performance_trending_dashboard_html"
+  algorithm: "table_perf_trending_dash_html"
   input-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-4t4c-3n-hsw.csv"
   output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-4t4c-3n-hsw.rst"
   testbed: "3n-hsw"
 
+# 3n-hsw
 -
   type: "table"
-  title: "Failed MRR tests 3n-hsw"
-  algorithm: "table_failed_tests"
+  title: "Performance trending dashboard 1t1c-3n-hsw ndr"
+  algorithm: "table_perf_trending_dash"
   output-file-ext: ".csv"
-  output-file: "{DIR[STATIC,VPP]}/failed-tests-3n-hsw"
-  data: "plot-performance-trending-all-3n-hsw"
-  filter: "'MRR' and not 'NIC_Intel-XXV710'"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-1t1c-3n-hsw-ndr"
+  data: "plot-ndrpdr-comparison-3n-hsw"
+  filter: "'NDRPDR' and '1T1C'"
+  include-tests: "NDR"
   parameters:
-  - "name"
-  - "parent"
-  - "status"
-  ignore-list:
-    # This test is "ndrdisc" test and was improperly tagged. It was fixed
-    # but it remains in the old output.xml files.
-  - "tests.vpp.perf.l2.10ge2p1x520-eth-l2bdscale1mmaclrn-mrr.tc01-64b-1t1c-eth-l2bdscale1mmaclrn-ndrdisc"
-  window: 7  # days
+    - "name"
+    - "parent"
+    - "throughput"
+  window: 4
+  long-trend-window: 12
 
 -
   type: "table"
-  title: "HTML Failed MRR tests 3n-hsw"
-  algorithm: "table_failed_tests_html"
-  input-file: "{DIR[STATIC,VPP]}/failed-tests-3n-hsw.csv"
-  output-file: "{DIR[STATIC,VPP]}/failed-tests-3n-hsw.rst"
+  title: "Performance trending dashboard 1t1c-3n-hsw pdr"
+  algorithm: "table_perf_trending_dash"
+  output-file-ext: ".csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-1t1c-3n-hsw-pdr"
+  data: "plot-ndrpdr-comparison-3n-hsw"
+  filter: "'NDRPDR' and '1T1C'"
+  include-tests: "PDR"
+  parameters:
+    - "name"
+    - "parent"
+    - "throughput"
+  window: 4
+  long-trend-window: 12
+
+-
+  type: "table"
+  title: "HTML performance trending dashboard 1t1c-3n-hsw ndr"
+  algorithm: "table_perf_trending_dash_html"
+  input-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-1t1c-3n-hsw-ndr.csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-1t1c-3n-hsw-ndr.rst"
   testbed: "3n-hsw"
+  test-type: "NDR"
+  add-links: True
+
+-
+  type: "table"
+  title: "HTML performance trending dashboard 1t1c-3n-hsw pdr"
+  algorithm: "table_perf_trending_dash_html"
+  input-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-1t1c-3n-hsw-pdr.csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-1t1c-3n-hsw-pdr.rst"
+  testbed: "3n-hsw"
+  test-type: "PDR"
+  add-links: True
 
-################################################################################
 # 3n-skx
 -
   type: "table"
-  title: "Performance trending dashboard 2t1c-3n-skx"
-  algorithm: "table_performance_trending_dashboard"
+  title: "Performance trending dashboard 2t1c-3n-skx ndr"
+  algorithm: "table_perf_trending_dash"
   output-file-ext: ".csv"
-  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t1c-3n-skx"
-  data: "plot-performance-trending-all-3n-skx"
-  filter: "'MRR' and '2T1C'"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t1c-3n-skx-ndr"
+  data: "plot-ndrpdr-comparison-3n-skx"
+  filter: "'NDRPDR' and '2T1C'"
+  include-tests: "NDR"
   parameters:
-  - "name"
-  - "parent"
-  - "result"
-  ignore-list:
-    # This test is "ndrdisc" test and was improperly tagged. It was fixed
-    # but it remains in the old output.xml files.
-  - "tests.vpp.perf.l2.10ge2p1x520-eth-l2bdscale1mmaclrn-mrr.tc01-64b-2t1c-eth-l2bdscale1mmaclrn-ndrdisc"
-  outlier-const: 1.5
-  window: 14
-  evaluated-window: 14
-  long-trend-window: 180
+    - "name"
+    - "parent"
+    - "throughput"
+  window: 4
+  long-trend-window: 12
 
 -
   type: "table"
-  title: "Performance trending dashboard 4t2c-3n-skx"
-  algorithm: "table_performance_trending_dashboard"
+  title: "Performance trending dashboard 2t1c-3n-skx pdr"
+  algorithm: "table_perf_trending_dash"
   output-file-ext: ".csv"
-  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-4t2c-3n-skx"
-  data: "plot-performance-trending-all-3n-skx"
-  filter: "'MRR' and '4T2C'"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t1c-3n-skx-pdr"
+  data: "plot-ndrpdr-comparison-3n-skx"
+  filter: "'NDRPDR' and '2T1C'"
+  include-tests: "PDR"
   parameters:
-  - "name"
-  - "parent"
-  - "result"
-  ignore-list:
-    # This test is "ndrdisc" test and was improperly tagged. It was fixed
-    # but it remains in the old output.xml files.
-  - "tests.vpp.perf.l2.10ge2p1x520-eth-l2bdscale1mmaclrn-mrr.tc05-64b-4t2c-eth-l2bdscale1mmaclrn-ndrdisc"
-  outlier-const: 1.5
-  window: 14
-  evaluated-window: 14
-  long-trend-window: 180
+    - "name"
+    - "parent"
+    - "throughput"
+  window: 4
+  long-trend-window: 12
 
 -
   type: "table"
-  title: "Performance trending dashboard 8t4c-3n-skx"
-  algorithm: "table_performance_trending_dashboard"
-  output-file-ext: ".csv"
-  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-8t4c-3n-skx"
-  data: "plot-performance-trending-all-3n-skx"
-  filter: "'MRR' and '8T4C'"
-  parameters:
-  - "name"
-  - "parent"
-  - "result"
-  ignore-list:
-    # This test is "ndrdisc" test and was improperly tagged. It was fixed
-    # but it remains in the old output.xml files.
-  - "tests.vpp.perf.l2.10ge2p1x520-eth-l2bdscale1mmaclrn-mrr.tc09-64b-8t4c-eth-l2bdscale1mmaclrn-ndrdisc"
-  outlier-const: 1.5
+  title: "HTML performance trending dashboard 2t1c-3n-skx ndr"
+  algorithm: "table_perf_trending_dash_html"
+  input-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t1c-3n-skx-ndr.csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t1c-3n-skx-ndr.rst"
+  testbed: "3n-skx"
+  test-type: "NDR"
+  add-links: True
+
+-
+  type: "table"
+  title: "HTML performance trending dashboard 2t1c-3n-skx pdr"
+  algorithm: "table_perf_trending_dash_html"
+  input-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t1c-3n-skx-pdr.csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t1c-3n-skx-pdr.rst"
+  testbed: "3n-skx"
+  test-type: "PDR"
+  add-links: True
+
+# 2n-skx
+-
+  type: "table"
+  title: "Performance trending dashboard 2t1c-2n-skx ndr"
+  algorithm: "table_perf_trending_dash"
+  output-file-ext: ".csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t1c-2n-skx-ndr"
+  data: "plot-ndrpdr-comparison-2n-skx"
+  filter: "'NDRPDR' and '2T1C'"
+  include-tests: "NDR"
+  parameters:
+    - "name"
+    - "parent"
+    - "throughput"
+  window: 4
+  long-trend-window: 12
+
+-
+  type: "table"
+  title: "Performance trending dashboard 2t1c-2n-skx pdr"
+  algorithm: "table_perf_trending_dash"
+  output-file-ext: ".csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t1c-2n-skx-pdr"
+  data: "plot-ndrpdr-comparison-2n-skx"
+  filter: "'NDRPDR' and '2T1C'"
+  include-tests: "PDR"
+  parameters:
+    - "name"
+    - "parent"
+    - "throughput"
+  window: 4
+  long-trend-window: 12
+
+-
+  type: "table"
+  title: "HTML performance trending dashboard 2t1c-2n-skx ndr"
+  algorithm: "table_perf_trending_dash_html"
+  input-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t1c-2n-skx-ndr.csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t1c-2n-skx-ndr.rst"
+  testbed: "2n-skx"
+  test-type: "NDR"
+  add-links: True
+
+-
+  type: "table"
+  title: "HTML performance trending dashboard 2t1c-2n-skx pdr"
+  algorithm: "table_perf_trending_dash_html"
+  input-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t1c-2n-skx-pdr.csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t1c-2n-skx-pdr.rst"
+  testbed: "2n-skx"
+  test-type: "PDR"
+  add-links: True
+
+# 2n-clx
+-
+  type: "table"
+  title: "Performance trending dashboard 2t1c-2n-clx ndr"
+  algorithm: "table_perf_trending_dash"
+  output-file-ext: ".csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t1c-2n-clx-ndr"
+  data: "plot-ndrpdr-comparison-2n-clx"
+  filter: "'NDRPDR' and '2T1C'"
+  include-tests: "NDR"
+  parameters:
+    - "name"
+    - "parent"
+    - "throughput"
+  window: 14
+  long-trend-window: 180
+
+-
+  type: "table"
+  title: "Performance trending dashboard 2t1c-2n-clx pdr"
+  algorithm: "table_perf_trending_dash"
+  output-file-ext: ".csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t1c-2n-clx-pdr"
+  data: "plot-ndrpdr-comparison-2n-clx"
+  filter: "'NDRPDR' and '2T1C'"
+  include-tests: "PDR"
+  parameters:
+    - "name"
+    - "parent"
+    - "throughput"
+  window: 14
+  long-trend-window: 180
+
+-
+  type: "table"
+  title: "HTML performance trending dashboard 2t1c-2n-clx ndr"
+  algorithm: "table_perf_trending_dash_html"
+  input-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t1c-2n-clx-ndr.csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t1c-2n-clx-ndr.rst"
+  testbed: "2n-clx"
+  test-type: "NDR"
+  add-links: True
+
+-
+  type: "table"
+  title: "HTML performance trending dashboard 2t1c-2n-clx pdr"
+  algorithm: "table_perf_trending_dash_html"
+  input-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t1c-2n-clx-pdr.csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t1c-2n-clx-pdr.rst"
+  testbed: "2n-clx"
+  test-type: "PDR"
+  add-links: True
+
+-
+  type: "table"
+  title: "Failed MRR tests 3n-hsw"
+  algorithm: "table_failed_tests"
+  output-file-ext: ".csv"
+  output-file: "{DIR[STATIC,VPP]}/failed-tests-3n-hsw"
+  data: "plot-performance-trending-all-3n-hsw"
+  filter: "'MRR' and not 'NIC_Intel-XXV710'"
+  parameters:
+    - "name"
+    - "parent"
+    - "status"
+  window: 7  # days
+
+-
+  type: "table"
+  title: "HTML Failed MRR tests 3n-hsw"
+  algorithm: "table_failed_tests_html"
+  input-file: "{DIR[STATIC,VPP]}/failed-tests-3n-hsw.csv"
+  output-file: "{DIR[STATIC,VPP]}/failed-tests-3n-hsw.rst"
+  testbed: "3n-hsw"
+
+-
+  type: "table"
+  title: "Failed NDRPDR tests 3n-hsw"
+  algorithm: "table_failed_tests"
+  output-file-ext: ".csv"
+  output-file: "{DIR[STATIC,VPP]}/failed-tests-3n-hsw-ndrpdr"
+  data: "plot-ndrpdr-comparison-3n-hsw"
+  filter: "'NDRPDR'"
+  parameters:
+    - "name"
+    - "parent"
+    - "status"
+  window: 30  # days
+
+-
+  type: "table"
+  title: "HTML Failed NDRPDR tests 3n-hsw"
+  algorithm: "table_failed_tests_html"
+  input-file: "{DIR[STATIC,VPP]}/failed-tests-3n-hsw-ndrpdr.csv"
+  output-file: "{DIR[STATIC,VPP]}/failed-tests-3n-hsw-ndrpdr.rst"
+  testbed: "3n-hsw"
+  test-type: "NDRPDR"
+
+###############################################################################
+# 3n-skx
+-
+  type: "table"
+  title: "Performance trending dashboard 2t1c-3n-skx"
+  algorithm: "table_perf_trending_dash"
+  output-file-ext: ".csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t1c-3n-skx"
+  data: "plot-performance-trending-all-3n-skx"
+  filter: "'MRR' and '2T1C'"
+  parameters:
+    - "name"
+    - "parent"
+    - "result"
+  window: 14
+  long-trend-window: 180
+
+-
+  type: "table"
+  title: "Performance trending dashboard 4t2c-3n-skx"
+  algorithm: "table_perf_trending_dash"
+  output-file-ext: ".csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-4t2c-3n-skx"
+  data: "plot-performance-trending-all-3n-skx"
+  filter: "'MRR' and '4T2C'"
+  parameters:
+    - "name"
+    - "parent"
+    - "result"
+  window: 14
+  long-trend-window: 180
+
+-
+  type: "table"
+  title: "Performance trending dashboard 8t4c-3n-skx"
+  algorithm: "table_perf_trending_dash"
+  output-file-ext: ".csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-8t4c-3n-skx"
+  data: "plot-performance-trending-all-3n-skx"
+  filter: "'MRR' and '8T4C'"
+  parameters:
+    - "name"
+    - "parent"
+    - "result"
   window: 14
-  evaluated-window: 14
   long-trend-window: 180
 
 -
   type: "table"
   title: "HTML performance trending dashboard 2t1c-3n-skx"
-  algorithm: "table_performance_trending_dashboard_html"
+  algorithm: "table_perf_trending_dash_html"
   input-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t1c-3n-skx.csv"
   output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t1c-3n-skx.rst"
   testbed: "3n-skx"
 -
   type: "table"
   title: "HTML performance trending dashboard 4t2c-3n-skx"
-  algorithm: "table_performance_trending_dashboard_html"
+  algorithm: "table_perf_trending_dash_html"
   input-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-4t2c-3n-skx.csv"
   output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-4t2c-3n-skx.rst"
   testbed: "3n-skx"
 -
   type: "table"
   title: "HTML performance trending dashboard 8t4c-3n-skx"
-  algorithm: "table_performance_trending_dashboard_html"
+  algorithm: "table_perf_trending_dash_html"
   input-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-8t4c-3n-skx.csv"
   output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-8t4c-3n-skx.rst"
   testbed: "3n-skx"
   data: "plot-performance-trending-all-3n-skx"
   filter: "'MRR'"
   parameters:
-  - "name"
-  - "parent"
-  - "status"
-  ignore-list:
-    # This test is "ndrdisc" test and was improperly tagged. It was fixed
-    # but it remains in the old output.xml files.
-  - "tests.vpp.perf.l2.10ge2p1x520-eth-l2bdscale1mmaclrn-mrr.tc01-64b-2t1c-eth-l2bdscale1mmaclrn-ndrdisc"
+    - "name"
+    - "parent"
+    - "status"
   window: 7  # days
 
 -
   output-file: "{DIR[STATIC,VPP]}/failed-tests-3n-skx.rst"
   testbed: "3n-skx"
 
+-
+  type: "table"
+  title: "Failed NDRPDR tests 3n-skx"
+  algorithm: "table_failed_tests"
+  output-file-ext: ".csv"
+  output-file: "{DIR[STATIC,VPP]}/failed-tests-3n-skx-ndrpdr"
+  data: "plot-ndrpdr-comparison-3n-skx"
+  filter: "'NDRPDR'"
+  parameters:
+    - "name"
+    - "parent"
+    - "status"
+  window: 30  # days
+
+-
+  type: "table"
+  title: "HTML Failed NDRPDR tests 3n-skx"
+  algorithm: "table_failed_tests_html"
+  input-file: "{DIR[STATIC,VPP]}/failed-tests-3n-skx-ndrpdr.csv"
+  output-file: "{DIR[STATIC,VPP]}/failed-tests-3n-skx-ndrpdr.rst"
+  testbed: "3n-skx"
+  test-type: "NDRPDR"
+
 ################################################################################
 # 2n-skx
 -
   type: "table"
   title: "Performance trending dashboard 2t1c-2n-skx"
-  algorithm: "table_performance_trending_dashboard"
+  algorithm: "table_perf_trending_dash"
   output-file-ext: ".csv"
   output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t1c-2n-skx"
   data: "plot-performance-trending-all-2n-skx"
   filter: "'MRR' and '2T1C'"
   parameters:
-  - "name"
-  - "parent"
-  - "result"
-  ignore-list:
-    # This test is "ndrdisc" test and was improperly tagged. It was fixed
-    # but it remains in the old output.xml files.
-  - "tests.vpp.perf.l2.10ge2p1x520-eth-l2bdscale1mmaclrn-mrr.tc01-64b-2t1c-eth-l2bdscale1mmaclrn-ndrdisc"
-  outlier-const: 1.5
+    - "name"
+    - "parent"
+    - "result"
   window: 14
-  evaluated-window: 14
   long-trend-window: 180
 
 -
   type: "table"
   title: "Performance trending dashboard 4t2c-2n-skx"
-  algorithm: "table_performance_trending_dashboard"
+  algorithm: "table_perf_trending_dash"
   output-file-ext: ".csv"
   output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-4t2c-2n-skx"
   data: "plot-performance-trending-all-2n-skx"
   filter: "'MRR' and '4T2C'"
   parameters:
-  - "name"
-  - "parent"
-  - "result"
-  ignore-list:
-    # This test is "ndrdisc" test and was improperly tagged. It was fixed
-    # but it remains in the old output.xml files.
-  - "tests.vpp.perf.l2.10ge2p1x520-eth-l2bdscale1mmaclrn-mrr.tc05-64b-4t2c-eth-l2bdscale1mmaclrn-ndrdisc"
-  outlier-const: 1.5
+    - "name"
+    - "parent"
+    - "result"
   window: 14
-  evaluated-window: 14
   long-trend-window: 180
 
 -
   type: "table"
   title: "Performance trending dashboard 8t4c-2n-skx"
-  algorithm: "table_performance_trending_dashboard"
+  algorithm: "table_perf_trending_dash"
   output-file-ext: ".csv"
   output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-8t4c-2n-skx"
   data: "plot-performance-trending-all-2n-skx"
   filter: "'MRR' and '8T4C'"
   parameters:
-  - "name"
-  - "parent"
-  - "result"
-  ignore-list:
-    # This test is "ndrdisc" test and was improperly tagged. It was fixed
-    # but it remains in the old output.xml files.
-  - "tests.vpp.perf.l2.10ge2p1x520-eth-l2bdscale1mmaclrn-mrr.tc09-64b-8t4c-eth-l2bdscale1mmaclrn-ndrdisc"
-  outlier-const: 1.5
+    - "name"
+    - "parent"
+    - "result"
   window: 14
-  evaluated-window: 14
   long-trend-window: 180
 
 -
   type: "table"
   title: "HTML performance trending dashboard 2t1c-2n-skx"
-  algorithm: "table_performance_trending_dashboard_html"
+  algorithm: "table_perf_trending_dash_html"
   input-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t1c-2n-skx.csv"
   output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t1c-2n-skx.rst"
   testbed: "2n-skx"
 -
   type: "table"
   title: "HTML performance trending dashboard 4t2c-2n-skx"
-  algorithm: "table_performance_trending_dashboard_html"
+  algorithm: "table_perf_trending_dash_html"
   input-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-4t2c-2n-skx.csv"
   output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-4t2c-2n-skx.rst"
   testbed: "2n-skx"
 -
   type: "table"
   title: "HTML performance trending dashboard 8t4c-2n-skx"
-  algorithm: "table_performance_trending_dashboard_html"
+  algorithm: "table_perf_trending_dash_html"
   input-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-8t4c-2n-skx.csv"
   output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-8t4c-2n-skx.rst"
   testbed: "2n-skx"
   data: "plot-performance-trending-all-2n-skx"
   filter: "'MRR'"
   parameters:
-  - "name"
-  - "parent"
-  - "status"
-  ignore-list:
-    # This test is "ndrdisc" test and was improperly tagged. It was fixed
-    # but it remains in the old output.xml files.
-  - "tests.vpp.perf.l2.10ge2p1x520-eth-l2bdscale1mmaclrn-mrr.tc01-64b-2t1c-eth-l2bdscale1mmaclrn-ndrdisc"
+    - "name"
+    - "parent"
+    - "status"
   window: 7  # days
 
 -
   output-file: "{DIR[STATIC,VPP]}/failed-tests-2n-skx.rst"
   testbed: "2n-skx"
 
+-
+  type: "table"
+  title: "Failed NDRPDR tests 2n-skx"
+  algorithm: "table_failed_tests"
+  output-file-ext: ".csv"
+  output-file: "{DIR[STATIC,VPP]}/failed-tests-2n-skx-ndrpdr"
+  data: "plot-ndrpdr-comparison-2n-skx"
+  filter: "'NDRPDR'"
+  parameters:
+    - "name"
+    - "parent"
+    - "status"
+  window: 30  # days
 
-################################################################################
-###                                 C P T A                                  ###
-################################################################################
+-
+  type: "table"
+  title: "HTML Failed NDRPDR tests 2n-skx"
+  algorithm: "table_failed_tests_html"
+  input-file: "{DIR[STATIC,VPP]}/failed-tests-2n-skx-ndrpdr.csv"
+  output-file: "{DIR[STATIC,VPP]}/failed-tests-2n-skx-ndrpdr.rst"
+  testbed: "2n-skx"
+  test-type: "NDRPDR"
 
-# Plots VPP Continuous Performance Trending and Analysis
+################################################################################
+# 2n-clx
+-
+  type: "table"
+  title: "Performance trending dashboard 2t1c-2n-clx"
+  algorithm: "table_perf_trending_dash"
+  output-file-ext: ".csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t1c-2n-clx"
+  data: "plot-performance-trending-vpp-2n-clx"
+  filter: "'MRR' and '2T1C'"
+  parameters:
+    - "name"
+    - "parent"
+    - "result"
+  window: 14
+  long-trend-window: 180
 
 -
-  type: "cpta"
-  title: "Continuous Performance Trending and Analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/cpta"
+  type: "table"
+  title: "Performance trending dashboard 4t2c-2n-clx"
+  algorithm: "table_perf_trending_dash"
+  output-file-ext: ".csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-4t2c-2n-clx"
+  data: "plot-performance-trending-vpp-2n-clx"
+  filter: "'MRR' and '4T2C'"
+  parameters:
+    - "name"
+    - "parent"
+    - "result"
+  window: 14
+  long-trend-window: 180
 
-  plots:
+-
+  type: "table"
+  title: "Performance trending dashboard 8t4c-2n-clx"
+  algorithm: "table_perf_trending_dash"
+  output-file-ext: ".csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-8t4c-2n-clx"
+  data: "plot-performance-trending-vpp-2n-clx"
+  filter: "'MRR' and '8T4C'"
+  parameters:
+    - "name"
+    - "parent"
+    - "result"
+  window: 14
+  long-trend-window: 180
 
-################################################################################
-# 3n-hsw
+-
+  type: "table"
+  title: "HTML performance trending dashboard 2t1c-2n-clx"
+  algorithm: "table_perf_trending_dash_html"
+  input-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t1c-2n-clx.csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t1c-2n-clx.rst"
+  testbed: "2n-clx"
 
-# L2 - x520
+-
+  type: "table"
+  title: "HTML performance trending dashboard 4t2c-2n-clx"
+  algorithm: "table_perf_trending_dash_html"
+  input-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-4t2c-2n-clx.csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-4t2c-2n-clx.rst"
+  testbed: "2n-clx"
 
-    - title: "VPP 1T1C L2 64B MRR Trending 3n-hsw"
-      output-file-name: "l2-1t1c-x520-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and ('BASE' or 'FIB_1M') and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'MEMIF' and not 'DRV_AVF'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
+-
+  type: "table"
+  title: "HTML performance trending dashboard 8t4c-2n-clx"
+  algorithm: "table_perf_trending_dash_html"
+  input-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-8t4c-2n-clx.csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-8t4c-2n-clx.rst"
+  testbed: "2n-clx"
 
-    - title: "VPP 2T2C L2 64B MRR Trending 3n-hsw"
-      output-file-name: "l2-2t2c-x520-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and ('BASE' or 'FIB_1M') and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'MEMIF' and not 'DRV_AVF'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
+-
+  type: "table"
+  title: "Failed MRR tests 2n-clx"
+  algorithm: "table_failed_tests"
+  output-file-ext: ".csv"
+  output-file: "{DIR[STATIC,VPP]}/failed-tests-2n-clx"
+  data: "plot-performance-trending-vpp-2n-clx"
+  filter: "'MRR'"
+  parameters:
+    - "name"
+    - "parent"
+    - "status"
+  window: 7  # days
 
-    - title: "VPP 4T4C L2 64B MRR Trending 3n-hsw"
-      output-file-name: "l2-4t4c-x520-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and ('BASE' or 'FIB_1M') and '4T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'MEMIF' and not 'DRV_AVF'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
+-
+  type: "table"
+  title: "HTML Failed MRR tests 2n-clx"
+  algorithm: "table_failed_tests_html"
+  input-file: "{DIR[STATIC,VPP]}/failed-tests-2n-clx.csv"
+  output-file: "{DIR[STATIC,VPP]}/failed-tests-2n-clx.rst"
+  testbed: "2n-clx"
 
-    - title: "VPP 1T1C L2 64B IACL MRR Trending 3n-hsw"
-      output-file-name: "l2-feature-1t1c-x520-3n-hsw-iacl"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and 'IACL' and ('ACL1' or 'ACL50') and '10k_FLOWS' and not 'MACIP' and not 'VHOST' and not 'MEMIF'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
+-
+  type: "table"
+  title: "Failed NDRPDR tests 2n-clx"
+  algorithm: "table_failed_tests"
+  output-file-ext: ".csv"
+  output-file: "{DIR[STATIC,VPP]}/failed-tests-2n-clx-ndrpdr"
+  data: "plot-ndrpdr-comparison-2n-clx"
+  filter: "'NDRPDR'"
+  parameters:
+    - "name"
+    - "parent"
+    - "status"
+  window: 30  # days
 
-    - title: "VPP 2T2C L2 64B IACL MRR Trending 3n-hsw"
-      output-file-name: "l2-feature-2t2c-x520-3n-hsw-iacl"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and 'IACL' and ('ACL1' or 'ACL50') and '10k_FLOWS' and not 'MACIP' and not 'VHOST' and not 'MEMIF'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
+-
+  type: "table"
+  title: "HTML Failed NDRPDR tests 2n-clx"
+  algorithm: "table_failed_tests_html"
+  input-file: "{DIR[STATIC,VPP]}/failed-tests-2n-clx-ndrpdr.csv"
+  output-file: "{DIR[STATIC,VPP]}/failed-tests-2n-clx-ndrpdr.rst"
+  testbed: "2n-clx"
+  test-type: "NDRPDR"
 
-    - title: "VPP 4T4C L2 64B IACL MRR Trending 3n-hsw"
-      output-file-name: "l2-feature-4t4c-x520-3n-hsw-iacl"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '4T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and 'IACL' and ('ACL1' or 'ACL50') and '10k_FLOWS' and not 'MACIP' and not 'VHOST' and not 'MEMIF'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
+################################################################################
+# 3n-tsh
+-
+  type: "table"
+  title: "Performance trending dashboard 1t1c-3n-tsh"
+  algorithm: "table_perf_trending_dash"
+  output-file-ext: ".csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-1t1c-3n-tsh"
+  data: "plot-performance-trending-all-3n-tsh"
+  filter: "'MRR' and '1T1C'"
+  parameters:
+    - "name"
+    - "parent"
+    - "result"
+  window: 14
+  long-trend-window: 180
 
-    - title: "VPP 1T1C L2 64B OACL MRR Trending 3n-hsw"
-      output-file-name: "l2-feature-1t1c-x520-3n-hsw-oacl"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and 'OACL' and ('ACL1' or 'ACL50') and '10k_FLOWS' and not 'MACIP' and not 'VHOST' and not 'MEMIF'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
+-
+  type: "table"
+  title: "Performance trending dashboard 2t2c-3n-tsh"
+  algorithm: "table_perf_trending_dash"
+  output-file-ext: ".csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t2c-3n-tsh"
+  data: "plot-performance-trending-all-3n-tsh"
+  filter: "'MRR' and '2T2C'"
+  parameters:
+  - "name"
+  - "parent"
+  - "result"
+  window: 14
+  long-trend-window: 180
 
-    - title: "VPP 2T2C L2 64B OACL MRR Trending 3n-hsw"
-      output-file-name: "l2-feature-2t2c-x520-3n-hsw-oacl"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and 'OACL' and ('ACL1' or 'ACL50') and '10k_FLOWS' and not 'MACIP' and not 'VHOST' and not 'MEMIF'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
+-
+  type: "table"
+  title: "Performance trending dashboard 4t4c-3n-tsh"
+  algorithm: "table_perf_trending_dash"
+  output-file-ext: ".csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-4t4c-3n-tsh"
+  data: "plot-performance-trending-all-3n-tsh"
+  filter: "'MRR' and '4T4C'"
+  parameters:
+    - "name"
+    - "parent"
+    - "result"
+  window: 14
+  long-trend-window: 180
 
-    - title: "VPP 4T4C L2 64B OACL MRR Trending 3n-hsw"
-      output-file-name: "l2-feature-4t4c-x520-3n-hsw-oacl"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '4T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and 'OACL' and ('ACL1' or 'ACL50') and '10k_FLOWS' and not 'MACIP' and not 'VHOST' and not 'MEMIF'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
+-
+  type: "table"
+  title: "HTML performance trending dashboard 1t1c-3n-tsh"
+  algorithm: "table_perf_trending_dash_html"
+  input-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-1t1c-3n-tsh.csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-1t1c-3n-tsh.rst"
+  testbed: "3n-tsh"
 
-    - title: "VPP 1T1C L2 64B MACIP MRR Trending 3n-hsw"
-      output-file-name: "l2-feature-1t1c-x520-3n-hsw-macip"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and 'MACIP' and ('ACL1' or 'ACL50') and '10k_FLOWS' and not 'VHOST' and not 'MEMIF'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
+-
+  type: "table"
+  title: "HTML performance trending dashboard 2t2c-3n-tsh"
+  algorithm: "table_perf_trending_dash_html"
+  input-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t2c-3n-tsh.csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t2c-3n-tsh.rst"
+  testbed: "3n-tsh"
 
-    - title: "VPP 2T2C L2 64B MACIP MRR Trending 3n-hsw"
-      output-file-name: "l2-feature-2t2c-x520-3n-hsw-macip"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and 'MACIP' and ('ACL1' or 'ACL50') and '10k_FLOWS' and not 'VHOST' and not 'MEMIF'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
+-
+  type: "table"
+  title: "HTML performance trending dashboard 4t4c-3n-tsh"
+  algorithm: "table_perf_trending_dash_html"
+  input-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-4t4c-3n-tsh.csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-4t4c-3n-tsh.rst"
+  testbed: "3n-tsh"
 
-    - title: "VPP 4T4C L2 64B MACIP MRR Trending 3n-hsw"
-      output-file-name: "l2-feature-4t4c-x520-3n-hsw-macip"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '4T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and 'MACIP' and ('ACL1' or 'ACL50') and '10k_FLOWS' and not 'VHOST' and not 'MEMIF'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
+-
+  type: "table"
+  title: "Failed MRR tests 3n-tsh"
+  algorithm: "table_failed_tests"
+  output-file-ext: ".csv"
+  output-file: "{DIR[STATIC,VPP]}/failed-tests-3n-tsh"
+  data: "plot-performance-trending-all-3n-tsh"
+  filter: "'MRR'"
+  parameters:
+    - "name"
+    - "parent"
+    - "status"
+  window: 7  # days
 
-# L2 - xl710
+-
+  type: "table"
+  title: "HTML Failed MRR tests 3n-tsh"
+  algorithm: "table_failed_tests_html"
+  input-file: "{DIR[STATIC,VPP]}/failed-tests-3n-tsh.csv"
+  output-file: "{DIR[STATIC,VPP]}/failed-tests-3n-tsh.rst"
+  testbed: "3n-tsh"
 
-    - title: "VPP 1T1C L2 64B MRR Trending 3n-hsw"
-      output-file-name: "l2-1t1c-xl710-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'MEMIF' and not 'DRV_AVF'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 2T2C L2 64B MRR Trending 3n-hsw"
-      output-file-name: "l2-2t2c-xl710-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'MEMIF' and not 'DRV_AVF'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 4T4C L2 64B MRR Trending 3n-hsw"
-      output-file-name: "l2-4t4c-xl710-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'MEMIF' and not 'DRV_AVF'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-# L2 - x710
-
-    - title: "VPP 1T1C L2 64B MRR Trending 3n-hsw"
-      output-file-name: "l2-1t1c-x710-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'MEMIF' and not 'DRV_AVF'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 2T2C L2 64B MRR Trending 3n-hsw"
-      output-file-name: "l2-2t2c-x710-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'MEMIF' and not 'DRV_AVF'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 4T4C L2 64B MRR Trending 3n-hsw"
-      output-file-name: "l2-4t4c-x710-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'MEMIF' and not 'DRV_AVF'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 1T1C L2 64B MRR Trending 3n-hsw"
-      output-file-name: "l2-feature-1t1c-x710-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 2T2C L2 64B MRR Trending 3n-hsw"
-      output-file-name: "l2-feature-2t2c-x710-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 4T4C L2 64B MRR Trending 3n-hsw"
-      output-file-name: "l2-feature-4t4c-x710-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '4T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-# IPv4 - x520
-
-    - title: "VPP 1T1C IPv4 64B MRR Trending 3n-hsw"
-      output-file-name: "ip4-1t1c-x520-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and ('BASE' or 'FIB_1M') and '1T1C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 2T2C IPv4 64B MRR Trending 3n-hsw"
-      output-file-name: "ip4-2t2c-x520-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and ('BASE' or 'FIB_1M') and '2T2C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 4T4C IPv4 64B MRR Trending 3n-hsw"
-      output-file-name: "ip4-4t4c-x520-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and ('BASE' or 'FIB_1M') and '4T4C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 1T1C IPv4 64B IACL MRR Trending 3n-hsw"
-      output-file-name: "ip4-feature-1t1c-x520-3n-hsw-iacl"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '1T1C' and 'IP4FWD' and 'IACL' and ('ACL1' or 'ACL50') and '10k_FLOWS' and not 'IPSEC' and not 'VHOST'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 2T2C IPv4 64B IACL MRR Trending 3n-hsw"
-      output-file-name: "ip4-feature-2t2c-x520-3n-hsw-iacl"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '2T2C' and 'IP4FWD' and 'IACL' and ('ACL1' or 'ACL50') and '10k_FLOWS' and not 'IPSEC' and not 'VHOST'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 4T4C IPv4 64B IACL MRR Trending 3n-hsw"
-      output-file-name: "ip4-feature-4t4c-x520-3n-hsw-iacl"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '4T4C' and 'IP4FWD' and 'IACL' and ('ACL1' or 'ACL50') and '10k_FLOWS' and not 'IPSEC' and not 'VHOST'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 1T1C IPv4 64B OACL MRR Trending 3n-hsw"
-      output-file-name: "ip4-feature-1t1c-x520-3n-hsw-oacl"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '1T1C' and 'IP4FWD' and 'OACL' and ('ACL1' or 'ACL50') and '10k_FLOWS' and not 'IPSEC' and not 'VHOST'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 2T2C IPv4 64B OACL MRR Trending 3n-hsw"
-      output-file-name: "ip4-feature-2t2c-x520-3n-hsw-oacl"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '2T2C' and 'IP4FWD' and 'OACL' and ('ACL1' or 'ACL50') and '10k_FLOWS' and not 'IPSEC' and not 'VHOST'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 4T4C IPv4 64B OACL MRR Trending 3n-hsw"
-      output-file-name: "ip4-feature-4t4c-x520-3n-hsw-oacl"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '4T4C' and 'IP4FWD' and 'OACL' and ('ACL1' or 'ACL50') and '10k_FLOWS' and not 'IPSEC' and not 'VHOST'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 1T1C IPv4 64B MRR Trending 3n-hsw"
-      output-file-name: "ip4-feature-1t1c-x520-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'NAT44' and('BASE' or 'SRC_USER_4000') and 'FEATURE' and '1T1C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 2T2C IPv4 64B MRR Trending 3n-hsw"
-      output-file-name: "ip4-feature-2t2c-x520-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'NAT44' and('BASE' or 'SRC_USER_4000') and 'FEATURE' and '2T2C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 4T4C IPv4 64B MRR Trending 3n-hsw"
-      output-file-name: "ip4-feature-4t4c-x520-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'NAT44' and('BASE' or 'SRC_USER_4000') and 'FEATURE' and '4T4C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-# IPv4 - xl710
-
-    - title: "VPP 1T1C IPv4 64B MRR Trending 3n-hsw"
-      output-file-name: "ip4-1t1c-xl710-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and ('BASE' or 'SCALE' or 'FEATURE') and '1T1C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 2T2C IPv4 64B MRR Trending 3n-hsw"
-      output-file-name: "ip4-2t2c-xl710-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and ('BASE' or 'SCALE' or 'FEATURE') and '2T2C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 4T4C IPv4 64B MRR Trending 3n-hsw"
-      output-file-name: "ip4-4t4c-xl710-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and ('BASE' or 'SCALE' or 'FEATURE') and '4T4C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-# IPv4 - x710
-
-    - title: "VPP 1T1C IPv4 64B MRR Trending 3n-hsw"
-      output-file-name: "ip4-1t1c-x710-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '1T1C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 2T2C IPv4 64B MRR Trending 3n-hsw"
-      output-file-name: "ip4-2t2c-x710-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T2C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 4T4C IPv4 64B MRR Trending 3n-hsw"
-      output-file-name: "ip4-4t4c-x710-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T4C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 1T1C IPv4 64B MRR Trending 3n-hsw"
-      output-file-name: "ip4-feature-1t1c-x710-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '1T1C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 2T2C IPv4 64B MRR Trending 3n-hsw"
-      output-file-name: "ip4-feature-2t2c-x710-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '2T2C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 4T4C IPv4 64B MRR Trending 3n-hsw"
-      output-file-name: "ip4-feature-4t4c-x710-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '4T4C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-# IPv4 Tunnels - x520
-
-    - title: "VPP 1T1C IPv4 Tunnels 64B MRR Trending 3n-hsw"
-      output-file-name: "ip4-tunnels-1t1c-x520-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and '64B' and 'ENCAP' and 'MRR' and '1T1C' and 'LISP' and 'IP6UNRLAY' and 'IP4OVRLAY' and not 'VHOST' and not 'IPSECHW'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 2T2C IPv4 Tunnels 64B MRR Trending 3n-hsw"
-      output-file-name: "ip4-tunnels-2t2c-x520-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and '64B' and 'ENCAP' and 'MRR' and '2T2C' and 'LISP' and 'IP6UNRLAY' and 'IP4OVRLAY' and not 'VHOST' and not 'IPSECHW'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 4T4C IPv4 Tunnels 64B MRR Trending 3n-hsw"
-      output-file-name: "ip4-tunnels-4t4c-x520-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and '64B' and 'ENCAP' and 'MRR' and '4T4C' and 'LISP' and 'IP6UNRLAY' and 'IP4OVRLAY' and not 'VHOST' and not 'IPSECHW'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-# IPv4 Tunnels - x710
-
-    - title: "VPP 1T1C IPv4 Tunnels 64B MRR Trending 3n-hsw"
-      output-file-name: "ip4-tunnels-1t1c-x710-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X710' and '64B' and 'ENCAP' and 'MRR' and '1T1C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 2T2C IPv4 Tunnels 64B MRR Trending 3n-hsw"
-      output-file-name: "ip4-tunnels-2t2c-x710-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X710' and '64B' and 'ENCAP' and 'MRR' and '2T2C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 4T4C IPv4 Tunnels 64B MRR Trending 3n-hsw"
-      output-file-name: "ip4-tunnels-4t4c-x710-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X710' and '64B' and 'ENCAP' and 'MRR' and '4T4C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-# IPv6 - x520
-
-    - title: "VPP 1T1C IPv6 78B MRR Trending 3n-hsw"
-      output-file-name: "ip6-1t1c-x520-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '78B' and 'BASE' and '1T1C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'SRv6' and not 'DOT1Q'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 2T2C IPv6 78B MRR Trending 3n-hsw"
-      output-file-name: "ip6-2t2c-x520-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '78B' and 'BASE' and '2T2C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'SRv6' and not 'DOT1Q'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 4T4C IPv6 78B MRR Trending 3n-hsw"
-      output-file-name: "ip6-4t4c-x520-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '78B' and 'BASE' and '4T4C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'SRv6' and not 'DOT1Q'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-# IPv6 - xl710
-
-    - title: "VPP 1T1C IPv6 78B MRR Trending 3n-hsw"
-      output-file-name: "ip6-1t1c-xl710-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-XL710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '1T1C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 2T2C IPv6 78B MRR Trending 3n-hsw"
-      output-file-name: "ip6-2t2c-xl710-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-XL710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '2T2C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 4T4C IPv6 78B MRR Trending 3n-hsw"
-      output-file-name: "ip6-4t4c-xl710-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-XL710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '4T4C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-# IPv6 - x710
-
-    - title: "VPP 1T1C IPv6 78B MRR Trending 3n-hsw"
-      output-file-name: "ip6-1t1c-x710-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '1T1C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 2T2C IPv6 78B MRR Trending 3n-hsw"
-      output-file-name: "ip6-2t2c-x710-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '2T2C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 4T4C IPv6 78B MRR Trending 3n-hsw"
-      output-file-name: "ip6-4t4c-x710-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '4T4C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-# Container memif - x520, 64B
-
-    - title: "VPP 1T1C L2 Container memif 64B MRR Trending 3n-hsw"
-      output-file-name: "container-memif-l2-1t1c-x520-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'BASE' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 2T2C L2 Container memif 64B MRR Trending 3n-hsw"
-      output-file-name: "container-memif-l2-2t2c-x520-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'BASE' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 4T4C L2 Container memif 64B MRR Trending 3n-hsw"
-      output-file-name: "container-memif-l2-4t4c-x520-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'BASE' and '4T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-# Container memif - x520, IMIX
-
-    - title: "VPP 1T1C L2 Container memif IMIX MRR Trending 3n-hsw"
-      output-file-name: "container-memif-imix-l2-1t1c-x520-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and 'IMIX' and 'BASE' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'DOT1Q'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 2T2C L2 Container memif IMIX MRR Trending 3n-hsw"
-      output-file-name: "container-memif-imix-l2-2t2c-x520-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and 'IMIX' and 'BASE' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'DOT1Q'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 4T4C L2 Container memif IMIX MRR Trending 3n-hsw"
-      output-file-name: "container-memif-imix-l2-4t4c-x520-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and 'IMIX' and 'BASE' and '4T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'DOT1Q'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-# Container memif - xl710, 64B
-
-    - title: "VPP 1T1C L2 Container memif 64B MRR Trending 3n-hsw"
-      output-file-name: "container-memif-l2-1t1c-xl710-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and 'BASE' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 2T2C L2 Container memif 64B MRR Trending 3n-hsw"
-      output-file-name: "container-memif-l2-2t2c-xl710-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and 'BASE' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 4T4C L2 Container memif 64B MRR Trending 3n-hsw"
-      output-file-name: "container-memif-l2-4t4c-xl710-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and 'BASE' and '4T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-# Container memif - xl710, IMIX
-
-    - title: "VPP 1T1C L2 Container memif IMIX MRR Trending 3n-hsw"
-      output-file-name: "container-memif-imix-l2-1t1c-xl710-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-XL710' and 'MRR' and 'IMIX' and 'BASE' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 2T2C L2 Container memif IMIX MRR Trending 3n-hsw"
-      output-file-name: "container-memif-imix-l2-2t2c-xl710-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-XL710' and 'MRR' and 'IMIX' and 'BASE' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 4T4C L2 Container memif IMIX MRR Trending 3n-hsw"
-      output-file-name: "container-memif-imix-l2-4t4c-xl710-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-XL710' and 'MRR' and 'IMIX' and 'BASE' and '4T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-# Container memif - x710, 64B
-
-    - title: "VPP 1T1C L2 Container memif 64B MRR Trending 3n-hsw"
-      output-file-name: "container-memif-l2-1t1c-x710-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'BASE' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 2T2C L2 Container memif 64B MRR Trending 3n-hsw"
-      output-file-name: "container-memif-l2-2t2c-x710-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'BASE' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 4T4C L2 Container memif 64B MRR Trending 3n-hsw"
-      output-file-name: "container-memif-l2-4t4c-x710-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'BASE' and '4T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-# Container memif - x710, IMIX
-
-    - title: "VPP 1T1C L2 Container memif IMIX MRR Trending 3n-hsw"
-      output-file-name: "container-memif-imix-l2-1t1c-x710-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X710' and 'MRR' and 'IMIX' and 'BASE' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'DOT1Q'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 2T2C L2 Container memif IMIX MRR Trending 3n-hsw"
-      output-file-name: "container-memif-imix-l2-2t2c-x710-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X710' and 'MRR' and 'IMIX' and 'BASE' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'DOT1Q'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 4T4C L2 Container memif IMIX MRR Trending 3n-hsw"
-      output-file-name: "container-memif-imix-l2-4t4c-x710-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X710' and 'MRR' and 'IMIX' and 'BASE' and '4T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'DOT1Q'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-# VM vhost - x520, ethip4, 64B
-
-    - title: "VPP 1T1C VM vhost ethip4 64B MRR Trending 3n-hsw"
-      output-file-name: "vm-vhost-ethip4-1t1c-x520-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '1T1C' and 'VHOST_1024' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 2T2C VM vhost ethip4 64B MRR Trending 3n-hsw"
-      output-file-name: "vm-vhost-ethip4-2t2c-x520-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '2T2C' and 'VHOST_1024' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 4T4C VM vhost ethip4 64B MRR Trending 3n-hsw"
-      output-file-name: "vm-vhost-ethip4-4t4c-x520-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '4T4C' and 'VHOST_1024' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-# VM vhost - x520, ethip4, IMIX
-
-    - title: "VPP 1T1C VM vhost ethip4 IMIX MRR Trending 3n-hsw"
-      output-file-name: "vm-vhost-imix-ethip4-1t1c-x520-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '1T1C' and 'VHOST_1024' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 2T2C VM vhost ethip4 IMIX MRR Trending 3n-hsw"
-      output-file-name: "vm-vhost-imix-ethip4-2t2c-x520-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '2T2C' and 'VHOST_1024' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 4T4C VM vhost ethip4 IMIX MRR Trending 3n-hsw"
-      output-file-name: "vm-vhost-imix-ethip4-4t4c-x520-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '4T4C' and 'VHOST_1024' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-# VM vhost - x520, eth, 64B
-
-    - title: "VPP 1T1C VM vhost eth L2XC 64B MRR Trending 3n-hsw"
-      output-file-name: "vm-vhost-eth-1t1c-x520-3n-hsw-l2xc"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '1T1C' and 'VHOST_1024' and 'L2XCFWD' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
-
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 2T2C VM vhost eth L2XC 64B MRR Trending 3n-hsw"
-      output-file-name: "vm-vhost-eth-2t2c-x520-3n-hsw-l2xc"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '2T2C' and 'VHOST_1024' and 'L2XCFWD' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 4T4C VM vhost eth L2XC 64B MRR Trending 3n-hsw"
-      output-file-name: "vm-vhost-eth-4t4c-x520-3n-hsw-l2xc"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '4T4C' and 'VHOST_1024' and 'L2XCFWD' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 1T1C VM vhost eth L2BD 64B MRR Trending 3n-hsw"
-      output-file-name: "vm-vhost-eth-1t1c-x520-3n-hsw-l2bd"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '1T1C' and 'VHOST_1024' and 'L2BDMACLRN' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
-
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 2T2C VM vhost eth L2BD 64B MRR Trending 3n-hsw"
-      output-file-name: "vm-vhost-eth-2t2c-x520-3n-hsw-l2bd"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '2T2C' and 'VHOST_1024' and 'L2BDMACLRN' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 4T4C VM vhost eth L2BD 64B MRR Trending 3n-hsw"
-      output-file-name: "vm-vhost-eth-4t4c-x520-3n-hsw-l2bd"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '4T4C' and 'VHOST_1024' and 'L2BDMACLRN' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-# VM vhost - x520, eth, IMIX
-
-    - title: "VPP 1T1C VM vhost eth L2XC IMIX MRR Trending 3n-hsw"
-      output-file-name: "vm-vhost-imix-eth-1t1c-x520-3n-hsw-l2xc"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '1T1C' and 'VHOST_1024' and 'L2XCFWD' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
-
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 2T2C VM vhost eth L2XC IMIX MRR Trending 3n-hsw"
-      output-file-name: "vm-vhost-imix-eth-2t2c-x520-3n-hsw-l2xc"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '2T2C' and 'VHOST_1024' and 'L2XCFWD' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 4T4C VM vhost eth L2XC IMIX MRR Trending 3n-hsw"
-      output-file-name: "vm-vhost-imix-eth-4t4c-x520-3n-hsw-l2xc"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '4T4C' and 'VHOST_1024' and 'L2XCFWD' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 1T1C VM vhost eth L2BD IMIX MRR Trending 3n-hsw"
-      output-file-name: "vm-vhost-imix-eth-1t1c-x520-3n-hsw-l2bd"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '1T1C' and 'VHOST_1024' and 'L2BDMACLRN' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
-
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 2T2C VM vhost eth L2BD IMIX MRR Trending 3n-hsw"
-      output-file-name: "vm-vhost-imix-eth-2t2c-x520-3n-hsw-l2bd"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '2T2C' and 'VHOST_1024' and 'L2BDMACLRN' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 4T4C VM vhost eth L2BD IMIX MRR Trending 3n-hsw"
-      output-file-name: "vm-vhost-imix-eth-4t4c-x520-3n-hsw-l2bd"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '4T4C' and 'VHOST_1024' and 'L2BDMACLRN' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-# VM vhost - xl710, eth, 64B
-
-    - title: "VPP 1T1C VM vhost eth 64B MRR Trending 3n-hsw"
-      output-file-name: "vm-vhost-eth-1t1c-xl710-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-XL710' and '64B' and 'MRR' and '1T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
-
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 2T2C VM vhost eth 64B MRR Trending 3n-hsw"
-      output-file-name: "vm-vhost-eth-2t2c-xl710-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-XL710' and '64B' and 'MRR' and '2T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 4T4C VM vhost eth 64B MRR Trending 3n-hsw"
-      output-file-name: "vm-vhost-eth-4t4c-xl710-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-XL710' and '64B' and 'MRR' and '4T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-# VM vhost - xl710, eth, IMIX
-
-    - title: "VPP 1T1C VM vhost eth IMIX MRR Trending 3n-hsw"
-      output-file-name: "vm-vhost-imix-eth-1t1c-xl710-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-XL710' and 'IMIX' and 'MRR' and '1T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
-
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 2T2C VM vhost eth IMIX MRR Trending 3n-hsw"
-      output-file-name: "vm-vhost-imix-eth-2t2c-xl710-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-XL710' and 'IMIX' and 'MRR' and '2T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 4T4C VM vhost eth IMIX MRR Trending 3n-hsw"
-      output-file-name: "vm-vhost-imix-eth-4t4c-xl710-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-XL710' and 'IMIX' and 'MRR' and '4T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-# VM vhost - x710, ethip4, 64B
-
-    - title: "VPP 1T1C VM vhost ethip4 64B MRR Trending 3n-hsw"
-      output-file-name: "vm-vhost-ethip4-1t1c-x710-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '1T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 2T2C VM vhost ethip4 64B MRR Trending 3n-hsw"
-      output-file-name: "vm-vhost-ethip4-2t2c-x710-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 4T4C VM vhost ethip4 64B MRR Trending 3n-hsw"
-      output-file-name: "vm-vhost-ethip4-4t4c-x710-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T4C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-# VM vhost - x710, ethip4, IMIX
-
-    - title: "VPP 1T1C VM vhost ethip4 IMIX MRR Trending 3n-hsw"
-      output-file-name: "vm-vhost-imix-ethip4-1t1c-x710-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '1T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 2T2C VM vhost ethip4 IMIX MRR Trending 3n-hsw"
-      output-file-name: "vm-vhost-imix-ethip4-2t2c-x710-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '2T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 4T4C VM vhost ethip4 IMIX MRR Trending 3n-hsw"
-      output-file-name: "vm-vhost-imix-ethip4-4t4c-x710-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '4T4C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-# VM vhost - x710, eth, 64B
-
-    - title: "VPP 1T1C VM vhost eth 64B MRR Trending 3n-hsw"
-      output-file-name: "vm-vhost-eth-1t1c-x710-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '1T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
-
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 2T2C VM vhost eth 64B MRR Trending 3n-hsw"
-      output-file-name: "vm-vhost-eth-2t2c-x710-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 4T4C VM vhost eth 64B MRR Trending 3n-hsw"
-      output-file-name: "vm-vhost-eth-4t4c-x710-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-# VM vhost - x710, eth, IMIX
-
-    - title: "VPP 1T1C VM vhost eth IMIX MRR Trending 3n-hsw"
-      output-file-name: "vm-vhost-imix-eth-1t1c-x710-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '1T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
-
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 2T2C VM vhost eth IMIX MRR Trending 3n-hsw"
-      output-file-name: "vm-vhost-imix-eth-2t2c-x710-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '2T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 4T4C VM vhost eth IMIX MRR Trending 3n-hsw"
-      output-file-name: "vm-vhost-imix-eth-4t4c-x710-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '4T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-# VTS - x520, 114B
-
-    - title: "VPP 1T1C VTS 114B MRR Trending 3n-hsw"
-      output-file-name: "vts-114b-1t1c-x520-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and '114B' and 'MRR' and '1T1C' and 'VHOST' and 'VTS'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 2T2C VTS 114B MRR Trending 3n-hsw"
-      output-file-name: "vts-114b-2t2c-x520-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and '114B' and 'MRR' and '2T2C' and 'VHOST' and 'VTS'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 4T4C VTS 114B 64B MRR Trending 3n-hsw"
-      output-file-name: "vts-114b-4t4c-x520-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and '114B' and 'MRR' and '4T4C' and 'VHOST' and 'VTS'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-# IPSec
-
-    - title: "VPP 1T1C IPSec 64B MRR Trending 3n-hsw"
-      output-file-name: "ipsec-1t1c-xl710-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-XL710' and '64B' and 'IP4FWD' and 'MRR' and '1T1C' and 'IPSECHW' and ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 2T2C IPSec 64B MRR Trending 3n-hsw"
-      output-file-name: "ipsec-2t2c-xl710-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-XL710' and '64B' and 'IP4FWD' and 'MRR' and '2T2C' and 'IPSECHW' and ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 4T4C IPSec 64B MRR Trending 3n-hsw"
-      output-file-name: "ipsec-4t4c-xl710-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-XL710' and '64B' and 'IP4FWD' and 'MRR' and '4T4C' and 'IPSECHW' and ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-# SRv6 - x520
-
-    - title: "VPP 1T1C SRv6 78B MRR Trending 3n-hsw"
-      output-file-name: "srv6-78b-1t1c-x520-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and '78B' and 'MRR' and '1T1C' and 'SRv6'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 2T2C SRv6 78B MRR Trending 3n-hsw"
-      output-file-name: "srv6-78b-2t2c-x520-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and '78B' and 'MRR' and '2T2C' and 'SRv6'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 4T4C SRv6 78B MRR Trending 3n-hsw"
-      output-file-name: "srv6-78b-4t4c-x520-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and '78B' and 'MRR' and '4T4C' and 'SRv6'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 1T1C SRv6 IMIX MRR Trending 3n-hsw"
-      output-file-name: "srv6-imix-1t1c-x520-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '1T1C' and 'SRv6'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 2T2C SRv6 IMIX MRR Trending 3n-hsw"
-      output-file-name: "srv6-imix-2t2c-x520-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '2T2C' and 'SRv6'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 4T4C SRv6 IMIX MRR Trending 3n-hsw"
-      output-file-name: "srv6-imix-4t4c-x520-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '4T4C' and 'SRv6'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-# Link Bonding - x520
-
-    - title: "VPP 1T1C Link Bonding 64B MRR Trending 3n-hsw"
-      output-file-name: "lb-64b-1t1c-x520-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '1T1C' and 'LBOND' and not 'LBOND_DPDK'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 2T2C Link Bonding 64B MRR Trending 3n-hsw"
-      output-file-name: "lb-64b-2t2c-x520-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '2T2C' and 'LBOND' and not 'LBOND_DPDK'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 4T4C Link Bonding 64B MRR Trending 3n-hsw"
-      output-file-name: "lb-64b-4t4c-x520-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '4T4C' and 'LBOND' and not 'LBOND_DPDK'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 1T1C Link Bonding IMIX MRR Trending 3n-hsw"
-      output-file-name: "lb-imix-1t1c-x520-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '1T1C' and 'LBOND' and not 'LBOND_DPDK'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 2T2C Link Bonding IMIX MRR Trending 3n-hsw"
-      output-file-name: "lb-imix-2t2c-x520-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '2T2C' and 'LBOND' and not 'LBOND_DPDK'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 4T4C Link Bonding IMIX MRR Trending 3n-hsw"
-      output-file-name: "lb-imix-4t4c-x520-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '4T4C' and 'LBOND' and not 'LBOND_DPDK'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-# Link Bonding - x710
-
-    - title: "VPP 1T1C Link Bonding 64B MRR Trending 3n-hsw"
-      output-file-name: "lb-64b-1t1c-x710-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '1T1C' and 'LBOND'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 2T2C Link Bonding 64B MRR Trending 3n-hsw"
-      output-file-name: "lb-64b-2t2c-x710-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T2C' and 'LBOND'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 4T4C Link Bonding 64B MRR Trending 3n-hsw"
-      output-file-name: "lb-64b-4t4c-x710-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T4C' and 'LBOND'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 1T1C Link Bonding IMIX MRR Trending 3n-hsw"
-      output-file-name: "lb-imix-1t1c-x710-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '1T1C' and 'LBOND'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 2T2C Link Bonding IMIX MRR Trending 3n-hsw"
-      output-file-name: "lb-imix-2t2c-x710-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '2T2C' and 'LBOND'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 4T4C Link Bonding IMIX MRR Trending 3n-hsw"
-      output-file-name: "lb-imix-4t4c-x710-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '4T4C' and 'LBOND'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-# DPDK - x520 - 64B
-
-    - title: "DPDK 1T1C 64B MRR Trending 3n-hsw"
-      output-file-name: "dpdk-64b-1t1c-x520-3n-hsw"
-      data: "plot-performance-trending-dpdk-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '1T1C' and 'DPDK'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "DPDK 2T2C 64B MRR Trending 3n-hsw"
-      output-file-name: "dpdk-64b-2t2c-x520-3n-hsw"
-      data: "plot-performance-trending-dpdk-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '2T2C' and 'DPDK'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "DPDK 4T4C 64B MRR Trending 3n-hsw"
-      output-file-name: "dpdk-64b-4t4c-x520-3n-hsw"
-      data: "plot-performance-trending-dpdk-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '4T4C' and 'DPDK'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-# DPDK - x710 - 64B
-
-    - title: "DPDK 1T1C 64B MRR Trending 3n-hsw"
-      output-file-name: "dpdk-64b-1t1c-x710-3n-hsw"
-      data: "plot-performance-trending-dpdk-3n-hsw"
-      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '1T1C' and 'DPDK'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
+################################################################################
+# 3n-dnv
+-
+  type: "table"
+  title: "Performance trending dashboard 1t1c-3n-dnv"
+  algorithm: "table_perf_trending_dash"
+  output-file-ext: ".csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-1t1c-3n-dnv"
+  data: "plot-performance-trending-vpp-3n-dnv"
+  filter: "'MRR' and '1T1C'"
+  parameters:
+    - "name"
+    - "parent"
+    - "result"
+  window: 14
+  long-trend-window: 180
 
-    - title: "DPDK 2T2C 64B MRR Trending 3n-hsw"
-      output-file-name: "dpdk-64b-2t2c-x710-3n-hsw"
-      data: "plot-performance-trending-dpdk-3n-hsw"
-      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T2C' and 'DPDK'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
+-
+  type: "table"
+  title: "Performance trending dashboard 2t2c-3n-dnv"
+  algorithm: "table_perf_trending_dash"
+  output-file-ext: ".csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t2c-3n-dnv"
+  data: "plot-performance-trending-vpp-3n-dnv"
+  filter: "'MRR' and '2T2C'"
+  parameters:
+    - "name"
+    - "parent"
+    - "result"
+  window: 14
+  long-trend-window: 180
 
-    - title: "DPDK 4T4C 64B MRR Trending 3n-hsw"
-      output-file-name: "dpdk-64b-4t4c-x710-3n-hsw"
-      data: "plot-performance-trending-dpdk-3n-hsw"
-      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T4C' and 'DPDK'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
+-
+  type: "table"
+  title: "Performance trending dashboard 4t4c-3n-dnv"
+  algorithm: "table_perf_trending_dash"
+  output-file-ext: ".csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-4t4c-3n-dnv"
+  data: "plot-performance-trending-vpp-3n-dnv"
+  filter: "'MRR' and '4T4C'"
+  parameters:
+    - "name"
+    - "parent"
+    - "result"
+  window: 14
+  long-trend-window: 180
 
-# DPDK - xl710 - 64B
+-
+  type: "table"
+  title: "HTML performance trending dashboard 1t1c-3n-dnv"
+  algorithm: "table_perf_trending_dash_html"
+  input-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-1t1c-3n-dnv.csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-1t1c-3n-dnv.rst"
+  testbed: "3n-dnv"
 
-    - title: "DPDK 1T1C 64B MRR Trending 3n-hsw"
-      output-file-name: "dpdk-64b-1t1c-xl710-3n-hsw"
-      data: "plot-performance-trending-dpdk-3n-hsw"
-      filter: "'NIC_Intel-XL710' and '64B' and 'MRR' and '1T1C' and 'DPDK'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
+-
+  type: "table"
+  title: "HTML performance trending dashboard 2t2c-3n-dnv"
+  algorithm: "table_perf_trending_dash_html"
+  input-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t2c-3n-dnv.csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t2c-3n-dnv.rst"
+  testbed: "3n-dnv"
 
-    - title: "DPDK 2T2C 64B MRR Trending 3n-hsw"
-      output-file-name: "dpdk-64b-2t2c-xl710-3n-hsw"
-      data: "plot-performance-trending-dpdk-3n-hsw"
-      filter: "'NIC_Intel-XL710' and '64B' and 'MRR' and '2T2C' and 'DPDK'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
+-
+  type: "table"
+  title: "HTML performance trending dashboard 4t4c-3n-dnv"
+  algorithm: "table_perf_trending_dash_html"
+  input-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-4t4c-3n-dnv.csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-4t4c-3n-dnv.rst"
+  testbed: "3n-dnv"
 
-    - title: "DPDK 4T4C 64B MRR Trending 3n-hsw"
-      output-file-name: "dpdk-64b-4t4c-xl710-3n-hsw"
-      data: "plot-performance-trending-dpdk-3n-hsw"
-      filter: "'NIC_Intel-XL710' and '64B' and 'MRR' and '4T4C' and 'DPDK'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
+-
+  type: "table"
+  title: "Failed MRR tests 3n-dnv"
+  algorithm: "table_failed_tests"
+  output-file-ext: ".csv"
+  output-file: "{DIR[STATIC,VPP]}/failed-tests-3n-dnv"
+  data: "plot-performance-trending-vpp-3n-dnv"
+  filter: "'MRR'"
+  parameters:
+    - "name"
+    - "parent"
+    - "status"
+  window: 7  # days
 
-## DPDK - x520 - IMIX
-#
-#    - title: "DPDK 1T1C IMIX MRR Trending 3n-hsw"
-#      output-file-name: "dpdk-imix-1t1c-x520-3n-hsw"
-#      data: "plot-performance-trending-dpdk-3n-hsw"
-#      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '1T1C' and 'DPDK'"
-#      parameters:
-#      - "result"
-#      layout: "plot-cpta"
-#
-#    - title: "DPDK 2T2C IMIX MRR Trending 3n-hsw"
-#      output-file-name: "dpdk-imix-2t2c-x520-3n-hsw"
-#      data: "plot-performance-trending-dpdk-3n-hsw"
-#      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '2T2C' and 'DPDK'"
-#      parameters:
-#      - "result"
-#      layout: "plot-cpta"
-#
-#    - title: "DPDK 4T4C IMIX MRR Trending 3n-hsw"
-#      output-file-name: "dpdk-imix-4t4c-x520-3n-hsw"
-#      data: "plot-performance-trending-dpdk-3n-hsw"
-#      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '4T4C' and 'DPDK'"
-#      parameters:
-#      - "result"
-#      layout: "plot-cpta"
-#
-## DPDK - x710 - IMIX
-#
-#    - title: "DPDK 1T1C IMIX MRR Trending 3n-hsw"
-#      output-file-name: "dpdk-imix-1t1c-x710-3n-hsw"
-#      data: "plot-performance-trending-dpdk-3n-hsw"
-#      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '1T1C' and 'DPDK'"
-#      parameters:
-#      - "result"
-#      layout: "plot-cpta"
-#
-#    - title: "DPDK 2T2C IMIX MRR Trending 3n-hsw"
-#      output-file-name: "dpdk-imix-2t2c-x710-3n-hsw"
-#      data: "plot-performance-trending-dpdk-3n-hsw"
-#      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '2T2C' and 'DPDK'"
-#      parameters:
-#      - "result"
-#      layout: "plot-cpta"
-#
-#    - title: "DPDK 4T4C IMIX MRR Trending 3n-hsw"
-#      output-file-name: "dpdk-imix-4t4c-x710-3n-hsw"
-#      data: "plot-performance-trending-dpdk-3n-hsw"
-#      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '4T4C' and 'DPDK'"
-#      parameters:
-#      - "result"
-#      layout: "plot-cpta"
-#
-## DPDK - xl710 - IMIX
-#
-#    - title: "DPDK 1T1C IMIX MRR Trending 3n-hsw"
-#      output-file-name: "dpdk-imix-1t1c-xl710-3n-hsw"
-#      data: "plot-performance-trending-dpdk-3n-hsw"
-#      filter: "'NIC_Intel-XL710' and 'IMIX' and 'MRR' and '1T1C' and 'DPDK'"
-#      parameters:
-#      - "result"
-#      layout: "plot-cpta"
-#
-#    - title: "DPDK 2T2C IMIX MRR Trending 3n-hsw"
-#      output-file-name: "dpdk-imix-2t2c-xl710-3n-hsw"
-#      data: "plot-performance-trending-dpdk-3n-hsw"
-#      filter: "'NIC_Intel-XL710' and 'IMIX' and 'MRR' and '2T2C' and 'DPDK'"
-#      parameters:
-#      - "result"
-#      layout: "plot-cpta"
-#
-#    - title: "DPDK 4T4C IMIX MRR Trending 3n-hsw"
-#      output-file-name: "dpdk-imix-4t4c-xl710-3n-hsw"
-#      data: "plot-performance-trending-dpdk-3n-hsw"
-#      filter: "'NIC_Intel-XL710' and 'IMIX' and 'MRR' and '4T4C' and 'DPDK'"
-#      parameters:
-#      - "result"
-#      layout: "plot-cpta"
+-
+  type: "table"
+  title: "HTML Failed MRR tests 3n-dnv"
+  algorithm: "table_failed_tests_html"
+  input-file: "{DIR[STATIC,VPP]}/failed-tests-3n-dnv.csv"
+  output-file: "{DIR[STATIC,VPP]}/failed-tests-3n-dnv.rst"
+  testbed: "3n-dnv"
 
 ################################################################################
-# 3n-skx
+# 2n-dnv
+-
+  type: "table"
+  title: "Performance trending dashboard 1t1c-2n-dnv"
+  algorithm: "table_perf_trending_dash"
+  output-file-ext: ".csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-1t1c-2n-dnv"
+  data: "plot-performance-trending-vpp-2n-dnv"
+  filter: "'MRR' and '1T1C'"
+  parameters:
+    - "name"
+    - "parent"
+    - "result"
+  window: 14
+  long-trend-window: 180
 
-# L2 - x710
+-
+  type: "table"
+  title: "Performance trending dashboard 2t2c-2n-dnv"
+  algorithm: "table_perf_trending_dash"
+  output-file-ext: ".csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t2c-2n-dnv"
+  data: "plot-performance-trending-vpp-2n-dnv"
+  filter: "'MRR' and '2T2C'"
+  parameters:
+    - "name"
+    - "parent"
+    - "result"
+  window: 14
+  long-trend-window: 180
 
-    - title: "VPP 2T1C L2 64B MRR Trending 3n-skx"
-      output-file-name: "l2-2t1c-x710-3n-skx"
-      data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
+-
+  type: "table"
+  title: "Performance trending dashboard 4t4c-2n-dnv"
+  algorithm: "table_perf_trending_dash"
+  output-file-ext: ".csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-4t4c-2n-dnv"
+  data: "plot-performance-trending-vpp-2n-dnv"
+  filter: "'MRR' and '4T4C'"
+  parameters:
+    - "name"
+    - "parent"
+    - "result"
+  window: 14
+  long-trend-window: 180
 
-    - title: "VPP 4T2C L2 64B MRR Trending 3n-skx"
-      output-file-name: "l2-4t2c-x710-3n-skx"
-      data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
+-
+  type: "table"
+  title: "HTML performance trending dashboard 1t1c-2n-dnv"
+  algorithm: "table_perf_trending_dash_html"
+  input-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-1t1c-2n-dnv.csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-1t1c-2n-dnv.rst"
+  testbed: "2n-dnv"
 
-    - title: "VPP 8T4C L2 64B MRR Trending 3n-skx"
-      output-file-name: "l2-8t4c-x710-3n-skx"
-      data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '8T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
+-
+  type: "table"
+  title: "HTML performance trending dashboard 2t2c-2n-dnv"
+  algorithm: "table_perf_trending_dash_html"
+  input-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t2c-2n-dnv.csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t2c-2n-dnv.rst"
+  testbed: "2n-dnv"
 
-    - title: "VPP 2T1C L2 64B MRR Trending 3n-skx"
-      output-file-name: "l2-feature-2t1c-x710-3n-skx"
-      data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '2T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
+-
+  type: "table"
+  title: "HTML performance trending dashboard 4t4c-2n-dnv"
+  algorithm: "table_perf_trending_dash_html"
+  input-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-4t4c-2n-dnv.csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-4t4c-2n-dnv.rst"
+  testbed: "2n-dnv"
 
-    - title: "VPP 4T2C L2 64B MRR Trending 3n-skx"
-      output-file-name: "l2-feature-4t2c-x710-3n-skx"
-      data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '4T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
+-
+  type: "table"
+  title: "Failed MRR tests 2n-dnv"
+  algorithm: "table_failed_tests"
+  output-file-ext: ".csv"
+  output-file: "{DIR[STATIC,VPP]}/failed-tests-2n-dnv"
+  data: "plot-performance-trending-vpp-2n-dnv"
+  filter: "'MRR'"
+  parameters:
+    - "name"
+    - "parent"
+    - "status"
+  window: 7  # days
 
-    - title: "VPP 8T4C L2 64B MRR Trending 3n-skx"
-      output-file-name: "l2-feature-8t4c-x710-3n-skx"
-      data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '8T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
+-
+  type: "table"
+  title: "HTML Failed MRR tests 2n-dnv"
+  algorithm: "table_failed_tests_html"
+  input-file: "{DIR[STATIC,VPP]}/failed-tests-2n-dnv.csv"
+  output-file: "{DIR[STATIC,VPP]}/failed-tests-2n-dnv.rst"
+  testbed: "2n-dnv"
 
-# L2 - xxv710
+################################################################################
+###                                 C P T A                                  ###
+################################################################################
 
-    - title: "VPP 2T1C L2 64B MRR Trending 3n-skx"
-      output-file-name: "l2-2t1c-xxv710-3n-skx"
-      data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
+# Plots VPP Continuous Performance Trending and Analysis
 
-    - title: "VPP 4T2C L2 64B MRR Trending 3n-skx"
-      output-file-name: "l2-4t2c-xxv710-3n-skx"
-      data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
+-
+  type: "cpta"
+  title: "Continuous Performance Trending and Analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}"
 
-    - title: "VPP 8T4C L2 64B MRR Trending 3n-skx"
-      output-file-name: "l2-8t4c-xxv710-3n-skx"
-      data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '8T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
+  plots:
 
-    - title: "VPP 2T1C L2 64B MRR Trending 3n-skx"
-      output-file-name: "l2-feature-2t1c-xxv710-3n-skx"
-      data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'FEATURE' and '2T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
+################################################################################
+# NFV
 
-    - title: "VPP 4T2C L2 64B MRR Trending 3n-skx"
-      output-file-name: "l2-feature-4t2c-xxv710-3n-skx"
-      data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'FEATURE' and '4T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
+# 2n-skx
 
-    - title: "VPP 8T4C L2 64B MRR Trending 3n-skx"
-      output-file-name: "l2-feature-8t4c-xxv710-3n-skx"
-      data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'FEATURE' and '8T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
-      parameters:
-      - "result"
+    - title: "VPP 2T1C NF Service Density VNFc IMIX MRR Trending 2n-skx"
+      output-file-name: "2n-skx-xxv710-imix-2t1c-vhost-chains-avf"
+      data: "plot-performance-trending-vpp-nfv-2n-skx"
+      filter: "'NIC_Intel-XXV710' and 'NF_DENSITY' and 'VM' and 'CHAIN' and 'MRR' and 'IMIX' and '2T1C' and 'L2BDMACLRN' and not 'VXLAN' and 'DRV_AVF'"
+      groups:
+        - ["1R1C", "1R2C", "1R4C", "1R6C", "1R8C", "1R10C"]
+        - ["2R1C", "2R2C", "2R4C", "2R6C", "2R8C", "2R10C"]
+        - ["4R1C", "4R2C", "4R4C", "4R6C"]
+        - ["6R1C", "6R2C", "6R4C"]
+        - ["8R1C", "8R2C"]
+        - ["10R1C", "10R2C"]
+      group-names:
+        - "1 Chain"
+        - "2 Chains"
+        - "4 Chains"
+        - "6 Chains"
+        - "8 Chains"
+        - "10 Chains"
+      layout: "plot-cpta"
+
+    - title: "VPP 4T2C NF Service Density VNFc IMIX MRR Trending 2n-skx"
+      output-file-name: "2n-skx-xxv710-imix-4t2c-vhost-chains-avf"
+      data: "plot-performance-trending-vpp-nfv-2n-skx"
+      filter: "'NIC_Intel-XXV710' and 'NF_DENSITY' and 'VM' and 'CHAIN' and 'MRR' and 'IMIX' and '4T2C' and 'L2BDMACLRN' and not 'VXLAN' and 'DRV_AVF'"
+      groups:
+        - ["1R1C", "1R2C", "1R4C", "1R6C", "1R8C", "1R10C"]
+        - ["2R1C", "2R2C", "2R4C", "2R6C", "2R8C", "2R10C"]
+        - ["4R1C", "4R2C", "4R4C", "4R6C"]
+        - ["6R1C", "6R2C", "6R4C"]
+        - ["8R1C", "8R2C"]
+        - ["10R1C", "10R2C"]
+      group-names:
+        - "1 Chain"
+        - "2 Chains"
+        - "4 Chains"
+        - "6 Chains"
+        - "8 Chains"
+        - "10 Chains"
+      layout: "plot-cpta"
+
+    - title: "VPP 8T4C NF Service Density VNFc IMIX MRR Trending 2n-skx"
+      output-file-name: "2n-skx-xxv710-imix-8t4c-vhost-chains-avf"
+      data: "plot-performance-trending-vpp-nfv-2n-skx"
+      filter: "'NIC_Intel-XXV710' and 'NF_DENSITY' and 'VM' and 'CHAIN' and 'MRR' and 'IMIX' and '8T4C' and 'L2BDMACLRN' and not 'VXLAN' and 'DRV_AVF'"
+      groups:
+        - ["1R1C", "1R2C", "1R4C", "1R6C", "1R8C", "1R10C"]
+        - ["2R1C", "2R2C", "2R4C", "2R6C", "2R8C", "2R10C"]
+        - ["4R1C", "4R2C", "4R4C", "4R6C"]
+        - ["6R1C", "6R2C", "6R4C"]
+        - ["8R1C", "8R2C"]
+        - ["10R1C", "10R2C"]
+      group-names:
+        - "1 Chain"
+        - "2 Chains"
+        - "4 Chains"
+        - "6 Chains"
+        - "8 Chains"
+        - "10 Chains"
+      layout: "plot-cpta"
+
+    - title: "VPP 2T1C NF Service Density VNFc VXLAN IMIX MRR Trending 2n-skx"
+      output-file-name: "2n-skx-xxv710-imix-2t1c-vhost-chains-vxlan-avf"
+      data: "plot-performance-trending-vpp-nfv-2n-skx"
+      filter: "'NIC_Intel-XXV710' and 'NF_DENSITY' and 'VM' and 'CHAIN' and 'MRR' and 'IMIX' and '2T1C' and 'L2BDMACLRN' and 'VXLAN' and 'DRV_AVF'"
+      groups:
+        - ["1R1C", ]
+        - ["2R1C", ]
+        - ["4R1C", ]
+        - ["6R1C", ]
+        - ["8R1C", ]
+        - ["10R1C", ]
+      group-names:
+        - "1 Chain"
+        - "2 Chains"
+        - "4 Chains"
+        - "6 Chains"
+        - "8 Chains"
+        - "10 Chains"
+      layout: "plot-cpta"
+
+    - title: "VPP 4T2C NF Service Density VNFc VXLAN IMIX MRR Trending 2n-skx"
+      output-file-name: "2n-skx-xxv710-imix-4t2c-vhost-chains-vxlan-avf"
+      data: "plot-performance-trending-vpp-nfv-2n-skx"
+      filter: "'NIC_Intel-XXV710' and 'NF_DENSITY' and 'VM' and 'CHAIN' and 'MRR' and 'IMIX' and '4T2C' and 'L2BDMACLRN' and 'VXLAN' and 'DRV_AVF'"
+      groups:
+        - ["1R1C", ]
+        - ["2R1C", ]
+        - ["4R1C", ]
+        - ["6R1C", ]
+        - ["8R1C", ]
+        - ["10R1C", ]
+      group-names:
+        - "1 Chain"
+        - "2 Chains"
+        - "4 Chains"
+        - "6 Chains"
+        - "8 Chains"
+        - "10 Chains"
+      layout: "plot-cpta"
+
+    - title: "VPP 8T4C NF Service Density VNFc VXLAN IMIX MRR Trending 2n-skx"
+      output-file-name: "2n-skx-xxv710-imix-8t4c-vhost-chains-vxlan-avf"
+      data: "plot-performance-trending-vpp-nfv-2n-skx"
+      filter: "'NIC_Intel-XXV710' and 'NF_DENSITY' and 'VM' and 'CHAIN' and 'MRR' and 'IMIX' and '8T4C' and 'L2BDMACLRN' and 'VXLAN' and 'DRV_AVF'"
+      groups:
+        - ["1R1C", ]
+        - ["2R1C", ]
+        - ["4R1C", ]
+        - ["6R1C", ]
+        - ["8R1C", ]
+        - ["10R1C", ]
+      group-names:
+        - "1 Chain"
+        - "2 Chains"
+        - "4 Chains"
+        - "6 Chains"
+        - "8 Chains"
+        - "10 Chains"
+      layout: "plot-cpta"
+
+    - title: "VPP 2T1C NF Service Density CNFc IMIX MRR Trending 2n-skx"
+      output-file-name: "2n-skx-xxv710-imix-2t1c-memif-chains-avf"
+      data: "plot-performance-trending-vpp-nfv-2n-skx"
+      filter: "'NIC_Intel-XXV710' and 'NF_DENSITY' and 'DOCKER' and 'CHAIN' and 'MRR' and 'IMIX' and '2T1C' and 'L2BDMACLRN' and 'DRV_AVF'"
+      groups:
+        - ["1R1C", "1R2C", "1R4C", "1R6C", "1R8C", "1R10C"]
+        - ["2R1C", "2R2C", "2R4C", "2R6C", "2R8C", "2R10C"]
+        - ["4R1C", "4R2C", "4R4C", "4R6C"]
+        - ["6R1C", "6R2C", "6R4C"]
+        - ["8R1C", "8R2C"]
+        - ["10R1C", "10R2C"]
+      group-names:
+        - "1 Chain"
+        - "2 Chains"
+        - "4 Chains"
+        - "6 Chains"
+        - "8 Chains"
+        - "10 Chains"
+      layout: "plot-cpta"
+
+    - title: "VPP 4T2C NF Service Density CNFc IMIX MRR Trending 2n-skx"
+      output-file-name: "2n-skx-xxv710-imix-4t2c-memif-chains-avf"
+      data: "plot-performance-trending-vpp-nfv-2n-skx"
+      filter: "'NIC_Intel-XXV710' and 'NF_DENSITY' and 'DOCKER' and 'CHAIN' and 'MRR' and 'IMIX' and '4T2C' and 'L2BDMACLRN' and 'DRV_AVF'"
+      groups:
+        - ["1R1C", "1R2C", "1R4C", "1R6C", "1R8C", "1R10C"]
+        - ["2R1C", "2R2C", "2R4C", "2R6C", "2R8C", "2R10C"]
+        - ["4R1C", "4R2C", "4R4C", "4R6C"]
+        - ["6R1C", "6R2C", "6R4C"]
+        - ["8R1C", "8R2C"]
+        - ["10R1C", "10R2C"]
+      group-names:
+        - "1 Chain"
+        - "2 Chains"
+        - "4 Chains"
+        - "6 Chains"
+        - "8 Chains"
+        - "10 Chains"
+      layout: "plot-cpta"
+
+    - title: "VPP 8T4C NF Service Density CNFc IMIX MRR Trending 2n-skx"
+      output-file-name: "2n-skx-xxv710-imix-8t4c-memif-chains-avf"
+      data: "plot-performance-trending-vpp-nfv-2n-skx"
+      filter: "'NIC_Intel-XXV710' and 'NF_DENSITY' and 'DOCKER' and 'CHAIN' and 'MRR' and 'IMIX' and '8T4C' and 'L2BDMACLRN' and 'DRV_AVF'"
+      groups:
+        - ["1R1C", "1R2C", "1R4C", "1R6C", "1R8C", "1R10C"]
+        - ["2R1C", "2R2C", "2R4C", "2R6C", "2R8C", "2R10C"]
+        - ["4R1C", "4R2C", "4R4C", "4R6C"]
+        - ["6R1C", "6R2C", "6R4C"]
+        - ["8R1C", "8R2C"]
+        - ["10R1C", "10R2C"]
+      group-names:
+        - "1 Chain"
+        - "2 Chains"
+        - "4 Chains"
+        - "6 Chains"
+        - "8 Chains"
+        - "10 Chains"
+      layout: "plot-cpta"
+
+    - title: "VPP 2T1C NF Service Density CNFp IMIX MRR Trending 2n-skx"
+      output-file-name: "2n-skx-xxv710-imix-2t1c-memif-pipelines-avf"
+      data: "plot-performance-trending-vpp-nfv-2n-skx"
+      filter: "'NIC_Intel-XXV710' and 'NF_DENSITY' and 'DOCKER' and 'PIPELINE' and 'MRR' and 'IMIX' and '2T1C' and 'L2BDMACLRN' and 'DRV_AVF'"
+      groups:
+        - ["1R1C", "1R2C", "1R4C", "1R6C", "1R8C", "1R10C"]
+        - ["2R1C", "2R2C", "2R4C", "2R6C", "2R8C", "2R10C"]
+        - ["4R1C", "4R2C", "4R4C", "4R6C"]
+        - ["6R1C", "6R2C", "6R4C"]
+        - ["8R1C", "8R2C"]
+        - ["10R1C", "10R2C"]
+      group-names:
+        - "1 Pipe"
+        - "2 Pipes"
+        - "4 Pipes"
+        - "6 Pipes"
+        - "8 Pipes"
+        - "10 Pipes"
+      layout: "plot-cpta"
+
+    - title: "VPP 4T2C NF Service Density CNFp IMIX MRR Trending 2n-skx"
+      output-file-name: "2n-skx-xxv710-imix-4t2c-memif-pipelines-avf"
+      data: "plot-performance-trending-vpp-nfv-2n-skx"
+      filter: "'NIC_Intel-XXV710' and 'NF_DENSITY' and 'DOCKER' and 'PIPELINE' and 'MRR' and 'IMIX' and '4T2C' and 'L2BDMACLRN' and 'DRV_AVF'"
+      groups:
+        - ["1R1C", "1R2C", "1R4C", "1R6C", "1R8C", "1R10C"]
+        - ["2R1C", "2R2C", "2R4C", "2R6C", "2R8C", "2R10C"]
+        - ["4R1C", "4R2C", "4R4C", "4R6C"]
+        - ["6R1C", "6R2C", "6R4C"]
+        - ["8R1C", "8R2C"]
+        - ["10R1C", "10R2C"]
+      group-names:
+        - "1 Pipe"
+        - "2 Pipes"
+        - "4 Pipes"
+        - "6 Pipes"
+        - "8 Pipes"
+        - "10 Pipes"
+      layout: "plot-cpta"
+
+    - title: "VPP 8T4C NF Service Density CNFp IMIX MRR Trending 2n-skx"
+      output-file-name: "2n-skx-xxv710-imix-8t4c-memif-pipelines-avf"
+      data: "plot-performance-trending-vpp-nfv-2n-skx"
+      filter: "'NIC_Intel-XXV710' and 'NF_DENSITY' and 'DOCKER' and 'PIPELINE' and 'MRR' and 'IMIX' and '8T4C' and 'L2BDMACLRN' and 'DRV_AVF'"
+      groups:
+        - ["1R1C", "1R2C", "1R4C", "1R6C", "1R8C", "1R10C"]
+        - ["2R1C", "2R2C", "2R4C", "2R6C", "2R8C", "2R10C"]
+        - ["4R1C", "4R2C", "4R4C", "4R6C"]
+        - ["6R1C", "6R2C", "6R4C"]
+        - ["8R1C", "8R2C"]
+        - ["10R1C", "10R2C"]
+      group-names:
+        - "1 Pipe"
+        - "2 Pipes"
+        - "4 Pipes"
+        - "6 Pipes"
+        - "8 Pipes"
+        - "10 Pipes"
+      layout: "plot-cpta"
+
+# 2n-clx
+
+    - title: "VPP 2T1C NF Service Density VNFc IMIX MRR Trending 2n-clx"
+      output-file-name: "2n-clx-xxv710-imix-2t1c-vhost-chains-avf"
+      data: "plot-performance-trending-vpp-nfv-2n-clx"
+      filter: "'NIC_Intel-XXV710' and 'NF_DENSITY' and 'VM' and 'CHAIN' and 'MRR' and 'IMIX' and '2T1C' and 'L2BDMACLRN' and not 'VXLAN' and 'DRV_AVF'"
+      groups:
+        - ["1R1C", "1R2C", "1R4C", "1R6C", "1R8C", "1R10C"]
+        - ["2R1C", "2R2C", "2R4C", "2R6C", "2R8C", "2R10C"]
+        - ["4R1C", "4R2C", "4R4C", "4R6C"]
+        - ["6R1C", "6R2C", "6R4C"]
+        - ["8R1C", "8R2C"]
+        - ["10R1C", "10R2C"]
+      group-names:
+        - "1 Chain"
+        - "2 Chains"
+        - "4 Chains"
+        - "6 Chains"
+        - "8 Chains"
+        - "10 Chains"
+      layout: "plot-cpta"
+
+    - title: "VPP 4T2C NF Service Density VNFc IMIX MRR Trending 2n-clx"
+      output-file-name: "2n-clx-xxv710-imix-4t2c-vhost-chains-avf"
+      data: "plot-performance-trending-vpp-nfv-2n-clx"
+      filter: "'NIC_Intel-XXV710' and 'NF_DENSITY' and 'VM' and 'CHAIN' and 'MRR' and 'IMIX' and '4T2C' and 'L2BDMACLRN' and not 'VXLAN' and 'DRV_AVF'"
+      groups:
+        - ["1R1C", "1R2C", "1R4C", "1R6C", "1R8C", "1R10C"]
+        - ["2R1C", "2R2C", "2R4C", "2R6C", "2R8C", "2R10C"]
+        - ["4R1C", "4R2C", "4R4C", "4R6C"]
+        - ["6R1C", "6R2C", "6R4C"]
+        - ["8R1C", "8R2C"]
+        - ["10R1C", "10R2C"]
+      group-names:
+        - "1 Chain"
+        - "2 Chains"
+        - "4 Chains"
+        - "6 Chains"
+        - "8 Chains"
+        - "10 Chains"
+      layout: "plot-cpta"
+
+    - title: "VPP 8T4C NF Service Density VNFc IMIX MRR Trending 2n-clx"
+      output-file-name: "2n-clx-xxv710-imix-8t4c-vhost-chains-avf"
+      data: "plot-performance-trending-vpp-nfv-2n-clx"
+      filter: "'NIC_Intel-XXV710' and 'NF_DENSITY' and 'VM' and 'CHAIN' and 'MRR' and 'IMIX' and '8T4C' and 'L2BDMACLRN' and not 'VXLAN' and 'DRV_AVF'"
+      groups:
+        - ["1R1C", "1R2C", "1R4C", "1R6C", "1R8C", "1R10C"]
+        - ["2R1C", "2R2C", "2R4C", "2R6C", "2R8C", "2R10C"]
+        - ["4R1C", "4R2C", "4R4C", "4R6C"]
+        - ["6R1C", "6R2C", "6R4C"]
+        - ["8R1C", "8R2C"]
+        - ["10R1C", "10R2C"]
+      group-names:
+        - "1 Chain"
+        - "2 Chains"
+        - "4 Chains"
+        - "6 Chains"
+        - "8 Chains"
+        - "10 Chains"
+      layout: "plot-cpta"
+
+    - title: "VPP 2T1C NF Service Density VNFc VXLAN IMIX MRR Trending 2n-clx"
+      output-file-name: "2n-clx-xxv710-imix-2t1c-vhost-chains-vxlan-avf"
+      data: "plot-performance-trending-vpp-nfv-2n-clx"
+      filter: "'NIC_Intel-XXV710' and 'NF_DENSITY' and 'VM' and 'CHAIN' and 'MRR' and 'IMIX' and '2T1C' and 'L2BDMACLRN' and 'VXLAN' and 'DRV_AVF'"
+      groups:
+        - ["1R1C", ]
+        - ["2R1C", ]
+        - ["4R1C", ]
+        - ["6R1C", ]
+        - ["8R1C", ]
+        - ["10R1C", ]
+      group-names:
+        - "1 Chain"
+        - "2 Chains"
+        - "4 Chains"
+        - "6 Chains"
+        - "8 Chains"
+        - "10 Chains"
+      layout: "plot-cpta"
+
+    - title: "VPP 4T2C NF Service Density VNFc VXLAN IMIX MRR Trending 2n-clx"
+      output-file-name: "2n-clx-xxv710-imix-4t2c-vhost-chains-vxlan-avf"
+      data: "plot-performance-trending-vpp-nfv-2n-clx"
+      filter: "'NIC_Intel-XXV710' and 'NF_DENSITY' and 'VM' and 'CHAIN' and 'MRR' and 'IMIX' and '4T2C' and 'L2BDMACLRN' and 'VXLAN' and 'DRV_AVF'"
+      groups:
+        - ["1R1C", ]
+        - ["2R1C", ]
+        - ["4R1C", ]
+        - ["6R1C", ]
+        - ["8R1C", ]
+        - ["10R1C", ]
+      group-names:
+        - "1 Chain"
+        - "2 Chains"
+        - "4 Chains"
+        - "6 Chains"
+        - "8 Chains"
+        - "10 Chains"
+      layout: "plot-cpta"
+
+    - title: "VPP 8T4C NF Service Density VNFc VXLAN IMIX MRR Trending 2n-clx"
+      output-file-name: "2n-clx-xxv710-imix-8t4c-vhost-chains-vxlan-avf"
+      data: "plot-performance-trending-vpp-nfv-2n-clx"
+      filter: "'NIC_Intel-XXV710' and 'NF_DENSITY' and 'VM' and 'CHAIN' and 'MRR' and 'IMIX' and '8T4C' and 'L2BDMACLRN' and 'VXLAN' and 'DRV_AVF'"
+      groups:
+        - ["1R1C", ]
+        - ["2R1C", ]
+        - ["4R1C", ]
+        - ["6R1C", ]
+        - ["8R1C", ]
+        - ["10R1C", ]
+      group-names:
+        - "1 Chain"
+        - "2 Chains"
+        - "4 Chains"
+        - "6 Chains"
+        - "8 Chains"
+        - "10 Chains"
+      layout: "plot-cpta"
+
+    - title: "VPP 2T1C NF Service Density CNFc IMIX MRR Trending 2n-clx"
+      output-file-name: "2n-clx-xxv710-imix-2t1c-memif-chains-avf"
+      data: "plot-performance-trending-vpp-nfv-2n-clx"
+      filter: "'NIC_Intel-XXV710' and 'NF_DENSITY' and 'DOCKER' and 'CHAIN' and 'MRR' and 'IMIX' and '2T1C' and 'L2BDMACLRN' and 'DRV_AVF'"
+      groups:
+        - ["1R1C", "1R2C", "1R4C", "1R6C", "1R8C", "1R10C"]
+        - ["2R1C", "2R2C", "2R4C", "2R6C", "2R8C", "2R10C"]
+        - ["4R1C", "4R2C", "4R4C", "4R6C"]
+        - ["6R1C", "6R2C", "6R4C"]
+        - ["8R1C", "8R2C"]
+        - ["10R1C", "10R2C"]
+      group-names:
+        - "1 Chain"
+        - "2 Chains"
+        - "4 Chains"
+        - "6 Chains"
+        - "8 Chains"
+        - "10 Chains"
+      layout: "plot-cpta"
+
+    - title: "VPP 4T2C NF Service Density CNFc IMIX MRR Trending 2n-clx"
+      output-file-name: "2n-clx-xxv710-imix-4t2c-memif-chains-avf"
+      data: "plot-performance-trending-vpp-nfv-2n-clx"
+      filter: "'NIC_Intel-XXV710' and 'NF_DENSITY' and 'DOCKER' and 'CHAIN' and 'MRR' and 'IMIX' and '4T2C' and 'L2BDMACLRN' and 'DRV_AVF'"
+      groups:
+        - ["1R1C", "1R2C", "1R4C", "1R6C", "1R8C", "1R10C"]
+        - ["2R1C", "2R2C", "2R4C", "2R6C", "2R8C", "2R10C"]
+        - ["4R1C", "4R2C", "4R4C", "4R6C"]
+        - ["6R1C", "6R2C", "6R4C"]
+        - ["8R1C", "8R2C"]
+        - ["10R1C", "10R2C"]
+      group-names:
+        - "1 Chain"
+        - "2 Chains"
+        - "4 Chains"
+        - "6 Chains"
+        - "8 Chains"
+        - "10 Chains"
+      layout: "plot-cpta"
+
+    - title: "VPP 8T4C NF Service Density CNFc IMIX MRR Trending 2n-clx"
+      output-file-name: "2n-clx-xxv710-imix-8t4c-memif-chains-avf"
+      data: "plot-performance-trending-vpp-nfv-2n-clx"
+      filter: "'NIC_Intel-XXV710' and 'NF_DENSITY' and 'DOCKER' and 'CHAIN' and 'MRR' and 'IMIX' and '8T4C' and 'L2BDMACLRN' and 'DRV_AVF'"
+      groups:
+        - ["1R1C", "1R2C", "1R4C", "1R6C", "1R8C", "1R10C"]
+        - ["2R1C", "2R2C", "2R4C", "2R6C", "2R8C", "2R10C"]
+        - ["4R1C", "4R2C", "4R4C", "4R6C"]
+        - ["6R1C", "6R2C", "6R4C"]
+        - ["8R1C", "8R2C"]
+        - ["10R1C", "10R2C"]
+      group-names:
+        - "1 Chain"
+        - "2 Chains"
+        - "4 Chains"
+        - "6 Chains"
+        - "8 Chains"
+        - "10 Chains"
+      layout: "plot-cpta"
+
+    - title: "VPP 2T1C NF Service Density CNFp IMIX MRR Trending 2n-clx"
+      output-file-name: "2n-clx-xxv710-imix-2t1c-memif-pipelines-avf"
+      data: "plot-performance-trending-vpp-nfv-2n-clx"
+      filter: "'NIC_Intel-XXV710' and 'NF_DENSITY' and 'DOCKER' and 'PIPELINE' and 'MRR' and 'IMIX' and '2T1C' and 'L2BDMACLRN' and 'DRV_AVF'"
+      groups:
+        - ["1R1C", "1R2C", "1R4C", "1R6C", "1R8C", "1R10C"]
+        - ["2R1C", "2R2C", "2R4C", "2R6C", "2R8C", "2R10C"]
+        - ["4R1C", "4R2C", "4R4C", "4R6C"]
+        - ["6R1C", "6R2C", "6R4C"]
+        - ["8R1C", "8R2C"]
+        - ["10R1C", "10R2C"]
+      group-names:
+        - "1 Pipe"
+        - "2 Pipes"
+        - "4 Pipes"
+        - "6 Pipes"
+        - "8 Pipes"
+        - "10 Pipes"
+      layout: "plot-cpta"
+
+    - title: "VPP 4T2C NF Service Density CNFp IMIX MRR Trending 2n-clx"
+      output-file-name: "2n-clx-xxv710-imix-4t2c-memif-pipelines-avf"
+      data: "plot-performance-trending-vpp-nfv-2n-clx"
+      filter: "'NIC_Intel-XXV710' and 'NF_DENSITY' and 'DOCKER' and 'PIPELINE' and 'MRR' and 'IMIX' and '4T2C' and 'L2BDMACLRN' and 'DRV_AVF'"
+      groups:
+        - ["1R1C", "1R2C", "1R4C", "1R6C", "1R8C", "1R10C"]
+        - ["2R1C", "2R2C", "2R4C", "2R6C", "2R8C", "2R10C"]
+        - ["4R1C", "4R2C", "4R4C", "4R6C"]
+        - ["6R1C", "6R2C", "6R4C"]
+        - ["8R1C", "8R2C"]
+        - ["10R1C", "10R2C"]
+      group-names:
+        - "1 Pipe"
+        - "2 Pipes"
+        - "4 Pipes"
+        - "6 Pipes"
+        - "8 Pipes"
+        - "10 Pipes"
+      layout: "plot-cpta"
+
+    - title: "VPP 8T4C NF Service Density CNFp IMIX MRR Trending 2n-clx"
+      output-file-name: "2n-clx-xxv710-imix-8t4c-memif-pipelines-avf"
+      data: "plot-performance-trending-vpp-nfv-2n-clx"
+      filter: "'NIC_Intel-XXV710' and 'NF_DENSITY' and 'DOCKER' and 'PIPELINE' and 'MRR' and 'IMIX' and '8T4C' and 'L2BDMACLRN' and 'DRV_AVF'"
+      groups:
+        - ["1R1C", "1R2C", "1R4C", "1R6C", "1R8C", "1R10C"]
+        - ["2R1C", "2R2C", "2R4C", "2R6C", "2R8C", "2R10C"]
+        - ["4R1C", "4R2C", "4R4C", "4R6C"]
+        - ["6R1C", "6R2C", "6R4C"]
+        - ["8R1C", "8R2C"]
+        - ["10R1C", "10R2C"]
+      group-names:
+        - "1 Pipe"
+        - "2 Pipes"
+        - "4 Pipes"
+        - "6 Pipes"
+        - "8 Pipes"
+        - "10 Pipes"
       layout: "plot-cpta"
 
-# IPv4 - x710
-
-    - title: "VPP 2T1C IPv4 64B MRR Trending 3n-skx"
-      output-file-name: "ip4-2t1c-x710-3n-skx"
-      data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T1C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
+################################################################################
 
-    - title: "VPP 4T2C IPv4 64B MRR Trending 3n-skx"
-      output-file-name: "ip4-4t2c-x710-3n-skx"
-      data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T2C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK'"
-      parameters:
-      - "result"
+    - title: "2n-clx-xxv710-64b-2t1c-memif-base-avf"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-memif-base-avf"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Memif-1Dcr-mrr.64B-2t1c-avf-eth-l2xcbase-eth-2memif-1dcr-mrr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-mrr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-mrr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-mrr.64B-2t1c-avf-eth-l2bdbasemaclrn-eth-2memif-1dcr-mrr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Eth-2Memif-1Dcr-mrr.64B-2t1c-avf-ethip4-ip4base-eth-2memif-1dcr-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-4t2c-memif-base-avf"
+      output-file-name: "2n-clx-xxv710-64b-4t2c-memif-base-avf"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Memif-1Dcr-mrr.64B-4t2c-avf-eth-l2xcbase-eth-2memif-1dcr-mrr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-mrr.64B-4t2c-avf-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-mrr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-mrr.64B-4t2c-avf-eth-l2bdbasemaclrn-eth-2memif-1dcr-mrr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Eth-2Memif-1Dcr-mrr.64B-4t2c-avf-ethip4-ip4base-eth-2memif-1dcr-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-8t4c-memif-base-avf"
+      output-file-name: "2n-clx-xxv710-64b-8t4c-memif-base-avf"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Memif-1Dcr-mrr.64B-8t4c-avf-eth-l2xcbase-eth-2memif-1dcr-mrr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-mrr.64B-8t4c-avf-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-mrr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-mrr.64B-8t4c-avf-eth-l2bdbasemaclrn-eth-2memif-1dcr-mrr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Eth-2Memif-1Dcr-mrr.64B-8t4c-avf-ethip4-ip4base-eth-2memif-1dcr-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-2t1c-memif-base-dpdk"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-memif-base-dpdk"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Memif-1Dcr-mrr.64B-2t1c-eth-l2xcbase-eth-2memif-1dcr-mrr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-mrr.64B-2t1c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-mrr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-mrr.64B-2t1c-eth-l2bdbasemaclrn-eth-2memif-1dcr-mrr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Memif-1Dcr-mrr.64B-2t1c-ethip4-ip4base-eth-2memif-1dcr-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-4t2c-memif-base-dpdk"
+      output-file-name: "2n-clx-xxv710-64b-4t2c-memif-base-dpdk"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Memif-1Dcr-mrr.64B-4t2c-eth-l2xcbase-eth-2memif-1dcr-mrr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-mrr.64B-4t2c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-mrr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-mrr.64B-4t2c-eth-l2bdbasemaclrn-eth-2memif-1dcr-mrr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Memif-1Dcr-mrr.64B-4t2c-ethip4-ip4base-eth-2memif-1dcr-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-8t4c-memif-base-dpdk"
+      output-file-name: "2n-clx-xxv710-64b-8t4c-memif-base-dpdk"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Memif-1Dcr-mrr.64B-8t4c-eth-l2xcbase-eth-2memif-1dcr-mrr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-mrr.64B-8t4c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-mrr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-mrr.64B-8t4c-eth-l2bdbasemaclrn-eth-2memif-1dcr-mrr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Memif-1Dcr-mrr.64B-8t4c-ethip4-ip4base-eth-2memif-1dcr-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-cx556a-64b-2t1c-rdma-l2-eth-2memif-1dcr"
+      output-file-name: "2n-clx-cx556a-64b-2t1c-rdma-l2-eth-2memif-1dcr"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Mrr.64B-2t1c-rdma-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-mrr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Mrr.64B-2t1c-rdma-eth-l2bdbasemaclrn-eth-2memif-1dcr-mrr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Xcbase-Eth-2Memif-1Dcr-Mrr.64B-2t1c-rdma-eth-l2xcbase-eth-2memif-1dcr-mrr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1Cx556A-Rdma-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Mrr.64B-2t1c-rdma-ethip4-ip4base-eth-2memif-1dcr-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-cx556a-64b-4t2c-rdma-l2-eth-2memif-1dcr"
+      output-file-name: "2n-clx-cx556a-64b-4t2c-rdma-l2-eth-2memif-1dcr"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Mrr.64B-4t2c-rdma-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-mrr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Mrr.64B-4t2c-rdma-eth-l2bdbasemaclrn-eth-2memif-1dcr-mrr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Xcbase-Eth-2Memif-1Dcr-Mrr.64B-4t2c-rdma-eth-l2xcbase-eth-2memif-1dcr-mrr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1Cx556A-Rdma-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Mrr.64B-4t2c-rdma-ethip4-ip4base-eth-2memif-1dcr-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-cx556a-64b-8t4c-rdma-l2-eth-2memif-1dcr"
+      output-file-name: "2n-clx-cx556a-64b-8t4c-rdma-l2-eth-2memif-1dcr"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Mrr.64B-8t4c-rdma-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-mrr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Mrr.64B-8t4c-rdma-eth-l2bdbasemaclrn-eth-2memif-1dcr-mrr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Xcbase-Eth-2Memif-1Dcr-Mrr.64B-8t4c-rdma-eth-l2xcbase-eth-2memif-1dcr-mrr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1Cx556A-Rdma-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Mrr.64B-8t4c-rdma-ethip4-ip4base-eth-2memif-1dcr-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-skx-xxv710-64b-2t1c-memif-base-avf"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-memif-base-avf"
+      data: "plot-performance-trending-vpp-2n-skx"
+      include:
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Memif-1Dcr-mrr.64B-2t1c-avf-eth-l2xcbase-eth-2memif-1dcr-mrr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-mrr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-mrr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-mrr.64B-2t1c-avf-eth-l2bdbasemaclrn-eth-2memif-1dcr-mrr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Eth-2Memif-1Dcr-mrr.64B-2t1c-avf-ethip4-ip4base-eth-2memif-1dcr-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C IPv4 64B MRR Trending 3n-skx"
-      output-file-name: "ip4-8t4c-x710-3n-skx"
-      data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '8T4C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK'"
-      parameters:
-      - "result"
+    - title: "2n-skx-xxv710-64b-4t2c-memif-base-avf"
+      output-file-name: "2n-skx-xxv710-64b-4t2c-memif-base-avf"
+      data: "plot-performance-trending-vpp-2n-skx"
+      include:
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Memif-1Dcr-mrr.64B-4t2c-avf-eth-l2xcbase-eth-2memif-1dcr-mrr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-mrr.64B-4t2c-avf-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-mrr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-mrr.64B-4t2c-avf-eth-l2bdbasemaclrn-eth-2memif-1dcr-mrr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Eth-2Memif-1Dcr-mrr.64B-4t2c-avf-ethip4-ip4base-eth-2memif-1dcr-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 2T1C IPv4 64B MRR Trending 3n-skx"
-      output-file-name: "ip4-feature-2t1c-x710-3n-skx"
-      data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '2T1C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
-      parameters:
-      - "result"
+    - title: "2n-skx-xxv710-64b-8t4c-memif-base-avf"
+      output-file-name: "2n-skx-xxv710-64b-8t4c-memif-base-avf"
+      data: "plot-performance-trending-vpp-2n-skx"
+      include:
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Memif-1Dcr-mrr.64B-8t4c-avf-eth-l2xcbase-eth-2memif-1dcr-mrr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-mrr.64B-8t4c-avf-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-mrr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-mrr.64B-8t4c-avf-eth-l2bdbasemaclrn-eth-2memif-1dcr-mrr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Eth-2Memif-1Dcr-mrr.64B-8t4c-avf-ethip4-ip4base-eth-2memif-1dcr-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C IPv4 64B MRR Trending 3n-skx"
-      output-file-name: "ip4-feature-4t2c-x710-3n-skx"
-      data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '4T2C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
-      parameters:
-      - "result"
+    - title: "2n-skx-xxv710-64b-2t1c-memif-base-dpdk"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-memif-base-dpdk"
+      data: "plot-performance-trending-vpp-2n-skx"
+      include:
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Memif-1Dcr-mrr.64B-2t1c-eth-l2xcbase-eth-2memif-1dcr-mrr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-mrr.64B-2t1c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-mrr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-mrr.64B-2t1c-eth-l2bdbasemaclrn-eth-2memif-1dcr-mrr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Memif-1Dcr-mrr.64B-2t1c-ethip4-ip4base-eth-2memif-1dcr-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C IPv4 64B MRR Trending 3n-skx"
-      output-file-name: "ip4-feature-8t4c-x710-3n-skx"
-      data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '8T4C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
-      parameters:
-      - "result"
+    - title: "2n-skx-xxv710-64b-4t2c-memif-base-dpdk"
+      output-file-name: "2n-skx-xxv710-64b-4t2c-memif-base-dpdk"
+      data: "plot-performance-trending-vpp-2n-skx"
+      include:
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Memif-1Dcr-mrr.64B-4t2c-eth-l2xcbase-eth-2memif-1dcr-mrr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-mrr.64B-4t2c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-mrr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-mrr.64B-4t2c-eth-l2bdbasemaclrn-eth-2memif-1dcr-mrr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Memif-1Dcr-mrr.64B-4t2c-ethip4-ip4base-eth-2memif-1dcr-mrr"
       layout: "plot-cpta"
 
-# IPv4 - xxv710
-
-    - title: "VPP 2T1C IPv4 64B MRR Trending 3n-skx"
-      output-file-name: "ip4-2t1c-xxv710-3n-skx"
-      data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T1C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST'"
-      parameters:
-      - "result"
+    - title: "2n-skx-xxv710-64b-8t4c-memif-base-dpdk"
+      output-file-name: "2n-skx-xxv710-64b-8t4c-memif-base-dpdk"
+      data: "plot-performance-trending-vpp-2n-skx"
+      include:
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Memif-1Dcr-mrr.64B-8t4c-eth-l2xcbase-eth-2memif-1dcr-mrr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-mrr.64B-8t4c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-mrr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-mrr.64B-8t4c-eth-l2bdbasemaclrn-eth-2memif-1dcr-mrr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Memif-1Dcr-mrr.64B-8t4c-ethip4-ip4base-eth-2memif-1dcr-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C IPv4 64B MRR Trending 3n-skx"
-      output-file-name: "ip4-4t2c-xxv710-3n-skx"
+    - title: "3n-skx-xxv710-64b-2t1c-memif-base-avf"
+      output-file-name: "3n-skx-xxv710-64b-2t1c-memif-base-avf"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T2C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST'"
-      parameters:
-      - "result"
+      include:
+        - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Memif-1Dcr-mrr.64B-2t1c-avf-eth-l2xcbase-eth-2memif-1dcr-mrr"
+        - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Memif-1Lxc-mrr.64B-2t1c-avf-eth-l2xcbase-eth-2memif-1lxc-mrr"
+        - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-mrr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-mrr"
+        - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Memif-1Lxc-mrr.64B-2t1c-avf-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr"
+        - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Eth-2Memif-1Dcr-mrr.64B-2t1c-avf-ethip4-ip4base-eth-2memif-1dcr-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C IPv4 64B MRR Trending 3n-skx"
-      output-file-name: "ip4-8t4c-xxv710-3n-skx"
+    - title: "3n-skx-xxv710-64b-4t2c-memif-base-avf"
+      output-file-name: "3n-skx-xxv710-64b-4t2c-memif-base-avf"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '8T4C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST'"
-      parameters:
-      - "result"
+      include:
+        - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Memif-1Dcr-mrr.64B-4t2c-avf-eth-l2xcbase-eth-2memif-1dcr-mrr"
+        - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Memif-1Lxc-mrr.64B-4t2c-avf-eth-l2xcbase-eth-2memif-1lxc-mrr"
+        - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-mrr.64B-4t2c-avf-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-mrr"
+        - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Memif-1Lxc-mrr.64B-4t2c-avf-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr"
+        - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Eth-2Memif-1Dcr-mrr.64B-4t2c-avf-ethip4-ip4base-eth-2memif-1dcr-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 2T1C IPv4 64B MRR Trending 3n-skx"
-      output-file-name: "ip4-feature-2t1c-xxv710-3n-skx"
+    - title: "3n-skx-xxv710-64b-8t4c-memif-base-avf"
+      output-file-name: "3n-skx-xxv710-64b-8t4c-memif-base-avf"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'FEATURE' and '2T1C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
-      parameters:
-      - "result"
+      include:
+        - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Memif-1Dcr-mrr.64B-8t4c-avf-eth-l2xcbase-eth-2memif-1dcr-mrr"
+        - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Memif-1Lxc-mrr.64B-8t4c-avf-eth-l2xcbase-eth-2memif-1lxc-mrr"
+        - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-mrr.64B-8t4c-avf-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-mrr"
+        - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Memif-1Lxc-mrr.64B-8t4c-avf-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr"
+        - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Eth-2Memif-1Dcr-mrr.64B-8t4c-avf-ethip4-ip4base-eth-2memif-1dcr-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C IPv4 64B MRR Trending 3n-skx"
-      output-file-name: "ip4-feature-4t2c-xxv710-3n-skx"
+    - title: "3n-skx-xxv710-64b-2t1c-memif-base-dpdk"
+      output-file-name: "3n-skx-xxv710-64b-2t1c-memif-base-dpdk"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'FEATURE' and '4T2C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
-      parameters:
-      - "result"
+      include:
+        - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Memif-1Dcr-mrr.64B-2t1c-eth-l2xcbase-eth-2memif-1dcr-mrr"
+        - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Memif-1Lxc-mrr.64B-2t1c-eth-l2xcbase-eth-2memif-1lxc-mrr"
+        - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Memif-1Lxc-mrr.64B-2t1c-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr"
+        - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Memif-1Dcr-mrr.64B-2t1c-ethip4-ip4base-eth-2memif-1dcr-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C IPv4 64B MRR Trending 3n-skx"
-      output-file-name: "ip4-feature-8t4c-xxv710-3n-skx"
+    - title: "3n-skx-xxv710-64b-4t2c-memif-base-dpdk"
+      output-file-name: "3n-skx-xxv710-64b-4t2c-memif-base-dpdk"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'FEATURE' and '8T4C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
-      parameters:
-      - "result"
+      include:
+        - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Memif-1Dcr-mrr.64B-4t2c-eth-l2xcbase-eth-2memif-1dcr-mrr"
+        - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Memif-1Lxc-mrr.64B-4t2c-eth-l2xcbase-eth-2memif-1lxc-mrr"
+        - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Memif-1Lxc-mrr.64B-4t2c-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr"
+        - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Memif-1Dcr-mrr.64B-4t2c-ethip4-ip4base-eth-2memif-1dcr-mrr"
       layout: "plot-cpta"
 
-# IPv4 Tunnels - x710
-
-    - title: "VPP 2T1C IPv4 Tunnels 64B MRR Trending 3n-skx"
-      output-file-name: "ip4-tunnels-2t1c-x710-3n-skx"
+    - title: "3n-skx-xxv710-64b-8t4c-memif-base-dpdk"
+      output-file-name: "3n-skx-xxv710-64b-8t4c-memif-base-dpdk"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-X710' and '64B' and 'ENCAP' and 'MRR' and '2T1C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
-      parameters:
-      - "result"
+      include:
+        - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Memif-1Dcr-mrr.64B-8t4c-eth-l2xcbase-eth-2memif-1dcr-mrr"
+        - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Memif-1Lxc-mrr.64B-8t4c-eth-l2xcbase-eth-2memif-1lxc-mrr"
+        - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Memif-1Lxc-mrr.64B-8t4c-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr"
+        - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Memif-1Dcr-mrr.64B-8t4c-ethip4-ip4base-eth-2memif-1dcr-mrr"
+      layout: "plot-cpta"
+
+    - title: "3n-tsh-xxv710-64b-1t1c-memif-base-dpdk"
+      output-file-name: "3n-tsh-xxv710-64b-1t1c-memif-base-dpdk"
+      data: "plot-performance-trending-vpp-3n-tsh"
+      include:
+        - "Tests.Vpp.Perf.Container Memif.10ge2p1x520-Eth-L2Xcbase-Eth-2Memif-1Dcr-mrr.64B-1t1c-eth-l2xcbase-eth-2memif-1dcr-mrr"
+        - "Tests.Vpp.Perf.Container Memif.10ge2p1x520-Eth-L2Xcbase-Eth-2Memif-1Lxc-mrr.64B-1t1c-eth-l2xcbase-eth-2memif-1lxc-mrr"
+        - "Tests.Vpp.Perf.Container Memif.10ge2p1x520-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-mrr.64B-1t1c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-mrr"
+        - "Tests.Vpp.Perf.Container Memif.10ge2p1x520-Eth-L2Bdbasemaclrn-Eth-2Memif-1Lxc-mrr.64B-1t1c-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr"
+        - "Tests.Vpp.Perf.Container Memif.10ge2p1x520-Ethip4-Ip4Base-Eth-2Memif-1Dcr-mrr.64B-1t1c-ethip4-ip4base-eth-2memif-1dcr-mrr"
+      layout: "plot-cpta"
+
+    - title: "3n-tsh-xxv710-64b-2t2c-memif-base-dpdk"
+      output-file-name: "3n-tsh-xxv710-64b-2t2c-memif-base-dpdk"
+      data: "plot-performance-trending-vpp-3n-tsh"
+      include:
+        - "Tests.Vpp.Perf.Container Memif.10ge2p1x520-Eth-L2Xcbase-Eth-2Memif-1Dcr-mrr.64B-2t2c-eth-l2xcbase-eth-2memif-1dcr-mrr"
+        - "Tests.Vpp.Perf.Container Memif.10ge2p1x520-Eth-L2Xcbase-Eth-2Memif-1Lxc-mrr.64B-2t2c-eth-l2xcbase-eth-2memif-1lxc-mrr"
+        - "Tests.Vpp.Perf.Container Memif.10ge2p1x520-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-mrr.64B-2t2c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-mrr"
+        - "Tests.Vpp.Perf.Container Memif.10ge2p1x520-Eth-L2Bdbasemaclrn-Eth-2Memif-1Lxc-mrr.64B-2t2c-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr"
+        - "Tests.Vpp.Perf.Container Memif.10ge2p1x520-Ethip4-Ip4Base-Eth-2Memif-1Dcr-mrr.64B-2t2c-ethip4-ip4base-eth-2memif-1dcr-mrr"
+      layout: "plot-cpta"
+
+    - title: "3n-tsh-xxv710-64b-4t4c-memif-base-dpdk"
+      output-file-name: "3n-tsh-xxv710-64b-4t4c-memif-base-dpdk"
+      data: "plot-performance-trending-vpp-3n-tsh"
+      include:
+        - "Tests.Vpp.Perf.Container Memif.10ge2p1x520-Eth-L2Xcbase-Eth-2Memif-1Dcr-mrr.64B-4t4c-eth-l2xcbase-eth-2memif-1dcr-mrr"
+        - "Tests.Vpp.Perf.Container Memif.10ge2p1x520-Eth-L2Xcbase-Eth-2Memif-1Lxc-mrr.64B-4t4c-eth-l2xcbase-eth-2memif-1lxc-mrr"
+        - "Tests.Vpp.Perf.Container Memif.10ge2p1x520-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-mrr.64B-4t4c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-mrr"
+        - "Tests.Vpp.Perf.Container Memif.10ge2p1x520-Eth-L2Bdbasemaclrn-Eth-2Memif-1Lxc-mrr.64B-4t4c-eth-l2bdbasemaclrn-eth-2memif-1lxc-mrr"
+        - "Tests.Vpp.Perf.Container Memif.10ge2p1x520-Ethip4-Ip4Base-Eth-2Memif-1Dcr-mrr.64B-4t4c-ethip4-ip4base-eth-2memif-1dcr-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-x710-64b-2t1c-ip4routing-base-scale-avf-dpdk"
+      output-file-name: "2n-clx-x710-64b-2t1c-ip4-base-scale-avf-dpdk"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Base-mrr.64B-2t1c-avf-ethip4-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-mrr.64B-2t1c-avf-ethip4-ip4scale2m-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-Rnd-Mrr.64B-2t1c-avf-ethip4-ip4scale2m-rnd-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Base-mrr.64B-2t1c-ethip4-ip4base-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-x710-64b-4t2c-ip4routing-base-scale-avf-dpdk"
+      output-file-name: "2n-clx-x710-64b-4t2c-ip4-base-scale-avf-dpdk"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Base-mrr.64B-4t2c-avf-ethip4-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-mrr.64B-4t2c-avf-ethip4-ip4scale2m-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-Rnd-Mrr.64B-4t2c-avf-ethip4-ip4scale2m-rnd-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Base-mrr.64B-4t2c-ethip4-ip4base-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-x710-64b-8t4c-ip4routing-base-scale-avf-dpdk"
+      output-file-name: "2n-clx-x710-64b-8t4c-ip4-base-scale-avf-dpdk"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Base-mrr.64B-8t4c-avf-ethip4-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-mrr.64B-8t4c-avf-ethip4-ip4scale2m-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-Rnd-Mrr.64B-8t4c-avf-ethip4-ip4scale2m-rnd-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Base-mrr.64B-8t4c-ethip4-ip4base-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-2t1c-ip4routing-base-avf-dpdk"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-ip4-base-avf"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-Ip4Base-Mrr.64B-2t1c-avf-dot1q-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-mrr.64B-2t1c-avf-ethip4-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-mrr.64B-2t1c-ethip4-ip4base-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-4t2c-ip4routing-base-avf-dpdk"
+      output-file-name: "2n-clx-xxv710-64b-4t2c-ip4-base-avf"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-Ip4Base-Mrr.64B-4t2c-avf-dot1q-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-mrr.64B-4t2c-avf-ethip4-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-mrr.64B-4t2c-ethip4-ip4base-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-8t4c-ip4routing-base-avf-dpdk"
+      output-file-name: "2n-clx-xxv710-64b-8t4c-ip4-base-avf"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-Ip4Base-Mrr.64B-8t4c-avf-dot1q-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-mrr.64B-8t4c-avf-ethip4-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-mrr.64B-8t4c-ethip4-ip4base-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-2t1c-ip4routing-scale-avf"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-ip4-scale-avf"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale20K-mrr.64B-2t1c-avf-ethip4-ip4scale20k-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale20K-Rnd-Mrr.64B-2t1c-avf-ethip4-ip4scale20k-rnd-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale200K-mrr.64B-2t1c-avf-ethip4-ip4scale200k-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale200K-Rnd-Mrr.64B-2t1c-avf-ethip4-ip4scale200k-rnd-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale2M-mrr.64B-2t1c-avf-ethip4-ip4scale2m-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale2M-Rnd-Mrr.64B-2t1c-avf-ethip4-ip4scale2m-rnd-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-4t2c-ip4routing-scale-avf"
+      output-file-name: "2n-clx-xxv710-64b-4t2c-ip4-scale-avf"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale20K-mrr.64B-4t2c-avf-ethip4-ip4scale20k-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale20K-Rnd-Mrr.64B-4t2c-avf-ethip4-ip4scale20k-rnd-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale200K-mrr.64B-4t2c-avf-ethip4-ip4scale200k-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale200K-Rnd-Mrr.64B-4t2c-avf-ethip4-ip4scale200k-rnd-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale2M-mrr.64B-4t2c-avf-ethip4-ip4scale2m-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale2M-Rnd-Mrr.64B-4t2c-avf-ethip4-ip4scale2m-rnd-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-8t4c-ip4routing-scale-avf"
+      output-file-name: "2n-clx-xxv710-64b-8t4c-ip4-scale-avf"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale20K-mrr.64B-8t4c-avf-ethip4-ip4scale20k-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale20K-Rnd-Mrr.64B-8t4c-avf-ethip4-ip4scale20k-rnd-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale200K-mrr.64B-8t4c-avf-ethip4-ip4scale200k-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale200K-Rnd-Mrr.64B-8t4c-avf-ethip4-ip4scale200k-rnd-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale2M-mrr.64B-8t4c-avf-ethip4-ip4scale2m-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale2M-Rnd-Mrr.64B-8t4c-avf-ethip4-ip4scale2m-rnd-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-2t1c-ip4routing-scale-dpdk"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-ip4-scale-dpdk"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale20K-mrr.64B-2t1c-ethip4-ip4scale20k-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale20K-Rnd-Mrr.64B-2t1c-ethip4-ip4scale20k-rnd-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale200K-mrr.64B-2t1c-ethip4-ip4scale200k-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale200K-Rnd-Mrr.64B-2t1c-ethip4-ip4scale200k-rnd-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale2M-mrr.64B-2t1c-ethip4-ip4scale2m-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale2M-Rnd-Mrr.64B-2t1c-ethip4-ip4scale2m-rnd-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-4t2c-ip4routing-scale-dpdk"
+      output-file-name: "2n-clx-xxv710-64b-4t2c-ip4-scale-dpdk"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale20K-mrr.64B-4t2c-ethip4-ip4scale20k-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale20K-Rnd-Mrr.64B-4t2c-ethip4-ip4scale20k-rnd-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale200K-mrr.64B-4t2c-ethip4-ip4scale200k-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale200K-Rnd-Mrr.64B-4t2c-ethip4-ip4scale200k-rnd-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale2M-mrr.64B-4t2c-ethip4-ip4scale2m-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale2M-Rnd-Mrr.64B-4t2c-ethip4-ip4scale2m-rnd-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-8t4c-ip4routing-scale-dpdk"
+      output-file-name: "2n-clx-xxv710-64b-8t4c-ip4-scale-dpdk"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale20K-mrr.64B-8t4c-ethip4-ip4scale20k-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale20K-Rnd-Mrr.64B-8t4c-ethip4-ip4scale20k-rnd-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale200K-mrr.64B-8t4c-ethip4-ip4scale200k-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale200K-Rnd-Mrr.64B-8t4c-ethip4-ip4scale200k-rnd-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale2M-mrr.64B-8t4c-ethip4-ip4scale2m-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale2M-Rnd-Mrr.64B-8t4c-ethip4-ip4scale2m-rnd-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-2t1c-features-ip4routing-base-avf"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-ip4-features-avf"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-mrr.64B-2t1c-avf-ethip4udp-ip4base-iacl50sf-10kflows-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-mrr.64B-2t1c-avf-ethip4udp-ip4base-iacl50sl-10kflows-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-mrr.64B-2t1c-avf-ethip4udp-ip4base-oacl50sf-10kflows-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-mrr.64B-2t1c-avf-ethip4udp-ip4base-oacl50sl-10kflows-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1-p1-s1-mrr.64B-2t1c-avf-ethip4udp-nat44det-h1-p1-s1-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1024-p63-s64512-Mrr.64B-2t1c-avf-ethip4udp-nat44det-h1024-p63-s64512-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-4t2c-features-ip4routing-base-avf"
+      output-file-name: "2n-clx-xxv710-64b-4t2c-ip4-features-avf"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-mrr.64B-4t2c-avf-ethip4udp-ip4base-iacl50sf-10kflows-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-mrr.64B-4t2c-avf-ethip4udp-ip4base-iacl50sl-10kflows-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-mrr.64B-4t2c-avf-ethip4udp-ip4base-oacl50sf-10kflows-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-mrr.64B-4t2c-avf-ethip4udp-ip4base-oacl50sl-10kflows-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1-p1-s1-mrr.64B-4t2c-avf-ethip4udp-nat44det-h1-p1-s1-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1024-p63-s64512-Mrr.64B-4t2c-avf-ethip4udp-nat44det-h1024-p63-s64512-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-8t4c-features-ip4routing-base-avf"
+      output-file-name: "2n-clx-xxv710-64b-8t4c-ip4-features-avf"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-mrr.64B-8t4c-avf-ethip4udp-ip4base-iacl50sf-10kflows-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-mrr.64B-8t4c-avf-ethip4udp-ip4base-iacl50sl-10kflows-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-mrr.64B-8t4c-avf-ethip4udp-ip4base-oacl50sf-10kflows-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-mrr.64B-8t4c-avf-ethip4udp-ip4base-oacl50sl-10kflows-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1-p1-s1-mrr.64B-8t4c-avf-ethip4udp-nat44det-h1-p1-s1-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1024-p63-s64512-Mrr.64B-8t4c-avf-ethip4udp-nat44det-h1024-p63-s64512-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-stl-bidir-avf"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-stl-bidir-avf"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h1024-p63-s64512-mrr.64b-2t1c-avf-ethip4udp-nat44det-h1024-p63-s64512-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h4096-p63-s258048-mrr.64b-2t1c-avf-ethip4udp-nat44det-h4096-p63-s258048-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h16384-p63-s1032192-mrr.64b-2t1c-avf-ethip4udp-nat44det-h16384-p63-s1032192-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h65536-p63-s4128758-mrr.64b-2t1c-avf-ethip4udp-nat44det-h65536-p63-s4128758-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h262144-p63-s16515072-mrr.64b-2t1c-avf-ethip4udp-nat44det-h262144-p63-s16515072-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-4t2c-nat44det-ip4routing-stl-bidir-avf"
+      output-file-name: "2n-clx-xxv710-64b-4t2c-nat44det-ip4routing-stl-bidir-avf"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h1024-p63-s64512-mrr.64b-4t2c-avf-ethip4udp-nat44det-h1024-p63-s64512-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h4096-p63-s258048-mrr.64b-4t2c-avf-ethip4udp-nat44det-h4096-p63-s258048-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h16384-p63-s1032192-mrr.64b-4t2c-avf-ethip4udp-nat44det-h16384-p63-s1032192-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h65536-p63-s4128758-mrr.64b-4t2c-avf-ethip4udp-nat44det-h65536-p63-s4128758-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h262144-p63-s16515072-mrr.64b-4t2c-avf-ethip4udp-nat44det-h262144-p63-s16515072-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-8t4c-nat44det-ip4routing-stl-bidir-avf"
+      output-file-name: "2n-clx-xxv710-64b-8t4c-nat44det-ip4routing-stl-bidir-avf"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h1024-p63-s64512-mrr.64b-8t4c-avf-ethip4udp-nat44det-h1024-p63-s64512-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h4096-p63-s258048-mrr.64b-8t4c-avf-ethip4udp-nat44det-h4096-p63-s258048-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h16384-p63-s1032192-mrr.64b-8t4c-avf-ethip4udp-nat44det-h16384-p63-s1032192-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h65536-p63-s4128758-mrr.64b-8t4c-avf-ethip4udp-nat44det-h65536-p63-s4128758-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h262144-p63-s16515072-mrr.64b-8t4c-avf-ethip4udp-nat44det-h262144-p63-s16515072-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-mrr.64b-2t1c-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-udir-mrr.64b-2t1c-avf-ethip4udp-nat44ed-h4096-p63-s258048-udir-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-udir-mrr.64b-2t1c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-udir-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-udir-mrr.64b-2t1c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-udir-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-udir-mrr.64b-2t1c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-udir-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-4t2c-nat44ed-ip4routing-stl-unidir-avf"
+      output-file-name: "2n-clx-xxv710-64b-4t2c-nat44ed-ip4routing-stl-unidir-avf"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-mrr.64b-4t2c-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-udir-mrr.64b-4t2c-avf-ethip4udp-nat44ed-h4096-p63-s258048-udir-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-udir-mrr.64b-4t2c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-udir-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-udir-mrr.64b-4t2c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-udir-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-udir-mrr.64b-4t2c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-udir-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-8t4c-nat44ed-ip4routing-stl-unidir-avf"
+      output-file-name: "2n-clx-xxv710-64b-8t4c-nat44ed-ip4routing-stl-unidir-avf"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-mrr.64b-8t4c-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-udir-mrr.64b-8t4c-avf-ethip4udp-nat44ed-h4096-p63-s258048-udir-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-udir-mrr.64b-8t4c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-udir-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-udir-mrr.64b-8t4c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-udir-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-udir-mrr.64b-8t4c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-udir-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-mrr.64b-2t1c-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-cps-mrr.64b-2t1c-avf-ethip4udp-nat44ed-h4096-p63-s258048-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-cps-mrr.64b-2t1c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-cps-mrr.64b-2t1c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-cps-mrr.64b-2t1c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h1024-p63-s64512-cps-mrr.64b-2t1c-avf-ethip4udp-ip4base-h1024-p63-s64512-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h4096-p63-s258048-cps-mrr.64b-2t1c-avf-ethip4udp-ip4base-h4096-p63-s258048-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h16384-p63-s1032192-cps-mrr.64b-2t1c-avf-ethip4udp-ip4base-h16384-p63-s1032192-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h65536-p63-s4128768-cps-mrr.64b-2t1c-avf-ethip4udp-ip4base-h65536-p63-s4128768-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h262144-p63-s16515072-cps-mrr.64b-2t1c-avf-ethip4udp-ip4base-h262144-p63-s16515072-cps-mrr"
+      layout: "plot-cpta-cps"
+
+    - title: "2n-clx-xxv710-64b-4t2c-nat44ed-ip4routing-udp-stf-cps-avf"
+      output-file-name: "2n-clx-xxv710-64b-4t2c-nat44ed-ip4routing-udp-stf-cps-avf"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-mrr.64b-4t2c-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-cps-mrr.64b-4t2c-avf-ethip4udp-nat44ed-h4096-p63-s258048-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-cps-mrr.64b-4t2c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-cps-mrr.64b-4t2c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-cps-mrr.64b-4t2c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h1024-p63-s64512-cps-mrr.64b-4t2c-avf-ethip4udp-ip4base-h1024-p63-s64512-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h4096-p63-s258048-cps-mrr.64b-4t2c-avf-ethip4udp-ip4base-h4096-p63-s258048-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h16384-p63-s1032192-cps-mrr.64b-4t2c-avf-ethip4udp-ip4base-h16384-p63-s1032192-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h65536-p63-s4128768-cps-mrr.64b-4t2c-avf-ethip4udp-ip4base-h65536-p63-s4128768-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h262144-p63-s16515072-cps-mrr.64b-4t2c-avf-ethip4udp-ip4base-h262144-p63-s16515072-cps-mrr"
+      layout: "plot-cpta-cps"
+
+    - title: "2n-clx-xxv710-64b-8t4c-nat44ed-ip4routing-udp-stf-cps-avf"
+      output-file-name: "2n-clx-xxv710-64b-8t4c-nat44ed-ip4routing-udp-stf-cps-avf"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-mrr.64b-8t4c-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-cps-mrr.64b-8t4c-avf-ethip4udp-nat44ed-h4096-p63-s258048-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-cps-mrr.64b-8t4c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-cps-mrr.64b-8t4c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-cps-mrr.64b-8t4c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h1024-p63-s64512-cps-mrr.64b-8t4c-avf-ethip4udp-ip4base-h1024-p63-s64512-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h4096-p63-s258048-cps-mrr.64b-8t4c-avf-ethip4udp-ip4base-h4096-p63-s258048-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h16384-p63-s1032192-cps-mrr.64b-8t4c-avf-ethip4udp-ip4base-h16384-p63-s1032192-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h65536-p63-s4128768-cps-mrr.64b-8t4c-avf-ethip4udp-ip4base-h65536-p63-s4128768-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h262144-p63-s16515072-cps-mrr.64b-8t4c-avf-ethip4udp-ip4base-h262144-p63-s16515072-cps-mrr"
+      layout: "plot-cpta-cps"
+
+    - title: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-pps-avf"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-pps-avf"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-mrr.64b-2t1c-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-pps-mrr.64b-2t1c-avf-ethip4udp-nat44ed-h4096-p63-s258048-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-pps-mrr.64b-2t1c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-pps-mrr.64b-2t1c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-pps-mrr.64b-2t1c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h1024-p63-s64512-pps-mrr.64b-2t1c-avf-ethip4udp-ip4base-h1024-p63-s64512-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h4096-p63-s258048-pps-mrr.64b-2t1c-avf-ethip4udp-ip4base-h4096-p63-s258048-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h16384-p63-s1032192-pps-mrr.64b-2t1c-avf-ethip4udp-ip4base-h16384-p63-s1032192-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h65536-p63-s4128768-pps-mrr.64b-2t1c-avf-ethip4udp-ip4base-h65536-p63-s4128768-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h262144-p63-s16515072-pps-mrr.64b-2t1c-avf-ethip4udp-ip4base-h262144-p63-s16515072-pps-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-4t2c-nat44ed-ip4routing-udp-stf-pps-avf"
+      output-file-name: "2n-clx-xxv710-64b-4t2c-nat44ed-ip4routing-udp-stf-pps-avf"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-mrr.64b-4t2c-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-pps-mrr.64b-4t2c-avf-ethip4udp-nat44ed-h4096-p63-s258048-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-pps-mrr.64b-4t2c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-pps-mrr.64b-4t2c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-pps-mrr.64b-4t2c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h1024-p63-s64512-pps-mrr.64b-4t2c-avf-ethip4udp-ip4base-h1024-p63-s64512-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h4096-p63-s258048-pps-mrr.64b-4t2c-avf-ethip4udp-ip4base-h4096-p63-s258048-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h16384-p63-s1032192-pps-mrr.64b-4t2c-avf-ethip4udp-ip4base-h16384-p63-s1032192-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h65536-p63-s4128768-pps-mrr.64b-4t2c-avf-ethip4udp-ip4base-h65536-p63-s4128768-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h262144-p63-s16515072-pps-mrr.64b-4t2c-avf-ethip4udp-ip4base-h262144-p63-s16515072-pps-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-8t4c-nat44ed-ip4routing-udp-stf-pps-avf"
+      output-file-name: "2n-clx-xxv710-64b-8t4c-nat44ed-ip4routing-udp-stf-pps-avf"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-mrr.64b-8t4c-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-pps-mrr.64b-8t4c-avf-ethip4udp-nat44ed-h4096-p63-s258048-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-pps-mrr.64b-8t4c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-pps-mrr.64b-8t4c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-pps-mrr.64b-8t4c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h1024-p63-s64512-pps-mrr.64b-8t4c-avf-ethip4udp-ip4base-h1024-p63-s64512-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h4096-p63-s258048-pps-mrr.64b-8t4c-avf-ethip4udp-ip4base-h4096-p63-s258048-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h16384-p63-s1032192-pps-mrr.64b-8t4c-avf-ethip4udp-ip4base-h16384-p63-s1032192-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h65536-p63-s4128768-pps-mrr.64b-8t4c-avf-ethip4udp-ip4base-h65536-p63-s4128768-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h262144-p63-s16515072-pps-mrr.64b-8t4c-avf-ethip4udp-ip4base-h262144-p63-s16515072-pps-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-mrr.64b-2t1c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h4096-p63-s258048-cps-mrr.64b-2t1c-avf-ethip4tcp-nat44ed-h4096-p63-s258048-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-mrr.64b-2t1c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-mrr.64b-2t1c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-mrr.64b-2t1c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h1024-p63-s64512-cps-mrr.64b-2t1c-avf-ethip4tcp-ip4base-h1024-p63-s64512-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h4096-p63-s258048-cps-mrr.64b-2t1c-avf-ethip4tcp-ip4base-h4096-p63-s258048-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h16384-p63-s1032192-cps-mrr.64b-2t1c-avf-ethip4tcp-ip4base-h16384-p63-s1032192-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h65536-p63-s4128768-cps-mrr.64b-2t1c-avf-ethip4tcp-ip4base-h65536-p63-s4128768-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h262144-p63-s16515072-cps-mrr.64b-2t1c-avf-ethip4tcp-ip4base-h262144-p63-s16515072-cps-mrr"
+      layout: "plot-cpta-cps"
+
+    - title: "2n-clx-xxv710-64b-4t2c-nat44ed-ip4routing-tcp-stf-cps-avf"
+      output-file-name: "2n-clx-xxv710-64b-4t2c-nat44ed-ip4routing-tcp-stf-cps-avf"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-mrr.64b-4t2c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h4096-p63-s258048-cps-mrr.64b-4t2c-avf-ethip4tcp-nat44ed-h4096-p63-s258048-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-mrr.64b-4t2c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-mrr.64b-4t2c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-mrr.64b-4t2c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h1024-p63-s64512-cps-mrr.64b-4t2c-avf-ethip4tcp-ip4base-h1024-p63-s64512-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h4096-p63-s258048-cps-mrr.64b-4t2c-avf-ethip4tcp-ip4base-h4096-p63-s258048-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h16384-p63-s1032192-cps-mrr.64b-4t2c-avf-ethip4tcp-ip4base-h16384-p63-s1032192-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h65536-p63-s4128768-cps-mrr.64b-4t2c-avf-ethip4tcp-ip4base-h65536-p63-s4128768-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h262144-p63-s16515072-cps-mrr.64b-4t2c-avf-ethip4tcp-ip4base-h262144-p63-s16515072-cps-mrr"
+      layout: "plot-cpta-cps"
+
+    - title: "2n-clx-xxv710-64b-8t4c-nat44ed-ip4routing-tcp-stf-cps-avf"
+      output-file-name: "2n-clx-xxv710-64b-8t4c-nat44ed-ip4routing-tcp-stf-cps-avf"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-mrr.64b-8t4c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h4096-p63-s258048-cps-mrr.64b-8t4c-avf-ethip4tcp-nat44ed-h4096-p63-s258048-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-mrr.64b-8t4c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-mrr.64b-8t4c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-mrr.64b-8t4c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h1024-p63-s64512-cps-mrr.64b-8t4c-avf-ethip4tcp-ip4base-h1024-p63-s64512-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h4096-p63-s258048-cps-mrr.64b-8t4c-avf-ethip4tcp-ip4base-h4096-p63-s258048-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h16384-p63-s1032192-cps-mrr.64b-8t4c-avf-ethip4tcp-ip4base-h16384-p63-s1032192-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h65536-p63-s4128768-cps-mrr.64b-8t4c-avf-ethip4tcp-ip4base-h65536-p63-s4128768-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h262144-p63-s16515072-cps-mrr.64b-8t4c-avf-ethip4tcp-ip4base-h262144-p63-s16515072-cps-mrr"
+      layout: "plot-cpta-cps"
+
+    - title: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-pps-avf"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-pps-avf"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-mrr.64b-2t1c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h4096-p63-s258048-pps-mrr.64b-2t1c-avf-ethip4tcp-nat44ed-h4096-p63-s258048-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-mrr.64b-2t1c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-mrr.64b-2t1c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-mrr.64b-2t1c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h1024-p63-s64512-pps-mrr.64b-2t1c-avf-ethip4tcp-ip4base-h1024-p63-s64512-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h4096-p63-s258048-pps-mrr.64b-2t1c-avf-ethip4tcp-ip4base-h4096-p63-s258048-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h16384-p63-s1032192-pps-mrr.64b-2t1c-avf-ethip4tcp-ip4base-h16384-p63-s1032192-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h65536-p63-s4128768-pps-mrr.64b-2t1c-avf-ethip4tcp-ip4base-h65536-p63-s4128768-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h262144-p63-s16515072-pps-mrr.64b-2t1c-avf-ethip4tcp-ip4base-h262144-p63-s16515072-pps-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-4t2c-nat44ed-ip4routing-tcp-stf-pps-avf"
+      output-file-name: "2n-clx-xxv710-64b-4t2c-nat44ed-ip4routing-tcp-stf-pps-avf"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-mrr.64b-4t2c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h4096-p63-s258048-pps-mrr.64b-4t2c-avf-ethip4tcp-nat44ed-h4096-p63-s258048-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-mrr.64b-4t2c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-mrr.64b-4t2c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-mrr.64b-4t2c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h1024-p63-s64512-pps-mrr.64b-4t2c-avf-ethip4tcp-ip4base-h1024-p63-s64512-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h4096-p63-s258048-pps-mrr.64b-4t2c-avf-ethip4tcp-ip4base-h4096-p63-s258048-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h16384-p63-s1032192-pps-mrr.64b-4t2c-avf-ethip4tcp-ip4base-h16384-p63-s1032192-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h65536-p63-s4128768-pps-mrr.64b-4t2c-avf-ethip4tcp-ip4base-h65536-p63-s4128768-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h262144-p63-s16515072-pps-mrr.64b-4t2c-avf-ethip4tcp-ip4base-h262144-p63-s16515072-pps-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-8t4c-nat44ed-ip4routing-tcp-stf-pps-avf"
+      output-file-name: "2n-clx-xxv710-64b-8t4c-nat44ed-ip4routing-tcp-stf-pps-avf"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-mrr.64b-8t4c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h4096-p63-s258048-pps-mrr.64b-8t4c-avf-ethip4tcp-nat44ed-h4096-p63-s258048-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-mrr.64b-8t4c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-mrr.64b-8t4c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-mrr.64b-8t4c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h1024-p63-s64512-pps-mrr.64b-8t4c-avf-ethip4tcp-ip4base-h1024-p63-s64512-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h4096-p63-s258048-pps-mrr.64b-8t4c-avf-ethip4tcp-ip4base-h4096-p63-s258048-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h16384-p63-s1032192-pps-mrr.64b-8t4c-avf-ethip4tcp-ip4base-h16384-p63-s1032192-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h65536-p63-s4128768-pps-mrr.64b-8t4c-avf-ethip4tcp-ip4base-h65536-p63-s4128768-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h262144-p63-s16515072-pps-mrr.64b-8t4c-avf-ethip4tcp-ip4base-h262144-p63-s16515072-pps-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-cx556a-64b-2t1c-rdma-ip4base"
+      output-file-name: "2n-clx-cx556a-64b-2t1c-rdma-ip4base"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-Ip4Base-Mrr.64B-2t1c-rdma-dot1q-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4-Ip4Base-Mrr.64B-2t1c-rdma-ethip4-ip4base-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-cx556a-64b-4t2c-rdma-ip4base"
+      output-file-name: "2n-clx-cx556a-64b-4t2c-rdma-ip4base"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-Ip4Base-Mrr.64B-4t2c-rdma-dot1q-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4-Ip4Base-Mrr.64B-4t2c-rdma-ethip4-ip4base-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-cx556a-64b-8t4c-rdma-ip4base"
+      output-file-name: "2n-clx-cx556a-64b-8t4c-rdma-ip4base"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-Ip4Base-Mrr.64B-8t4c-rdma-dot1q-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4-Ip4Base-Mrr.64B-8t4c-rdma-ethip4-ip4base-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-cx556a-64b-2t1c-rdma-ethip4-ip4scale"
+      output-file-name: "2n-clx-cx556a-64b-2t1c-rdma-ethip4-ip4scale"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4-Ip4Scale20K-Mrr.64B-2t1c-rdma-ethip4-ip4scale20k-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4-Ip4Scale20K-Rnd-Mrr.64B-2t1c-rdma-ethip4-ip4scale20k-rnd-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4-Ip4Scale200K-Mrr.64B-2t1c-rdma-ethip4-ip4scale200k-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4-Ip4Scale200K-Rnd-Mrr.64B-2t1c-rdma-ethip4-ip4scale200k-rnd-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4-Ip4Scale2M-Mrr.64B-2t1c-rdma-ethip4-ip4scale2m-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4-Ip4Scale2M-Rnd-Mrr.64B-2t1c-rdma-ethip4-ip4scale2m-rnd-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-cx556a-64b-4t2c-rdma-ethip4-ip4scale"
+      output-file-name: "2n-clx-cx556a-64b-4t2c-rdma-ethip4-ip4scale"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4-Ip4Scale20K-Mrr.64B-4t2c-rdma-ethip4-ip4scale20k-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4-Ip4Scale20K-Rnd-Mrr.64B-4t2c-rdma-ethip4-ip4scale20k-rnd-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4-Ip4Scale200K-Mrr.64B-4t2c-rdma-ethip4-ip4scale200k-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4-Ip4Scale200K-Rnd-Mrr.64B-4t2c-rdma-ethip4-ip4scale200k-rnd-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4-Ip4Scale2M-Mrr.64B-4t2c-rdma-ethip4-ip4scale2m-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4-Ip4Scale2M-Rnd-Mrr.64B-4t2c-rdma-ethip4-ip4scale2m-rnd-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-cx556a-64b-8t4c-rdma-ethip4-ip4scale"
+      output-file-name: "2n-clx-cx556a-64b-8t4c-rdma-ethip4-ip4scale"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4-Ip4Scale20K-Mrr.64B-8t4c-rdma-ethip4-ip4scale20k-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4-Ip4Scale20K-Rnd-Mrr.64B-8t4c-rdma-ethip4-ip4scale20k-rnd-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4-Ip4Scale200K-Mrr.64B-8t4c-rdma-ethip4-ip4scale200k-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4-Ip4Scale200K-Rnd-Mrr.64B-8t4c-rdma-ethip4-ip4scale200k-rnd-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4-Ip4Scale2M-Mrr.64B-8t4c-rdma-ethip4-ip4scale2m-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4-Ip4Scale2M-Rnd-Mrr.64B-8t4c-rdma-ethip4-ip4scale2m-rnd-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-cx556a-64b-2t1c-rdma-ethip4-features"
+      output-file-name: "2n-clx-cx556a-64b-2t1c-rdma-ethip4-features"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Mrr.64B-2t1c-rdma-ethip4udp-ip4base-iacl50sf-10kflows-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Mrr.64B-2t1c-rdma-ethip4udp-ip4base-iacl50sl-10kflows-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Mrr.64B-2t1c-rdma-ethip4udp-ip4base-oacl50sf-10kflows-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Mrr.64B-2t1c-rdma-ethip4udp-ip4base-oacl50sl-10kflows-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-ethip4udp-nat44det-h1-p1-s1-Mrr.64B-2t1c-rdma-ethip4udp-nat44det-h1-p1-s1-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-ethip4udp-nat44det-h1024-p63-s64512-Mrr.64B-2t1c-rdma-ethip4udp-nat44det-h1024-p63-s64512-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-cx556a-64b-4t2c-rdma-ethip4-features"
+      output-file-name: "2n-clx-cx556a-64b-4t2c-rdma-ethip4-features"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Mrr.64B-4t2c-rdma-ethip4udp-ip4base-iacl50sf-10kflows-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Mrr.64B-4t2c-rdma-ethip4udp-ip4base-iacl50sl-10kflows-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Mrr.64B-4t2c-rdma-ethip4udp-ip4base-oacl50sf-10kflows-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Mrr.64B-4t2c-rdma-ethip4udp-ip4base-oacl50sl-10kflows-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-ethip4udp-nat44det-h1-p1-s1-Mrr.64B-4t2c-rdma-ethip4udp-nat44det-h1-p1-s1-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-ethip4udp-nat44det-h1024-p63-s64512-Mrr.64B-4t2c-rdma-ethip4udp-nat44det-h1024-p63-s64512-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-cx556a-64b-8t4c-ip4routing-base-scale-avf-dpdk"
+      output-file-name: "2n-clx-cx556a-64b-8t4c-rdma-ethip4-features"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Mrr.64B-8t4c-rdma-ethip4udp-ip4base-iacl50sf-10kflows-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Mrr.64B-8t4c-rdma-ethip4udp-ip4base-iacl50sl-10kflows-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Mrr.64B-8t4c-rdma-ethip4udp-ip4base-oacl50sf-10kflows-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Mrr.64B-8t4c-rdma-ethip4udp-ip4base-oacl50sl-10kflows-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-ethip4udp-nat44det-h1-p1-s1-Mrr.64B-8t4c-rdma-ethip4udp-nat44det-h1-p1-s1-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-ethip4udp-nat44det-h1024-p63-s64512-Mrr.64B-8t4c-rdma-ethip4udp-nat44det-h1024-p63-s64512-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-dnv-x553-64b-1t1c-ip4routing-base-scale-ixgbe"
+      output-file-name: "2n-dnv-x553-64b-1t1c-ip4-ixgbe"
+      data: "plot-performance-trending-vpp-2n-dnv"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Dot1Q-Ip4Base-mrr.64B-1t1c-dot1q-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4-Ip4Base-mrr.64B-1t1c-ethip4-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4-Ip4Scale20K-mrr.64B-1t1c-ethip4-ip4scale20k-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4-Ip4Scale200K-mrr.64B-1t1c-ethip4-ip4scale200k-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4-Ip4Scale2M-mrr.64B-1t1c-ethip4-ip4scale2m-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-dnv-x553-64b-2t2c-ip4routing-base-scale-ixgbe"
+      output-file-name: "2n-dnv-x553-64b-2t2c-ip4-ixgbe"
+      data: "plot-performance-trending-vpp-2n-dnv"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Dot1Q-Ip4Base-mrr.64B-2t2c-dot1q-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4-Ip4Base-mrr.64B-2t2c-ethip4-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4-Ip4Scale20K-mrr.64B-2t2c-ethip4-ip4scale20k-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4-Ip4Scale200K-mrr.64B-2t2c-ethip4-ip4scale200k-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4-Ip4Scale2M-mrr.64B-2t2c-ethip4-ip4scale2m-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-dnv-x553-64b-4t4c-ip4routing-base-scale-ixgbe"
+      output-file-name: "2n-dnv-x553-64b-4t4c-ip4-ixgbe"
+      data: "plot-performance-trending-vpp-2n-dnv"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Dot1Q-Ip4Base-mrr.64B-4t4c-dot1q-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4-Ip4Base-mrr.64B-4t4c-ethip4-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4-Ip4Scale20K-mrr.64B-4t4c-ethip4-ip4scale20k-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4-Ip4Scale200K-mrr.64B-4t4c-ethip4-ip4scale200k-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4-Ip4Scale2M-mrr.64B-4t4c-ethip4-ip4scale2m-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-skx-x710-64b-2t1c-ip4routing-base-scale-avf-dpdk"
+      output-file-name: "2n-skx-x710-64b-2t1c-ip4-avf-dpdk"
+      data: "plot-performance-trending-vpp-2n-skx"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Base-mrr.64B-2t1c-avf-ethip4-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-mrr.64B-2t1c-avf-ethip4-ip4scale2m-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-Rnd-Mrr.64B-2t1c-avf-ethip4-ip4scale2m-rnd-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Base-mrr.64B-2t1c-ethip4-ip4base-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C IPv4 Tunnels 64B MRR Trending 3n-skx"
-      output-file-name: "ip4-tunnels-4t2c-x710-3n-skx"
-      data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-X710' and '64B' and 'ENCAP' and 'MRR' and '4T2C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
-      parameters:
-      - "result"
+    - title: "2n-skx-x710-64b-4t2c-ip4routing-base-scale-avf-dpdk"
+      output-file-name: "2n-skx-x710-64b-4t2c-ip4-avf-dpdk"
+      data: "plot-performance-trending-vpp-2n-skx"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Base-mrr.64B-4t2c-avf-ethip4-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-mrr.64B-4t2c-avf-ethip4-ip4scale2m-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-Rnd-Mrr.64B-4t2c-avf-ethip4-ip4scale2m-rnd-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Base-mrr.64B-4t2c-ethip4-ip4base-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C IPv4 Tunnels 64B MRR Trending 3n-skx"
-      output-file-name: "ip4-tunnels-8t4c-x710-3n-skx"
-      data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-X710' and '64B' and 'ENCAP' and 'MRR' and '8T4C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
-      parameters:
-      - "result"
+    - title: "2n-skx-x710-64b-8t4c-ip4routing-base-scale-avf-dpdk"
+      output-file-name: "2n-skx-x710-64b-8t4c-ip4-avf-dpdk"
+      data: "plot-performance-trending-vpp-2n-skx"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Base-mrr.64B-8t4c-avf-ethip4-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-mrr.64B-8t4c-avf-ethip4-ip4scale2m-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-Rnd-Mrr.64B-8t4c-avf-ethip4-ip4scale2m-rnd-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Base-mrr.64B-8t4c-ethip4-ip4base-mrr"
       layout: "plot-cpta"
 
-# IPv4 Tunnels - xxv710
-
-    - title: "VPP 2T1C IPv4 Tunnels 64B MRR Trending 3n-skx"
-      output-file-name: "ip4-tunnels-2t1c-xxv710-3n-skx"
-      data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and '64B' and 'ENCAP' and 'MRR' and '2T1C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
-      parameters:
-      - "result"
+    - title: "2n-skx-xxv710-64b-2t1c-ip4routing-base-scale-avf"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-ip4-base-scale-avf"
+      data: "plot-performance-trending-vpp-2n-skx"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-Ip4Base-Mrr.64B-2t1c-avf-dot1q-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-mrr.64B-2t1c-avf-ethip4-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale20K-mrr.64B-2t1c-avf-ethip4-ip4scale20k-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale200K-mrr.64B-2t1c-avf-ethip4-ip4scale200k-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale2M-mrr.64B-2t1c-avf-ethip4-ip4scale2m-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C IPv4 Tunnels 64B MRR Trending 3n-skx"
-      output-file-name: "ip4-tunnels-4t2c-xxv710-3n-skx"
-      data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and '64B' and 'ENCAP' and 'MRR' and '4T2C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
-      parameters:
-      - "result"
+    - title: "2n-skx-xxv710-64b-4t2c-ip4routing-base-scale-avf"
+      output-file-name: "2n-skx-xxv710-64b-4t2c-ip4-base-scale-avf"
+      data: "plot-performance-trending-vpp-2n-skx"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-Ip4Base-Mrr.64B-4t2c-avf-dot1q-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-mrr.64B-4t2c-avf-ethip4-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale20K-mrr.64B-4t2c-avf-ethip4-ip4scale20k-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale200K-mrr.64B-4t2c-avf-ethip4-ip4scale200k-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale2M-mrr.64B-4t2c-avf-ethip4-ip4scale2m-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C IPv4 Tunnels 64B MRR Trending 3n-skx"
-      output-file-name: "ip4-tunnels-8t4c-xxv710-3n-skx"
-      data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and '64B' and 'ENCAP' and 'MRR' and '8T4C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
-      parameters:
-      - "result"
+    - title: "2n-skx-xxv710-64b-8t4c-ip4routing-base-scale-avf"
+      output-file-name: "2n-skx-xxv710-64b-8t4c-ip4-base-scale-avf"
+      data: "plot-performance-trending-vpp-2n-skx"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-Ip4Base-Mrr.64B-8t4c-avf-dot1q-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-mrr.64B-8t4c-avf-ethip4-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale20K-mrr.64B-8t4c-avf-ethip4-ip4scale20k-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale200K-mrr.64B-8t4c-avf-ethip4-ip4scale200k-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale2M-mrr.64B-8t4c-avf-ethip4-ip4scale2m-mrr"
       layout: "plot-cpta"
 
-# IPv6 - x710
-
-    - title: "VPP 2T1C IPv6 78B MRR Trending 3n-skx"
-      output-file-name: "ip6-2t1c-x710-3n-skx"
-      data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '2T1C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
-      parameters:
-      - "result"
+    - title: "2n-skx-xxv710-64b-2t1c-ip4routing-base-scale-avf-rnd"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-ip4-base-scale-avf-rnd"
+      data: "plot-performance-trending-vpp-2n-skx"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale20K-Rnd-Mrr.64B-2t1c-avf-ethip4-ip4scale20k-rnd-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale200K-Rnd-Mrr.64B-2t1c-avf-ethip4-ip4scale200k-rnd-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale2M-Rnd-Mrr.64B-2t1c-avf-ethip4-ip4scale2m-rnd-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C IPv6 78B MRR Trending 3n-skx"
-      output-file-name: "ip6-4t2c-x710-3n-skx"
-      data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '4T2C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
-      parameters:
-      - "result"
+    - title: "2n-skx-xxv710-64b-4t2c-ip4routing-base-scale-avf-rnd"
+      output-file-name: "2n-skx-xxv710-64b-4t2c-ip4-base-scale-avf-rnd"
+      data: "plot-performance-trending-vpp-2n-skx"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale20K-Rnd-Mrr.64B-4t2c-avf-ethip4-ip4scale20k-rnd-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale200K-Rnd-Mrr.64B-4t2c-avf-ethip4-ip4scale200k-rnd-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale2M-Rnd-Mrr.64B-4t2c-avf-ethip4-ip4scale2m-rnd-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C IPv6 78B MRR Trending 3n-skx"
-      output-file-name: "ip6-8t4c-x710-3n-skx"
-      data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '8T4C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
-      parameters:
-      - "result"
+    - title: "2n-skx-xxv710-64b-8t4c-ip4routing-base-scale-avf-rnd"
+      output-file-name: "2n-skx-xxv710-64b-8t4c-ip4-base-scale-avf-rnd"
+      data: "plot-performance-trending-vpp-2n-skx"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale20K-Rnd-Mrr.64B-8t4c-avf-ethip4-ip4scale20k-rnd-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale200K-Rnd-Mrr.64B-8t4c-avf-ethip4-ip4scale200k-rnd-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale2M-Rnd-Mrr.64B-8t4c-avf-ethip4-ip4scale2m-rnd-mrr"
       layout: "plot-cpta"
 
-# IPv6 - xxv710
-
-    - title: "VPP 2T1C IPv6 78B MRR Trending 3n-skx"
-      output-file-name: "ip6-2t1c-xxv710-3n-skx"
-      data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '2T1C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
-      parameters:
-      - "result"
+    - title: "2n-skx-xxv710-64b-2t1c-ip4routing-base-scale-dpdk"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-ip4-base-scale-dpdk"
+      data: "plot-performance-trending-vpp-2n-skx"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Dot1Q-Ip4Base-mrr.64B-2t1c-dot1q-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-mrr.64B-2t1c-ethip4-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale20K-mrr.64B-2t1c-ethip4-ip4scale20k-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale200K-mrr.64B-2t1c-ethip4-ip4scale200k-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale2M-mrr.64B-2t1c-ethip4-ip4scale2m-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C IPv6 78B MRR Trending 3n-skx"
-      output-file-name: "ip6-4t2c-xxv710-3n-skx"
-      data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '4T2C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
-      parameters:
-      - "result"
+    - title: "2n-skx-xxv710-64b-4t2c-ip4routing-base-scale-dpdk"
+      output-file-name: "2n-skx-xxv710-64b-4t2c-ip4-base-scale-dpdk"
+      data: "plot-performance-trending-vpp-2n-skx"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Dot1Q-Ip4Base-mrr.64B-4t2c-dot1q-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-mrr.64B-4t2c-ethip4-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale20K-mrr.64B-4t2c-ethip4-ip4scale20k-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale200K-mrr.64B-4t2c-ethip4-ip4scale200k-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale2M-mrr.64B-4t2c-ethip4-ip4scale2m-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C IPv6 78B MRR Trending 3n-skx"
-      output-file-name: "ip6-8t4c-xxv710-3n-skx"
-      data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '8T4C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
-      parameters:
-      - "result"
+    - title: "2n-skx-xxv710-64b-8t4c-ip4routing-base-scale-dpdk"
+      output-file-name: "2n-skx-xxv710-64b-8t4c-ip4-base-scale-dpdk"
+      data: "plot-performance-trending-vpp-2n-skx"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Dot1Q-Ip4Base-mrr.64B-8t4c-dot1q-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-mrr.64B-8t4c-ethip4-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale20K-mrr.64B-8t4c-ethip4-ip4scale20k-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale200K-mrr.64B-8t4c-ethip4-ip4scale200k-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale2M-mrr.64B-8t4c-ethip4-ip4scale2m-mrr"
       layout: "plot-cpta"
 
-# Container memif - x710, 64B
+    - title: "2n-skx-xxv710-64b-2t1c-ip4routing-base-scale-dpdk-rnd"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-ip4-base-scale-dpdk-rnd"
+      data: "plot-performance-trending-vpp-2n-skx"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale20K-Rnd-Mrr.64B-2t1c-ethip4-ip4scale20k-rnd-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale200K-Rnd-Mrr.64B-2t1c-ethip4-ip4scale200k-rnd-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale2M-Rnd-Mrr.64B-2t1c-ethip4-ip4scale2m-rnd-mrr"
+      layout: "plot-cpta"
 
-    - title: "VPP 2T1C L2 Container memif 64B MRR Trending 3n-skx"
-      output-file-name: "container-memif-l2-2t1c-x710-3n-skx"
-      data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'BASE' and '2T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
-      parameters:
-      - "result"
+    - title: "2n-skx-xxv710-64b-4t2c-ip4routing-base-scale-dpdk-rnd"
+      output-file-name: "2n-skx-xxv710-64b-4t2c-ip4-base-scale-dpdk-rnd"
+      data: "plot-performance-trending-vpp-2n-skx"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale20K-Rnd-Mrr.64B-4t2c-ethip4-ip4scale20k-rnd-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale200K-Rnd-Mrr.64B-4t2c-ethip4-ip4scale200k-rnd-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale2M-Rnd-Mrr.64B-4t2c-ethip4-ip4scale2m-rnd-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C L2 Container memif 64B MRR Trending 3n-skx"
-      output-file-name: "container-memif-l2-4t2c-x710-3n-skx"
-      data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'BASE' and '4T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
-      parameters:
-      - "result"
+    - title: "2n-skx-xxv710-64b-8t4c-ip4routing-base-scale-dpdk-rnd"
+      output-file-name: "2n-skx-xxv710-64b-8t4c-ip4-base-scale-dpdk-rnd"
+      data: "plot-performance-trending-vpp-2n-skx"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale20K-Rnd-Mrr.64B-8t4c-ethip4-ip4scale20k-rnd-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale200K-Rnd-Mrr.64B-8t4c-ethip4-ip4scale200k-rnd-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale2M-Rnd-Mrr.64B-8t4c-ethip4-ip4scale2m-rnd-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C L2 Container memif 64B MRR Trending 3n-skx"
-      output-file-name: "container-memif-l2-8t4c-x710-3n-skx"
-      data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'BASE' and '8T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
-      parameters:
-      - "result"
+    - title: "2n-skx-xxv710-64b-2t1c-features-ip4routing-base-avf"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-ip4-features-avf"
+      data: "plot-performance-trending-vpp-2n-skx"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-mrr.64B-2t1c-avf-ethip4udp-ip4base-iacl50sf-10kflows-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-mrr.64B-2t1c-avf-ethip4udp-ip4base-iacl50sl-10kflows-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-mrr.64B-2t1c-avf-ethip4udp-ip4base-oacl50sf-10kflows-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-mrr.64B-2t1c-avf-ethip4udp-ip4base-oacl50sl-10kflows-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1-p1-s1-mrr.64B-2t1c-avf-ethip4udp-nat44det-h1-p1-s1-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1024-p63-s64512-Mrr.64B-2t1c-avf-ethip4udp-nat44det-h1024-p63-s64512-mrr"
       layout: "plot-cpta"
 
-# Container memif - xxv710, 64B
+    - title: "2n-skx-xxv710-64b-4t2c-features-ip4routing-base-avf"
+      output-file-name: "2n-skx-xxv710-64b-4t2c-ip4-features-avf"
+      data: "plot-performance-trending-vpp-2n-skx"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-mrr.64B-4t2c-avf-ethip4udp-ip4base-iacl50sf-10kflows-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-mrr.64B-4t2c-avf-ethip4udp-ip4base-iacl50sl-10kflows-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-mrr.64B-4t2c-avf-ethip4udp-ip4base-oacl50sf-10kflows-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-mrr.64B-4t2c-avf-ethip4udp-ip4base-oacl50sl-10kflows-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1-p1-s1-mrr.64B-4t2c-avf-ethip4udp-nat44det-h1-p1-s1-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1024-p63-s64512-Mrr.64B-4t2c-avf-ethip4udp-nat44det-h1024-p63-s64512-mrr"
+      layout: "plot-cpta"
 
-    - title: "VPP 2T1C L2 Container memif 64B MRR Trending 3n-skx"
-      output-file-name: "container-memif-l2-2t1c-xxv710-3n-skx"
-      data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'BASE' and '2T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
-      parameters:
-      - "result"
+    - title: "2n-skx-xxv710-64b-8t4c-features-ip4routing-base-avf"
+      output-file-name: "2n-skx-xxv710-64b-8t4c-ip4-features-avf"
+      data: "plot-performance-trending-vpp-2n-skx"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-mrr.64B-8t4c-avf-ethip4udp-ip4base-iacl50sf-10kflows-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-mrr.64B-8t4c-avf-ethip4udp-ip4base-iacl50sl-10kflows-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-mrr.64B-8t4c-avf-ethip4udp-ip4base-oacl50sf-10kflows-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-mrr.64B-8t4c-avf-ethip4udp-ip4base-oacl50sl-10kflows-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1-p1-s1-mrr.64B-8t4c-avf-ethip4udp-nat44det-h1-p1-s1-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1024-p63-s64512-Mrr.64B-8t4c-avf-ethip4udp-nat44det-h1024-p63-s64512-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C L2 Container memif 64B MRR Trending 3n-skx"
-      output-file-name: "container-memif-l2-4t2c-xxv710-3n-skx"
-      data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'BASE' and '4T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
-      parameters:
-      - "result"
+    - title: "2n-skx-xxv710-64b-2t1c-nat44det-ip4routing-stl-bidir-avf"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-nat44det-ip4routing-stl-bidir-avf"
+      data: "plot-performance-trending-vpp-2n-skx"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h1024-p63-s64512-mrr.64b-2t1c-avf-ethip4udp-nat44det-h1024-p63-s64512-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h4096-p63-s258048-mrr.64b-2t1c-avf-ethip4udp-nat44det-h4096-p63-s258048-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h16384-p63-s1032192-mrr.64b-2t1c-avf-ethip4udp-nat44det-h16384-p63-s1032192-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h65536-p63-s4128758-mrr.64b-2t1c-avf-ethip4udp-nat44det-h65536-p63-s4128758-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h262144-p63-s16515072-mrr.64b-2t1c-avf-ethip4udp-nat44det-h262144-p63-s16515072-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C L2 Container memif 64B MRR Trending 3n-skx"
-      output-file-name: "container-memif-l2-8t4c-xxv710-3n-skx"
-      data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'BASE' and '8T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
-      parameters:
-      - "result"
+    - title: "2n-skx-xxv710-64b-4t2c-nat44det-ip4routing-stl-bidir-avf"
+      output-file-name: "2n-skx-xxv710-64b-4t2c-nat44det-ip4routing-stl-bidir-avf"
+      data: "plot-performance-trending-vpp-2n-skx"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h1024-p63-s64512-mrr.64b-4t2c-avf-ethip4udp-nat44det-h1024-p63-s64512-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h4096-p63-s258048-mrr.64b-4t2c-avf-ethip4udp-nat44det-h4096-p63-s258048-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h16384-p63-s1032192-mrr.64b-4t2c-avf-ethip4udp-nat44det-h16384-p63-s1032192-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h65536-p63-s4128758-mrr.64b-4t2c-avf-ethip4udp-nat44det-h65536-p63-s4128758-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h262144-p63-s16515072-mrr.64b-4t2c-avf-ethip4udp-nat44det-h262144-p63-s16515072-mrr"
       layout: "plot-cpta"
 
-# Container memif - x710, IMIX
+    - title: "2n-skx-xxv710-64b-8t4c-nat44det-ip4routing-stl-bidir-avf"
+      output-file-name: "2n-skx-xxv710-64b-8t4c-nat44det-ip4routing-stl-bidir-avf"
+      data: "plot-performance-trending-vpp-2n-skx"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h1024-p63-s64512-mrr.64b-8t4c-avf-ethip4udp-nat44det-h1024-p63-s64512-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h4096-p63-s258048-mrr.64b-8t4c-avf-ethip4udp-nat44det-h4096-p63-s258048-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h16384-p63-s1032192-mrr.64b-8t4c-avf-ethip4udp-nat44det-h16384-p63-s1032192-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h65536-p63-s4128758-mrr.64b-8t4c-avf-ethip4udp-nat44det-h65536-p63-s4128758-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h262144-p63-s16515072-mrr.64b-8t4c-avf-ethip4udp-nat44det-h262144-p63-s16515072-mrr"
+      layout: "plot-cpta"
 
-    - title: "VPP 2T1C L2 Container memif IMIX MRR Trending 3n-skx"
-      output-file-name: "container-memif-imix-l2-2t1c-x710-3n-skx"
-      data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and 'IMIX' and 'BASE' and '2T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'DOT1Q'"
-      parameters:
-      - "result"
+    - title: "2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf"
+      data: "plot-performance-trending-vpp-2n-skx"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-mrr.64b-2t1c-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-udir-mrr.64b-2t1c-avf-ethip4udp-nat44ed-h4096-p63-s258048-udir-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-udir-mrr.64b-2t1c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-udir-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-udir-mrr.64b-2t1c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-udir-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-udir-mrr.64b-2t1c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-udir-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C L2 Container memif IMIX MRR Trending 3n-skx"
-      output-file-name: "container-memif-imix-l2-4t2c-x710-3n-skx"
-      data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and 'IMIX' and 'BASE' and '4T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'DOT1Q'"
-      parameters:
-      - "result"
+    - title: "2n-skx-xxv710-64b-4t2c-nat44ed-ip4routing-stl-unidir-avf"
+      output-file-name: "2n-skx-xxv710-64b-4t2c-nat44ed-ip4routing-stl-unidir-avf"
+      data: "plot-performance-trending-vpp-2n-skx"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-mrr.64b-4t2c-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-udir-mrr.64b-4t2c-avf-ethip4udp-nat44ed-h4096-p63-s258048-udir-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-udir-mrr.64b-4t2c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-udir-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-udir-mrr.64b-4t2c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-udir-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-udir-mrr.64b-4t2c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-udir-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C L2 Container memif IMIX MRR Trending 3n-skx"
-      output-file-name: "container-memif-imix-l2-8t4c-x710-3n-skx"
-      data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and 'IMIX' and 'BASE' and '8T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'DOT1Q'"
-      parameters:
-      - "result"
+    - title: "2n-skx-xxv710-64b-8t4c-nat44ed-ip4routing-stl-unidir-avf"
+      output-file-name: "2n-skx-xxv710-64b-8t4c-nat44ed-ip4routing-stl-unidir-avf"
+      data: "plot-performance-trending-vpp-2n-skx"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-mrr.64b-8t4c-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-udir-mrr.64b-8t4c-avf-ethip4udp-nat44ed-h4096-p63-s258048-udir-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-udir-mrr.64b-8t4c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-udir-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-udir-mrr.64b-8t4c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-udir-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-udir-mrr.64b-8t4c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-udir-mrr"
       layout: "plot-cpta"
 
-# Container memif - xxv710, IMIX
+    - title: "2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf"
+      data: "plot-performance-trending-vpp-2n-skx"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-mrr.64b-2t1c-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-cps-mrr.64b-2t1c-avf-ethip4udp-nat44ed-h4096-p63-s258048-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-cps-mrr.64b-2t1c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-cps-mrr.64b-2t1c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-cps-mrr.64b-2t1c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h1024-p63-s64512-cps-mrr.64b-2t1c-avf-ethip4udp-ip4base-h1024-p63-s64512-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h4096-p63-s258048-cps-mrr.64b-2t1c-avf-ethip4udp-ip4base-h4096-p63-s258048-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h16384-p63-s1032192-cps-mrr.64b-2t1c-avf-ethip4udp-ip4base-h16384-p63-s1032192-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h65536-p63-s4128768-cps-mrr.64b-2t1c-avf-ethip4udp-ip4base-h65536-p63-s4128768-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h262144-p63-s16515072-cps-mrr.64b-2t1c-avf-ethip4udp-ip4base-h262144-p63-s16515072-cps-mrr"
+      layout: "plot-cpta-cps"
+
+    - title: "2n-skx-xxv710-64b-4t2c-nat44ed-ip4routing-udp-stf-cps-avf"
+      output-file-name: "2n-skx-xxv710-64b-4t2c-nat44ed-ip4routing-udp-stf-cps-avf"
+      data: "plot-performance-trending-vpp-2n-skx"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-mrr.64b-4t2c-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-cps-mrr.64b-4t2c-avf-ethip4udp-nat44ed-h4096-p63-s258048-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-cps-mrr.64b-4t2c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-cps-mrr.64b-4t2c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-cps-mrr.64b-4t2c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h1024-p63-s64512-cps-mrr.64b-4t2c-avf-ethip4udp-ip4base-h1024-p63-s64512-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h4096-p63-s258048-cps-mrr.64b-4t2c-avf-ethip4udp-ip4base-h4096-p63-s258048-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h16384-p63-s1032192-cps-mrr.64b-4t2c-avf-ethip4udp-ip4base-h16384-p63-s1032192-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h65536-p63-s4128768-cps-mrr.64b-4t2c-avf-ethip4udp-ip4base-h65536-p63-s4128768-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h262144-p63-s16515072-cps-mrr.64b-4t2c-avf-ethip4udp-ip4base-h262144-p63-s16515072-cps-mrr"
+      layout: "plot-cpta-cps"
+
+    - title: "2n-skx-xxv710-64b-8t4c-nat44ed-ip4routing-udp-stf-cps-avf"
+      output-file-name: "2n-skx-xxv710-64b-8t4c-nat44ed-ip4routing-udp-stf-cps-avf"
+      data: "plot-performance-trending-vpp-2n-skx"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-mrr.64b-8t4c-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-cps-mrr.64b-8t4c-avf-ethip4udp-nat44ed-h4096-p63-s258048-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-cps-mrr.64b-8t4c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-cps-mrr.64b-8t4c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-cps-mrr.64b-8t4c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h1024-p63-s64512-cps-mrr.64b-8t4c-avf-ethip4udp-ip4base-h1024-p63-s64512-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h4096-p63-s258048-cps-mrr.64b-8t4c-avf-ethip4udp-ip4base-h4096-p63-s258048-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h16384-p63-s1032192-cps-mrr.64b-8t4c-avf-ethip4udp-ip4base-h16384-p63-s1032192-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h65536-p63-s4128768-cps-mrr.64b-8t4c-avf-ethip4udp-ip4base-h65536-p63-s4128768-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h262144-p63-s16515072-cps-mrr.64b-8t4c-avf-ethip4udp-ip4base-h262144-p63-s16515072-cps-mrr"
+      layout: "plot-cpta-cps"
+
+    - title: "2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-pps-avf"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-pps-avf"
+      data: "plot-performance-trending-vpp-2n-skx"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-mrr.64b-2t1c-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-pps-mrr.64b-2t1c-avf-ethip4udp-nat44ed-h4096-p63-s258048-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-pps-mrr.64b-2t1c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-pps-mrr.64b-2t1c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-pps-mrr.64b-2t1c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h1024-p63-s64512-pps-mrr.64b-2t1c-avf-ethip4udp-ip4base-h1024-p63-s64512-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h4096-p63-s258048-pps-mrr.64b-2t1c-avf-ethip4udp-ip4base-h4096-p63-s258048-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h16384-p63-s1032192-pps-mrr.64b-2t1c-avf-ethip4udp-ip4base-h16384-p63-s1032192-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h65536-p63-s4128768-pps-mrr.64b-2t1c-avf-ethip4udp-ip4base-h65536-p63-s4128768-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h262144-p63-s16515072-pps-mrr.64b-2t1c-avf-ethip4udp-ip4base-h262144-p63-s16515072-pps-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-skx-xxv710-64b-4t2c-nat44ed-ip4routing-udp-stf-pps-avf"
+      output-file-name: "2n-skx-xxv710-64b-4t2c-nat44ed-ip4routing-udp-stf-pps-avf"
+      data: "plot-performance-trending-vpp-2n-skx"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-mrr.64b-4t2c-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-pps-mrr.64b-4t2c-avf-ethip4udp-nat44ed-h4096-p63-s258048-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-pps-mrr.64b-4t2c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-pps-mrr.64b-4t2c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-pps-mrr.64b-4t2c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h1024-p63-s64512-pps-mrr.64b-4t2c-avf-ethip4udp-ip4base-h1024-p63-s64512-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h4096-p63-s258048-pps-mrr.64b-4t2c-avf-ethip4udp-ip4base-h4096-p63-s258048-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h16384-p63-s1032192-pps-mrr.64b-4t2c-avf-ethip4udp-ip4base-h16384-p63-s1032192-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h65536-p63-s4128768-pps-mrr.64b-4t2c-avf-ethip4udp-ip4base-h65536-p63-s4128768-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h262144-p63-s16515072-pps-mrr.64b-4t2c-avf-ethip4udp-ip4base-h262144-p63-s16515072-pps-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-skx-xxv710-64b-8t4c-nat44ed-ip4routing-udp-stf-pps-avf"
+      output-file-name: "2n-skx-xxv710-64b-8t4c-nat44ed-ip4routing-udp-stf-pps-avf"
+      data: "plot-performance-trending-vpp-2n-skx"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-mrr.64b-8t4c-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-pps-mrr.64b-8t4c-avf-ethip4udp-nat44ed-h4096-p63-s258048-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-pps-mrr.64b-8t4c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-pps-mrr.64b-8t4c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-pps-mrr.64b-8t4c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h1024-p63-s64512-pps-mrr.64b-8t4c-avf-ethip4udp-ip4base-h1024-p63-s64512-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h4096-p63-s258048-pps-mrr.64b-8t4c-avf-ethip4udp-ip4base-h4096-p63-s258048-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h16384-p63-s1032192-pps-mrr.64b-8t4c-avf-ethip4udp-ip4base-h16384-p63-s1032192-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h65536-p63-s4128768-pps-mrr.64b-8t4c-avf-ethip4udp-ip4base-h65536-p63-s4128768-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h262144-p63-s16515072-pps-mrr.64b-8t4c-avf-ethip4udp-ip4base-h262144-p63-s16515072-pps-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf"
+      data: "plot-performance-trending-vpp-2n-skx"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-mrr.64b-2t1c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h4096-p63-s258048-cps-mrr.64b-2t1c-avf-ethip4tcp-nat44ed-h4096-p63-s258048-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-mrr.64b-2t1c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-mrr.64b-2t1c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-mrr.64b-2t1c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h1024-p63-s64512-cps-mrr.64b-2t1c-avf-ethip4tcp-ip4base-h1024-p63-s64512-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h4096-p63-s258048-cps-mrr.64b-2t1c-avf-ethip4tcp-ip4base-h4096-p63-s258048-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h16384-p63-s1032192-cps-mrr.64b-2t1c-avf-ethip4tcp-ip4base-h16384-p63-s1032192-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h65536-p63-s4128768-cps-mrr.64b-2t1c-avf-ethip4tcp-ip4base-h65536-p63-s4128768-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h262144-p63-s16515072-cps-mrr.64b-2t1c-avf-ethip4tcp-ip4base-h262144-p63-s16515072-cps-mrr"
+      layout: "plot-cpta-cps"
+
+    - title: "2n-skx-xxv710-64b-4t2c-nat44ed-ip4routing-tcp-stf-cps-avf"
+      output-file-name: "2n-skx-xxv710-64b-4t2c-nat44ed-ip4routing-tcp-stf-cps-avf"
+      data: "plot-performance-trending-vpp-2n-skx"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-mrr.64b-4t2c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h4096-p63-s258048-cps-mrr.64b-4t2c-avf-ethip4tcp-nat44ed-h4096-p63-s258048-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-mrr.64b-4t2c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-mrr.64b-4t2c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-mrr.64b-4t2c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h1024-p63-s64512-cps-mrr.64b-4t2c-avf-ethip4tcp-ip4base-h1024-p63-s64512-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h4096-p63-s258048-cps-mrr.64b-4t2c-avf-ethip4tcp-ip4base-h4096-p63-s258048-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h16384-p63-s1032192-cps-mrr.64b-4t2c-avf-ethip4tcp-ip4base-h16384-p63-s1032192-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h65536-p63-s4128768-cps-mrr.64b-4t2c-avf-ethip4tcp-ip4base-h65536-p63-s4128768-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h262144-p63-s16515072-cps-mrr.64b-4t2c-avf-ethip4tcp-ip4base-h262144-p63-s16515072-cps-mrr"
+      layout: "plot-cpta-cps"
+
+    - title: "2n-skx-xxv710-64b-8t4c-nat44ed-ip4routing-tcp-stf-cps-avf"
+      output-file-name: "2n-skx-xxv710-64b-8t4c-nat44ed-ip4routing-tcp-stf-cps-avf"
+      data: "plot-performance-trending-vpp-2n-skx"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-mrr.64b-8t4c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h4096-p63-s258048-cps-mrr.64b-8t4c-avf-ethip4tcp-nat44ed-h4096-p63-s258048-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-mrr.64b-8t4c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-mrr.64b-8t4c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-mrr.64b-8t4c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h1024-p63-s64512-cps-mrr.64b-8t4c-avf-ethip4tcp-ip4base-h1024-p63-s64512-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h4096-p63-s258048-cps-mrr.64b-8t4c-avf-ethip4tcp-ip4base-h4096-p63-s258048-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h16384-p63-s1032192-cps-mrr.64b-8t4c-avf-ethip4tcp-ip4base-h16384-p63-s1032192-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h65536-p63-s4128768-cps-mrr.64b-8t4c-avf-ethip4tcp-ip4base-h65536-p63-s4128768-cps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h262144-p63-s16515072-cps-mrr.64b-8t4c-avf-ethip4tcp-ip4base-h262144-p63-s16515072-cps-mrr"
+      layout: "plot-cpta-cps"
+
+    - title: "2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-pps-avf"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-pps-avf"
+      data: "plot-performance-trending-vpp-2n-skx"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-mrr.64b-2t1c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h4096-p63-s258048-pps-mrr.64b-2t1c-avf-ethip4tcp-nat44ed-h4096-p63-s258048-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-mrr.64b-2t1c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-mrr.64b-2t1c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-mrr.64b-2t1c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h1024-p63-s64512-pps-mrr.64b-2t1c-avf-ethip4tcp-ip4base-h1024-p63-s64512-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h4096-p63-s258048-pps-mrr.64b-2t1c-avf-ethip4tcp-ip4base-h4096-p63-s258048-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h16384-p63-s1032192-pps-mrr.64b-2t1c-avf-ethip4tcp-ip4base-h16384-p63-s1032192-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h65536-p63-s4128768-pps-mrr.64b-2t1c-avf-ethip4tcp-ip4base-h65536-p63-s4128768-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h262144-p63-s16515072-pps-mrr.64b-2t1c-avf-ethip4tcp-ip4base-h262144-p63-s16515072-pps-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-skx-xxv710-64b-4t2c-nat44ed-ip4routing-tcp-stf-pps-avf-ndr"
+      output-file-name: "2n-skx-xxv710-64b-4t2c-nat44ed-ip4routing-tcp-stf-pps-avf-ndr"
+      data: "plot-performance-trending-vpp-2n-skx"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-mrr.64b-4t2c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h4096-p63-s258048-pps-mrr.64b-4t2c-avf-ethip4tcp-nat44ed-h4096-p63-s258048-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-mrr.64b-4t2c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-mrr.64b-4t2c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-mrr.64b-4t2c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h1024-p63-s64512-pps-mrr.64b-4t2c-avf-ethip4tcp-ip4base-h1024-p63-s64512-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h4096-p63-s258048-pps-mrr.64b-4t2c-avf-ethip4tcp-ip4base-h4096-p63-s258048-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h16384-p63-s1032192-pps-mrr.64b-4t2c-avf-ethip4tcp-ip4base-h16384-p63-s1032192-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h65536-p63-s4128768-pps-mrr.64b-4t2c-avf-ethip4tcp-ip4base-h65536-p63-s4128768-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h262144-p63-s16515072-pps-mrr.64b-4t2c-avf-ethip4tcp-ip4base-h262144-p63-s16515072-pps-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-skx-xxv710-64b-8t4c-nat44ed-ip4routing-tcp-stf-pps-avf-ndr"
+      output-file-name: "2n-skx-xxv710-64b-8t4c-nat44ed-ip4routing-tcp-stf-pps-avf-ndr"
+      data: "plot-performance-trending-vpp-2n-skx"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-mrr.64b-8t4c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h4096-p63-s258048-pps-mrr.64b-8t4c-avf-ethip4tcp-nat44ed-h4096-p63-s258048-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-mrr.64b-8t4c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-mrr.64b-8t4c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-mrr.64b-8t4c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h1024-p63-s64512-pps-mrr.64b-8t4c-avf-ethip4tcp-ip4base-h1024-p63-s64512-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h4096-p63-s258048-pps-mrr.64b-8t4c-avf-ethip4tcp-ip4base-h4096-p63-s258048-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h16384-p63-s1032192-pps-mrr.64b-8t4c-avf-ethip4tcp-ip4base-h16384-p63-s1032192-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h65536-p63-s4128768-pps-mrr.64b-8t4c-avf-ethip4tcp-ip4base-h65536-p63-s4128768-pps-mrr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h262144-p63-s16515072-pps-mrr.64b-8t4c-avf-ethip4tcp-ip4base-h262144-p63-s16515072-pps-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-skx-xxv710-64b-2t1c-features-ip4routing-base-dpdk"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-ip4-features-dpdk"
+      data: "plot-performance-trending-vpp-2n-skx"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-mrr.64B-2t1c-ethip4-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-ethip4udp-nat44det-h1-p1-s1-mrr.64B-2t1c-ethip4udp-nat44det-h1-p1-s1-mrr"
+      layout: "plot-cpta"
 
-    - title: "VPP 2T1C L2 Container memif IMIX MRR Trending 3n-skx"
-      output-file-name: "container-memif-imix-l2-2t1c-xxv710-3n-skx"
-      data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and 'IMIX' and 'BASE' and '2T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
-      parameters:
-      - "result"
+    - title: "2n-skx-xxv710-64b-4t2c-features-ip4routing-base-dpdk"
+      output-file-name: "2n-skx-xxv710-64b-4t2c-ip4-features-dpdk"
+      data: "plot-performance-trending-vpp-2n-skx"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-mrr.64B-4t2c-ethip4-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-ethip4udp-nat44det-h1-p1-s1-mrr.64B-4t2c-ethip4udp-nat44det-h1-p1-s1-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C L2 Container memif IMIX MRR Trending 3n-skx"
-      output-file-name: "container-memif-imix-l2-4t2c-xxv710-3n-skx"
-      data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and 'IMIX' and 'BASE' and '4T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
-      parameters:
-      - "result"
+    - title: "2n-skx-xxv710-64b-8t4c-features-ip4routing-base-dpdk"
+      output-file-name: "2n-skx-xxv710-64b-8t4c-ip4-features-dpdk"
+      data: "plot-performance-trending-vpp-2n-skx"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-mrr.64B-8t4c-ethip4-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-ethip4udp-nat44det-h1-p1-s1-mrr.64B-8t4c-ethip4udp-nat44det-h1-p1-s1-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C L2 Container memif IMIX MRR Trending 3n-skx"
-      output-file-name: "container-memif-imix-l2-8t4c-xxv710-3n-skx"
-      data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and 'IMIX' and 'BASE' and '8T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
-      parameters:
-      - "result"
+    - title: "3n-dnv-x553-64b-1t1c-ip4routing-base-scale-ixgbe"
+      output-file-name: "3n-dnv-x553-64b-1t1c-ip4-base-scale-ixgbe"
+      data: "plot-performance-trending-vpp-3n-dnv"
+      include:
+        - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Dot1Q-Ip4Base-mrr.64B-1t1c-dot1q-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4-Ip4Base-mrr.64B-1t1c-ethip4-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4-Ip4Scale20K-mrr.64B-1t1c-ethip4-ip4scale20k-mrr"
+        - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4-Ip4Scale200K-mrr.64B-1t1c-ethip4-ip4scale200k-mrr"
+        - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4-Ip4Scale2M-mrr.64B-1t1c-ethip4-ip4scale2m-mrr"
       layout: "plot-cpta"
 
-# VM vhost - x710, ethip4, 64B
+    - title: "3n-dnv-x553-64b-2t2c-ip4routing-base-scale-ixgbe"
+      output-file-name: "3n-dnv-x553-64b-2t2c-ip4-base-scale-ixgbe"
+      data: "plot-performance-trending-vpp-3n-dnv"
+      include:
+        - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Dot1Q-Ip4Base-mrr.64B-2t2c-dot1q-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4-Ip4Base-mrr.64B-2t2c-ethip4-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4-Ip4Scale20K-mrr.64B-2t2c-ethip4-ip4scale20k-mrr"
+        - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4-Ip4Scale200K-mrr.64B-2t2c-ethip4-ip4scale200k-mrr"
+        - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4-Ip4Scale2M-mrr.64B-2t2c-ethip4-ip4scale2m-mrr"
+      layout: "plot-cpta"
 
-    - title: "VPP 2T1C VM vhost ethip4 64B MRR Trending 3n-skx"
-      output-file-name: "vm-vhost-ethip4-2t1c-x710-3n-skx"
-      data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
-      parameters:
-      - "result"
+    - title: "3n-dnv-x553-64b-4t4c-ip4routing-base-scale-ixgbe"
+      output-file-name: "3n-dnv-x553-64b-4t4c-ip4-base-scale-ixgbe"
+      data: "plot-performance-trending-vpp-3n-dnv"
+      include:
+        - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Dot1Q-Ip4Base-mrr.64B-4t4c-dot1q-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4-Ip4Base-mrr.64B-4t4c-ethip4-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4-Ip4Scale20K-mrr.64B-4t4c-ethip4-ip4scale20k-mrr"
+        - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4-Ip4Scale200K-mrr.64B-4t4c-ethip4-ip4scale200k-mrr"
+        - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4-Ip4Scale2M-mrr.64B-4t4c-ethip4-ip4scale2m-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C VM vhost ethip4 64B MRR Trending 3n-skx"
-      output-file-name: "vm-vhost-ethip4-4t2c-x710-3n-skx"
-      data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
-      parameters:
-      - "result"
+    - title: "3n-hsw-xl710-64b-1t1c-ip4routing-base-scale-dpdk"
+      output-file-name: "3n-hsw-xl710-64b-1t1c-ip4-base-scale-dpdk"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      include:
+        - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Dot1Q-Ip4Base-mrr.64B-1t1c-dot1q-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4-Ip4Base-mrr.64B-1t1c-ethip4-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4-Ip4Scale2M-mrr.64B-1t1c-ethip4-ip4scale2m-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C VM vhost ethip4 64B MRR Trending 3n-skx"
-      output-file-name: "vm-vhost-ethip4-8t4c-x710-3n-skx"
-      data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '8T4C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
-      parameters:
-      - "result"
+    - title: "3n-hsw-xl710-64b-2t2c-ip4routing-base-scale-dpdk"
+      output-file-name: "3n-hsw-xl710-64b-2t2c-ip4-base-scale-dpdk"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      include:
+        - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Dot1Q-Ip4Base-mrr.64B-2t2c-dot1q-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4-Ip4Base-mrr.64B-2t2c-ethip4-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4-Ip4Scale2M-mrr.64B-2t2c-ethip4-ip4scale2m-mrr"
       layout: "plot-cpta"
 
-# VM vhost - xxv710, ethip4, 64B
+    - title: "3n-hsw-xl710-64b-4t4c-ip4routing-base-scale-dpdk"
+      output-file-name: "3n-hsw-xl710-64b-4t4c-ip4-base-scale-dpdk"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      include:
+        - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Dot1Q-Ip4Base-mrr.64B-4t4c-dot1q-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4-Ip4Base-mrr.64B-4t4c-ethip4-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4-Ip4Scale2M-mrr.64B-4t4c-ethip4-ip4scale2m-mrr"
+      layout: "plot-cpta"
 
-    - title: "VPP 2T1C VM vhost ethip4 64B MRR Trending 3n-skx"
-      output-file-name: "vm-vhost-ethip4-2t1c-xxv710-3n-skx"
+    - title: "3n-skx-x710-64b-2t1c-ip4routing-base-scale-avf"
+      output-file-name: "3n-skx-x710-64b-2t1c-ip4-base-scale-avf"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '2T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
-      parameters:
-      - "result"
+      include:
+        - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Avf-Ethip4-Ip4Base-Mrr.64B-2t1c-avf-ethip4-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-Mrr.64B-2t1c-avf-ethip4-ip4scale2m-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C VM vhost ethip4 64B MRR Trending 3n-skx"
-      output-file-name: "vm-vhost-ethip4-4t2c-xxv710-3n-skx"
+    - title: "3n-skx-x710-64b-4t2c-ip4routing-base-scale-avf"
+      output-file-name: "3n-skx-x710-64b-4t2c-ip4-base-scale-avf"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '4T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
-      parameters:
-      - "result"
+      include:
+        - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Avf-Ethip4-Ip4Base-Mrr.64B-4t2c-avf-ethip4-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-Mrr.64B-4t2c-avf-ethip4-ip4scale2m-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C VM vhost ethip4 64B MRR Trending 3n-skx"
-      output-file-name: "vm-vhost-ethip4-8t4c-xxv710-3n-skx"
+    - title: "3n-skx-x710-64b-8t4c-ip4routing-base-scale-avf"
+      output-file-name: "3n-skx-x710-64b-8t4c-ip4-base-scale-avf"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '8T4C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
-      parameters:
-      - "result"
+      include:
+        - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Avf-Ethip4-Ip4Base-Mrr.64B-8t4c-avf-ethip4-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-Mrr.64B-8t4c-avf-ethip4-ip4scale2m-mrr"
       layout: "plot-cpta"
 
-# VM vhost - x710, ethip4, IMIX
-
-    - title: "VPP 2T1C VM vhost ethip4 IMIX MRR Trending 3n-skx"
-      output-file-name: "vm-vhost-imix-ethip4-2t1c-x710-3n-skx"
+    - title: "3n-skx-xxv710-64b-2t1c-ip4routing-base-scale-avf"
+      output-file-name: "3n-skx-xxv710-64b-2t1c-ip4-base-scale-avf"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '2T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
-      parameters:
-      - "result"
+      include:
+        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Dot1Q-Ip4Base-Mrr.64B-2t1c-avf-dot1q-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Mrr.64B-2t1c-avf-ethip4-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale20K-mrr.64B-2t1c-avf-ethip4-ip4scale20k-mrr"
+        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale200K-mrr.64B-2t1c-avf-ethip4-ip4scale200k-mrr"
+        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale2M-mrr.64B-2t1c-avf-ethip4-ip4scale2m-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C VM vhost ethip4 IMIX MRR Trending 3n-skx"
-      output-file-name: "vm-vhost-imix-ethip4-4t2c-x710-3n-skx"
+    - title: "3n-skx-xxv710-64b-4t2c-ip4routing-base-scale-avf"
+      output-file-name: "3n-skx-xxv710-64b-4t2c-ip4-base-scale-avf"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '4T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
-      parameters:
-      - "result"
+      include:
+        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Dot1Q-Ip4Base-Mrr.64B-4t2c-avf-dot1q-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Mrr.64B-4t2c-avf-ethip4-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale20K-mrr.64B-4t2c-avf-ethip4-ip4scale20k-mrr"
+        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale200K-mrr.64B-4t2c-avf-ethip4-ip4scale200k-mrr"
+        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale2M-mrr.64B-4t2c-avf-ethip4-ip4scale2m-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C VM vhost ethip4 IMIX MRR Trending 3n-skx"
-      output-file-name: "vm-vhost-imix-ethip4-8t4c-x710-3n-skx"
+    - title: "3n-skx-xxv710-64b-8t4c-ip4routing-base-scale-avf"
+      output-file-name: "3n-skx-xxv710-64b-8t4c-ip4-base-scale-avf"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '8T4C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
-      parameters:
-      - "result"
+      include:
+        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Dot1Q-Ip4Base-Mrr.64B-8t4c-avf-dot1q-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Mrr.64B-8t4c-avf-ethip4-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale20K-mrr.64B-8t4c-avf-ethip4-ip4scale20k-mrr"
+        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale200K-mrr.64B-8t4c-avf-ethip4-ip4scale200k-mrr"
+        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale2M-mrr.64B-8t4c-avf-ethip4-ip4scale2m-mrr"
       layout: "plot-cpta"
 
-# VM vhost - xxv710, ethip4, IMIX
-
-    - title: "VPP 2T1C VM vhost ethip4 IMIX MRR Trending 3n-skx"
-      output-file-name: "vm-vhost-imix-ethip4-2t1c-xxv710-3n-skx"
+    - title: "3n-skx-xxv710-64b-2t1c-ip4routing-base-scale-dpdk"
+      output-file-name: "3n-skx-xxv710-64b-2t1c-ip4-base-scale-dpdk"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '2T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
-      parameters:
-      - "result"
+      include:
+        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Base-mrr.64B-2t1c-ethip4-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Scale2M-mrr.64B-2t1c-ethip4-ip4scale2m-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C VM vhost ethip4 IMIX MRR Trending 3n-skx"
-      output-file-name: "vm-vhost-imix-ethip4-4t2c-xxv710-3n-skx"
+    - title: "3n-skx-xxv710-64b-4t2c-ip4routing-base-scale-dpdk"
+      output-file-name: "3n-skx-xxv710-64b-4t2c-ip4-base-scale-dpdk"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '4T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
-      parameters:
-      - "result"
+      include:
+        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Base-mrr.64B-4t2c-ethip4-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Scale2M-mrr.64B-4t2c-ethip4-ip4scale2m-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C VM vhost ethip4 IMIX MRR Trending 3n-skx"
-      output-file-name: "vm-vhost-imix-ethip4-8t4c-xxv710-3n-skx"
+    - title: "3n-skx-xxv710-64b-8t4c-ip4routing-base-scale-dpdk"
+      output-file-name: "3n-skx-xxv710-64b-8t4c-ip4-base-scale-dpdk"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '8T4C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
+      include:
+        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Base-mrr.64B-8t4c-ethip4-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Scale2M-mrr.64B-8t4c-ethip4-ip4scale2m-mrr"
+      layout: "plot-cpta"
+
+    - title: "3n-tsh-x520-64b-1t1c-ip4routing-base-scale-ixgbe"
+      output-file-name: "3n-tsh-x520-64b-1t1c-ip4-base-scale-ixgbe"
+      data: "plot-performance-trending-vpp-3n-tsh"
+      include:
+        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Dot1Q-Ip4Base-mrr.64B-1t1c-dot1q-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4-Ip4Base-mrr.64B-1t1c-ethip4-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4-Ip4Scale20K-mrr.64B-1t1c-ethip4-ip4scale20k-mrr"
+        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4-Ip4Scale200K-mrr.64B-1t1c-ethip4-ip4scale200k-mrr"
+        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4-Ip4Scale2M-mrr.64B-1t1c-ethip4-ip4scale2m-mrr"
+      layout: "plot-cpta"
+
+    - title: "3n-tsh-x520-64b-2t2c-ip4routing-base-scale-ixgbe"
+      output-file-name: "3n-tsh-x520-64b-2t2c-ip4-base-scale-ixgbe"
+      data: "plot-performance-trending-vpp-3n-tsh"
+      include:
+        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Dot1Q-Ip4Base-mrr.64B-2t2c-dot1q-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4-Ip4Base-mrr.64B-2t2c-ethip4-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4-Ip4Scale20K-mrr.64B-2t2c-ethip4-ip4scale20k-mrr"
+        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4-Ip4Scale200K-mrr.64B-2t2c-ethip4-ip4scale200k-mrr"
+        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4-Ip4Scale2M-mrr.64B-2t2c-ethip4-ip4scale2m-mrr"
+      layout: "plot-cpta"
+
+    - title: "3n-tsh-x520-64b-4t4c-ip4routing-base-scale-ixgbe"
+      output-file-name: "3n-tsh-x520-64b-4t4c-ip4-base-scale-ixgbe"
+      data: "plot-performance-trending-vpp-3n-tsh"
+      include:
+        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Dot1Q-Ip4Base-mrr.64B-4t4c-dot1q-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4-Ip4Base-mrr.64B-4t4c-ethip4-ip4base-mrr"
+        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4-Ip4Scale20K-mrr.64B-4t4c-ethip4-ip4scale20k-mrr"
+        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4-Ip4Scale200K-mrr.64B-4t4c-ethip4-ip4scale200k-mrr"
+        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4-Ip4Scale2M-mrr.64B-4t4c-ethip4-ip4scale2m-mrr"
+      layout: "plot-cpta"
+
+    - title: "3n-tsh-x520-64b-1t1c-ip4routing-features-ixgbe"
+      output-file-name: "3n-tsh-x520-64b-1t1c-ip4-features-ixgbe"
+      data: "plot-performance-trending-vpp-3n-tsh"
+      include:
+        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Mrr.64B-1t1c-ethip4udp-ip4base-iacl50sf-10kflows-mrr"
+        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Mrr.64B-1t1c-ethip4udp-ip4base-iacl50sl-10kflows-mrr"
+        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Mrr.64B-1t1c-ethip4udp-ip4base-oacl50sf-10kflows-mrr"
+        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Mrr.64B-1t1c-ethip4udp-ip4base-oacl50sl-10kflows-mrr"
+      layout: "plot-cpta"
+
+    - title: "3n-tsh-x520-64b-2t2c-ip4routing-features-ixgbe"
+      output-file-name: "3n-tsh-x520-64b-2t2c-ip4-features-ixgbe"
+      data: "plot-performance-trending-vpp-3n-tsh"
+      include:
+        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Mrr.64B-2t2c-ethip4udp-ip4base-iacl50sf-10kflows-mrr"
+        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Mrr.64B-2t2c-ethip4udp-ip4base-iacl50sl-10kflows-mrr"
+        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Mrr.64B-2t2c-ethip4udp-ip4base-oacl50sf-10kflows-mrr"
+        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Mrr.64B-2t2c-ethip4udp-ip4base-oacl50sl-10kflows-mrr"
+      layout: "plot-cpta"
+
+    - title: "3n-tsh-x520-64b-4t4c-ip4routing-features-ixgbe"
+      output-file-name: "3n-tsh-x520-64b-4t4c-ip4-features-ixgbe"
+      data: "plot-performance-trending-vpp-3n-tsh"
+      include:
+        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Mrr.64B-4t4c-ethip4udp-ip4base-iacl50sf-10kflows-mrr"
+        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Mrr.64B-4t4c-ethip4udp-ip4base-iacl50sl-10kflows-mrr"
+        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Mrr.64B-4t4c-ethip4udp-ip4base-oacl50sf-10kflows-mrr"
+        - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Mrr.64B-4t4c-ethip4udp-ip4base-oacl50sl-10kflows-mrr"
+      layout: "plot-cpta"
+
+    - title: "3n-dnv-x553-64b-1t1c-ip4tunnel-base-scale-ixgbe"
+      output-file-name: "3n-dnv-x553-64b-1t1c-ip4-tunnels-scale-ixgbe"
+      data: "plot-performance-trending-vpp-3n-dnv"
+      include:
+        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X553-Ethip4Vxlan-L2Xcbase-mrr.64B-1t1c-ethip4vxlan-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X553-Ethip4Vxlan-L2Bdbasemaclrn-mrr.64B-1t1c-ethip4vxlan-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X553-Dot1Q--Ethip4Vxlan-L2Bdscale1L2Bd1Vlan1Vxlan-mrr.64B-1t1c-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-mrr"
+        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X553-Dot1Q--Ethip4Vxlan-L2Bdscale100L2Bd100Vlan100Vxlan-mrr.64B-1t1c-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-mrr"
+      layout: "plot-cpta"
+
+    - title: "3n-dnv-x553-64b-2t2c-ip4tunnel-base-scale-ixgbe"
+      output-file-name: "3n-dnv-x553-64b-2t2c-ip4-tunnels-scale-ixgbe"
+      data: "plot-performance-trending-vpp-3n-dnv"
+      include:
+        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X553-Ethip4Vxlan-L2Xcbase-mrr.64B-2t2c-ethip4vxlan-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X553-Ethip4Vxlan-L2Bdbasemaclrn-mrr.64B-2t2c-ethip4vxlan-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X553-Dot1Q--Ethip4Vxlan-L2Bdscale1L2Bd1Vlan1Vxlan-mrr.64B-2t2c-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-mrr"
+        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X553-Dot1Q--Ethip4Vxlan-L2Bdscale100L2Bd100Vlan100Vxlan-mrr.64B-2t2c-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-mrr"
+      layout: "plot-cpta"
+
+    - title: "3n-dnv-x553-64b-4t4c-ip4tunnel-base-scale-ixgbe"
+      output-file-name: "3n-dnv-x553-64b-4t4c-ip4-tunnels-scale-ixgbe"
+      data: "plot-performance-trending-vpp-3n-dnv"
+      include:
+        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X553-Ethip4Vxlan-L2Xcbase-mrr.64B-4t4c-ethip4vxlan-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X553-Ethip4Vxlan-L2Bdbasemaclrn-mrr.64B-4t4c-ethip4vxlan-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X553-Dot1Q--Ethip4Vxlan-L2Bdscale1L2Bd1Vlan1Vxlan-mrr.64B-4t4c-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-mrr"
+        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X553-Dot1Q--Ethip4Vxlan-L2Bdscale100L2Bd100Vlan100Vxlan-mrr.64B-4t4c-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-mrr"
+      layout: "plot-cpta"
+
+    - title: "3n-hsw-xl710-64b-1t1c-ip4tunnel-base-dpdk"
+      output-file-name: "3n-hsw-xl710-64b-1t1c-ip4-tunnels-base-dpdk"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      include:
+        - "Tests.Vpp.Perf.Ip4 Tunnels.40Ge2P1Xl710-Ethip4Vxlan-L2Xcbase-mrr.64B-1t1c-ethip4vxlan-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.Ip4 Tunnels.40Ge2P1Xl710-Ethip4Vxlan-L2Bdbasemaclrn-mrr.64B-1t1c-ethip4vxlan-l2bdbasemaclrn-mrr"
+      layout: "plot-cpta"
+
+    - title: "3n-hsw-xl710-64b-2t2c-ip4tunnel-base-dpdk"
+      output-file-name: "3n-hsw-xl710-64b-2t2c-ip4-tunnels-base-dpdk"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      include:
+        - "Tests.Vpp.Perf.Ip4 Tunnels.40Ge2P1Xl710-Ethip4Vxlan-L2Xcbase-mrr.64B-2t2c-ethip4vxlan-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.Ip4 Tunnels.40Ge2P1Xl710-Ethip4Vxlan-L2Bdbasemaclrn-mrr.64B-2t2c-ethip4vxlan-l2bdbasemaclrn-mrr"
+      layout: "plot-cpta"
 
-# VM vhost - x710, eth, 64B
+    - title: "3n-hsw-xl710-64b-4t4c-ip4tunnel-base-dpdk"
+      output-file-name: "3n-hsw-xl710-64b-4t4c-ip4-tunnels-base-dpdk"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      include:
+        - "Tests.Vpp.Perf.Ip4 Tunnels.40Ge2P1Xl710-Ethip4Vxlan-L2Xcbase-mrr.64B-4t4c-ethip4vxlan-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.Ip4 Tunnels.40Ge2P1Xl710-Ethip4Vxlan-L2Bdbasemaclrn-mrr.64B-4t4c-ethip4vxlan-l2bdbasemaclrn-mrr"
+      layout: "plot-cpta"
 
-    - title: "VPP 2T1C VM vhost eth 64B MRR Trending 3n-skx"
-      output-file-name: "vm-vhost-eth-2t1c-x710-3n-skx"
+    - title: "3n-skx-xxv710-64b-2t1c-ip4tunnel-base-scale-avf-dpdk"
+      output-file-name: "3n-skx-xxv710-64b-2t1c-ip4-tunnels-base-scale-avf-dpdk"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
-
-      parameters:
-      - "result"
+      include:
+        - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Avf-Dot1Q--Ethip4Vxlan-L2Bdscale100L2Bd100Vlan100Vxlan-Mrr.64B-2t1c-avf-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-mrr"
+        - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Avf-Dot1Q--Ethip4Vxlan-L2Bdscale1L2Bd1Vlan1Vxlan-Mrr.64B-2t1c-avf-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-mrr"
+        - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Mrr.64B-2t1c-avf-ethip4vxlan-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Xcbase-Mrr.64B-2t1c-avf-ethip4vxlan-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Mrr.64B-2t1c-ethip4vxlan-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Vxlan-L2Xcbase-Mrr.64B-2t1c-ethip4vxlan-l2xcbase-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C VM vhost eth 64B MRR Trending 3n-skx"
-      output-file-name: "vm-vhost-eth-4t2c-x710-3n-skx"
+    - title: "3n-skx-xxv710-64b-4t2c-ip4tunnel-base-scale-avf-dpdk"
+      output-file-name: "3n-skx-xxv710-64b-4t2c-ip4-tunnels-base-scale-avf-dpdk"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
-      parameters:
-      - "result"
+      include:
+        - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Avf-Dot1Q--Ethip4Vxlan-L2Bdscale100L2Bd100Vlan100Vxlan-Mrr.64B-4t2c-avf-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-mrr"
+        - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Avf-Dot1Q--Ethip4Vxlan-L2Bdscale1L2Bd1Vlan1Vxlan-Mrr.64B-4t2c-avf-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-mrr"
+        - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Mrr.64B-4t2c-avf-ethip4vxlan-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Xcbase-Mrr.64B-4t2c-avf-ethip4vxlan-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Mrr.64B-4t2c-ethip4vxlan-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Vxlan-L2Xcbase-Mrr.64B-4t2c-ethip4vxlan-l2xcbase-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C VM vhost eth 64B MRR Trending 3n-skx"
-      output-file-name: "vm-vhost-eth-8t4c-x710-3n-skx"
+    - title: "3n-skx-xxv710-64b-8t4c-ip4tunnel-base-scale-dpdk"
+      output-file-name: "3n-skx-xxv710-64b-8t4c-ip4-tunnels-base-scale-avf-dpdk"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '8T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
-      parameters:
-      - "result"
+      include:
+        - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Avf-Dot1Q--Ethip4Vxlan-L2Bdscale100L2Bd100Vlan100Vxlan-Mrr.64B-8t4c-avf-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-mrr"
+        - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Avf-Dot1Q--Ethip4Vxlan-L2Bdscale1L2Bd1Vlan1Vxlan-Mrr.64B-8t4c-avf-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-mrr"
+        - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Mrr.64B-8t4c-avf-ethip4vxlan-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Xcbase-Mrr.64B-8t4c-avf-ethip4vxlan-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Mrr.64B-8t4c-ethip4vxlan-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Vxlan-L2Xcbase-Mrr.64B-8t4c-ethip4vxlan-l2xcbase-mrr"
+      layout: "plot-cpta"
+
+    - title: "3n-tsh-x520-64b-1t1c-ip4tunnel-base-scale-ixgbe"
+      output-file-name: "3n-tsh-x520-64b-1t1c-ip4-tunnels-base-scale-dpdk"
+      data: "plot-performance-trending-vpp-3n-tsh"
+      include:
+        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X520-Ethip4Vxlan-L2Xcbase-mrr.64B-1t1c-ethip4vxlan-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X520-Ethip4Vxlan-L2Bdbasemaclrn-mrr.64B-1t1c-ethip4vxlan-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X520-Dot1Q--Ethip4Vxlan-L2Bdscale1L2Bd1Vlan1Vxlan-mrr.64B-1t1c-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-mrr"
+        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X520-Dot1Q--Ethip4Vxlan-L2Bdscale100L2Bd100Vlan100Vxlan-mrr.64B-1t1c-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-mrr"
+      layout: "plot-cpta"
+
+    - title: "3n-tsh-x520-64b-2t2c-ip4tunnel-base-scale-ixgbe"
+      output-file-name: "3n-tsh-x520-64b-2t2c-ip4-tunnels-base-scale-dpdk"
+      data: "plot-performance-trending-vpp-3n-tsh"
+      include:
+        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X520-Ethip4Vxlan-L2Xcbase-mrr.64B-2t2c-ethip4vxlan-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X520-Ethip4Vxlan-L2Bdbasemaclrn-mrr.64B-2t2c-ethip4vxlan-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X520-Dot1Q--Ethip4Vxlan-L2Bdscale1L2Bd1Vlan1Vxlan-mrr.64B-2t2c-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-mrr"
+        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X520-Dot1Q--Ethip4Vxlan-L2Bdscale100L2Bd100Vlan100Vxlan-mrr.64B-2t2c-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-mrr"
+      layout: "plot-cpta"
+
+    - title: "3n-tsh-x520-64b-4t4c-ip4tunnel-base-scale-ixgbe"
+      output-file-name: "3n-tsh-x520-64b-4t4c-ip4-tunnels-base-scale-dpdk"
+      data: "plot-performance-trending-vpp-3n-tsh"
+      include:
+        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X520-Ethip4Vxlan-L2Xcbase-mrr.64B-4t4c-ethip4vxlan-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X520-Ethip4Vxlan-L2Bdbasemaclrn-mrr.64B-4t4c-ethip4vxlan-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X520-Dot1Q--Ethip4Vxlan-L2Bdscale1L2Bd1Vlan1Vxlan-mrr.64B-4t4c-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-mrr"
+        - "Tests.Vpp.Perf.Ip4 Tunnels.10Ge2P1X520-Dot1Q--Ethip4Vxlan-L2Bdscale100L2Bd100Vlan100Vxlan-mrr.64B-1t1c-4t4c--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-x710-78b-2t1c-ip6routing-base-scale-avf-dpdk"
+      output-file-name: "2n-clx-x710-78b-2t1c-ip6-base-scale-avf-dpdk"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Base-Mrr.78B-2t1c-avf-ethip6-ip6base-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-Mrr.78B-2t1c-avf-ethip6-ip6scale2m-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Base-mrr.78B-2t1c-ethip6-ip6base-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-x710-78b-4t2c-ip6routing-base-scale-avf-dpdk"
+      output-file-name: "2n-clx-x710-78b-4t2c-ip6-base-scale-avf-dpdk"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Base-Mrr.78B-4t2c-avf-ethip6-ip6base-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-Mrr.78B-4t2c-avf-ethip6-ip6scale2m-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Base-mrr.78B-4t2c-ethip6-ip6base-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-x710-78b-8t4c-ip6routing-base-scale-avf-dpdk"
+      output-file-name: "2n-clx-x710-78b-8t4c-ip6-base-scale-avf-dpdk"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Base-Mrr.78B-8t4c-avf-ethip6-ip6base-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-Mrr.78B-8t4c-avf-ethip6-ip6scale2m-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Base-mrr.78B-8t4c-ethip6-ip6base-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-78b-2t1c-ip6routing-base-scale-avf"
+      output-file-name: "2n-clx-xxv710-78b-2t1c-ip6-base-scale-avf"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-Ip6Base-mrr.78B-2t1c-avf-dot1q-ip6base-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Base-mrr.78B-2t1c-avf-ethip6-ip6base-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale20K-mrr.78B-2t1c-avf-ethip6-ip6scale20k-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale200K-mrr.78B-2t1c-avf-ethip6-ip6scale200k-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale2M-mrr.78B-2t1c-avf-ethip6-ip6scale2m-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-78b-4t2c-ip6routing-base-scale-avf"
+      output-file-name: "2n-clx-xxv710-78b-4t2c-ip6-base-scale-avf"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-Ip6Base-mrr.78B-4t2c-avf-dot1q-ip6base-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Base-mrr.78B-4t2c-avf-ethip6-ip6base-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale20K-mrr.78B-4t2c-avf-ethip6-ip6scale20k-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale200K-mrr.78B-4t2c-avf-ethip6-ip6scale200k-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale2M-mrr.78B-4t2c-avf-ethip6-ip6scale2m-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-78b-8t4c-ip6routing-base-scale-avf"
+      output-file-name: "2n-clx-xxv710-78b-8t4c-ip6-base-scale-avf"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-Ip6Base-mrr.78B-8t4c-avf-dot1q-ip6base-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Base-mrr.78B-8t4c-avf-ethip6-ip6base-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale20K-mrr.78B-8t4c-avf-ethip6-ip6scale20k-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale200K-mrr.78B-8t4c-avf-ethip6-ip6scale200k-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale2M-mrr.78B-8t4c-avf-ethip6-ip6scale2m-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-78b-2t1c-ip6routing-base-scale-dpdk"
+      output-file-name: "2n-clx-xxv710-78b-2t1c-ip6-base-scale-dpdk"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Base-mrr.78B-2t1c-ethip6-ip6base-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale20K-mrr.78B-2t1c-ethip6-ip6scale20k-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale200K-mrr.78B-2t1c-ethip6-ip6scale200k-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale2M-mrr.78B-2t1c-ethip6-ip6scale2m-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-78b-4t2c-ip6routing-base-scale-dpdk"
+      output-file-name: "2n-clx-xxv710-78b-4t2c-ip6-base-scale-dpdk"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Base-mrr.78B-4t2c-ethip6-ip6base-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale20K-mrr.78B-4t2c-ethip6-ip6scale20k-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale200K-mrr.78B-4t2c-ethip6-ip6scale200k-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale2M-mrr.78B-4t2c-ethip6-ip6scale2m-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-78b-8t4c-ip6routing-base-scale-dpdk"
+      output-file-name: "2n-clx-xxv710-78b-8t4c-ip6-base-scale-dpdk"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Base-mrr.78B-8t4c-ethip6-ip6base-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale20K-mrr.78B-8t4c-ethip6-ip6scale20k-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale200K-mrr.78B-8t4c-ethip6-ip6scale200k-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale2M-mrr.78B-8t4c-ethip6-ip6scale2m-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-cx556a-78b-2t1c-rdma-ip6routing-base-scale"
+      output-file-name: "2n-clx-cx556a-78b-2t1c-rdma-ip6routing-base-scale"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-Ip6Base-Mrr.78B-2t1c-rdma-dot1q-ip6base-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1Cx556A-Rdma-Ethip6-Ip6Base-Mrr.78B-2t1c-rdma-ethip6-ip6base-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1Cx556A-Rdma-Ethip6-Ip6Scale20K-Mrr.78B-2t1c-rdma-ethip6-ip6scale20k-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1Cx556A-Rdma-Ethip6-Ip6Scale200K-Mrr.78B-2t1c-rdma-ethip6-ip6scale200k-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1Cx556A-Rdma-Ethip6-Ip6Scale2M-Mrr.78B-2t1c-rdma-ethip6-ip6scale2m-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-cx556a-78b-4t2c-rdma-ip6routing-base-scale"
+      output-file-name: "2n-clx-cx556a-78b-4t2c-rdma-ip6routing-base-scale"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-Ip6Base-Mrr.78B-4t2c-rdma-dot1q-ip6base-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1Cx556A-Rdma-Ethip6-Ip6Base-Mrr.78B-4t2c-rdma-ethip6-ip6base-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1Cx556A-Rdma-Ethip6-Ip6Scale20K-Mrr.78B-4t2c-rdma-ethip6-ip6scale20k-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1Cx556A-Rdma-Ethip6-Ip6Scale200K-Mrr.78B-4t2c-rdma-ethip6-ip6scale200k-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1Cx556A-Rdma-Ethip6-Ip6Scale2M-Mrr.78B-4t2c-rdma-ethip6-ip6scale2m-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-cx556a-78b-8t4c-rdma-ip6routing-base-scale"
+      output-file-name: "2n-clx-cx556a-78b-8t4c-rdma-ip6routing-base-scale"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-Ip6Base-Mrr.78B-8t4c-rdma-dot1q-ip6base-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1Cx556A-Rdma-Ethip6-Ip6Base-Mrr.78B-8t4c-rdma-ethip6-ip6base-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1Cx556A-Rdma-Ethip6-Ip6Scale20K-Mrr.78B-8t4c-rdma-ethip6-ip6scale20k-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1Cx556A-Rdma-Ethip6-Ip6Scale200K-Mrr.78B-8t4c-rdma-ethip6-ip6scale200k-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1Cx556A-Rdma-Ethip6-Ip6Scale2M-Mrr.78B-8t4c-rdma-ethip6-ip6scale2m-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-dnv-x553-78b-1t1c-ip6-base-scale-ixgbe"
+      output-file-name: "2n-dnv-x553-78b-1t1c-ip6-base-scale-ixgbe"
+      data: "plot-performance-trending-vpp-2n-dnv"
+      include:
+        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X553-Dot1Q-Ip6Base-mrr.78B-1t1c-dot1q-ip6base-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X553-Ethip6-Ip6Base-mrr.78B-1t1c-ethip6-ip6base-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X553-Ethip6-Ip6Scale20K-mrr.78B-1t1c-ethip6-ip6scale20k-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X553-Ethip6-Ip6Scale200K-mrr.78B-1t1c-ethip6-ip6scale200k-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X553-Ethip6-Ip6Scale2M-mrr.78B-1t1c-ethip6-ip6scale2m-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-dnv-x553-78b-2t2c-ip6-base-scale-ixgbe"
+      output-file-name: "2n-dnv-x553-78b-2t2c-ip6-base-scale-ixgbe"
+      data: "plot-performance-trending-vpp-2n-dnv"
+      include:
+        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X553-Dot1Q-Ip6Base-mrr.78B-2t2c-dot1q-ip6base-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X553-Ethip6-Ip6Base-mrr.78B-2t2c-ethip6-ip6base-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X553-Ethip6-Ip6Scale20K-mrr.78B-2t2c-ethip6-ip6scale20k-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X553-Ethip6-Ip6Scale200K-mrr.78B-2t2c-ethip6-ip6scale200k-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X553-Ethip6-Ip6Scale2M-mrr.78B-2t2c-ethip6-ip6scale2m-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-dnv-x553-78b-4t4c-ip6-base-scale-ixgbe"
+      output-file-name: "2n-dnv-x553-78b-4t4c-ip6-base-scale-ixgbe"
+      data: "plot-performance-trending-vpp-2n-dnv"
+      include:
+        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X553-Dot1Q-Ip6Base-mrr.78B-4t4c-dot1q-ip6base-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X553-Ethip6-Ip6Base-mrr.78B-4t4c-ethip6-ip6base-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X553-Ethip6-Ip6Scale20K-mrr.78B-4t4c-ethip6-ip6scale20k-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X553-Ethip6-Ip6Scale200K-mrr.78B-4t4c-ethip6-ip6scale200k-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X553-Ethip6-Ip6Scale2M-mrr.78B-4t4c-ethip6-ip6scale2m-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-skx-x710-78b-2t1c-ip6routing-base-scale-avf-dpdk"
+      output-file-name: "2n-skx-x710-78b-2t1c-ip6-base-scale-avf-dpdk"
+      data: "plot-performance-trending-vpp-2n-skx"
+      include:
+        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Base-Mrr.78B-2t1c-avf-ethip6-ip6base-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-Mrr.78B-2t1c-avf-ethip6-ip6scale2m-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Base-mrr.78B-2t1c-ethip6-ip6base-mrr"
       layout: "plot-cpta"
 
-# VM vhost - xxv710, eth, 64B
+    - title: "2n-skx-x710-78b-4t2c-ip6routing-base-scale-avf-dpdk"
+      output-file-name: "2n-skx-x710-78b-4t2c-ip6-base-scale-avf-dpdk"
+      data: "plot-performance-trending-vpp-2n-skx"
+      include:
+        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Base-Mrr.78B-4t2c-avf-ethip6-ip6base-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-Mrr.78B-4t2c-avf-ethip6-ip6scale2m-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Base-mrr.78B-4t2c-ethip6-ip6base-mrr"
+      layout: "plot-cpta"
 
-    - title: "VPP 2T1C VM vhost eth 64B MRR Trending 3n-skx"
-      output-file-name: "vm-vhost-eth-2t1c-xxv710-3n-skx"
-      data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '2T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+    - title: "2n-skx-x710-78b-8t4c-ip6routing-base-scale-avf-dpdk"
+      output-file-name: "2n-skx-x710-78b-8t4c-ip6-base-scale-avf-dpdk"
+      data: "plot-performance-trending-vpp-2n-skx"
+      include:
+        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Base-Mrr.78B-8t4c-avf-ethip6-ip6base-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-Mrr.78B-8t4c-avf-ethip6-ip6scale2m-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Base-mrr.78B-8t4c-ethip6-ip6base-mrr"
+      layout: "plot-cpta"
 
-      parameters:
-      - "result"
+    - title: "2n-skx-xxv710-78b-2t1c-ip6routing-base-scale-avf"
+      output-file-name: "2n-skx-xxv710-78b-2t1c-ip6-base-scale-avf"
+      data: "plot-performance-trending-vpp-2n-skx"
+      include:
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Base-mrr.78B-2t1c-avf-ethip6-ip6base-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale20K-mrr.78B-2t1c-avf-ethip6-ip6scale20k-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale200K-mrr.78B-2t1c-avf-ethip6-ip6scale200k-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale2M-mrr.78B-2t1c-avf-ethip6-ip6scale2m-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C VM vhost eth 64B MRR Trending 3n-skx"
-      output-file-name: "vm-vhost-eth-4t2c-xxv710-3n-skx"
-      data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '4T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
-      parameters:
-      - "result"
+    - title: "2n-skx-xxv710-78b-4t2c-ip6routing-base-scale-avf"
+      output-file-name: "2n-skx-xxv710-78b-4t2c-ip6-base-scale-avf"
+      data: "plot-performance-trending-vpp-2n-skx"
+      include:
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Base-mrr.78B-4t2c-avf-ethip6-ip6base-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale20K-mrr.78B-4t2c-avf-ethip6-ip6scale20k-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale200K-mrr.78B-4t2c-avf-ethip6-ip6scale200k-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale2M-mrr.78B-4t2c-avf-ethip6-ip6scale2m-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C VM vhost eth 64B MRR Trending 3n-skx"
-      output-file-name: "vm-vhost-eth-8t4c-xxv710-3n-skx"
-      data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '8T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
-      parameters:
-      - "result"
+    - title: "2n-skx-xxv710-78b-8t4c-ip6routing-base-scale-avf"
+      output-file-name: "2n-skx-xxv710-78b-8t4c-ip6-base-scale-avf"
+      data: "plot-performance-trending-vpp-2n-skx"
+      include:
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Base-mrr.78B-8t4c-avf-ethip6-ip6base-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale20K-mrr.78B-8t4c-avf-ethip6-ip6scale20k-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale200K-mrr.78B-8t4c-avf-ethip6-ip6scale200k-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale2M-mrr.78B-8t4c-avf-ethip6-ip6scale2m-mrr"
       layout: "plot-cpta"
 
-# VM vhost - x710, eth, IMIX
+    - title: "2n-skx-xxv710-78b-2t1c-ip6routing-base-scale-dpdk"
+      output-file-name: "2n-skx-xxv710-78b-2t1c-ip6-base-scale-dpdk"
+      data: "plot-performance-trending-vpp-2n-skx"
+      include:
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Base-mrr.78B-2t1c-ethip6-ip6base-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale20K-mrr.78B-2t1c-ethip6-ip6scale20k-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale200K-mrr.78B-2t1c-ethip6-ip6scale200k-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale2M-mrr.78B-2t1c-ethip6-ip6scale2m-mrr"
+      layout: "plot-cpta"
 
-    - title: "VPP 2T1C VM vhost eth IMIX MRR Trending 3n-skx"
-      output-file-name: "vm-vhost-imix-eth-2t1c-x710-3n-skx"
-      data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '2T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+    - title: "2n-skx-xxv710-78b-4t2c-ip6routing-base-scale-dpdk"
+      output-file-name: "2n-skx-xxv710-78b-4t2c-ip6-base-scale-dpdk"
+      data: "plot-performance-trending-vpp-2n-skx"
+      include:
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Base-mrr.78B-4t2c-ethip6-ip6base-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale20K-mrr.78B-4t2c-ethip6-ip6scale20k-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale200K-mrr.78B-4t2c-ethip6-ip6scale200k-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale2M-mrr.78B-4t2c-ethip6-ip6scale2m-mrr"
+      layout: "plot-cpta"
 
-      parameters:
-      - "result"
+    - title: "2n-skx-xxv710-78b-8t4c-ip6routing-base-scale-dpdk"
+      output-file-name: "2n-skx-xxv710-78b-8t4c-ip6-base-scale-dpdk"
+      data: "plot-performance-trending-vpp-2n-skx"
+      include:
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Base-mrr.78B-8t4c-ethip6-ip6base-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale20K-mrr.78B-8t4c-ethip6-ip6scale20k-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale200K-mrr.78B-8t4c-ethip6-ip6scale200k-mrr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale2M-mrr.78B-8t4c-ethip6-ip6scale2m-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C VM vhost eth IMIX MRR Trending 3n-skx"
-      output-file-name: "vm-vhost-imix-eth-4t2c-x710-3n-skx"
-      data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '4T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
-      parameters:
-      - "result"
+    - title: "3n-dnv-x553-78b-1t1c-ip6routing-base-scale-ixgbe"
+      output-file-name: "3n-dnv-x553-78b-1t1c-ip6-base-scale-ixgbe"
+      data: "plot-performance-trending-vpp-3n-dnv"
+      include:
+        - "Tests.Vpp.Perf.Ip6.10Ge2P1X553-Dot1Q-Ip6Base-mrr.78B-1t1c-dot1q-ip6base-mrr"
+        - "Tests.Vpp.Perf.Ip6.10Ge2P1X553-Ethip6-Ip6Base-mrr.78B-1t1c-ethip6-ip6base-mrr"
+        - "Tests.Vpp.Perf.Ip6.10Ge2P1X553-Ethip6-Ip6Scale20K-mrr.78B-1t1c-ethip6-ip6scale20k-mrr"
+        - "Tests.Vpp.Perf.Ip6.10Ge2P1X553-Ethip6-Ip6Scale200K-mrr.78B-1t1c-ethip6-ip6scale200k-mrr"
+        - "Tests.Vpp.Perf.Ip6.10Ge2P1X553-Ethip6-Ip6Scale2M-mrr.78B-1t1c-ethip6-ip6scale2m-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C VM vhost eth IMIX MRR Trending 3n-skx"
-      output-file-name: "vm-vhost-imix-eth-8t4c-x710-3n-skx"
-      data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '8T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
-      parameters:
-      - "result"
+    - title: "3n-dnv-x553-78b-2t2c-ip6routing-base-scale-ixgbe"
+      output-file-name: "3n-dnv-x553-78b-2t2c-ip6-base-scale-ixgbe"
+      data: "plot-performance-trending-vpp-3n-dnv"
+      include:
+        - "Tests.Vpp.Perf.Ip6.10Ge2P1X553-Dot1Q-Ip6Base-mrr.78B-2t2c-dot1q-ip6base-mrr"
+        - "Tests.Vpp.Perf.Ip6.10Ge2P1X553-Ethip6-Ip6Base-mrr.78B-2t2c-ethip6-ip6base-mrr"
+        - "Tests.Vpp.Perf.Ip6.10Ge2P1X553-Ethip6-Ip6Scale20K-mrr.78B-2t2c-ethip6-ip6scale20k-mrr"
+        - "Tests.Vpp.Perf.Ip6.10Ge2P1X553-Ethip6-Ip6Scale200K-mrr.78B-2t2c-ethip6-ip6scale200k-mrr"
+        - "Tests.Vpp.Perf.Ip6.10Ge2P1X553-Ethip6-Ip6Scale2M-mrr.78B-2t2c-ethip6-ip6scale2m-mrr"
       layout: "plot-cpta"
 
-# VM vhost - xxv710, eth, IMIX
+    - title: "3n-dnv-x553-78b-4t4c-ip6routing-base-scale-ixgbe"
+      output-file-name: "3n-dnv-x553-78b-4t4c-ip6-base-scale-ixgbe"
+      data: "plot-performance-trending-vpp-3n-dnv"
+      include:
+        - "Tests.Vpp.Perf.Ip6.10Ge2P1X553-Dot1Q-Ip6Base-mrr.78B-4t4c-dot1q-ip6base-mrr"
+        - "Tests.Vpp.Perf.Ip6.10Ge2P1X553-Ethip6-Ip6Base-mrr.78B-4t4c-ethip6-ip6base-mrr"
+        - "Tests.Vpp.Perf.Ip6.10Ge2P1X553-Ethip6-Ip6Scale20K-mrr.78B-4t4c-ethip6-ip6scale20k-mrr"
+        - "Tests.Vpp.Perf.Ip6.10Ge2P1X553-Ethip6-Ip6Scale200K-mrr.78B-4t4c-ethip6-ip6scale200k-mrr"
+        - "Tests.Vpp.Perf.Ip6.10Ge2P1X553-Ethip6-Ip6Scale2M-mrr.78B-4t4c-ethip6-ip6scale2m-mrr"
+      layout: "plot-cpta"
 
-    - title: "VPP 2T1C VM vhost eth IMIX MRR Trending 3n-skx"
-      output-file-name: "vm-vhost-imix-eth-2t1c-xxv710-3n-skx"
-      data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '2T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+    - title: "3n-hsw-xl710-78b-1t1c-ip6routing-base-scale-dpdk"
+      output-file-name: "3n-hsw-xl710-78b-1t1c-ip6-base-scale-dpdk"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      include:
+        - "Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Dot1Q-Ip6Base-mrr.78B-1t1c-dot1q-ip6base-mrr"
+        - "Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Ethip6-Ip6Base-mrr.78B-1t1c-ethip6-ip6base-mrr"
+        - "Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Ethip6-Ip6Scale2M-mrr.78B-1t1c-ethip6-ip6scale2m-mrr"
+      layout: "plot-cpta"
 
-      parameters:
-      - "result"
+    - title: "3n-hsw-xl710-78b-2t2c-ip6routing-base-scale-dpdk"
+      output-file-name: "3n-hsw-xl710-78b-2t2c-ip6-base-scale-dpdk"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      include:
+        - "Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Dot1Q-Ip6Base-mrr.78B-2t2c-dot1q-ip6base-mrr"
+        - "Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Ethip6-Ip6Base-mrr.78B-2t2c-ethip6-ip6base-mrr"
+        - "Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Ethip6-Ip6Scale2M-mrr.78B-2t2c-ethip6-ip6scale2m-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C VM vhost eth IMIX MRR Trending 3n-skx"
-      output-file-name: "vm-vhost-imix-eth-4t2c-xxv710-3n-skx"
-      data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '4T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
-      parameters:
-      - "result"
+    - title: "3n-hsw-xl710-78b-4t4c-ip6routing-base-scale-dpdk"
+      output-file-name: "3n-hsw-xl710-78b-4t4c-ip6-base-scale-dpdk"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      include:
+        - "Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Dot1Q-Ip6Base-mrr.78B-4t4c-dot1q-ip6base-mrr"
+        - "Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Ethip6-Ip6Base-mrr.78B-4t4c-ethip6-ip6base-mrr"
+        - "Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Ethip6-Ip6Scale2M-mrr.78B-4t4c-ethip6-ip6scale2m-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C VM vhost eth IMIX MRR Trending 3n-skx"
-      output-file-name: "vm-vhost-imix-eth-8t4c-xxv710-3n-skx"
+    - title: "3n-skx-x710-78b-2t1c-ip6routing-base-scale-avf"
+      output-file-name: "3n-skx-x710-78b-2t1c-ip6-base-scale-avf"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '8T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
-      parameters:
-      - "result"
+      include:
+        - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Avf-Ethip6-Ip6Base-mrr.78B-2t1c-avf-ethip6-ip6base-mrr"
+        - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-mrr.78B-2t1c-avf-ethip6-ip6scale2m-mrr"
       layout: "plot-cpta"
 
-# Link Bonding - x710
-
-    - title: "VPP 2T1C Link Bonding 64B MRR Trending 3n-skx"
-      output-file-name: "lb-64b-2t1c-x710-3n-skx"
+    - title: "3n-skx-x710-78b-4t2c-ip6routing-base-scale-avf"
+      output-file-name: "3n-skx-x710-78b-4t2c-ip6-base-scale-avf"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T1C' and 'LBOND_VPP'"
-      parameters:
-      - "result"
+      include:
+        - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Avf-Ethip6-Ip6Base-mrr.78B-4t2c-avf-ethip6-ip6base-mrr"
+        - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-mrr.78B-4t2c-avf-ethip6-ip6scale2m-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C Link Bonding 64B MRR Trending 3n-skx"
-      output-file-name: "lb-64b-4t2c-x710-3n-skx"
+    - title: "3n-skx-x710-78b-8t4c-ip6routing-base-scale-avf"
+      output-file-name: "3n-skx-x710-78b-8t4c-ip6-base-scale-avf"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T2C' and 'LBOND_VPP'"
-      parameters:
-      - "result"
+      include:
+        - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Avf-Ethip6-Ip6Base-mrr.78B-8t4c-avf-ethip6-ip6base-mrr"
+        - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-mrr.78B-8t4c-avf-ethip6-ip6scale2m-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C Link Bonding 64B MRR Trending 3n-skx"
-      output-file-name: "lb-64b-8t4c-x710-3n-skx"
+    - title: "3n-skx-xxv710-78b-2t1c-ip6routing-base-scale-avf"
+      output-file-name: "3n-skx-xxv710-78b-2t1c-ip6-base-scale-avf"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '8T4C' and 'LBOND_VPP'"
-      parameters:
-      - "result"
+      include:
+        - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Avf-Dot1Q-Ip6Base-mrr.78B-2t1c-avf-dot1q-ip6base-mrr"
+        - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Avf-Ethip6-Ip6Base-mrr.78B-2t1c-avf-ethip6-ip6base-mrr"
+        - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale20K-mrr.78B-2t1c-avf-ethip6-ip6scale20k-mrr"
+        - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale200K-mrr.78B-2t1c-avf-ethip6-ip6scale200k-mrr"
+        - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale2M-mrr.78B-2t1c-avf-ethip6-ip6scale2m-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 2T1C Link Bonding IMIX MRR Trending 3n-skx"
-      output-file-name: "lb-imix-2t1c-x710-3n-skx"
+    - title: "3n-skx-xxv710-78b-4t2c-ip6routing-base-scale-avf"
+      output-file-name: "3n-skx-xxv710-78b-4t2c-ip6-base-scale-avf"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '2T1C' and 'LBOND_VPP'"
-      parameters:
-      - "result"
+      include:
+        - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Avf-Dot1Q-Ip6Base-mrr.78B-4t2c-avf-dot1q-ip6base-mrr"
+        - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Avf-Ethip6-Ip6Base-mrr.78B-4t2c-avf-ethip6-ip6base-mrr"
+        - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale20K-mrr.78B-4t2c-avf-ethip6-ip6scale20k-mrr"
+        - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale200K-mrr.78B-4t2c-avf-ethip6-ip6scale200k-mrr"
+        - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale2M-mrr.78B-4t2c-avf-ethip6-ip6scale2m-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C Link Bonding IMIX MRR Trending 3n-skx"
-      output-file-name: "lb-imix-4t2c-x710-3n-skx"
+    - title: "3n-skx-xxv710-78b-8t4c-ip6routing-base-scale-avf"
+      output-file-name: "3n-skx-xxv710-78b-8t4c-ip6-base-scale-avf"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '4T2C' and 'LBOND_VPP'"
-      parameters:
-      - "result"
+      include:
+        - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Avf-Dot1Q-Ip6Base-mrr.78B-8t4c-avf-dot1q-ip6base-mrr"
+        - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Avf-Ethip6-Ip6Base-mrr.78B-8t4c-avf-ethip6-ip6base-mrr"
+        - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale20K-mrr.78B-8t4c-avf-ethip6-ip6scale20k-mrr"
+        - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale200K-mrr.78B-8t4c-avf-ethip6-ip6scale200k-mrr"
+        - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale2M-mrr.78B-8t4c-avf-ethip6-ip6scale2m-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C Link Bonding IMIX MRR Trending 3n-skx"
-      output-file-name: "lb-imix-8t4c-x710-3n-skx"
+    - title: "3n-skx-xxv710-78b-2t1c-ip6routing-base-scale-dpdk"
+      output-file-name: "3n-skx-xxv710-78b-2t1c-ip6-base-scale-dpdk"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '8T4C' and 'LBOND_VPP'"
-      parameters:
-      - "result"
+      include:
+        - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Ethip6-Ip6Base-mrr.78B-2t1c-ethip6-ip6base-mrr"
+        - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Ethip6-Ip6Scale2M-mrr.78B-2t1c-ethip6-ip6scale2m-mrr"
       layout: "plot-cpta"
 
-# Link Bonding - xxv710
-
-    - title: "VPP 2T1C Link Bonding 64B MRR Trending 3n-skx"
-      output-file-name: "lb-64b-2t1c-xxv710-3n-skx"
+    - title: "3n-skx-xxv710-78b-4t2c-ip6routing-base-scale-dpdk"
+      output-file-name: "3n-skx-xxv710-78b-4t2c-ip6-base-scale-dpdk"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '2T1C' and 'LBOND_VPP'"
-      parameters:
-      - "result"
+      include:
+        - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Ethip6-Ip6Base-mrr.78B-4t2c-ethip6-ip6base-mrr"
+        - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Ethip6-Ip6Scale2M-mrr.78B-4t2c-ethip6-ip6scale2m-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C Link Bonding 64B MRR Trending 3n-skx"
-      output-file-name: "lb-64b-4t2c-xxv710-3n-skx"
+    - title: "3n-skx-xxv710-78b-8t4c-ip6routing-base-scale-dpdk"
+      output-file-name: "3n-skx-xxv710-78b-8t4c-ip6-base-scale-dpdk"
+      data: "plot-performance-trending-vpp-3n-skx"
+      include:
+        - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Ethip6-Ip6Base-mrr.78B-8t4c-ethip6-ip6base-mrr"
+        - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Ethip6-Ip6Scale2M-mrr.78B-8t4c-ethip6-ip6scale2m-mrr"
+      layout: "plot-cpta"
+
+    - title: "3n-tsh-x520-78b-1t1c-ip6routing-base-scale-ixgbe"
+      output-file-name: "3n-tsh-x520-78b-1t1c-ip6-base-scale-ixgbe"
+      data: "plot-performance-trending-vpp-3n-tsh"
+      include:
+        - "Tests.Vpp.Perf.Ip6.10Ge2P1X520-Dot1Q-Ip6Base-mrr.78B-1t1c-dot1q-ip6base-mrr"
+        - "Tests.Vpp.Perf.Ip6.10Ge2P1X520-Ethip6-Ip6Base-mrr.78B-1t1c-ethip6-ip6base-mrr"
+        - "Tests.Vpp.Perf.Ip6.10Ge2P1X520-Ethip6-Ip6Scale20K-mrr.78B-1t1c-ethip6-ip6scale20k-mrr"
+        - "Tests.Vpp.Perf.Ip6.10Ge2P1X520-Ethip6-Ip6Scale200K-mrr.78B-1t1c-ethip6-ip6scale200k-mrr"
+        - "Tests.Vpp.Perf.Ip6.10Ge2P1X520-Ethip6-Ip6Scale2M-mrr.78B-1t1c-ethip6-ip6scale2m-mrr"
+      layout: "plot-cpta"
+
+    - title: "3n-tsh-x520-78b-2t2c-ip6routing-base-scale-ixgbe"
+      output-file-name: "3n-tsh-x520-78b-2t2c-ip6-base-scale-ixgbe"
+      data: "plot-performance-trending-vpp-3n-tsh"
+      include:
+        - "Tests.Vpp.Perf.Ip6.10Ge2P1X520-Dot1Q-Ip6Base-mrr.78B-2t2c-dot1q-ip6base-mrr"
+        - "Tests.Vpp.Perf.Ip6.10Ge2P1X520-Ethip6-Ip6Base-mrr.78B-2t2c-ethip6-ip6base-mrr"
+        - "Tests.Vpp.Perf.Ip6.10Ge2P1X520-Ethip6-Ip6Scale20K-mrr.78B-2t2c-ethip6-ip6scale20k-mrr"
+        - "Tests.Vpp.Perf.Ip6.10Ge2P1X520-Ethip6-Ip6Scale200K-mrr.78B-2t2c-ethip6-ip6scale200k-mrr"
+        - "Tests.Vpp.Perf.Ip6.10Ge2P1X520-Ethip6-Ip6Scale2M-mrr.78B-2t2c-ethip6-ip6scale2m-mrr"
+      layout: "plot-cpta"
+
+    - title: "3n-tsh-x520-78b-4t4c-ip6routing-base-scale-ixgbe"
+      output-file-name: "3n-tsh-x520-78b-4t4c-ip6-base-scale-ixgbe"
+      data: "plot-performance-trending-vpp-3n-tsh"
+      include:
+        - "Tests.Vpp.Perf.Ip6.10Ge2P1X520-Dot1Q-Ip6Base-mrr.78B-4t4c-dot1q-ip6base-mrr"
+        - "Tests.Vpp.Perf.Ip6.10Ge2P1X520-Ethip6-Ip6Base-mrr.78B-4t4c-ethip6-ip6base-mrr"
+        - "Tests.Vpp.Perf.Ip6.10Ge2P1X520-Ethip6-Ip6Scale20K-mrr.78B-4t4c-ethip6-ip6scale20k-mrr"
+        - "Tests.Vpp.Perf.Ip6.10Ge2P1X520-Ethip6-Ip6Scale200K-mrr.78B-4t4c-ethip6-ip6scale200k-mrr"
+        - "Tests.Vpp.Perf.Ip6.10Ge2P1X520-Ethip6-Ip6Scale2M-mrr.78B-4t4c-ethip6-ip6scale2m-mrr"
+      layout: "plot-cpta"
+
+    - title: "3n-dnv-x553-imix-1t1c-ipsec-base-scale-sw-ixgbe"
+      output-file-name: "3n-dnv-x553-imix-1t1c-ipsec-base-scale-sw-ixgbe"
+      data: "plot-performance-trending-vpp-3n-dnv"
+      include:
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X553-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-1t1c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-mrr"
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X553-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-1t1c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X553-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-1t1c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-mrr"
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X553-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-1t1c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X553-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-1t1c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-mrr"
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X553-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-1t1c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
+      layout: "plot-cpta"
+
+    - title: "3n-dnv-x553-imix-2t2c-ipsec-base-scale-sw-ixgbe"
+      output-file-name: "3n-dnv-x553-imix-2t2c-ipsec-base-scale-sw-ixgbe"
+      data: "plot-performance-trending-vpp-3n-dnv"
+      include:
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X553-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-2t2c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-mrr"
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X553-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-2t2c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X553-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-2t2c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-mrr"
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X553-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-2t2c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X553-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-2t2c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-mrr"
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X553-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-2t2c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
+      layout: "plot-cpta"
+
+    - title: "3n-dnv-x553-imix-4t4c-ipsec-base-scale-sw-ixgbe"
+      output-file-name: "3n-dnv-x553-imix-4t4c-ipsec-base-scale-sw-ixgbe"
+      data: "plot-performance-trending-vpp-3n-dnv"
+      include:
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X553-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-4t4c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-mrr"
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X553-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-4t4c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X553-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-4t4c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-mrr"
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X553-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-4t4c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X553-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-4t4c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-mrr"
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X553-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-4t4c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
+      layout: "plot-cpta"
+
+    - title: "3n-dnv-x553-1518b-1t1c-ipsec-base-scale-sw-ixgbe"
+      output-file-name: "3n-dnv-x553-1518b-1t1c-ipsec-base-scale-sw-ixgbe"
+      data: "plot-performance-trending-vpp-3n-dnv"
+      include:
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X553-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.1518b-1t1c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-mrr"
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X553-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.1518b-1t1c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X553-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.1518b-1t1c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-mrr"
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X553-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.1518b-1t1c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X553-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.1518b-1t1c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-mrr"
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X553-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.1518b-1t1c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
+      layout: "plot-cpta"
+
+    - title: "3n-dnv-x553-1518b-2t2c-ipsec-base-scale-sw-ixgbe"
+      output-file-name: "3n-dnv-x553-1518b-2t2c-ipsec-base-scale-sw-ixgbe"
+      data: "plot-performance-trending-vpp-3n-dnv"
+      include:
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X553-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.1518b-2t2c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-mrr"
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X553-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.1518b-2t2c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X553-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.1518b-2t2c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-mrr"
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X553-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.1518b-2t2c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X553-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.1518b-2t2c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-mrr"
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X553-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.1518b-2t2c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
+      layout: "plot-cpta"
+
+    - title: "3n-dnv-x553-1518b-4t4c-ipsec-base-scale-sw-ixgbe"
+      output-file-name: "3n-dnv-x553-1518b-4t4c-ipsec-base-scale-sw-ixgbe"
+      data: "plot-performance-trending-vpp-3n-dnv"
+      include:
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X553-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.1518b-4t4c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-mrr"
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X553-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.1518b-4t4c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X553-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.1518b-4t4c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-mrr"
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X553-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.1518b-4t4c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X553-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.1518b-4t4c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-mrr"
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X553-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.1518b-4t4c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
+      layout: "plot-cpta"
+
+    - title: "3n-hsw-xl710-imix-1t1c-ipsec-ip4routing-base-scale-sw-dpdk"
+      output-file-name: "3n-hsw-xl710-imix-1t1c-ipsec-base-scale-sw-dpdk"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      include:
+        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-1t1c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-mrr"
+        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-1t1c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
+        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-1t1c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-mrr"
+        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-1t1c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
+        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-1t1c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-mrr"
+        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-1t1c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
+      layout: "plot-cpta"
+
+    - title: "3n-hsw-xl710-imix-2t2c-ipsec-ip4routing-base-scale-sw-dpdk"
+      output-file-name: "3n-hsw-xl710-imix-2t2c-ipsec-base-scale-sw-dpdk"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      include:
+        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-2t2c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-mrr"
+        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-2t2c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
+        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-2t2c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-mrr"
+        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-2t2c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
+        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-2t2c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-mrr"
+        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-2t2c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
+      layout: "plot-cpta"
+
+    - title: "3n-hsw-xl710-imix-4t4c-ipsec-ip4routing-base-scale-sw-dpdk"
+      output-file-name: "3n-hsw-xl710-imix-4t4c-ipsec-base-scale-sw-dpdk"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      include:
+        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-4t4c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-mrr"
+        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-4t4c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
+        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-4t4c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-mrr"
+        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-4t4c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
+        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-4t4c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-mrr"
+        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-4t4c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
+      layout: "plot-cpta"
+
+    - title: "3n-hsw-xl710-imix-1t1c-ipsec-ip4routing-base-scale-hw-dpdk"
+      output-file-name: "3n-hsw-xl710-imix-1t1c-ipsec-base-scale-hw-dpdk"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      include:
+        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1Tnlhw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-1t1c-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-mrr"
+        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1Tnlhw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-1t1c-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac512sha-mrr"
+        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlhw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-1t1c-ethip4ipsec1000tnlhw-ip4base-int-aes256gcm-mrr"
+        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlhw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-1t1c-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac512sha-mrr"
+      layout: "plot-cpta"
+
+    - title: "3n-hsw-xl710-imix-2t2c-ipsec-ip4routing-base-scale-hw-dpdk"
+      output-file-name: "3n-hsw-xl710-imix-2t2c-ipsec-base-scale-hw-dpdk"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      include:
+        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1Tnlhw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-2t2c-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-mrr"
+        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1Tnlhw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-2t2c-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac512sha-mrr"
+        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlhw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-2t2c-ethip4ipsec1000tnlhw-ip4base-int-aes256gcm-mrr"
+        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlhw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-2t2c-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac512sha-mrr"
+      layout: "plot-cpta"
+
+    - title: "3n-hsw-xl710-imix-4t4c-ipsec-ip4routing-base-scale-hw-dpdk"
+      output-file-name: "3n-hsw-xl710-imix-4t4c-ipsec-base-scale-hw-dpdk"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      include:
+        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1Tnlhw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-4t4c-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-mrr"
+        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1Tnlhw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-4t4c-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac512sha-mrr"
+        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlhw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-4t4c-ethip4ipsec1000tnlhw-ip4base-int-aes256gcm-mrr"
+        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlhw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-4t4c-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac512sha-mrr"
+      layout: "plot-cpta"
+
+    - title: "3n-skx-xxv710-imix-2t1c-ipsec-ip4routing-base-scale-avf"
+      output-file-name: "3n-skx-xxv710-imix-2t1c-ipsec-base-scale-sw-avf"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '4T2C' and 'LBOND_VPP'"
-      parameters:
-      - "result"
+      include:
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-2t1c-avf-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-mrr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-2t1c-avf-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-2t1c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-mrr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-2t1c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-2t1c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-mrr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-2t1c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C Link Bonding 64B MRR Trending 3n-skx"
-      output-file-name: "lb-64b-8t4c-xxv710-3n-skx"
+    - title: "3n-skx-xxv710-imix-4t2c-ipsec-ip4routing-base-scale-avf"
+      output-file-name: "3n-skx-xxv710-imix-4t2c-ipsec-base-scale-sw-avf"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '8T4C' and 'LBOND_VPP'"
-      parameters:
-      - "result"
+      include:
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-4t2c-avf-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-mrr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-4t2c-avf-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-4t2c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-mrr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-4t2c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-4t2c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-mrr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-4t2c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 2T1C Link Bonding IMIX MRR Trending 3n-skx"
-      output-file-name: "lb-imix-2t1c-xxv710-3n-skx"
+    - title: "3n-skx-xxv710-imix-8t4c-ipsec-ip4routing-base-scale-avf"
+      output-file-name: "3n-skx-xxv710-imix-8t4c-ipsec-base-scale-sw-avf"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '2T1C' and 'LBOND_VPP'"
-      parameters:
-      - "result"
+      include:
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-8t4c-avf-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-mrr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-8t4c-avf-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-8t4c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-mrr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-8t4c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.8t4c-2t1c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-mrr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-8t4c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C Link Bonding IMIX MRR Trending 3n-skx"
-      output-file-name: "lb-imix-4t2c-xxv710-3n-skx"
+    - title: "3n-skx-xxv710-imix-2t1c-ipsec-ip4routing-base-scale-dpdk"
+      output-file-name: "3n-skx-xxv710-imix-2t1c-ipsec-base-scale-sw-dpdk"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '4T2C' and 'LBOND_VPP'"
-      parameters:
-      - "result"
+      include:
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-2t1c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-mrr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-2t1c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C Link Bonding IMIX MRR Trending 3n-skx"
-      output-file-name: "lb-imix-8t4c-xxv710-3n-skx"
+    - title: "3n-skx-xxv710-imix-4t2c-ipsec-ip4routing-base-scale-dpdk"
+      output-file-name: "3n-skx-xxv710-imix-4t2c-ipsec-base-scale-sw-dpdk"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '8T4C' and 'LBOND_VPP'"
-      parameters:
-      - "result"
+      include:
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-4t2c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-mrr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-4t2c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-mrr"
       layout: "plot-cpta"
 
-# DPDK - x710 - 64B
-
-    - title: "DPDK 2T1C 64B MRR Trending 3n-skx"
-      output-file-name: "dpdk-64b-2t1c-x710-3n-skx"
-      data: "plot-performance-trending-dpdk-3n-skx"
-      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T1C' and 'DPDK'"
-      parameters:
-      - "result"
+    - title: "3n-skx-xxv710-imix-8t4c-ipsec-ip4routing-base-scale-dpdk"
+      output-file-name: "3n-skx-xxv710-imix-8t4c-ipsec-base-scale-sw-dpdk"
+      data: "plot-performance-trending-vpp-3n-skx"
+      include:
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-8t4c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-mrr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.8t4c-2t1c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-mrr"
       layout: "plot-cpta"
 
-    - title: "DPDK 4T2C 64B MRR Trending 3n-skx"
-      output-file-name: "dpdk-64b-4t2c-x710-3n-skx"
-      data: "plot-performance-trending-dpdk-3n-skx"
-      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T2C' and 'DPDK'"
-      parameters:
-      - "result"
+    - title: "3n-skx-xxv710-1518b-2t1c-ipsec-ip4routing-base-scale-avf"
+      output-file-name: "3n-skx-xxv710-1518b-2t1c-ipsec-base-scale-sw-avf"
+      data: "plot-performance-trending-vpp-3n-skx"
+      include:
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.1518b-2t1c-avf-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-mrr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.1518b-2t1c-avf-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.1518b-2t1c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-mrr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.1518b-2t1c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.1518b-2t1c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-mrr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.1518b-2t1c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
       layout: "plot-cpta"
 
-    - title: "DPDK 8T4C 64B MRR Trending 3n-skx"
-      output-file-name: "dpdk-64b-8t4c-x710-3n-skx"
-      data: "plot-performance-trending-dpdk-3n-skx"
-      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '8T4C' and 'DPDK'"
-      parameters:
-      - "result"
+    - title: "3n-skx-xxv710-1518b-4t2c-ipsec-ip4routing-base-scale-avf"
+      output-file-name: "3n-skx-xxv710-1518b-4t2c-ipsec-base-scale-sw-avf"
+      data: "plot-performance-trending-vpp-3n-skx"
+      include:
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.1518b-4t2c-avf-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-mrr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.1518b-4t2c-avf-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.1518b-4t2c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-mrr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.1518b-4t2c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.1518b-4t2c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-mrr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.1518b-4t2c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
       layout: "plot-cpta"
 
-## DPDK - x710 - IMIX
-#
-#    - title: "DPDK 2T1C IMIX MRR Trending 3n-skx"
-#      output-file-name: "dpdk-imix-2t1c-x710-3n-skx"
-#      data: "plot-performance-trending-dpdk-3n-skx"
-#      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '2T1C' and 'DPDK'"
-#      parameters:
-#      - "result"
-#      layout: "plot-cpta"
-#
-#    - title: "DPDK 4T2C IMIX MRR Trending 3n-skx"
-#      output-file-name: "dpdk-imix-4t2c-x710-3n-skx"
-#      data: "plot-performance-trending-dpdk-3n-skx"
-#      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '4T2C' and 'DPDK'"
-#      parameters:
-#      - "result"
-#      layout: "plot-cpta"
-#
-#    - title: "DPDK 8T4C IMIX MRR Trending 3n-skx"
-#      output-file-name: "dpdk-imix-8t4c-x710-3n-skx"
-#      data: "plot-performance-trending-dpdk-3n-skx"
-#      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '8T4C' and 'DPDK'"
-#      parameters:
-#      - "result"
-#      layout: "plot-cpta"
-
-# DPDK - xxv710 - 64B
-
-    - title: "DPDK 2T1C 64B MRR Trending 3n-skx"
-      output-file-name: "dpdk-64b-2t1c-xxv710-3n-skx"
-      data: "plot-performance-trending-dpdk-3n-skx"
-      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '2T1C' and 'DPDK'"
-      parameters:
-      - "result"
+    - title: "3n-skx-xxv710-1518b-8t4c-ipsec-ip4routing-base-scale-avf"
+      output-file-name: "3n-skx-xxv710-1518b-8t4c-ipsec-base-scale-sw-avf"
+      data: "plot-performance-trending-vpp-3n-skx"
+      include:
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.1518b-8t4c-avf-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-mrr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.1518b-8t4c-avf-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.1518b-8t4c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-mrr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.1518b-8t4c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.8t4c-2t1c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-mrr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.1518b-8t4c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
       layout: "plot-cpta"
 
-    - title: "DPDK 4T2C 64B MRR Trending 3n-skx"
-      output-file-name: "dpdk-64b-4t2c-xxv710-3n-skx"
-      data: "plot-performance-trending-dpdk-3n-skx"
-      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '4T2C' and 'DPDK'"
-      parameters:
-      - "result"
+    - title: "3n-skx-xxv710-1518b-2t1c-ipsec-ip4routing-base-scale-dpdk"
+      output-file-name: "3n-skx-xxv710-1518b-2t1c-ipsec-base-scale-sw-dpdk"
+      data: "plot-performance-trending-vpp-3n-skx"
+      include:
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.1518b-2t1c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-mrr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.1518b-2t1c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-mrr"
       layout: "plot-cpta"
 
-    - title: "DPDK 8T4C 64B MRR Trending 3n-skx"
-      output-file-name: "dpdk-64b-8t4c-xxv710-3n-skx"
-      data: "plot-performance-trending-dpdk-3n-skx"
-      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '8T4C' and 'DPDK'"
-      parameters:
-      - "result"
+    - title: "3n-skx-xxv710-1518b-4t2c-ipsec-ip4routing-base-scale-dpdk"
+      output-file-name: "3n-skx-xxv710-1518b-4t2c-ipsec-base-scale-sw-dpdk"
+      data: "plot-performance-trending-vpp-3n-skx"
+      include:
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.1518b-4t2c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-mrr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.1518b-4t2c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-mrr"
       layout: "plot-cpta"
 
-## DPDK - xxv710 - IMIX
-#
-#    - title: "DPDK 2T1C IMIX MRR Trending 3n-skx"
-#      output-file-name: "dpdk-imix-2t1c-xxv710-3n-skx"
-#      data: "plot-performance-trending-dpdk-3n-skx"
-#      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '2T1C' and 'DPDK'"
-#      parameters:
-#      - "result"
-#      layout: "plot-cpta"
-#
-#    - title: "DPDK 4T2C IMIX MRR Trending 3n-skx"
-#      output-file-name: "dpdk-imix-4t2c-xxv710-3n-skx"
-#      data: "plot-performance-trending-dpdk-3n-skx"
-#      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '4T2C' and 'DPDK'"
-#      parameters:
-#      - "result"
-#      layout: "plot-cpta"
-#
-#    - title: "DPDK 8T4C IMIX MRR Trending 3n-skx"
-#      output-file-name: "dpdk-imix-8t4c-xxv710-3n-skx"
-#      data: "plot-performance-trending-dpdk-3n-skx"
-#      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '8T4C' and 'DPDK'"
-#      parameters:
-#      - "result"
-#      layout: "plot-cpta"
-
-################################################################################
-# 2n-skx
-
-# L2 - x710
-
-    - title: "VPP 2T1C L2 64B MRR Trending 2n-skx"
-      output-file-name: "l2-2t1c-x710-2n-skx"
+    - title: "3n-skx-xxv710-1518b-8t4c-ipsec-ip4routing-base-scale-dpdk"
+      output-file-name: "3n-skx-xxv710-1518b-8t4c-ipsec-base-scale-sw-dpdk"
+      data: "plot-performance-trending-vpp-3n-skx"
+      include:
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.1518b-8t4c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-mrr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.8t4c-2t1c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-mrr"
+      layout: "plot-cpta"
+
+    - title: "3n-tsh-x520-imix-1t1c-ipsec-ip4routing-base-scale-sw-ixgbe"
+      output-file-name: "3n-tsh-x520-imix-1t1c-ipsec-base-scale-sw-ixgbe"
+      data: "plot-performance-trending-vpp-3n-tsh"
+      include:
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-1t1c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-mrr"
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-1t1c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-1t1c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-mrr"
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-1t1c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-1t1c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-mrr"
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-1t1c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
+      layout: "plot-cpta"
+
+    - title: "3n-tsh-x520-imix-2t2c-ipsec-ip4routing-base-scale-sw-ixgbe"
+      output-file-name: "3n-tsh-x520-imix-2t2c-ipsec-base-scale-sw-ixgbe"
+      data: "plot-performance-trending-vpp-3n-tsh"
+      include:
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-2t2c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-mrr"
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-2t2c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-2t2c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-mrr"
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-2t2c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-2t2c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-mrr"
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-2t2c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
+      layout: "plot-cpta"
+
+    - title: "3n-tsh-x520-imix-4t4c-ipsec-ip4routing-base-scale-sw-ixgbe"
+      output-file-name: "3n-tsh-x520-imix-4t4c-ipsec-base-scale-sw-ixgbe"
+      data: "plot-performance-trending-vpp-3n-tsh"
+      include:
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-4t4c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-mrr"
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-4t4c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-4t4c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-mrr"
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-4t4c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.IMIX-4t4c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-mrr"
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.IMIX-4t4c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
+      layout: "plot-cpta"
+
+    - title: "3n-tsh-x520-1518b-1t1c-ipsec-ip4routing-base-scale-sw-ixgbe"
+      output-file-name: "3n-tsh-x520-1518b-1t1c-ipsec-base-scale-sw-ixgbe"
+      data: "plot-performance-trending-vpp-3n-tsh"
+      include:
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.1518b-1t1c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-mrr"
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.1518b-1t1c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.1518b-1t1c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-mrr"
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.1518b-1t1c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.1518b-1t1c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-mrr"
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.1518b-1t1c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
+      layout: "plot-cpta"
+
+    - title: "3n-tsh-x520-1518b-2t2c-ipsec-ip4routing-base-scale-sw-ixgbe"
+      output-file-name: "3n-tsh-x520-1518b-2t2c-ipsec-base-scale-sw-ixgbe"
+      data: "plot-performance-trending-vpp-3n-tsh"
+      include:
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.1518b-2t2c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-mrr"
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.1518b-2t2c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.1518b-2t2c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-mrr"
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.1518b-2t2c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.1518b-2t2c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-mrr"
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.1518b-2t2c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
+      layout: "plot-cpta"
+
+    - title: "3n-tsh-x520-1518b-4t4c-ipsec-ip4routing-base-scale-sw-ixgbe"
+      output-file-name: "3n-tsh-x520-1518b-4t4c-ipsec-base-scale-sw-ixgbe"
+      data: "plot-performance-trending-vpp-3n-tsh"
+      include:
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.1518b-4t4c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-mrr"
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.1518b-4t4c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.1518b-4t4c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-mrr"
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.1518b-4t4c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-mrr.1518b-4t4c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-mrr"
+        - "Tests.Vpp.Perf.Crypto.10Ge2P1X520-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-mrr.1518b-4t4c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-x710-64b-2t1c-l2switching-base-scale-avf-dpdk"
+      output-file-name: "2n-clx-x710-64b-2t1c-l2-base-scale-avf"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Bdbasemaclrn-mrr.64B-2t1c-avf-eth-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdbasemaclrn-mrr.64B-2t1c-eth-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-avf-Eth-L2Bdscale1Mmaclrn-Mrr.64B-2t1c-avf-eth-l2bdscale1mmaclrn-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-x710-64b-4t2c-l2switching-base-scale-avf-dpdk"
+      output-file-name: "2n-clx-x710-64b-4t2c-l2-base-scale-avf"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Bdbasemaclrn-mrr.64B-4t2c-avf-eth-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdbasemaclrn-mrr.64B-4t2c-eth-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-avf-Eth-L2Bdscale1Mmaclrn-Mrr.64B-4t2c-avf-eth-l2bdscale1mmaclrn-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-x710-64b-8t4c-l2switching-base-scale-avf-dpdk"
+      output-file-name: "2n-clx-x710-64b-8t4c-l2-base-scale-avf"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Bdbasemaclrn-mrr.64B-8t4c-avf-eth-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdbasemaclrn-mrr.64B-8t4c-eth-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-avf-Eth-L2Bdscale1Mmaclrn-Mrr.64B-8t4c-avf-eth-l2bdscale1mmaclrn-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-2t1c-l2switching-base-avf"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-l2-base-avf"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Patch-mrr.64B-2t1c-avf-eth-l2patch-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-mrr.64B-2t1c-avf-eth-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-mrr.64B-2t1c-avf-eth-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-mrr.64B-2t1c-avf-dot1q-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-mrr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-4t2c-l2switching-base-avf"
+      output-file-name: "2n-clx-xxv710-64b-4t2c-l2-base-avf"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Patch-mrr.64B-4t2c-avf-eth-l2patch-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-mrr.64B-4t2c-avf-eth-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-mrr.64B-4t2c-avf-eth-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-mrr.64B-4t2c-avf-dot1q-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-mrr.64B-4t2c-avf-dot1q-l2bdbasemaclrn-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-8t4c-l2switching-base-avf"
+      output-file-name: "2n-clx-xxv710-64b-8t4c-l2-base-avf"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Patch-mrr.64B-8t4c-avf-eth-l2patch-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-mrr.64B-8t4c-avf-eth-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-mrr.64B-8t4c-avf-eth-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-mrr.64B-8t4c-avf-dot1q-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-mrr.64B-8t4c-avf-dot1q-l2bdbasemaclrn-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-2t1c-l2switching-base-dpdk"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-l2-base-dpdk"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Patch-mrr.64B-2t1c-eth-l2patch-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-mrr.64B-2t1c-eth-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-mrr.64B-2t1c-eth-l2bdbasemaclrn-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-4t2c-l2switching-base-dpdk"
+      output-file-name: "2n-clx-xxv710-64b-4t2c-l2-base-dpdk"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Patch-mrr.64B-4t2c-eth-l2patch-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-mrr.64B-4t2c-eth-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-mrr.64B-4t2c-eth-l2bdbasemaclrn-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-8t4c-l2switching-base-dpdk"
+      output-file-name: "2n-clx-xxv710-64b-8t4c-l2-base-dpdk"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Patch-mrr.64B-8t4c-eth-l2patch-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-mrr.64B-8t4c-eth-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-mrr.64B-8t4c-eth-l2bdbasemaclrn-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-2t1c-l2switching-base-scale-avf"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-l2-base-scale-avf"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-mrr.64B-2t1c-avf-eth-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale10Kmaclrn-mrr.64B-2t1c-avf-eth-l2bdscale10kmaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale100Kmaclrn-mrr.64B-2t1c-avf-eth-l2bdscale100kmaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale1Mmaclrn-mrr.64B-2t1c-avf-eth-l2bdscale1mmaclrn-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-4t2c-l2switching-base-scale-avf"
+      output-file-name: "2n-clx-xxv710-64b-4t2c-l2-base-scale-avf"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-mrr.64B-4t2c-avf-eth-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale10Kmaclrn-mrr.64B-4t2c-avf-eth-l2bdscale10kmaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale100Kmaclrn-mrr.64B-4t2c-avf-eth-l2bdscale100kmaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale1Mmaclrn-mrr.64B-4t2c-avf-eth-l2bdscale1mmaclrn-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-8t4c-l2switching-base-scale-avf"
+      output-file-name: "2n-clx-xxv710-64b-8t4c-l2-base-scale-avf"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-mrr.64B-8t4c-avf-eth-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale10Kmaclrn-mrr.64B-8t4c-avf-eth-l2bdscale10kmaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale100Kmaclrn-mrr.64B-8t4c-avf-eth-l2bdscale100kmaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale1Mmaclrn-mrr.64B-8t4c-avf-eth-l2bdscale1mmaclrn-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-2t1c-l2switching-base-scale-dpdk"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-l2-base-scale-dpdk"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-mrr.64B-2t1c-eth-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale10Kmaclrn-mrr.64B-2t1c-eth-l2bdscale10kmaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale100Kmaclrn-mrr.64B-2t1c-eth-l2bdscale100kmaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale1Mmaclrn-mrr.64B-2t1c-eth-l2bdscale1mmaclrn-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-4t2c-l2switching-base-scale-dpdk"
+      output-file-name: "2n-clx-xxv710-64b-4t2c-l2-base-scale-dpdk"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-mrr.64B-4t2c-eth-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale10Kmaclrn-mrr.64B-4t2c-eth-l2bdscale10kmaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale100Kmaclrn-mrr.64B-4t2c-eth-l2bdscale100kmaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale1Mmaclrn-mrr.64B-4t2c-eth-l2bdscale1mmaclrn-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-8t4c-l2switching-base-scale-dpdk"
+      output-file-name: "2n-clx-xxv710-64b-8t4c-l2-base-scale-dpdk"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-mrr.64B-8t4c-eth-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale10Kmaclrn-mrr.64B-8t4c-eth-l2bdscale10kmaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale100Kmaclrn-mrr.64B-8t4c-eth-l2bdscale100kmaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale1Mmaclrn-mrr.64B-8t4c-eth-l2bdscale1mmaclrn-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-cx556a-64b-2t1c-rdma-l2switching-base"
+      output-file-name: "2n-clx-cx556a-64b-2t1c-rdma-l2switching-base"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Xcbase-Mrr.64B-2t1c-rdma-dot1q-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Bdbasemaclrn-Mrr.64B-2t1c-rdma-dot1q-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Patch-Mrr.64B-2t1c-rdma-eth-l2patch-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Xcbase-Mrr.64B-2t1c-rdma-eth-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdbasemaclrn-Mrr.64B-2t1c-rdma-eth-l2bdbasemaclrn-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-cx556a-64b-4t2c-rdma-l2switching-base"
+      output-file-name: "2n-clx-cx556a-64b-4t2c-rdma-l2switching-base"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Xcbase-Mrr.64B-4t2c-rdma-dot1q-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Bdbasemaclrn-Mrr.64B-4t2c-rdma-dot1q-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Patch-Mrr.64B-4t2c-rdma-eth-l2patch-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Xcbase-Mrr.64B-4t2c-rdma-eth-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdbasemaclrn-Mrr.64B-4t2c-rdma-eth-l2bdbasemaclrn-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-cx556a-64b-8t4c-rdma-l2switching-base"
+      output-file-name: "2n-clx-cx556a-64b-8t4c-rdma-l2switching-base"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Xcbase-Mrr.64B-8t4c-rdma-dot1q-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Bdbasemaclrn-Mrr.64B-8t4c-rdma-dot1q-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Patch-Mrr.64B-8t4c-rdma-eth-l2patch-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Xcbase-Mrr.64B-8t4c-rdma-eth-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdbasemaclrn-Mrr.64B-8t4c-rdma-eth-l2bdbasemaclrn-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-cx556a-64b-2t1c-rdma-l2switching-scale"
+      output-file-name: "2n-clx-cx556a-64b-2t1c-rdma-l2switching-scale"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdbasemaclrn-Mrr.64B-2t1c-rdma-eth-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdscale10Kmaclrn-Mrr.64B-2t1c-rdma-eth-l2bdscale10kmaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdscale100Kmaclrn-Mrr.64B-2t1c-rdma-eth-l2bdscale100kmaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdscale1Mmaclrn-Mrr.64B-2t1c-rdma-eth-l2bdscale1mmaclrn-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-cx556a-64b-4t2c-rdma-l2switching-scale"
+      output-file-name: "2n-clx-cx556a-64b-4t2c-rdma-l2switching-scale"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdbasemaclrn-Mrr.64B-4t2c-rdma-eth-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdscale10Kmaclrn-Mrr.64B-4t2c-rdma-eth-l2bdscale10kmaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdscale100Kmaclrn-Mrr.64B-4t2c-rdma-eth-l2bdscale100kmaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdscale1Mmaclrn-Mrr.64B-4t2c-rdma-eth-l2bdscale1mmaclrn-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-cx556a-64b-8t4c-rdma-l2switching-scale"
+      output-file-name: "2n-clx-cx556a-64b-8t4c-rdma-l2switching-scale"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdbasemaclrn-Mrr.64B-8t4c-rdma-eth-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdscale10Kmaclrn-Mrr.64B-8t4c-rdma-eth-l2bdscale10kmaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdscale100Kmaclrn-Mrr.64B-8t4c-rdma-eth-l2bdscale100kmaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdscale1Mmaclrn-Mrr.64B-8t4c-rdma-eth-l2bdscale1mmaclrn-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-dnv-x553-64b-1t1c-l2switching-base-scale-ixgbe"
+      output-file-name: "2n-dnv-x553-64b-1t1c-l2-base-scale-ixgbe"
+      data: "plot-performance-trending-vpp-2n-dnv"
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Eth-L2Patch-mrr.64B-1t1c-eth-l2patch-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Eth-L2Xcbase-mrr.64B-1t1c-eth-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Eth-L2Bdbasemaclrn-mrr.64B-1t1c-eth-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Eth-L2Bdscale10Kmaclrn-mrr.64B-1t1c-eth-l2bdscale10kmaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Eth-L2Bdscale100Kmaclrn-mrr.64B-1t1c-eth-l2bdscale100kmaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Eth-L2Bdscale1Mmaclrn-mrr.64B-1t1c-eth-l2bdscale1mmaclrn-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-dnv-x553-64b-2t2c-l2switching-base-scale-ixgbe"
+      output-file-name: "2n-dnv-x553-64b-2t2c-l2-base-scale-ixgbe"
+      data: "plot-performance-trending-vpp-2n-dnv"
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Eth-L2Patch-mrr.64B-2t2c-eth-l2patch-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Eth-L2Xcbase-mrr.64B-2t2c-eth-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Eth-L2Bdbasemaclrn-mrr.64B-2t2c-eth-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Eth-L2Bdscale10Kmaclrn-mrr.64B-2t2c-eth-l2bdscale10kmaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Eth-L2Bdscale100Kmaclrn-mrr.64B-2t2c-eth-l2bdscale100kmaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Eth-L2Bdscale1Mmaclrn-mrr.64B-2t2c-eth-l2bdscale1mmaclrn-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-dnv-x553-64b-4t4c-l2switching-base-scale-ixgbe"
+      output-file-name: "2n-dnv-x553-64b-4t4c-l2-base-scale-ixgbe"
+      data: "plot-performance-trending-vpp-2n-dnv"
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Eth-L2Patch-mrr.64B-4t4c-eth-l2patch-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Eth-L2Xcbase-mrr.64B-4t4c-eth-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Eth-L2Bdbasemaclrn-mrr.64B-4t4c-eth-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Eth-L2Bdscale10Kmaclrn-mrr.64B-4t4c-eth-l2bdscale10kmaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Eth-L2Bdscale100Kmaclrn-mrr.64B-4t4c-eth-l2bdscale100kmaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Eth-L2Bdscale1Mmaclrn-mrr.64B-4t4c-eth-l2bdscale1mmaclrn-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-skx-x710-64b-2t1c-l2switching-base-scale-avf"
+      output-file-name: "2n-skx-x710-64b-2t1c-l2-base-scale-avf"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF' and not 'POLICE_MARK'"
-      parameters:
-      - "result"
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Patch-Mrr.64B-2t1c-avf-eth-l2patch-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Xcbase-mrr.64B-2t1c-avf-eth-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Bdbasemaclrn-mrr.64B-2t1c-avf-eth-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Bdscale1Mmaclrn-Mrr.64B-2t1c-avf-eth-l2bdscale1mmaclrn-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C L2 64B MRR Trending 2n-skx"
-      output-file-name: "l2-4t2c-x710-2n-skx"
+    - title: "2n-skx-x710-64b-4t2c-l2switching-base-scale-avf"
+      output-file-name: "2n-skx-x710-64b-4t2c-l2-base-scale-avf"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF' and not 'POLICE_MARK'"
-      parameters:
-      - "result"
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Patch-Mrr.64B-4t2c-avf-eth-l2patch-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Xcbase-mrr.64B-4t2c-avf-eth-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Bdbasemaclrn-mrr.64B-4t2c-avf-eth-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Bdscale1Mmaclrn-Mrr.64B-4t2c-avf-eth-l2bdscale1mmaclrn-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C L2 64B MRR Trending 2n-skx"
-      output-file-name: "l2-8t4c-x710-2n-skx"
+    - title: "2n-skx-x710-64b-8t4c-l2switching-base-scale-avf"
+      output-file-name: "2n-skx-x710-64b-8t4c-l2-base-scale-avf"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '8T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF' and not 'POLICE_MARK'"
-      parameters:
-      - "result"
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Patch-Mrr.64B-8t4c-avf-eth-l2patch-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Xcbase-mrr.64B-8t4c-avf-eth-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Bdbasemaclrn-mrr.64B-8t4c-avf-eth-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Bdscale1Mmaclrn-Mrr.64B-8t4c-avf-eth-l2bdscale1mmaclrn-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 2T1C L2 64B MRR Trending 2n-skx"
-      output-file-name: "l2-feature-2t1c-x710-2n-skx"
+    - title: "2n-skx-x710-64b-2t1c-l2switching-base-scale-dpdk"
+      output-file-name: "2n-skx-x710-64b-2t1c-l2-base-scale-dpdk"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '2T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
-      parameters:
-      - "result"
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Patch-Mrr.64B-2t1c-eth-l2patch-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Xcbase-Mrr.64B-2t1c-eth-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdbasemaclrn-mrr.64B-2t1c-eth-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdscale1Mmaclrn-mrr.64B-2t1c-eth-l2bdscale1mmaclrn-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C L2 64B MRR Trending 2n-skx"
-      output-file-name: "l2-feature-4t2c-x710-2n-skx"
+    - title: "2n-skx-x710-64b-4t2c-l2switching-base-scale-dpdk"
+      output-file-name: "2n-skx-x710-64b-4t2c-l2-base-scale-dpdk"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '4T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
-      parameters:
-      - "result"
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Patch-Mrr.64B-4t2c-eth-l2patch-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Xcbase-Mrr.64B-4t2c-eth-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdbasemaclrn-mrr.64B-4t2c-eth-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdscale1Mmaclrn-mrr.64B-4t2c-eth-l2bdscale1mmaclrn-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C L2 64B MRR Trending 2n-skx"
-      output-file-name: "l2-feature-8t4c-x710-2n-skx"
+    - title: "2n-skx-x710-64b-8t4c-l2switching-base-scale-dpdk"
+      output-file-name: "2n-skx-x710-64b-8t4c-l2-base-scale-dpdk"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '8T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
-      parameters:
-      - "result"
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Patch-Mrr.64B-8t4c-eth-l2patch-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Xcbase-Mrr.64B-8t4c-eth-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdbasemaclrn-mrr.64B-8t4c-eth-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdscale1Mmaclrn-mrr.64B-8t4c-eth-l2bdscale1mmaclrn-mrr"
       layout: "plot-cpta"
 
-# L2 - xxv710
-
-    - title: "VPP 2T1C L2 64B MRR Trending 2n-skx"
-      output-file-name: "l2-2t1c-xxv710-2n-skx"
+    - title: "2n-skx-xxv710-64b-2t1c-l2switching-base-avf"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-l2-base-avf"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'MEMIF' and not 'POLICE_MARK' and not 'DRV_AVF'"
-      parameters:
-      - "result"
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Mrr.64B-2t1c-avf-dot1q-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-mrr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Patch-mrr.64B-2t1c-avf-eth-l2patch-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-mrr.64B-2t1c-avf-eth-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-mrr.64B-2t1c-avf-eth-l2bdbasemaclrn-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C L2 64B MRR Trending 2n-skx"
-      output-file-name: "l2-4t2c-xxv710-2n-skx"
+    - title: "2n-skx-xxv710-64b-4t2c-l2switching-base-avf"
+      output-file-name: "2n-skx-xxv710-64b-4t2c-l2-base-avf"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'MEMIF' and not 'POLICE_MARK' and not 'DRV_AVF'"
-      parameters:
-      - "result"
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Mrr.64B-4t2c-avf-dot1q-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-mrr.64B-4t2c-avf-dot1q-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Patch-mrr.64B-4t2c-avf-eth-l2patch-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-mrr.64B-4t2c-avf-eth-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-mrr.64B-4t2c-avf-eth-l2bdbasemaclrn-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C L2 64B MRR Trending 2n-skx"
-      output-file-name: "l2-8t4c-xxv710-2n-skx"
+    - title: "2n-skx-xxv710-64b-8t4c-l2switching-base-avf"
+      output-file-name: "2n-skx-xxv710-64b-8t4c-l2-base-avf"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '8T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'MEMIF' and not 'POLICE_MARK' and not 'DRV_AVF'"
-      parameters:
-      - "result"
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Mrr.64B-8t4c-avf-dot1q-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-mrr.64B-8t4c-avf-dot1q-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Patch-mrr.64B-8t4c-avf-eth-l2patch-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-mrr.64B-8t4c-avf-eth-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-mrr.64B-8t4c-avf-eth-l2bdbasemaclrn-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 2T1C L2 64B MRR Trending 2n-skx"
-      output-file-name: "l2-feature-2t1c-xxv710-2n-skx"
+    - title: "2n-skx-xxv710-64b-2t1c-l2switching-base-dpdk"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-l2-base-dpdk"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'FEATURE' and '2T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
-      parameters:
-      - "result"
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Patch-mrr.64B-2t1c-eth-l2patch-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-mrr.64B-2t1c-eth-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-mrr.64B-2t1c-eth-l2bdbasemaclrn-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C L2 64B MRR Trending 2n-skx"
-      output-file-name: "l2-feature-4t2c-xxv710-2n-skx"
+    - title: "2n-skx-xxv710-64b-4t2c-l2switching-base-dpdk"
+      output-file-name: "2n-skx-xxv710-64b-4t2c-l2-base-dpdk"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'FEATURE' and '4T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
-      parameters:
-      - "result"
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Patch-mrr.64B-4t2c-eth-l2patch-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-mrr.64B-4t2c-eth-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-mrr.64B-4t2c-eth-l2bdbasemaclrn-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C L2 64B MRR Trending 2n-skx"
-      output-file-name: "l2-feature-8t4c-xxv710-2n-skx"
+    - title: "2n-skx-xxv710-64b-8t4c-l2switching-base-dpdk"
+      output-file-name: "2n-skx-xxv710-64b-8t4c-l2-base-dpdk"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'FEATURE' and '8T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
-      parameters:
-      - "result"
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Patch-mrr.64B-8t4c-eth-l2patch-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-mrr.64B-8t4c-eth-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-mrr.64B-8t4c-eth-l2bdbasemaclrn-mrr"
       layout: "plot-cpta"
 
-# IPv4 - x710
-
-    - title: "VPP 2T1C IPv4 64B MRR Trending 2n-skx"
-      output-file-name: "ip4-2t1c-x710-2n-skx"
+    - title: "2n-skx-xxv710-64b-2t1c-l2switching-base-scale-avf"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-l2-base-scale-avf"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T1C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK'"
-      parameters:
-      - "result"
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-mrr.64B-2t1c-avf-eth-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale10Kmaclrn-mrr.64B-2t1c-avf-eth-l2bdscale10kmaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale100Kmaclrn-mrr.64B-2t1c-avf-eth-l2bdscale100kmaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale1Mmaclrn-mrr.64B-2t1c-avf-eth-l2bdscale1mmaclrn-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C IPv4 64B MRR Trending 2n-skx"
-      output-file-name: "ip4-4t2c-x710-2n-skx"
+    - title: "2n-skx-xxv710-64b-4t2c-l2switching-base-scale-avf"
+      output-file-name: "2n-skx-xxv710-64b-4t2c-l2-base-scale-avf"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T2C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK'"
-      parameters:
-      - "result"
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-mrr.64B-4t2c-avf-eth-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale10Kmaclrn-mrr.64B-4t2c-avf-eth-l2bdscale10kmaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale100Kmaclrn-mrr.64B-4t2c-avf-eth-l2bdscale100kmaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale1Mmaclrn-mrr.64B-4t2c-avf-eth-l2bdscale1mmaclrn-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C IPv4 64B MRR Trending 2n-skx"
-      output-file-name: "ip4-8t4c-x710-2n-skx"
+    - title: "2n-skx-xxv710-64b-8t4c-l2switching-base-scale-avf"
+      output-file-name: "2n-skx-xxv710-64b-8t4c-l2-base-scale-avf"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '8T4C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK'"
-      parameters:
-      - "result"
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-mrr.64B-8t4c-avf-eth-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale10Kmaclrn-mrr.64B-8t4c-avf-eth-l2bdscale10kmaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale100Kmaclrn-mrr.64B-8t4c-avf-eth-l2bdscale100kmaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale1Mmaclrn-mrr.64B-8t4c-avf-eth-l2bdscale1mmaclrn-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 2T1C IPv4 64B MRR Trending 2n-skx"
-      output-file-name: "ip4-feature-2t1c-x710-2n-skx"
+    - title: "2n-skx-xxv710-64b-2t1c-l2switching-base-scale-dpdk"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-l2-base-scale-dpdk"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '2T1C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
-      parameters:
-      - "result"
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-mrr.64B-2t1c-eth-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale10Kmaclrn-mrr.64B-2t1c-eth-l2bdscale10kmaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale100Kmaclrn-mrr.64B-2t1c-eth-l2bdscale100kmaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale1Mmaclrn-mrr.64B-2t1c-eth-l2bdscale1mmaclrn-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C IPv4 64B MRR Trending 2n-skx"
-      output-file-name: "ip4-feature-4t2c-x710-2n-skx"
+    - title: "2n-skx-xxv710-64b-4t2c-l2switching-base-scale-dpdk"
+      output-file-name: "2n-skx-xxv710-64b-4t2c-l2-base-scale-dpdk"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '4T2C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
-      parameters:
-      - "result"
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-mrr.64B-4t2c-eth-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale10Kmaclrn-mrr.64B-4t2c-eth-l2bdscale10kmaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale100Kmaclrn-mrr.64B-4t2c-eth-l2bdscale100kmaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale1Mmaclrn-mrr.64B-4t2c-eth-l2bdscale1mmaclrn-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C IPv4 64B MRR Trending 2n-skx"
-      output-file-name: "ip4-feature-8t4c-x710-2n-skx"
+    - title: "2n-skx-xxv710-64b-8t4c-l2switching-base-scale-dpdk"
+      output-file-name: "2n-skx-xxv710-64b-8t4c-l2-base-scale-dpdk"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '8T4C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
-      parameters:
-      - "result"
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-mrr.64B-8t4c-eth-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale10Kmaclrn-mrr.64B-8t4c-eth-l2bdscale10kmaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale100Kmaclrn-mrr.64B-8t4c-eth-l2bdscale100kmaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale1Mmaclrn-mrr.64B-8t4c-eth-l2bdscale1mmaclrn-mrr"
+      layout: "plot-cpta"
+
+    - title: "3n-dnv-x553-64b-1t1c-l2switching-base-scale-ixgbe"
+      output-file-name: "3n-dnv-x553-64b-1t1c-l2-base-scale-ixgbe"
+      data: "plot-performance-trending-vpp-3n-dnv"
+      include:
+        - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Patch-mrr.64B-1t1c-eth-l2patch-mrr"
+        - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Xcbase-mrr.64B-1t1c-eth-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdbasemaclrn-mrr.64B-1t1c-eth-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdscale10Kmaclrn-mrr.64B-1t1c-eth-l2bdscale10kmaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdscale100Kmaclrn-mrr.64B-1t1c-eth-l2bdscale100kmaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdscale1Mmaclrn-mrr.64B-1t1c-eth-l2bdscale1mmaclrn-mrr"
+      layout: "plot-cpta"
+
+    - title: "3n-dnv-x553-64b-2t2c-l2switching-base-scale-ixgbe"
+      output-file-name: "3n-dnv-x553-64b-2t2c-l2-base-scale-ixgbe"
+      data: "plot-performance-trending-vpp-3n-dnv"
+      include:
+        - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Patch-mrr.64B-2t2c-eth-l2patch-mrr"
+        - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Xcbase-mrr.64B-2t2c-eth-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdbasemaclrn-mrr.64B-2t2c-eth-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdscale10Kmaclrn-mrr.64B-2t2c-eth-l2bdscale10kmaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdscale100Kmaclrn-mrr.64B-2t2c-eth-l2bdscale100kmaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdscale1Mmaclrn-mrr.64B-2t2c-eth-l2bdscale1mmaclrn-mrr"
+      layout: "plot-cpta"
+
+    - title: "3n-dnv-x553-64b-4t4c-l2switching-base-scale-ixgbe"
+      output-file-name: "3n-dnv-x553-64b-4t4c-l2-base-scale-ixgbe"
+      data: "plot-performance-trending-vpp-3n-dnv"
+      include:
+        - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Patch-mrr.64B-4t4c-eth-l2patch-mrr"
+        - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Xcbase-mrr.64B-4t4c-eth-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdbasemaclrn-mrr.64B-4t4c-eth-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdscale10Kmaclrn-mrr.64B-4t4c-eth-l2bdscale10kmaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdscale100Kmaclrn-mrr.64B-4t4c-eth-l2bdscale100kmaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdscale1Mmaclrn-mrr.64B-4t4c-eth-l2bdscale1mmaclrn-mrr"
+      layout: "plot-cpta"
+
+    - title: "3n-hsw-xl710-64b-1t1c-l2switching-base-scale-dpdk"
+      output-file-name: "3n-hsw-xl710-64b-1t1c-l2-base-scale-dpdk"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      include:
+        - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Patch-mrr.64B-1t1c-eth-l2patch-mrr"
+        - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Dot1Q-L2Xcbase-mrr.64B-1t1c-dot1q-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Xcbase-mrr.64B-1t1c-eth-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Dot1Q-L2Bdbasemaclrn-mrr.64B-1t1c-dot1q-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Bdbasemaclrn-mrr.64B-1t1c-eth-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Bdscale1Mmaclrn-mrr.64B-1t1c-eth-l2bdscale1mmaclrn-mrr"
+      layout: "plot-cpta"
+
+    - title: "3n-hsw-xl710-64b-2t2c-l2switching-base-scale-dpdk"
+      output-file-name: "3n-hsw-xl710-64b-2t2c-l2-base-scale-dpdk"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      include:
+        - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Patch-mrr.64B-2t2c-eth-l2patch-mrr"
+        - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Dot1Q-L2Xcbase-mrr.64B-2t2c-dot1q-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Xcbase-mrr.64B-2t2c-eth-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Dot1Q-L2Bdbasemaclrn-mrr.64B-2t2c-dot1q-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Bdbasemaclrn-mrr.64B-2t2c-eth-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Bdscale1Mmaclrn-mrr.64B-2t2c-eth-l2bdscale1mmaclrn-mrr"
+      layout: "plot-cpta"
+
+    - title: "3n-hsw-xl710-64b-4t4c-l2switching-base-scale-dpdk"
+      output-file-name: "3n-hsw-xl710-64b-4t4c-l2-base-scale-dpdk"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      include:
+        - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Patch-mrr.64B-4t4c-eth-l2patch-mrr"
+        - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Dot1Q-L2Xcbase-mrr.64B-4t4c-dot1q-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Xcbase-mrr.64B-4t4c-eth-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Dot1Q-L2Bdbasemaclrn-mrr.64B-4t4c-dot1q-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Bdbasemaclrn-mrr.64B-4t4c-eth-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Bdscale1Mmaclrn-mrr.64B-4t4c-eth-l2bdscale1mmaclrn-mrr"
+      layout: "plot-cpta"
+
+    - title: "3n-skx-x710-64b-2t1c-l2switching-base-scale-avf"
+      output-file-name: "3n-skx-x710-64b-2t1c-l2-base-scale-avf"
+      data: "plot-performance-trending-vpp-3n-skx"
+      include:
+        - "Tests.Vpp.Perf.L2.10Ge2P1X710-Avf-Eth-L2Patch-Mrr.64B-2t1c-avf-eth-l2patch-mrr"
+        - "Tests.Vpp.Perf.L2.10Ge2P1X710-Avf-Eth-L2Xcbase-Mrr.64B-2t1c-avf-eth-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.L2.10Ge2P1X710-Avf-Eth-L2Bdbasemaclrn-Mrr.64B-2t1c-avf-eth-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.10Ge2P1X710-Avf-Eth-L2Bdscale1Mmaclrn-Mrr.64B-2t1c-avf-eth-l2bdscale1mmaclrn-mrr"
       layout: "plot-cpta"
 
-# IPv4 - xxv710
-
-    - title: "VPP 2T1C IPv4 64B MRR Trending 2n-skx"
-      output-file-name: "ip4-2t1c-xxv710-2n-skx"
-      data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T1C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK'"
-      parameters:
-      - "result"
+    - title: "3n-skx-x710-64b-4t2c-l2switching-base-scale-avf"
+      output-file-name: "3n-skx-x710-64b-4t2c-l2-base-scale-avf"
+      data: "plot-performance-trending-vpp-3n-skx"
+      include:
+        - "Tests.Vpp.Perf.L2.10Ge2P1X710-Avf-Eth-L2Patch-Mrr.64B-4t2c-avf-eth-l2patch-mrr"
+        - "Tests.Vpp.Perf.L2.10Ge2P1X710-Avf-Eth-L2Xcbase-Mrr.64B-4t2c-avf-eth-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.L2.10Ge2P1X710-Avf-Eth-L2Bdbasemaclrn-Mrr.64B-4t2c-avf-eth-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.10Ge2P1X710-Avf-Eth-L2Bdscale1Mmaclrn-Mrr.64B-4t2c-avf-eth-l2bdscale1mmaclrn-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C IPv4 64B MRR Trending 2n-skx"
-      output-file-name: "ip4-4t2c-xxv710-2n-skx"
-      data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T2C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK'"
-      parameters:
-      - "result"
+    - title: "3n-skx-x710-64b-8t4c-l2switching-base-scale-avf"
+      output-file-name: "3n-skx-x710-64b-8t4c-l2-base-scale-avf"
+      data: "plot-performance-trending-vpp-3n-skx"
+      include:
+        - "Tests.Vpp.Perf.L2.10Ge2P1X710-Avf-Eth-L2Patch-Mrr.64B-8t4c-avf-eth-l2patch-mrr"
+        - "Tests.Vpp.Perf.L2.10Ge2P1X710-Avf-Eth-L2Xcbase-Mrr.64B-8t4c-avf-eth-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.L2.10Ge2P1X710-Avf-Eth-L2Bdbasemaclrn-Mrr.64B-8t4c-avf-eth-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.10Ge2P1X710-Avf-Eth-L2Bdscale1Mmaclrn-Mrr.64B-8t4c-avf-eth-l2bdscale1mmaclrn-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C IPv4 64B MRR Trending 2n-skx"
-      output-file-name: "ip4-8t4c-xxv710-2n-skx"
-      data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '8T4C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK'"
-      parameters:
-      - "result"
+    - title: "3n-skx-xxv710-64b-2t1c-l2switching-base-avf"
+      output-file-name: "3n-skx-xxv710-64b-2t1c-l2-base-avf"
+      data: "plot-performance-trending-vpp-3n-skx"
+      include:
+        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Mrr.64B-2t1c-avf-dot1q-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Mrr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Patch-Mrr.64B-2t1c-avf-eth-l2patch-mrr"
+        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Mrr.64B-2t1c-avf-eth-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Mrr.64B-2t1c-avf-eth-l2bdbasemaclrn-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 2T1C IPv4 64B MRR Trending 2n-skx"
-      output-file-name: "ip4-feature-2t1c-xxv710-2n-skx"
-      data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'FEATURE' and '2T1C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
-      parameters:
-      - "result"
+    - title: "3n-skx-xxv710-64b-4t2c-l2switching-base-avf"
+      output-file-name: "3n-skx-xxv710-64b-4t2c-l2-base-avf"
+      data: "plot-performance-trending-vpp-3n-skx"
+      include:
+        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Mrr.64B-4t2c-avf-dot1q-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Mrr.64B-4t2c-avf-dot1q-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Patch-Mrr.64B-4t2c-avf-eth-l2patch-mrr"
+        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Mrr.64B-4t2c-avf-eth-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Mrr.64B-4t2c-avf-eth-l2bdbasemaclrn-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C IPv4 64B MRR Trending 2n-skx"
-      output-file-name: "ip4-feature-4t2c-xxv710-2n-skx"
-      data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'FEATURE' and '4T2C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
-      parameters:
-      - "result"
+    - title: "3n-skx-xxv710-64b-8t4c-l2switching-base-avf"
+      output-file-name: "3n-skx-xxv710-64b-8t4c-l2-base-avf"
+      data: "plot-performance-trending-vpp-3n-skx"
+      include:
+        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Mrr.64B-8t4c-avf-dot1q-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Mrr.64B-8t4c-avf-dot1q-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Patch-Mrr.64B-8t4c-avf-eth-l2patch-mrr"
+        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Mrr.64B-8t4c-avf-eth-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Mrr.64B-8t4c-avf-eth-l2bdbasemaclrn-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C IPv4 64B MRR Trending 2n-skx"
-      output-file-name: "ip4-feature-8t4c-xxv710-2n-skx"
-      data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'FEATURE' and '8T4C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
-      parameters:
-      - "result"
+    - title: "3n-skx-xxv710-64b-2t1c-l2switching-base-scale-avf"
+      output-file-name: "3n-skx-xxv710-64b-2t1c-l2-base-scale-avf"
+      data: "plot-performance-trending-vpp-3n-skx"
+      include:
+        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Mrr.64B-2t1c-avf-eth-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdscale10Kmaclrn-Mrr.64B-2t1c-avf-eth-l2bdscale10kmaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdscale100Kmaclrn-Mrr.64B-2t1c-avf-eth-l2bdscale100kmaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdscale1Mmaclrn-Mrr.64B-2t1c-avf-eth-l2bdscale1mmaclrn-mrr"
       layout: "plot-cpta"
 
-# IPv4 Tunnels - x710
-
-    - title: "VPP 2T1C IPv4 Tunnels 64B MRR Trending 2n-skx"
-      output-file-name: "ip4-tunnels-2t1c-x710-2n-skx"
-      data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and '64B' and 'ENCAP' and 'MRR' and '2T1C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
-      parameters:
-      - "result"
+    - title: "3n-skx-xxv710-64b-4t2c-l2switching-base-scale-avf"
+      output-file-name: "3n-skx-xxv710-64b-4t2c-l2-base-scale-avf"
+      data: "plot-performance-trending-vpp-3n-skx"
+      include:
+        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Mrr.64B-4t2c-avf-eth-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdscale10Kmaclrn-Mrr.64B-4t2c-avf-eth-l2bdscale10kmaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdscale100Kmaclrn-Mrr.64B-4t2c-avf-eth-l2bdscale100kmaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdscale1Mmaclrn-Mrr.64B-4t2c-avf-eth-l2bdscale1mmaclrn-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C IPv4 Tunnels 64B MRR Trending 2n-skx"
-      output-file-name: "ip4-tunnels-4t2c-x710-2n-skx"
-      data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and '64B' and 'ENCAP' and 'MRR' and '4T2C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
-      parameters:
-      - "result"
+    - title: "3n-skx-xxv710-64b-8t4c-l2switching-base-scale-avf"
+      output-file-name: "3n-skx-xxv710-64b-8t4c-l2-base-scale-avf"
+      data: "plot-performance-trending-vpp-3n-skx"
+      include:
+        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Mrr.64B-8t4c-avf-eth-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdscale10Kmaclrn-Mrr.64B-8t4c-avf-eth-l2bdscale10kmaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdscale100Kmaclrn-Mrr.64B-8t4c-avf-eth-l2bdscale100kmaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdscale1Mmaclrn-Mrr.64B-8t4c-avf-eth-l2bdscale1mmaclrn-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C IPv4 Tunnels 64B MRR Trending 2n-skx"
-      output-file-name: "ip4-tunnels-8t4c-x710-2n-skx"
-      data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and '64B' and 'ENCAP' and 'MRR' and '8T4C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
-      parameters:
-      - "result"
+    - title: "3n-skx-xxv710-64b-2t1c-l2switching-base-scale-avf-dpdk"
+      output-file-name: "3n-skx-xxv710-64b-2t1c-l2-base-scale-dpdk"
+      data: "plot-performance-trending-vpp-3n-skx"
+      include:
+        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Patch-mrr.64B-2t1c-eth-l2patch-mrr"
+        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Xcbase-mrr.64B-2t1c-eth-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-mrr.64B-2t1c-eth-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdscale1Mmaclrn-mrr.64B-2t1c-eth-l2bdscale1mmaclrn-mrr"
       layout: "plot-cpta"
 
-# IPv4 Tunnels - xxv710
+    - title: "3n-skx-xxv710-64b-4t2c-l2switching-base-scale-avf-dpdk"
+      output-file-name: "3n-skx-xxv710-64b-4t2c-l2-base-scale-dpdk"
+      data: "plot-performance-trending-vpp-3n-skx"
+      include:
+        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Patch-mrr.64B-4t2c-eth-l2patch-mrr"
+        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Xcbase-mrr.64B-4t2c-eth-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-mrr.64B-4t2c-eth-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdscale1Mmaclrn-mrr.64B-4t2c-eth-l2bdscale1mmaclrn-mrr"
+      layout: "plot-cpta"
 
-    - title: "VPP 2T1C IPv4 Tunnels 64B MRR Trending 2n-skx"
-      output-file-name: "ip4-tunnels-2t1c-xxv710-2n-skx"
-      data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and '64B' and 'ENCAP' and 'MRR' and '2T1C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
-      parameters:
-      - "result"
+    - title: "3n-skx-xxv710-64b-8t4c-l2switching-base-scale-avf-dpdk"
+      output-file-name: "3n-skx-xxv710-64b-8t4c-l2-base-scale-dpdk"
+      data: "plot-performance-trending-vpp-3n-skx"
+      include:
+        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Patch-mrr.64B-8t4c-eth-l2patch-mrr"
+        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Xcbase-mrr.64B-8t4c-eth-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-mrr.64B-8t4c-eth-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdscale1Mmaclrn-mrr.64B-8t4c-eth-l2bdscale1mmaclrn-mrr"
+      layout: "plot-cpta"
+
+    - title: "3n-tsh-x520-64b-1t1c-l2switching-base-ixgbe"
+      output-file-name: "3n-tsh-x520-64b-1t1c-l2-base-ixgbe"
+      data: "plot-performance-trending-vpp-3n-tsh"
+      include:
+        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Dot1Q-L2Xcbase-mrr.64B-1t1c-dot1q-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Dot1Q-L2Bdbasemaclrn-mrr.64B-1t1c-dot1q-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Patch-Mrr.64B-1t1c-eth-l2patch-mrr"
+        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Xcbase-mrr.64B-1t1c-eth-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-mrr.64B-1t1c-eth-l2bdbasemaclrn-mrr"
+      layout: "plot-cpta"
+
+    - title: "3n-tsh-x520-64b-2t2c-l2switching-base-ixgbe"
+      output-file-name: "3n-tsh-x520-64b-2t2c-l2-base-ixgbe"
+      data: "plot-performance-trending-vpp-3n-tsh"
+      include:
+        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Dot1Q-L2Xcbase-mrr.64B-2t2c-dot1q-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Dot1Q-L2Bdbasemaclrn-mrr.64B-2t2c-dot1q-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Patch-Mrr.64B-2t2c-eth-l2patch-mrr"
+        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Xcbase-mrr.64B-2t2c-eth-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-mrr.64B-2t2c-eth-l2bdbasemaclrn-mrr"
+      layout: "plot-cpta"
+
+    - title: "3n-tsh-x520-64b-4t4c-l2switching-base-ixgbe"
+      output-file-name: "3n-tsh-x520-64b-4t4c-l2-base-ixgbe"
+      data: "plot-performance-trending-vpp-3n-tsh"
+      include:
+        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Dot1Q-L2Xcbase-mrr.64B-4t4c-dot1q-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Dot1Q-L2Bdbasemaclrn-mrr.64B-4t4c-dot1q-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Patch-Mrr.64B-4t4c-eth-l2patch-mrr"
+        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Xcbase-mrr.64B-4t4c-eth-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-mrr.64B-4t4c-eth-l2bdbasemaclrn-mrr"
+      layout: "plot-cpta"
+
+    - title: "3n-tsh-x520-64b-1t1c-l2switching-base-scale-ixgbe"
+      output-file-name: "3n-tsh-x520-64b-1t1c-l2-base-scale-ixgbe"
+      data: "plot-performance-trending-vpp-3n-tsh"
+      include:
+        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Patch-mrr.64B-1t1c-eth-l2patch-mrr"
+        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Xcbase-mrr.64B-1t1c-eth-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-mrr.64B-1t1c-eth-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdscale10Kmaclrn-mrr.64B-1t1c-eth-l2bdscale10kmaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdscale100Kmaclrn-mrr.64B-1t1c-eth-l2bdscale100kmaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdscale1Mmaclrn-mrr.64B-1t1c-eth-l2bdscale1mmaclrn-mrr"
+      layout: "plot-cpta"
+
+    - title: "3n-tsh-x520-64b-2t2c-l2switching-base-scale-ixgbe"
+      output-file-name: "3n-tsh-x520-64b-2t2c-l2-base-scale-ixgbe"
+      data: "plot-performance-trending-vpp-3n-tsh"
+      include:
+        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Patch-mrr.64B-2t2c-eth-l2patch-mrr"
+        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Xcbase-mrr.64B-2t2c-eth-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-mrr.64B-2t2c-eth-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdscale10Kmaclrn-mrr.64B-2t2c-eth-l2bdscale10kmaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdscale100Kmaclrn-mrr.64B-2t2c-eth-l2bdscale100kmaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdscale1Mmaclrn-mrr.64B-2t2c-eth-l2bdscale1mmaclrn-mrr"
+      layout: "plot-cpta"
+
+    - title: "3n-tsh-x520-64b-4t4c-l2switching-base-scale-ixgbe"
+      output-file-name: "3n-tsh-x520-64b-4t4c-l2-base-scale-ixgbe"
+      data: "plot-performance-trending-vpp-3n-tsh"
+      include:
+        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Patch-mrr.64B-4t4c-eth-l2patch-mrr"
+        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Xcbase-mrr.64B-4t4c-eth-l2xcbase-mrr"
+        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-mrr.64B-4t4c-eth-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdscale10Kmaclrn-mrr.64B-4t4c-eth-l2bdscale10kmaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdscale100Kmaclrn-mrr.64B-4t4c-eth-l2bdscale100kmaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdscale1Mmaclrn-mrr.64B-4t4c-eth-l2bdscale1mmaclrn-mrr"
+      layout: "plot-cpta"
+
+    - title: "3n-tsh-x520-64b-1t1c-features-l2switching-base-ixgbe"
+      output-file-name: "3n-tsh-x520-64b-1t1c-l2-features-ixgbe"
+      data: "plot-performance-trending-vpp-3n-tsh"
+      include:
+        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-mrr.64B-1t1c-eth-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Iacl50Sf-10Kflows-mrr.64B-1t1c-eth-l2bdbasemaclrn-iacl50sf-10kflows-mrr"
+        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Iacl50Sl-10Kflows-mrr.64B-1t1c-eth-l2bdbasemaclrn-iacl50sl-10kflows-mrr"
+        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Oacl50Sf-10Kflows-mrr.64B-1t1c-eth-l2bdbasemaclrn-oacl50sf-10kflows-mrr"
+        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Oacl50Sl-10Kflows-mrr.64B-1t1c-eth-l2bdbasemaclrn-oacl50sl-10kflows-mrr"
+        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Macip-Iacl50Sl-10Kflows-mrr.64B-1t1c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-mrr"
+      layout: "plot-cpta"
+
+    - title: "3n-tsh-x520-64b-2t2c-features-l2switching-base-ixgbe"
+      output-file-name: "3n-tsh-x520-64b-2t2c-l2-features-ixgbe"
+      data: "plot-performance-trending-vpp-3n-tsh"
+      include:
+        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-mrr.64B-2t2c-eth-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Iacl50Sf-10Kflows-mrr.64B-2t2c-eth-l2bdbasemaclrn-iacl50sf-10kflows-mrr"
+        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Iacl50Sl-10Kflows-mrr.64B-2t2c-eth-l2bdbasemaclrn-iacl50sl-10kflows-mrr"
+        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Oacl50Sf-10Kflows-mrr.64B-2t2c-eth-l2bdbasemaclrn-oacl50sf-10kflows-mrr"
+        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Oacl50Sl-10Kflows-mrr.64B-2t2c-eth-l2bdbasemaclrn-oacl50sl-10kflows-mrr"
+        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Macip-Iacl50Sl-10Kflows-mrr.64B-2t2c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-mrr"
+      layout: "plot-cpta"
+
+    - title: "3n-tsh-x520-64b-4t4c-features-l2switching-base-ixgbe"
+      output-file-name: "3n-tsh-x520-64b-4t4c-l2-features-ixgbe"
+      data: "plot-performance-trending-vpp-3n-tsh"
+      include:
+        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-mrr.64B-4t4c-eth-l2bdbasemaclrn-mrr"
+        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Iacl50Sf-10Kflows-mrr.64B-4t4c-eth-l2bdbasemaclrn-iacl50sf-10kflows-mrr"
+        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Iacl50Sl-10Kflows-mrr.64B-4t4c-eth-l2bdbasemaclrn-iacl50sl-10kflows-mrr"
+        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Oacl50Sf-10Kflows-mrr.64B-4t4c-eth-l2bdbasemaclrn-oacl50sf-10kflows-mrr"
+        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Oacl50Sl-10Kflows-mrr.64B-4t4c-eth-l2bdbasemaclrn-oacl50sl-10kflows-mrr"
+        - "Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Macip-Iacl50Sl-10Kflows-mrr.64B-4t4c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-mrr"
+      layout: "plot-cpta"
+
+    - title: "3n-hsw-xl710-78b-1t1c-srv6-ip6routing-base-dpdk"
+      output-file-name: "3n-hsw-xl710-78b-1t1c-srv6-base-dpdk"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      include:
+        - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-mrr.78B-1t1c-ethip6ip6-ip6base-srv6enc1sid-mrr"
+        - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-mrr.78B-1t1c-ethip6srhip6-ip6base-srv6enc2sids-mrr"
+        - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Nodecaps-mrr.78B-1t1c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-mrr"
+        - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Dyn-mrr.78B-1t1c-ethip6srhip6-ip6base-srv6proxy-dyn-mrr"
+        - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Masq-mrr.78B-1t1c-ethip6srhip6-ip6base-srv6proxy-masq-mrr"
+        - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Stat-mrr.78B-1t1c-ethip6srhip6-ip6base-srv6proxy-stat-mrr"
+      layout: "plot-cpta"
+
+    - title: "3n-hsw-xl710-78b-2t2c-srv6-ip6routing-base-dpdk"
+      output-file-name: "3n-hsw-xl710-78b-2t2c-srv6-base-dpdk"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      include:
+        - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-mrr.78B-2t2c-ethip6ip6-ip6base-srv6enc1sid-mrr"
+        - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-mrr.78B-2t2c-ethip6srhip6-ip6base-srv6enc2sids-mrr"
+        - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Nodecaps-mrr.78B-2t2c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-mrr"
+        - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Dyn-mrr.78B-2t2c-ethip6srhip6-ip6base-srv6proxy-dyn-mrr"
+        - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Masq-mrr.78B-2t2c-ethip6srhip6-ip6base-srv6proxy-masq-mrr"
+        - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Stat-mrr.78B-2t2c-ethip6srhip6-ip6base-srv6proxy-stat-mrr"
+      layout: "plot-cpta"
+
+    - title: "3n-hsw-xl710-78b-4t4c-srv6-ip6routing-base-dpdk"
+      output-file-name: "3n-hsw-xl710-78b-4t4c-srv6-base-dpdk"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      include:
+        - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-mrr.78B-4t4c-ethip6ip6-ip6base-srv6enc1sid-mrr"
+        - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-mrr.78B-4t4c-ethip6srhip6-ip6base-srv6enc2sids-mrr"
+        - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Nodecaps-mrr.78B-4t4c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-mrr"
+        - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Dyn-mrr.78B-4t4c-ethip6srhip6-ip6base-srv6proxy-dyn-mrr"
+        - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Masq-mrr.78B-4t4c-ethip6srhip6-ip6base-srv6proxy-masq-mrr"
+        - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Stat-mrr.78B-4t4c-ethip6srhip6-ip6base-srv6proxy-stat-mrr"
+      layout: "plot-cpta"
+
+    - title: "3n-skx-xxv710-78b-2t1c-srv6-ip6routing-base-avf"
+      output-file-name: "3n-skx-xxv710-78b-2t1c-srv6-base-avf"
+      data: "plot-performance-trending-vpp-3n-skx"
+      include:
+        - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-mrr.78B-2t1c-avf-ethip6ip6-ip6base-srv6enc1sid-mrr"
+        - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-mrr.78B-2t1c-avf-ethip6srhip6-ip6base-srv6enc2sids-mrr"
+        - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Nodecaps-mrr.78B-2t1c-avf-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-mrr"
+        - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Proxy-Dyn-mrr.78B-2t1c-avf-ethip6srhip6-ip6base-srv6proxy-dyn-mrr"
+        - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Proxy-Masq-mrr.78B-2t1c-avf-ethip6srhip6-ip6base-srv6proxy-masq-mrr"
+        - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Proxy-Stat-mrr.78B-2t1c-avf-ethip6srhip6-ip6base-srv6proxy-stat-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C IPv4 Tunnels 64B MRR Trending 2n-skx"
-      output-file-name: "ip4-tunnels-4t2c-xxv710-2n-skx"
-      data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and '64B' and 'ENCAP' and 'MRR' and '4T2C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
-      parameters:
-      - "result"
+    - title: "3n-skx-xxv710-78b-4t2c-srv6-ip6routing-base-avf"
+      output-file-name: "3n-skx-xxv710-78b-4t2c-srv6-base-avf"
+      data: "plot-performance-trending-vpp-3n-skx"
+      include:
+        - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-mrr.78B-4t2c-avf-ethip6ip6-ip6base-srv6enc1sid-mrr"
+        - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-mrr.78B-4t2c-avf-ethip6srhip6-ip6base-srv6enc2sids-mrr"
+        - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Nodecaps-mrr.78B-4t2c-avf-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-mrr"
+        - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Proxy-Dyn-mrr.78B-4t2c-avf-ethip6srhip6-ip6base-srv6proxy-dyn-mrr"
+        - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Proxy-Masq-mrr.78B-4t2c-avf-ethip6srhip6-ip6base-srv6proxy-masq-mrr"
+        - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Proxy-Stat-mrr.78B-4t2c-avf-ethip6srhip6-ip6base-srv6proxy-stat-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C IPv4 Tunnels 64B MRR Trending 2n-skx"
-      output-file-name: "ip4-tunnels-8t4c-xxv710-2n-skx"
+    - title: "3n-skx-xxv710-78b-8t4c-srv6-ip6routing-base-avf"
+      output-file-name: "3n-skx-xxv710-78b-8t4c-srv6-base-avf"
+      data: "plot-performance-trending-vpp-3n-skx"
+      include:
+        - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-mrr.78B-8t4c-avf-ethip6ip6-ip6base-srv6enc1sid-mrr"
+        - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-mrr.78B-8t4c-avf-ethip6srhip6-ip6base-srv6enc2sids-mrr"
+        - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Nodecaps-mrr.78B-8t4c-avf-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-mrr"
+        - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Proxy-Dyn-mrr.78B-8t4c-avf-ethip6srhip6-ip6base-srv6proxy-dyn-mrr"
+        - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Proxy-Masq-mrr.78B-8t4c-avf-ethip6srhip6-ip6base-srv6proxy-masq-mrr"
+        - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Proxy-Stat-mrr.78B-8t4c-avf-ethip6srhip6-ip6base-srv6proxy-stat-mrr"
+      layout: "plot-cpta"
+
+    - title: "3n-tsh-x520-78b-1t1c-srv6-ip6routing-base-ixgbe"
+      output-file-name: "3n-tsh-x520-78b-1t1c-srv6-base-ixgbe"
+      data: "plot-performance-trending-vpp-3n-tsh"
+      include:
+        - "Tests.Vpp.Perf.Srv6.10Ge2P1X520-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-mrr.78B-1t1c-ethip6ip6-ip6base-srv6enc1sid-mrr"
+        - "Tests.Vpp.Perf.Srv6.10Ge2P1X520-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-mrr.78B-1t1c-ethip6srhip6-ip6base-srv6enc2sids-mrr"
+        - "Tests.Vpp.Perf.Srv6.10Ge2P1X520-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Nodecaps-mrr.78B-1t1c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-mrr"
+        - "Tests.Vpp.Perf.Srv6.10Ge2P1X520-Ethip6Srhip6-Ip6Base-Srv6Proxy-Dyn-mrr.78B-1t1c-ethip6srhip6-ip6base-srv6proxy-dyn-mrr"
+        - "Tests.Vpp.Perf.Srv6.10Ge2P1X520-Ethip6Srhip6-Ip6Base-Srv6Proxy-Masq-mrr.78B-1t1c-ethip6srhip6-ip6base-srv6proxy-masq-mrr"
+        - "Tests.Vpp.Perf.Srv6.10Ge2P1X520-Ethip6Srhip6-Ip6Base-Srv6Proxy-Stat-mrr.78B-1t1c-ethip6srhip6-ip6base-srv6proxy-stat-mrr"
+      layout: "plot-cpta"
+
+    - title: "3n-tsh-x520-78b-2t2c-srv6-ip6routing-base-ixgbe"
+      output-file-name: "3n-tsh-x520-78b-2t2c-srv6-base-ixgbe"
+      data: "plot-performance-trending-vpp-3n-tsh"
+      include:
+        - "Tests.Vpp.Perf.Srv6.10Ge2P1X520-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-mrr.78B-2t2c-ethip6ip6-ip6base-srv6enc1sid-mrr"
+        - "Tests.Vpp.Perf.Srv6.10Ge2P1X520-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-mrr.78B-2t2c-ethip6srhip6-ip6base-srv6enc2sids-mrr"
+        - "Tests.Vpp.Perf.Srv6.10Ge2P1X520-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Nodecaps-mrr.78B-2t2c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-mrr"
+        - "Tests.Vpp.Perf.Srv6.10Ge2P1X520-Ethip6Srhip6-Ip6Base-Srv6Proxy-Dyn-mrr.78B-2t2c-ethip6srhip6-ip6base-srv6proxy-dyn-mrr"
+        - "Tests.Vpp.Perf.Srv6.10Ge2P1X520-Ethip6Srhip6-Ip6Base-Srv6Proxy-Masq-mrr.78B-2t2c-ethip6srhip6-ip6base-srv6proxy-masq-mrr"
+        - "Tests.Vpp.Perf.Srv6.10Ge2P1X520-Ethip6Srhip6-Ip6Base-Srv6Proxy-Stat-mrr.78B-2t2c-ethip6srhip6-ip6base-srv6proxy-stat-mrr"
+      layout: "plot-cpta"
+
+    - title: "3n-tsh-x520-78b-4t4c-srv6-ip6routing-base-ixgbe"
+      output-file-name: "3n-tsh-x520-78b-4t4c-srv6-base-ixgbe"
+      data: "plot-performance-trending-vpp-3n-tsh"
+      include:
+        - "Tests.Vpp.Perf.Srv6.10Ge2P1X520-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-mrr.78B-4t4c-ethip6ip6-ip6base-srv6enc1sid-mrr"
+        - "Tests.Vpp.Perf.Srv6.10Ge2P1X520-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-mrr.78B-4t4c-ethip6srhip6-ip6base-srv6enc2sids-mrr"
+        - "Tests.Vpp.Perf.Srv6.10Ge2P1X520-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Nodecaps-mrr.78B-4t4c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-mrr"
+        - "Tests.Vpp.Perf.Srv6.10Ge2P1X520-Ethip6Srhip6-Ip6Base-Srv6Proxy-Dyn-mrr.78B-4t4c-ethip6srhip6-ip6base-srv6proxy-dyn-mrr"
+        - "Tests.Vpp.Perf.Srv6.10Ge2P1X520-Ethip6Srhip6-Ip6Base-Srv6Proxy-Masq-mrr.78B-4t4c-ethip6srhip6-ip6base-srv6proxy-masq-mrr"
+        - "Tests.Vpp.Perf.Srv6.10Ge2P1X520-Ethip6Srhip6-Ip6Base-Srv6Proxy-Stat-mrr.78B-4t4c-ethip6srhip6-ip6base-srv6proxy-stat-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-2t1c-vhost-base-avf-testpmd"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-vhost-base-avf-testpmd"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Mrr.64B-2t1c-avf-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Mrr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Mrr.64B-2t1c-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Mrr.64B-2t1c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-4t2c-vhost-base-avf-testpmd"
+      output-file-name: "2n-clx-xxv710-64b-4t2c-vhost-base-avf-testpmd"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Mrr.64B-4t2c-avf-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Mrr.64B-4t2c-avf-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Mrr.64B-4t2c-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Mrr.64B-4t2c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-8t4c-vhost-base-avf-testpmd"
+      output-file-name: "2n-clx-xxv710-64b-8t4c-vhost-base-avf-testpmd"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Mrr.64B-8t4c-avf-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Mrr.64B-8t4c-avf-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Mrr.64B-8t4c-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Mrr.64B-8t4c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-2t1c-vhost-base-avf-vpp"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-vhost-base-avf-vpp"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-2t1c-avf-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-2t1c-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-2t1c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-4t2c-vhost-base-avf-vpp"
+      output-file-name: "2n-clx-xxv710-64b-4t2c-vhost-base-avf-vpp"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-4t2c-avf-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-4t2c-avf-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-4t2c-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-4t2c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-8t4c-vhost-base-avf-vpp"
+      output-file-name: "2n-clx-xxv710-64b-8t4c-vhost-base-avf-vpp"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-8t4c-avf-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-8t4c-avf-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-8t4c-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-8t4c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-2t1c-vhost-base-dpdk-testpmd"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-vhost-base-dpdk-testpmd"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Mrr.64B-2t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-4t2c-vhost-base-dpdk-testpmd"
+      output-file-name: "2n-clx-xxv710-64b-4t2c-vhost-base-dpdk-testpmd"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Mrr.64B-4t2c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-8t4c-vhost-base-dpdk-testpmd"
+      output-file-name: "2n-clx-xxv710-64b-8t4c-vhost-base-dpdk-testpmd"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Mrr.64B-8t4c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-2t1c-vhost-base-dpdk-vpp"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-vhost-base-dpdk-vpp"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-2t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-4t2c-vhost-base-dpdk-vpp"
+      output-file-name: "2n-clx-xxv710-64b-4t2c-vhost-base-dpdk-vpp"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-4t2c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-8t4c-vhost-base-dpdk-vpp"
+      output-file-name: "2n-clx-xxv710-64b-8t4c-vhost-base-dpdk-vpp"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-8t4c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-cx556a-64b-2t1c-rdma-l2-vhost-base"
+      output-file-name: "2n-clx-cx556a-64b-2t1c-rdma-l2-vhost-base"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Mrr.64B-2t1c-rdma-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Mrr.64B-2t1c-rdma-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Mrr.64B-2t1c-rdma-eth-l2xcbase-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Mrr.64B-2t1c-rdma-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-cx556a-64b-4t2c-rdma-l2-vhost-base"
+      output-file-name: "2n-clx-cx556a-64b-4t2c-rdma-l2-vhost-base"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Mrr.64B-4t2c-rdma-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Mrr.64B-4t2c-rdma-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Mrr.64B-4t2c-rdma-eth-l2xcbase-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Mrr.64B-4t2c-rdma-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-cx556a-64b-8t4c-rdma-l2-vhost-base"
+      output-file-name: "2n-clx-cx556a-64b-8t4c-rdma-l2-vhost-base"
+      data: "plot-performance-trending-vpp-2n-clx"
+      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"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-cx556a-64b-2t1c-rdma-l2-vhost-vppl2xc-base"
+      output-file-name: "2n-clx-cx556a-64b-2t1c-rdma-l2-vhost-vppl2xc-base"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-2t1c-rdma-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-2t1c-rdma-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-2t1c-rdma-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-2t1c-rdma-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-cx556a-64b-4t2c-rdma-l2-vhost-vppl2xc-base"
+      output-file-name: "2n-clx-cx556a-64b-4t2c-rdma-l2-vhost-vppl2xc-base"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-4t2c-rdma-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-4t2c-rdma-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-4t2c-rdma-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-4t2c-rdma-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-cx556a-64b-8t4c-rdma-l2-vhost-vppl2xc-base"
+      output-file-name: "2n-clx-cx556a-64b-8t4c-rdma-l2-vhost-vppl2xc-base"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-8t4c-rdma-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-8t4c-rdma-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-8t4c-rdma-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-8t4c-rdma-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-114b-2t1c-vts-l2switching-base-avf-dpdk"
+      output-file-name: "2n-clx-xxv710-114b-2t1c-vts-l2switching-base-avf-dpdk"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Noacl-2Vhostvr1024-1Vm-mrr.114B-2t1c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermit-2Vhostvr1024-1Vm-mrr.114B-2t1c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermitreflect-2Vhostvr1024-1Vm-mrr.114B-2t1c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-114b-4t2c-vts-l2switching-base-avf-dpdk"
+      output-file-name: "2n-clx-xxv710-114b-4t2c-vts-l2switching-base-avf-dpdk"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Noacl-2Vhostvr1024-1Vm-mrr.114B-4t2c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermit-2Vhostvr1024-1Vm-mrr.114B-4t2c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermitreflect-2Vhostvr1024-1Vm-mrr.114B-4t2c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-114b-8t4c-vts-l2switching-base-avf-dpdk"
+      output-file-name: "2n-clx-xxv710-114b-8t4c-vts-l2switching-base-avf-dpdk"
+      data: "plot-performance-trending-vpp-2n-clx"
+      include:
+        - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Noacl-2Vhostvr1024-1Vm-mrr.114B-8t4c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermit-2Vhostvr1024-1Vm-mrr.114B-8t4c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermitreflect-2Vhostvr1024-1Vm-mrr.114B-8t4c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-skx-xxv710-64b-2t1c-vhost-base-avf-testpmd"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-vhost-base-avf-testpmd"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and '64B' and 'ENCAP' and 'MRR' and '8T4C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
-      parameters:
-      - "result"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Mrr.64B-2t1c-avf-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-mrr.64B-2t1c-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-2t1c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
       layout: "plot-cpta"
 
-# IPv6 - x710
-
-    - title: "VPP 2T1C IPv6 78B MRR Trending 2n-skx"
-      output-file-name: "ip6-2t1c-x710-2n-skx"
+    - title: "2n-skx-xxv710-64b-4t2c-vhost-base-avf-testpmd"
+      output-file-name: "2n-skx-xxv710-64b-4t2c-vhost-base-avf-testpmd"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '2T1C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
-      parameters:
-      - "result"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Mrr.64B-4t2c-avf-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-4t2c-avf-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-mrr.64B-4t2c-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-4t2c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C IPv6 78B MRR Trending 2n-skx"
-      output-file-name: "ip6-4t2c-x710-2n-skx"
+    - title: "2n-skx-xxv710-64b-8t4c-vhost-base-avf-testpmd"
+      output-file-name: "2n-skx-xxv710-64b-8t4c-vhost-base-avf-testpmd"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '4T2C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
-      parameters:
-      - "result"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Mrr.64B-8t4c-avf-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-8t4c-avf-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-mrr.64B-8t4c-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-8t4c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C IPv6 78B MRR Trending 2n-skx"
-      output-file-name: "ip6-8t4c-x710-2n-skx"
+    - title: "2n-skx-xxv710-64b-2t1c-vhost-base-avf-vpp"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-vhost-base-avf-vpp"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '8T4C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
-      parameters:
-      - "result"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-2t1c-avf-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-mrr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-mrr.64B-2t1c-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-mrr.64B-2t1c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
       layout: "plot-cpta"
 
-# IPv6 - xxv710
-
-    - title: "VPP 2T1C IPv6 78B MRR Trending 2n-skx"
-      output-file-name: "ip6-2t1c-xxv710-2n-skx"
+    - title: "2n-skx-xxv710-64b-4t2c-vhost-base-avf-vpp"
+      output-file-name: "2n-skx-xxv710-64b-4t2c-vhost-base-avf-vpp"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '2T1C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
-      parameters:
-      - "result"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-4t2c-avf-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-mrr.64B-4t2c-avf-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-mrr.64B-4t2c-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-mrr.64B-4t2c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C IPv6 78B MRR Trending 2n-skx"
-      output-file-name: "ip6-4t2c-xxv710-2n-skx"
+    - title: "2n-skx-xxv710-64b-8t4c-vhost-base-avf-vpp"
+      output-file-name: "2n-skx-xxv710-64b-8t4c-vhost-base-avf-vpp"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '4T2C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
-      parameters:
-      - "result"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-8t4c-avf-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-mrr.64B-8t4c-avf-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-mrr.64B-8t4c-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-mrr.64B-8t4c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C IPv6 78B MRR Trending 2n-skx"
-      output-file-name: "ip6-8t4c-xxv710-2n-skx"
+    - title: "2n-skx-xxv710-64b-2t1c-vhost-base-dpdk-testpmd"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-vhost-base-dpdk-testpmd"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '8T4C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
-      parameters:
-      - "result"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-2t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-mrr.64B-2t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-2t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
       layout: "plot-cpta"
 
-# Container memif - x710, 64B
-
-    - title: "VPP 2T1C L2 Container memif 64B MRR Trending 2n-skx"
-      output-file-name: "container-memif-l2-2t1c-x710-2n-skx"
+    - title: "2n-skx-xxv710-64b-4t2c-vhost-base-dpdk-testpmd"
+      output-file-name: "2n-skx-xxv710-64b-4t2c-vhost-base-dpdk-testpmd"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'BASE' and '2T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'DRV_AVF'"
-      parameters:
-      - "result"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-4t2c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-mrr.64B-4t2c-eth-l2xcbase-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-4t2c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C L2 Container memif 64B MRR Trending 2n-skx"
-      output-file-name: "container-memif-l2-4t2c-x710-2n-skx"
+    - title: "2n-skx-xxv710-64b-8t4c-vhost-base-dpdk-testpmd"
+      output-file-name: "2n-skx-xxv710-64b-8t4c-vhost-base-dpdk-testpmd"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'BASE' and '4T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'DRV_AVF'"
-      parameters:
-      - "result"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-8t4c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-mrr.64B-8t4c-eth-l2xcbase-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-8t4c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C L2 Container memif 64B MRR Trending 2n-skx"
-      output-file-name: "container-memif-l2-8t4c-x710-2n-skx"
+    - title: "2n-skx-xxv710-64b-2t1c-vhost-base-dpdk-vpp"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-vhost-base-dpdk-vpp"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'BASE' and '8T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'DRV_AVF'"
-      parameters:
-      - "result"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-mrr.64B-2t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-mrr.64B-2t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-mrr.64B-2t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
       layout: "plot-cpta"
 
-# Container memif - xxv710, 64B
-
-    - title: "VPP 2T1C L2 Container memif 64B MRR Trending 2n-skx"
-      output-file-name: "container-memif-l2-2t1c-xxv710-2n-skx"
+    - title: "2n-skx-xxv710-64b-4t2c-vhost-base-dpdk-vpp"
+      output-file-name: "2n-skx-xxv710-64b-4t2c-vhost-base-dpdk-vpp"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'BASE' and '2T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
-      parameters:
-      - "result"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-mrr.64B-4t2c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-mrr.64B-4t2c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-mrr.64B-4t2c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C L2 Container memif 64B MRR Trending 2n-skx"
-      output-file-name: "container-memif-l2-4t2c-xxv710-2n-skx"
+    - title: "2n-skx-xxv710-64b-8t4c-vhost-base-dpdk-vpp"
+      output-file-name: "2n-skx-xxv710-64b-8t4c-vhost-base-dpdk-vpp"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'BASE' and '4T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
-      parameters:
-      - "result"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-mrr.64B-8t4c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-mrr.64B-8t4c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-mrr.64B-8t4c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C L2 Container memif 64B MRR Trending 2n-skx"
-      output-file-name: "container-memif-l2-8t4c-xxv710-2n-skx"
-      data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'BASE' and '8T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
-      parameters:
-      - "result"
+    - title: "3n-hsw-xl710-64b-1t1c-vhost-base-dpdk-testpmd"
+      output-file-name: "3n-hsw-xl710-64b-1t1c-vhost-base-dpdk-testpmd"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Mrr.64B-1t1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-1t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-mrr.64B-1t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-1t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-mrr.64B-1t1c-ethip4-ip4base-eth-2vhostvr1024-1vm-mrr"
       layout: "plot-cpta"
 
-# VM vhost - x710, ethip4, 64B
+    - title: "3n-hsw-xl710-64b-2t2c-vhost-base-dpdk-testpmd"
+      output-file-name: "3n-hsw-xl710-64b-2t2c-vhost-base-dpdk-testpmd"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Mrr.64B-2t2c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-2t2c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-mrr.64B-2t2c-eth-l2xcbase-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-2t2c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-mrr.64B-2t2c-ethip4-ip4base-eth-2vhostvr1024-1vm-mrr"
+      layout: "plot-cpta"
 
-    - title: "VPP 2T1C VM vhost ethip4 64B MRR Trending 2n-skx"
-      output-file-name: "vm-vhost-ethip4-2t1c-x710-2n-skx"
-      data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
-      parameters:
-      - "result"
+    - title: "3n-hsw-xl710-64b-4t4c-vhost-base-dpdk-testpmd"
+      output-file-name: "3n-hsw-xl710-64b-4t4c-vhost-base-dpdk-testpmd"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Mrr.64B-4t4c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-4t4c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-mrr.64B-4t4c-eth-l2xcbase-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-4t4c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-mrr.64B-4t4c-ethip4-ip4base-eth-2vhostvr1024-1vm-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C VM vhost ethip4 64B MRR Trending 2n-skx"
-      output-file-name: "vm-vhost-ethip4-4t2c-x710-2n-skx"
-      data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
-      parameters:
-      - "result"
+    - title: "3n-hsw-xl710-64b-1t1c-vhost-base-dpdk-vpp"
+      output-file-name: "3n-hsw-xl710-64b-1t1c-vhost-base-dpdk-vpp"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-1t1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr10241Vm-Vppl2Xc-mrr.64B-1t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-mrr.64B-1t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1V-m-Vppl2Xc-mrr.64B-1t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Vppip4-mrr.64B-1t1c-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C VM vhost ethip4 64B MRR Trending 2n-skx"
-      output-file-name: "vm-vhost-ethip4-8t4c-x710-2n-skx"
-      data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '8T4C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
-      parameters:
-      - "result"
+    - title: "3n-hsw-xl710-64b-2t2c-vhost-base-dpdk-vpp"
+      output-file-name: "3n-hsw-xl710-64b-2t2c-vhost-base-dpdk-vpp"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-2t2c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr10241Vm-Vppl2Xc-mrr.64B-2t2c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-mrr.64B-2t2c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1V-m-Vppl2Xc-mrr.64B-2t2c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Vppip4-mrr.64B-2t2c-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-mrr"
       layout: "plot-cpta"
 
-# VM vhost - xxv710, ethip4, 64B
+    - title: "3n-hsw-xl710-64b-4t4c-vhost-base-dpdk-vpp"
+      output-file-name: "3n-hsw-xl710-64b-4t4c-vhost-base-dpdk-vpp"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-4t4c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr10241Vm-Vppl2Xc-mrr.64B-4t4c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-mrr.64B-4t4c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1V-m-Vppl2Xc-mrr.64B-4t4c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Vppip4-mrr.64B-4t4c-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-mrr"
+      layout: "plot-cpta"
 
-    - title: "VPP 2T1C VM vhost ethip4 64B MRR Trending 2n-skx"
-      output-file-name: "vm-vhost-ethip4-2t1c-xxv710-2n-skx"
-      data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '2T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
-      parameters:
-      - "result"
+    - title: "3n-skx-x710-64b-2t1c-link-bonding-vhost-base-avf-testpmd"
+      output-file-name: "3n-skx-x710-64b-2t1c-link-bonding-vhost-base-avf-testpmd"
+      data: "plot-performance-trending-vpp-3n-skx"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Avf-2Lbvpplacp-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-mrr.64B-2t1c-avf-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Avf-2Lbvpplacp-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-2t1c-avf-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C VM vhost ethip4 64B MRR Trending 2n-skx"
-      output-file-name: "vm-vhost-ethip4-4t2c-xxv710-2n-skx"
-      data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '4T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
-      parameters:
-      - "result"
+    - title: "3n-skx-x710-64b-4t2c-link-bonding-vhost-base-avf-testpmd"
+      output-file-name: "3n-skx-x710-64b-4t2c-link-bonding-vhost-base-avf-testpmd"
+      data: "plot-performance-trending-vpp-3n-skx"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Avf-2Lbvpplacp-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-mrr.64B-4t2c-avf-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Avf-2Lbvpplacp-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-4t2c-avf-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C VM vhost ethip4 64B MRR Trending 2n-skx"
-      output-file-name: "vm-vhost-ethip4-8t4c-xxv710-2n-skx"
-      data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '8T4C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
-      parameters:
-      - "result"
+    - title: "3n-skx-x710-64b-8t4c-link-bonding-vhost-base-avf-testpmd"
+      output-file-name: "3n-skx-x710-64b-8t4c-link-bonding-vhost-base-avf-testpmd"
+      data: "plot-performance-trending-vpp-3n-skx"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Avf-2Lbvpplacp-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-mrr.64B-8t4c-avf-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Avf-2Lbvpplacp-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-8t4c-avf-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
       layout: "plot-cpta"
 
-# VM vhost - x710, ethip4, IMIX
+    - title: "3n-skx-x710-64b-2t1c-link-bonding-vhost-base-avf-vpp"
+      output-file-name: "3n-skx-x710-64b-2t1c-link-bonding-vhost-base-avf-vpp"
+      data: "plot-performance-trending-vpp-3n-skx"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Avf-2Lbvpplacp-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-mrr.64B-2t1c-avf-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Avf-2Lbvpplacp-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-mrr.64B-2t1c-avf-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+      layout: "plot-cpta"
 
-    - title: "VPP 2T1C VM vhost ethip4 IMIX MRR Trending 2n-skx"
-      output-file-name: "vm-vhost-imix-ethip4-2t1c-x710-2n-skx"
-      data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '2T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
-      parameters:
-      - "result"
+    - title: "3n-skx-x710-64b-4t2c-link-bonding-vhost-base-avf-vpp"
+      output-file-name: "3n-skx-x710-64b-4t2c-link-bonding-vhost-base-avf-vpp"
+      data: "plot-performance-trending-vpp-3n-skx"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Avf-2Lbvpplacp-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-mrr.64B-4t2c-avf-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Avf-2Lbvpplacp-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-mrr.64B-4t2c-avf-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C VM vhost ethip4 IMIX MRR Trending 2n-skx"
-      output-file-name: "vm-vhost-imix-ethip4-4t2c-x710-2n-skx"
-      data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '4T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
-      parameters:
-      - "result"
+    - title: "3n-skx-x710-64b-8t4c-link-bonding-vhost-base-avf-vpp"
+      output-file-name: "3n-skx-x710-64b-8t4c-link-bonding-vhost-base-avf-vpp"
+      data: "plot-performance-trending-vpp-3n-skx"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Avf-2Lbvpplacp-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-mrr.64B-8t4c-avf-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Avf-2Lbvpplacp-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-mrr.64B-8t4c-avf-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C VM vhost ethip4 IMIX MRR Trending 2n-skx"
-      output-file-name: "vm-vhost-imix-ethip4-8t4c-x710-2n-skx"
-      data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '8T4C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
-      parameters:
-      - "result"
+    - title: "3n-skx-xxv710-64b-2t1c-vhost-base-dpdk-testpmd"
+      output-file-name: "3n-skx-xxv710-64b-2t1c-vhost-base-dpdk-testpmd"
+      data: "plot-performance-trending-vpp-3n-skx"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-2t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-mrr.64B-2t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-2t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-mrr.64B-2t1c-ethip4-ip4base-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Mrr.64B-2t1c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
       layout: "plot-cpta"
 
-# VM vhost - xxv710, ethip4, IMIX
+    - title: "3n-skx-xxv710-64b-4t2c-vhost-base-dpdk-testpmd"
+      output-file-name: "3n-skx-xxv710-64b-4t2c-vhost-base-dpdk-testpmd"
+      data: "plot-performance-trending-vpp-3n-skx"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-4t2c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-mrr.64B-4t2c-eth-l2xcbase-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-4t2c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-mrr.64B-4t2c-ethip4-ip4base-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Mrr.64B-4t2c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
+      layout: "plot-cpta"
 
-    - title: "VPP 2T1C VM vhost ethip4 IMIX MRR Trending 2n-skx"
-      output-file-name: "vm-vhost-imix-ethip4-2t1c-xxv710-2n-skx"
-      data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '2T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
-      parameters:
-      - "result"
+    - title: "3n-skx-xxv710-64b-8t4c-vhost-base-dpdk-testpmd"
+      output-file-name: "3n-skx-xxv710-64b-8t4c-vhost-base-dpdk-testpmd"
+      data: "plot-performance-trending-vpp-3n-skx"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-8t4c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-mrr.64B-8t4c-eth-l2xcbase-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-8t4c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-mrr.64B-8t4c-ethip4-ip4base-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Mrr.64B-8t4c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C VM vhost ethip4 IMIX MRR Trending 2n-skx"
-      output-file-name: "vm-vhost-imix-ethip4-4t2c-xxv710-2n-skx"
-      data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '4T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
-      parameters:
-      - "result"
+    - title: "3n-skx-xxv710-64b-2t1c-vhost-base-avf-testpmd"
+      output-file-name: "3n-skx-xxv710-64b-2t1c-vhost-base-avf-testpmd"
+      data: "plot-performance-trending-vpp-3n-skx"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-mrr.64B-2t1c-avf-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-mrr.64B-2t1c-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-2t1c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-mrr.64B-2t1c-avf-ethip4-ip4base-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Mrr.64B-2t1c-avf-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C VM vhost ethip4 IMIX MRR Trending 2n-skx"
-      output-file-name: "vm-vhost-imix-ethip4-8t4c-xxv710-2n-skx"
-      data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '8T4C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
-      parameters:
-      - "result"
+    - title: "3n-skx-xxv710-64b-4t2c-vhost-base-avf-testpmd"
+      output-file-name: "3n-skx-xxv710-64b-4t2c-vhost-base-avf-testpmd"
+      data: "plot-performance-trending-vpp-3n-skx"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-mrr.64B-4t2c-avf-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-4t2c-avf-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-mrr.64B-4t2c-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-4t2c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-mrr.64B-4t2c-avf-ethip4-ip4base-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Mrr.64B-4t2c-avf-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
       layout: "plot-cpta"
 
-# VM vhost - x710, eth, 64B
+    - title: "3n-skx-xxv710-64b-8t4c-vhost-base-avf-testpmd"
+      output-file-name: "3n-skx-xxv710-64b-8t4c-vhost-base-avf-testpmd"
+      data: "plot-performance-trending-vpp-3n-skx"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-mrr.64B-8t4c-avf-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-8t4c-avf-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-mrr.64B-8t4c-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-8t4c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-mrr.64B-8t4c-avf-ethip4-ip4base-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Mrr.64B-8t4c-avf-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
+      layout: "plot-cpta"
 
-    - title: "VPP 2T1C VM vhost eth 64B MRR Trending 2n-skx"
-      output-file-name: "vm-vhost-eth-2t1c-x710-2n-skx"
-      data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+    - title: "3n-skx-xxv710-64b-2t1c-vhost-base-avf-vpp"
+      output-file-name: "3n-skx-xxv710-64b-2t1c-vhost-base-avf-vpp"
+      data: "plot-performance-trending-vpp-3n-skx"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-2t1c-avf-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-2t1c-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-2t1c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-2t1c-avf-ethip4-ip4base-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-2t1c-avf-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+      layout: "plot-cpta"
 
-      parameters:
-      - "result"
+    - title: "3n-skx-xxv710-64b-4t2c-vhost-base-avf-vpp"
+      output-file-name: "3n-skx-xxv710-64b-4t2c-vhost-base-avf-vpp"
+      data: "plot-performance-trending-vpp-3n-skx"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-4t2c-avf-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-4t2c-avf-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-4t2c-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-4t2c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-4t2c-avf-ethip4-ip4base-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-4t2c-avf-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C VM vhost eth 64B MRR Trending 2n-skx"
-      output-file-name: "vm-vhost-eth-4t2c-x710-2n-skx"
-      data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
-      parameters:
-      - "result"
+    - title: "3n-skx-xxv710-64b-8t4c-vhost-base-avf-vpp"
+      output-file-name: "3n-skx-xxv710-64b-8t4c-vhost-base-avf-vpp"
+      data: "plot-performance-trending-vpp-3n-skx"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-8t4c-avf-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-8t4c-avf-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-8t4c-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-8t4c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-8t4c-avf-ethip4-ip4base-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-8t4c-avf-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C VM vhost eth 64B MRR Trending 2n-skx"
-      output-file-name: "vm-vhost-eth-8t4c-x710-2n-skx"
-      data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '8T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
-      parameters:
-      - "result"
+    - title: "3n-skx-xxv710-64b-2t1c-link-bonding-vhost-base-avf-testpmd"
+      output-file-name: "3n-skx-xxv710-64b-2t1c-link-bonding-vhost-base-avf-testpmd"
+      data: "plot-performance-trending-vpp-3n-skx"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-1Lbvpplacp-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-mrr.64B-2t1c-avf-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-1Lbvpplacp-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-2t1c-avf-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
       layout: "plot-cpta"
 
-# VM vhost - xxv710, eth, 64B
+    - title: "3n-skx-xxv710-64b-4t2c-link-bonding-vhost-base-avf-testpmd"
+      output-file-name: "3n-skx-xxv710-64b-4t2c-link-bonding-vhost-base-avf-testpmd"
+      data: "plot-performance-trending-vpp-3n-skx"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-1Lbvpplacp-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-mrr.64B-4t2c-avf-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-1Lbvpplacp-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-4t2c-avf-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
+      layout: "plot-cpta"
 
-    - title: "VPP 2T1C VM vhost eth 64B MRR Trending 2n-skx"
-      output-file-name: "vm-vhost-eth-2t1c-xxv710-2n-skx"
-      data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '2T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+    - title: "3n-skx-xxv710-64b-8t4c-link-bonding-vhost-base-avf-testpmd"
+      output-file-name: "3n-skx-xxv710-64b-8t4c-link-bonding-vhost-base-avf-testpmd"
+      data: "plot-performance-trending-vpp-3n-skx"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-1Lbvpplacp-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-mrr.64B-8t4c-avf-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-1Lbvpplacp-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-8t4c-avf-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
+      layout: "plot-cpta"
 
-      parameters:
-      - "result"
+    - title: "3n-skx-xxv710-64b-2t1c-link-bonding-vhost-base-avf-vpp"
+      output-file-name: "3n-skx-xxv710-64b-2t1c-link-bonding-vhost-base-avf-vpp"
+      data: "plot-performance-trending-vpp-3n-skx"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-1Lbvpplacp-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-mrr.64B-2t1c-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-2t1c-avf-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C VM vhost eth 64B MRR Trending 2n-skx"
-      output-file-name: "vm-vhost-eth-4t2c-xxv710-2n-skx"
-      data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '4T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
-      parameters:
-      - "result"
+    - title: "3n-skx-xxv710-64b-4t2c-link-bonding-vhost-base-avf-vpp"
+      output-file-name: "3n-skx-xxv710-64b-4t2c-link-bonding-vhost-base-avf-vpp"
+      data: "plot-performance-trending-vpp-3n-skx"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-1Lbvpplacp-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-mrr.64B-4t2c-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-4t2c-avf-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C VM vhost eth 64B MRR Trending 2n-skx"
-      output-file-name: "vm-vhost-eth-8t4c-xxv710-2n-skx"
+    - title: "3n-skx-xxv710-64b-8t4c-link-bonding-vhost-base-avf-vpp"
+      output-file-name: "3n-skx-xxv710-64b-8t4c-link-bonding-vhost-base-avf-vpp"
+      data: "plot-performance-trending-vpp-3n-skx"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-1Lbvpplacp-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-mrr.64B-8t4c-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-8t4c-avf-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+      layout: "plot-cpta"
+
+    - title: "3n-tsh-x520-64b-1t1c-vhost-base-ixgbe-testpmd"
+      output-file-name: "3n-tsh-x520-64b-1t1c-vhost-base-ixgbe-testpmd"
+      data: "plot-performance-trending-vpp-3n-tsh"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-mrr.64B-1t1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-1t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-mrr.64B-1t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-1t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-mrr.64B-1t1c-ethip4-ip4base-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Ethip4Vxlan-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Mrr.64B-1t1c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
+      layout: "plot-cpta"
+
+    - title: "3n-tsh-x520-64b-2t2c-vhost-base-ixgbe-testpmd"
+      output-file-name: "3n-tsh-x520-64b-2t2c-vhost-base-ixgbe-testpmd"
+      data: "plot-performance-trending-vpp-3n-tsh"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-mrr.64B-2t2c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-2t2c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-mrr.64B-2t2c-eth-l2xcbase-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-2t2c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-mrr.64B-2t2c-ethip4-ip4base-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Ethip4Vxlan-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Mrr.64B-2t2c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
+      layout: "plot-cpta"
+
+    - title: "3n-tsh-x520-64b-4t4c-vhost-base-ixgbe-testpmd"
+      output-file-name: "3n-tsh-x520-64b-4t4c-vhost-base-ixgbe-testpmd"
+      data: "plot-performance-trending-vpp-3n-tsh"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-mrr.64B-4t4c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-4t4c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-mrr.64B-4t4c-eth-l2xcbase-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-mrr.64B-4t4c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-mrr.64B-4t4c-ethip4-ip4base-eth-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Ethip4Vxlan-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Mrr.64B-4t4c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr"
+      layout: "plot-cpta"
+
+    - title: "3n-tsh-x520-64b-1t1c-vhost-base-ixgbe-vpp"
+      output-file-name: "3n-tsh-x520-64b-1t1c-vhost-base-ixgbe-vpp"
+      data: "plot-performance-trending-vpp-3n-tsh"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-1t1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-1t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-1t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-1t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-1t1c-ethip4-ip4base-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Ethip4Vxlan-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-1t1c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+      layout: "plot-cpta"
+
+    - title: "3n-tsh-x520-64b-2t2c-vhost-base-ixgbe-vpp"
+      output-file-name: "3n-tsh-x520-64b-2t2c-vhost-base-ixgbe-vpp"
+      data: "plot-performance-trending-vpp-3n-tsh"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-2t2c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-2t2c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-2t2c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-2t2c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-2t2c-ethip4-ip4base-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Ethip4Vxlan-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-2t2c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+      layout: "plot-cpta"
+
+    - title: "3n-tsh-x520-64b-4t4c-vhost-base-ixgbe-vpp"
+      output-file-name: "3n-tsh-x520-64b-4t4c-vhost-base-ixgbe-vpp"
+      data: "plot-performance-trending-vpp-3n-tsh"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-4t4c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-4t4c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-4t4c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-4t4c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-4t4c-ethip4-ip4base-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Ethip4Vxlan-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-4t4c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
+      layout: "plot-cpta"
+
+    - title: "2n-skx-xxv710-114b-2t1c-vts-l2switching-base-avf"
+      output-file-name: "2n-skx-xxv710-114b-2t1c-vts-l2switching-base-avf"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '8T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
-      parameters:
-      - "result"
+      include:
+        - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Noacl-2Vhostvr1024-1Vm-mrr.114B-2t1c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermit-2Vhostvr1024-1Vm-mrr.114B-2t1c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermitreflect-2Vhostvr1024-1Vm-mrr.114B-2t1c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-mrr"
       layout: "plot-cpta"
 
-# VM vhost - x710, eth, IMIX
-
-    - title: "VPP 2T1C VM vhost eth IMIX MRR Trending 2n-skx"
-      output-file-name: "vm-vhost-imix-eth-2t1c-x710-2n-skx"
+    - title: "2n-skx-xxv710-114b-4t2c-vts-l2switching-base-avf"
+      output-file-name: "2n-skx-xxv710-114b-4t2c-vts-l2switching-base-avf"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '2T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
-
-      parameters:
-      - "result"
+      include:
+        - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Noacl-2Vhostvr1024-1Vm-mrr.114B-4t2c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermit-2Vhostvr1024-1Vm-mrr.114B-4t2c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermitreflect-2Vhostvr1024-1Vm-mrr.114B-4t2c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C VM vhost eth IMIX MRR Trending 2n-skx"
-      output-file-name: "vm-vhost-imix-eth-4t2c-x710-2n-skx"
+    - title: "2n-skx-xxv710-114b-8t4c-vts-l2switching-base-avf"
+      output-file-name: "2n-skx-xxv710-114b-8t4c-vts-l2switching-base-avf"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '4T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
-      parameters:
-      - "result"
+      include:
+        - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Noacl-2Vhostvr1024-1Vm-mrr.114B-8t4c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermit-2Vhostvr1024-1Vm-mrr.114B-8t4c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-mrr"
+        - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermitreflect-2Vhostvr1024-1Vm-mrr.114B-8t4c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C VM vhost eth IMIX MRR Trending 2n-skx"
-      output-file-name: "vm-vhost-imix-eth-8t4c-x710-2n-skx"
-      data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '8T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
-      parameters:
-      - "result"
+    - title: "2n-skx-x710-64b-2t1c-dpdk"
+      output-file-name: "2n-skx-x710-64b-2t1c-dpdk"
+      data: "plot-performance-trending-dpdk-2n-skx"
+      include:
+        - "tests.dpdk.perf.2n1l-10ge2p1x710-eth-l2xcbase-testpmd-mrr.64b-2t1c-eth-l2xcbase-testpmd-mrr"
+        - "tests.dpdk.perf.2n1l-10ge2p1x710-ethip4-ip4base-l3fwd-mrr.64b-2t1c-ethip4-ip4base-l3fwd-mrr"
       layout: "plot-cpta"
 
-# VM vhost - xxv710, eth, IMIX
+    - title: "2n-skx-x710-64b-4t2c-dpdk"
+      output-file-name: "2n-skx-x710-64b-4t2c-dpdk"
+      data: "plot-performance-trending-dpdk-2n-skx"
+      include:
+        - "tests.dpdk.perf.2n1l-10ge2p1x710-eth-l2xcbase-testpmd-mrr.64b-4t2c-eth-l2xcbase-testpmd-mrr"
+        - "tests.dpdk.perf.2n1l-10ge2p1x710-ethip4-ip4base-l3fwd-mrr.64b-4t2c-ethip4-ip4base-l3fwd-mrr"
+      layout: "plot-cpta"
 
-    - title: "VPP 2T1C VM vhost eth IMIX MRR Trending 2n-skx"
-      output-file-name: "vm-vhost-imix-eth-2t1c-xxv710-2n-skx"
-      data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '2T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+    - title: "2n-skx-x710-64b-8t4c-dpdk"
+      output-file-name: "2n-skx-x710-64b-8t4c-dpdk"
+      data: "plot-performance-trending-dpdk-2n-skx"
+      include:
+        - "tests.dpdk.perf.2n1l-10ge2p1x710-eth-l2xcbase-testpmd-mrr.64b-8t4c-eth-l2xcbase-testpmd-mrr"
+        - "tests.dpdk.perf.2n1l-10ge2p1x710-ethip4-ip4base-l3fwd-mrr.64b-8t4c-ethip4-ip4base-l3fwd-mrr"
+      layout: "plot-cpta"
 
-      parameters:
-      - "result"
+    - title: "2n-skx-xxv710-64b-2t1c-dpdk"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-dpdk"
+      data: "plot-performance-trending-dpdk-2n-skx"
+      include:
+        - "tests.dpdk.perf.2n1l-25ge2p1xxv710-eth-l2xcbase-testpmd-mrr.64b-2t1c-eth-l2xcbase-testpmd-mrr"
+        - "tests.dpdk.perf.2n1l-25ge2p1xxv710-ethip4-ip4base-l3fwd-mrr.64b-2t1c-ethip4-ip4base-l3fwd-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C VM vhost eth IMIX MRR Trending 2n-skx"
-      output-file-name: "vm-vhost-imix-eth-4t2c-xxv710-2n-skx"
-      data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '4T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
-      parameters:
-      - "result"
+    - title: "2n-skx-xxv710-64b-4t2c-dpdk"
+      output-file-name: "2n-skx-xxv710-64b-4t2c-dpdk"
+      data: "plot-performance-trending-dpdk-2n-skx"
+      include:
+        - "tests.dpdk.perf.2n1l-25ge2p1xxv710-eth-l2xcbase-testpmd-mrr.64b-4t2c-eth-l2xcbase-testpmd-mrr"
+        - "tests.dpdk.perf.2n1l-25ge2p1xxv710-ethip4-ip4base-l3fwd-mrr.64b-4t2c-ethip4-ip4base-l3fwd-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C VM vhost eth IMIX MRR Trending 2n-skx"
-      output-file-name: "vm-vhost-imix-eth-8t4c-xxv710-2n-skx"
-      data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '8T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
-      parameters:
-      - "result"
+    - title: "2n-skx-xxv710-64b-8t4c-dpdk"
+      output-file-name: "2n-skx-xxv710-64b-8t4c-dpdk"
+      data: "plot-performance-trending-dpdk-2n-skx"
+      include:
+        - "tests.dpdk.perf.2n1l-25ge2p1xxv710-eth-l2xcbase-testpmd-mrr.64b-8t4c-eth-l2xcbase-testpmd-mrr"
+        - "tests.dpdk.perf.2n1l-25ge2p1xxv710-ethip4-ip4base-l3fwd-mrr.64b-8t4c-ethip4-ip4base-l3fwd-mrr"
       layout: "plot-cpta"
 
-# Link Bonding - x710
+    - title: "2n-clx-x710-64b-2t1c-dpdk"
+      output-file-name: "2n-clx-x710-64b-2t1c-dpdk"
+      data: "plot-performance-trending-dpdk-2n-clx"
+      include:
+        - "tests.dpdk.perf.2n1l-10ge2p1x710-eth-l2xcbase-testpmd-mrr.64b-2t1c-eth-l2xcbase-testpmd-mrr"
+        - "tests.dpdk.perf.2n1l-10ge2p1x710-ethip4-ip4base-l3fwd-mrr.64b-2t1c-ethip4-ip4base-l3fwd-mrr"
+      layout: "plot-cpta"
 
-    - title: "VPP 2T1C Link Bonding 64B MRR Trending 2n-skx"
-      output-file-name: "lb-64b-2t1c-x710-2n-skx"
-      data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T1C' and 'LBOND'"
-      parameters:
-      - "result"
+    - title: "2n-clx-x710-64b-4t2c-dpdk"
+      output-file-name: "2n-clx-x710-64b-4t2c-dpdk"
+      data: "plot-performance-trending-dpdk-2n-clx"
+      include:
+        - "tests.dpdk.perf.2n1l-10ge2p1x710-eth-l2xcbase-testpmd-mrr.64b-4t2c-eth-l2xcbase-testpmd-mrr"
+        - "tests.dpdk.perf.2n1l-10ge2p1x710-ethip4-ip4base-l3fwd-mrr.64b-4t2c-ethip4-ip4base-l3fwd-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C Link Bonding 64B MRR Trending 2n-skx"
-      output-file-name: "lb-64b-4t2c-x710-2n-skx"
-      data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T2C' and 'LBOND'"
-      parameters:
-      - "result"
+    - title: "2n-clx-x710-64b-8t4c-dpdk"
+      output-file-name: "2n-clx-x710-64b-8t4c-dpdk"
+      data: "plot-performance-trending-dpdk-2n-clx"
+      include:
+        - "tests.dpdk.perf.2n1l-10ge2p1x710-eth-l2xcbase-testpmd-mrr.64b-8t4c-eth-l2xcbase-testpmd-mrr"
+        - "tests.dpdk.perf.2n1l-10ge2p1x710-ethip4-ip4base-l3fwd-mrr.64b-8t4c-ethip4-ip4base-l3fwd-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C Link Bonding 64B MRR Trending 2n-skx"
-      output-file-name: "lb-64b-8t4c-x710-2n-skx"
-      data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '8T4C' and 'LBOND'"
-      parameters:
-      - "result"
+    - title: "2n-clx-xxv710-64b-2t1c-dpdk"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-dpdk"
+      data: "plot-performance-trending-dpdk-2n-clx"
+      include:
+        - "tests.dpdk.perf.2n1l-25ge2p1xxv710-eth-l2xcbase-testpmd-mrr.64b-2t1c-eth-l2xcbase-testpmd-mrr"
+        - "tests.dpdk.perf.2n1l-25ge2p1xxv710-ethip4-ip4base-l3fwd-mrr.64b-2t1c-ethip4-ip4base-l3fwd-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 2T1C Link Bonding IMIX MRR Trending 2n-skx"
-      output-file-name: "lb-imix-2t1c-x710-2n-skx"
-      data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '2T1C' and 'LBOND'"
-      parameters:
-      - "result"
+    - title: "2n-clx-xxv710-64b-4t2c-dpdk"
+      output-file-name: "2n-clx-xxv710-64b-4t2c-dpdk"
+      data: "plot-performance-trending-dpdk-2n-clx"
+      include:
+        - "tests.dpdk.perf.2n1l-25ge2p1xxv710-eth-l2xcbase-testpmd-mrr.64b-4t2c-eth-l2xcbase-testpmd-mrr"
+        - "tests.dpdk.perf.2n1l-25ge2p1xxv710-ethip4-ip4base-l3fwd-mrr.64b-4t2c-ethip4-ip4base-l3fwd-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C Link Bonding IMIX MRR Trending 2n-skx"
-      output-file-name: "lb-imix-4t2c-x710-2n-skx"
-      data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '4T2C' and 'LBOND'"
-      parameters:
-      - "result"
+    - title: "2n-clx-xxv710-64b-8t4c-dpdk"
+      output-file-name: "2n-clx-xxv710-64b-8t4c-dpdk"
+      data: "plot-performance-trending-dpdk-2n-clx"
+      include:
+        - "tests.dpdk.perf.2n1l-25ge2p1xxv710-eth-l2xcbase-testpmd-mrr.64b-8t4c-eth-l2xcbase-testpmd-mrr"
+        - "tests.dpdk.perf.2n1l-25ge2p1xxv710-ethip4-ip4base-l3fwd-mrr.64b-8t4c-ethip4-ip4base-l3fwd-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C Link Bonding IMIX MRR Trending 2n-skx"
-      output-file-name: "lb-imix-8t4c-x710-2n-skx"
-      data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '8T4C' and 'LBOND'"
-      parameters:
-      - "result"
+
+    - title: "3n-hsw-x710-64b-1t1c-dpdk"
+      output-file-name: "3n-hsw-x710-64b-1t1c-dpdk"
+      data: "plot-performance-trending-dpdk-3n-hsw"
+      include:
+        - "tests.dpdk.perf.10ge2p1x710-eth-l2xcbase-testpmd-mrr.64b-1t1c-eth-l2xcbase-testpmd-mrr"
+        - "tests.dpdk.perf.10ge2p1x710-ethip4-ip4base-l3fwd-mrr.64b-1t1c-ethip4-ip4base-l3fwd-mrr"
       layout: "plot-cpta"
 
-# Link Bonding - xxv710
+    - title: "3n-hsw-x710-64b-2t2c-dpdk"
+      output-file-name: "3n-hsw-x710-64b-2t2c-dpdk"
+      data: "plot-performance-trending-dpdk-3n-hsw"
+      include:
+        - "tests.dpdk.perf.10ge2p1x710-eth-l2xcbase-testpmd-mrr.64b-2t2c-eth-l2xcbase-testpmd-mrr"
+        - "tests.dpdk.perf.10ge2p1x710-ethip4-ip4base-l3fwd-mrr.64b-2t2c-ethip4-ip4base-l3fwd-mrr"
+      layout: "plot-cpta"
 
-    - title: "VPP 2T1C Link Bonding 64B MRR Trending 2n-skx"
-      output-file-name: "lb-64b-2t1c-xxv710-2n-skx"
-      data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '2T1C' and 'LBOND'"
-      parameters:
-      - "result"
+    - title: "3n-hsw-x710-64b-4t4c-dpdk"
+      output-file-name: "3n-hsw-x710-64b-4t4c-dpdk"
+      data: "plot-performance-trending-dpdk-3n-hsw"
+      include:
+        - "tests.dpdk.perf.10ge2p1x710-eth-l2xcbase-testpmd-mrr.64b-4t4c-eth-l2xcbase-testpmd-mrr"
+        - "tests.dpdk.perf.10ge2p1x710-ethip4-ip4base-l3fwd-mrr.64b-4t4c-ethip4-ip4base-l3fwd-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C Link Bonding 64B MRR Trending 2n-skx"
-      output-file-name: "lb-64b-4t2c-xxv710-2n-skx"
-      data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '4T2C' and 'LBOND'"
-      parameters:
-      - "result"
+    - title: "3n-hsw-xl710-64b-1t1c-dpdk"
+      output-file-name: "3n-hsw-xl710-64b-1t1c-dpdk"
+      data: "plot-performance-trending-dpdk-3n-hsw"
+      include:
+        - "tests.dpdk.perf.40ge2p1xl710-eth-l2xcbase-testpmd-mrr.64b-1t1c-eth-l2xcbase-testpmd-mrr"
+        - "tests.dpdk.perf.40ge2p1xl710-ethip4-ip4base-l3fwd-mrr.64b-1t1c-ethip4-ip4base-l3fwd-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C Link Bonding 64B MRR Trending 2n-skx"
-      output-file-name: "lb-64b-8t4c-xxv710-2n-skx"
-      data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '8T4C' and 'LBOND'"
-      parameters:
-      - "result"
+    - title: "3n-hsw-xl710-64b-2t2c-dpdk"
+      output-file-name: "3n-hsw-xl710-64b-2t2c-dpdk"
+      data: "plot-performance-trending-dpdk-3n-hsw"
+      include:
+        - "tests.dpdk.perf.40ge2p1xl710-eth-l2xcbase-testpmd-mrr.64b-2t2c-eth-l2xcbase-testpmd-mrr"
+        - "tests.dpdk.perf.40ge2p1xl710-ethip4-ip4base-l3fwd-mrr.64b-2t2c-ethip4-ip4base-l3fwd-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 2T1C Link Bonding IMIX MRR Trending 2n-skx"
-      output-file-name: "lb-imix-2t1c-xxv710-2n-skx"
-      data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '2T1C' and 'LBOND'"
-      parameters:
-      - "result"
+    - title: "3n-hsw-xl710-64b-4t4c-dpdk"
+      output-file-name: "3n-hsw-xl710-64b-4t4c-dpdk"
+      data: "plot-performance-trending-dpdk-3n-hsw"
+      include:
+        - "tests.dpdk.perf.40ge2p1xl710-eth-l2xcbase-testpmd-mrr.64b-4t4c-eth-l2xcbase-testpmd-mrr"
+        - "tests.dpdk.perf.40ge2p1xl710-ethip4-ip4base-l3fwd-mrr.64b-4t4c-ethip4-ip4base-l3fwd-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C Link Bonding IMIX MRR Trending 2n-skx"
-      output-file-name: "lb-imix-4t2c-xxv710-2n-skx"
-      data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '4T2C' and 'LBOND'"
-      parameters:
-      - "result"
+    - title: "3n-skx-x710-64b-2t1c-dpdk"
+      output-file-name: "3n-skx-x710-64b-2t1c-dpdk"
+      data: "plot-performance-trending-dpdk-3n-skx"
+      include:
+        - "tests.dpdk.perf.10ge2p1x710-eth-l2xcbase-testpmd-mrr.64b-2t1c-eth-l2xcbase-testpmd-mrr"
+        - "tests.dpdk.perf.10ge2p1x710-ethip4-ip4base-l3fwd-mrr.64b-2t1c-ethip4-ip4base-l3fwd-mrr"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C Link Bonding IMIX MRR Trending 2n-skx"
-      output-file-name: "lb-imix-8t4c-xxv710-2n-skx"
-      data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '8T4C' and 'LBOND'"
-      parameters:
-      - "result"
+    - title: "3n-skx-x710-64b-4t2c-dpdk"
+      output-file-name: "3n-skx-x710-64b-4t2c-dpdk"
+      data: "plot-performance-trending-dpdk-3n-skx"
+      include:
+        - "tests.dpdk.perf.10ge2p1x710-eth-l2xcbase-testpmd-mrr.64b-4t2c-eth-l2xcbase-testpmd-mrr"
+        - "tests.dpdk.perf.10ge2p1x710-ethip4-ip4base-l3fwd-mrr.64b-4t2c-ethip4-ip4base-l3fwd-mrr"
       layout: "plot-cpta"
 
-# DPDK - x710 - 64B
+    - title: "3n-skx-x710-64b-8t4c-dpdk"
+      output-file-name: "3n-skx-x710-64b-8t4c-dpdk"
+      data: "plot-performance-trending-dpdk-3n-skx"
+      include:
+        - "tests.dpdk.perf.10ge2p1x710-eth-l2xcbase-testpmd-mrr.64b-8t4c-eth-l2xcbase-testpmd-mrr"
+        - "tests.dpdk.perf.10ge2p1x710-ethip4-ip4base-l3fwd-mrr.64b-8t4c-ethip4-ip4base-l3fwd-mrr"
+      layout: "plot-cpta"
 
-    - title: "DPDK 2T1C 64B MRR Trending 2n-skx"
-      output-file-name: "dpdk-64b-2t1c-x710-2n-skx"
-      data: "plot-performance-trending-dpdk-2n-skx"
-      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T1C' and 'DPDK'"
-      parameters:
-      - "result"
+    - title: "3n-skx-xxv710-64b-2t1c-dpdk"
+      output-file-name: "3n-skx-xxv710-64b-2t1c-dpdk"
+      data: "plot-performance-trending-dpdk-3n-skx"
+      include:
+        - "tests.dpdk.perf.25ge2p1xxv710-eth-l2xcbase-testpmd-mrr.64b-2t1c-eth-l2xcbase-testpmd-mrr"
+        - "tests.dpdk.perf.25ge2p1xxv710-ethip4-ip4base-l3fwd-mrr.64b-2t1c-ethip4-ip4base-l3fwd-mrr"
       layout: "plot-cpta"
 
-    - title: "DPDK 4T2C 64B MRR Trending 2n-skx"
-      output-file-name: "dpdk-64b-4t2c-x710-2n-skx"
-      data: "plot-performance-trending-dpdk-2n-skx"
-      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T2C' and 'DPDK'"
-      parameters:
-      - "result"
+    - title: "3n-skx-xxv710-64b-4t2c-dpdk"
+      output-file-name: "3n-skx-xxv710-64b-4t2c-dpdk"
+      data: "plot-performance-trending-dpdk-3n-skx"
+      include:
+        - "tests.dpdk.perf.25ge2p1xxv710-eth-l2xcbase-testpmd-mrr.64b-4t2c-eth-l2xcbase-testpmd-mrr"
+        - "tests.dpdk.perf.25ge2p1xxv710-ethip4-ip4base-l3fwd-mrr.64b-4t2c-ethip4-ip4base-l3fwd-mrr"
       layout: "plot-cpta"
 
-    - title: "DPDK 8T4C 64B MRR Trending 2n-skx"
-      output-file-name: "dpdk-64b-8t4c-x710-2n-skx"
-      data: "plot-performance-trending-dpdk-2n-skx"
-      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '8T4C' and 'DPDK'"
-      parameters:
-      - "result"
+    - title: "3n-skx-xxv710-64b-8t4c-dpdk"
+      output-file-name: "3n-skx-xxv710-64b-8t4c-dpdk"
+      data: "plot-performance-trending-dpdk-3n-skx"
+      include:
+        - "tests.dpdk.perf.25ge2p1xxv710-eth-l2xcbase-testpmd-mrr.64b-8t4c-eth-l2xcbase-testpmd-mrr"
+        - "tests.dpdk.perf.25ge2p1xxv710-ethip4-ip4base-l3fwd-mrr.64b-8t4c-ethip4-ip4base-l3fwd-mrr"
       layout: "plot-cpta"
 
-## DPDK - x710 - IMIX
-#
-#    - title: "DPDK 2T1C IMIX MRR Trending 2n-skx"
-#      output-file-name: "dpdk-imix-2t1c-x710-2n-skx"
-#      data: "plot-performance-trending-dpdk-2n-skx"
-#      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '2T1C' and 'DPDK'"
-#      parameters:
-#      - "result"
-#      layout: "plot-cpta"
-#
-#    - title: "DPDK 4T2C IMIX MRR Trending 2n-skx"
-#      output-file-name: "dpdk-imix-4t2c-x710-2n-skx"
-#      data: "plot-performance-trending-dpdk-2n-skx"
-#      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '4T2C' and 'DPDK'"
-#      parameters:
-#      - "result"
-#      layout: "plot-cpta"
-#
-#    - title: "DPDK 8T4C IMIX MRR Trending 2n-skx"
-#      output-file-name: "dpdk-imix-8t4c-x710-2n-skx"
-#      data: "plot-performance-trending-dpdk-2n-skx"
-#      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '8T4C' and 'DPDK'"
-#      parameters:
-#      - "result"
-#      layout: "plot-cpta"
-
-# DPDK - xxv710 - 64B
-
-    - title: "DPDK 2T1C 64B MRR Trending 2n-skx"
-      output-file-name: "dpdk-64b-2t1c-xxv710-2n-skx"
-      data: "plot-performance-trending-dpdk-2n-skx"
-      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '2T1C' and 'DPDK'"
-      parameters:
-      - "result"
+    - title: "3n-tsh-x520-64b-1t1c-dpdk"
+      output-file-name: "3n-tsh-x520-64b-1t1c-dpdk"
+      data: "plot-performance-trending-dpdk-3n-tsh"
+      include:
+        - "Tests.Dpdk.Perf.10Ge2P1X520-Eth-L2Xcbase-Testpmd-Mrr.64B-1t1c-eth-l2xcbase-testpmd-mrr"
+        - "Tests.Dpdk.Perf.10Ge2P1X520-Ethip4-Ip4Base-L3Fwd-Mrr.64B-1t1c-ethip4-ip4base-l3fwd-mrr"
       layout: "plot-cpta"
 
-    - title: "DPDK 4T2C 64B MRR Trending 2n-skx"
-      output-file-name: "dpdk-64b-4t2c-xxv710-2n-skx"
-      data: "plot-performance-trending-dpdk-2n-skx"
-      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '4T2C' and 'DPDK'"
-      parameters:
-      - "result"
+    - title: "3n-tsh-x520-64b-2t2c-dpdk"
+      output-file-name: "3n-tsh-x520-64b-2t2c-dpdk"
+      data: "plot-performance-trending-dpdk-3n-tsh"
+      include:
+        - "Tests.Dpdk.Perf.10Ge2P1X520-Eth-L2Xcbase-Testpmd-Mrr.64B-2t2c-eth-l2xcbase-testpmd-mrr"
+        - "Tests.Dpdk.Perf.10Ge2P1X520-Ethip4-Ip4Base-L3Fwd-Mrr.64B-2t2c-ethip4-ip4base-l3fwd-mrr"
       layout: "plot-cpta"
 
-    - title: "DPDK 8T4C 64B MRR Trending 2n-skx"
-      output-file-name: "dpdk-64b-8t4c-xxv710-2n-skx"
-      data: "plot-performance-trending-dpdk-2n-skx"
-      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '8T4C' and 'DPDK'"
-      parameters:
-      - "result"
+    - title: "3n-tsh-x520-64b-4t4c-dpdk"
+      output-file-name: "3n-tsh-x520-64b-4t4c-dpdk"
+      data: "plot-performance-trending-dpdk-3n-tsh"
+      include:
+        - "Tests.Dpdk.Perf.10Ge2P1X520-Eth-L2Xcbase-Testpmd-Mrr.64B-4t4c-eth-l2xcbase-testpmd-mrr"
+        - "Tests.Dpdk.Perf.10Ge2P1X520-Ethip4-Ip4Base-L3Fwd-Mrr.64B-4t4c-ethip4-ip4base-l3fwd-mrr"
       layout: "plot-cpta"
 
-## DPDK - xxv710 - IMIX
-#
-#    - title: "DPDK 2T1C IMIX MRR Trending 2n-skx"
-#      output-file-name: "dpdk-imix-2t1c-xxv710-2n-skx"
-#      data: "plot-performance-trending-dpdk-2n-skx"
-#      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '2T1C' and 'DPDK'"
-#      parameters:
-#      - "result"
-#      layout: "plot-cpta"
-#
-#    - title: "DPDK 4T2C IMIX MRR Trending 2n-skx"
-#      output-file-name: "dpdk-imix-4t2c-xxv710-2n-skx"
-#      data: "plot-performance-trending-dpdk-2n-skx"
-#      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '4T2C' and 'DPDK'"
-#      parameters:
-#      - "result"
-#      layout: "plot-cpta"
-#
-#    - title: "DPDK 8T4C IMIX MRR Trending 2n-skx"
-#      output-file-name: "dpdk-imix-8t4c-xxv710-2n-skx"
-#      data: "plot-performance-trending-dpdk-2n-skx"
-#      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '8T4C' and 'DPDK'"
-#      parameters:
-#      - "result"
-#      layout: "plot-cpta"
+################################################################################
+
+#  NDRPDR Trending
+
+# 2n-clx memif
+
+    - title: "2n-clx-xxv710-64b-2t1c-memif-base-dpdk-ndr"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-memif-base-dpdk-ndr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-2t1c-memif-base-dpdk-pdr"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-memif-base-dpdk-pdr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-2t1c-memif-base-avf-ndr"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-memif-base-avf-ndr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-avf-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-2t1c-memif-base-avf-pdr"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-memif-base-avf-pdr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-avf-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-cx556a-64b-2t1c-rdma-l2-eth-2memif-1dcr-ndr"
+      output-file-name: "2n-clx-cx556a-64b-2t1c-rdma-l2-eth-2memif-1dcr-ndr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-rdma-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-rdma-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-rdma-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1Cx556A-Rdma-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-rdma-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-cx556a-64b-2t1c-rdma-l2-eth-2memif-1dcr-pdr"
+      output-file-name: "2n-clx-cx556a-64b-2t1c-rdma-l2-eth-2memif-1dcr-pdr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-rdma-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-rdma-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-rdma-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1Cx556A-Rdma-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-rdma-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
+      layout: "plot-cpta"
+
+# 2n-clx ip4
+
+    - title: "2n-clx-x710-64b-2t1c-ip4-base-avf-dpdk-ndr"
+      output-file-name: "2n-clx-x710-64b-2t1c-ip4-base-avf-dpdk-ndr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-ethip4-ip4base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-avf-ethip4-ip4base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale2m-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-Rnd-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale2m-rnd-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-x710-64b-2t1c-ip4-base-avf-dpdk-pdr"
+      output-file-name: "2n-clx-x710-64b-2t1c-ip4-base-avf-dpdk-pdr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-ethip4-ip4base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-avf-ethip4-ip4base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale2m-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-Rnd-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale2m-rnd-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-cx556a-64b-2t1c-ip4-base-rdma-ndr"
+      output-file-name: "2n-clx-cx556a-64b-2t1c-ip4-base-rdma-ndr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-Ip4Base-Ndrpdr.64B-2t1c-rdma-dot1q-ip4base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-rdma-ethip4-ip4base-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-cx556a-64b-2t1c-ip4-scale-rdma-ndr"
+      output-file-name: "2n-clx-cx556a-64b-2t1c-ip4-scale-rdma-ndr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4-Ip4Scale20K-Ndrpdr.64B-2t1c-rdma-ethip4-ip4scale20k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4-Ip4Scale20K-Rnd-Ndrpdr.64B-2t1c-rdma-ethip4-ip4scale20k-rnd-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4-Ip4Scale200K-Ndrpdr.64B-2t1c-rdma-ethip4-ip4scale200k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4-Ip4Scale200K-Rnd-Ndrpdr.64B-2t1c-rdma-ethip4-ip4scale200k-rnd-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-rdma-ethip4-ip4scale2m-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4-Ip4Scale2M-Rnd-Ndrpdr.64B-2t1c-rdma-ethip4-ip4scale2m-rnd-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-cx556a-64b-2t1c-ip4-features-rdma-ndr"
+      output-file-name: "2n-clx-cx556a-64b-2t1c-ip4-features-rdma-ndr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-2t1c-rdma-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-2t1c-rdma-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-2t1c-rdma-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-2t1c-rdma-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-ethip4udp-nat44det-h1-p1-s1-Ndrpdr.64B-2t1c-rdma-ethip4udp-nat44det-h1-p1-s1-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-ethip4udp-nat44det-h1024-p63-s64512-Ndrpdr.64B-2t1c-rdma-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-cx556a-64b-2t1c-ip4-base-rdma-pdr"
+      output-file-name: "2n-clx-cx556a-64b-2t1c-ip4-base-rdma-pdr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-Ip4Base-Ndrpdr.64B-2t1c-rdma-dot1q-ip4base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-rdma-ethip4-ip4base-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-cx556a-64b-2t1c-ip4-scale-rdma-pdr"
+      output-file-name: "2n-clx-cx556a-64b-2t1c-ip4-scale-rdma-pdr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4-Ip4Scale20K-Ndrpdr.64B-2t1c-rdma-ethip4-ip4scale20k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4-Ip4Scale20K-Rnd-Ndrpdr.64B-2t1c-rdma-ethip4-ip4scale20k-rnd-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4-Ip4Scale200K-Ndrpdr.64B-2t1c-rdma-ethip4-ip4scale200k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4-Ip4Scale200K-Rnd-Ndrpdr.64B-2t1c-rdma-ethip4-ip4scale200k-rnd-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-rdma-ethip4-ip4scale2m-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4-Ip4Scale2M-Rnd-Ndrpdr.64B-2t1c-rdma-ethip4-ip4scale2m-rnd-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-cx556a-64b-2t1c-ip4-features-rdma-pdr"
+      output-file-name: "2n-clx-cx556a-64b-2t1c-ip4-features-rdma-pdr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-2t1c-rdma-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-2t1c-rdma-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-2t1c-rdma-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-2t1c-rdma-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-ethip4udp-nat44det-h1-p1-s1-Ndrpdr.64B-2t1c-rdma-ethip4udp-nat44det-h1-p1-s1-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-ethip4udp-nat44det-h1024-p63-s64512-Ndrpdr.64B-2t1c-rdma-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-2t1c-ip4-base-scale-avf-ndr"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-ip4-base-scale-avf-ndr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-Ip4Base-Ndrpdr.64B-2t1c-avf-dot1q-ip4base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-avf-ethip4-ip4base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale20K-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale20k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale200K-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale200k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale2m-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-2t1c-ip4-scale-avf-rnd-ndr"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-ip4-scale-avf-rnd-ndr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale20K-Rnd-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale20k-rnd-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale200K-Rnd-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale200k-rnd-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale2M-Rnd-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale2m-rnd-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-2t1c-ip4-features-avf-ndr"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-ip4-features-avf-ndr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1-p1-s1-Ndrpdr.64B-2t1c-avf-ethip4udp-nat44det-h1-p1-s1-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1024-p63-s64512-Ndrpdr.64B-2t1c-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-stl-bidir-avf-ndr"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-stl-bidir-avf-ndr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "NDR"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr.64b-2t1c-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h4096-p63-s258048-ndrpdr.64b-2t1c-avf-ethip4udp-nat44det-h4096-p63-s258048-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h16384-p63-s1032192-ndrpdr.64b-2t1c-avf-ethip4udp-nat44det-h16384-p63-s1032192-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h65536-p63-s4128758-ndrpdr.64b-2t1c-avf-ethip4udp-nat44det-h65536-p63-s4128758-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h262144-p63-s16515072-ndrpdr.64b-2t1c-avf-ethip4udp-nat44det-h262144-p63-s16515072-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf-ndr"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf-ndr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "NDR"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-udir-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h4096-p63-s258048-udir-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-udir-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-udir-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-udir-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-udir-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-udir-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-udir-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf-ndr"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf-ndr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "NDR"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-cps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h4096-p63-s258048-cps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-cps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-cps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-cps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-cps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-cps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-cps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h1024-p63-s64512-cps-ndrpdr.64b-2t1c-avf-ethip4udp-ip4base-h1024-p63-s64512-cps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h4096-p63-s258048-cps-ndrpdr.64b-2t1c-avf-ethip4udp-ip4base-h4096-p63-s258048-cps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h16384-p63-s1032192-cps-ndrpdr.64b-2t1c-avf-ethip4udp-ip4base-h16384-p63-s1032192-cps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h65536-p63-s4128768-cps-ndrpdr.64b-2t1c-avf-ethip4udp-ip4base-h65536-p63-s4128768-cps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h262144-p63-s16515072-cps-ndrpdr.64b-2t1c-avf-ethip4udp-ip4base-h262144-p63-s16515072-cps-ndrpdr"
+      layout: "plot-cpta-cps"
+
+    - title: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-pps-avf-ndr"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-pps-avf-ndr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "NDR"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-pps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h4096-p63-s258048-pps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-pps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-pps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-pps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-pps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-pps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-pps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h1024-p63-s64512-pps-ndrpdr.64b-2t1c-avf-ethip4udp-ip4base-h1024-p63-s64512-pps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h4096-p63-s258048-pps-ndrpdr.64b-2t1c-avf-ethip4udp-ip4base-h4096-p63-s258048-pps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h16384-p63-s1032192-pps-ndrpdr.64b-2t1c-avf-ethip4udp-ip4base-h16384-p63-s1032192-pps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h65536-p63-s4128768-pps-ndrpdr.64b-2t1c-avf-ethip4udp-ip4base-h65536-p63-s4128768-pps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h262144-p63-s16515072-pps-ndrpdr.64b-2t1c-avf-ethip4udp-ip4base-h262144-p63-s16515072-pps-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf-ndr"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf-ndr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "NDR"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h4096-p63-s258048-cps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h4096-p63-s258048-cps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h1024-p63-s64512-cps-ndrpdr.64b-2t1c-avf-ethip4tcp-ip4base-h1024-p63-s64512-cps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h4096-p63-s258048-cps-ndrpdr.64b-2t1c-avf-ethip4tcp-ip4base-h4096-p63-s258048-cps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h16384-p63-s1032192-cps-ndrpdr.64b-2t1c-avf-ethip4tcp-ip4base-h16384-p63-s1032192-cps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h65536-p63-s4128768-cps-ndrpdr.64b-2t1c-avf-ethip4tcp-ip4base-h65536-p63-s4128768-cps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h262144-p63-s16515072-cps-ndrpdr.64b-2t1c-avf-ethip4tcp-ip4base-h262144-p63-s16515072-cps-ndrpdr"
+      layout: "plot-cpta-cps"
+
+    - title: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-pps-avf-ndr"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-pps-avf-ndr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "NDR"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h4096-p63-s258048-pps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h4096-p63-s258048-pps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h1024-p63-s64512-pps-ndrpdr.64b-2t1c-avf-ethip4tcp-ip4base-h1024-p63-s64512-pps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h4096-p63-s258048-pps-ndrpdr.64b-2t1c-avf-ethip4tcp-ip4base-h4096-p63-s258048-pps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h16384-p63-s1032192-pps-ndrpdr.64b-2t1c-avf-ethip4tcp-ip4base-h16384-p63-s1032192-pps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h65536-p63-s4128768-pps-ndrpdr.64b-2t1c-avf-ethip4tcp-ip4base-h65536-p63-s4128768-pps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h262144-p63-s16515072-pps-ndrpdr.64b-2t1c-avf-ethip4tcp-ip4base-h262144-p63-s16515072-pps-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-2t1c-ip4-base-scale-avf-pdr"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-ip4-base-scale-avf-pdr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-Ip4Base-Ndrpdr.64B-2t1c-avf-dot1q-ip4base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-avf-ethip4-ip4base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale20K-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale20k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale200K-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale200k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale2m-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-2t1c-ip4-scale-avf-rnd-pdr"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-ip4-scale-avf-rnd-pdr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale20K-Rnd-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale20k-rnd-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale200K-Rnd-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale200k-rnd-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale2M-Rnd-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale2m-rnd-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-2t1c-ip4-features-avf-pdr"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-ip4-features-avf-pdr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1-p1-s1-Ndrpdr.64B-2t1c-avf-ethip4udp-nat44det-h1-p1-s1-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1024-p63-s64512-Ndrpdr.64B-2t1c-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-stl-bidir-avf-pdr"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-stl-bidir-avf-pdr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "PDR"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr.64b-2t1c-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h4096-p63-s258048-ndrpdr.64b-2t1c-avf-ethip4udp-nat44det-h4096-p63-s258048-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h16384-p63-s1032192-ndrpdr.64b-2t1c-avf-ethip4udp-nat44det-h16384-p63-s1032192-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h65536-p63-s4128758-ndrpdr.64b-2t1c-avf-ethip4udp-nat44det-h65536-p63-s4128758-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h262144-p63-s16515072-ndrpdr.64b-2t1c-avf-ethip4udp-nat44det-h262144-p63-s16515072-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf-pdr"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf-pdr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "PDR"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-udir-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h4096-p63-s258048-udir-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-udir-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-udir-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-udir-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-udir-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-udir-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-udir-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf-pdr"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf-pdr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "PDR"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-cps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h4096-p63-s258048-cps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-cps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-cps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-cps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-cps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-cps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-cps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h1024-p63-s64512-cps-ndrpdr.64b-2t1c-avf-ethip4udp-ip4base-h1024-p63-s64512-cps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h4096-p63-s258048-cps-ndrpdr.64b-2t1c-avf-ethip4udp-ip4base-h4096-p63-s258048-cps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h16384-p63-s1032192-cps-ndrpdr.64b-2t1c-avf-ethip4udp-ip4base-h16384-p63-s1032192-cps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h65536-p63-s4128768-cps-ndrpdr.64b-2t1c-avf-ethip4udp-ip4base-h65536-p63-s4128768-cps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h262144-p63-s16515072-cps-ndrpdr.64b-2t1c-avf-ethip4udp-ip4base-h262144-p63-s16515072-cps-ndrpdr"
+      layout: "plot-cpta-cps"
+
+    - title: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-pps-avf-pdr"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-pps-avf-pdr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "PDR"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-pps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h4096-p63-s258048-pps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-pps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-pps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-pps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-pps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-pps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-pps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h1024-p63-s64512-pps-ndrpdr.64b-2t1c-avf-ethip4udp-ip4base-h1024-p63-s64512-pps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h4096-p63-s258048-pps-ndrpdr.64b-2t1c-avf-ethip4udp-ip4base-h4096-p63-s258048-pps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h16384-p63-s1032192-pps-ndrpdr.64b-2t1c-avf-ethip4udp-ip4base-h16384-p63-s1032192-pps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h65536-p63-s4128768-pps-ndrpdr.64b-2t1c-avf-ethip4udp-ip4base-h65536-p63-s4128768-pps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h262144-p63-s16515072-pps-ndrpdr.64b-2t1c-avf-ethip4udp-ip4base-h262144-p63-s16515072-pps-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf-pdr"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf-pdr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "PDR"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h4096-p63-s258048-cps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h4096-p63-s258048-cps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h1024-p63-s64512-cps-ndrpdr.64b-2t1c-avf-ethip4tcp-ip4base-h1024-p63-s64512-cps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h4096-p63-s258048-cps-ndrpdr.64b-2t1c-avf-ethip4tcp-ip4base-h4096-p63-s258048-cps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h16384-p63-s1032192-cps-ndrpdr.64b-2t1c-avf-ethip4tcp-ip4base-h16384-p63-s1032192-cps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h65536-p63-s4128768-cps-ndrpdr.64b-2t1c-avf-ethip4tcp-ip4base-h65536-p63-s4128768-cps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h262144-p63-s16515072-cps-ndrpdr.64b-2t1c-avf-ethip4tcp-ip4base-h262144-p63-s16515072-cps-ndrpdr"
+      layout: "plot-cpta-cps"
+
+    - title: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-pps-avf-pdr"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-pps-avf-pdr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "PDR"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h4096-p63-s258048-pps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h4096-p63-s258048-pps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h1024-p63-s64512-pps-ndrpdr.64b-2t1c-avf-ethip4tcp-ip4base-h1024-p63-s64512-pps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h4096-p63-s258048-pps-ndrpdr.64b-2t1c-avf-ethip4tcp-ip4base-h4096-p63-s258048-pps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h16384-p63-s1032192-pps-ndrpdr.64b-2t1c-avf-ethip4tcp-ip4base-h16384-p63-s1032192-pps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h65536-p63-s4128768-pps-ndrpdr.64b-2t1c-avf-ethip4tcp-ip4base-h65536-p63-s4128768-pps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h262144-p63-s16515072-pps-ndrpdr.64b-2t1c-avf-ethip4tcp-ip4base-h262144-p63-s16515072-pps-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-2t1c-ip4-base-scale-dpdk-ndr"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-ip4-base-scale-dpdk-ndr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-ethip4-ip4base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale20K-Ndrpdr.64B-2t1c-ethip4-ip4scale20k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale200K-Ndrpdr.64B-2t1c-ethip4-ip4scale200k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-ethip4-ip4scale2m-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-2t1c-ip4-scale-dpdk-rnd-ndr"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-ip4-scale-dpdk-rnd-ndr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale20K-Rnd-Ndrpdr.64B-2t1c-ethip4-ip4scale20k-rnd-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale200K-Rnd-Ndrpdr.64B-2t1c-ethip4-ip4scale200k-rnd-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale2M-Rnd-Ndrpdr.64B-2t1c-ethip4-ip4scale2m-rnd-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-2t1c-ip4-base-features-dpdk-ndr"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-ip4-base-features-dpdk-ndr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-ethip4-ip4base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-ethip4udp-nat44det-h1-p1-s1-Ndrpdr.64B-2t1c-ip4base-nat44-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-2t1c-ip4-base-scale-dpdk-pdr"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-ip4-base-scale-dpdk-pdr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-ethip4-ip4base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale20K-Ndrpdr.64B-2t1c-ethip4-ip4scale20k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale200K-Ndrpdr.64B-2t1c-ethip4-ip4scale200k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-ethip4-ip4scale2m-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-2t1c-ip4-scale-dpdk-rnd-pdr"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-ip4-scale-dpdk-rnd-pdr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale20K-Rnd-Ndrpdr.64B-2t1c-ethip4-ip4scale20k-rnd-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale200K-Rnd-Ndrpdr.64B-2t1c-ethip4-ip4scale200k-rnd-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale2M-Rnd-Ndrpdr.64B-2t1c-ethip4-ip4scale2m-rnd-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-2t1c-ip4-base-features-dpdk-pdr"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-ip4-base-features-dpdk-pdr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-ethip4-ip4base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-ethip4udp-nat44det-h1-p1-s1-Ndrpdr.64B-2t1c-ip4base-nat44-ndrpdr"
+      layout: "plot-cpta"
+
+# 2n-clx ip6
+
+    - title: "2n-clx-cx556a-78b-2t1c-ip6-base-scale-rdma-ndr"
+      output-file-name: "2n-clx-cx556a-78b-2t1c-ip6-base-scale-rdma-ndr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-Ip6Base-Ndrpdr.78B-2t1c-rdma-dot1q-ip6base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1Cx556A-Rdma-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-rdma-ethip6-ip6base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1Cx556A-Rdma-Ethip6-Ip6Scale20K-Ndrpdr.78B-2t1c-rdma-ethip6-ip6scale20k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1Cx556A-Rdma-Ethip6-Ip6Scale200K-Ndrpdr.78B-2t1c-rdma-ethip6-ip6scale200k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1Cx556A-Rdma-Ethip6-Ip6Scale2M-Ndrpdr.78B-2t1c-rdma-ethip6-ip6scale2m-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-cx556a-78b-2t1c-ip6-base-scale-rdma-pdr"
+      output-file-name: "2n-clx-cx556a-78b-2t1c-ip6-base-scale-rdma-pdr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-Ip6Base-Ndrpdr.78B-2t1c-rdma-dot1q-ip6base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1Cx556A-Rdma-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-rdma-ethip6-ip6base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1Cx556A-Rdma-Ethip6-Ip6Scale20K-Ndrpdr.78B-2t1c-rdma-ethip6-ip6scale20k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1Cx556A-Rdma-Ethip6-Ip6Scale200K-Ndrpdr.78B-2t1c-rdma-ethip6-ip6scale200k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1Cx556A-Rdma-Ethip6-Ip6Scale2M-Ndrpdr.78B-2t1c-rdma-ethip6-ip6scale2m-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-x710-78b-2t1c-ip6-base-scale-avf-dpdk-ndr"
+      output-file-name: "2n-clx-x710-78b-2t1c-ip6-base-scale-avf-dpdk-ndr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-avf-ethip6-ip6base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-Ndrpdr.78B-2t1c-avf-ethip6-ip6scale2m-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-ethip6-ip6base-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-x710-78b-2t1c-ip6-base-scale-avf-dpdk-pdr"
+      output-file-name: "2n-clx-x710-78b-2t1c-ip6-base-scale-avf-dpdk-pdr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-avf-ethip6-ip6base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-Ndrpdr.78B-2t1c-avf-ethip6-ip6scale2m-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-ethip6-ip6base-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-78b-2t1c-ip6-base-scale-avf-ndr"
+      output-file-name: "2n-clx-xxv710-78b-2t1c-ip6-base-scale-avf-ndr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-Ip6Base-Ndrpdr.78B-2t1c-avf-dot1q-ip6base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-avf-ethip6-ip6base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale20K-Ndrpdr.78B-2t1c-avf-ethip6-ip6scale20k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale200K-Ndrpdr.78B-2t1c-avf-ethip6-ip6scale200k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale2M-Ndrpdr.78B-2t1c-avf-ethip6-ip6scale2m-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-78b-2t1c-ip6-base-scale-avf-pdr"
+      output-file-name: "2n-clx-xxv710-78b-2t1c-ip6-base-scale-avf-pdr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-Ip6Base-Ndrpdr.78B-2t1c-avf-dot1q-ip6base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-avf-ethip6-ip6base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale20K-Ndrpdr.78B-2t1c-avf-ethip6-ip6scale20k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale200K-Ndrpdr.78B-2t1c-avf-ethip6-ip6scale200k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale2M-Ndrpdr.78B-2t1c-avf-ethip6-ip6scale2m-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-78b-2t1c-ip6-base-scale-dpdk-ndr"
+      output-file-name: "2n-clx-xxv710-78b-2t1c-ip6-base-scale-dpdk-ndr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-ethip6-ip6base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale20K-Ndrpdr.78B-2t1c-ethip6-ip6scale20k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale200K-Ndrpdr.78B-2t1c-ethip6-ip6scale200k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale2M-Ndrpdr.78B-2t1c-ethip6-ip6scale2m-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-78b-2t1c-ip6-base-scale-dpdk-pdr"
+      output-file-name: "2n-clx-xxv710-78b-2t1c-ip6-base-scale-dpdk-pdr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-ethip6-ip6base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale20K-Ndrpdr.78B-2t1c-ethip6-ip6scale20k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale200K-Ndrpdr.78B-2t1c-ethip6-ip6scale200k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale2M-Ndrpdr.78B-2t1c-ethip6-ip6scale2m-ndrpdr"
+      layout: "plot-cpta"
+
+# 2n-clx L2
+
+    - title: "2n-clx-cx556a-64b-2t1c-l2-base-rdma-ndr"
+      output-file-name: "2n-clx-cx556a-64b-2t1c-l2-base-rdma-ndr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Xcbase-Ndrpdr.64B-2t1c-rdma-dot1q-l2xcbase-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-rdma-dot1q-l2bdbasemaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Patch-Ndrpdr.64B-2t1c-rdma-eth-l2patch-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Xcbase-Ndrpdr.64B-2t1c-rdma-eth-l2xcbase-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-rdma-eth-l2bdbasemaclrn-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-cx556a-64b-2t1c-l2-base-scale-rdma-ndr"
+      output-file-name: "2n-clx-cx556a-64b-2t1c-l2-base-scale-rdma-ndr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-rdma-eth-l2bdbasemaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-2t1c-rdma-eth-l2bdscale10kmaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-2t1c-rdma-eth-l2bdscale100kmaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-2t1c-rdma-eth-l2bdscale1mmaclrn-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-cx556a-64b-2t1c-l2-base-rdma-pdr"
+      output-file-name: "2n-clx-cx556a-64b-2t1c-l2-base-rdma-pdr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Xcbase-Ndrpdr.64B-2t1c-rdma-dot1q-l2xcbase-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-rdma-dot1q-l2bdbasemaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Patch-Ndrpdr.64B-2t1c-rdma-eth-l2patch-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Xcbase-Ndrpdr.64B-2t1c-rdma-eth-l2xcbase-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-rdma-eth-l2bdbasemaclrn-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-cx556a-64b-2t1c-l2-base-scale-rdma-pdr"
+      output-file-name: "2n-clx-cx556a-64b-2t1c-l2-base-scale-rdma-pdr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-rdma-eth-l2bdbasemaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-2t1c-rdma-eth-l2bdscale10kmaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-2t1c-rdma-eth-l2bdscale100kmaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-2t1c-rdma-eth-l2bdscale1mmaclrn-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-x710-64b-2t1c-l2-base-scale-avf-dpdk-ndr"
+      output-file-name: "2n-clx-x710-64b-2t1c-l2-base-scale-avf-dpdk-ndr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdscale1mmaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-x710-64b-2t1c-l2-base-scale-avf-dpdk-pdr"
+      output-file-name: "2n-clx-x710-64b-2t1c-l2-base-scale-avf-dpdk-pdr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdscale1mmaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-2t1c-l2-base-avf-ndr"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-l2-base-avf-ndr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Ndrpdr.64B-2t1c-avf-dot1q-l2xcbase-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Patch-Ndrpdr.64B-2t1c-avf-eth-l2patch-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-2t1c-l2-base-avf-pdr"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-l2-base-avf-pdr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Ndrpdr.64B-2t1c-avf-dot1q-l2xcbase-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Patch-Ndrpdr.64B-2t1c-avf-eth-l2patch-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-2t1c-l2-base-scale-avf-ndr"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-l2-base-scale-avf-ndr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdscale10kmaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdscale100kmaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdscale1mmaclrn-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-2t1c-l2-base-scale-avf-pdr"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-l2-base-scale-avf-pdr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdscale10kmaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdscale100kmaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdscale1mmaclrn-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-2t1c-l2-base-scale-dpdk-ndr"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-l2-base-scale-dpdk-ndr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Patch-Ndrpdr.64B-2t1c-eth-l2patch-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Ndrpdr.64B-2t1c-eth-l2xcbase-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale10kmaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale100kmaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale1mmaclrn-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-2t1c-l2-base-scale-dpdk-pdr"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-l2-base-scale-dpdk-pdr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Patch-Ndrpdr.64B-2t1c-eth-l2patch-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Ndrpdr.64B-2t1c-eth-l2xcbase-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale10kmaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale100kmaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale1mmaclrn-ndrpdr"
+      layout: "plot-cpta"
+
+# 2n-clx VHost
+
+    - title: "2n-clx-cx556a-64b-2t1c-vhost-base-rdma-testpmd-ndr"
+      output-file-name: "2n-clx-cx556a-64b-2t1c-vhost-base-rdma-testpmd-ndr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-rdma-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-rdma-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-rdma-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-rdma-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-cx556a-64b-2t1c-vhost-base-rdma-vpp-ndr"
+      output-file-name: "2n-clx-cx556a-64b-2t1c-vhost-base-rdma-vpp-ndr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-rdma-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-rdma-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-rdma-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-rdma-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-cx556a-64b-2t1c-vhost-base-rdma-testpmd-pdr"
+      output-file-name: "2n-clx-cx556a-64b-2t1c-vhost-base-rdma-testpmd-pdr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-rdma-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-rdma-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-rdma-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-rdma-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-cx556a-64b-2t1c-vhost-base-rdma-vpp-pdr"
+      output-file-name: "2n-clx-cx556a-64b-2t1c-vhost-base-rdma-vpp-pdr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-rdma-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-rdma-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-rdma-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-rdma-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-2t1c-vhost-base-avf-dpdk-testpmd-ndr"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-vhost-base-avf-dpdk-testpmd-ndr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-avf-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-2t1c-vhost-base-avf-dpdk-vpp-ndr"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-vhost-base-avf-dpdk-vpp-ndr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-avf-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-2t1c-vhost-base-avf-dpdk-testpmd-pdr"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-vhost-base-avf-dpdk-testpmd-pdr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-avf-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-64b-2t1c-vhost-base-avf-dpdk-vpp-pdr"
+      output-file-name: "2n-clx-xxv710-64b-2t1c-vhost-base-avf-dpdk-vpp-pdr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-avf-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-114b-2t1c-vts-l2switching-base-avf-ndr"
+      output-file-name: "2n-clx-xxv710-114b-2t1c-vts-l2switching-base-avf-ndr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.Vts.2N1L-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermit-2Vhostvr1024-1Vm-Ndrpdr.114B-2t1c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vts.2N1L-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermitreflect-2Vhostvr1024-1Vm-Ndrpdr.114B-2t1c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vts.2N1L-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Noacl-2Vhostvr1024-1Vm-Ndrpdr.114B-2t1c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-clx-xxv710-114b-2t1c-vts-l2switching-base-avf-pdr"
+      output-file-name: "2n-clx-xxv710-114b-2t1c-vts-l2switching-base-avf-pdr"
+      data: "plot-ndrpdr-comparison-2n-clx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.Vts.2N1L-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermit-2Vhostvr1024-1Vm-Ndrpdr.114B-2t1c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vts.2N1L-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermitreflect-2Vhostvr1024-1Vm-Ndrpdr.114B-2t1c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vts.2N1L-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Noacl-2Vhostvr1024-1Vm-Ndrpdr.114B-2t1c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr"
+      layout: "plot-cpta"
+
+# 2n-skx memif
+
+    - title: "2n-skx-xxv710-64b-2t1c-memif-base-avf-ndr"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-memif-base-avf-ndr"
+      data: "plot-ndrpdr-comparison-2n-skx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-avf-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-avf-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-avf-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-avf-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-avf-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-skx-xxv710-64b-2t1c-memif-base-avf-pdr"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-memif-base-avf-pdr"
+      data: "plot-ndrpdr-comparison-2n-skx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-avf-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-avf-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-avf-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-avf-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-avf-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-skx-xxv710-64b-2t1c-memif-base-dpdk-ndr"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-memif-base-dpdk-ndr"
+      data: "plot-ndrpdr-comparison-2n-skx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-skx-xxv710-64b-2t1c-memif-base-dpdk-pdr"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-memif-base-dpdk-pdr"
+      data: "plot-ndrpdr-comparison-2n-skx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
+        - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
+      layout: "plot-cpta"
+
+# 2n-skx ip4
+
+    - title: "2n-skx-x710-64b-2t1c-ip4-base-scale-avf-dpdk-ndr"
+      output-file-name: "2n-skx-x710-64b-2t1c-ip4-base-scale-avf-dpdk-ndr"
+      data: "plot-ndrpdr-comparison-2n-skx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-avf-ethip4-ip4base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale2m-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-avf-Ethip4-Ip4Scale2M-Rnd-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale2m-rnd-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-ethip4-ip4base-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-skx-x710-64b-2t1c-ip4-base-scale-avf-dpdk-pdr"
+      output-file-name: "2n-skx-x710-64b-2t1c-ip4-base-scale-avf-dpdk-pdr"
+      data: "plot-ndrpdr-comparison-2n-skx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-avf-ethip4-ip4base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale2m-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-avf-Ethip4-Ip4Scale2M-Rnd-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale2m-rnd-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-ethip4-ip4base-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-skx-xxv710-64b-2t1c-ip4-base-avf-ndr"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-ip4-base-avf-ndr"
+      data: "plot-ndrpdr-comparison-2n-skx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-Ip4Base-Ndrpdr.64B-2t1c-avf-dot1q-ip4base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-avf-ethip4-ip4base-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-skx-xxv710-64b-2t1c-ip4-scale-avf-ndr"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-ip4-scale-avf-ndr"
+      data: "plot-ndrpdr-comparison-2n-skx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-avf-Ethip4-Ip4Scale20K-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale20k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-avf-Ethip4-Ip4Scale20K-Rnd-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale20k-rnd-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-avf-Ethip4-Ip4Scale200K-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale200k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-avf-Ethip4-Ip4Scale200K-Rnd-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale200k-rnd-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale2m-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-avf-Ethip4-Ip4Scale2M-Rnd-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale2m-rnd-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-skx-xxv710-64b-2t1c-ip4-features-avf-ndr"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-ip4-features-avf-ndr"
+      data: "plot-ndrpdr-comparison-2n-skx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1-p1-s1-Ndrpdr.64B-2t1c-avf-ethip4udp-nat44det-h1-p1-s1-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1024-p63-s64512-Ndrpdr.64B-2t1c-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-skx-xxv710-64b-2t1c-nat44det-ip4routing-stl-bidir-avf-ndr"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-nat44det-ip4routing-stl-bidir-avf-ndr"
+      data: "plot-ndrpdr-comparison-2n-skx"
+      include-tests: "NDR"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr.64b-2t1c-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h4096-p63-s258048-ndrpdr.64b-2t1c-avf-ethip4udp-nat44det-h4096-p63-s258048-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h16384-p63-s1032192-ndrpdr.64b-2t1c-avf-ethip4udp-nat44det-h16384-p63-s1032192-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h65536-p63-s4128758-ndrpdr.64b-2t1c-avf-ethip4udp-nat44det-h65536-p63-s4128758-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h262144-p63-s16515072-ndrpdr.64b-2t1c-avf-ethip4udp-nat44det-h262144-p63-s16515072-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf-ndr"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf-ndr"
+      data: "plot-ndrpdr-comparison-2n-skx"
+      include-tests: "NDR"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-udir-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h4096-p63-s258048-udir-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-udir-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-udir-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-udir-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-udir-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-udir-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-udir-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf-ndr"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf-ndr"
+      data: "plot-ndrpdr-comparison-2n-skx"
+      include-tests: "NDR"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-cps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h4096-p63-s258048-cps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-cps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-cps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-cps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-cps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-cps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-cps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h1024-p63-s64512-cps-ndrpdr.64b-2t1c-avf-ethip4udp-ip4base-h1024-p63-s64512-cps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h4096-p63-s258048-cps-ndrpdr.64b-2t1c-avf-ethip4udp-ip4base-h4096-p63-s258048-cps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h16384-p63-s1032192-cps-ndrpdr.64b-2t1c-avf-ethip4udp-ip4base-h16384-p63-s1032192-cps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h65536-p63-s4128768-cps-ndrpdr.64b-2t1c-avf-ethip4udp-ip4base-h65536-p63-s4128768-cps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h262144-p63-s16515072-cps-ndrpdr.64b-2t1c-avf-ethip4udp-ip4base-h262144-p63-s16515072-cps-ndrpdr"
+      layout: "plot-cpta-cps"
+
+    - title: "2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-pps-avf-ndr"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-pps-avf-ndr"
+      data: "plot-ndrpdr-comparison-2n-skx"
+      include-tests: "NDR"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-pps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h4096-p63-s258048-pps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-pps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-pps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-pps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-pps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-pps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-pps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h1024-p63-s64512-pps-ndrpdr.64b-2t1c-avf-ethip4udp-ip4base-h1024-p63-s64512-pps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h4096-p63-s258048-pps-ndrpdr.64b-2t1c-avf-ethip4udp-ip4base-h4096-p63-s258048-pps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h16384-p63-s1032192-pps-ndrpdr.64b-2t1c-avf-ethip4udp-ip4base-h16384-p63-s1032192-pps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h65536-p63-s4128768-pps-ndrpdr.64b-2t1c-avf-ethip4udp-ip4base-h65536-p63-s4128768-pps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h262144-p63-s16515072-pps-ndrpdr.64b-2t1c-avf-ethip4udp-ip4base-h262144-p63-s16515072-pps-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf-ndr"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf-ndr"
+      data: "plot-ndrpdr-comparison-2n-skx"
+      include-tests: "NDR"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h4096-p63-s258048-cps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h4096-p63-s258048-cps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h1024-p63-s64512-cps-ndrpdr.64b-2t1c-avf-ethip4tcp-ip4base-h1024-p63-s64512-cps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h4096-p63-s258048-cps-ndrpdr.64b-2t1c-avf-ethip4tcp-ip4base-h4096-p63-s258048-cps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h16384-p63-s1032192-cps-ndrpdr.64b-2t1c-avf-ethip4tcp-ip4base-h16384-p63-s1032192-cps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h65536-p63-s4128768-cps-ndrpdr.64b-2t1c-avf-ethip4tcp-ip4base-h65536-p63-s4128768-cps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h262144-p63-s16515072-cps-ndrpdr.64b-2t1c-avf-ethip4tcp-ip4base-h262144-p63-s16515072-cps-ndrpdr"
+      layout: "plot-cpta-cps"
+
+    - title: "2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-pps-avf-ndr"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-pps-avf-ndr"
+      data: "plot-ndrpdr-comparison-2n-skx"
+      include-tests: "NDR"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h4096-p63-s258048-pps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h4096-p63-s258048-pps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h1024-p63-s64512-pps-ndrpdr.64b-2t1c-avf-ethip4tcp-ip4base-h1024-p63-s64512-pps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h4096-p63-s258048-pps-ndrpdr.64b-2t1c-avf-ethip4tcp-ip4base-h4096-p63-s258048-pps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h16384-p63-s1032192-pps-ndrpdr.64b-2t1c-avf-ethip4tcp-ip4base-h16384-p63-s1032192-pps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h65536-p63-s4128768-pps-ndrpdr.64b-2t1c-avf-ethip4tcp-ip4base-h65536-p63-s4128768-pps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h262144-p63-s16515072-pps-ndrpdr.64b-2t1c-avf-ethip4tcp-ip4base-h262144-p63-s16515072-pps-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-skx-xxv710-64b-2t1c-ip4-base-avf-pdr"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-ip4-base-avf-pdr"
+      data: "plot-ndrpdr-comparison-2n-skx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-Ip4Base-Ndrpdr.64B-2t1c-avf-dot1q-ip4base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-avf-ethip4-ip4base-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-skx-xxv710-64b-2t1c-ip4-scale-avf-pdr"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-ip4-scale-avf-pdr"
+      data: "plot-ndrpdr-comparison-2n-skx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-avf-Ethip4-Ip4Scale20K-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale20k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-avf-Ethip4-Ip4Scale20K-Rnd-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale20k-rnd-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-avf-Ethip4-Ip4Scale200K-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale200k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-avf-Ethip4-Ip4Scale200K-Rnd-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale200k-rnd-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale2m-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-avf-Ethip4-Ip4Scale2M-Rnd-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale2m-rnd-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-skx-xxv710-64b-2t1c-ip4-features-avf-pdr"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-ip4-features-avf-pdr"
+      data: "plot-ndrpdr-comparison-2n-skx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1-p1-s1-Ndrpdr.64B-2t1c-avf-ethip4udp-nat44det-h1-p1-s1-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1024-p63-s64512-Ndrpdr.64B-2t1c-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-skx-xxv710-64b-2t1c-nat44det-ip4routing-stl-bidir-avf-pdr"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-nat44det-ip4routing-stl-bidir-avf-pdr"
+      data: "plot-ndrpdr-comparison-2n-skx"
+      include-tests: "PDR"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr.64b-2t1c-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h4096-p63-s258048-ndrpdr.64b-2t1c-avf-ethip4udp-nat44det-h4096-p63-s258048-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h16384-p63-s1032192-ndrpdr.64b-2t1c-avf-ethip4udp-nat44det-h16384-p63-s1032192-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h65536-p63-s4128758-ndrpdr.64b-2t1c-avf-ethip4udp-nat44det-h65536-p63-s4128758-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h262144-p63-s16515072-ndrpdr.64b-2t1c-avf-ethip4udp-nat44det-h262144-p63-s16515072-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf-pdr"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf-pdr"
+      data: "plot-ndrpdr-comparison-2n-skx"
+      include-tests: "PDR"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-udir-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h4096-p63-s258048-udir-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-udir-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-udir-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-udir-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-udir-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-udir-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-udir-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf-pdr"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf-pdr"
+      data: "plot-ndrpdr-comparison-2n-skx"
+      include-tests: "PDR"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-cps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h4096-p63-s258048-cps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-cps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-cps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-cps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-cps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-cps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-cps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h1024-p63-s64512-cps-ndrpdr.64b-2t1c-avf-ethip4udp-ip4base-h1024-p63-s64512-cps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h4096-p63-s258048-cps-ndrpdr.64b-2t1c-avf-ethip4udp-ip4base-h4096-p63-s258048-cps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h16384-p63-s1032192-cps-ndrpdr.64b-2t1c-avf-ethip4udp-ip4base-h16384-p63-s1032192-cps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h65536-p63-s4128768-cps-ndrpdr.64b-2t1c-avf-ethip4udp-ip4base-h65536-p63-s4128768-cps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h262144-p63-s16515072-cps-ndrpdr.64b-2t1c-avf-ethip4udp-ip4base-h262144-p63-s16515072-cps-ndrpdr"
+      layout: "plot-cpta-cps"
+
+    - title: "2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-pps-avf-pdr"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-pps-avf-pdr"
+      data: "plot-ndrpdr-comparison-2n-skx"
+      include-tests: "PDR"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-pps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h4096-p63-s258048-pps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-pps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-pps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-pps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-pps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-pps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-pps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h1024-p63-s64512-pps-ndrpdr.64b-2t1c-avf-ethip4udp-ip4base-h1024-p63-s64512-pps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h4096-p63-s258048-pps-ndrpdr.64b-2t1c-avf-ethip4udp-ip4base-h4096-p63-s258048-pps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h16384-p63-s1032192-pps-ndrpdr.64b-2t1c-avf-ethip4udp-ip4base-h16384-p63-s1032192-pps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h65536-p63-s4128768-pps-ndrpdr.64b-2t1c-avf-ethip4udp-ip4base-h65536-p63-s4128768-pps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h262144-p63-s16515072-pps-ndrpdr.64b-2t1c-avf-ethip4udp-ip4base-h262144-p63-s16515072-pps-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf-pdr"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf-pdr"
+      data: "plot-ndrpdr-comparison-2n-skx"
+      include-tests: "PDR"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h4096-p63-s258048-cps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h4096-p63-s258048-cps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h1024-p63-s64512-cps-ndrpdr.64b-2t1c-avf-ethip4tcp-ip4base-h1024-p63-s64512-cps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h4096-p63-s258048-cps-ndrpdr.64b-2t1c-avf-ethip4tcp-ip4base-h4096-p63-s258048-cps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h16384-p63-s1032192-cps-ndrpdr.64b-2t1c-avf-ethip4tcp-ip4base-h16384-p63-s1032192-cps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h65536-p63-s4128768-cps-ndrpdr.64b-2t1c-avf-ethip4tcp-ip4base-h65536-p63-s4128768-cps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h262144-p63-s16515072-cps-ndrpdr.64b-2t1c-avf-ethip4tcp-ip4base-h262144-p63-s16515072-cps-ndrpdr"
+      layout: "plot-cpta-cps"
+
+    - title: "2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-pps-avf-pdr"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-pps-avf-pdr"
+      data: "plot-ndrpdr-comparison-2n-skx"
+      include-tests: "PDR"
+      include:
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h4096-p63-s258048-pps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h4096-p63-s258048-pps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h1024-p63-s64512-pps-ndrpdr.64b-2t1c-avf-ethip4tcp-ip4base-h1024-p63-s64512-pps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h4096-p63-s258048-pps-ndrpdr.64b-2t1c-avf-ethip4tcp-ip4base-h4096-p63-s258048-pps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h16384-p63-s1032192-pps-ndrpdr.64b-2t1c-avf-ethip4tcp-ip4base-h16384-p63-s1032192-pps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h65536-p63-s4128768-pps-ndrpdr.64b-2t1c-avf-ethip4tcp-ip4base-h65536-p63-s4128768-pps-ndrpdr"
+        - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h262144-p63-s16515072-pps-ndrpdr.64b-2t1c-avf-ethip4tcp-ip4base-h262144-p63-s16515072-pps-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-skx-xxv710-64b-2t1c-ip4-base-features-dpdk-ndr"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-ip4-base-features-dpdk-ndr"
+      data: "plot-ndrpdr-comparison-2n-skx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-ethip4-ip4base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-ethip4udp-nat44det-h1-p1-s1-Ndrpdr.64B-2t1c-ethip4udp-nat44det-h1-p1-s1-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-skx-xxv710-64b-2t1c-ip4-scale-dpdk-ndr"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-ip4-scale-dpdk-ndr"
+      data: "plot-ndrpdr-comparison-2n-skx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale20K-Ndrpdr.64B-2t1c-ethip4-ip4scale20k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale20K-Rnd-Ndrpdr.64B-2t1c-ethip4-ip4scale20k-rnd-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale200K-Ndrpdr.64B-2t1c-ethip4-ip4scale200k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale200K-Rnd-Ndrpdr.64B-2t1c-ethip4-ip4scale200k-rnd-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-ethip4-ip4scale2m-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale2M-Rnd-Ndrpdr.64B-2t1c-ethip4-ip4scale2m-rnd-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-skx-xxv710-64b-2t1c-ip4-base-features-dpdk-pdr"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-ip4-base-features-dpdk-pdr"
+      data: "plot-ndrpdr-comparison-2n-skx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-ethip4-ip4base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-ethip4udp-nat44det-h1-p1-s1-Ndrpdr.64B-2t1c-ethip4udp-nat44det-h1-p1-s1-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-skx-xxv710-64b-2t1c-ip4-scale-dpdk-pdr"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-ip4-scale-dpdk-pdr"
+      data: "plot-ndrpdr-comparison-2n-skx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale20K-Ndrpdr.64B-2t1c-ethip4-ip4scale20k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale20K-Rnd-Ndrpdr.64B-2t1c-ethip4-ip4scale20k-rnd-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale200K-Ndrpdr.64B-2t1c-ethip4-ip4scale200k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale200K-Rnd-Ndrpdr.64B-2t1c-ethip4-ip4scale200k-rnd-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-ethip4-ip4scale2m-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale2M-Rnd-Ndrpdr.64B-2t1c-ethip4-ip4scale2m-rnd-ndrpdr"
+      layout: "plot-cpta"
+
+# 2n-skx ip6
+
+    - title: "2n-skx-x710-78b-2t1c-ip6-base-scale-avf-dpdk-ndr"
+      output-file-name: "2n-skx-x710-78b-2t1c-ip6-base-scale-avf-dpdk-ndr"
+      data: "plot-ndrpdr-comparison-2n-skx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-avf-ethip6-ip6base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-Ndrpdr.78B-2t1c-avf-ethip6-ip6scale2m-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-ethip6-ip6base-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-skx-x710-78b-2t1c-ip6-base-scale-avf-dpdk-pdr"
+      output-file-name: "2n-skx-x710-78b-2t1c-ip6-base-scale-avf-dpdk-pdr"
+      data: "plot-ndrpdr-comparison-2n-skx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-avf-ethip6-ip6base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-Ndrpdr.78B-2t1c-avf-ethip6-ip6scale2m-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-ethip6-ip6base-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-skx-xxv710-78b-2t1c-ip6-base-scale-avf-ndr"
+      output-file-name: "2n-skx-xxv710-78b-2t1c-ip6-base-scale-avf-ndr"
+      data: "plot-ndrpdr-comparison-2n-skx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-avf-ethip6-ip6base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale20K-Ndrpdr.78B-2t1c-avf-ethip6-ip6scale20k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale200K-Ndrpdr.78B-2t1c-avf-ethip6-ip6scale200k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale2M-Ndrpdr.78B-2t1c-avf-ethip6-ip6scale2m-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-skx-xxv710-78b-2t1c-ip6-base-scale-avf-pdr"
+      output-file-name: "2n-skx-xxv710-78b-2t1c-ip6-base-scale-avf-pdr"
+      data: "plot-ndrpdr-comparison-2n-skx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-avf-ethip6-ip6base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale20K-Ndrpdr.78B-2t1c-avf-ethip6-ip6scale20k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale200K-Ndrpdr.78B-2t1c-avf-ethip6-ip6scale200k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale2M-Ndrpdr.78B-2t1c-avf-ethip6-ip6scale2m-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-skx-xxv710-78b-2t1c-ip6-base-scale-dpdk-ndr"
+      output-file-name: "2n-skx-xxv710-78b-2t1c-ip6-base-scale-dpdk-ndr"
+      data: "plot-ndrpdr-comparison-2n-skx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-ethip6-ip6base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale20K-Ndrpdr.78B-2t1c-ethip6-ip6scale20k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale200K-Ndrpdr.78B-2t1c-ethip6-ip6scale200k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale2M-Ndrpdr.78B-2t1c-ethip6-ip6scale2m-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-skx-xxv710-78b-2t1c-ip6-base-scale-dpdk-pdr"
+      output-file-name: "2n-skx-xxv710-78b-2t1c-ip6-base-scale-dpdk-pdr"
+      data: "plot-ndrpdr-comparison-2n-skx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-ethip6-ip6base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale20K-Ndrpdr.78B-2t1c-ethip6-ip6scale20k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale200K-Ndrpdr.78B-2t1c-ethip6-ip6scale200k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale2M-Ndrpdr.78B-2t1c-ethip6-ip6scale2m-ndrpdr"
+      layout: "plot-cpta"
+
+# 2n-skx L2
+
+    - title: "2n-skx-x710-64b-2t1c-l2-base-scale-avf-ndr"
+      output-file-name: "2n-skx-x710-64b-2t1c-l2-base-scale-avf-ndr"
+      data: "plot-ndrpdr-comparison-2n-skx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Patch-Ndrpdr.64B-2t1c-avf-eth-l2patch-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Xcbase-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdscale1mmaclrn-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-skx-x710-64b-2t1c-l2-base-scale-dpdk-ndr"
+      output-file-name: "2n-skx-x710-64b-2t1c-l2-base-scale-dpdk-ndr"
+      data: "plot-ndrpdr-comparison-2n-skx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Patch-Ndrpdr.64B-2t1c-eth-l2patch-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Xcbase-Ndrpdr.64B-2t1c-eth-l2xcbase-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale1mmaclrn-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-skx-x710-64b-2t1c-l2-base-scale-avf-pdr"
+      output-file-name: "2n-skx-x710-64b-2t1c-l2-base-scale-avf-pdr"
+      data: "plot-ndrpdr-comparison-2n-skx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Patch-Ndrpdr.64B-2t1c-avf-eth-l2patch-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Xcbase-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdscale1mmaclrn-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-skx-x710-64b-2t1c-l2-base-scale-dpdk-pdr"
+      output-file-name: "2n-skx-x710-64b-2t1c-l2-base-scale-dpdk-pdr"
+      data: "plot-ndrpdr-comparison-2n-skx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Patch-Ndrpdr.64B-2t1c-eth-l2patch-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Xcbase-Ndrpdr.64B-2t1c-eth-l2xcbase-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale1mmaclrn-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-skx-xxv710-64b-2t1c-l2-base-avf-ndr"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-l2-base-avf-ndr"
+      data: "plot-ndrpdr-comparison-2n-skx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Patch-Ndrpdr.64B-2t1c-avf-eth-l2patch-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Ndrpdr.64B-2t1c-avf-dot1q-l2xcbase-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-skx-xxv710-64b-2t1c-l2-base-scale-avf-ndr"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-l2-base-scale-avf-ndr"
+      data: "plot-ndrpdr-comparison-2n-skx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdscale10kmaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdscale100kmaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdscale1mmaclrn-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-skx-xxv710-64b-2t1c-l2-base-dpdk-ndr"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-l2-base-dpdk-ndr"
+      data: "plot-ndrpdr-comparison-2n-skx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Patch-Ndrpdr.64B-2t1c-eth-l2patch-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Ndrpdr.64B-2t1c-eth-l2xcbase-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-skx-xxv710-64b-2t1c-l2-base-scale-dpdk-ndr"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-l2-base-scale-dpdk-ndr"
+      data: "plot-ndrpdr-comparison-2n-skx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale10kmaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale100kmaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale1mmaclrn-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-skx-xxv710-64b-2t1c-l2-base-avf-pdr"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-l2-base-avf-pdr"
+      data: "plot-ndrpdr-comparison-2n-skx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Patch-Ndrpdr.64B-2t1c-avf-eth-l2patch-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Ndrpdr.64B-2t1c-avf-dot1q-l2xcbase-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-skx-xxv710-64b-2t1c-l2-base-scale-avf-pdr"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-l2-base-scale-avf-pdr"
+      data: "plot-ndrpdr-comparison-2n-skx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdscale10kmaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdscale100kmaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdscale1mmaclrn-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-skx-xxv710-64b-2t1c-l2-base-dpdk-pdr"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-l2-base-dpdk-pdr"
+      data: "plot-ndrpdr-comparison-2n-skx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Patch-Ndrpdr.64B-2t1c-eth-l2patch-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Ndrpdr.64B-2t1c-eth-l2xcbase-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-skx-xxv710-64b-2t1c-l2-base-scale-dpdk-pdr"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-l2-base-scale-dpdk-pdr"
+      data: "plot-ndrpdr-comparison-2n-skx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale10kmaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale100kmaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale1mmaclrn-ndrpdr"
+      layout: "plot-cpta"
+
+# 2n-skx VHost
+
+    - title: "2n-skx-xxv710-64b-2t1c-vhost-base-avf-testpmd-ndr"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-vhost-base-avf-testpmd-ndr"
+      data: "plot-ndrpdr-comparison-2n-skx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-avf-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-skx-xxv710-64b-2t1c-vhost-base-avf-vpp-ndr"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-vhost-base-avf-vpp-ndr"
+      data: "plot-ndrpdr-comparison-2n-skx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-avf-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-skx-xxv710-64b-2t1c-vhost-base-avf-testpmd-pdr"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-vhost-base-avf-testpmd-pdr"
+      data: "plot-ndrpdr-comparison-2n-skx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-avf-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-skx-xxv710-64b-2t1c-vhost-base-avf-vpp-pdr"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-vhost-base-avf-vpp-pdr"
+      data: "plot-ndrpdr-comparison-2n-skx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-avf-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-skx-xxv710-64b-2t1c-vhost-base-dpdk-testpmd-ndr"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-vhost-base-dpdk-testpmd-ndr"
+      data: "plot-ndrpdr-comparison-2n-skx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-skx-xxv710-64b-2t1c-vhost-base-dpdk-vpp-ndr"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-vhost-base-dpdk-vpp-ndr"
+      data: "plot-ndrpdr-comparison-2n-skx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-skx-xxv710-64b-2t1c-vhost-base-dpdk-testpmd-pdr"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-vhost-base-dpdk-testpmd-pdr"
+      data: "plot-ndrpdr-comparison-2n-skx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-skx-xxv710-64b-2t1c-vhost-base-dpdk-vpp-pdr"
+      output-file-name: "2n-skx-xxv710-64b-2t1c-vhost-base-dpdk-vpp-pdr"
+      data: "plot-ndrpdr-comparison-2n-skx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+      layout: "plot-cpta"
+
+# 3n-skx memif
+
+    - title: "3n-skx-xxv710-64b-2t1c-memif-base-avf-ndr"
+      output-file-name: "3n-skx-xxv710-64b-2t1c-memif-base-avf-ndr"
+      data: "plot-ndrpdr-comparison-3n-skx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
+        - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Memif-1Lxc-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr"
+        - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
+        - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Memif-1Lxc-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-eth-2memif-1lxc-ndrpdr"
+        - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-avf-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "3n-skx-xxv710-64b-2t1c-memif-base-avf-pdr"
+      output-file-name: "3n-skx-xxv710-64b-2t1c-memif-base-avf-pdr"
+      data: "plot-ndrpdr-comparison-3n-skx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
+        - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Memif-1Lxc-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr"
+        - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
+        - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Memif-1Lxc-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-eth-2memif-1lxc-ndrpdr"
+        - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-avf-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "3n-skx-xxv710-64b-2t1c-memif-base-dpdk-ndr"
+      output-file-name: "3n-skx-xxv710-64b-2t1c-memif-base-dpdk-ndr"
+      data: "plot-ndrpdr-comparison-3n-skx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
+        - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Memif-1Lxc-Ndrpdr.64B-2t1c-eth-l2xcbase-eth-2memif-1lxc-ndrpdr"
+        - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Memif-1Lxc-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr"
+        - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "3n-skx-xxv710-64b-2t1c-memif-base-dpdk-pdr"
+      output-file-name: "3n-skx-xxv710-64b-2t1c-memif-base-dpdk-pdr"
+      data: "plot-ndrpdr-comparison-3n-skx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
+        - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Memif-1Lxc-Ndrpdr.64B-2t1c-eth-l2xcbase-eth-2memif-1lxc-ndrpdr"
+        - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Memif-1Lxc-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr"
+        - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
+      layout: "plot-cpta"
+
+# 3n-skx ipsec
+
+    - title: "3n-skx-xxv710-imix-2t1c-ipsec-base-scale-sw-avf-ndr"
+      output-file-name: "3n-skx-xxv710-imix-2t1c-ipsec-base-scale-sw-avf-ndr"
+      data: "plot-ndrpdr-comparison-3n-skx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-2t1c-avf-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-2t1c-avf-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-2t1c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-2t1c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-2t1c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-2t1c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "3n-skx-xxv710-1518b-2t1c-ipsec-base-scale-sw-avf-ndr"
+      output-file-name: "3n-skx-xxv710-1518b-2t1c-ipsec-base-scale-sw-avf-ndr"
+      data: "plot-ndrpdr-comparison-3n-skx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518b-2t1c-avf-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.1518b-2t1c-avf-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518b-2t1c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.1518b-2t1c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518b-2t1c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.1518b-2t1c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "3n-skx-xxv710-imix-2t1c-ipsec-base-scale-sw-avf-pdr"
+      output-file-name: "3n-skx-xxv710-imix-2t1c-ipsec-base-scale-sw-avf-pdr"
+      data: "plot-ndrpdr-comparison-3n-skx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-2t1c-avf-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-2t1c-avf-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-2t1c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-2t1c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-2t1c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-2t1c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "3n-skx-xxv710-1518b-2t1c-ipsec-base-scale-sw-avf-pdr"
+      output-file-name: "3n-skx-xxv710-1518b-2t1c-ipsec-base-scale-sw-avf-pdr"
+      data: "plot-ndrpdr-comparison-3n-skx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518b-2t1c-avf-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.1518b-2t1c-avf-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518b-2t1c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.1518b-2t1c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518b-2t1c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.1518b-2t1c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "3n-skx-xxv710-imix-2t1c-ipsec-base-scale-sw-dpdk-ndr"
+      output-file-name: "3n-skx-xxv710-imix-2t1c-ipsec-base-scale-sw-dpdk-ndr"
+      data: "plot-ndrpdr-comparison-3n-skx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-2t1c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-2t1c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "3n-skx-xxv710-1518b-2t1c-ipsec-base-scale-sw-dpdk-ndr"
+      output-file-name: "3n-skx-xxv710-1518b-2t1c-ipsec-base-scale-sw-dpdk-ndr"
+      data: "plot-ndrpdr-comparison-3n-skx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518b-2t1c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518b-2t1c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "3n-skx-xxv710-imix-2t1c-ipsec-base-scale-sw-dpdk-pdr"
+      output-file-name: "3n-skx-xxv710-imix-2t1c-ipsec-base-scale-sw-dpdk-pdr"
+      data: "plot-ndrpdr-comparison-3n-skx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-2t1c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-2t1c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "3n-skx-xxv710-1518b-2t1c-ipsec-base-scale-sw-dpdk-pdr"
+      output-file-name: "3n-skx-xxv710-1518b-2t1c-ipsec-base-scale-sw-dpdk-pdr"
+      data: "plot-ndrpdr-comparison-3n-skx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518b-2t1c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518b-2t1c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+      layout: "plot-cpta"
+
+# 3n-skx ip4
+
+    - title: "3n-skx-x710-64b-2t1c-ip4-base-scale-avf-ndr"
+      output-file-name: "3n-skx-x710-64b-2t1c-ip4-base-scale-avf-ndr"
+      data: "plot-ndrpdr-comparison-3n-skx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Avf-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-avf-ethip4-ip4base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale2m-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "3n-skx-x710-64b-2t1c-ip4-base-scale-avf-pdr"
+      output-file-name: "3n-skx-x710-64b-2t1c-ip4-base-scale-avf-pdr"
+      data: "plot-ndrpdr-comparison-3n-skx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Avf-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-avf-ethip4-ip4base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale2m-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "3n-skx-xxv710-64b-2t1c-ip4-base-scale-avf-ndr"
+      output-file-name: "3n-skx-xxv710-64b-2t1c-ip4-base-scale-avf-ndr"
+      data: "plot-ndrpdr-comparison-3n-skx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Dot1Q-Ip4Base-Ndrpdr.64B-2t1c-avf-dot1q-ip4base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-avf-ethip4-ip4base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale20K-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale20k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale200K-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale200k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale2m-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "3n-skx-xxv710-64b-2t1c-ip4-base-scale-dpdk-ndr"
+      output-file-name: "3n-skx-xxv710-64b-2t1c-ip4-base-scale-dpdk-ndr"
+      data: "plot-ndrpdr-comparison-3n-skx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-ethip4-ip4base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-ethip4-ip4scale2m-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "3n-skx-xxv710-64b-2t1c-ip4-base-scale-avf-pdr"
+      output-file-name: "3n-skx-xxv710-64b-2t1c-ip4-base-scale-avf-pdr"
+      data: "plot-ndrpdr-comparison-3n-skx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Dot1Q-Ip4Base-Ndrpdr.64B-2t1c-avf-dot1q-ip4base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-avf-ethip4-ip4base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale20K-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale20k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale200K-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale200k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale2m-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "3n-skx-xxv710-64b-2t1c-ip4-base-scale-dpdk-pdr"
+      output-file-name: "3n-skx-xxv710-64b-2t1c-ip4-base-scale-dpdk-pdr"
+      data: "plot-ndrpdr-comparison-3n-skx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-ethip4-ip4base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-ethip4-ip4scale2m-ndrpdr"
+      layout: "plot-cpta"
+
+# 3n-skx ip4 tunnels
+
+    - title: "3n-skx-xxv710-64b-2t1c-ip4-tunnels-base-avf-ndr"
+      output-file-name: "3n-skx-xxv710-64b-2t1c-ip4-tunnels-base-avf-ndr"
+      data: "plot-ndrpdr-comparison-3n-skx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Xcbase-Ndrpdr.64B-2t1c-avf-ethip4vxlan-l2xcbase-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Avf-Dot1Q--Ethip4Vxlan-L2Bdscale1L2Bd1Vlan1Vxlan-Ndrpdr.64B-2t1c-avf-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Avf-Dot1Q--Ethip4Vxlan-L2Bdscale100L2Bd100Vlan100Vxlan-Ndrpdr.64B-2t1c-avf-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "3n-skx-xxv710-64b-2t1c-ip4-tunnels-base-dpdk-ndr"
+      output-file-name: "3n-skx-xxv710-64b-2t1c-ip4-tunnels-base-dpdk-ndr"
+      data: "plot-ndrpdr-comparison-3n-skx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Vxlan-L2Xcbase-Ndrpdr.64B-2t1c-ethip4vxlan-l2xcbase-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "3n-skx-xxv710-64b-2t1c-ip4-tunnels-base-avf-pdr"
+      output-file-name: "3n-skx-xxv710-64b-2t1c-ip4-tunnels-base-avf-pdr"
+      data: "plot-ndrpdr-comparison-3n-skx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Xcbase-Ndrpdr.64B-2t1c-avf-ethip4vxlan-l2xcbase-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Avf-Dot1Q--Ethip4Vxlan-L2Bdscale1L2Bd1Vlan1Vxlan-Ndrpdr.64B-2t1c-avf-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Avf-Dot1Q--Ethip4Vxlan-L2Bdscale100L2Bd100Vlan100Vxlan-Ndrpdr.64B-2t1c-avf-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "3n-skx-xxv710-64b-2t1c-ip4-tunnels-base-dpdk-pdr"
+      output-file-name: "3n-skx-xxv710-64b-2t1c-ip4-tunnels-base-dpdk-pdr"
+      data: "plot-ndrpdr-comparison-3n-skx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Vxlan-L2Xcbase-Ndrpdr.64B-2t1c-ethip4vxlan-l2xcbase-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
+      layout: "plot-cpta"
+
+# 3n-skx ip6
+
+    - title: "3n-skx-x710-78b-2t1c-ip6-base-scale-dpdk-ndr"
+      output-file-name: "3n-skx-x710-78b-2t1c-ip6-base-scale-dpdk-ndr"
+      data: "plot-ndrpdr-comparison-3n-skx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Avf-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-avf-ethip6-ip6base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-Ndrpdr.78B-2t1c-avf-ethip6-ip6scale2m-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "3n-skx-x710-78b-2t1c-ip6-base-scale-dpdk-pdr"
+      output-file-name: "3n-skx-x710-78b-2t1c-ip6-base-scale-dpdk-pdr"
+      data: "plot-ndrpdr-comparison-3n-skx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Avf-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-avf-ethip6-ip6base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-Ndrpdr.78B-2t1c-avf-ethip6-ip6scale2m-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "3n-skx-xxv710-78b-2t1c-ip6-base-scale-avf-ndr"
+      output-file-name: "3n-skx-xxv710-78b-2t1c-ip6-base-scale-avf-ndr"
+      data: "plot-ndrpdr-comparison-3n-skx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Avf-Dot1Q-Ip6Base-Ndrpdr.78B-2t1c-avf-dot1q-ip6base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Avf-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-avf-ethip6-ip6base-ndrpdr"
+        - "    Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale20K-Ndrpdr.78B-2t1c-avf-ethip6-ip6scale20k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale200K-Ndrpdr.78B-2t1c-avf-ethip6-ip6scale200k-ndrpdr"
+        - "    Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale2M-Ndrpdr.78B-2t1c-avf-ethip6-ip6scale2m-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "3n-skx-xxv710-78b-2t1c-ip6-base-scale-dpdk-ndr"
+      output-file-name: "3n-skx-xxv710-78b-2t1c-ip6-base-scale-dpdk-ndr"
+      data: "plot-ndrpdr-comparison-3n-skx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-ethip6-ip6base-ndrpdr"
+        - "    Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Ethip6-Ip6Scale2M-Ndrpdr.78B-2t1c-ethip6-ip6scale2m-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "3n-skx-xxv710-78b-2t1c-ip6-base-scale-avf-pdr"
+      output-file-name: "3n-skx-xxv710-78b-2t1c-ip6-base-scale-avf-pdr"
+      data: "plot-ndrpdr-comparison-3n-skx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Avf-Dot1Q-Ip6Base-Ndrpdr.78B-2t1c-avf-dot1q-ip6base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Avf-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-avf-ethip6-ip6base-ndrpdr"
+        - "    Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale20K-Ndrpdr.78B-2t1c-avf-ethip6-ip6scale20k-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale200K-Ndrpdr.78B-2t1c-avf-ethip6-ip6scale200k-ndrpdr"
+        - "    Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale2M-Ndrpdr.78B-2t1c-avf-ethip6-ip6scale2m-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "3n-skx-xxv710-78b-2t1c-ip6-base-scale-dpdk-pdr"
+      output-file-name: "3n-skx-xxv710-78b-2t1c-ip6-base-scale-dpdk-pdr"
+      data: "plot-ndrpdr-comparison-3n-skx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-ethip6-ip6base-ndrpdr"
+        - "    Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Ethip6-Ip6Scale2M-Ndrpdr.78B-2t1c-ethip6-ip6scale2m-ndrpdr"
+      layout: "plot-cpta"
+
+# 3n-skx L2
+
+    - title: "3n-skx-x710-64b-2t1c-l2-base-scale-avf-ndr"
+      output-file-name: "3n-skx-x710-64b-2t1c-l2-base-scale-avf-ndr"
+      data: "plot-ndrpdr-comparison-3n-skx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.L2.10Ge2P1X710-Avf-Eth-L2Patch-Ndrpdr.64B-2t1c-avf-eth-l2patch-ndrpdr"
+        - "Tests.Vpp.Perf.L2.10Ge2P1X710-Avf-Eth-L2Xcbase-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-ndrpdr"
+        - "Tests.Vpp.Perf.L2.10Ge2P1X710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.10Ge2P1X710-Avf-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdscale1mmaclrn-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "3n-skx-x710-64b-2t1c-l2-base-scale-avf-pdr"
+      output-file-name: "3n-skx-x710-64b-2t1c-l2-base-scale-avf-pdr"
+      data: "plot-ndrpdr-comparison-3n-skx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.L2.10Ge2P1X710-Avf-Eth-L2Patch-Ndrpdr.64B-2t1c-avf-eth-l2patch-ndrpdr"
+        - "Tests.Vpp.Perf.L2.10Ge2P1X710-Avf-Eth-L2Xcbase-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-ndrpdr"
+        - "Tests.Vpp.Perf.L2.10Ge2P1X710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.10Ge2P1X710-Avf-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdscale1mmaclrn-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "3n-skx-xxv710-64b-2t1c-l2-base-avf-ndr"
+      output-file-name: "3n-skx-xxv710-64b-2t1c-l2-base-avf-ndr"
+      data: "plot-ndrpdr-comparison-3n-skx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Ndrpdr.64B-2t1c-avf-dot1q-l2xcbase-ndrpdr"
+        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Patch-Ndrpdr.64B-2t1c-avf-eth-l2patch-ndrpdr"
+        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-ndrpdr"
+        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "3n-skx-xxv710-64b-2t1c-l2-scale-avf-ndr"
+      output-file-name: "3n-skx-xxv710-64b-2t1c-l2-scale-avf-ndr"
+      data: "plot-ndrpdr-comparison-3n-skx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdscale10kmaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdscale100kmaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdscale1mmaclrn-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "3n-skx-xxv710-64b-2t1c-l2-base-avf-pdr"
+      output-file-name: "3n-skx-xxv710-64b-2t1c-l2-base-avf-pdr"
+      data: "plot-ndrpdr-comparison-3n-skx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Ndrpdr.64B-2t1c-avf-dot1q-l2xcbase-ndrpdr"
+        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Patch-Ndrpdr.64B-2t1c-avf-eth-l2patch-ndrpdr"
+        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-ndrpdr"
+        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "3n-skx-xxv710-64b-2t1c-l2-scale-avf-pdr"
+      output-file-name: "3n-skx-xxv710-64b-2t1c-l2-scale-avf-pdr"
+      data: "plot-ndrpdr-comparison-3n-skx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdscale10kmaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdscale100kmaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdscale1mmaclrn-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "3n-skx-xxv710-64b-2t1c-l2-base-scale-dpdk-ndr"
+      output-file-name: "3n-skx-xxv710-64b-2t1c-l2-base-scale-dpdk-ndr"
+      data: "plot-ndrpdr-comparison-3n-skx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Patch-Ndrpdr.64B-2t1c-eth-l2patch-ndrpdr"
+        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Xcbase-Ndrpdr.64B-2t1c-eth-l2xcbase-ndrpdr"
+        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale1mmaclrn-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "3n-skx-xxv710-64b-2t1c-l2-base-scale-dpdk-pdr"
+      output-file-name: "3n-skx-xxv710-64b-2t1c-l2-base-scale-dpdk-pdr"
+      data: "plot-ndrpdr-comparison-3n-skx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Patch-Ndrpdr.64B-2t1c-eth-l2patch-ndrpdr"
+        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Xcbase-Ndrpdr.64B-2t1c-eth-l2xcbase-ndrpdr"
+        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale1mmaclrn-ndrpdr"
+      layout: "plot-cpta"
+
+# 3n-skx srv6
+
+    - title: "3n-skx-xxv710-78b-2t1c-srv6-base-avf-ndr"
+      output-file-name: "3n-skx-xxv710-78b-2t1c-srv6-base-avf-ndr"
+      data: "plot-ndrpdr-comparison-3n-skx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-Ndrpdr.78B-2t1c-avf-ethip6ip6-ip6base-srv6enc1sid-ndrpdr"
+        - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Ndrpdr.78B-2t1c-avf-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr"
+        - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Nodecaps-Ndrpdr.78B-2t1c-avf-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr"
+        - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Proxy-Dyn-Ndrpdr.78B-2t1c-avf-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr"
+        - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Proxy-Masq-Ndrpdr.78B-2t1c-avf-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr"
+        - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Proxy-Stat-Ndrpdr.78B-2t1c-avf-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "3n-skx-xxv710-78b-2t1c-srv6-base-avf-pdr"
+      output-file-name: "3n-skx-xxv710-78b-2t1c-srv6-base-avf-pdr"
+      data: "plot-ndrpdr-comparison-3n-skx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-Ndrpdr.78B-2t1c-avf-ethip6ip6-ip6base-srv6enc1sid-ndrpdr"
+        - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Ndrpdr.78B-2t1c-avf-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr"
+        - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Nodecaps-Ndrpdr.78B-2t1c-avf-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr"
+        - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Proxy-Dyn-Ndrpdr.78B-2t1c-avf-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr"
+        - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Proxy-Masq-Ndrpdr.78B-2t1c-avf-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr"
+        - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Proxy-Stat-Ndrpdr.78B-2t1c-avf-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr"
+      layout: "plot-cpta"
+
+# 3n-skx VHost
+
+    - title: "3n-skx-x710-64b-2t1c-link-bonding-vhost-base-avf-testpmd-ndr"
+      output-file-name: "3n-skx-x710-64b-2t1c-link-bonding-vhost-base-avf-testpmd-ndr"
+      data: "plot-ndrpdr-comparison-3n-skx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Avf-2Lbvpplacp-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-avf-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Avf-2Lbvpplacp-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-avf-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "3n-skx-x710-64b-2t1c-link-bonding-vhost-base-avf-vpp-ndr"
+      output-file-name: "3n-skx-x710-64b-2t1c-link-bonding-vhost-base-avf-vpp-ndr"
+      data: "plot-ndrpdr-comparison-3n-skx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Avf-2Lbvpplacp-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-avf-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Avf-2Lbvpplacp-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-avf-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "3n-skx-x710-64b-2t1c-link-bonding-vhost-base-avf-testpmd-pdr"
+      output-file-name: "3n-skx-x710-64b-2t1c-link-bonding-vhost-base-avf-testpmd-pdr"
+      data: "plot-ndrpdr-comparison-3n-skx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Avf-2Lbvpplacp-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-avf-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Avf-2Lbvpplacp-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-avf-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "3n-skx-x710-64b-2t1c-link-bonding-vhost-base-avf-vpp-pdr"
+      output-file-name: "3n-skx-x710-64b-2t1c-link-bonding-vhost-base-avf-vpp-pdr"
+      data: "plot-ndrpdr-comparison-3n-skx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Avf-2Lbvpplacp-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-avf-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X710-Avf-2Lbvpplacp-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-avf-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "3n-skx-xxv710-64b-2t1c-vhost-base-dpdk-testpmd-ndr"
+      output-file-name: "3n-skx-xxv710-64b-2t1c-vhost-base-dpdk-testpmd-ndr"
+      data: "plot-ndrpdr-comparison-3n-skx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "3n-skx-xxv710-64b-2t1c-vhost-base-dpdk-testpmd-pdr"
+      output-file-name: "3n-skx-xxv710-64b-2t1c-vhost-base-dpdk-testpmd-pdr"
+      data: "plot-ndrpdr-comparison-3n-skx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "3n-skx-xxv710-64b-2t1c-link-bonding-vhost-base-avf-testpmd-ndr"
+      output-file-name: "3n-skx-xxv710-64b-2t1c-link-bonding-vhost-base-avf-testpmd-ndr"
+      data: "plot-ndrpdr-comparison-3n-skx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-1Lbvpplacp-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-avf-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-1Lbvpplacp-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-avf-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "3n-skx-xxv710-64b-2t1c-link-bonding-vhost-base-avf-vpp-ndr"
+      output-file-name: "3n-skx-xxv710-64b-2t1c-link-bonding-vhost-base-avf-vpp-ndr"
+      data: "plot-ndrpdr-comparison-3n-skx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-1Lbvpplacp-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-avf-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-1Lbvpplacp-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-avf-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "3n-skx-xxv710-64b-2t1c-link-bonding-vhost-base-avf-testpmd-pdr"
+      output-file-name: "3n-skx-xxv710-64b-2t1c-link-bonding-vhost-base-avf-testpmd-pdr"
+      data: "plot-ndrpdr-comparison-3n-skx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-1Lbvpplacp-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-avf-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-1Lbvpplacp-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-avf-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "3n-skx-xxv710-64b-2t1c-link-bonding-vhost-base-avf-vpp-pdr"
+      output-file-name: "3n-skx-xxv710-64b-2t1c-link-bonding-vhost-base-avf-vpp-pdr"
+      data: "plot-ndrpdr-comparison-3n-skx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-1Lbvpplacp-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-avf-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-1Lbvpplacp-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-avf-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "3n-skx-xxv710-64b-2t1c-vhost-base-avf-testpmd-ndr"
+      output-file-name: "3n-skx-xxv710-64b-2t1c-vhost-base-avf-testpmd-ndr"
+      data: "plot-ndrpdr-comparison-3n-skx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-avf-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-avf-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-avf-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "3n-skx-xxv710-64b-2t1c-vhost-base-avf-vpp-ndr"
+      output-file-name: "3n-skx-xxv710-64b-2t1c-vhost-base-avf-vpp-ndr"
+      data: "plot-ndrpdr-comparison-3n-skx"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-avf-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Vppip4-Ndrpdr.64B-2t1c-avf-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-avf-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "3n-skx-xxv710-64b-2t1c-vhost-base-avf-testpmd-pdr"
+      output-file-name: "3n-skx-xxv710-64b-2t1c-vhost-base-avf-testpmd-pdr"
+      data: "plot-ndrpdr-comparison-3n-skx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-avf-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-avf-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-avf-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "3n-skx-xxv710-64b-2t1c-vhost-base-avf-vpp-pdr"
+      output-file-name: "3n-skx-xxv710-64b-2t1c-vhost-base-avf-vpp-pdr"
+      data: "plot-ndrpdr-comparison-3n-skx"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-avf-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Vppip4-Ndrpdr.64B-2t1c-avf-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-avf-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+      layout: "plot-cpta"
+
+# 3n-hsw ipsec
+
+    - title: "3n-hsw-xl710-imix-1t1c-ipsec-ip4routing-base-scale-sw-dpdk-ndr"
+      output-file-name: "3n-hsw-xl710-imix-1t1c-ipsec-ip4routing-base-scale-sw-dpdk-ndr"
+      data: "plot-ndrpdr-comparison-3n-hsw"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-1t1c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-1t1c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-1t1c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-1t1c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-1t1c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-1t1c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "3n-hsw-xl710-imix-1t1c-ipsec-ip4routing-base-scale-hw-dpdk-ndr"
+      output-file-name: "3n-hsw-xl710-imix-1t1c-ipsec-ip4routing-base-scale-hw-dpdk-ndr"
+      data: "plot-ndrpdr-comparison-3n-hsw"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1Tnlhw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-1t1c-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1Tnlhw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-1t1c-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlhw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-1t1c-ethip4ipsec1000tnlhw-ip4base-int-aes256gcm-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlhw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-1t1c-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "3n-hsw-xl710-imix-1t1c-ipsec-ip4routing-base-scale-sw-dpdk-pdr"
+      output-file-name: "3n-hsw-xl710-imix-1t1c-ipsec-ip4routing-base-scale-sw-dpdk-pdr"
+      data: "plot-ndrpdr-comparison-3n-hsw"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-1t1c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-1t1c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-1t1c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-1t1c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-1t1c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-1t1c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "3n-hsw-xl710-imix-1t1c-ipsec-ip4routing-base-scale-hw-dpdk-pdr"
+      output-file-name: "3n-hsw-xl710-imix-1t1c-ipsec-ip4routing-base-scale-hw-dpdk-pdr"
+      data: "plot-ndrpdr-comparison-3n-hsw"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1Tnlhw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-1t1c-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1Tnlhw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-1t1c-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlhw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-1t1c-ethip4ipsec1000tnlhw-ip4base-int-aes256gcm-ndrpdr"
+        - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlhw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-1t1c-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+      layout: "plot-cpta"
+
+# 3n-hsw ip4
+
+    - title: "3n-hsw-xl710-64b-1t1c-ip4-base-scale-dpdk-ndr"
+      output-file-name: "3n-hsw-xl710-64b-1t1c-ip4-base-scale-dpdk-ndr"
+      data: "plot-ndrpdr-comparison-3n-hsw"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Dot1Q-Ip4Base-Ndrpdr.64B-1t1c-dot1q-ip4base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4-Ip4Base-Ndrpdr.64B-1t1c-ethip4-ip4base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4-Ip4Scale2M-Ndrpdr.64B-1t1c-ethip4-ip4scale2m-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "3n-hsw-xl710-64b-1t1c-ip4-base-scale-dpdk-pdr"
+      output-file-name: "3n-hsw-xl710-64b-1t1c-ip4-base-scale-dpdk-pdr"
+      data: "plot-ndrpdr-comparison-3n-hsw"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Dot1Q-Ip4Base-Ndrpdr.64B-1t1c-dot1q-ip4base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4-Ip4Base-Ndrpdr.64B-1t1c-ethip4-ip4base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4-Ip4Scale2M-Ndrpdr.64B-1t1c-ethip4-ip4scale2m-ndrpdr"
+      layout: "plot-cpta"
+
+# 3n-hsw ip4 tunnels
+
+    - title: "3n-hsw-xl710-64b-1t1c-ip4tunnel-base-dpdk-ndr"
+      output-file-name: "3n-hsw-xl710-64b-1t1c-ip4tunnel-base-dpdk-ndr"
+      data: "plot-ndrpdr-comparison-3n-hsw"
+      include-tests: "NDR"
+      include:
+      - "Tests.Vpp.Perf.Ip4 Tunnels.40Ge2P1Xl710-Ethip4Vxlan-L2Xcbase-Ndrpdr.64B-1t1c-ethip4vxlan-l2xcbase-ndrpdr"
+      - "Tests.Vpp.Perf.Ip4 Tunnels.40Ge2P1Xl710-Ethip4Vxlan-L2Bdbasemaclrn-Ndrpdr.64B-1t1c-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "3n-hsw-xl710-64b-1t1c-ip4tunnel-base-dpdk-pdr"
+      output-file-name: "3n-hsw-xl710-64b-1t1c-ip4tunnel-base-dpdk-pdr"
+      data: "plot-ndrpdr-comparison-3n-hsw"
+      include-tests: "PDR"
+      include:
+      - "Tests.Vpp.Perf.Ip4 Tunnels.40Ge2P1Xl710-Ethip4Vxlan-L2Xcbase-Ndrpdr.64B-1t1c-ethip4vxlan-l2xcbase-ndrpdr"
+      - "Tests.Vpp.Perf.Ip4 Tunnels.40Ge2P1Xl710-Ethip4Vxlan-L2Bdbasemaclrn-Ndrpdr.64B-1t1c-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
+      layout: "plot-cpta"
+
+# 3n-hsw ip6
+
+    - title: "3n-hsw-xl710-78b-1t1c-ip6routing-base-scale-dpdk-ndr"
+      output-file-name: "3n-hsw-xl710-78b-1t1c-ip6routing-base-scale-dpdk-ndr"
+      data: "plot-ndrpdr-comparison-3n-hsw"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Dot1Q-Ip6Base-Ndrpdr.78B-1t1c-dot1q-ip6base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Ethip6-Ip6Base-Ndrpdr.78B-1t1c-ethip6-ip6base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Ethip6-Ip6Scale2M-Ndrpdr.78B-1t1c-ethip6-ip6scale2m-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "3n-hsw-xl710-78b-1t1c-ip6routing-base-scale-dpdk-pdr"
+      output-file-name: "3n-hsw-xl710-78b-1t1c-ip6routing-base-scale-dpdk-pdr"
+      data: "plot-ndrpdr-comparison-3n-hsw"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Dot1Q-Ip6Base-Ndrpdr.78B-1t1c-dot1q-ip6base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Ethip6-Ip6Base-Ndrpdr.78B-1t1c-ethip6-ip6base-ndrpdr"
+        - "Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Ethip6-Ip6Scale2M-Ndrpdr.78B-1t1c-ethip6-ip6scale2m-ndrpdr"
+      layout: "plot-cpta"
+
+# 3n-hsw l2
+
+    - title: "3n-hsw-xl710-64b-1t1c-l2-base-scale-dpdk-ndr"
+      output-file-name: "3n-hsw-xl710-64b-1t1c-l2-base-scale-dpdk-ndr"
+      data: "plot-ndrpdr-comparison-3n-hsw"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Patch-Ndrpdr.64B-1t1c-eth-l2patch-ndrpdr"
+        - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Dot1Q-L2Xcbase-Ndrpdr.64B-1t1c-dot1q-l2xcbase-ndrpdr"
+        - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Xcbase-Ndrpdr.64B-1t1c-eth-l2xcbase-ndrpdr"
+        - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-1t1c-dot1q-l2bdbasemaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-1t1c-eth-l2bdscale1mmaclrn-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "3n-hsw-xl710-64b-1t1c-l2-base-scale-dpdk-pdr"
+      output-file-name: "3n-hsw-xl710-64b-1t1c-l2-base-scale-dpdk-pdr"
+      data: "plot-ndrpdr-comparison-3n-hsw"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Patch-Ndrpdr.64B-1t1c-eth-l2patch-ndrpdr"
+        - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Dot1Q-L2Xcbase-Ndrpdr.64B-1t1c-dot1q-l2xcbase-ndrpdr"
+        - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Xcbase-Ndrpdr.64B-1t1c-eth-l2xcbase-ndrpdr"
+        - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-1t1c-dot1q-l2bdbasemaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-ndrpdr"
+        - "Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-1t1c-eth-l2bdscale1mmaclrn-ndrpdr"
+      layout: "plot-cpta"
+
+# 3n-hsw srv6
+
+    - title: "3n-hsw-xl710-78b-1t1c-srv6-base-dpdk-ndr"
+      output-file-name: "3n-hsw-xl710-78b-1t1c-srv6-base-dpdk-ndr"
+      data: "plot-ndrpdr-comparison-3n-hsw"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-Ndrpdr.78B-1t1c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr"
+        - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Ndrpdr.78B-1t1c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr"
+        - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Nodecaps-Ndrpdr.78B-1t1c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr"
+        - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Dyn-Ndrpdr.78B-1t1c-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr"
+        - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Masq-Ndrpdr.78B-1t1c-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr"
+        - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Stat-Ndrpdr.78B-1t1c-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "3n-hsw-xl710-78b-1t1c-srv6-base-dpdk-pdr"
+      output-file-name: "3n-hsw-xl710-78b-1t1c-srv6-base-dpdk-pdr"
+      data: "plot-ndrpdr-comparison-3n-hsw"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-Ndrpdr.78B-1t1c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr"
+        - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Ndrpdr.78B-1t1c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr"
+        - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Nodecaps-Ndrpdr.78B-1t1c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr"
+        - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Dyn-Ndrpdr.78B-1t1c-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr"
+        - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Masq-Ndrpdr.78B-1t1c-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr"
+        - "Tests.Vpp.Perf.Srv6.40Ge2P1Xl710-Ethip6Srhip6-Ip6Base-Srv6Proxy-Stat-Ndrpdr.78B-1t1c-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr"
+      layout: "plot-cpta"
+
+# 3n-hsw vhost
+
+    - title: "3n-hsw-xl710-64b-1t1c-vhost-base-dpdk-testpmd-ndr"
+      output-file-name: "3n-hsw-xl710-64b-1t1c-vhost-base-dpdk-testpmd-ndr"
+      data: "plot-ndrpdr-comparison-3n-hsw"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "3n-hsw-xl710-64b-1t1c-vhost-base-dpdk-vpp-ndr"
+      output-file-name: "3n-hsw-xl710-64b-1t1c-vhost-base-dpdk-vpp-ndr"
+      data: "plot-ndrpdr-comparison-3n-hsw"
+      include-tests: "NDR"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-1t1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr10241Vm-Vppl2Xc-Ndrpdr.64B-1t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-1t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1V-m-Vppl2Xc-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Vppip4-Ndrpdr.64B-1t1c-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "3n-hsw-xl710-64b-1t1c-vhost-base-dpdk-testpmd-pdr"
+      output-file-name: "3n-hsw-xl710-64b-1t1c-vhost-base-dpdk-testpmd-pdr"
+      data: "plot-ndrpdr-comparison-3n-hsw"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "3n-hsw-xl710-64b-1t1c-vhost-base-dpdk-vpp-pdr"
+      output-file-name: "3n-hsw-xl710-64b-1t1c-vhost-base-dpdk-vpp-pdr"
+      data: "plot-ndrpdr-comparison-3n-hsw"
+      include-tests: "PDR"
+      include:
+        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-1t1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr10241Vm-Vppl2Xc-Ndrpdr.64B-1t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-1t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1V-m-Vppl2Xc-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+        - "Tests.Vpp.Perf.Vm Vhost.40Ge2P1Xl710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Vppip4-Ndrpdr.64B-1t1c-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr"
+      layout: "plot-cpta"