Trending: Reduce the amount of downloaded data

[csit.git] / resources / tools / presentation / specification_CPTA.yaml

diff --git a/resources/tools/presentation/specification_CPTA.yaml b/resources/tools/presentation/specification_CPTA.yaml
index 760f087..4d19958 100644 (file)
--- a/resources/tools/presentation/specification_CPTA.yaml
+++ b/resources/tools/presentation/specification_CPTA.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2018 Cisco and/or its affiliates.
+# Copyright (c) 2019 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:
@@ -61,6 +61,17 @@
   # 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.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"
+
 -
   type: "configuration"
 
@@ -140,65 +151,67 @@
     # 3n-hsw
     plot-performance-trending-all-3n-hsw:
       csit-vpp-perf-mrr-daily-master:
-        start: 260
+        start: 457
         end: "lastCompletedBuild"
       csit-dpdk-perf-mrr-weekly-master:
-        start: 3
+        start: 52
         end: "lastCompletedBuild"
 
     plot-performance-trending-vpp-3n-hsw:
       csit-vpp-perf-mrr-daily-master:
-        start: 260
+        start: 457
         end: "lastCompletedBuild"
 
     plot-performance-trending-dpdk-3n-hsw:
       csit-dpdk-perf-mrr-weekly-master:
-        start: 3
+        start: 52
         end: "lastCompletedBuild"
 
     # 3n-skx
     plot-performance-trending-all-3n-skx:
       csit-vpp-perf-mrr-daily-master-3n-skx:
-        start: 20
+        start: 207
         end: "lastCompletedBuild"
       csit-dpdk-perf-mrr-weekly-master-3n-skx:
-        start: 1
+        start: 17
         end: "lastCompletedBuild"
 
     plot-performance-trending-vpp-3n-skx:
       csit-vpp-perf-mrr-daily-master-3n-skx:
-        start: 20
+        start: 207
         end: "lastCompletedBuild"
 
     plot-performance-trending-dpdk-3n-skx:
       csit-dpdk-perf-mrr-weekly-master-3n-skx:
-        start: 1
+        start: 17
         end: "lastCompletedBuild"
 
     # 2n-skx
     plot-performance-trending-all-2n-skx:
       csit-vpp-perf-mrr-daily-master-2n-skx:
-        start: 20
+        start: 207
         end: "lastCompletedBuild"
       csit-dpdk-perf-mrr-weekly-master-2n-skx:
-        start: 1
+        start: 17
         end: "lastCompletedBuild"
 
     plot-performance-trending-vpp-2n-skx:
       csit-vpp-perf-mrr-daily-master-2n-skx:
-        start: 20
+        start: 207
         end: "lastCompletedBuild"
 
     plot-performance-trending-dpdk-2n-skx:
       csit-dpdk-perf-mrr-weekly-master-2n-skx:
-        start: 1
+        start: 17
         end: "lastCompletedBuild"
 
   plot-layouts:
 
     plot-cpta:
       title: ""
-      autosize: False
+      titlefont:
+        size: 16
+      autosize: True
       showlegend: True
       width: 1100
       height: 800
@@ -274,31 +287,34 @@
     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: 90
 
   builds:
 
     # 3n-hsw
     csit-vpp-perf-mrr-daily-master:
-      start: 260
+      start: 457
       end: "lastCompletedBuild"
     csit-dpdk-perf-mrr-weekly-master:
-      start: 3
+      start: 52
       end: "lastCompletedBuild"
 
     # 3n-skx
     csit-vpp-perf-mrr-daily-master-3n-skx:
-      start: 20
+      start: 207
       end: "lastCompletedBuild"
     csit-dpdk-perf-mrr-weekly-master-3n-skx:
-      start: 1
+      start: 17
       end: "lastCompletedBuild"
 
     # 2n-skx
     csit-vpp-perf-mrr-daily-master-2n-skx:
-      start: 20
+      start: 207
       end: "lastCompletedBuild"
     csit-dpdk-perf-mrr-weekly-master-2n-skx:
-      start: 1
+      start: 17
       end: "lastCompletedBuild"
 
 -
@@ -331,9 +347,7 @@
     # 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
   window: 14
-  evaluated-window: 14
   long-trend-window: 180
 
 -
@@ -352,9 +366,7 @@
     # 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
   window: 14
-  evaluated-window: 14
   long-trend-window: 180
 
 -
@@ -373,9 +385,7 @@
     # 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
   window: 14
-  evaluated-window: 14
   long-trend-window: 180
 
 -
@@ -446,9 +456,7 @@
     # 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
 
 -
@@ -467,9 +475,7 @@
     # 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
 
 -
@@ -488,9 +494,7 @@
     # 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
   window: 14
-  evaluated-window: 14
   long-trend-window: 180
 
 -
@@ -561,9 +565,7 @@
     # 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
 
 -
@@ -582,9 +584,7 @@
     # 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
 
 -
@@ -603,9 +603,7 @@
     # 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
   window: 14
-  evaluated-window: 14
   long-trend-window: 180
 
 -
@@ -676,9 +674,61 @@
 ################################################################################
 # 3n-hsw
 
+# L2 - VIC-1227
+
+    - title: "3n-hsw-vic1227-l2sw-64b-base-scale-1t1c"
+      output-file-name: "l2-1t1c-vic1227-3n-hsw"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      filter: "'NIC_Cisco-VIC-1227' 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"
+
+    - title: "3n-hsw-vic1227-l2sw-64b-base-scale-2t2c"
+      output-file-name: "l2-2t2c-vic1227-3n-hsw"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      filter: "'NIC_Cisco-VIC-1227' 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"
+
+    - title: "3n-hsw-vic1227-l2sw-64b-base-scale-4t4c"
+      output-file-name: "l2-4t4c-vic1227-3n-hsw"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      filter: "'NIC_Cisco-VIC-1227' 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"
+
+# L2 - VIC-1385
+
+    - title: "3n-hsw-vic1385-l2sw-64b-base-scale-1t1c"
+      output-file-name: "l2-1t1c-vic1385-3n-hsw"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      filter: "'NIC_Cisco-VIC-1385' 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"
+
+    - title: "3n-hsw-vic1385-l2sw-64b-base-scale-2t2c"
+      output-file-name: "l2-2t2c-vic1385-3n-hsw"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      filter: "'NIC_Cisco-VIC-1385' 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"
+
+    - title: "3n-hsw-vic1385-l2sw-64b-base-scale-4t4c"
+      output-file-name: "l2-4t4c-vic1385-3n-hsw"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      filter: "'NIC_Cisco-VIC-1385' 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"
+
 # L2 - x520
 
-    - title: "VPP 1T1C L2 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-64b-base-scale-1t1c"
       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'"
@@ -686,7 +736,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C L2 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-64b-base-scale-2t2c"
       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'"
@@ -694,7 +744,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C L2 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-64b-base-scale-4t4c"
       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'"
@@ -702,7 +752,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 1T1C L2 64B IACL MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-64b-features-iacl-1t1c"
       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'"
@@ -710,7 +760,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C L2 64B IACL MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-64b-features-iacl-2t2c"
       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'"
