X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fspecification.yaml;h=a795b705935c61ffc8b90c675bf08e86ec3b7856;hb=70b50286ea9145d2720d8bcb36d522b96a0b0ac2;hp=17c3809156fdded1f9c277d80d4a271b3f426cfc;hpb=87c9212433574478b9c19a702c74bbaf39567404;p=csit.git

diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml
index 17c3809156..a795b70593 100644
--- a/resources/tools/presentation/specification.yaml
+++ b/resources/tools/presentation/specification.yaml
@@ -151,6 +151,9 @@
       - 12  # NDRPDR sel
       - 14  # NDRPDR sel
       - 18  # NDRPDR sel
+      - 23  # NDRPDR sel
+      - 25  # NDRPDR sel
+      - 38  # NDRPDR sel
 
     vpp-compare-testbeds:
       csit-vpp-perf-verify-1810-3n-hsw:
@@ -159,6 +162,9 @@
       - 12  # NDRPDR sel
       - 14  # NDRPDR sel
       - 18  # NDRPDR sel
+      - 23  # NDRPDR sel
+      - 25  # NDRPDR sel
+      - 38  # NDRPDR sel
       csit-vpp-perf-verify-1810-3n-skx:
       - 24  # NDRPDR full
       - 10  # NDRPDR sel
@@ -170,6 +176,7 @@
       - 20  # NDRPDR sel
       - 21  # NDRPDR sel
       - 22  # NDRPDR sel
+      - 25  # NDRPDR sel
 
     vpp-compare-testbeds-mrr:
       csit-vpp-perf-verify-1810-3n-hsw:
@@ -210,12 +217,14 @@
 
     vpp-perf-results-3n-hsw:
       csit-vpp-perf-verify-1810-3n-hsw:
-      # TODO: Replace with full
-      - 8   # NDRPDR sel
+      - 20  # NDRPDR full
+      - 21  # NDRPDR full
+      - 22  # NDRPDR full
+      - 27  # NDRPDR full
 
     vpp-perf-results-3n-skx:
       csit-vpp-perf-verify-1810-3n-skx:
-      # TODO: Add data
+      - 23  # NDRPDR full
       - 24  # NDRPDR full
 
     vpp-perf-results-2n-skx:
@@ -245,6 +254,9 @@
       - 12  # NDRPDR sel
       - 14  # NDRPDR sel
       - 18  # NDRPDR sel
+      - 23  # NDRPDR sel
+      - 25  # NDRPDR sel
+      - 38  # NDRPDR sel
 
     plot-throughput-speedup-analysis-3n-skx:
       csit-vpp-perf-verify-1810-3n-skx:
@@ -258,6 +270,7 @@
       - 20  # NDRPDR sel
       - 21  # NDRPDR sel
       - 22  # NDRPDR sel
+      - 25  # NDRPDR sel
 
     plot-throughput-speedup-analysis-2n-skx:
       csit-vpp-perf-verify-1810-2n-skx:
@@ -270,6 +283,7 @@
       - 22  # NDRPDR sel
       - 23  # NDRPDR sel
       - 24  # NDRPDR sel
+      - 27  # NDRPDR sel
 
     plot-vpp-throughput-latency-3n-hsw:
       csit-vpp-perf-verify-1810-3n-hsw:
@@ -278,6 +292,9 @@
       - 12  # NDRPDR sel
       - 14  # NDRPDR sel
       - 18  # NDRPDR sel
+      - 23  # NDRPDR sel
+      - 25  # NDRPDR sel
+      - 38  # NDRPDR sel
 
     plot-vpp-throughput-latency-3n-skx:
       csit-vpp-perf-verify-1810-3n-skx:
@@ -291,6 +308,7 @@
       - 20  # NDRPDR sel
       - 21  # NDRPDR sel
       - 22  # NDRPDR sel
+      - 25  # NDRPDR sel
 
     plot-vpp-throughput-latency-2n-skx:
       csit-vpp-perf-verify-1810-2n-skx:
@@ -303,20 +321,20 @@
       - 22  # NDRPDR sel
       - 23  # NDRPDR sel
       - 24  # NDRPDR sel
+      - 27  # NDRPDR sel
 
     plot-vpp-http-server-performance:
-      # TODO: Replace with 1810 data:
-      csit-vpp-perf-verify-1807-3n-hsw:
-      - 24  # WRK
-      - 25  # WRK
-      - 23  # WRK
-      - 26  # WRK
-      - 27  # WRK
+      csit-vpp-perf-verify-1810-3n-hsw:
       - 28  # WRK
       - 29  # WRK
       - 30  # WRK
+      - 31  # WRK
       - 32  # WRK
+      - 33  # WRK
+      - 34  # WRK
       - 35  # WRK
+      - 36  # WRK
+      - 37  # WRK
 
     # VPP Functional
     vpp-func-results-ubuntu:
@@ -324,7 +342,6 @@
       - 44
 
     vpp-func-results-centos:
-      # TODO: Replace with 1810 data:
       csit-vpp-functional-1810-centos7-virl:
       - 44
 
@@ -334,25 +351,39 @@
 
     # VPP Ligato
     ligato-perf-results-3n-hsw:
-      # TODO: Replace with 1810 data:
-      csit-ligato-perf-1807-all:
-      - 3   # full ?
+      csit-ligato-perf-verify-1810-3n-hsw:
+      - 5   # full
 
     plot-ligato-throughput-speedup-analysis-3n-hsw:
-      # TODO: Replace with 1810 data:
-      csit-ligato-perf-1807-all:
-      - 3   # full ?
-      - 4   # sel
+      csit-ligato-perf-verify-1810-3n-hsw:
+      - 5   # full
+      - 6   # sel
+      - 8   # sel
+      - 9   # sel
+      - 11  # sel
+      - 12  # sel
+      - 13  # sel
+      - 14  # sel
+      - 16  # sel
+      - 17  # sel
+      - 18  # sel
 
     plot-ligato-throughput-latency-3n-hsw:
-      # TODO: Replace with 1810 data:
-      csit-ligato-perf-1807-all:
-      - 3   # full ?
-      - 4   # sel
+      csit-ligato-perf-verify-1810-3n-hsw:
+      - 5   # full
+      - 6   # sel
+      - 8   # sel
+      - 9   # sel
+      - 11  # sel
+      - 12  # sel
+      - 13  # sel
+      - 14  # sel
+      - 16  # sel
+      - 17  # sel
+      - 18  # sel
 
     # DPDK Performance
     dpdk-performance-changes:
-      # TODO: Replace with 1810 data:
       csit-dpdk-perf-1804-all:
       - 4
       - 5
@@ -375,88 +406,92 @@
       - 21
       - 22
       - 23
+      csit-dpdk-perf-verify-1810-3n-hsw:
+      - 1   # NDRPDR sel
+      - 2   # NDRPDR sel
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 5   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
 
     dpdk-compare-testbeds:
-      # TODO: Replace with 1810 data:
-      csit-dpdk-perf-verify-1807-3n-skx:
-      - 1
-      - 2
-      - 3
-      - 6
-      - 7
-      - 8
-      - 9
-      - 10
-      - 11
-      - 12
-      csit-dpdk-perf-verify-1807-3n-hsw:
-      - 11
-      - 12  # full
-      - 14
-      - 15
-      - 16
-      - 17
-      - 20
-      - 21
-      - 22
-      - 23
+      csit-dpdk-perf-verify-1810-3n-skx:
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
+      - 11  # NDRPDR sel
+      - 12  # NDRPDR sel
+      - 13  # NDRPDR sel
+      csit-dpdk-perf-verify-1810-3n-hsw:
+      - 1   # NDRPDR sel
+      - 2   # NDRPDR sel
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 5   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
 
     dpdk-perf-results-3n-hsw:
-      # TODO: Replace with 1810 data:
-      csit-dpdk-perf-verify-1807-3n-hsw:
-      - 12
+      csit-dpdk-perf-verify-1810-3n-hsw:
+      - 1
 
     dpdk-perf-results-3n-skx:
-      # TODO: Replace with 1810 data:
-      csit-dpdk-perf-verify-1807-3n-skx:
-      - 12
+      csit-dpdk-perf-verify-1810-3n-skx:
+      - 3   # NDRPDR sel
 
     dpdk-perf-results-2n-skx:
-      # TODO: Replace with 1810 data:
-      csit-dpdk-perf-verify-1807-2n-skx:
-      - 10
+      csit-dpdk-perf-verify-1810-2n-skx:
+      - 3
 
     plot-dpdk-throughput-latency-3n-hsw:
-      # TODO: Replace with 1810 data:
-      csit-dpdk-perf-verify-1807-3n-hsw:
-      - 11
-      - 12  # full
-      - 14
-      - 15
-      - 16
-      - 17
-      - 20
-      - 21
-      - 22
-      - 23
+      csit-dpdk-perf-verify-1810-3n-hsw:
+      - 1   # NDRPDR sel
+      - 2   # NDRPDR sel
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 5   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
 
     plot-dpdk-throughput-latency-3n-skx:
-      # TODO: Replace with 1810 data:
-      csit-dpdk-perf-verify-1807-3n-skx:
-      - 1
-      - 2
-      - 3
-      - 6
-      - 7
-      - 8
-      - 9
-      - 10
-      - 11
-      - 12
+      csit-dpdk-perf-verify-1810-3n-skx:
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
+      - 11  # NDRPDR sel
+      - 12  # NDRPDR sel
+      - 13  # NDRPDR sel
 
     plot-dpdk-throughput-latency-2n-skx:
-      # TODO: Replace with 1810 data:
-      csit-dpdk-perf-verify-1807-2n-skx:
-      - 1
-      - 2
-      - 3
-      - 4
-      - 5
-      - 6
-      - 7
-      - 8
-      - 9
-      - 10
+      csit-dpdk-perf-verify-1810-2n-skx:
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 5   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
+      - 11  # NDRPDR sel
+      - 12  # NDRPDR sel
+      - 13  # NDRPDR sel
 
     # HoneyComb Functional
     hc-func-results:
@@ -845,10 +880,27 @@
     # TODO: Add data:
     csit-vpp-perf-verify-1810-3n-hsw:
     - 9   # MRR sel
+    - 20  # NDRPDR full
+    - 21  # NDRPDR full
+    - 22  # NDRPDR full
+    - 27  # NDRPDR full
     - 8   # NDRPDR sel
     - 12  # NDRPDR sel
     - 14  # NDRPDR sel
     - 18  # NDRPDR sel
+    - 23  # NDRPDR sel
+    - 25  # NDRPDR sel
+    - 38  # NDRPDR sel
+    - 28  # WRK
+    - 29  # WRK
+    - 30  # WRK
+    - 31  # WRK
+    - 32  # WRK
+    - 33  # WRK
+    - 34  # WRK
+    - 35  # WRK
+    - 36  # WRK
+    - 37  # WRK
     csit-vpp-perf-verify-1807-3n-skx:
     - 31  # MRR full
     - 28  # MRR sel
@@ -879,6 +931,7 @@
     - 11  # MRR sel
     - 12  # MRR sel
     - 13  # MRR sel
+    - 23  # NDRPDR full
     - 24  # NDRPDR full
     - 10  # NDRPDR sel
     - 14  # NDRPDR sel
@@ -889,6 +942,7 @@
     - 20  # NDRPDR sel
     - 21  # NDRPDR sel
     - 22  # NDRPDR sel
+    - 25  # NDRPDR sel
     csit-vpp-perf-verify-1807-2n-skx:
     - 27  # MRR full
     - 31  # MRR sel
@@ -929,6 +983,7 @@
     - 22  # NDRPDR sel
     - 23  # NDRPDR sel
     - 24  # NDRPDR sel
+    - 27  # NDRPDR sel
     csit-vpp-perf-check-1804:
     - 5   # mrr - full
     - 6   # mrr - sel
