X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fspecification.yaml;h=4c83a30658c07d069f820babc3b49dd29b4238a1;hb=dadb06ada83c7f25f9cf884d54d3a30fad979b29;hp=9d279ebfb9e48acdd797e9231f37d27cc39fa7df;hpb=ee1321d27bc39baab5bc2615834fd7392b79a160;p=csit.git

diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml
index 9d279ebfb9..4c83a30658 100644
--- a/resources/tools/presentation/specification.yaml
+++ b/resources/tools/presentation/specification.yaml
@@ -125,34 +125,42 @@
       - 31  # sel
       - 35  # sel
       # TODO: Add Data sources
-      # 1807
+      csit-vpp-perf-verify-1807-3n-hsw:
+      - 15  # NDRPDR sel
+      - 16  # NDRPDR sel
+
     vpp-compare-testbeds:
       # TODO: Add Data sources
-      csit-vpp-perf-1801-all:
-      - 124  # sel
-      - 127  # sel
-      - 128  # sel
-      - 141  # sel
-      - 142  # sel
-      - 143  # sel
-      - 145  # sel
-      - 146  # sel
-      - 162  # sel
-      - 163  # sel
-      - 167  # sel
-      - 172  # sel acl only
+      csit-vpp-perf-verify-1807-3n-hsw:
+      - 15  # NDRPDR sel
+      - 16  # NDRPDR sel
       # TODO: Add Data sources
-      csit-vpp-perf-1804-all:
-      - 21  # sel
-      - 22  # sel
-      - 23  # sel
-      - 24  # sel
-      - 27  # sel
-      - 28  # sel
-      - 29  # sel
-      - 30  # sel
-      - 31  # sel
-      - 35  # sel
+      csit-vpp-perf-verify-1807-3n-skx:
+      - 33  # NDRPDR sel
+      - 35  # NDRPDR sel
+      - 37  # NDRPDR sel
+      - 38  # NDRPDR sel
+      - 39  # NDRPDR sel
+      - 43  # NDRPDR sel
+      - 44  # NDRPDR sel
+      - 49  # NDRPDR sel
+      - 50  # NDRPDR sel
+
+    vpp-compare-testbeds-mrr:
+      # TODO: Add Data sources
+      csit-vpp-perf-verify-1807-3n-hsw:
+      - 9   # MRR sel
+      # TODO: Add Data sources
+      csit-vpp-perf-verify-1807-3n-skx:
+      - 28  # MRR sel
+      - 32  # MRR sel
+      - 36  # MRR sel
+      - 42  # MRR sel
+      - 47  # MRR sel
+      - 48  # MRR sel
+      - 51  # MRR sel
+      - 52  # MRR sel
+
     vpp-performance-changes-mrr:
       csit-vpp-perf-check-1801:
       - 3
@@ -177,144 +185,103 @@
       - 21  # mrr - sel
       - 22  # mrr - sel
       # TODO: Add Data sources
-      # 1807
+      csit-vpp-perf-verify-1807-3n-hsw:
+      - 9   # MRR sel
+
     vpp-perf-results-3n-hsw:
       # TODO: Add Data sources
-      csit-vpp-perf-1804-all:
-      - 19  # full
-      - 20  # full
-      - 25  # full
-      - 49  # full
+      csit-vpp-perf-verify-1807-3n-hsw:
+      - 11  # NDRPDR full 1
+
     vpp-perf-results-3n-skx:
-      # TODO: Add Data sources
-      csit-vpp-perf-1804-all:
-      - 19  # full
-      - 20  # full
-      - 25  # full
-      - 49  # full
+      csit-vpp-perf-verify-1807-3n-skx:
+      - 40  # NDRPDR full 1
+      - 41  # NDRPDR full 2
+
     vpp-perf-results-2n-skx:
       # TODO: Add Data sources
-      csit-vpp-perf-1804-all:
-      - 19  # full
-      - 20  # full
-      - 25  # full
-      - 49  # full
+      csit-vpp-perf-verify-1807-2n-skx:
+      - 32  # NDRPDR full
+
     vpp-mrr-results-3n-hsw:
-      # TODO: Add Data sources
-      csit-vpp-perf-check-1804:
-      - 5   # mrr - full
+      csit-vpp-perf-verify-1807-3n-hsw:
+      - 8   # MRR full
+
     vpp-mrr-results-3n-skx:
-      # TODO: Add Data sources
-      csit-vpp-perf-check-1804:
-      - 5   # mrr - full
+      # TODO: Replace with better results
+      csit-vpp-perf-verify-1807-3n-skx:
+      - 31  # MRR full
+
     vpp-mrr-results-2n-skx:
-      # TODO: Add Data sources
-      csit-vpp-perf-check-1804:
-      - 5   # mrr - full
+      csit-vpp-perf-verify-1807-2n-skx:
+      - 27  # MRR full
+
     plot-throughput-speedup-analysis-3n-hsw:
       # TODO: Add Data sources
-      csit-vpp-perf-1804-all:
-      - 19  # full
-      - 20  # full
-      - 25  # full
-      - 49  # full
-      - 21  # sel
-      - 22  # sel
-      - 23  # sel
-      - 24  # sel
-      - 27  # sel
-      - 28  # sel
-      - 29  # sel
-      - 30  # sel
-      - 31  # sel
-      - 35  # sel
+      csit-vpp-perf-verify-1807-3n-hsw:
+      - 15  # NDRPDR sel
+      - 16  # NDRPDR sel
+
     plot-throughput-speedup-analysis-3n-skx:
       # TODO: Add Data sources
-      csit-vpp-perf-1804-all:
-      - 19  # full
-      - 20  # full
-      - 25  # full
-      - 49  # full
-      - 21  # sel
-      - 22  # sel
-      - 23  # sel
-      - 24  # sel
-      - 27  # sel
-      - 28  # sel
-      - 29  # sel
-      - 30  # sel
-      - 31  # sel
-      - 35  # sel
+      csit-vpp-perf-verify-1807-3n-skx:
+      - 33  # NDRPDR sel
+      - 35  # NDRPDR sel
+      - 37  # NDRPDR sel
+      - 38  # NDRPDR sel
+      - 39  # NDRPDR sel
+      - 43  # NDRPDR sel
+      - 44  # NDRPDR sel
+      - 49  # NDRPDR sel
+      - 50  # NDRPDR sel
+
     plot-throughput-speedup-analysis-2n-skx:
-      # TODO: Add Data sources
-      csit-vpp-perf-1804-all:
-      - 19  # full
-      - 20  # full
-      - 25  # full
-      - 49  # full
-      - 21  # sel
-      - 22  # sel
-      - 23  # sel
-      - 24  # sel
-      - 27  # sel
-      - 28  # sel
-      - 29  # sel
-      - 30  # sel
-      - 31  # sel
-      - 35  # sel
+      csit-vpp-perf-verify-1807-2n-skx:
+      - 26  # NDRPDR sel
+      - 28  # NDRPDR sel
+      - 29  # NDRPDR sel
+      - 30  # NDRPDR sel
+      - 34  # NDRPDR sel
+      - 35  # NDRPDR sel
+      - 36  # NDRPDR sel
+      - 39  # NDRPDR sel
+      - 40  # NDRPDR sel
+      - 42  # NDRPDR sel
+
     plot-vpp-throughput-latency-3n-hsw:
       # TODO: Add Data sources
-      csit-vpp-perf-1804-all:
-      - 19  # full
-      - 20  # full
-      - 25  # full
-      - 49  # full
-      - 21  # sel
-      - 22  # sel
-      - 23  # sel
-      - 24  # sel
-      - 27  # sel
-      - 28  # sel
-      - 29  # sel
-      - 30  # sel
-      - 31  # sel
-      - 35  # sel
+      csit-vpp-perf-verify-1807-3n-hsw:
+      - 15  # NDRPDR sel
+      - 16  # NDRPDR sel
+
     plot-vpp-throughput-latency-3n-skx:
       # TODO: Add Data sources
-      csit-vpp-perf-1804-all:
-      - 19  # full
-      - 20  # full
-      - 25  # full
-      - 49  # full
-      - 21  # sel
-      - 22  # sel
-      - 23  # sel
-      - 24  # sel
-      - 27  # sel
-      - 28  # sel
-      - 29  # sel
-      - 30  # sel
-      - 31  # sel
-      - 35  # sel
+      csit-vpp-perf-verify-1807-3n-skx:
+      - 33  # NDRPDR sel
+      - 35  # NDRPDR sel
+      - 37  # NDRPDR sel
+      - 38  # NDRPDR sel
+      - 39  # NDRPDR sel
+      - 43  # NDRPDR sel
+      - 44  # NDRPDR sel
+      - 49  # NDRPDR sel
+      - 50  # NDRPDR sel
+
     plot-vpp-throughput-latency-2n-skx:
-      # TODO: Add Data sources
-      csit-vpp-perf-1804-all:
-      - 19  # full
-      - 20  # full
-      - 25  # full
-      - 49  # full
-      - 21  # sel
-      - 22  # sel
-      - 23  # sel
-      - 24  # sel
-      - 27  # sel
-      - 28  # sel
-      - 29  # sel
-      - 30  # sel
-      - 31  # sel
-      - 35  # sel
+      csit-vpp-perf-verify-1807-2n-skx:
+      - 26  # NDRPDR sel
+      - 28  # NDRPDR sel
+      - 29  # NDRPDR sel
+      - 30  # NDRPDR sel
+      - 34  # NDRPDR sel
+      - 35  # NDRPDR sel
+      - 36  # NDRPDR sel
+      - 39  # NDRPDR sel
+      - 40  # NDRPDR sel
+      - 42  # NDRPDR sel
+
     plot-vpp-http-server-performance:
-      # TODO: Add Data sources
+      # TODO: Add NEW Data sources
       csit-vpp-perf-1804-all:
       - 39  # wrk
       - 40  # wrk
@@ -332,6 +299,7 @@
       csit-vpp-functional-1807-ubuntu1604-virl:
       # TODO: Add Data sources
       - "lastSuccessfulBuild"
+
     vpp-func-results-centos:
       csit-vpp-functional-1807-centos7-virl:
       # TODO: Add Data sources
@@ -339,35 +307,19 @@
 
     # VPP Ligato
     ligato-perf-results-3n-hsw:
-      # TODO: Add Data sources
-      csit-ligato-perf-1804-all:
-      - 4  # full
+      # TODO: Replace with better results
+      csit-ligato-perf-1807-all:
+      - 3   # full ?
+
     plot-ligato-throughput-speedup-analysis-3n-hsw:
       # TODO: Add Data sources
-      csit-ligato-perf-1804-all:
-      - 5   # sel
-      - 6   # sel
-      - 7   # sel
-      - 8   # sel
-      - 9   # sel
-      - 10  # sel
-      - 11  # sel
-      - 12  # sel
-      - 13  # sel
-      - 14  # sel
+      csit-ligato-perf-1807-all:
+      - 4   # sel
+
     plot-ligato-throughput-latency-3n-hsw:
       # TODO: Add Data sources
-      csit-ligato-perf-1804-all:
-      - 5   # sel
-      - 6   # sel
-      - 7   # sel
-      - 8   # sel
-      - 9   # sel
-      - 10  # sel
-      - 11  # sel
-      - 12  # sel
-      - 13  # sel
-      - 14  # sel
+      csit-ligato-perf-1807-all:
+      - 4   # sel
 
     # DPDK Performance
     dpdk-performance-changes:
@@ -393,6 +345,7 @@
       - 21
       - 22
       - 23
+
     dpdk-compare-testbeds:
       csit-dpdk-perf-verify-1807-3n-skx:
       - 1
@@ -416,15 +369,19 @@
       - 21
       - 22
       - 23
+
     dpdk-perf-results-3n-hsw:
       csit-dpdk-perf-verify-1807-3n-hsw:
       - 12
+
     dpdk-perf-results-3n-skx:
       csit-dpdk-perf-verify-1807-3n-skx:
       - 12
+
     dpdk-perf-results-2n-skx:
       csit-dpdk-perf-verify-1807-2n-skx:
       - 10
+
     plot-dpdk-throughput-latency-3n-hsw:
       csit-dpdk-perf-verify-1807-3n-hsw:
       - 11
@@ -437,6 +394,7 @@
       - 21
       - 22
       - 23
+
     plot-dpdk-throughput-latency-3n-skx:
       csit-dpdk-perf-verify-1807-3n-skx:
       - 1
@@ -449,6 +407,7 @@
       - 10
       - 11
       - 12
+
     plot-dpdk-throughput-latency-2n-skx:
       csit-dpdk-perf-verify-1807-2n-skx:
       - 1
@@ -709,10 +668,6 @@
     - 167  # sel
     - 172  # sel acl only
     csit-vpp-perf-1804-all:
-    - 19  # full
-    - 20  # full
-    - 25  # full
-    - 49  # full
     - 21  # sel
     - 22  # sel
     - 23  # sel
@@ -734,12 +689,57 @@
     - 47  # wrk
     - 48  # wrk
     # TODO: Add Data sources
-#    csit-vpp-perf-verify-1807-3n-hsw:
-#    -
-#    csit-vpp-perf-verify-1807-3n-skx:
-#    -
-#    csit-vpp-perf-verify-1807-2n-skx:
-#    -
+    csit-vpp-perf-verify-1807-3n-hsw:
+    - 8   # MRR full
+    - 9   # MRR sel
+    - 11  # NDRPDR full 1
+    - 15  # NDRPDR sel
+    - 16  # NDRPDR sel
+    # TODO: Add Data sources
+    csit-vpp-perf-verify-1807-3n-skx:
+    - 31  # MRR full
+    - 28  # MRR sel
+    - 32  # MRR sel
+    - 36  # MRR sel
+    - 42  # MRR sel
+    - 47  # MRR sel
+    - 48  # MRR sel
+    - 51  # MRR sel
+    - 52  # MRR sel
+    - 40  # NDRPDR full 1
+    - 41  # NDRPDR full 2
+    - 33  # NDRPDR sel
+    - 35  # NDRPDR sel
+    - 37  # NDRPDR sel
+    - 38  # NDRPDR sel
+    - 39  # NDRPDR sel
+    - 43  # NDRPDR sel
+    - 44  # NDRPDR sel
+    - 49  # NDRPDR sel
+    - 50  # NDRPDR sel
+    csit-vpp-perf-verify-1807-2n-skx:
+    - 27  # MRR full
+    - 31  # MRR sel
+    - 33  # MRR sel
+    - 37  # MRR sel
+    - 38  # MRR sel
+    - 41  # MRR sel
+    - 43  # MRR sel
+    - 44  # MRR sel
+    - 45  # MRR sel
+    - 46  # MRR sel
+    - 47  # MRR sel
+    - 32  # NDRPDR full
+    - 26  # NDRPDR sel
+    - 28  # NDRPDR sel
+    - 29  # NDRPDR sel
+    - 30  # NDRPDR sel
+    - 34  # NDRPDR sel
+    - 35  # NDRPDR sel
+    - 36  # NDRPDR sel
+    - 39  # NDRPDR sel
+    - 40  # NDRPDR sel
+    - 42  # NDRPDR sel
     csit-vpp-perf-check-1801:
     - 3   # mrr
     - 4   # mrr
@@ -763,8 +763,6 @@
     - 20  # mrr - sel
     - 21  # mrr - sel
     - 22  # mrr - sel
-    # TODO: Add Data sources
-    # mrr 1807
     csit-ligato-perf-1804-all:
     - 4   # full
     - 5   # sel
@@ -778,8 +776,9 @@
     - 13  # sel
     - 14  # sel
     # TODO: Add Data sources
-#    csit-ligato-perf-1807-all:
-#    -
+    csit-ligato-perf-1807-all:
+    - 3   # full ?
+    - 4   # sel
     csit-dpdk-perf-1804-all:
     - 4
     - 5
@@ -843,8 +842,8 @@
   format:
     html:
     - full
-#    pdf:
-#    - minimal
+    pdf:
+    - minimal
 
 ################################################################################
 ###                               T A B L E S                                ###
@@ -892,17 +891,9 @@
     title: "rls1807"
     data:
       # TODO: Add Data sources
-      csit-vpp-perf-1804-all:
-      - 21  # sel
-      - 22  # sel
-      - 23  # sel
-      - 24  # sel
-      - 27  # sel
-      - 28  # sel
-      - 29  # sel
-      - 30  # sel
-      - 31  # sel
-      - 35  # sel
+      csit-vpp-perf-verify-1807-3n-hsw:
+      - 15  # NDRPDR sel
+      - 16  # NDRPDR sel
   data: "vpp-performance-changes"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -951,17 +942,9 @@
     title: "rls1807"
     data:
       # TODO: Add Data sources