@@ -718,7 +768,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C L2 64B IACL MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-64b-features-iacl-4t4c"
       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'"
@@ -726,7 +776,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 1T1C L2 64B OACL MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-64b-features-oacl-1t1c"
       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'"
@@ -734,7 +784,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C L2 64B OACL MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-64b-features-oacl-2t2c"
       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'"
@@ -742,7 +792,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C L2 64B OACL MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-64b-features-oacl-4t4c"
       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'"
@@ -750,7 +800,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 1T1C L2 64B MACIP MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-64b-features-macip-1t1c"
       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'"
@@ -758,7 +808,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C L2 64B MACIP MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-64b-features-macip-2t2c"
       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'"
@@ -766,7 +816,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C L2 64B MACIP MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-64b-features-macip-4t4c"
       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'"
@@ -776,7 +826,7 @@
 
 # L2 - xl710
 
-    - title: "VPP 1T1C L2 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-xl710-l2sw-64b-base-scale-1t1c"
       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'"
@@ -784,7 +834,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C L2 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-xl710-l2sw-64b-base-scale-2t2c"
       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'"
@@ -792,7 +842,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C L2 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-xl710-l2sw-64b-base-scale-4t4c"
       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'"
@@ -802,7 +852,7 @@
 
 # L2 - x710
 
-    - title: "VPP 1T1C L2 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-l2sw-64b-base-scale-1t1c"
       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'"
@@ -810,7 +860,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C L2 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-l2sw-64b-base-scale-2t2c"
       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'"
@@ -818,7 +868,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C L2 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-l2sw-64b-base-scale-4t4c"
       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'"
@@ -826,7 +876,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 1T1C L2 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-l2sw-64b-features-1t1c"
       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'"
@@ -834,7 +884,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C L2 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-l2sw-64b-features-2t2c"
       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'"
@@ -842,7 +892,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C L2 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-l2sw-64b-features-4t4c"
       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'"
@@ -852,31 +902,31 @@
 
 # IPv4 - x520
 
-    - title: "VPP 1T1C IPv4 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip4-64b-base-scale-1t1c"
       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'"
+      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' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C IPv4 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip4-64b-base-scale-2t2c"
       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'"
+      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' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C IPv4 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip4-64b-base-scale-4t4c"
       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'"
+      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' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 1T1C IPv4 64B IACL MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip4-64b-features-iacl-1t1c"
       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'"
@@ -884,7 +934,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C IPv4 64B IACL MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip4-64b-features-iacl-2t2c"
       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'"
@@ -892,7 +942,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C IPv4 64B IACL MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip4-64b-features-iacl-4t4c"
       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'"
@@ -900,7 +950,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 1T1C IPv4 64B OACL MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip4-64b-features-oacl-1t1c"
       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'"
@@ -908,7 +958,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C IPv4 64B OACL MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip4-64b-features-oacl-2t2c"
       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'"
@@ -916,7 +966,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C IPv4 64B OACL MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip4-64b-features-oacl-4t4c"
       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'"
@@ -924,7 +974,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 1T1C IPv4 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip4-64b-features-1t1c"
       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'"
@@ -932,7 +982,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C IPv4 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip4-64b-features-2t2c"
       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'"
@@ -940,7 +990,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C IPv4 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip4-64b-features-4t4c"
       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'"
@@ -950,57 +1000,57 @@
 
 # IPv4 - xl710
 
-    - title: "VPP 1T1C IPv4 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-xl710-ip4-64b-base-scale-features-1t1c"
       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'"
+      filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and ('BASE' or 'SCALE' or 'FEATURE') and '1T1C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C IPv4 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-xl710-ip4-64b-base-scale-features-2t2c"
       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'"
+      filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and ('BASE' or 'SCALE' or 'FEATURE') and '2T2C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C IPv4 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-xl710-ip4-64b-base-scale-features-4t4c"
       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'"
+      filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and ('BASE' or 'SCALE' or 'FEATURE') and '4T4C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
 # IPv4 - x710
 
-    - title: "VPP 1T1C IPv4 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-ip4-64b-base-scale-1t1c"
       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'"
+      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' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C IPv4 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-ip4-64b-base-scale-2t2c"
       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'"
+      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' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C IPv4 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-ip4-64b-base-scale-4t4c"
       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'"
+      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' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 1T1C IPv4 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-ip4-64b-features-1t1c"
       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'"
@@ -1008,7 +1058,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C IPv4 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-ip4-64b-features-2t2c"
       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'"
@@ -1016,7 +1066,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C IPv4 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-ip4-64b-features-4t4c"
       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'"
@@ -1026,7 +1076,7 @@
 
 # IPv4 Tunnels - x520
 
-    - title: "VPP 1T1C IPv4 Tunnels 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip4tun-64b-base-1t1c"
       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'"
@@ -1034,7 +1084,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C IPv4 Tunnels 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip4tun-64b-base-2t2c"
       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'"
@@ -1042,7 +1092,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C IPv4 Tunnels 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip4tun-64b-base-4t4c"
       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'"
@@ -1052,7 +1102,7 @@
 
 # IPv4 Tunnels - x710
 
-    - title: "VPP 1T1C IPv4 Tunnels 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-ip4tun-64b-base-1t1c"
       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'"
@@ -1060,7 +1110,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C IPv4 Tunnels 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-ip4tun-64b-base-2t2c"
       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'"
@@ -1068,7 +1118,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C IPv4 Tunnels 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-ip4tun-64b-base-4t4c"
       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'"
@@ -1078,7 +1128,7 @@
 
 # IPv6 - x520
 
-    - title: "VPP 1T1C IPv6 78B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip6-78b-base-scale-1t1c"
       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'"
@@ -1086,7 +1136,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C IPv6 78B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip6-78b-base-scale-2t2c"
       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'"
@@ -1094,7 +1144,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C IPv6 78B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip6-78b-base-scale-4t4c"
       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'"
@@ -1104,7 +1154,7 @@
 
 # IPv6 - xl710
 
-    - title: "VPP 1T1C IPv6 78B MRR Trending 3n-hsw"
+    - title: "3n-hsw-xl710-ip6-78b-base-scale-1t1c"
       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'"
@@ -1112,7 +1162,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C IPv6 78B MRR Trending 3n-hsw"
+    - title: "3n-hsw-xl710-ip6-78b-base-scale-2t2c"
       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'"
@@ -1120,7 +1170,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C IPv6 78B MRR Trending 3n-hsw"
+    - title: "3n-hsw-xl710-ip6-78b-base-scale-4t4c"
       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'"
@@ -1130,7 +1180,7 @@
 
 # IPv6 - x710
 
-    - title: "VPP 1T1C IPv6 78B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-ip6-78b-base-scale-1t1c"
       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'"
@@ -1138,7 +1188,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C IPv6 78B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-ip6-78b-base-scale-2t2c"
       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'"
@@ -1146,7 +1196,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C IPv6 78B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-ip6-78b-base-scale-4t4c"
       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'"
@@ -1156,163 +1206,163 @@
 
 # Container memif - x520, 64B
 