@@ -941,21 +996,18 @@
     - 20  # mrr - sel
     - 21  # mrr - sel
     - 22  # mrr - sel
-    csit-ligato-perf-1804-all:
-    - 4   # full
-    - 5   # sel
+    csit-ligato-perf-verify-1810-3n-hsw:
+    - 5   # full
     - 6   # sel
-    - 7   # sel
     - 8   # sel
     - 9   # sel
-    - 10  # sel
     - 11  # sel
     - 12  # sel
     - 13  # sel
     - 14  # sel
-    csit-ligato-perf-1807-all:
-    - 3   # full ?
-    - 4   # sel
+    - 16  # sel
+    - 17  # sel
+    - 18  # sel
     csit-dpdk-perf-1804-all:
     - 4
     - 5
@@ -978,6 +1030,17 @@
     - 21
     - 22
     - 23
+    csit-dpdk-perf-verify-1810-3n-hsw:
+    - 1   # NDRPDR sel
+    - 2   # NDRPDR sel
+    - 3   # NDRPDR sel
+    - 4   # NDRPDR sel
+    - 5   # NDRPDR sel
+    - 6   # NDRPDR sel
+    - 7   # NDRPDR sel
+    - 8   # NDRPDR sel
+    - 9   # NDRPDR sel
+    - 10  # NDRPDR sel
     csit-dpdk-perf-verify-1807-3n-skx:
     - 1
     - 2
@@ -989,17 +1052,29 @@
     - 10
     - 11
     - 12
-    csit-dpdk-perf-verify-1807-2n-skx:
-    - 1
-    - 2
-    - 3
-    - 4
-    - 5
-    - 6
-    - 7
-    - 8
-    - 9
-    - 10
+    csit-dpdk-perf-verify-1810-3n-skx:
+    - 3   # NDRPDR sel
+    - 4   # NDRPDR sel
+    - 6   # NDRPDR sel
+    - 7   # NDRPDR sel
+    - 8   # NDRPDR sel
+    - 9   # NDRPDR sel
+    - 10  # NDRPDR sel
+    - 11  # NDRPDR sel
+    - 12  # NDRPDR sel
+    - 13  # NDRPDR sel
+    csit-dpdk-perf-verify-1810-2n-skx:
+    - 3   # NDRPDR sel
+    - 4   # NDRPDR sel
+    - 5   # NDRPDR sel
+    - 7   # NDRPDR sel
+    - 8   # NDRPDR sel
+    - 9   # NDRPDR sel
+    - 10  # NDRPDR sel
+    - 11  # NDRPDR sel
+    - 12  # NDRPDR sel
+    - 13  # NDRPDR sel
+
     csit-vpp-functional-1810-ubuntu1604-virl:
     - 44
     csit-vpp-functional-1810-centos7-virl:
@@ -1075,6 +1150,9 @@
       - 12  # NDRPDR sel
       - 14  # NDRPDR sel
       - 18  # NDRPDR sel
+      - 23  # NDRPDR sel
+      - 25  # NDRPDR sel
+      - 38  # NDRPDR sel
   data: "vpp-performance-changes"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -1129,6 +1207,9 @@
       - 12  # NDRPDR sel
       - 14  # NDRPDR sel
       - 18  # NDRPDR sel
+      - 23  # NDRPDR sel
+      - 25  # NDRPDR sel
+      - 38  # NDRPDR sel
   data: "vpp-performance-changes"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -1183,6 +1264,9 @@
       - 12  # NDRPDR sel
       - 14  # NDRPDR sel
       - 18  # NDRPDR sel
+      - 23  # NDRPDR sel
+      - 25  # NDRPDR sel
+      - 38  # NDRPDR sel
   data: "vpp-performance-changes"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -1237,6 +1321,9 @@
       - 12  # NDRPDR sel
       - 14  # NDRPDR sel
       - 18  # NDRPDR sel
+      - 23  # NDRPDR sel
+      - 25  # NDRPDR sel
+      - 38  # NDRPDR sel
   data: "vpp-performance-changes"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -1259,6 +1346,9 @@
       - 12  # NDRPDR sel
       - 14  # NDRPDR sel
       - 18  # NDRPDR sel