-      csit-vpp-perf-1804-all:
-      - 21  # sel
-      - 22  # sel
-      - 23  # sel
-      - 24  # sel
-      - 27  # sel
-      - 28  # sel
-      - 29  # sel
-      - 30  # sel
-      - 31  # sel
-      - 35  # sel
+      csit-vpp-perf-verify-1807-3n-hsw:
+      - 15  # NDRPDR sel
+      - 16  # NDRPDR sel
   data: "vpp-performance-changes"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -1010,17 +993,9 @@
     title: "rls1807"
     data:
       # TODO: Add Data sources
-      csit-vpp-perf-1804-all:
-      - 21  # sel
-      - 22  # sel
-      - 23  # sel
-      - 24  # sel
-      - 27  # sel
-      - 28  # sel
-      - 29  # sel
-      - 30  # sel
-      - 31  # sel
-      - 35  # sel
+      csit-vpp-perf-verify-1807-3n-hsw:
+      - 15  # NDRPDR sel
+      - 16  # NDRPDR sel
   data: "vpp-performance-changes"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -1069,17 +1044,9 @@
     title: "rls1807"
     data:
       # TODO: Add Data sources
-      csit-vpp-perf-1804-all:
-      - 21  # sel
-      - 22  # sel
-      - 23  # sel
-      - 24  # sel
-      - 27  # sel
-      - 28  # sel
-      - 29  # sel
-      - 30  # sel
-      - 31  # sel
-      - 35  # sel
+      csit-vpp-perf-verify-1807-3n-hsw:
+      - 15  # NDRPDR sel
+      - 16  # NDRPDR sel
   data: "vpp-performance-changes"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -1097,37 +1064,26 @@
     title: "3-Node Hsw"
     data:
       # TODO: Add Data sources
-      csit-vpp-perf-1801-all:
-      - 124  # sel
-      - 127  # sel
-      - 128  # sel
-      - 141  # sel
-      - 142  # sel
-      - 143  # sel
-      - 145  # sel
-      - 146  # sel
-      - 162  # sel
-      - 163  # sel
-      - 167  # sel
-      - 172  # sel acl only
+      csit-vpp-perf-verify-1807-3n-hsw:
+      - 15  # NDRPDR sel
+      - 16  # NDRPDR sel
   compare:
     title: "3-Node Skx"
     data:
       # TODO: Add Data sources
-      csit-vpp-perf-1804-all:
-      - 21  # sel
-      - 22  # sel
-      - 23  # sel
-      - 24  # sel
-      - 27  # sel
-      - 28  # sel
-      - 29  # sel
-      - 30  # sel
-      - 31  # sel
-      - 35  # sel
+      csit-vpp-perf-verify-1807-3n-skx:
+      - 33  # NDRPDR sel
+      - 35  # NDRPDR sel
+      - 37  # NDRPDR sel
+      - 38  # NDRPDR sel
+      - 39  # NDRPDR sel
+      - 43  # NDRPDR sel
+      - 44  # NDRPDR sel
+      - 49  # NDRPDR sel
+      - 50  # NDRPDR sel
   data: "vpp-compare-testbeds"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'NIC_Intel-X710' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  filter: "'NIC_Intel-X710' and 'NDRPDR'"
   parameters:
   - "name"
   - "parent"
@@ -1142,37 +1098,26 @@
     title: "3-Node Hsw"
     data:
       # TODO: Add Data sources
-      csit-vpp-perf-1801-all:
-      - 124  # sel
-      - 127  # sel
-      - 128  # sel
-      - 141  # sel
-      - 142  # sel
-      - 143  # sel
-      - 145  # sel
-      - 146  # sel
-      - 162  # sel
-      - 163  # sel
-      - 167  # sel
-      - 172  # sel acl only
+      csit-vpp-perf-verify-1807-3n-hsw:
+      - 15  # NDRPDR sel
+      - 16  # NDRPDR sel
   compare:
     title: "3-Node Skx"
     data:
       # TODO: Add Data sources
-      csit-vpp-perf-1804-all:
-      - 21  # sel
-      - 22  # sel
-      - 23  # sel
-      - 24  # sel
-      - 27  # sel
-      - 28  # sel
-      - 29  # sel
-      - 30  # sel
-      - 31  # sel
-      - 35  # sel
+      csit-vpp-perf-verify-1807-3n-skx:
+      - 33  # NDRPDR sel
+      - 35  # NDRPDR sel
+      - 37  # NDRPDR sel
+      - 38  # NDRPDR sel
+      - 39  # NDRPDR sel
+      - 43  # NDRPDR sel
+      - 44  # NDRPDR sel
+      - 49  # NDRPDR sel
+      - 50  # NDRPDR sel
   data: "vpp-compare-testbeds"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'NIC_Intel-X710' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  filter: "'NIC_Intel-X710' and 'NDRPDR'"
   parameters:
   - "name"
   - "parent"
@@ -1216,17 +1161,8 @@
     title: "rls1807"
     data:
       # TODO: Add Data sources
-      csit-vpp-perf-check-1804:
-      - 6   # mrr - sel
-      - 13  # mrr - sel
-      - 14  # mrr - sel
-      - 15  # mrr - sel
-      - 16  # mrr - sel
-      - 17  # mrr - sel
-      - 19  # mrr - sel
-      - 20  # mrr - sel
-      - 21  # mrr - sel
-      - 22  # mrr - sel
+      csit-vpp-perf-verify-1807-3n-hsw:
+      - 9   # MRR sel
   data: "vpp-performance-changes-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -1273,17 +1209,8 @@
     title: "rls1807"
     data:
       # TODO: Add Data sources
-      csit-vpp-perf-check-1804:
-      - 6   # mrr - sel
-      - 13  # mrr - sel
-      - 14  # mrr - sel
-      - 15  # mrr - sel
-      - 16  # mrr - sel
-      - 17  # mrr - sel
-      - 19  # mrr - sel
-      - 20  # mrr - sel
-      - 21  # mrr - sel
-      - 22  # mrr - sel
+      csit-vpp-perf-verify-1807-3n-hsw:
+      - 9   # MRR sel
   data: "vpp-performance-changes-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -1330,17 +1257,8 @@
     title: "rls1807"
     data:
       # TODO: Add Data sources
-      csit-vpp-perf-check-1804:
-      - 6   # mrr - sel
-      - 13  # mrr - sel
-      - 14  # mrr - sel
-      - 15  # mrr - sel
-      - 16  # mrr - sel
-      - 17  # mrr - sel
-      - 19  # mrr - sel
-      - 20  # mrr - sel
-      - 21  # mrr - sel
-      - 22  # mrr - sel
+      csit-vpp-perf-verify-1807-3n-hsw:
+      - 9   # MRR sel
   data: "vpp-performance-changes-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'4T4C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -1349,6 +1267,38 @@
   - "parent"
   - "result"
 
+-
+  type: "table"
+  title: "VPP Comparison Across Testbeds 3n-hsw to 3n-skx mrr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-hsw-3n-skx-mrr"
+  reference:
+    title: "3-Node Hsw"
+    data:
+      # TODO: Add Data sources
+      csit-vpp-perf-verify-1807-3n-hsw:
+      - 9   # MRR sel
+  compare:
+    title: "3-Node Skx"
+    data:
+      # TODO: Add Data sources
+      csit-vpp-perf-verify-1807-3n-skx:
+      - 28  # MRR sel
+      - 32  # MRR sel
+      - 36  # MRR sel
+      - 42  # MRR sel
+      - 47  # MRR sel
+      - 48  # MRR sel
+      - 51  # MRR sel
+      - 52  # MRR sel
+  data: "vpp-compare-testbeds-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'NIC_Intel-X710' and 'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "result"
+
 -
   type: "table"
   title: "Detailed Test Results - VPP Performance Results 3n-hsw"
@@ -2054,6 +2004,47 @@
   - "parent"
   - "throughput"
 
+-
+  type: "table"
+  title: "DPDK Comparison Across Testbeds 3n-hsw to 3n-skx mrr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-compare-testbeds-3n-hsw-3n-skx-mrr"
+  reference:
+    title: "3-Node Hsw"
+    data:
+      csit-dpdk-perf-verify-1807-3n-hsw:
+      - 11
+      - 12  # full
+      - 14
+      - 15
+      - 16
+      - 17
+      - 20
+      - 21
+      - 22
+      - 23
+  compare:
+    title: "3-Node Skx"
+    data:
+      csit-dpdk-perf-verify-1807-3n-skx:
+      - 1
+      - 2
+      - 3
+      - 6
+      - 7
+      - 8
+      - 9
+      - 10
+      - 11
+      - 12
+  data: "dpdk-compare-testbeds"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'NIC_Intel-X710' and MRR" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+
 -
   type: "table"
   title: "Detailed Test Results - DPDK Performance Results 3n-hsw"
@@ -2670,9 +2661,9 @@
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -2696,9 +2687,9 @@
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -2722,9 +2713,9 @@
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -2748,9 +2739,9 @@
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -2775,9 +2766,9 @@
            '64B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
+           'NDRPDR' and
            '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -2802,9 +2793,9 @@
            '64B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -2829,9 +2820,9 @@
            '64B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -2856,9 +2847,9 @@
            '64B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -2883,9 +2874,9 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -2909,9 +2900,9 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -2935,9 +2926,9 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -2961,9 +2952,9 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -2988,9 +2979,9 @@
            '64B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
+           'NDRPDR' and
            '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -3015,9 +3006,9 @@
            '64B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -3042,9 +3033,9 @@
            '64B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -3069,9 +3060,9 @@
            '64B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -3096,9 +3087,9 @@
   filter: "'NIC_Intel-XL710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -3122,9 +3113,9 @@
   filter: "'NIC_Intel-XL710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -3148,9 +3139,9 @@
   filter: "'NIC_Intel-XL710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -3174,9 +3165,9 @@
   filter: "'NIC_Intel-XL710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -3201,9 +3192,9 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -3227,9 +3218,9 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -3253,9 +3244,9 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -3279,9 +3270,9 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -3306,9 +3297,9 @@
            '64B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -3333,9 +3324,9 @@
            '64B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -3360,9 +3351,9 @@
            '64B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
+           'NDRPDR' and
            '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -3387,9 +3378,9 @@
            '64B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -3414,9 +3405,9 @@
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -3440,9 +3431,9 @@
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -3466,9 +3457,9 @@
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -3492,9 +3483,9 @@
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -3519,9 +3510,9 @@
            '64B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -3546,9 +3537,9 @@
            '64B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -3573,9 +3564,9 @@
            '64B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
+           'NDRPDR' and
            '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -3600,9 +3591,9 @@
            '64B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -3627,9 +3618,9 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -3653,9 +3644,9 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -3679,9 +3670,9 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -3705,9 +3696,9 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -3721,20 +3712,20 @@
     title: ""  # No title
     layout: "plot-throughput"
 
+# Packet Throughput - VPP L2 2n-skx-xxv710
 -
   type: "plot"
-  title: "VPP Throughput: l2sw-2n-skx-x710-64b-2t1c-features-ndr"
+  title: "VPP Throughput: l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-x710-64b-2t1c-features-ndr"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
   data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
            '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -3750,18 +3741,17 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: l2sw-2n-skx-x710-64b-2t1c-features-pdr"
+  title: "VPP Throughput: l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-x710-64b-2t1c-features-pdr"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
   data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'PDRDISC' and not 'NDRDISC' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
            '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -3777,18 +3767,17 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: l2sw-2n-skx-x710-64b-4t2c-features-ndr"
+  title: "VPP Throughput: l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-x710-64b-4t2c-features-ndr"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
   data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
            '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -3804,18 +3793,17 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: l2sw-2n-skx-x710-64b-4t2c-features-pdr"
+  title: "VPP Throughput: l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-x710-64b-4t2c-features-pdr"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
   data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'PDRDISC' and not 'NDRDISC' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
            '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -3829,22 +3817,24 @@
     title: ""  # No title
     layout: "plot-throughput"
 
-# Packet Throughput - VPP L2 2n-skx-xxv710
+################################################################################
+
+# Packet Throughput - VPP Container Memif 3n-hsw-x520
 -
   type: "plot"
-  title: "VPP Throughput: l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
+  title: "VPP Throughput: memif-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'NDRPDR' and
+           '1T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           not 'MEMIF'"
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
@@ -3858,19 +3848,19 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
+  title: "VPP Throughput: memif-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'NDRPDR' and
+           '1T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           not 'MEMIF'"
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
@@ -3884,19 +3874,19 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
+  title: "VPP Throughput: memif-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'NDRPDR' and
+           '2T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           not 'MEMIF'"
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
@@ -3910,19 +3900,19 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
+  title: "VPP Throughput: memif-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'NDRPDR' and
+           '2T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           not 'MEMIF'"
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
@@ -3934,22 +3924,22 @@
     title: ""  # No title
     layout: "plot-throughput"
 
+# Packet Throughput - VPP Container Memif 3n-hsw-x710
 -
   type: "plot"
-  title: "VPP Throughput: l2sw-2n-skx-xxv710-64b-2t1c-features-ndr"
+  title: "VPP Throughput: memif-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-xxv710-64b-2t1c-features-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
+           '1T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           not 'MEMIF'"
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
@@ -3963,20 +3953,19 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: l2sw-2n-skx-xxv710-64b-2t1c-features-pdr"
+  title: "VPP Throughput: memif-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-xxv710-64b-2t1c-features-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'PDRDISC' and not 'NDRDISC' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
+           '1T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           not 'MEMIF'"
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
@@ -3990,20 +3979,19 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: l2sw-2n-skx-xxv710-64b-4t2c-features-ndr"
+  title: "VPP Throughput: memif-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-xxv710-64b-4t2c-features-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
+           '2T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           not 'MEMIF'"
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
@@ -4017,20 +4005,19 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: l2sw-2n-skx-xxv710-64b-4t2c-features-pdr"
+  title: "VPP Throughput: memif-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-xxv710-64b-4t2c-features-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'PDRDISC' and not 'NDRDISC' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
+           '2T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           not 'MEMIF'"
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
@@ -4042,22 +4029,20 @@
     title: ""  # No title
     layout: "plot-throughput"
 
-################################################################################
-
-# Packet Throughput - VPP Container Memif 3n-hsw-x520
+# Packet Throughput - VPP Container Memif 3n-hsw-xl710
 -
   type: "plot"
-  title: "VPP Throughput: memif-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
+  title: "VPP Throughput: memif-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  filter: "'NIC_Intel-XL710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
@@ -4073,17 +4058,17 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: memif-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
+  title: "VPP Throughput: memif-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  filter: "'NIC_Intel-XL710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
@@ -4099,17 +4084,17 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: memif-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
+  title: "VPP Throughput: memif-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  filter: "'NIC_Intel-XL710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
@@ -4125,17 +4110,17 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: memif-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
+  title: "VPP Throughput: memif-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  filter: "'NIC_Intel-XL710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
@@ -4149,20 +4134,20 @@
     title: ""  # No title
     layout: "plot-throughput"
 
-# Packet Throughput - VPP Container Memif 3n-hsw-x710
+# Packet Throughput - VPP Container Memif 3n-skx-x710
 -
   type: "plot"
-  title: "VPP Throughput: memif-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
+  title: "VPP Throughput: memif-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'NDRPDR' and
+           '2T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
@@ -4178,19 +4163,19 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: memif-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
+  title: "VPP Throughput: memif-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'NDRPDR' and
+           '2T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           'MEMIF'"
+            'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
@@ -4204,17 +4189,17 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: memif-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+  title: "VPP Throughput: memif-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'NDRPDR' and
+           '4T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
@@ -4230,17 +4215,17 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: memif-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
+  title: "VPP Throughput: memif-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'NDRPDR' and
+           '4T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
@@ -4254,20 +4239,22 @@
     title: ""  # No title
     layout: "plot-throughput"
 
-# Packet Throughput - VPP Container Memif 3n-hsw-xl710
+################################################################################
+
+# Packet Throughput - VPP Container Orchestrated Memif 3n-hsw-x520
 -
   type: "plot"
-  title: "VPP Throughput: memif-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
+  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
+  data: "plot-ligato-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
@@ -4283,17 +4270,17 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: memif-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
+  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
+  data: "plot-ligato-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
@@ -4309,17 +4296,17 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: memif-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
+  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
+  data: "plot-ligato-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
@@ -4335,17 +4322,17 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: memif-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
+  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
+  data: "plot-ligato-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
@@ -4359,20 +4346,20 @@
     title: ""  # No title
     layout: "plot-throughput"
 
-# Packet Throughput - VPP Container Memif 3n-skx-x710
+# Packet Throughput - VPP Container Orchestrated Memif 3n-hsw-x710
 -
   type: "plot"
-  title: "VPP Throughput: memif-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
+  data: "plot-ligato-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'NDRPDR' and
+           '1T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
@@ -4388,19 +4375,19 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: memif-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
+  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
+  data: "plot-ligato-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'NDRPDR' and
+           '1T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-            'MEMIF'"
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
@@ -4414,17 +4401,17 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: memif-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
+  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+  data: "plot-ligato-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'NDRPDR' and
+           '2T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
@@ -4440,17 +4427,17 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: memif-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
+  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
+  data: "plot-ligato-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'NDRPDR' and
+           '2T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
@@ -4464,22 +4451,24 @@
     title: ""  # No title
     layout: "plot-throughput"
 
-# Packet Throughput - VPP Container Memif 3n-skx-xxv710
+################################################################################
+
+# Packet Throughput - VPP IPv4 3n-hsw-x520
 -
   type: "plot"
-  title: "VPP Throughput: memif-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
+  title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           not 'VHOST' and
-           'MEMIF'"
+           'NDRPDR' and
+           '1T1C' and
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
@@ -4493,19 +4482,19 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: memif-3n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
+  title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           not 'VHOST' and
-           'MEMIF'"
+           'NDRPDR' and
+           '1T1C' and
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
@@ -4519,19 +4508,19 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: memif-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
+  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           not 'VHOST' and
-           'MEMIF'"
+           'NDRPDR' and
+           '2T2C' and
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
@@ -4545,19 +4534,19 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: memif-3n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
+  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           not 'VHOST' and
-           'MEMIF'"
+           'NDRPDR' and
+           '2T2C' and
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
@@ -4569,22 +4558,22 @@
     title: ""  # No title
     layout: "plot-throughput"
 
-# Packet Throughput - VPP Container Memif 2n-skx-x710
 -
   type: "plot"
-  title: "VPP Throughput: memif-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
+  title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRDISC' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           not 'VHOST' and
-           'MEMIF'"
+           'FEATURE' and
+           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           'NDRPDR' and
+           '1T1C' and
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
@@ -4598,19 +4587,20 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: memif-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
+  title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           not 'VHOST' and
-           'MEMIF'"
+           'FEATURE' and
+           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           'NDRPDR' and
+           '1T1C' and
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
@@ -4624,19 +4614,20 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: memif-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
+  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRDISC' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           not 'VHOST' and
-           'MEMIF'"
+           'FEATURE' and
+           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           'NDRPDR' and
+           '2T2C' and
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
@@ -4650,895 +4641,19 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: memif-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
+  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP Container Memif 2n-skx-xxv710
--
-  type: "plot"
-  title: "VPP Throughput: memif-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRDISC' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: memif-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: memif-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRDISC' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: memif-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput"
-
-################################################################################
-
-# Packet Throughput - VPP Container Orchestrated Memif 3n-hsw-x520
--
-  type: "plot"
-  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
-  data: "plot-ligato-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRDISC' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
-  data: "plot-ligato-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
-  data: "plot-ligato-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRDISC' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
-  data: "plot-ligato-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP Container Orchestrated Memif 3n-hsw-x710
--
-  type: "plot"
-  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
-  data: "plot-ligato-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRDISC' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
-  data: "plot-ligato-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
-  data: "plot-ligato-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRDISC' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
-  data: "plot-ligato-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput"
-
-################################################################################
-
-# Packet Throughput - VPP IPv4 3n-hsw-x520
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRDISC' and
-           '1T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and 
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
-           '1T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and 
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRDISC' and
-           '2T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and 
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
-           '2T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and 
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
-           '1T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and 
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-features-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'PDRDISC' and not 'NDRDISC' and
-           '1T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and 
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
-           '2T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and 
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-features-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'PDRDISC' and not 'NDRDISC' and
-           '2T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and 
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP IPv4 3n-hsw-x710
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRDISC' and
-           '1T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and 
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
-           '1T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and 
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRDISC' and
-           '2T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and 
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
-           '2T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and 
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
-           '1T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and 
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-features-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'PDRDISC' and not 'NDRDISC' and
-           '1T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and 
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
-           '2T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and 
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-features-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'PDRDISC' and not 'NDRDISC' and
-           '2T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and 
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP IPv4 3n-hsw-xl710
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRDISC' and
-           '1T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and 
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
-           '1T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and 
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRDISC' and
-           '2T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and 
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
-           '2T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and 
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP IPv4 3n-skx-x710
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRDISC' and
-           '2T1C' and
+           'FEATURE' and
+           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           'NDRPDR' and
+           '2T2C' and
            'IP4FWD' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -5551,20 +4666,21 @@
     title: ""  # No title
     layout: "plot-throughput"
 
+# Packet Throughput - VPP IPv4 3n-hsw-x710
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
+  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
-           '2T1C' and
+           'NDRPDR' and
+           '1T1C' and
            'IP4FWD' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -5579,18 +4695,18 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
+  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
-           '4T2C' and
+           'NDRPDR' and
+           '1T1C' and
            'IP4FWD' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -5605,18 +4721,18 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
+  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
-           '4T2C' and
+           'NDRPDR' and
+           '2T2C' and
            'IP4FWD' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -5631,19 +4747,18 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-ndr"
+  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
-           '2T1C' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
+           '2T2C' and
            'IP4FWD' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -5658,19 +4773,19 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-pdr"
+  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'PDRDISC' and not 'NDRDISC' and
-           '2T1C' and
+           'NDRPDR' and
+           '1T1C' and
            'IP4FWD' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -5685,19 +4800,19 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-ndr"
+  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
-           '4T2C' and
+           'NDRPDR' and
+           '1T1C' and
            'IP4FWD' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -5712,205 +4827,19 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-pdr"
+  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'PDRDISC' and not 'NDRDISC' and
-           '4T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and 
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP IPv4 3n-skx-xxv710
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRDISC' and
-           '2T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and 
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
-           '2T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and 
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRDISC' and
-           '4T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and 
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
-           '4T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and 
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-xxv710-64b-2t1c-features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-xxv710-64b-2t1c-features-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
-           '2T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and 
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-xxv710-64b-2t1c-features-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-xxv710-64b-2t1c-features-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'PDRDISC' and not 'NDRDISC' and
-           '2T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and 
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-xxv710-64b-4t2c-features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-xxv710-64b-4t2c-features-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
-           '4T2C' and
+           'NDRPDR' and
+           '2T2C' and
            'IP4FWD' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -5925,19 +4854,19 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-xxv710-64b-4t2c-features-pdr"
+  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-xxv710-64b-4t2c-features-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'PDRDISC' and not 'NDRDISC' and
-           '4T2C' and
+           'NDRPDR' and
+           '2T2C' and
            'IP4FWD' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -5950,21 +4879,21 @@
     title: ""  # No title
     layout: "plot-throughput"
 
-# Packet Throughput - VPP IPv4 2n-skx-x710
+# Packet Throughput - VPP IPv4 3n-hsw-xl710
 -
   type: "plot"
-  title: "VPP Throughput: ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
+  title: "VPP Throughput: ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
-           '2T1C' and
+           'NDRPDR' and
+           '1T1C' and
            'IP4FWD' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -5979,18 +4908,18 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
+  title: "VPP Throughput: ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
-           '2T1C' and
+           'NDRPDR' and
+           '1T1C' and
            'IP4FWD' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -6005,18 +4934,18 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
+  title: "VPP Throughput: ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
-           '4T2C' and
+           'NDRPDR' and
+           '2T2C' and
            'IP4FWD' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -6031,18 +4960,18 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
+  title: "VPP Throughput: ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
-           '4T2C' and
+           'NDRPDR' and
+           '2T2C' and
            'IP4FWD' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -6055,21 +4984,21 @@
     title: ""  # No title
     layout: "plot-throughput"
 
+# Packet Throughput - VPP IPv4 3n-skx-x710
 -
   type: "plot"
-  title: "VPP Throughput: ip4-2n-skx-x710-64b-2t1c-features-ndr"
+  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-2t1c-features-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
            '2T1C' and
            'IP4FWD' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -6084,19 +5013,18 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-2n-skx-x710-64b-2t1c-features-pdr"
+  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-2t1c-features-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'PDRDISC' and not 'NDRDISC' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
            '2T1C' and
            'IP4FWD' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -6111,19 +5039,18 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-2n-skx-x710-64b-4t2c-features-ndr"
+  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-4t2c-features-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
            '4T2C' and
            'IP4FWD' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -6138,19 +5065,18 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-2n-skx-x710-64b-4t2c-features-pdr"
+  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-4t2c-features-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'PDRDISC' and not 'NDRDISC' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
            '4T2C' and
            'IP4FWD' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -6163,21 +5089,21 @@
     title: ""  # No title
     layout: "plot-throughput"
 
-# Packet Throughput - VPP IPv4 2n-skx-xxv710
 -
   type: "plot"
-  title: "VPP Throughput: ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
+  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-ndr"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'FEATURE' and
+           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           'NDRPDR' and
            '2T1C' and
            'IP4FWD' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -6192,18 +5118,19 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
+  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-pdr"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
+           'FEATURE' and
+           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           'NDRPDR' and
            '2T1C' and
            'IP4FWD' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -6218,18 +5145,19 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
+  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-ndr"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'FEATURE' and
+           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           'NDRPDR' and
            '4T2C' and
            'IP4FWD' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -6244,18 +5172,19 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
+  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-pdr"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
+           'FEATURE' and
+           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           'NDRPDR' and
            '4T2C' and
            'IP4FWD' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -6268,21 +5197,21 @@
     title: ""  # No title
     layout: "plot-throughput"
 
+# Packet Throughput - VPP IPv4 3n-skx-xxv710
 -
   type: "plot"
-  title: "VPP Throughput: ip4-2n-skx-xxv710-64b-2t1c-features-ndr"
+  title: "VPP Throughput: ip4-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-2t1c-features-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
            '2T1C' and
            'IP4FWD' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -6297,19 +5226,18 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-2n-skx-xxv710-64b-2t1c-features-pdr"
+  title: "VPP Throughput: ip4-3n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-2t1c-features-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'PDRDISC' and not 'NDRDISC' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
            '2T1C' and
            'IP4FWD' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -6324,19 +5252,18 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-2n-skx-xxv710-64b-4t2c-features-ndr"
+  title: "VPP Throughput: ip4-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-4t2c-features-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
            '4T2C' and
            'IP4FWD' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -6351,19 +5278,18 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-2n-skx-xxv710-64b-4t2c-features-pdr"
+  title: "VPP Throughput: ip4-3n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-4t2c-features-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'PDRDISC' and not 'NDRDISC' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
            '4T2C' and
            'IP4FWD' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -6376,24 +5302,22 @@
     title: ""  # No title
     layout: "plot-throughput"
 
-################################################################################
-
-# Packet Throughput - VPP IPv4 tunnels 3n-hsw-x520
 -
   type: "plot"
-  title: "VPP Throughput: ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
+  title: "VPP Throughput: ip4-3n-skx-xxv710-64b-2t1c-features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-xxv710-64b-2t1c-features-ndr"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
-           'ENCAP' and
-           'NDRDISC' and
-           '1T1C' and
-           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           'FEATURE' and
+           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           'NDRPDR' and
+           '2T1C' and
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
@@ -6407,19 +5331,20 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
+  title: "VPP Throughput: ip4-3n-skx-xxv710-64b-2t1c-features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-xxv710-64b-2t1c-features-pdr"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
-           'ENCAP' and
-           'PDRDISC' and not 'NDRDISC' and
-           '1T1C' and
-           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           'FEATURE' and
+           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           'NDRPDR' and
+           '2T1C' and
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
@@ -6433,19 +5358,20 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
+  title: "VPP Throughput: ip4-3n-skx-xxv710-64b-4t2c-features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-xxv710-64b-4t2c-features-ndr"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
-           'ENCAP' and
-           'NDRDISC' and
-           '2T2C' and
-           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           'FEATURE' and
+           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           'NDRPDR' and
+           '4T2C' and
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
@@ -6459,19 +5385,20 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
+  title: "VPP Throughput: ip4-3n-skx-xxv710-64b-4t2c-features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-xxv710-64b-4t2c-features-pdr"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
-           'ENCAP' and
-           'PDRDISC' and not 'NDRDISC' and
-           '2T2C' and
-           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           'FEATURE' and
+           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           'NDRPDR' and
+           '4T2C' and
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
@@ -6483,22 +5410,22 @@
     title: ""  # No title
     layout: "plot-throughput"
 
-# Packet Throughput - VPP IPv4 tunnels 3n-hsw-x710
+# Packet Throughput - VPP IPv4 2n-skx-x710
 -
   type: "plot"
-  title: "VPP Throughput: ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
+  title: "VPP Throughput: ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           'ENCAP' and
-           'NDRDISC' and
-           '1T1C' and
-           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
+           '2T1C' and
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
@@ -6512,19 +5439,19 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
+  title: "VPP Throughput: ip4-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           'ENCAP' and
-           'PDRDISC' and not 'NDRDISC' and
-           '1T1C' and
-           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
+           '2T1C' and
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
@@ -6538,19 +5465,19 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+  title: "VPP Throughput: ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           'ENCAP' and
-           'NDRDISC' and
-           '2T2C' and
-           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
+           '4T2C' and
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
@@ -6564,19 +5491,19 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
+  title: "VPP Throughput: ip4-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           'ENCAP' and
-           'PDRDISC' and not 'NDRDISC' and
-           '2T2C' and
-           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
+           '4T2C' and
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
@@ -6588,22 +5515,22 @@
     title: ""  # No title
     layout: "plot-throughput"
 
-# Packet Throughput - VPP IPv4 tunnels 3n-skx-x710
+# Packet Throughput - VPP IPv4 2n-skx-xxv710
 -
   type: "plot"
-  title: "VPP Throughput: ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+  title: "VPP Throughput: ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
-           'ENCAP' and
-           'NDRDISC' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
            '2T1C' and
-           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
@@ -6617,19 +5544,19 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
+  title: "VPP Throughput: ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
-           'ENCAP' and
-           'PDRDISC' and not 'NDRDISC' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
            '2T1C' and
-           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
@@ -6643,19 +5570,19 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
+  title: "VPP Throughput: ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
-           'ENCAP' and
-           'NDRDISC' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
            '4T2C' and
-           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
@@ -6669,19 +5596,19 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
+  title: "VPP Throughput: ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
-           'ENCAP' and
-           'PDRDISC' and not 'NDRDISC' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
            '4T2C' and
-           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
@@ -6693,19 +5620,21 @@
     title: ""  # No title
     layout: "plot-throughput"
 
-# Packet Throughput - VPP IPv4 tunnels 3n-skx-xxv710
+################################################################################
+
+# Packet Throughput - VPP IPv4 tunnels 3n-hsw-x520
 -
   type: "plot"
-  title: "VPP Throughput: ip4tun-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
+  title: "VPP Throughput: ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'ENCAP' and
-           'NDRDISC' and
-           '2T1C' and
+           'NDRPDR' and
+           '1T1C' and
            ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
            not 'VHOST' and
            not 'IPSECHW'"
@@ -6722,16 +5651,16 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4tun-3n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
+  title: "VPP Throughput: ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'ENCAP' and
-           'PDRDISC' and not 'NDRDISC' and
-           '2T1C' and
+           'NDRPDR' and
+           '1T1C' and
            ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
            not 'VHOST' and
            not 'IPSECHW'"
@@ -6748,16 +5677,16 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4tun-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
+  title: "VPP Throughput: ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'ENCAP' and
-           'NDRDISC' and
-           '4T2C' and
+           'NDRPDR' and
+           '2T2C' and
            ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
            not 'VHOST' and
            not 'IPSECHW'"
@@ -6774,16 +5703,16 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4tun-3n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
+  title: "VPP Throughput: ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'ENCAP' and
-           'PDRDISC' and not 'NDRDISC' and
-           '4T2C' and
+           'NDRPDR' and
+           '2T2C' and
            ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
            not 'VHOST' and
            not 'IPSECHW'"
@@ -6798,19 +5727,19 @@
     title: ""  # No title
     layout: "plot-throughput"
 
-# Packet Throughput - VPP IPv4 tunnels 2n-skx-x710
+# Packet Throughput - VPP IPv4 tunnels 3n-hsw-x710
 -
   type: "plot"
-  title: "VPP Throughput: ip4tun-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
+  title: "VPP Throughput: ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
-           'NDRDISC' and
-           '2T1C' and
+           'NDRPDR' and
+           '1T1C' and
            ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
            not 'VHOST' and
            not 'IPSECHW'"
@@ -6827,16 +5756,16 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4tun-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
+  title: "VPP Throughput: ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
-           'PDRDISC' and not 'NDRDISC' and
-           '2T1C' and
+           'NDRPDR' and
+           '1T1C' and
            ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
            not 'VHOST' and
            not 'IPSECHW'"
@@ -6853,16 +5782,16 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4tun-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
+  title: "VPP Throughput: ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
-           'NDRDISC' and
-           '4T2C' and
+           'NDRPDR' and
+           '2T2C' and
            ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
            not 'VHOST' and
            not 'IPSECHW'"
@@ -6879,16 +5808,16 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4tun-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
+  title: "VPP Throughput: ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
-           'PDRDISC' and not 'NDRDISC' and
-           '4T2C' and
+           'NDRPDR' and
+           '2T2C' and
            ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
            not 'VHOST' and
            not 'IPSECHW'"
@@ -6903,18 +5832,18 @@
     title: ""  # No title
     layout: "plot-throughput"
 
-# Packet Throughput - VPP IPv4 tunnels 2n-skx-xxv710
+# Packet Throughput - VPP IPv4 tunnels 3n-skx-x710
 -
   type: "plot"
-  title: "VPP Throughput: ip4tun-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
+  title: "VPP Throughput: ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T1C' and
            ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
            not 'VHOST' and
@@ -6932,15 +5861,15 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4tun-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
+  title: "VPP Throughput: ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            '2T1C' and
            ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
            not 'VHOST' and
@@ -6958,15 +5887,15 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4tun-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
+  title: "VPP Throughput: ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
-           'NDRDISC' and
+           'NDRPDR' and
            '4T2C' and
            ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
            not 'VHOST' and
@@ -6984,15 +5913,15 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4tun-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
+  title: "VPP Throughput: ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            '4T2C' and
            ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
            not 'VHOST' and
@@ -7021,11 +5950,11 @@
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            '1T1C' and
            'IP6FWD' and
            not 'SRv6' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -7048,11 +5977,11 @@
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
            ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            '1T1C' and
            'IP6FWD' and
            not 'SRv6' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -7075,11 +6004,11 @@
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T2C' and
            'IP6FWD' and
            not 'SRv6' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -7102,11 +6031,11 @@
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
            ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            '2T2C' and
            'IP6FWD' and
            not 'SRv6' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -7130,11 +6059,11 @@
            '78B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
+           'NDRPDR' and
            '1T1C' and
            'IP6FWD' and
            not 'SRv6' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -7158,11 +6087,11 @@
            '78B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            '1T1C' and
            'IP6FWD' and
            not 'SRv6' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -7186,11 +6115,11 @@
            '78B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T2C' and
            not 'SRv6' and
            'IP6FWD' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -7214,11 +6143,11 @@
            '78B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            '2T2C' and
            'IP6FWD' and
            not 'SRv6' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -7242,11 +6171,11 @@
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            '1T1C' and
            'IP6FWD' and
            not 'SRv6' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -7269,11 +6198,11 @@
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            '1T1C' and
            'IP6FWD' and
            not 'SRv6' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -7296,11 +6225,11 @@
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T2C' and
            'IP6FWD' and
            not 'SRv6' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -7323,11 +6252,11 @@
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            '2T2C' and
            'IP6FWD' and
            not 'SRv6' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -7351,11 +6280,11 @@
            '78B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
+           'NDRPDR' and
            '1T1C' and
            'IP6FWD' and
            not 'SRv6' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -7379,11 +6308,11 @@
            '78B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            '1T1C' and
            'IP6FWD' and
            not 'SRv6' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -7407,11 +6336,11 @@
            '78B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T2C' and
            'IP6FWD' and
            not 'SRv6' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -7435,11 +6364,11 @@
            '78B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            '2T2C' and
            'IP6FWD' and
            not 'SRv6' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -7463,11 +6392,11 @@
   filter: "'NIC_Intel-XL710' and
            '78B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            '1T1C' and
            'IP6FWD' and
            not 'SRv6' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -7490,11 +6419,11 @@
   filter: "'NIC_Intel-XL710' and
            '78B' and
            ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            '1T1C' and
            'IP6FWD' and
            not 'SRv6' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -7517,11 +6446,11 @@
   filter: "'NIC_Intel-XL710' and
            '78B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T2C' and
            'IP6FWD' and
            not 'SRv6' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -7544,11 +6473,11 @@
   filter: "'NIC_Intel-XL710' and
            '78B' and
            ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            '2T2C' and
            'IP6FWD' and
            not 'SRv6' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -7572,11 +6501,11 @@
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T1C' and
            'IP6FWD' and
            not 'SRv6' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -7599,11 +6528,11 @@
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            '2T1C' and
            'IP6FWD' and
            not 'SRv6' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -7626,11 +6555,11 @@
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            '4T2C' and
            'IP6FWD' and
            not 'SRv6' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -7653,11 +6582,11 @@
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            '4T2C' and
            'IP6FWD' and
            not 'SRv6' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -7681,11 +6610,11 @@
            '78B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T1C' and
            'IP6FWD' and
            not 'SRv6' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -7709,232 +6638,11 @@
            '78B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'PDRDISC' and not 'NDRDISC' and
-           '2T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and 
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: ip6-3n-skx-x710-78b-4t2c-features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-4t2c-features-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
-           '4T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and 
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: ip6-3n-skx-x710-78b-4t2c-features-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-4t2c-features-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'PDRDISC' and not 'NDRDISC' and
-           '4T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and 
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP IPv6 3n-skx-xxv710
--
-  type: "plot"
-  title: "VPP Throughput: ip6-3n-skx-xxv710-78b-2t1c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-xxv710-78b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '78B' and
-           ('BASE' or 'SCALE') and
-           'NDRDISC' and
-           '2T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and 
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: ip6-3n-skx-xxv710-78b-2t1c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-xxv710-78b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '78B' and
-           ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
-           '2T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and 
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: ip6-3n-skx-xxv710-78b-4t2c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-xxv710-78b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '78B' and
-           ('BASE' or 'SCALE') and
-           'NDRDISC' and
-           '4T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and 
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: ip6-3n-skx-xxv710-78b-4t2c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-xxv710-78b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '78B' and
-           ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
-           '4T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and 
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: ip6-3n-skx-xxv710-78b-2t1c-features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-xxv710-78b-2t1c-features-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '78B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
-           '2T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and 
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: ip6-3n-skx-xxv710-78b-2t1c-features-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-xxv710-78b-2t1c-features-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '78B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            '2T1C' and
            'IP6FWD' and
            not 'SRv6' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -7949,20 +6657,20 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-skx-xxv710-78b-4t2c-features-ndr"
+  title: "VPP Throughput: ip6-3n-skx-x710-78b-4t2c-features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-xxv710-78b-4t2c-features-ndr"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-4t2c-features-ndr"
   data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  filter: "'NIC_Intel-X710' and
            '78B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
+           'NDRPDR' and
            '4T2C' and
            'IP6FWD' and
            not 'SRv6' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -7977,20 +6685,20 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-skx-xxv710-78b-4t2c-features-pdr"
+  title: "VPP Throughput: ip6-3n-skx-x710-78b-4t2c-features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-xxv710-78b-4t2c-features-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-4t2c-features-pdr"
   data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  filter: "'NIC_Intel-X710' and
            '78B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            '4T2C' and
            'IP6FWD' and
            not 'SRv6' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -8003,22 +6711,22 @@
     title: ""  # No title
     layout: "plot-throughput"
 
-# Packet Throughput - VPP IPv6 2n-skx-x710
+# Packet Throughput - VPP IPv6 3n-skx-xxv710
 -
   type: "plot"
-  title: "VPP Throughput: ip6-2n-skx-x710-78b-2t1c-base_and_scale-ndr"
+  title: "VPP Throughput: ip6-3n-skx-xxv710-78b-2t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-xxv710-78b-2t1c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '78B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T1C' and
            'IP6FWD' and
            not 'SRv6' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -8033,18 +6741,19 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-2n-skx-x710-78b-2t1c-base_and_scale-pdr"
+  title: "VPP Throughput: ip6-3n-skx-xxv710-78b-2t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-xxv710-78b-2t1c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '78B' and
            ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            '2T1C' and
            'IP6FWD' and
-           not 'IPSEC' and 
+           not 'SRv6' and
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -8059,19 +6768,19 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-2n-skx-x710-78b-4t2c-base_and_scale-ndr"
+  title: "VPP Throughput: ip6-3n-skx-xxv710-78b-4t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-xxv710-78b-4t2c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '78B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            '4T2C' and
            'IP6FWD' and
            not 'SRv6' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -8086,19 +6795,19 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-2n-skx-x710-78b-4t2c-base_and_scale-pdr"
+  title: "VPP Throughput: ip6-3n-skx-xxv710-78b-4t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-xxv710-78b-4t2c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '78B' and
            ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            '4T2C' and
            'IP6FWD' and
            not 'SRv6' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -8113,20 +6822,20 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-2n-skx-x710-78b-2t1c-features-ndr"
+  title: "VPP Throughput: ip6-3n-skx-xxv710-78b-2t1c-features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-2t1c-features-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-xxv710-78b-2t1c-features-ndr"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '78B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T1C' and
            'IP6FWD' and
            not 'SRv6' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -8141,20 +6850,20 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-2n-skx-x710-78b-2t1c-features-pdr"
+  title: "VPP Throughput: ip6-3n-skx-xxv710-78b-2t1c-features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-2t1c-features-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-xxv710-78b-2t1c-features-pdr"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '78B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            '2T1C' and
            'IP6FWD' and
            not 'SRv6' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -8169,20 +6878,20 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-2n-skx-x710-78b-4t2c-features-ndr"
+  title: "VPP Throughput: ip6-3n-skx-xxv710-78b-4t2c-features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-4t2c-features-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-xxv710-78b-4t2c-features-ndr"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '78B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
+           'NDRPDR' and
            '4T2C' and
            'IP6FWD' and
            not 'SRv6' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -8197,20 +6906,20 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-2n-skx-x710-78b-4t2c-features-pdr"
+  title: "VPP Throughput: ip6-3n-skx-xxv710-78b-4t2c-features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-4t2c-features-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-xxv710-78b-4t2c-features-pdr"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '78B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            '4T2C' and
            'IP6FWD' and
            not 'SRv6' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -8223,22 +6932,22 @@
     title: ""  # No title
     layout: "plot-throughput"
 
-# Packet Throughput - VPP IPv6 2n-skx-xxv710
+# Packet Throughput - VPP IPv6 2n-skx-x710
 -
   type: "plot"
-  title: "VPP Throughput: ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr"
+  title: "VPP Throughput: ip6-2n-skx-x710-78b-2t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-2t1c-base_and_scale-ndr"
   data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  filter: "'NIC_Intel-X710' and
            '78B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T1C' and
            'IP6FWD' and
            not 'SRv6' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -8253,19 +6962,18 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-pdr"
+  title: "VPP Throughput: ip6-2n-skx-x710-78b-2t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-2t1c-base_and_scale-pdr"
   data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  filter: "'NIC_Intel-X710' and
            '78B' and
            ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            '2T1C' and
            'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -8280,19 +6988,19 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr"
+  title: "VPP Throughput: ip6-2n-skx-x710-78b-4t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-4t2c-base_and_scale-ndr"
   data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  filter: "'NIC_Intel-X710' and
            '78B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            '4T2C' and
            'IP6FWD' and
            not 'SRv6' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -8307,19 +7015,19 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-pdr"
+  title: "VPP Throughput: ip6-2n-skx-x710-78b-4t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-4t2c-base_and_scale-pdr"
   data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  filter: "'NIC_Intel-X710' and
            '78B' and
            ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            '4T2C' and
            'IP6FWD' and
            not 'SRv6' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -8332,22 +7040,22 @@
     title: ""  # No title
     layout: "plot-throughput"
 
+# Packet Throughput - VPP IPv6 2n-skx-xxv710
 -
   type: "plot"
-  title: "VPP Throughput: ip6-2n-skx-xxv710-78b-2t1c-features-ndr"
+  title: "VPP Throughput: ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-2t1c-features-ndr"
+  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr"
   data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '78B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
            '2T1C' and
            'IP6FWD' and
            not 'SRv6' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -8362,20 +7070,19 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-2n-skx-xxv710-78b-2t1c-features-pdr"
+  title: "VPP Throughput: ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-2t1c-features-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-pdr"
   data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '78B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'PDRDISC' and not 'NDRDISC' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
            '2T1C' and
            'IP6FWD' and
            not 'SRv6' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -8390,20 +7097,19 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-2n-skx-xxv710-78b-4t2c-features-ndr"
+  title: "VPP Throughput: ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-4t2c-features-ndr"
+  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr"
   data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '78B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
            '4T2C' and
            'IP6FWD' and
            not 'SRv6' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -8418,20 +7124,19 @@
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-2n-skx-xxv710-78b-4t2c-features-pdr"
+  title: "VPP Throughput: ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-4t2c-features-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-pdr"
   data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '78B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'PDRDISC' and not 'NDRDISC' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
            '4T2C' and
            'IP6FWD' and
            not 'SRv6' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -8457,7 +7162,7 @@
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
            'ENCAP' and
-           'NDRDISC' and
+           'NDRPDR' and
            '1T1C' and
            ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
            not 'VHOST'"
@@ -8482,7 +7187,7 @@
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
            'ENCAP' and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            '1T1C' and
            ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
            not 'VHOST'"
@@ -8507,7 +7212,7 @@
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
            'ENCAP' and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T2C' and
            ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
            not 'VHOST'"
@@ -8532,7 +7237,7 @@
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
            'ENCAP' and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            '2T2C' and
            ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
            not 'VHOST'"
@@ -8557,13 +7262,13 @@
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and 
-           '64B' and 
-           'IP4FWD' and 
-           'NDRDISC' and 
-           '1T1C' and 
-           'IPSECHW' and 
-           ('IPSECTRAN' or 'IPSECTUN') and 
+  filter: "'NIC_Intel-XL710' and
+           '64B' and
+           'IP4FWD' and
+           'NDRPDR' and
+           '1T1C' and
+           'IPSECHW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -8583,13 +7288,13 @@
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and 
-           '64B' and 
-           'IP4FWD' and 
-           'PDRDISC' and not 'NDRDISC' and
-           '1T1C' and 
-           'IPSECHW' and 
-           ('IPSECTRAN' or 'IPSECTUN') and 
+  filter: "'NIC_Intel-XL710' and
+           '64B' and
+           'IP4FWD' and
+           'NDRPDR' and
+           '1T1C' and
+           'IPSECHW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -8609,13 +7314,13 @@
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and 
-           '64B' and 
-           'IP4FWD' and 
-           'NDRDISC' and 
-           '2T2C' and 
-           'IPSECHW' and 
-           ('IPSECTRAN' or 'IPSECTUN') and 
+  filter: "'NIC_Intel-XL710' and
+           '64B' and
+           'IP4FWD' and
+           'NDRPDR' and
+           '2T2C' and
+           'IPSECHW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -8635,13 +7340,13 @@
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and 
-           '64B' and 
-           'IP4FWD' and 
-           'PDRDISC' and not 'NDRDISC' and
-           '2T2C' and 
-           'IPSECHW' and 
-           ('IPSECTRAN' or 'IPSECTUN') and 
+  filter: "'NIC_Intel-XL710' and
+           '64B' and
+           'IP4FWD' and
+           'NDRPDR' and
+           '2T2C' and
+           'IPSECHW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -8667,7 +7372,7 @@
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
            'FEATURE' and
-           'NDRDISC' and
+           'NDRPDR' and
            '1T1C' and
            'IP6FWD' and
            'SRv6'"
@@ -8692,7 +7397,7 @@
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
            'FEATURE' and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            '1T1C' and
            'IP6FWD' and
            'SRv6'"
@@ -8717,7 +7422,7 @@
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
            'FEATURE' and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T2C' and
            'IP6FWD' and
            'SRv6'"
@@ -8742,8 +7447,8 @@
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
            'FEATURE' and
-           'PDRDISC' and not 'NDRDISC' and
-           '1T1C' and
+           'NDRPDR' and
+           '2T2C' and
            'IP6FWD' and
            'SRv6'"
   parameters:
@@ -8768,11 +7473,11 @@
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
-           '64B' and 
-           'NDRDISC' and 
-           '1T1C' and 
-           'VHOST' and 
-           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
+           '64B' and
+           'NDRPDR' and
+           '1T1C' and
+           'VHOST' and
+           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -8792,11 +7497,11 @@
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
-           '64B' and 
-           'NDRDISC' and 
-           '2T2C' and 
-           'VHOST' and 
-           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
+           '64B' and
+           'NDRPDR' and
+           '2T2C' and
+           'VHOST' and
+           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -8816,11 +7521,11 @@
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
-           '64B' and 
-           'PDRDISC' and not 'NDRDISC' and
-           '1T1C' and 
-           'VHOST' and 
-           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
+           '64B' and
+           'NDRPDR' and
+           '1T1C' and
+           'VHOST' and
+           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -8840,11 +7545,11 @@
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
-           '64B' and 
-           'PDRDISC' and not 'NDRDISC' and
-           '2T2C' and 
-           'VHOST' and 
-           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
+           '64B' and
+           'NDRPDR' and
+           '2T2C' and
+           'VHOST' and
+           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -8865,13 +7570,13 @@
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
-           '64B' and 
-           'NDRDISC' and 
-           '1T1C' and 
-           'VHOST' and 
-           not 'VXLAN' and 
-           not 'IP4FWD' and 
-           not 'DOT1Q' and 
+           '64B' and
+           'NDRPDR' and
+           '1T1C' and
+           'VHOST' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
@@ -8892,13 +7597,13 @@
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
-           '64B' and 
-           'NDRDISC' and 
-           '2T2C' and 
-           'VHOST' and 
-           not 'VXLAN' and 
-           not 'IP4FWD' and 
-           not 'DOT1Q' and 
+           '64B' and
+           'NDRPDR' and
+           '2T2C' and
+           'VHOST' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
@@ -8919,13 +7624,13 @@
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
-           '64B' and 
-           'PDRDISC' and not 'NDRDISC' and
-           '1T1C' and 
-           'VHOST' and 
-           not 'VXLAN' and 
-           not 'IP4FWD' and 
-           not 'DOT1Q' and 
+           '64B' and
+           'NDRPDR' and
+           '1T1C' and
+           'VHOST' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
@@ -8946,13 +7651,13 @@
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
-           '64B' and 
-           'PDRDISC' and not 'NDRDISC' and
-           '2T2C' and 
-           'VHOST' and 
-           not 'VXLAN' and 
-           not 'IP4FWD' and 
-           not 'DOT1Q' and 
+           '64B' and
+           'NDRPDR' and
+           '2T2C' and
+           'VHOST' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
@@ -8974,11 +7679,11 @@
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
-           '64B' and 
-           'NDRDISC' and 
-           '1T1C' and 
-           'VHOST' and 
-           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
+           '64B' and
+           'NDRPDR' and
+           '1T1C' and
+           'VHOST' and
+           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -8998,11 +7703,11 @@
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
-           '64B' and 
-           'NDRDISC' and 
-           '2T2C' and 
-           'VHOST' and 
-           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
+           '64B' and
+           'NDRPDR' and
+           '2T2C' and
+           'VHOST' and
+           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -9022,11 +7727,11 @@
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
-           '64B' and 
-           'PDRDISC' and not 'NDRDISC' and
-           '1T1C' and 
-           'VHOST' and 
-           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
+           '64B' and
+           'NDRPDR' and
+           '1T1C' and
+           'VHOST' and
+           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -9046,11 +7751,11 @@
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
-           '64B' and 
-           'PDRDISC' and not 'NDRDISC' and
-           '2T2C' and 
-           'VHOST' and 
-           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
+           '64B' and
+           'NDRPDR' and
+           '2T2C' and
+           'VHOST' and
+           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -9071,13 +7776,13 @@
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
-           '64B' and 
-           'NDRDISC' and 
-           '1T1C' and 
-           'VHOST' and 
-           not 'VXLAN' and 
-           not 'IP4FWD' and 
-           not 'DOT1Q' and 
+           '64B' and
+           'NDRPDR' and
+           '1T1C' and
+           'VHOST' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
@@ -9098,13 +7803,13 @@
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
-           '64B' and 
-           'NDRDISC' and 
-           '2T2C' and 
-           'VHOST' and 
-           not 'VXLAN' and 
-           not 'IP4FWD' and 
-           not 'DOT1Q' and 
+           '64B' and
+           'NDRPDR' and
+           '2T2C' and
+           'VHOST' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
@@ -9125,13 +7830,13 @@
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
-           '64B' and 
-           'PDRDISC' and not 'NDRDISC' and
-           '1T1C' and 
-           'VHOST' and 
-           not 'VXLAN' and 
-           not 'IP4FWD' and 
-           not 'DOT1Q' and 
+           '64B' and
+           'NDRPDR' and
+           '1T1C' and
+           'VHOST' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
@@ -9152,13 +7857,13 @@
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
-           '64B' and 
-           'PDRDISC' and not 'NDRDISC' and
-           '2T2C' and 
-           'VHOST' and 
-           not 'VXLAN' and 
-           not 'IP4FWD' and 
-           not 'DOT1Q' and 
+           '64B' and
+           'NDRPDR' and
+           '2T2C' and
+           'VHOST' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
@@ -9180,11 +7885,11 @@
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-XL710' and
-           '64B' and 
-           'NDRDISC' and 
-           '1T1C' and 
-           'VHOST' and 
-           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
+           '64B' and
+           'NDRPDR' and
+           '1T1C' and
+           'VHOST' and
+           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -9204,11 +7909,11 @@
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-XL710' and
-           '64B' and 
-           'NDRDISC' and 
-           '2T2C' and 
-           'VHOST' and 
-           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
+           '64B' and
+           'NDRPDR' and
+           '2T2C' and
+           'VHOST' and
+           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -9228,11 +7933,11 @@
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-XL710' and
-           '64B' and 
-           'PDRDISC' and not 'NDRDISC' and
-           '1T1C' and 
-           'VHOST' and 
-           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
+           '64B' and
+           'NDRPDR' and
+           '1T1C' and
+           'VHOST' and
+           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -9252,11 +7957,11 @@
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-XL710' and
-           '64B' and 
-           'PDRDISC' and not 'NDRDISC' and
-           '2T2C' and 
-           'VHOST' and 
-           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
+           '64B' and
+           'NDRPDR' and
+           '2T2C' and
+           'VHOST' and
+           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -9277,13 +7982,13 @@
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-XL710' and
-           '64B' and 
-           'NDRDISC' and 
-           '1T1C' and 
-           'VHOST' and 
-           not 'VXLAN' and 
-           not 'IP4FWD' and 
-           not 'DOT1Q' and 
+           '64B' and
+           'NDRPDR' and
+           '1T1C' and
+           'VHOST' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
@@ -9304,13 +8009,13 @@
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-XL710' and
-           '64B' and 
-           'NDRDISC' and 
-           '2T2C' and 
-           'VHOST' and 
-           not 'VXLAN' and 
-           not 'IP4FWD' and 
-           not 'DOT1Q' and 
+           '64B' and
+           'NDRPDR' and
+           '2T2C' and
+           'VHOST' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
@@ -9331,13 +8036,13 @@
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-XL710' and
-           '64B' and 
-           'PDRDISC' and not 'NDRDISC' and
-           '1T1C' and 
-           'VHOST' and 
-           not 'VXLAN' and 
-           not 'IP4FWD' and 
-           not 'DOT1Q' and 
+           '64B' and
+           'NDRPDR' and
+           '1T1C' and
+           'VHOST' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
@@ -9358,13 +8063,13 @@
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-XL710' and
-           '64B' and 
-           'PDRDISC' and not 'NDRDISC' and
-           '2T2C' and 
-           'VHOST' and 
-           not 'VXLAN' and 
-           not 'IP4FWD' and 
-           not 'DOT1Q' and 
+           '64B' and
+           'NDRPDR' and
+           '2T2C' and
+           'VHOST' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
@@ -9389,7 +8094,7 @@
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           'NDRDISC' and
+           'NDRPDR' and
            '1T1C' and
            'VTS'"
   parameters:
@@ -9412,7 +8117,7 @@
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T2C' and
            'VTS'"
   parameters:
@@ -9435,7 +8140,7 @@
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            '1T1C' and
            'VTS'"
   parameters:
@@ -9458,7 +8163,7 @@
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            '2T2C' and
            'VTS'"
   parameters:
@@ -10168,7 +8873,7 @@
            'BASE' and
            'NDRPDR' and
            '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -10192,7 +8897,7 @@
            'BASE' and
            'NDRPDR' and
            '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -10216,7 +8921,7 @@
            'BASE' and
            'NDRPDR' and
            '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -10240,7 +8945,7 @@
            'BASE' and
            'NDRPDR' and
            '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -10265,7 +8970,7 @@
            'BASE' and
            'NDRPDR' and
            '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -10289,7 +8994,7 @@
            'BASE' and
            'NDRPDR' and
            '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -10313,7 +9018,7 @@
            'BASE' and
            'NDRPDR' and
            '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -10337,7 +9042,7 @@
            'BASE' and
            'NDRPDR' and
            '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -10362,7 +9067,7 @@
            'BASE' and
            'NDRPDR' and
            '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -10386,7 +9091,7 @@
            'BASE' and
            'NDRPDR' and
            '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -10410,7 +9115,7 @@
            'BASE' and
            'NDRPDR' and
            '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -10434,7 +9139,7 @@
            'BASE' and
            'NDRPDR' and
            '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -10459,7 +9164,7 @@
            'BASE' and
            'NDRPDR' and
            '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -10483,7 +9188,7 @@
            'BASE' and
            'NDRPDR' and
            '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -10507,7 +9212,7 @@
            'BASE' and
            'NDRPDR' and
            '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -10531,7 +9236,7 @@
            'BASE' and
            'NDRPDR' and
            '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -10556,7 +9261,7 @@
            'BASE' and
            'NDRPDR' and
            '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -10580,7 +9285,7 @@
            'BASE' and
            'NDRPDR' and
            '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -10603,8 +9308,8 @@
            '64B' and
            'BASE' and
            'NDRPDR' and
-           '4T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
+           '2T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -10628,7 +9333,7 @@
            'BASE' and
            'NDRPDR' and
            '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -10653,7 +9358,7 @@
            'BASE' and
            'NDRPDR' and
            '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -10677,7 +9382,7 @@
            'BASE' and
            'NDRPDR' and
            '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -10701,7 +9406,7 @@
            'BASE' and
            'NDRPDR' and
            '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -10725,7 +9430,7 @@
            'BASE' and
            'NDRPDR' and
            '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -10750,7 +9455,7 @@
            'BASE' and
            'NDRPDR' and
            '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -10774,7 +9479,7 @@
            'BASE' and
            'NDRPDR' and
            '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -10798,7 +9503,7 @@
            'BASE' and
            'NDRPDR' and
            '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -10822,7 +9527,7 @@
            'BASE' and
            'NDRPDR' and
            '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -10854,9 +9559,9 @@
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -10878,9 +9583,9 @@
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -10903,9 +9608,9 @@
            '64B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
+           'NDRPDR' and
            '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -10928,9 +9633,9 @@
            '64B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -10953,9 +9658,9 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -10977,9 +9682,9 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -11002,9 +9707,9 @@
            '64B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
+           'NDRPDR' and
            '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -11027,9 +9732,9 @@
            '64B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -11052,9 +9757,9 @@
   filter: "'NIC_Intel-XL710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -11076,9 +9781,9 @@
   filter: "'NIC_Intel-XL710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -11101,9 +9806,9 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -11125,9 +9830,9 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -11150,9 +9855,9 @@
            '64B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -11175,9 +9880,9 @@
            '64B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
+           'NDRPDR' and
            '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -11200,9 +9905,9 @@
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -11224,9 +9929,9 @@
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -11249,9 +9954,9 @@
            '64B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -11274,9 +9979,9 @@
            '64B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
+           'NDRPDR' and
            '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -11299,9 +10004,9 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -11323,59 +10028,9 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  traces:
-    boxmean: False
-  layout:
-    title: ""  # No title
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: l2sw-2n-skx-x710-64b-2t1c-features-ndr-lat"
-  algorithm: "plot_latency_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-x710-64b-2t1c-features-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  traces:
-    boxmean: False
-  layout:
-    title: ""  # No title
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: l2sw-2n-skx-x710-64b-4t2c-features-ndr-lat"
-  algorithm: "plot_latency_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-x710-64b-4t2c-features-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
+           'NDRPDR' and
            '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -11398,9 +10053,9 @@
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -11422,59 +10077,9 @@
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  traces:
-    boxmean: False
-  layout:
-    title: ""  # No title
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: l2sw-2n-skx-xxv710-64b-2t1c-features-ndr-lat"
-  algorithm: "plot_latency_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-xxv710-64b-2t1c-features-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  traces:
-    boxmean: False
-  layout:
-    title: ""  # No title
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: l2sw-2n-skx-xxv710-64b-4t2c-features-ndr-lat"
-  algorithm: "plot_latency_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-xxv710-64b-4t2c-features-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
+           'NDRPDR' and
            '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -11499,9 +10104,9 @@
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
@@ -11523,9 +10128,9 @@
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
@@ -11548,9 +10153,9 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
@@ -11572,9 +10177,9 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
@@ -11597,9 +10202,9 @@
   filter: "'NIC_Intel-XL710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
@@ -11621,9 +10226,9 @@
   filter: "'NIC_Intel-XL710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
@@ -11646,9 +10251,9 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
@@ -11670,156 +10275,9 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  traces:
-    boxmean: False
-  layout:
-    title: ""  # No title
-    layout: "plot-latency"
-
-# Packet Latency - VPP Container Memif 3n-skx-xxv710
--
-  type: "plot"
-  title: "VPP Latency: memif-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRDISC' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  traces:
-    boxmean: False
-  layout:
-    title: ""  # No title
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: memif-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRDISC' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  traces:
-    boxmean: False
-  layout:
-    title: ""  # No title
-    layout: "plot-latency"
-
-# Packet Latency - VPP Container Memif 2n-skx-x710
--
-  type: "plot"
-  title: "VPP Latency: memif-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRDISC' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  traces:
-    boxmean: False
-  layout:
-    title: ""  # No title
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: memif-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRDISC' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  traces:
-    boxmean: False
-  layout:
-    title: ""  # No title
-    layout: "plot-latency"
-
-# Packet Latency - VPP Container Memif 2n-skx-xxv710
--
-  type: "plot"
-  title: "VPP Latency: memif-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRDISC' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  traces:
-    boxmean: False
-  layout:
-    title: ""  # No title
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: memif-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
@@ -11844,9 +10302,9 @@
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
@@ -11868,9 +10326,9 @@
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
@@ -11893,9 +10351,9 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
@@ -11917,9 +10375,9 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
@@ -11944,10 +10402,10 @@
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            '1T1C' and
            'IP4FWD' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "latency"
@@ -11968,10 +10426,10 @@
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T2C' and
            'IP4FWD' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "latency"
@@ -11993,10 +10451,10 @@
            '64B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
+           'NDRPDR' and
            '1T1C' and
            'IP4FWD' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "latency"
@@ -12018,10 +10476,10 @@
            '64B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T2C' and
            'IP4FWD' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "latency"
@@ -12043,10 +10501,10 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            '1T1C' and
            'IP4FWD' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "latency"
@@ -12067,10 +10525,10 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T2C' and
            'IP4FWD' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "latency"
@@ -12092,10 +10550,10 @@
            '64B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
+           'NDRPDR' and
            '1T1C' and
            'IP4FWD' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "latency"
@@ -12117,10 +10575,10 @@
            '64B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T2C' and
            'IP4FWD' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "latency"
@@ -12142,10 +10600,10 @@
   filter: "'NIC_Intel-XL710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            '1T1C' and
            'IP4FWD' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "latency"
@@ -12166,10 +10624,10 @@
   filter: "'NIC_Intel-XL710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T2C' and
            'IP4FWD' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "latency"
@@ -12191,10 +10649,10 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T1C' and
            'IP4FWD' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "latency"
@@ -12215,10 +10673,10 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            '4T2C' and
            'IP4FWD' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "latency"
@@ -12240,10 +10698,10 @@
            '64B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T1C' and
            'IP4FWD' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "latency"
@@ -12265,10 +10723,10 @@
            '64B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
+           'NDRPDR' and
            '4T2C' and
            'IP4FWD' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "latency"
@@ -12290,10 +10748,10 @@
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T1C' and
            'IP4FWD' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "latency"
@@ -12314,10 +10772,10 @@
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            '4T2C' and
            'IP4FWD' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "latency"
@@ -12339,10 +10797,10 @@
            '64B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T1C' and
            'IP4FWD' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "latency"
@@ -12364,262 +10822,13 @@
            '64B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
-           '4T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and 
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  traces:
-    boxmean: False
-  layout:
-    title: ""  # No title
-    layout: "plot-latency"
-
-# Packet Latency - VPP IPv4 2n-skx-x710
--
-  type: "plot"
-  title: "VPP Latency: ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRDISC' and
-           '2T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and 
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  traces:
-    boxmean: False
-  layout:
-    title: ""  # No title
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRDISC' and
-           '4T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and 
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  traces:
-    boxmean: False
-  layout:
-    title: ""  # No title
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: ip4-2n-skx-x710-64b-2t1c-features-ndr-lat"
-  algorithm: "plot_latency_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-2t1c-features-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
-           '2T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and 
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  traces:
-    boxmean: False
-  layout:
-    title: ""  # No title
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: ip4-2n-skx-x710-64b-4t2c-features-ndr-lat"
-  algorithm: "plot_latency_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-4t2c-features-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
-           '4T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and 
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  traces:
-    boxmean: False
-  layout:
-    title: ""  # No title
-    layout: "plot-latency"
-
-# Packet Latency - VPP IPv4 2n-skx-xxv710
--
-  type: "plot"
-  title: "VPP Latency: ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRDISC' and
-           '2T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and 
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  traces:
-    boxmean: False
-  layout:
-    title: ""  # No title
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRDISC' and
-           '4T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and 
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  traces:
-    boxmean: False
-  layout:
-    title: ""  # No title
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: ip4-2n-skx-xxv710-64b-2t1c-features-ndr-lat"
-  algorithm: "plot_latency_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-2t1c-features-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
-           '2T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and 
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  traces:
-    boxmean: False
-  layout:
-    title: ""  # No title
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: ip4-2n-skx-xxv710-64b-4t2c-features-ndr-lat"
-  algorithm: "plot_latency_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-4t2c-features-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
+           'NDRPDR' and
            '4T2C' and
            'IP4FWD' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "latency"
-  - "parent"
-  traces:
-    boxmean: False
-  layout:
-    title: ""  # No title
-    layout: "plot-latency"
-
-################################################################################
-
-# Packet Latency - VPP Ipv4 tunnels 3n-hsw-x520
--
-  type: "plot"
-  title: "VPP Latency: ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'ENCAP' and
-           'NDRDISC' and
-           '1T1C' and
-           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "throughput"
-  - "parent"
-  traces:
-    boxmean: False
-  layout:
-    title: ""  # No title
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'ENCAP' and
-           'NDRDISC' and
-           '2T2C' and
-           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   traces:
     boxmean: False
@@ -12627,24 +10836,24 @@
     title: ""  # No title
     layout: "plot-latency"
 
-# Packet Latency - VPP Ipv4 tunnels 3n-hsw-x710
+# Packet Latency - VPP IPv4 2n-skx-x710
 -
   type: "plot"
-  title: "VPP Latency: ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
+  title: "VPP Latency: ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           'ENCAP' and
-           'NDRDISC' and
-           '1T1C' and
-           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
+           '2T1C' and
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   traces:
     boxmean: False
@@ -12654,21 +10863,21 @@
 
 -
   type: "plot"
-  title: "VPP Latency: ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
+  title: "VPP Latency: ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           'ENCAP' and
-           'NDRDISC' and
-           '2T2C' and
-           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
+           '4T2C' and
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   traces:
     boxmean: False
@@ -12676,24 +10885,24 @@
     title: ""  # No title
     layout: "plot-latency"
 
-# Packet Latency - VPP Ipv4 tunnels 3n-skx-x710
+# Packet Latency - VPP IPv4 2n-skx-xxv710
 -
   type: "plot"
-  title: "VPP Latency: ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
+  title: "VPP Latency: ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
-           'ENCAP' and
-           'NDRDISC' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
            '2T1C' and
-           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   traces:
     boxmean: False
@@ -12703,21 +10912,21 @@
 
 -
   type: "plot"
-  title: "VPP Latency: ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
+  title: "VPP Latency: ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
-           'ENCAP' and
-           'NDRDISC' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
            '4T2C' and
-           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   traces:
     boxmean: False
@@ -12725,19 +10934,21 @@
     title: ""  # No title
     layout: "plot-latency"
 
-# Packet Latency - VPP Ipv4 tunnels 3n-skx-xxv710
+################################################################################
+
+# Packet Latency - VPP Ipv4 tunnels 3n-hsw-x520
 -
   type: "plot"
-  title: "VPP Latency: ip4tun-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
+  title: "VPP Latency: ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'ENCAP' and
-           'NDRDISC' and
-           '2T1C' and
+           'NDRPDR' and
+           '1T1C' and
            ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
            not 'VHOST' and
            not 'IPSECHW'"
@@ -12752,16 +10963,16 @@
 
 -
   type: "plot"
-  title: "VPP Latency: ip4tun-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
+  title: "VPP Latency: ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'ENCAP' and
-           'NDRDISC' and
-           '4T2C' and
+           'NDRPDR' and
+           '2T2C' and
            ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
            not 'VHOST' and
            not 'IPSECHW'"
@@ -12774,19 +10985,19 @@
     title: ""  # No title
     layout: "plot-latency"
 
-# Packet Latency - VPP Ipv4 tunnels 2n-skx-x710
+# Packet Latency - VPP Ipv4 tunnels 3n-hsw-x710
 -
   type: "plot"
-  title: "VPP Latency: ip4tun-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
+  title: "VPP Latency: ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
-           'NDRDISC' and
-           '2T1C' and
+           'NDRPDR' and
+           '1T1C' and
            ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
            not 'VHOST' and
            not 'IPSECHW'"
@@ -12801,16 +11012,16 @@
 
 -
   type: "plot"
-  title: "VPP Latency: ip4tun-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
+  title: "VPP Latency: ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
-           'NDRDISC' and
-           '4T2C' and
+           'NDRPDR' and
+           '2T2C' and
            ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
            not 'VHOST' and
            not 'IPSECHW'"
@@ -12823,19 +11034,18 @@
     title: ""  # No title
     layout: "plot-latency"
 
-
-# Packet Latency - VPP Ipv4 tunnels 2n-skx-xxv710
+# Packet Latency - VPP Ipv4 tunnels 3n-skx-x710
 -
   type: "plot"
-  title: "VPP Latency: ip4tun-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
+  title: "VPP Latency: ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T1C' and
            ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
            not 'VHOST' and
@@ -12851,15 +11061,15 @@
 
 -
   type: "plot"
-  title: "VPP Latency: ip4tun-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
+  title: "VPP Latency: ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            'ENCAP' and
-           'NDRDISC' and
+           'NDRPDR' and
            '4T2C' and
            ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
            not 'VHOST' and
@@ -12886,11 +11096,11 @@
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            '1T1C' and
            'IP6FWD' and
            not 'SRv6' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "latency"
@@ -12911,11 +11121,11 @@
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T2C' and
            'IP6FWD' and
            not 'SRv6' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "latency"
@@ -12937,11 +11147,11 @@
            '78B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
+           'NDRPDR' and
            '1T1C' and
            'IP6FWD' and
            not 'SRv6' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "latency"
@@ -12963,11 +11173,11 @@
            '78B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T2C' and
            'IP6FWD' and
            not 'SRv6' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "latency"
@@ -12989,11 +11199,11 @@
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            '1T1C' and
            'IP6FWD' and
            not 'SRv6' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "latency"
@@ -13014,11 +11224,11 @@
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T2C' and
            'IP6FWD' and
            not 'SRv6' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "latency"
@@ -13040,11 +11250,11 @@
            '78B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
+           'NDRPDR' and
            '1T1C' and
            'IP6FWD' and
            not 'SRv6' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "latency"
@@ -13066,11 +11276,11 @@
            '78B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T2C' and
            'IP6FWD' and
            not 'SRv6' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "latency"
@@ -13092,11 +11302,11 @@
   filter: "'NIC_Intel-XL710' and
            '78B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            '1T1C' and
            'IP6FWD' and
            not 'SRv6' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "latency"
@@ -13117,11 +11327,11 @@
   filter: "'NIC_Intel-XL710' and
            '78B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T2C' and
            'IP6FWD' and
            not 'SRv6' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "latency"
@@ -13143,11 +11353,11 @@
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T1C' and
            'IP6FWD' and
            not 'SRv6' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "latency"
@@ -13168,11 +11378,11 @@
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            '4T2C' and
            'IP6FWD' and
            not 'SRv6' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "latency"
@@ -13194,11 +11404,11 @@
            '78B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T1C' and
            'IP6FWD' and
            not 'SRv6' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "latency"
@@ -13216,118 +11426,15 @@
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-4t2c-features-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
-           '4T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and 
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  traces:
-    boxmean: False
-  layout:
-    title: ""  # No title
-    layout: "plot-latency"
-
-# Packet Latency - VPP IPv6 3n-skx-xxv710
--
-  type: "plot"
-  title: "VPP Latency: ip6-3n-skx-xxv710-78b-2t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-xxv710-78b-2t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '78B' and
-           ('BASE' or 'SCALE') and
-           'NDRDISC' and
-           '2T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and 
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  traces:
-    boxmean: False
-  layout:
-    title: ""  # No title
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: ip6-3n-skx-xxv710-78b-4t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-xxv710-78b-4t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '78B' and
-           ('BASE' or 'SCALE') and
-           'NDRDISC' and
-           '4T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and 
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  traces:
-    boxmean: False
-  layout:
-    title: ""  # No title
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: ip6-3n-skx-xxv710-78b-2t1c-features-ndr-lat"
-  algorithm: "plot_latency_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-xxv710-78b-2t1c-features-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '78B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
-           '2T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and 
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  traces:
-    boxmean: False
-  layout:
-    title: ""  # No title
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: ip6-3n-skx-xxv710-78b-4t2c-features-ndr-lat"
-  algorithm: "plot_latency_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-xxv710-78b-4t2c-features-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  filter: "'NIC_Intel-X710' and
            '78B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
+           'NDRPDR' and
            '4T2C' and
            'IP6FWD' and
            not 'SRv6' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "latency"
@@ -13338,22 +11445,22 @@
     title: ""  # No title
     layout: "plot-latency"
 
-# Packet Latency - VPP IPv6 2n-skx-x710
+# Packet Latency - VPP IPv6 3n-skx-xxv710
 -
   type: "plot"
-  title: "VPP Latency: ip6-2n-skx-x710-78b-2t1c-base_and_scale-ndr-lat"
+  title: "VPP Latency: ip6-3n-skx-xxv710-78b-2t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-2t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-xxv710-78b-2t1c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '78B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T1C' and
            'IP6FWD' and
            not 'SRv6' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "latency"
@@ -13366,19 +11473,19 @@
 
 -
   type: "plot"
-  title: "VPP Latency: ip6-2n-skx-x710-78b-4t2c-base_and_scale-ndr-lat"
+  title: "VPP Latency: ip6-3n-skx-xxv710-78b-4t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-4t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-xxv710-78b-4t2c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '78B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            '4T2C' and
            'IP6FWD' and
            not 'SRv6' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "latency"
@@ -13391,20 +11498,20 @@
 
 -
   type: "plot"
-  title: "VPP Latency: ip6-2n-skx-x710-78b-2t1c-features-ndr-lat"
+  title: "VPP Latency: ip6-3n-skx-xxv710-78b-2t1c-features-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-2t1c-features-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-xxv710-78b-2t1c-features-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '78B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T1C' and
            'IP6FWD' and
            not 'SRv6' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "latency"
@@ -13417,20 +11524,20 @@
 
 -
   type: "plot"
-  title: "VPP Latency: ip6-2n-skx-x710-78b-4t2c-features-ndr-lat"
+  title: "VPP Latency: ip6-3n-skx-xxv710-78b-4t2c-features-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-4t2c-features-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-xxv710-78b-4t2c-features-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '78B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
+           'NDRPDR' and
            '4T2C' and
            'IP6FWD' and
            not 'SRv6' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "latency"
@@ -13441,22 +11548,22 @@
     title: ""  # No title
     layout: "plot-latency"
 
-# Packet Latency - VPP IPv6 2n-skx-xxv710
+# Packet Latency - VPP IPv6 2n-skx-x710
 -
   type: "plot"
-  title: "VPP Latency: ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr-lat"
+  title: "VPP Latency: ip6-2n-skx-x710-78b-2t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-2t1c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  filter: "'NIC_Intel-X710' and
            '78B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T1C' and
            'IP6FWD' and
            not 'SRv6' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "latency"
@@ -13469,19 +11576,19 @@
 
 -
   type: "plot"
-  title: "VPP Latency: ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr-lat"
+  title: "VPP Latency: ip6-2n-skx-x710-78b-4t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-4t2c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  filter: "'NIC_Intel-X710' and
            '78B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            '4T2C' and
            'IP6FWD' and
            not 'SRv6' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "latency"
@@ -13492,22 +11599,22 @@
     title: ""  # No title
     layout: "plot-latency"
 
+# Packet Latency - VPP IPv6 2n-skx-xxv710
 -
   type: "plot"
-  title: "VPP Latency: ip6-2n-skx-xxv710-78b-2t1c-features-ndr-lat"
+  title: "VPP Latency: ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-2t1c-features-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '78B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
            '2T1C' and
            'IP6FWD' and
            not 'SRv6' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "latency"
@@ -13520,20 +11627,19 @@
 
 -
   type: "plot"
-  title: "VPP Latency: ip6-2n-skx-xxv710-78b-4t2c-features-ndr-lat"
+  title: "VPP Latency: ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-4t2c-features-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '78B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
            '4T2C' and
            'IP6FWD' and
            not 'SRv6' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "latency"
@@ -13557,7 +11663,7 @@
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
            'ENCAP' and
-           'NDRDISC' and
+           'NDRPDR' and
            '1T1C' and
            ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
            not 'VHOST'"
@@ -13580,7 +11686,7 @@
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
            'ENCAP' and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T2C' and
            ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
            not 'VHOST'"
@@ -13606,7 +11712,7 @@
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'IP4FWD' and
-           'NDRDISC' and
+           'NDRPDR' and
            '1T1C' and
            'IPSECHW' and
            ('IPSECTRAN' or 'IPSECTUN') and
@@ -13630,7 +11736,7 @@
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'IP4FWD' and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T2C' and
            'IPSECHW' and
            ('IPSECTRAN' or 'IPSECTUN') and
@@ -13655,11 +11761,11 @@
   output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-1t1c-features-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
-           '78B' and 
-           'FEATURE' and 
-           'NDRDISC' and 
-           '1T1C' and 
-           'IP6FWD' and 
+           '78B' and
+           'FEATURE' and
+           'NDRPDR' and
+           '1T1C' and
+           'IP6FWD' and
            'SRv6'"
   parameters:
   - "latency"
@@ -13678,11 +11784,11 @@
   output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-2t2c-features-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
-           '78B' and 
-           'FEATURE' and 
-           'NDRDISC' and 
-           '2T2C' and 
-           'IP6FWD' and 
+           '78B' and
+           'FEATURE' and
+           'NDRPDR' and
+           '2T2C' and
+           'IP6FWD' and
            'SRv6'"
   parameters:
   - "latency"
@@ -13704,11 +11810,11 @@
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
-           '64B' and 
-           'NDRDISC' and 
-           '1T1C' and 
-           'VHOST' and 
-           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
+           '64B' and
+           'NDRPDR' and
+           '1T1C' and
+           'VHOST' and
+           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "latency"
   - "parent"
@@ -13726,11 +11832,11 @@
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
-           '64B' and 
-           'NDRDISC' and 
-           '2T2C' and 
-           'VHOST' and 
-           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
+           '64B' and
+           'NDRPDR' and
+           '2T2C' and
+           'VHOST' and
+           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "latency"
   - "parent"
@@ -13749,13 +11855,13 @@
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
-           '64B' and 
-           'NDRDISC' and 
-           '1T1C' and 
-           'VHOST' and 
-           not 'VXLAN' and 
-           not 'IP4FWD' and 
-           not 'DOT1Q' and 
+           '64B' and
+           'NDRPDR' and
+           '1T1C' and
+           'VHOST' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "latency"
@@ -13774,13 +11880,13 @@
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
-           '64B' and 
-           'NDRDISC' and 
-           '2T2C' and 
-           'VHOST' and 
-           not 'VXLAN' and 
-           not 'IP4FWD' and 
-           not 'DOT1Q' and 
+           '64B' and
+           'NDRPDR' and
+           '2T2C' and
+           'VHOST' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "latency"
@@ -13800,11 +11906,11 @@
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
-           '64B' and 
-           'NDRDISC' and 
-           '1T1C' and 
-           'VHOST' and 
-           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
+           '64B' and
+           'NDRPDR' and
+           '1T1C' and
+           'VHOST' and
+           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "latency"
   - "parent"
@@ -13822,11 +11928,11 @@
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
-           '64B' and 
-           'NDRDISC' and 
-           '2T2C' and 
-           'VHOST' and 
-           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
+           '64B' and
+           'NDRPDR' and
+           '2T2C' and
+           'VHOST' and
+           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "latency"
   - "parent"
@@ -13845,13 +11951,13 @@
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
-           '64B' and 
-           'NDRDISC' and 
-           '1T1C' and 
-           'VHOST' and 
-           not 'VXLAN' and 
-           not 'IP4FWD' and 
-           not 'DOT1Q' and 
+           '64B' and
+           'NDRPDR' and
+           '1T1C' and
+           'VHOST' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "latency"
@@ -13870,13 +11976,13 @@
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
-           '64B' and 
-           'NDRDISC' and 
-           '2T2C' and 
-           'VHOST' and 
-           not 'VXLAN' and 
-           not 'IP4FWD' and 
-           not 'DOT1Q' and 
+           '64B' and
+           'NDRPDR' and
+           '2T2C' and
+           'VHOST' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "latency"
@@ -13896,11 +12002,11 @@
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-XL710' and
-           '64B' and 
-           'NDRDISC' and 
-           '1T1C' and 
-           'VHOST' and 
-           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
+           '64B' and
+           'NDRPDR' and
+           '1T1C' and
+           'VHOST' and
+           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "latency"
   - "parent"
@@ -13918,11 +12024,11 @@
   output-file: "{DIR[STATIC,VPP]}/ip4-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-XL710' and
-           '64B' and 
-           'NDRDISC' and 
-           '2T2C' and 
-           'VHOST' and 
-           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
+           '64B' and
+           'NDRPDR' and
+           '2T2C' and
+           'VHOST' and
+           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "latency"
   - "parent"
@@ -13941,13 +12047,13 @@
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-XL710' and
-           '64B' and 
-           'NDRDISC' and 
-           '1T1C' and 
-           'VHOST' and 
-           not 'VXLAN' and 
-           not 'IP4FWD' and 
-           not 'DOT1Q' and 
+           '64B' and
+           'NDRPDR' and
+           '1T1C' and
+           'VHOST' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "latency"
@@ -13966,13 +12072,13 @@
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-XL710' and
-           '64B' and 
-           'NDRDISC' and 
-           '2T2C' and 
-           'VHOST' and 
-           not 'VXLAN' and 
-           not 'IP4FWD' and 
-           not 'DOT1Q' and 
+           '64B' and
+           'NDRPDR' and
+           '2T2C' and
+           'VHOST' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "latency"
@@ -13995,7 +12101,7 @@
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           'NDRDISC' and
+           'NDRPDR' and
            '1T1C' and
            'VTS'"
   parameters:
@@ -14016,7 +12122,7 @@
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           'NDRDISC' and
+           'NDRPDR' and
            '2T2C' and
            'VTS'"
   parameters:
@@ -14388,7 +12494,7 @@
            'BASE' and
            'NDRPDR' and
            '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "latency"
   - "parent"
@@ -14412,7 +12518,7 @@
            'BASE' and
            'NDRPDR' and
            '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "latency"
   - "parent"
@@ -14437,7 +12543,7 @@
            'BASE' and
            'NDRPDR' and
            '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "latency"
   - "parent"
@@ -14461,7 +12567,7 @@
            'BASE' and
            'NDRPDR' and
            '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "latency"
   - "parent"
@@ -14486,7 +12592,7 @@
            'BASE' and
            'NDRPDR' and
            '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "latency"
   - "parent"
@@ -14510,7 +12616,7 @@
            'BASE' and
            'NDRPDR' and
            '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "latency"
   - "parent"
@@ -14535,7 +12641,7 @@
            'BASE' and
            'NDRPDR' and
            '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "latency"
   - "parent"
@@ -14559,7 +12665,7 @@
            'BASE' and
            'NDRPDR' and
            '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "latency"
   - "parent"
@@ -14584,7 +12690,7 @@
            'BASE' and
            'NDRPDR' and
            '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "latency"
   - "parent"
@@ -14608,7 +12714,7 @@
            'BASE' and
            'NDRPDR' and
            '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "latency"
   - "parent"
@@ -14633,7 +12739,7 @@
            'BASE' and
            'NDRPDR' and
            '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "latency"
   - "parent"
@@ -14657,7 +12763,7 @@
            'BASE' and
            'NDRPDR' and
            '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "latency"
   - "parent"
@@ -14682,192 +12788,57 @@
            'BASE' and
            'NDRPDR' and
            '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
-  parameters:
-  - "latency"
-  - "parent"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: ""  # No title
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "DPDK Latency: testpmd-2n-skx-xxv710-64b-4t2c-base-ndr-lat"
-  algorithm: "plot_latency_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-xxv710-64b-4t2c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "latency"
   - "parent"
   traces:
     hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: ""  # No title
-    layout: "plot-latency"
-
-################################################################################
-
-# Speedup - VPP Container Memif 3n-hsw-x520
--
-  type: "plot"
-  title: "Speedup: memif-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRDISC' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput-speedup-analysis"
-
--
-  type: "plot"
-  title: "Speedup: memif-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput-speedup-analysis"
-
-# Speedup - VPP Container Memif 3n-hsw-x710
--
-  type: "plot"
-  title: "Speedup: memif-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRDISC' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput-speedup-analysis"
-
--
-  type: "plot"
-  title: "Speedup: memif-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput-speedup-analysis"
-
-# Speedup - VPP Container Memif 3n-hsw-xl710
--
-  type: "plot"
-  title: "Speedup: memif-3n-hsw-xl710-64b-base_and_scale-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRDISC' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
     title: ""  # No title
-    layout: "plot-throughput-speedup-analysis"
+    layout: "plot-latency"
 
 -
   type: "plot"
-  title: "Speedup: memif-3n-hsw-xl710-64b-base_and_scale-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Latency: testpmd-2n-skx-xxv710-64b-4t2c-base-ndr-lat"
+  algorithm: "plot_latency_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-xxv710-64b-4t2c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
-           ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           not 'VHOST' and
-           'MEMIF'"
+           'BASE' and
+           'NDRPDR' and
+           '4T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
-  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
     title: ""  # No title
-    layout: "plot-throughput-speedup-analysis"
+    layout: "plot-latency"
 
-# Speedup - VPP Container Memif 3n-skx-x710
+################################################################################
+
+# Speedup - VPP Container Memif 3n-hsw-x520
 -
   type: "plot"
-  title: "Speedup: memif-3n-skx-x710-64b-base_and_scale-ndr-tsa"
+  title: "Speedup: memif-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'NDRPDR' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
@@ -14880,18 +12851,18 @@
 
 -
   type: "plot"
-  title: "Speedup: memif-3n-skx-x710-64b-base_and_scale-pdr-tsa"
+  title: "Speedup: memif-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'NDRPDR' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-            'MEMIF'"
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
@@ -14900,19 +12871,19 @@
     title: ""  # No title
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP Container Memif 3n-skx-xxv710
+# Speedup - VPP Container Memif 3n-hsw-x710
 -
   type: "plot"
-  title: "Speedup: memif-3n-skx-xxv710-64b-base_and_scale-ndr-tsa"
+  title: "Speedup: memif-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-xxv710-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'NDRPDR' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
@@ -14925,16 +12896,16 @@
 
 -
   type: "plot"
-  title: "Speedup: memif-3n-skx-xxv710-64b-base_and_scale-pdr-tsa"
+  title: "Speedup: memif-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-xxv710-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'NDRPDR' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
@@ -14945,19 +12916,19 @@
     title: ""  # No title
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP Container Memif 2n-skx-x710
+# Speedup - VPP Container Memif 3n-hsw-xl710
 -
   type: "plot"
-  title: "Speedup: memif-2n-skx-x710-64b-base_and_scale-ndr-tsa"
+  title: "Speedup: memif-3n-hsw-xl710-64b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-base_and_scale-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'NDRPDR' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
@@ -14970,16 +12941,16 @@
 
 -
   type: "plot"
-  title: "Speedup: memif-2n-skx-x710-64b-base_and_scale-pdr-tsa"
+  title: "Speedup: memif-3n-hsw-xl710-64b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-base_and_scale-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'NDRPDR' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
@@ -14990,19 +12961,19 @@
     title: ""  # No title
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP Container Memif 2n-skx-xxv710
+# Speedup - VPP Container Memif 3n-skx-x710
 -
   type: "plot"
-  title: "Speedup: memif-2n-skx-xxv710-64b-base_and_scale-ndr-tsa"
+  title: "Speedup: memif-3n-skx-x710-64b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-xxv710-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-base_and_scale-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'NDRPDR' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
@@ -15015,18 +12986,18 @@
 
 -
   type: "plot"
-  title: "Speedup: memif-2n-skx-xxv710-64b-base_and_scale-pdr-tsa"
+  title: "Speedup: memif-3n-skx-x710-64b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-xxv710-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-base_and_scale-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'NDRPDR' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           'MEMIF'"
+            'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
@@ -15048,8 +13019,8 @@
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'NDRPDR' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
@@ -15070,8 +13041,8 @@
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'NDRPDR' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
@@ -15093,8 +13064,8 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'NDRPDR' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
@@ -15115,53 +13086,8 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput-speedup-analysis"
-
-# Speedup - VPP Container Memif 3n-hsw-xl710
--
-  type: "plot"
-  title: "Speedup: k8s-memif-3n-hsw-xl710-64b-base_and_scale-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-xl710-64b-base_and_scale-ndr-tsa"
-  data: "plot-ligato-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRDISC' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput-speedup-analysis"
-
--
-  type: "plot"
-  title: "Speedup: k8s-memif-3n-hsw-xl710-64b-base_and_scale-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-xl710-64b-base_and_scale-pdr-tsa"
-  data: "plot-ligato-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'NDRPDR' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
@@ -15185,9 +13111,9 @@
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            'IP4FWD' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -15207,9 +13133,9 @@
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            'IP4FWD' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -15230,9 +13156,9 @@
            '64B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
+           'NDRPDR' and
            'IP4FWD' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -15253,9 +13179,9 @@
            '64B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            'IP4FWD' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -15276,9 +13202,9 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            'IP4FWD' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -15298,9 +13224,9 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            'IP4FWD' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -15321,9 +13247,9 @@
            '64B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
+           'NDRPDR' and
            'IP4FWD' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -15344,9 +13270,9 @@
            '64B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            'IP4FWD' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -15367,9 +13293,9 @@
   filter: "'NIC_Intel-XL710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            'IP4FWD' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -15389,9 +13315,9 @@
   filter: "'NIC_Intel-XL710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            'IP4FWD' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -15412,9 +13338,9 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            'IP4FWD' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -15434,9 +13360,9 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            'IP4FWD' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -15457,9 +13383,9 @@
            '64B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
+           'NDRPDR' and
            'IP4FWD' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -15480,9 +13406,9 @@
            '64B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            'IP4FWD' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -15503,9 +13429,9 @@
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            'IP4FWD' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -15525,9 +13451,9 @@
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            'IP4FWD' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -15548,9 +13474,9 @@
            '64B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
+           'NDRPDR' and
            'IP4FWD' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -15571,9 +13497,9 @@
            '64B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            'IP4FWD' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -15594,100 +13520,9 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
-           'IP4FWD' and
-           not 'IPSEC' and 
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput-speedup-analysis"
-
--
-  type: "plot"
-  title: "Speedup: ip4-2n-skx-x710-64b-base_and_scale-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
-           'IP4FWD' and
-           not 'IPSEC' and 
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput-speedup-analysis"
-
--
-  type: "plot"
-  title: "Speedup: ip4-2n-skx-x710-64b-features-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-features-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
-           'IP4FWD' and
-           not 'IPSEC' and 
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput-speedup-analysis"
-
--
-  type: "plot"
-  title: "Speedup: ip4-2n-skx-x710-64b-features-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-features-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'PDRDISC' and not 'NDRDISC' and
-           'IP4FWD' and
-           not 'IPSEC' and 
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput-speedup-analysis"
-
-# Speedup - VPP IPv4 2n-skx-xxv710
--
-  type: "plot"
-  title: "Speedup: ip4-2n-skx-xxv710-64b-base_and_scale-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            'IP4FWD' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -15699,17 +13534,17 @@
 
 -
   type: "plot"
-  title: "Speedup: ip4-2n-skx-xxv710-64b-base_and_scale-pdr-tsa"
+  title: "Speedup: ip4-2n-skx-x710-64b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-base_and_scale-pdr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-base_and_scale-pdr-tsa"
   data: "plot-throughput-speedup-analysis-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            'IP4FWD' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -15719,20 +13554,20 @@
     title: ""  # No title
     layout: "plot-throughput-speedup-analysis"
 
+# Speedup - VPP IPv4 2n-skx-xxv710
 -
   type: "plot"
-  title: "Speedup: ip4-2n-skx-xxv710-64b-features-ndr-tsa"
+  title: "Speedup: ip4-2n-skx-xxv710-64b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-features-ndr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-base_and_scale-ndr-tsa"
   data: "plot-throughput-speedup-analysis-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
            'IP4FWD' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -15744,18 +13579,17 @@
 
 -
   type: "plot"
-  title: "Speedup: ip4-2n-skx-xxv710-64b-features-pdr-tsa"
+  title: "Speedup: ip4-2n-skx-xxv710-64b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-features-pdr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-base_and_scale-pdr-tsa"
   data: "plot-throughput-speedup-analysis-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'PDRDISC' and not 'NDRDISC' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
            'IP4FWD' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -15779,9 +13613,9 @@
            '64B' and
            'ENCAP' and
            ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
-           'NDRDISC' and
+           'NDRPDR' and
            'IP4FWD' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -15802,9 +13636,9 @@
            '64B' and
            'ENCAP' and
            ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            'IP4FWD' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -15826,9 +13660,9 @@
            '64B' and
            'ENCAP' and
            ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
-           'NDRDISC' and
+           'NDRPDR' and
            'IP4FWD' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -15849,9 +13683,9 @@
            '64B' and
            'ENCAP' and
            ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            'IP4FWD' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -15873,9 +13707,9 @@
            '64B' and
            'ENCAP' and
            ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
-           'NDRDISC' and
+           'NDRPDR' and
            'IP4FWD' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -15896,9 +13730,9 @@
            '64B' and
            'ENCAP' and
            ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            'IP4FWD' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -15920,9 +13754,9 @@
            '64B' and
            'ENCAP' and
            ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
-           'NDRDISC' and
+           'NDRPDR' and
            'IP4FWD' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -15943,150 +13777,9 @@
            '64B' and
            'ENCAP' and
            ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
-           'PDRDISC' and not 'NDRDISC' and
-           'IP4FWD' and
-           not 'IPSEC' and 
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput-speedup-analysis"
-
-# Speedup - VPP IPv4 Tunnels 3n-skx-xxv710
--
-  type: "plot"
-  title: "Speedup: ip4tun-3n-skx-xxv710-64b-base_and_scale-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-xxv710-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'ENCAP' and
-           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
-           'NDRDISC' and
-           'IP4FWD' and
-           not 'IPSEC' and 
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput-speedup-analysis"
-
--
-  type: "plot"
-  title: "Speedup: ip4tun-3n-skx-xxv710-64b-base_and_scale-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-xxv710-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'ENCAP' and
-           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
-           'PDRDISC' and not 'NDRDISC' and
-           'IP4FWD' and
-           not 'IPSEC' and 
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput-speedup-analysis"
-
-# Speedup - VPP IPv4 Tunnels 2n-skx-x710
--
-  type: "plot"
-  title: "Speedup: ip4tun-2n-skx-x710-64b-base_and_scale-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-2n-skx-x710-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'ENCAP' and
-           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
-           'NDRDISC' and
-           'IP4FWD' and
-           not 'IPSEC' and 
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput-speedup-analysis"
-
--
-  type: "plot"
-  title: "Speedup: ip4tun-2n-skx-x710-64b-base_and_scale-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-2n-skx-x710-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'ENCAP' and
-           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
-           'PDRDISC' and not 'NDRDISC' and
-           'IP4FWD' and
-           not 'IPSEC' and 
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput-speedup-analysis"
-
-# Speedup - VPP IPv4 Tunnels 2n-skx-xxv710
--
-  type: "plot"
-  title: "Speedup: ip4tun-2n-skx-xxv710-64b-base_and_scale-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-2n-skx-xxv710-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'ENCAP' and
-           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
-           'NDRDISC' and
-           'IP4FWD' and
-           not 'IPSEC' and 
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput-speedup-analysis"
-
--
-  type: "plot"
-  title: "Speedup: ip4tun-2n-skx-xxv710-64b-base_and_scale-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-2n-skx-xxv710-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'ENCAP' and
-           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            'IP4FWD' and
-           not 'IPSEC' and 
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -16109,7 +13802,7 @@
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            'IP6FWD' and
            not 'SRv6' and
            not 'IPSEC' and
@@ -16132,7 +13825,7 @@
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
            ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            'IP6FWD' and
            not 'SRv6' and
            not 'IPSEC' and
@@ -16156,7 +13849,7 @@
            '78B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
+           'NDRPDR' and
            'IP6FWD' and
            not 'SRv6' and
            not 'IPSEC' and
@@ -16180,7 +13873,7 @@
            '78B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            'IP6FWD' and
            not 'SRv6' and
            not 'IPSEC' and
@@ -16204,7 +13897,7 @@
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            'IP6FWD' and
            not 'SRv6' and
            not 'IPSEC' and
@@ -16227,7 +13920,7 @@
   filter: "'NIC_Intel-X710' and
            '78B' and
            ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            'IP6FWD' and
            not 'SRv6' and
            not 'IPSEC' and
@@ -16251,7 +13944,7 @@
            '78B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
+           'NDRPDR' and
            'IP6FWD' and
            not 'SRv6' and
            not 'IPSEC' and
@@ -16275,7 +13968,7 @@
            '78B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            'IP6FWD' and
            not 'SRv6' and
            not 'IPSEC' and
@@ -16299,7 +13992,7 @@
   filter: "'NIC_Intel-XL710' and
            '78B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            'IP6FWD' and
            not 'SRv6' and
            not 'IPSEC' and
@@ -16322,7 +14015,7 @@
   filter: "'NIC_Intel-XL710' and
            '78B' and
            ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            'IP6FWD' and
            not 'SRv6' and
            not 'IPSEC' and
@@ -16338,110 +14031,15 @@
 # Speedup - VPP IPv6 3n-skx-x710
 -
   type: "plot"
-  title: "Speedup: ip6-3n-skx-x710-78b-base_and_scale-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('BASE' or 'SCALE') and
-           'NDRDISC' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput-speedup-analysis"
-
--
-  type: "plot"
-  title: "Speedup: ip6-3n-skx-x710-78b-base_and_scale-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput-speedup-analysis"
-
--
-  type: "plot"
-  title: "Speedup: ip6-3n-skx-x710-78b-features-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-features-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput-speedup-analysis"
-
--
-  type: "plot"
-  title: "Speedup: ip6-3n-skx-x710-78b-features-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-features-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'PDRDISC' and not 'NDRDISC' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput-speedup-analysis"
-
-# Speedup - VPP IPv6 3n-skx-xxv710
--
-  type: "plot"
-  title: "Speedup: ip6-3n-skx-xxv710-78b-base_and_scale-ndr-tsa"
+  title: "Speedup: ip6-3n-skx-x710-78b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-xxv710-78b-base_and_scale-ndr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-base_and_scale-ndr-tsa"
   data: "plot-throughput-speedup-analysis-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  filter: "'NIC_Intel-X710' and
            '78B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            'IP6FWD' and
            not 'SRv6' and
            not 'IPSEC' and
@@ -16456,15 +14054,15 @@
 
 -
   type: "plot"
-  title: "Speedup: ip6-3n-skx-xxv710-78b-base_and_scale-pdr-tsa"
+  title: "Speedup: ip6-3n-skx-x710-78b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-xxv710-78b-base_and_scale-pdr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-base_and_scale-pdr-tsa"
   data: "plot-throughput-speedup-analysis-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  filter: "'NIC_Intel-X710' and
            '78B' and
            ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            'IP6FWD' and
            not 'SRv6' and
            not 'IPSEC' and
@@ -16479,16 +14077,16 @@
 
 -
   type: "plot"
-  title: "Speedup: ip6-3n-skx-xxv710-78b-features-ndr-tsa"
+  title: "Speedup: ip6-3n-skx-x710-78b-features-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-xxv710-78b-features-ndr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-features-ndr-tsa"
   data: "plot-throughput-speedup-analysis-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  filter: "'NIC_Intel-X710' and
            '78B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
+           'NDRPDR' and
            'IP6FWD' and
            not 'SRv6' and
            not 'IPSEC' and
@@ -16503,16 +14101,16 @@
 
 -
   type: "plot"
-  title: "Speedup: ip6-3n-skx-xxv710-78b-features-pdr-tsa"
+  title: "Speedup: ip6-3n-skx-x710-78b-features-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-xxv710-78b-features-pdr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-features-pdr-tsa"
   data: "plot-throughput-speedup-analysis-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  filter: "'NIC_Intel-X710' and
            '78B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            'IP6FWD' and
            not 'SRv6' and
            not 'IPSEC' and
@@ -16525,18 +14123,18 @@
     title: ""  # No title
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP IPv6 2n-skx-x710
+# Speedup - VPP IPv6 3n-skx-xxv710
 -
   type: "plot"
-  title: "Speedup: ip6-2n-skx-x710-78b-base_and_scale-ndr-tsa"
+  title: "Speedup: ip6-3n-skx-xxv710-78b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-xxv710-78b-base_and_scale-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '78B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            'IP6FWD' and
            not 'SRv6' and
            not 'IPSEC' and
@@ -16551,16 +14149,17 @@
 
 -
   type: "plot"
-  title: "Speedup: ip6-2n-skx-x710-78b-base_and_scale-pdr-tsa"
+  title: "Speedup: ip6-3n-skx-xxv710-78b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-xxv710-78b-base_and_scale-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '78B' and
            ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            'IP6FWD' and
+           not 'SRv6' and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -16573,16 +14172,16 @@
 
 -
   type: "plot"
-  title: "Speedup: ip6-2n-skx-x710-78b-features-ndr-tsa"
+  title: "Speedup: ip6-3n-skx-xxv710-78b-features-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-features-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-xxv710-78b-features-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '78B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
+           'NDRPDR' and
            'IP6FWD' and
            not 'SRv6' and
            not 'IPSEC' and
@@ -16597,16 +14196,16 @@
 
 -
   type: "plot"
-  title: "Speedup: ip6-2n-skx-x710-78b-features-pdr-tsa"
+  title: "Speedup: ip6-3n-skx-xxv710-78b-features-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-features-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-xxv710-78b-features-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '78B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            'IP6FWD' and
            not 'SRv6' and
            not 'IPSEC' and
@@ -16619,18 +14218,18 @@
     title: ""  # No title
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP IPv6 2n-skx-xxv710
+# Speedup - VPP IPv6 2n-skx-x710
 -
   type: "plot"
-  title: "Speedup: ip6-2n-skx-xxv710-78b-base_and_scale-ndr-tsa"
+  title: "Speedup: ip6-2n-skx-x710-78b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-base_and_scale-ndr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-base_and_scale-ndr-tsa"
   data: "plot-throughput-speedup-analysis-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  filter: "'NIC_Intel-X710' and
            '78B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
+           'NDRPDR' and
            'IP6FWD' and
            not 'SRv6' and
            not 'IPSEC' and
@@ -16645,17 +14244,16 @@
 
 -
   type: "plot"
-  title: "Speedup: ip6-2n-skx-xxv710-78b-base_and_scale-pdr-tsa"
+  title: "Speedup: ip6-2n-skx-x710-78b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-base_and_scale-pdr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-base_and_scale-pdr-tsa"
   data: "plot-throughput-speedup-analysis-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  filter: "'NIC_Intel-X710' and
            '78B' and
            ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            'IP6FWD' and
-           not 'SRv6' and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -16666,18 +14264,18 @@
     title: ""  # No title
     layout: "plot-throughput-speedup-analysis"
 
+# Speedup - VPP IPv6 2n-skx-xxv710
 -
   type: "plot"
-  title: "Speedup: ip6-2n-skx-xxv710-78b-features-ndr-tsa"
+  title: "Speedup: ip6-2n-skx-xxv710-78b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-features-ndr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-base_and_scale-ndr-tsa"
   data: "plot-throughput-speedup-analysis-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '78B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
            'IP6FWD' and
            not 'SRv6' and
            not 'IPSEC' and
@@ -16692,16 +14290,15 @@
 
 -
   type: "plot"
-  title: "Speedup: ip6-2n-skx-xxv710-78b-features-pdr-tsa"
+  title: "Speedup: ip6-2n-skx-xxv710-78b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-features-pdr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-base_and_scale-pdr-tsa"
   data: "plot-throughput-speedup-analysis-2n-skx"
   filter: "'NIC_Intel-XXV710' and
            '78B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'PDRDISC' and not 'NDRDISC' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
            'IP6FWD' and
            not 'SRv6' and
            not 'IPSEC' and
@@ -16727,7 +14324,7 @@
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
            'ENCAP' and
-           'NDRDISC' and
+           'NDRPDR' and
            ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
            not 'VHOST'"
   parameters:
@@ -16748,7 +14345,7 @@
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
            'ENCAP' and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
            not 'VHOST'"
   parameters:
@@ -16772,7 +14369,7 @@
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'IP4FWD' and
-           'NDRDISC' and
+           'NDRPDR' and
            'IPSECHW' and
            ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
@@ -16794,7 +14391,7 @@
   filter: "'NIC_Intel-XL710' and
            '64B' and
            'IP4FWD' and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            'IPSECHW' and
            ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
@@ -16819,7 +14416,7 @@
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
            'FEATURE' and
-           'NDRDISC' and
+           'NDRPDR' and
            'IP6FWD' and
            'SRv6'"
   parameters:
@@ -16840,7 +14437,7 @@
   filter: "'NIC_Intel-X520-DA2' and
            '78B' and
            'FEATURE' and
-           'PDRDISC' and not 'NDRDISC' and
+           'NDRPDR' and
            'IP6FWD' and
            'SRv6'"
   parameters:
@@ -16864,8 +14461,8 @@
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'NDRPDR' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -16886,8 +14483,8 @@
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'NDRPDR' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -16909,8 +14506,8 @@
            '64B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'NDRPDR' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -16932,8 +14529,8 @@
            '64B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'PDRDISC' and not 'NDRDISC' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'NDRPDR' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -16955,8 +14552,8 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'NDRPDR' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -16977,8 +14574,8 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'NDRPDR' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -17000,8 +14597,8 @@
            '64B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'NDRPDR' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -17023,8 +14620,8 @@
            '64B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'PDRDISC' and not 'NDRDISC' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'NDRPDR' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -17046,8 +14643,8 @@
   filter: "'NIC_Intel-XL710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'NDRPDR' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -17068,8 +14665,8 @@
   filter: "'NIC_Intel-XL710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'NDRPDR' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -17091,8 +14688,8 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'NDRPDR' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -17113,8 +14710,8 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'NDRPDR' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -17136,8 +14733,8 @@
            '64B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'NDRPDR' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -17159,8 +14756,8 @@
            '64B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'PDRDISC' and not 'NDRDISC' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'NDRPDR' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -17182,8 +14779,8 @@
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'NDRPDR' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -17204,8 +14801,8 @@
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'NDRPDR' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -17227,8 +14824,8 @@
            '64B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'NDRPDR' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -17250,8 +14847,8 @@
            '64B' and
            'FEATURE' and
            ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'PDRDISC' and not 'NDRDISC' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'NDRPDR' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -17273,8 +14870,8 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'NDRPDR' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -17295,54 +14892,8 @@
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput-speedup-analysis"
-
--
-  type: "plot"
-  title: "Speedup: l2sw-2n-skx-x710-64b-features-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-x710-64b-features-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput-speedup-analysis"
-
--
-  type: "plot"
-  title: "Speedup: l2sw-2n-skx-x710-64b-features-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-x710-64b-features-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'PDRDISC' and not 'NDRDISC' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'NDRPDR' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -17364,8 +14915,8 @@
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'NDRDISC' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'NDRPDR' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -17386,54 +14937,8 @@
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('BASE' or 'SCALE') and
-           'PDRDISC' and not 'NDRDISC' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput-speedup-analysis"
-
--
-  type: "plot"
-  title: "Speedup: l2sw-2n-skx-xxv710-64b-features-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-xxv710-64b-features-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRDISC' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput-speedup-analysis"
-
--
-  type: "plot"
-  title: "Speedup: l2sw-2n-skx-xxv710-64b-features-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-xxv710-64b-features-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'PDRDISC' and not 'NDRDISC' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
+           'NDRPDR' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
@@ -17455,10 +14960,10 @@
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
   data: "plot-throughput-speedup-analysis-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
-           '64B' and 
-           'NDRDISC' and
-           'VHOST' and 
-           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
+           '64B' and
+           'NDRPDR' and
+           'VHOST' and
+           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -17475,10 +14980,10 @@
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
   data: "plot-throughput-speedup-analysis-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
-           '64B' and 
-           'PDRDISC' and not 'NDRDISC' and
-           'VHOST' and 
-           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
+           '64B' and
+           'NDRPDR' and
+           'VHOST' and
+           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -17496,12 +15001,12 @@
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
   data: "plot-throughput-speedup-analysis-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
-           '64B' and 
-           'NDRDISC' and
-           'VHOST' and 
-           not 'VXLAN' and 
-           not 'IP4FWD' and 
-           not 'DOT1Q' and 
+           '64B' and
+           'NDRPDR' and
+           'VHOST' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
@@ -17519,12 +15024,12 @@
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
   data: "plot-throughput-speedup-analysis-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
-           '64B' and 
-           'PDRDISC' and not 'NDRDISC' and
-           'VHOST' and 
-           not 'VXLAN' and 
-           not 'IP4FWD' and 
-           not 'DOT1Q' and 
+           '64B' and
+           'NDRPDR' and
+           'VHOST' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
@@ -17543,10 +15048,10 @@
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
   data: "plot-throughput-speedup-analysis-3n-hsw"
   filter: "'NIC_Intel-X710' and
-           '64B' and 
-           'NDRDISC' and
-           'VHOST' and 
-           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
+           '64B' and
+           'NDRPDR' and
+           'VHOST' and
+           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -17563,10 +15068,10 @@
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
   data: "plot-throughput-speedup-analysis-3n-hsw"
   filter: "'NIC_Intel-X710' and
-           '64B' and 
-           'PDRDISC' and not 'NDRDISC' and
-           'VHOST' and 
-           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
+           '64B' and
+           'NDRPDR' and
+           'VHOST' and
+           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -17584,12 +15089,12 @@
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
   data: "plot-throughput-speedup-analysis-3n-hsw"
   filter: "'NIC_Intel-X710' and
-           '64B' and 
-           'NDRDISC' and
-           'VHOST' and 
-           not 'VXLAN' and 
-           not 'IP4FWD' and 
-           not 'DOT1Q' and 
+           '64B' and
+           'NDRPDR' and
+           'VHOST' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
@@ -17607,12 +15112,12 @@
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
   data: "plot-throughput-speedup-analysis-3n-hsw"
   filter: "'NIC_Intel-X710' and
-           '64B' and 
-           'PDRDISC' and not 'NDRDISC' and
-           'VHOST' and 
-           not 'VXLAN' and 
-           not 'IP4FWD' and 
-           not 'DOT1Q' and 
+           '64B' and
+           'NDRPDR' and
+           'VHOST' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
@@ -17631,10 +15136,10 @@
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-xl710-64b-base_and_scale-ndr-tsa"
   data: "plot-throughput-speedup-analysis-3n-hsw"
   filter: "'NIC_Intel-XL710' and
-           '64B' and 
-           'NDRDISC' and
-           'VHOST' and 
-           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
+           '64B' and
+           'NDRPDR' and
+           'VHOST' and
+           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -17651,10 +15156,10 @@
   output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-xl710-64b-base_and_scale-pdr-tsa"
   data: "plot-throughput-speedup-analysis-3n-hsw"
   filter: "'NIC_Intel-XL710' and
-           '64B' and 
-           'PDRDISC' and not 'NDRDISC' and
-           'VHOST' and 
-           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
+           '64B' and
+           'NDRPDR' and
+           'VHOST' and
+           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   - "throughput"
   - "parent"
@@ -17672,12 +15177,12 @@
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-base_and_scale-ndr-tsa"
   data: "plot-throughput-speedup-analysis-3n-hsw"
   filter: "'NIC_Intel-XL710' and
-           '64B' and 
-           'NDRDISC' and
-           'VHOST' and 
-           not 'VXLAN' and 
-           not 'IP4FWD' and 
-           not 'DOT1Q' and 
+           '64B' and
+           'NDRPDR' and
+           'VHOST' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
@@ -17695,12 +15200,12 @@
   output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-base_and_scale-pdr-tsa"
   data: "plot-throughput-speedup-analysis-3n-hsw"
   filter: "'NIC_Intel-XL710' and
-           '64B' and 
-           'PDRDISC' and not 'NDRDISC' and
-           'VHOST' and 
-           not 'VXLAN' and 
-           not 'IP4FWD' and 
-           not 'DOT1Q' and 
+           '64B' and
+           'NDRPDR' and
+           'VHOST' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
@@ -17709,3 +15214,42 @@
   layout:
     title: ""  # No title
     layout: "plot-throughput-speedup-analysis"
+
+# Speedup - VPP vhost l2sw 3n-hsw-x520
+-
+  type: "plot"
+  title: "VPP Speedup: vts-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           'NDRPDR' and
+           'VTS'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  layout:
+    title: ""  # No title
+    layout: "plot-throughput-speedup-analysis"
+
+-
+  type: "plot"
+  title: "VPP Speedup: vts-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           'NDRPDR' and
+           'VTS'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  layout:
+    title: ""  # No title
+    layout: "plot-throughput-speedup-analysis"