-    - title: "VPP 1T1C L2 Container memif 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-memif-64b-base-1t1c"
       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'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'BASE' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C L2 Container memif 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-memif-64b-base-2t2c"
       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'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'BASE' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C L2 Container memif 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-memif-64b-base-4t4c"
       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'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'BASE' and '4T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
 # Container memif - x520, IMIX
 
-    - title: "VPP 1T1C L2 Container memif IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-memif-imix-base-1t1c"
       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'"
+      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' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C L2 Container memif IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-memif-imix-base-2t2c"
       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'"
+      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' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C L2 Container memif IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-memif-imix-base-4t4c"
       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'"
+      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' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
 # Container memif - xl710, 64B
 
-    - title: "VPP 1T1C L2 Container memif 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-xl710-l2sw-memif-64b-base-1t1c"
       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'"
+      filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and 'BASE' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C L2 Container memif 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-xl710-l2sw-memif-64b-base-2t2c"
       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'"
+      filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and 'BASE' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C L2 Container memif 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-xl710-l2sw-memif-64b-base-4t4c"
       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'"
+      filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and 'BASE' and '4T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
 # Container memif - xl710, IMIX
 
-    - title: "VPP 1T1C L2 Container memif IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-xl710-l2sw-memif-imix-base-1t1c"
       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'"
+      filter: "'NIC_Intel-XL710' and 'MRR' and 'IMIX' and 'BASE' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C L2 Container memif IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-xl710-l2sw-memif-imix-base-2t2c"
       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'"
+      filter: "'NIC_Intel-XL710' and 'MRR' and 'IMIX' and 'BASE' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C L2 Container memif IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-xl710-l2sw-memif-imix-base-4t4c"
       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'"
+      filter: "'NIC_Intel-XL710' and 'MRR' and 'IMIX' and 'BASE' and '4T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
 # Container memif - x710, 64B
 
-    - title: "VPP 1T1C L2 Container memif 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-l2sw-memif-64b-base-1t1c"
       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'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'BASE' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C L2 Container memif 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-l2sw-memif-64b-base-2t2c"
       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'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'BASE' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C L2 Container memif 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-l2sw-memif-64b-base-4t4c"
       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'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'BASE' and '4T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
 # Container memif - x710, IMIX
 
-    - title: "VPP 1T1C L2 Container memif IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-l2sw-memif-imix-base-1t1c"
       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'"
+      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' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C L2 Container memif IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-l2sw-memif-imix-base-2t2c"
       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'"
+      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' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C L2 Container memif IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-l2sw-memif-imix-base-4t4c"
       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'"
+      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' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
 # VM vhost - x520, ethip4, 64B
 
-    - title: "VPP 1T1C VM vhost ethip4 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip4-vhost-64b-base-1t1c"
       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'"
@@ -1320,7 +1370,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C VM vhost ethip4 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip4-vhost-64b-base-2t2c"
       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'"
@@ -1328,7 +1378,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C VM vhost ethip4 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip4-vhost-64b-base-4t4c"
       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'"
@@ -1338,7 +1388,7 @@
 
 # VM vhost - x520, ethip4, IMIX
 
-    - title: "VPP 1T1C VM vhost ethip4 IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip4-vhost-imix-base-1t1c"
       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'"
@@ -1346,7 +1396,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C VM vhost ethip4 IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip4-vhost-imix-base-2t2c"
       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'"
@@ -1354,7 +1404,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C VM vhost ethip4 IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip4-vhost-imix-base-4t4c"
       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'"
@@ -1364,7 +1414,7 @@
 
 # VM vhost - x520, eth, 64B
 
-    - title: "VPP 1T1C VM vhost eth L2XC 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-vhost-64b-base-l2xc-1t1c"
       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'"
@@ -1373,7 +1423,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C VM vhost eth L2XC 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-vhost-64b-base-l2xc-2t2c"
       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'"
@@ -1381,7 +1431,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C VM vhost eth L2XC 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-vhost-64b-base-l2xc-4t4c"
       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'"
@@ -1389,7 +1439,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 1T1C VM vhost eth L2BD 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-vhost-64b-base-l2bd-1t1c"
       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'"
@@ -1398,7 +1448,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C VM vhost eth L2BD 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-vhost-64b-base-l2bd-2t2c"
       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'"
@@ -1406,7 +1456,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C VM vhost eth L2BD 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-vhost-64b-base-l2bd-4t4c"
       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'"
@@ -1416,7 +1466,7 @@
 
 # VM vhost - x520, eth, IMIX
 
-    - title: "VPP 1T1C VM vhost eth L2XC IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-vhost-imix-base-l2xc-1t1c"
       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'"
@@ -1425,7 +1475,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C VM vhost eth L2XC IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-vhost-imix-base-l2xc-2t2c"
       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'"
@@ -1433,7 +1483,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C VM vhost eth L2XC IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-vhost-imix-base-l2xc-4t4c"
       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'"
@@ -1441,7 +1491,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 1T1C VM vhost eth L2BD IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-vhost-imix-base-l2bd-1t1c"
       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'"
@@ -1450,7 +1500,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C VM vhost eth L2BD IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-vhost-imix-base-l2bd-2t2c"
       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'"
@@ -1458,7 +1508,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C VM vhost eth L2BD IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-vhost-imix-base-l2bd-4t4c"
       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'"
@@ -1466,63 +1516,63 @@
       - "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"
+## VM vhost - xl710, eth, 64B
+#
+#    - title: "3n-hsw-xl710-l2sw-vhost-64b-base-1t1c"
+#      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: "3n-hsw-xl710-l2sw-vhost-64b-base-2t2c"
+#      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: "3n-hsw-xl710-l2sw-vhost-64b-base-4t4c"
+#      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"
 
-    - 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 - xl710, eth, IMIX
+#
+#    - title: "3n-hsw-xl710-l2sw-vhost-imix-base-1t1c"
+#      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: "3n-hsw-xl710-l2sw-vhost-imix-base-2t2c"
+#      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: "3n-hsw-xl710-l2sw-vhost-imix-base-4t4c"
+#      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"
+    - title: "3n-hsw-x710-ip4-vhost-64b-base-1t1c"
       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'"
@@ -1530,7 +1580,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C VM vhost ethip4 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-ip4-vhost-64b-base-2t2c"
       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'"
@@ -1538,7 +1588,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C VM vhost ethip4 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-ip4-vhost-64b-base-4t4c"
       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'"
@@ -1548,7 +1598,7 @@
 
 # VM vhost - x710, ethip4, IMIX
 
-    - title: "VPP 1T1C VM vhost ethip4 IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-ip4-vhost-imix-base-1t1c"
       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'"
@@ -1556,7 +1606,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C VM vhost ethip4 IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-ip4-vhost-imix-base-2t2c"
       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'"
@@ -1564,7 +1614,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C VM vhost ethip4 IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-ip4-vhost-imix-base-4t4c"
       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'"
@@ -1574,7 +1624,7 @@
 
 # VM vhost - x710, eth, 64B
 
-    - title: "VPP 1T1C VM vhost eth 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-l2sw-vhost-64b-base-1t1c"
       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'"
@@ -1583,7 +1633,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C VM vhost eth 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-l2sw-vhost-64b-base-2t2c"
       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'"
@@ -1591,7 +1641,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C VM vhost eth 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-l2sw-vhost-64b-base-4t4c"
       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'"
@@ -1601,7 +1651,7 @@
 
 # VM vhost - x710, eth, IMIX
 
-    - title: "VPP 1T1C VM vhost eth IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-l2sw-vhost-imix-base-1t1c"
       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'"
@@ -1610,7 +1660,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C VM vhost eth IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-l2sw-vhost-imix-base-2t2c"
       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'"
@@ -1618,7 +1668,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C VM vhost eth IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-l2sw-vhost-imix-base-4t4c"
       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'"
@@ -1628,7 +1678,7 @@
 
 # VTS - x520, 114B
 
-    - title: "VPP 1T1C VTS 114B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-vts-114b-1t1c"
       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'"
@@ -1636,7 +1686,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C VTS 114B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-vts-114b-2t2c"
       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'"
@@ -1644,7 +1694,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C VTS 114B 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-vts-114b-4t4c"
       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'"
@@ -1654,7 +1704,7 @@
 
 # IPSec
 
-    - title: "VPP 1T1C IPSec 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-xl710-ip4-ipsechw-64b-base-scale-1t1c"
       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'"
@@ -1662,7 +1712,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C IPSec 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-xl710-ip4-ipsechw-64b-base-scale-2t2c"
       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'"
@@ -1670,7 +1720,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C IPSec 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-xl710-ip4-ipsechw-64b-base-scale-4t4c"
       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'"
@@ -1680,7 +1730,7 @@
 
 # SRv6 - x520
 
-    - title: "VPP 1T1C SRv6 78B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-srv6-78b-1t1c"
       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'"
@@ -1688,7 +1738,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C SRv6 78B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-srv6-78b-2t2c"
       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'"
@@ -1696,7 +1746,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C SRv6 78B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-srv6-78b-4t4c"
       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'"
@@ -1704,33 +1754,33 @@
       - "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"
+#    - title: "3n-hsw-x520-srv6-imix-1t1c"
+#      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: "3n-hsw-x520-srv6-imix-2t2c"
+#      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: "3n-hsw-x520-srv6-imix-4t4c"
+#      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"
+    - title: "3n-hsw-x520-lb-64b-1t1c"
       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'"
@@ -1738,7 +1788,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C Link Bonding 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-lb-64b-2t2c"
       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'"
@@ -1746,7 +1796,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C Link Bonding 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-lb-64b-4t4c"
       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'"
@@ -1754,7 +1804,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 1T1C Link Bonding IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-lb-imix-1t1c"
       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'"
@@ -1762,7 +1812,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C Link Bonding IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-lb-imix-2t2c"
       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'"
@@ -1770,7 +1820,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C Link Bonding IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-lb-imix-4t4c"
       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'"
@@ -1780,7 +1830,7 @@
 
 # Link Bonding - x710
 
-    - title: "VPP 1T1C Link Bonding 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-lb-64b-1t1c"
       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'"
@@ -1788,7 +1838,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C Link Bonding 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-lb-64b-2t2c"
       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'"
@@ -1796,7 +1846,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C Link Bonding 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-lb-64b-4t4c"
       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'"
@@ -1804,7 +1854,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 1T1C Link Bonding IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-lb-imix-1t1c"
       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'"
@@ -1812,7 +1862,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C Link Bonding IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-lb-imix-2t2c"
       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'"
@@ -1820,7 +1870,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C Link Bonding IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-lb-imix-4t4c"
       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'"
@@ -1830,7 +1880,7 @@
 
 # DPDK - x520 - 64B
 
-    - title: "DPDK 1T1C 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-dpdk-64b-1t1c"
       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'"
@@ -1838,7 +1888,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "DPDK 2T2C 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-dpdk-64b-2t2c"
       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'"
@@ -1846,7 +1896,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "DPDK 4T4C 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-dpdk-64b-4t4c"
       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'"
@@ -1856,7 +1906,7 @@
 
 # DPDK - x710 - 64B
 
-    - title: "DPDK 1T1C 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-dpdk-64b-1t1c"
       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'"
@@ -1864,7 +1914,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "DPDK 2T2C 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-dpdk-64b-2t2c"
       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'"
@@ -1872,7 +1922,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "DPDK 4T4C 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-dpdk-64b-4t4c"
       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'"
@@ -1882,7 +1932,7 @@
 
 # DPDK - xl710 - 64B
 
-    - title: "DPDK 1T1C 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-xl710-dpdk-64b-1t1c"
       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'"
@@ -1890,7 +1940,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "DPDK 2T2C 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-xl710-dpdk-64b-2t2c"
       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'"
@@ -1898,7 +1948,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "DPDK 4T4C 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-xl710-dpdk-64b-4t4c"
       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'"
@@ -1989,7 +2039,7 @@
 
 # L2 - x710
 
-    - title: "VPP 2T1C L2 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-l2sw-64b-base-scale-2t1c"
       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'"
@@ -1997,7 +2047,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C L2 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-l2sw-64b-base-scale-4t2c"
       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'"
@@ -2005,7 +2055,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C L2 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-l2sw-64b-base-scale-8t4c"
       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'"
@@ -2013,7 +2063,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T1C L2 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-l2sw-64b-features-2t1c"
       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'"
@@ -2021,7 +2071,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C L2 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-l2sw-64b-features-4t2c"
       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'"
@@ -2029,7 +2079,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C L2 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-l2sw-64b-features-8t4c"
       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'"
@@ -2039,7 +2089,7 @@
 
 # L2 - xxv710
 
-    - title: "VPP 2T1C L2 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-l2sw-64b-base-scale-2t1c"
       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'"
@@ -2047,7 +2097,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C L2 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-l2sw-64b-base-scale-4t2c"
       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'"
@@ -2055,7 +2105,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C L2 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-l2sw-64b-base-scale-8t4c"
       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'"
@@ -2063,7 +2113,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T1C L2 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-l2sw-64b-features-2t1c"
       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'"
@@ -2071,7 +2121,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C L2 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-l2sw-64b-features-4t2c"
       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'"
@@ -2079,7 +2129,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C L2 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-l2sw-64b-features-8t4c"
       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'"
@@ -2089,31 +2139,31 @@
 
 # IPv4 - x710
 
-    - title: "VPP 2T1C IPv4 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-ip4-64b-base-scale-2t1c"
       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'"
+      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' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C IPv4 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-ip4-64b-base-scale-4t2c"
       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'"
+      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' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C IPv4 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-ip4-64b-base-scale-8t4c"
       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'"
+      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' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T1C IPv4 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-ip4-64b-features-2t1c"
       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'"
@@ -2121,7 +2171,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C IPv4 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-ip4-64b-features-4t2c"
       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'"
@@ -2129,7 +2179,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C IPv4 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-ip4-64b-features-8t4c"
       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'"
@@ -2139,7 +2189,7 @@
 
 # IPv4 - xxv710
 
-    - title: "VPP 2T1C IPv4 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-ip4-64b-base-scale-2t1c"
       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'"
@@ -2147,7 +2197,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C IPv4 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-ip4-64b-base-scale-4t2c"
       output-file-name: "ip4-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 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST'"
@@ -2155,7 +2205,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C IPv4 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-ip4-64b-base-scale-8t4c"
       output-file-name: "ip4-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 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST'"
@@ -2163,7 +2213,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T1C IPv4 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-ip4-64b-features-2t1c"
       output-file-name: "ip4-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 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
@@ -2171,7 +2221,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C IPv4 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-ip4-64b-features-4t2c"
       output-file-name: "ip4-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 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
@@ -2179,7 +2229,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C IPv4 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-ip4-64b-features-8t4c"
       output-file-name: "ip4-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 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
@@ -2189,7 +2239,7 @@
 
 # IPv4 Tunnels - x710
 
-    - title: "VPP 2T1C IPv4 Tunnels 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-ip4tun-64b-base-2t1c"
       output-file-name: "ip4-tunnels-2t1c-x710-3n-skx"
       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'"
@@ -2197,7 +2247,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C IPv4 Tunnels 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-ip4tun-64b-base-4t2c"
       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'"
@@ -2205,7 +2255,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C IPv4 Tunnels 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-ip4tun-64b-base-8t4c"
       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'"
@@ -2215,7 +2265,7 @@
 
 # IPv4 Tunnels - xxv710
 
-    - title: "VPP 2T1C IPv4 Tunnels 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-ip4tun-64b-base-2t1c"
       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'"
@@ -2223,7 +2273,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C IPv4 Tunnels 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-ip4tun-64b-base-4t2c"
       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'"
@@ -2231,7 +2281,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C IPv4 Tunnels 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-ip4tun-64b-base-8t4c"
       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'"
@@ -2241,7 +2291,7 @@
 
 # IPv6 - x710
 
-    - title: "VPP 2T1C IPv6 78B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-ip6-78b-base-scale-2t1c"
       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'"
@@ -2249,7 +2299,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C IPv6 78B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-ip6-78b-base-scale-4t2c"
       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'"
@@ -2257,7 +2307,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C IPv6 78B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-ip6-78b-base-scale-8t4c"
       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'"
@@ -2267,7 +2317,7 @@
 
 # IPv6 - xxv710
 
-    - title: "VPP 2T1C IPv6 78B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-ip6-78b-base-scale-2t1c"
       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'"
@@ -2275,7 +2325,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C IPv6 78B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-ip6-78b-base-scale-4t2c"
       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'"
@@ -2283,7 +2333,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C IPv6 78B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-ip6-78b-base-scale-8t4c"
       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'"
@@ -2293,111 +2343,111 @@
 
 # Container memif - x710, 64B
 
-    - title: "VPP 2T1C L2 Container memif 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-l2sw-memif-64b-base-2t1c"
       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'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'BASE' and '2T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C L2 Container memif 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-l2sw-memif-64b-base-4t2c"
       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'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'BASE' and '4T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C L2 Container memif 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-l2sw-memif-64b-base-8t4c"
       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'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'BASE' and '8T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
 # Container memif - xxv710, 64B
 
-    - title: "VPP 2T1C L2 Container memif 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-l2sw-memif-64b-base-2t1c"
       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'"
+      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'BASE' and '2T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C L2 Container memif 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-l2sw-memif-64b-base-4t2c"
       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'"
+      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'BASE' and '4T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C L2 Container memif 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-l2sw-memif-64b-base-8t4c"
       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'"
+      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'BASE' and '8T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
 # Container memif - x710, IMIX
 
-    - title: "VPP 2T1C L2 Container memif IMIX MRR Trending 3n-skx"
+    - title: "3n-skx-x710-l2sw-memif-imix-base-2t1c"
       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'"
+      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' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C L2 Container memif IMIX MRR Trending 3n-skx"
+    - title: "3n-skx-x710-l2sw-memif-imix-base-4t2c"
       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'"
+      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' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C L2 Container memif IMIX MRR Trending 3n-skx"
+    - title: "3n-skx-x710-l2sw-memif-imix-base-8t4c"
       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'"
+      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' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
 # Container memif - xxv710, IMIX
 
-    - title: "VPP 2T1C L2 Container memif IMIX MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-l2sw-memif-imix-base-2t1c"
       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'"
+      filter: "'NIC_Intel-XXV710' and 'MRR' and 'IMIX' and 'BASE' and '2T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C L2 Container memif IMIX MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-l2sw-memif-imix-base-4t2c"
       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'"
+      filter: "'NIC_Intel-XXV710' and 'MRR' and 'IMIX' and 'BASE' and '4T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C L2 Container memif IMIX MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-l2sw-memif-imix-base-8t4c"
       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'"
+      filter: "'NIC_Intel-XXV710' and 'MRR' and 'IMIX' and 'BASE' and '8T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
 # VM vhost - x710, ethip4, 64B
 
-    - title: "VPP 2T1C VM vhost ethip4 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-ip4-vhost-64b-base-2t1c"
       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'"
@@ -2405,7 +2455,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C VM vhost ethip4 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-ip4-vhost-64b-base-4t2c"
       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'"
@@ -2413,7 +2463,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C VM vhost ethip4 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-ip4-vhost-64b-base-8t4c"
       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'"
@@ -2423,7 +2473,7 @@
 
 # VM vhost - xxv710, ethip4, 64B
 
-    - title: "VPP 2T1C VM vhost ethip4 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-ip4-vhost-64b-base-2t1c"
       output-file-name: "vm-vhost-ethip4-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 ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
@@ -2431,7 +2481,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C VM vhost ethip4 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-ip4-vhost-64b-base-4t2c"
       output-file-name: "vm-vhost-ethip4-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 ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
@@ -2439,7 +2489,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C VM vhost ethip4 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-ip4-vhost-64b-base-8t4c"
       output-file-name: "vm-vhost-ethip4-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 ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
@@ -2449,7 +2499,7 @@
 
 # VM vhost - x710, ethip4, IMIX
 
-    - title: "VPP 2T1C VM vhost ethip4 IMIX MRR Trending 3n-skx"
+    - title: "3n-skx-x710-ip4-vhost-imix-base-2t1c"
       output-file-name: "vm-vhost-imix-ethip4-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 ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
@@ -2457,7 +2507,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C VM vhost ethip4 IMIX MRR Trending 3n-skx"
+    - title: "3n-skx-x710-ip4-vhost-imix-base-4t2c"
       output-file-name: "vm-vhost-imix-ethip4-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 ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
@@ -2465,7 +2515,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C VM vhost ethip4 IMIX MRR Trending 3n-skx"
+    - title: "3n-skx-x710-ip4-vhost-imix-base-8t4c"
       output-file-name: "vm-vhost-imix-ethip4-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 ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
@@ -2475,7 +2525,7 @@
 
 # VM vhost - xxv710, ethip4, IMIX
 
-    - title: "VPP 2T1C VM vhost ethip4 IMIX MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-ip4-vhost-imix-base-2t1c"
       output-file-name: "vm-vhost-imix-ethip4-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 ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
@@ -2483,7 +2533,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C VM vhost ethip4 IMIX MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-ip4-vhost-imix-base-4t2c"
       output-file-name: "vm-vhost-imix-ethip4-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 ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
@@ -2491,7 +2541,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C VM vhost ethip4 IMIX MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-ip4-vhost-imix-base-8t4c"
       output-file-name: "vm-vhost-imix-ethip4-8t4c-xxv710-3n-skx"
       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'"
@@ -2501,7 +2551,7 @@
 
 # VM vhost - x710, eth, 64B
 
-    - title: "VPP 2T1C VM vhost eth 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-l2sw-vhost-64b-base-2t1c"
       output-file-name: "vm-vhost-eth-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 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
@@ -2510,7 +2560,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C VM vhost eth 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-l2sw-vhost-64b-base-4t2c"
       output-file-name: "vm-vhost-eth-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 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
@@ -2518,7 +2568,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C VM vhost eth 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-l2sw-vhost-64b-base-8t4c"
       output-file-name: "vm-vhost-eth-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 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
@@ -2528,7 +2578,7 @@
 
 # VM vhost - xxv710, eth, 64B
 
-    - title: "VPP 2T1C VM vhost eth 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-l2sw-vhost-64b-base-2t1c"
       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'"
@@ -2537,7 +2587,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C VM vhost eth 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-l2sw-vhost-64b-base-4t2c"
       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'"
@@ -2545,7 +2595,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C VM vhost eth 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-l2sw-vhost-64b-base-8t4c"
       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'"
@@ -2555,7 +2605,7 @@
 
 # VM vhost - x710, eth, IMIX
 
-    - title: "VPP 2T1C VM vhost eth IMIX MRR Trending 3n-skx"
+    - title: "3n-skx-x710-l2sw-vhost-imix-base-2t1c"
       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'"
@@ -2564,7 +2614,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C VM vhost eth IMIX MRR Trending 3n-skx"
+    - title: "3n-skx-x710-l2sw-vhost-imix-base-4t2c"
       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'"
@@ -2572,7 +2622,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C VM vhost eth IMIX MRR Trending 3n-skx"
+    - title: "3n-skx-x710-l2sw-vhost-imix-base-8t4c"
       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'"
@@ -2582,7 +2632,7 @@
 
 # VM vhost - xxv710, eth, IMIX
 
-    - title: "VPP 2T1C VM vhost eth IMIX MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-l2sw-vhost-imix-base-2t1c"
       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'"
@@ -2591,7 +2641,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C VM vhost eth IMIX MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-l2sw-vhost-imix-base-4t2c"
       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'"
@@ -2599,7 +2649,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C VM vhost eth IMIX MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-l2sw-vhost-imix-base-8t4c"
       output-file-name: "vm-vhost-imix-eth-8t4c-xxv710-3n-skx"
       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'"
@@ -2609,7 +2659,7 @@
 
 # Link Bonding - x710
 
-    - title: "VPP 2T1C Link Bonding 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-lb-64b-2t1c"
       output-file-name: "lb-64b-2t1c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T1C' and 'LBOND_VPP'"
@@ -2617,7 +2667,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C Link Bonding 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-lb-64b-4t2c"
       output-file-name: "lb-64b-4t2c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T2C' and 'LBOND_VPP'"
@@ -2625,7 +2675,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C Link Bonding 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-lb-64b-8t4c"
       output-file-name: "lb-64b-8t4c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '8T4C' and 'LBOND_VPP'"
@@ -2633,7 +2683,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T1C Link Bonding IMIX MRR Trending 3n-skx"
+    - title: "3n-skx-x710-lb-imix-2t1c"
       output-file-name: "lb-imix-2t1c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '2T1C' and 'LBOND_VPP'"
@@ -2641,7 +2691,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C Link Bonding IMIX MRR Trending 3n-skx"
+    - title: "3n-skx-x710-lb-imix-4t2c"
       output-file-name: "lb-imix-4t2c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '4T2C' and 'LBOND_VPP'"
@@ -2649,7 +2699,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C Link Bonding IMIX MRR Trending 3n-skx"
+    - title: "3n-skx-x710-lb-imix-8t4c"
       output-file-name: "lb-imix-8t4c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '8T4C' and 'LBOND_VPP'"
@@ -2657,59 +2707,59 @@
       - "result"
       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"
-      data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '2T1C' and 'LBOND_VPP'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 4T2C Link Bonding 64B MRR Trending 3n-skx"
-      output-file-name: "lb-64b-4t2c-xxv710-3n-skx"
-      data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '4T2C' and 'LBOND_VPP'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 8T4C Link Bonding 64B MRR Trending 3n-skx"
-      output-file-name: "lb-64b-8t4c-xxv710-3n-skx"
-      data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '8T4C' and 'LBOND_VPP'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 2T1C Link Bonding IMIX MRR Trending 3n-skx"
-      output-file-name: "lb-imix-2t1c-xxv710-3n-skx"
-      data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '2T1C' and 'LBOND_VPP'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 4T2C Link Bonding IMIX MRR Trending 3n-skx"
-      output-file-name: "lb-imix-4t2c-xxv710-3n-skx"
-      data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '4T2C' and 'LBOND_VPP'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 8T4C Link Bonding IMIX MRR Trending 3n-skx"
-      output-file-name: "lb-imix-8t4c-xxv710-3n-skx"
-      data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '8T4C' and 'LBOND_VPP'"
-      parameters:
-      - "result"
-      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"
+#      data: "plot-performance-trending-vpp-3n-skx"
+#      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '2T1C' and 'LBOND_VPP'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "VPP 4T2C Link Bonding 64B MRR Trending 3n-skx"
+#      output-file-name: "lb-64b-4t2c-xxv710-3n-skx"
+#      data: "plot-performance-trending-vpp-3n-skx"
+#      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '4T2C' and 'LBOND_VPP'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "VPP 8T4C Link Bonding 64B MRR Trending 3n-skx"
+#      output-file-name: "lb-64b-8t4c-xxv710-3n-skx"
+#      data: "plot-performance-trending-vpp-3n-skx"
+#      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '8T4C' and 'LBOND_VPP'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "VPP 2T1C Link Bonding IMIX MRR Trending 3n-skx"
+#      output-file-name: "lb-imix-2t1c-xxv710-3n-skx"
+#      data: "plot-performance-trending-vpp-3n-skx"
+#      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '2T1C' and 'LBOND_VPP'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "VPP 4T2C Link Bonding IMIX MRR Trending 3n-skx"
+#      output-file-name: "lb-imix-4t2c-xxv710-3n-skx"
+#      data: "plot-performance-trending-vpp-3n-skx"
+#      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '4T2C' and 'LBOND_VPP'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "VPP 8T4C Link Bonding IMIX MRR Trending 3n-skx"
+#      output-file-name: "lb-imix-8t4c-xxv710-3n-skx"
+#      data: "plot-performance-trending-vpp-3n-skx"
+#      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '8T4C' and 'LBOND_VPP'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
 
 # DPDK - x710 - 64B
 
-    - title: "DPDK 2T1C 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-dpdk-64b-2t1c"
       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'"
@@ -2717,7 +2767,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "DPDK 4T2C 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-dpdk-64b-4t2c"
       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'"
@@ -2725,7 +2775,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "DPDK 8T4C 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-dpdk-64b-8t4c"
       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'"
@@ -2761,7 +2811,7 @@
 
 # DPDK - xxv710 - 64B
 
-    - title: "DPDK 2T1C 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-dpdk-64b-2t1c"
       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'"
@@ -2769,7 +2819,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "DPDK 4T2C 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-dpdk-64b-4t2c"
       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'"
@@ -2777,7 +2827,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "DPDK 8T4C 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-dpdk-64b-8t4c"
       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'"
@@ -2816,7 +2866,7 @@
 
 # L2 - x710
 
-    - title: "VPP 2T1C L2 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-l2sw-64b-base-scale-2t1c"
       output-file-name: "l2-2t1c-x710-2n-skx"
       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'"
@@ -2824,7 +2874,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C L2 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-l2sw-64b-base-scale-4t2c"
       output-file-name: "l2-4t2c-x710-2n-skx"
       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'"
@@ -2832,7 +2882,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C L2 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-l2sw-64b-base-scale-8t4c"
       output-file-name: "l2-8t4c-x710-2n-skx"
       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'"
@@ -2840,7 +2890,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T1C L2 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-l2sw-64b-features-2t1c"
       output-file-name: "l2-feature-2t1c-x710-2n-skx"
       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'"
@@ -2848,7 +2898,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C L2 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-l2sw-64b-features-4t2c"
       output-file-name: "l2-feature-4t2c-x710-2n-skx"
       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'"
@@ -2856,7 +2906,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C L2 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-l2sw-64b-features-8t4c"
       output-file-name: "l2-feature-8t4c-x710-2n-skx"
       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'"
@@ -2866,7 +2916,7 @@
 
 # L2 - xxv710
 
-    - title: "VPP 2T1C L2 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-l2sw-64b-base-scale-2t1c"
       output-file-name: "l2-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 ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'MEMIF' and not 'POLICE_MARK' and not 'DRV_AVF'"
@@ -2874,7 +2924,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C L2 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-l2sw-64b-base-scale-4t2c"
       output-file-name: "l2-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 ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'MEMIF' and not 'POLICE_MARK' and not 'DRV_AVF'"
@@ -2882,7 +2932,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C L2 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-l2sw-64b-base-scale-8t4c"
       output-file-name: "l2-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 ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'MEMIF' and not 'POLICE_MARK' and not 'DRV_AVF'"
@@ -2890,7 +2940,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T1C L2 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-l2sw-64b-features-2t1c"
       output-file-name: "l2-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 ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
@@ -2898,7 +2948,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C L2 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-l2sw-64b-features-4t2c"
       output-file-name: "l2-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 ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
@@ -2906,7 +2956,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C L2 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-l2sw-64b-features-8t4c"
       output-file-name: "l2-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 ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
@@ -2916,31 +2966,31 @@
 
 # IPv4 - x710
 
-    - title: "VPP 2T1C IPv4 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-ip4-64b-base-scale-2t1c"
       output-file-name: "ip4-2t1c-x710-2n-skx"
       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'"
+      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' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C IPv4 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-ip4-64b-base-scale-4t2c"
       output-file-name: "ip4-4t2c-x710-2n-skx"
       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'"
+      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' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C IPv4 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-ip4-64b-base-scale-8t4c"
       output-file-name: "ip4-8t4c-x710-2n-skx"
       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'"
+      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' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T1C IPv4 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-ip4-64b-features-2t1c"
       output-file-name: "ip4-feature-2t1c-x710-2n-skx"
       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'"
@@ -2948,7 +2998,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C IPv4 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-ip4-64b-features-4t2c"
       output-file-name: "ip4-feature-4t2c-x710-2n-skx"
       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'"
@@ -2956,7 +3006,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C IPv4 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-ip4-64b-features-8t4c"
       output-file-name: "ip4-feature-8t4c-x710-2n-skx"
       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'"
@@ -2966,31 +3016,31 @@
 
 # IPv4 - xxv710
 
-    - title: "VPP 2T1C IPv4 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-ip4-64b-base-scale-2t1c"
       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'"
+      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' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C IPv4 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-ip4-64b-base-scale-4t2c"
       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'"
+      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' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C IPv4 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-ip4-64b-base-scale-8t4c"
       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'"
+      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' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T1C IPv4 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-ip4-64b-features-2t1c"
       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'"
@@ -2998,7 +3048,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C IPv4 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-ip4-64b-features-4t2c"
       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'"
@@ -3006,7 +3056,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C IPv4 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-ip4-64b-features-8t4c"
       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'"
@@ -3016,7 +3066,7 @@
 
 # IPv4 Tunnels - x710
 
-    - title: "VPP 2T1C IPv4 Tunnels 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-ip4tun-64b-base-2t1c"
       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'"
@@ -3024,7 +3074,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C IPv4 Tunnels 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-ip4tun-64b-base-4t2c"
       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'"
@@ -3032,7 +3082,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C IPv4 Tunnels 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-ip4tun-64b-base-8t4c"
       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'"
@@ -3042,7 +3092,7 @@
 
 # IPv4 Tunnels - xxv710
 
-    - title: "VPP 2T1C IPv4 Tunnels 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-ip4tun-64b-base-2t1c"
       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'"
@@ -3050,7 +3100,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C IPv4 Tunnels 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-ip4tun-64b-base-4t2c"
       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'"
@@ -3058,7 +3108,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C IPv4 Tunnels 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-ip4tun-64b-base-8t4c"
       output-file-name: "ip4-tunnels-8t4c-xxv710-2n-skx"
       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'"
@@ -3068,7 +3118,7 @@
 
 # IPv6 - x710
 
-    - title: "VPP 2T1C IPv6 78B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-ip6-78b-base-scale-2t1c"
       output-file-name: "ip6-2t1c-x710-2n-skx"
       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'"
@@ -3076,7 +3126,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C IPv6 78B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-ip6-78b-base-scale-4t2c"
       output-file-name: "ip6-4t2c-x710-2n-skx"
       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'"
@@ -3084,7 +3134,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C IPv6 78B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-ip6-78b-base-scale-8t4c"
       output-file-name: "ip6-8t4c-x710-2n-skx"
       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'"
@@ -3094,7 +3144,7 @@
 
 # IPv6 - xxv710
 
-    - title: "VPP 2T1C IPv6 78B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-ip6-78b-base-scale-2t1c"
       output-file-name: "ip6-2t1c-xxv710-2n-skx"
       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'"
@@ -3102,7 +3152,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C IPv6 78B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-ip6-78b-base-scale-4t2c"
       output-file-name: "ip6-4t2c-xxv710-2n-skx"
       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'"
@@ -3110,7 +3160,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C IPv6 78B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-ip6-78b-base-scale-8t4c"
       output-file-name: "ip6-8t4c-xxv710-2n-skx"
       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'"
@@ -3120,85 +3170,85 @@
 
 # Container memif - x710, 64B
 
-    - title: "VPP 2T1C L2 Container memif 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-l2sw-memif-64b-base-2t1c"
       output-file-name: "container-memif-l2-2t1c-x710-2n-skx"
       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'"
+      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' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C L2 Container memif 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-l2sw-memif-64b-base-4t2c"
       output-file-name: "container-memif-l2-4t2c-x710-2n-skx"
       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'"
+      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' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C L2 Container memif 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-l2sw-memif-64b-base-8t4c"
       output-file-name: "container-memif-l2-8t4c-x710-2n-skx"
       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'"
+      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' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
 # Container memif - xxv710, 64B
 
-    - title: "VPP 2T1C L2 Container memif 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-l2sw-memif-64b-base-2t1c"
       output-file-name: "container-memif-l2-2t1c-xxv710-2n-skx"
       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'"
+      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'BASE' and '2T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C L2 Container memif 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-l2sw-memif-64b-base-4t2c"
       output-file-name: "container-memif-l2-4t2c-xxv710-2n-skx"
       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'"
+      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'BASE' and '4T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C L2 Container memif 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-l2sw-memif-64b-base-8t4c"
       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'"
+      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'BASE' and '8T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
 # VM vhost - x710, ethip4, 64B
 
-    - title: "VPP 2T1C VM vhost ethip4 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-ip4-vhost-64b-base-2t1c-mrr"
       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'"
+      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' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C VM vhost ethip4 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-ip4-vhost-64b-base-4t2c-mrr"
       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'"
+      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' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C VM vhost ethip4 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-ip4-vhost-64b-base-8t4c-mrr"
       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'"
+      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' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
 # VM vhost - xxv710, ethip4, 64B
 
-    - title: "VPP 2T1C VM vhost ethip4 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-ip4-vhost-64b-base-2t1c"
       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'"
@@ -3206,7 +3256,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C VM vhost ethip4 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-ip4-vhost-64b-base-4t2c"
       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'"
@@ -3214,7 +3264,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C VM vhost ethip4 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-ip4-vhost-64b-base-8t4c"
       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'"
@@ -3224,33 +3274,33 @@
 
 # VM vhost - x710, ethip4, IMIX
 
-    - title: "VPP 2T1C VM vhost ethip4 IMIX MRR Trending 2n-skx"
+    - title: "2n-skx-x710-ip4-vhost-imix-base-2t1c"
       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'"
+      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' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C VM vhost ethip4 IMIX MRR Trending 2n-skx"
+    - title: "2n-skx-x710-ip4-vhost-imix-base-4t2c"
       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'"
+      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' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C VM vhost ethip4 IMIX MRR Trending 2n-skx"
+    - title: "2n-skx-x710-ip4-vhost-imix-base-8t4c"
       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'"
+      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' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
 # VM vhost - xxv710, ethip4, IMIX
 
-    - title: "VPP 2T1C VM vhost ethip4 IMIX MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-ip4-vhost-imix-base-2t1c"
       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'"
@@ -3258,7 +3308,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C VM vhost ethip4 IMIX MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-ip4-vhost-imix-base-4t2c"
       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'"
@@ -3266,7 +3316,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C VM vhost ethip4 IMIX MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-ip4-vhost-imix-base-8t4c"
       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'"
@@ -3276,34 +3326,34 @@
 
 # VM vhost - x710, eth, 64B
 
-    - title: "VPP 2T1C VM vhost eth 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-l2sw-vhost-64b-base-2t1c"
       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'"
+      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS' and not 'NF_DENSITY'"
 
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C VM vhost eth 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-l2sw-vhost-64b-base-4t2c"
       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'"
+      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C VM vhost eth 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-l2sw-vhost-64b-base-8t4c"
       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'"
+      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '8T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
 # VM vhost - xxv710, eth, 64B
 
-    - title: "VPP 2T1C VM vhost eth 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-l2sw-vhost-64b-base-2t1c"
       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'"
@@ -3312,7 +3362,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C VM vhost eth 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-l2sw-vhost-64b-base-4t2c"
       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'"
@@ -3320,7 +3370,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C VM vhost eth 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-l2sw-vhost-64b-base-8t4c"
       output-file-name: "vm-vhost-eth-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 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
@@ -3330,34 +3380,34 @@
 
 # VM vhost - x710, eth, IMIX
 
-    - title: "VPP 2T1C VM vhost eth IMIX MRR Trending 2n-skx"
+    - title: "2n-skx-x710-l2sw-vhost-imix-base-2t1c"
       output-file-name: "vm-vhost-imix-eth-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 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '2T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS' and not 'NF_DENSITY'"
 
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C VM vhost eth IMIX MRR Trending 2n-skx"
+    - title: "2n-skx-x710-l2sw-vhost-imix-base-4t2c"
       output-file-name: "vm-vhost-imix-eth-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 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '4T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C VM vhost eth IMIX MRR Trending 2n-skx"
+    - title: "2n-skx-x710-l2sw-vhost-imix-base-8t4c"
       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'"
+      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '8T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
 # VM vhost - xxv710, eth, IMIX
 
-    - title: "VPP 2T1C VM vhost eth IMIX MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-l2sw-vhost-imix-base-2t1c"
       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'"
@@ -3366,7 +3416,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C VM vhost eth IMIX MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-l2sw-vhost-imix-base-4t2c"
       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'"
@@ -3374,7 +3424,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C VM vhost eth IMIX MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-l2sw-vhost-imix-base-8t4c"
       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'"
@@ -3384,7 +3434,7 @@
 
 # Link Bonding - x710
 
-    - title: "VPP 2T1C Link Bonding 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-lb-64b-2t1c"
       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'"
@@ -3392,7 +3442,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C Link Bonding 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-lb-64b-4t2c"
       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'"
@@ -3400,7 +3450,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C Link Bonding 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-lb-64b-8t4c"
       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'"
@@ -3408,7 +3458,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T1C Link Bonding IMIX MRR Trending 2n-skx"
+    - title: "2n-skx-x710-lb-imix-2t1c"
       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'"
@@ -3416,7 +3466,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C Link Bonding IMIX MRR Trending 2n-skx"
+    - title: "2n-skx-x710-lb-imix-4t2c"
       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'"
@@ -3424,7 +3474,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C Link Bonding IMIX MRR Trending 2n-skx"
+    - title: "2n-skx-x710-lb-imix-8t4c"
       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'"
@@ -3432,59 +3482,59 @@
       - "result"
       layout: "plot-cpta"
 
-# Link Bonding - xxv710
-
-    - 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"
-      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"
-      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"
-      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"
-      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"
-      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"
-      layout: "plot-cpta"
+## Link Bonding - xxv710
+#
+#    - 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"
+#      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"
+#      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"
+#      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"
+#      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"
+#      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"
+#      layout: "plot-cpta"
 
 # DPDK - x710 - 64B
 
-    - title: "DPDK 2T1C 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-dpdk-64b-2t1c"
       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'"
@@ -3492,7 +3542,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "DPDK 4T2C 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-dpdk-64b-4t2c"
       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'"
@@ -3500,7 +3550,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "DPDK 8T4C 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-dpdk-64b-8t4c"
       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'"
@@ -3536,7 +3586,7 @@
 
 # DPDK - xxv710 - 64B
 
-    - title: "DPDK 2T1C 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-dpdk-64b-2t1c"
       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'"
@@ -3544,7 +3594,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "DPDK 4T2C 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-dpdk-64b-4t2c"
       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'"
@@ -3552,7 +3602,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "DPDK 8T4C 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-dpdk-64b-8t4c"
       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'"