+      - 23  # NDRPDR sel
+      - 25  # NDRPDR sel
+      - 38  # NDRPDR sel
   compare:
     title: "3-Node Skx"
     data:
@@ -1272,6 +1362,7 @@
       - 20  # NDRPDR sel
       - 21  # NDRPDR sel
       - 22  # NDRPDR sel
+      - 25  # NDRPDR sel
   data: "vpp-compare-testbeds"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'NIC_Intel-X710' and 'NDRPDR'"
@@ -1294,6 +1385,9 @@
       - 12  # NDRPDR sel
       - 14  # NDRPDR sel
       - 18  # NDRPDR sel
+      - 23  # NDRPDR sel
+      - 25  # NDRPDR sel
+      - 38  # NDRPDR sel
   compare:
     title: "3-Node Skx"
     data:
@@ -1307,6 +1401,7 @@
       - 20  # NDRPDR sel
       - 21  # NDRPDR sel
       - 22  # NDRPDR sel
+      - 25  # NDRPDR sel
   data: "vpp-compare-testbeds"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'NIC_Intel-X710' and 'NDRPDR'"
@@ -1988,21 +2083,22 @@
   title: "DPDK Performance Changes 1t1c pdr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-1t1c-pdr"
+  history:
+    -
+      title: "rls1804"
+      data:
+        csit-dpdk-perf-1804-all:
+        - 4
+        - 5
+        - 6
+        - 7
+        - 8
+        - 9
+        - 10
+        - 11
+        - 12
+        - 13
   reference:
-    title: "rls1804"
-    data:
-      csit-dpdk-perf-1804-all:
-      - 4
-      - 5
-      - 6
-      - 7
-      - 8
-      - 9
-      - 10
-      - 11
-      - 12
-      - 13
-  compare:
     title: "rls1807"
     data:
       csit-dpdk-perf-verify-1807-3n-hsw:
@@ -2016,6 +2112,20 @@
       - 21
       - 22
       - 23
+  compare:
+    title: "rls1810"
+    data:
+      csit-dpdk-perf-verify-1810-3n-hsw:
+      - 1   # NDRPDR sel
+      - 2   # NDRPDR sel
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 5   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
   data: "dpdk-performance-changes"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -2030,21 +2140,22 @@
   title: "DPDK Performance Changes 2t2c pdr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-2t2c-pdr"
+  history:
+    -
+      title: "rls1804"
+      data:
+        csit-dpdk-perf-1804-all:
+        - 4
+        - 5
+        - 6
+        - 7
+        - 8
+        - 9
+        - 10
+        - 11
+        - 12
+        - 13
   reference:
-    title: "rls1804"
-    data:
-      csit-dpdk-perf-1804-all:
-      - 4
-      - 5
-      - 6
-      - 7
-      - 8
-      - 9
-      - 10
-      - 11
-      - 12
-      - 13
-  compare:
     title: "rls1807"
     data:
       csit-dpdk-perf-verify-1807-3n-hsw:
@@ -2058,6 +2169,20 @@
       - 21
       - 22
       - 23
+  compare:
+    title: "rls1810"
+    data:
+      csit-dpdk-perf-verify-1810-3n-hsw:
+      - 1   # NDRPDR sel
+      - 2   # NDRPDR sel
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 5   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
   data: "dpdk-performance-changes"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -2072,21 +2197,22 @@
   title: "DPDK Performance Changes 1t1c ndr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-1t1c-ndr"
+  history:
+    -
+      title: "rls1804"
+      data:
+        csit-dpdk-perf-1804-all:
+        - 4
+        - 5
+        - 6
+        - 7
+        - 8
+        - 9
+        - 10
+        - 11
+        - 12
+        - 13
   reference:
-    title: "rls1804"
-    data:
-      csit-dpdk-perf-1804-all:
-      - 4
-      - 5
-      - 6
-      - 7
-      - 8
-      - 9
-      - 10
-      - 11
-      - 12
-      - 13
-  compare:
     title: "rls1807"
     data:
       csit-dpdk-perf-verify-1807-3n-hsw:
@@ -2100,6 +2226,20 @@
       - 21
       - 22
       - 23
+  compare:
+    title: "rls1810"
+    data:
+      csit-dpdk-perf-verify-1810-3n-hsw:
+      - 1   # NDRPDR sel
+      - 2   # NDRPDR sel
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 5   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
   data: "dpdk-performance-changes"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -2114,21 +2254,22 @@
   title: "DPDK Performance Changes 2t2c ndr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-2t2c-ndr"
+  history:
+    -
+      title: "rls1804"
+      data:
+        csit-dpdk-perf-1804-all:
+        - 4
+        - 5
+        - 6
+        - 7
+        - 8
+        - 9
+        - 10
+        - 11
+        - 12
+        - 13
   reference:
-    title: "rls1804"
-    data:
-      csit-dpdk-perf-1804-all:
-      - 4
-      - 5
-      - 6
-      - 7
-      - 8
-      - 9
-      - 10
-      - 11
-      - 12
-      - 13
-  compare:
     title: "rls1807"
     data:
       csit-dpdk-perf-verify-1807-3n-hsw:
@@ -2142,6 +2283,20 @@
       - 21
       - 22
       - 23
+  compare:
+    title: "rls1810"
+    data:
+      csit-dpdk-perf-verify-1810-3n-hsw:
+      - 1   # NDRPDR sel
+      - 2   # NDRPDR sel
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 5   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
   data: "dpdk-performance-changes"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -2159,31 +2314,31 @@
   reference:
     title: "3-Node Hsw"
     data:
-      csit-dpdk-perf-verify-1807-3n-hsw:
-      - 11
-      - 12  # full
-      - 14
-      - 15
-      - 16
-      - 17
-      - 20
-      - 21
-      - 22
-      - 23
+      csit-dpdk-perf-verify-1810-3n-hsw:
+      - 1   # NDRPDR sel
+      - 2   # NDRPDR sel
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 5   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
   compare:
     title: "3-Node Skx"
     data:
-      csit-dpdk-perf-verify-1807-3n-skx:
-      - 1
-      - 2
-      - 3
-      - 6
-      - 7
-      - 8
-      - 9
-      - 10
-      - 11
-      - 12
+      csit-dpdk-perf-verify-1810-3n-skx:
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
+      - 11  # NDRPDR sel
+      - 12  # NDRPDR sel
+      - 13  # NDRPDR sel
   data: "dpdk-compare-testbeds"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'NIC_Intel-X710' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -2201,31 +2356,31 @@
   reference:
     title: "3-Node Hsw"
     data:
-      csit-dpdk-perf-verify-1807-3n-hsw:
-      - 11
-      - 12  # full
-      - 14
-      - 15
-      - 16
-      - 17
-      - 20
-      - 21
-      - 22
-      - 23
+      csit-dpdk-perf-verify-1810-3n-hsw:
+      - 1   # NDRPDR sel
+      - 2   # NDRPDR sel
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 5   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
   compare:
     title: "3-Node Skx"
     data:
-      csit-dpdk-perf-verify-1807-3n-skx:
-      - 1
-      - 2
-      - 3
-      - 6
-      - 7
-      - 8
-      - 9
-      - 10
-      - 11
-      - 12
+      csit-dpdk-perf-verify-1810-3n-skx:
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
+      - 11  # NDRPDR sel
+      - 12  # NDRPDR sel
+      - 13  # NDRPDR sel
   data: "dpdk-compare-testbeds"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'NIC_Intel-X710' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -2235,6 +2390,7 @@
   - "throughput"
 
 # DPDK Comparison Across Testbeds 3n-hsw to 3n-skx mrr
+# NOTE: Not used in 18.10
 -
   type: "table"
   title: "DPDK Comparison Across Testbeds 3n-hsw to 3n-skx mrr"
@@ -2243,6 +2399,7 @@
   reference:
     title: "3-Node Hsw"
     data:
+      # TODO: Replace with 1810 data
       csit-dpdk-perf-verify-1807-3n-hsw:
       - 11
       - 12  # full
@@ -2257,6 +2414,7 @@
   compare:
     title: "3-Node Skx"
     data:
+      # TODO: Replace with 1810 data
       csit-dpdk-perf-verify-1807-3n-skx:
       - 1
       - 2
@@ -4370,10 +4528,10 @@
 # Packet Throughput - VPP Container Memif 3n-hsw-x520
 -
   type: "plot"
-  title: "VPP Throughput: memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-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]}/memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-ndr"
+  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
@@ -4399,7 +4557,7 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-ndr"
+    title: "memif-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
@@ -9736,7 +9894,7 @@
            '78B' and
            ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
-           '4T12' and
+           '4T2C' and
            'IP6FWD' and
            not 'SRv6' and
            not 'IPSEC' and
@@ -16944,7 +17102,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -16978,7 +17136,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -17009,7 +17167,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -17028,7 +17186,7 @@
   title: "VPP Latency: ip4-3n-hsw-x520-64b-2t2c-features-nat44-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-ndr-nat44-lat"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-nat44-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
@@ -17039,7 +17197,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -17071,7 +17229,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -17088,7 +17246,7 @@
   title: "VPP Latency: ip4-3n-hsw-x520-64b-2t2c-features-iacl-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-ndr-iacl-lat"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-iacl-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
@@ -17100,7 +17258,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -17130,7 +17288,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -17147,7 +17305,7 @@
   title: "VPP Latency: ip4-3n-hsw-x520-64b-2t2c-features-oacl-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-ndr-oacl-lat"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-oacl-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
@@ -17159,7 +17317,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -17249,7 +17407,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -17283,7 +17441,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -17314,7 +17472,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -17333,7 +17491,7 @@
   title: "VPP Latency: ip4-3n-hsw-x710-64b-2t2c-features-nat44-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-ndr-nat44-lat"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-nat44-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
@@ -17344,7 +17502,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -17376,7 +17534,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -17393,7 +17551,7 @@
   title: "VPP Latency: ip4-3n-hsw-x710-64b-2t2c-features-iacl-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-ndr-iacl-lat"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-iacl-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
@@ -17405,7 +17563,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -17435,7 +17593,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -17452,7 +17610,7 @@
   title: "VPP Latency: ip4-3n-hsw-x710-64b-2t2c-features-oacl-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-ndr-oacl-lat"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-oacl-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
@@ -17464,7 +17622,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -17611,7 +17769,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -17645,7 +17803,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -17676,7 +17834,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -17695,7 +17853,7 @@
   title: "VPP Latency: ip4-3n-skx-x710-64b-4t2c-features-nat44-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-ndr-nat44-lat"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-nat44-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
@@ -17706,7 +17864,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -17738,7 +17896,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -17755,7 +17913,7 @@
   title: "VPP Latency: ip4-3n-skx-x710-64b-4t2c-features-iacl-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-ndr-iacl-lat"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-iacl-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
@@ -17767,7 +17925,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -17797,7 +17955,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -17826,7 +17984,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -18033,7 +18191,7 @@
            not 'VHOST' and
            not 'IPSECHW'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -18061,7 +18219,7 @@
            not 'VHOST' and
            not 'IPSECHW'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -18151,7 +18309,7 @@
            not 'VHOST' and
            not 'IPSECHW'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -18179,7 +18337,7 @@
            not 'VHOST' and
            not 'IPSECHW'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -18232,7 +18390,7 @@
            '64B' and
            'ENCAP' and
            'NDRPDR' and
-           '4t2c' and
+           '4T2C' and
            'VXLAN' and
            'L2BDMACLRN' and
            not 'VHOST' and
@@ -18269,7 +18427,7 @@
            not 'VHOST' and
            not 'IPSECHW'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -18297,7 +18455,7 @@
            not 'VHOST' and
            not 'IPSECHW'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -18682,7 +18840,7 @@
            'LISP' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -18707,7 +18865,7 @@
            'LISP' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort: