X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fspecification.yaml;h=e92903b60890411ab2cc2ea727df4b9f6185e981;hp=9346cf4b6fce61f4a3b1c5bfedf74b157cdc1736;hb=0d70066abaac78d14d9615087b94c4152c2abfbb;hpb=019a796394d6b8484225fe133c24c0e502b219f6

diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml
index 9346cf4b6f..e92903b608 100644
--- a/resources/tools/presentation/specification.yaml
+++ b/resources/tools/presentation/specification.yaml
@@ -141,36 +141,13 @@
         - 26  # NDRPDR sel
         - 29  # NDRPDR sel
         - 30  # NDRPDR sel
+      # TODO: Add data
+      # csit-vpp-perf-verify-1904-3n-hsw:
 
+      # TODO: Add data
 #    plot-vpp-http-server-performance:
-#      # TODO: Replace with 1904 data
-#      # csit-vpp-perf-verify-1904-3n-hsw:
-#      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
-
-#    plot-ligato-throughput-lat-tsa-3n-hsw:
-#      # TODO: Replace with 1904 data
-#      # csit-ligato-perf-verify-1904-3n-hsw:
-#      csit-ligato-perf-verify-1901-3n-hsw:
-#        - 8   # NDRPDR sel
-#        - 9   # NDRPDR sel
-#        - 11  # NDRPDR sel
-#        - 12  # NDRPDR sel
-#        - 13  # NDRPDR sel
-#        - 14  # NDRPDR sel
-#        - 15  # NDRPDR sel
-#        - 16  # NDRPDR sel
-#        - 17  # NDRPDR sel
-#        - 18  # NDRPDR sel
+#      csit-vpp-perf-verify-1908-3n-hsw:
+#        -
 
     plot-dpdk-throughput-latency-3n-hsw:
       csit-dpdk-perf-verify-1904-3n-hsw:
@@ -184,6 +161,8 @@
         - 18  # NDRPDR sel
         - 19  # NDRPDR sel
         - 20  # NDRPDR sel
+      # TODO: Add data
+      # csit-dpdk-perf-verify-1908-3n-hsw:
 
     # 3n-skx
 
@@ -199,6 +178,8 @@
         - 21  # NDRPDR sel
         - 23  # NDRPDR sel
         - 25  # NDRPDR sel
+      # TODO: Add data
+      # csit-vpp-perf-verify-1908-3n-skx:
 
     plot-dpdk-throughput-latency-3n-skx:
       csit-dpdk-perf-verify-1904-3n-skx:
@@ -212,6 +193,8 @@
         - 12  # NDRPDR sel
         - 13  # NDRPDR sel
         - 14  # NDRPDR sel
+      # TODO: Add data
+      # csit-dpdk-perf-verify-1908-3n-skx:
 
     # 2n-skx
 
@@ -227,12 +210,15 @@
         - 30  # NDRPDR sel
         - 31  # NDRPDR sel
         - 32  # NDRPDR sel
+      # TODO: Add data
+      # csit-vpp-perf-verify-1908-2n-skx:
 
     plot-vpp-soak-2n-skx:
-      # TODO: Add 1904 data
       csit-vpp-perf-verify-1904-2n-skx:
-        - 70  # SOAK
-        - 71  # SOAK
+        - 70  # soak
+        - 71  # soak
+      # TODO: Add data
+      # csit-vpp-perf-verify-1908-2n-skx:
 
     plot-vpp-nfv-2n-skx-ndrpdr-64b:
       csit-vpp-perf-verify-1904-2n-skx:
@@ -241,13 +227,28 @@
         - 60  # NFV NDRPDR 64b
         - 65  # NFV NDRPDR 64b
         - 68  # NFV NDRPDR 64b
+        - 80  # NFV MRR NDRPDR 64b IMIX
+        - 81  # NFV MRR NDRPDR 64b IMIX
+        - 84  # NFV MRR NDRPDR 64b IMIX
+        - 85  # NFV MRR NDRPDR 64b IMIX
+        - 86  # NFV MRR NDRPDR 64b IMIX
+      # TODO: Add data
+      # csit-vpp-perf-verify-1908-2n-skx:
 
     plot-vpp-nfv-2n-skx-ndrpdr-imix:
-      # TODO: Add 1904 data
       csit-vpp-perf-verify-1904-2n-skx:
         - 66  # NFV NDRPDR IMIX
         - 67  # NFV NDRPDR IMIX
         - 69  # NFV NDRPDR IMIX
+        - 82  # NFV NDRPDR IMIX
+        - 83  # NFV NDRPDR IMIX
+        - 80  # NFV MRR NDRPDR 64b IMIX
+        - 81  # NFV MRR NDRPDR 64b IMIX
+        - 84  # NFV MRR NDRPDR 64b IMIX
+        - 85  # NFV MRR NDRPDR 64b IMIX
+        - 86  # NFV MRR NDRPDR 64b IMIX
+      # TODO: Add data
+      # csit-vpp-perf-verify-1908-2n-skx:
 
     plot-vpp-nfv-2n-skx-mrr-64b:
       csit-vpp-perf-verify-1904-2n-skx:
@@ -256,6 +257,13 @@
         - 42  # NFV MRR 64b
         - 47  # NFV MRR 64b
         - 48  # NFV MRR 64b
+        - 80  # NFV MRR NDRPDR 64b IMIX
+        - 81  # NFV MRR NDRPDR 64b IMIX
+        - 84  # NFV MRR NDRPDR 64b IMIX
+        - 85  # NFV MRR NDRPDR 64b IMIX
+        - 86  # NFV MRR NDRPDR 64b IMIX
+      # TODO: Add data
+      # csit-vpp-perf-verify-1908-2n-skx:
 
     plot-vpp-nfv-2n-skx-mrr-imix:
       csit-vpp-perf-verify-1904-2n-skx:
@@ -264,6 +272,13 @@
         - 51  # NFV MRR IMIX
         - 54  # NFV MRR IMIX
         - 55  # NFV MRR IMIX
+        - 80  # NFV MRR NDRPDR 64b IMIX
+        - 81  # NFV MRR NDRPDR 64b IMIX
+        - 84  # NFV MRR NDRPDR 64b IMIX
+        - 85  # NFV MRR NDRPDR 64b IMIX
+        - 86  # NFV MRR NDRPDR 64b IMIX
+      # TODO: Add data
+      # csit-vpp-perf-verify-1908-2n-skx:
 
     plot-dpdk-throughput-latency-2n-skx:
       csit-dpdk-perf-verify-1904-2n-skx:
@@ -277,12 +292,13 @@
         - 10  # NDRPDR sel
         - 11  # NDRPDR sel
         - 12  # NDRPDR sel
+      # TODO: Add data
+      # csit-dpdk-perf-verify-1904-2n-skx:
 
     # 3rd party
 
 #    # Denverton:
 #    intel-dnv-vpp:
-#      # TODO: Replace with 1904 data
 #      # intel-dnv-vpp-release-1904:
 #      intel-dnv-vpp-release-1901:
 #        - 1
@@ -304,6 +320,8 @@
         - 26  # NDRPDR sel
         - 29  # NDRPDR sel
         - 30  # NDRPDR sel
+      # TODO: Add data
+      # csit-vpp-perf-verify-1908-3n-hsw:
 
     vpp-nic-comparison-3n-skx:
       csit-vpp-perf-verify-1904-3n-skx:
@@ -317,6 +335,8 @@
         - 21  # NDRPDR sel
         - 23  # NDRPDR sel
         - 25  # NDRPDR sel
+      # TODO: Add data
+      # csit-vpp-perf-verify-1908-3n-skx:
 
     vpp-nic-comparison-2n-skx:
       csit-vpp-perf-verify-1904-2n-skx:
@@ -330,87 +350,107 @@
         - 30  # NDRPDR sel
         - 31  # NDRPDR sel
         - 32  # NDRPDR sel
+      # TODO: Add data
+      # csit-vpp-perf-verify-1908-2n-skx:
 
     vpp-nic-comparison-3n-hsw-mrr:
       csit-vpp-perf-verify-1904-3n-hsw:
         - 9   # MRR sel
+      # TODO: Add data
+      # csit-vpp-perf-verify-1908-3n-hsw:
 
     vpp-nic-comparison-3n-skx-mrr:
       csit-vpp-perf-verify-1904-3n-skx:
         - 7   # MRR sel
+      # TODO: Add data
+      # csit-vpp-perf-verify-1908-3n-skx:
 
     vpp-nic-comparison-2n-skx-mrr:
       csit-vpp-perf-verify-1904-2n-skx:
         - 11  # MRR sel
+      # TODO: Add data
+      # csit-vpp-perf-verify-1908-2n-skx:
 
     # Results
 
     vpp-perf-results-3n-hsw:
-      # TODO: Replace with FULL 1904 data
       csit-vpp-perf-verify-1904-3n-hsw:
-        - 12  # NDRPDR sel
+        - 30  # NDRPDR sel
+      # TODO: Add FULL data
+      # csit-vpp-perf-verify-1908-3n-hsw:
 
     vpp-perf-results-3n-skx:
       csit-vpp-perf-verify-1904-3n-skx:
-        - 26  # NDRPDR full
-        - 27  # NDRPDR full
-        - 30  # NDRPDR full
-        - 31  # NDRPDR full
+        - 25  # NDRPDR sel
+      # TODO: Add FULL data
+      # csit-vpp-perf-verify-1908-3n-skx:
 
     vpp-perf-results-2n-skx:
       csit-vpp-perf-verify-1904-2n-skx:
-        - 33  # NDRPDR full
-        - 39  # NDRPDR full
-        - 58  # NDRPDR full
-        - 62  # NDRPDR full
+        - 32  # NDRPDR sel
+      # TODO: Add FULL data
+      # csit-vpp-perf-verify-1908-2n-skx:
 
     vpp-mrr-results-3n-hsw:
       csit-vpp-perf-verify-1904-3n-hsw:
         - 9   # MRR sel
+      # TODO: Add data
+      # csit-vpp-perf-verify-1908-3n-hsw:
 
     vpp-mrr-results-3n-skx:
       csit-vpp-perf-verify-1904-3n-skx:
         - 7   # MRR sel
+      # TODO: Add data
+      # csit-vpp-perf-verify-1908-3n-skx:
 
     vpp-mrr-results-2n-skx:
       csit-vpp-perf-verify-1904-2n-skx:
         - 11  # MRR sel
+      # TODO: Add data
+      # csit-vpp-perf-verify-1908-2n-skx:
 
     vpp-func-results-ubuntu:
       csit-vpp-functional-1904-ubuntu1604-virl:
-        - 29
+        - 33
+      # TODO: Add data
+      # csit-vpp-functional-1908-ubuntu1604-virl:
 
     vpp-func-results-centos:
       csit-vpp-functional-1904-centos7-virl:
         - 32
+      # TODO: Add data
+      # csit-vpp-functional-1908-centos7-virl:
 
     vpp-device-results-ubuntu:
       csit-vpp-device-1904-ubuntu1804-1n-skx:
-        - 33
-
-#    # VPP Ligato
-#    ligato-perf-results-3n-hsw:
-#      # TODO: Replace with 1904 data
-#      # csit-ligato-perf-verify-1904-3n-hsw:
-#      csit-ligato-perf-verify-1901-3n-hsw:
-#        - 10  # NDRPDR full
+        - 32
+      # TODO: Add data
+      # csit-vpp-device-1908-ubuntu1804-1n-skx:
 
     dpdk-perf-results-3n-hsw:
-      csit-dpdk-perf-verify-1904-3n-hsw:
+
         - 5   # NDRPDR sel
+      # TODO: Add data
+      # csit-dpdk-perf-verify-1908-3n-hsw:
 
     dpdk-perf-results-3n-skx:
       csit-dpdk-perf-verify-1904-3n-skx:
         - 7   # NDRPDR sel
+      # TODO: Add data
+      # csit-dpdk-perf-verify-1908-3n-skx:
 
     dpdk-perf-results-2n-skx:
       csit-dpdk-perf-verify-1904-2n-skx:
         - 9   # NDRPDR sel
+      # TODO: Add data
+      # csit-dpdk-perf-verify-1908-2n-skx:
 
     # HoneyComb Functional
     hc-func-results:
       csit-hc2vpp-verify-func-1904-ubuntu1604:
         - 4
+      # TODO: Add data
+      # csit-hc2vpp-verify-func-1908-ubuntu1604:
 
 #    # NSH SFC Functional
 #    nsh-func-results:
@@ -422,6 +462,8 @@
     dmm-func-results:
       csit-dmm-functional-1904-ubuntu1604-virl:
         - 1
+      # TODO: Add data
+      # csit-dmm-functional-1908-ubuntu1604-virl:
 
     ###########################################################################
     # Tables (more than one data set)
@@ -435,7 +477,6 @@
 #      intel-dnv-vpp-release-1901:
 #        - 1
 #    intel-dnv-vpp-changes-2n-dnv-cmp:
-#      # TODO: Replace with 1904 data
 #      # intel-dnv-vpp-release-1904:
 #      intel-dnv-vpp-release-1901:
 #        - 1
@@ -445,18 +486,6 @@
 #      - "intel-dnv-vpp-changes-2n-dnv-cmp"
 
     vpp-performance-changes-3n-hsw-h1:
-      csit-vpp-perf-verify-1810-3n-hsw:
-        - 8   # NDRPDR sel
-        - 12  # NDRPDR sel
-        - 14  # NDRPDR sel
-        - 18  # NDRPDR sel
-        - 23  # NDRPDR sel
-        - 25  # NDRPDR sel
-        - 38  # NDRPDR sel
-        - 39  # NDRPDR sel
-        - 41  # NDRPDR sel
-        - 42  # NDRPDR sel
-    vpp-performance-changes-3n-hsw-ref:
       csit-vpp-perf-verify-1901-3n-hsw:
         - 10  # NDRPDR sel
         - 19  # NDRPDR sel
@@ -478,6 +507,18 @@
         - 69  # NDRPDR LB
         - 70  # NDRPDR LB
         - 71  # NDRPDR LB
+    vpp-performance-changes-3n-hsw-ref:
+      csit-vpp-perf-verify-1904-3n-hsw:
+        - 11  # NDRPDR sel
+        - 12  # NDRPDR sel
+        - 20  # NDRPDR sel
+        - 21  # NDRPDR sel
+        - 23  # NDRPDR sel
+        - 24  # NDRPDR sel
+        - 25  # NDRPDR sel
+        - 26  # NDRPDR sel
+        - 29  # NDRPDR sel
+        - 30  # NDRPDR sel
     vpp-performance-changes-3n-hsw-cmp:
       csit-vpp-perf-verify-1904-3n-hsw:
         - 11  # NDRPDR sel
@@ -490,24 +531,14 @@
         - 26  # NDRPDR sel
         - 29  # NDRPDR sel
         - 30  # NDRPDR sel
+      # TODO: Add data
+      # csit-vpp-perf-verify-1908-3n-hsw:
     vpp-performance-changes-3n-hsw:
       - "vpp-performance-changes-3n-hsw-h1"
       - "vpp-performance-changes-3n-hsw-ref"
       - "vpp-performance-changes-3n-hsw-cmp"
 
     vpp-performance-changes-3n-skx-h1:
-      csit-vpp-perf-verify-1810-3n-skx:
-        - 10  # NDRPDR sel
-        - 14  # NDRPDR sel
-        - 15  # NDRPDR sel
-        - 16  # NDRPDR sel
-        - 17  # NDRPDR sel
-        - 19  # NDRPDR sel
-        - 20  # NDRPDR sel
-        - 21  # NDRPDR sel
-        - 22  # NDRPDR sel
-        - 25  # NDRPDR sel
-    vpp-performance-changes-3n-skx-ref:
       csit-vpp-perf-verify-1901-3n-skx:
         - 18  # NDRPDR sel
         - 19  # NDRPDR sel
@@ -529,6 +560,18 @@
         - 65  # NDRPDR LB
         - 66  # NDRPDR LB
         - 67  # NDRPDR LB
+    vpp-performance-changes-3n-skx-ref:
+      csit-vpp-perf-verify-1904-3n-skx:
+        - 8   # NDRPDR sel
+        - 9   # NDRPDR sel
+        - 10  # NDRPDR sel
+        - 11  # NDRPDR sel
+        - 12  # NDRPDR sel
+        - 14  # NDRPDR sel
+        - 16  # NDRPDR sel
+        - 21  # NDRPDR sel
+        - 23  # NDRPDR sel
+        - 25  # NDRPDR sel
     vpp-performance-changes-3n-skx-cmp:
       csit-vpp-perf-verify-1904-3n-skx:
         - 8   # NDRPDR sel
@@ -541,24 +584,14 @@
         - 21  # NDRPDR sel
         - 23  # NDRPDR sel
         - 25  # NDRPDR sel
+      # TODO: Add data
+      # csit-vpp-perf-verify-1908-3n-skx:
     vpp-performance-changes-3n-skx:
       - "vpp-performance-changes-3n-skx-h1"
       - "vpp-performance-changes-3n-skx-ref"
       - "vpp-performance-changes-3n-skx-cmp"
 
     vpp-performance-changes-2n-skx-h1:
-      csit-vpp-perf-verify-1810-2n-skx:
-        - 9   # NDRPDR sel
-        - 13  # NDRPDR sel
-        - 14  # NDRPDR sel
-        - 19  # NDRPDR sel
-        - 20  # NDRPDR sel
-        - 21  # NDRPDR sel
-        - 22  # NDRPDR sel
-        - 23  # NDRPDR sel
-        - 24  # NDRPDR sel
-        - 27  # NDRPDR sel
-    vpp-performance-changes-2n-skx-ref:
       csit-vpp-perf-verify-1901-2n-skx:
         - 5   # NDRPDR sel
         - 12  # NDRPDR sel
@@ -570,6 +603,18 @@
         - 40  # NDRPDR sel
         - 42  # NDRPDR sel
         - 43  # NDRPDR sel
+    vpp-performance-changes-2n-skx-ref:
+      csit-vpp-perf-verify-1904-2n-skx:
+        - 12  # NDRPDR sel
+        - 14  # NDRPDR sel
+        - 16  # NDRPDR sel
+        - 17  # NDRPDR sel
+        - 18  # NDRPDR sel
+        - 21  # NDRPDR sel
+        - 27  # NDRPDR sel
+        - 30  # NDRPDR sel
+        - 31  # NDRPDR sel
+        - 32  # NDRPDR sel
     vpp-performance-changes-2n-skx-cmp:
       csit-vpp-perf-verify-1904-2n-skx:
         - 12  # NDRPDR sel
@@ -582,6 +627,8 @@
         - 30  # NDRPDR sel
         - 31  # NDRPDR sel
         - 32  # NDRPDR sel
+      # TODO: Add data
+      # csit-vpp-perf-verify-1908-2n-skx:
     vpp-performance-changes-2n-skx:
       - "vpp-performance-changes-2n-skx-h1"
       - "vpp-performance-changes-2n-skx-ref"
@@ -599,10 +646,14 @@
         - 30  # NDRPDR sel
         - 31  # NDRPDR sel
         - 32  # NDRPDR sel
+      # TODO: Add data
+      # csit-vpp-perf-verify-1908-2n-skx:
     vpp-soak-vs-ndr-2n-skx-cmp:
       csit-vpp-perf-verify-1904-2n-skx:
-        - 70  # SOAK
-        - 71  # SOAK
+        - 70  # soak
+        - 71  # soak
+      # TODO: Add data
+      # csit-vpp-perf-verify-1908-2n-skx:
     vpp-soak-vs-ndr-2n-skx:
       csit-vpp-perf-verify-1904-2n-skx:
         - 12  # NDRPDR sel
@@ -615,70 +666,60 @@
         - 30  # NDRPDR sel
         - 31  # NDRPDR sel
         - 32  # NDRPDR sel
-        - 70  # SOAK
-        - 71  # SOAK
+        - 70  # soak
+        - 71  # soak
+      # TODO: Add data
+      # csit-vpp-perf-verify-1908-2n-skx:
 
     vpp-performance-changes-3n-hsw-mrr-h1:
-      csit-vpp-perf-verify-1810-3n-hsw:
-        - 9   # MRR sel
-    vpp-performance-changes-3n-hsw-mrr-ref:
       csit-vpp-perf-verify-1901-3n-hsw:
         - 35  # MRR sel
+    vpp-performance-changes-3n-hsw-mrr-ref:
+      csit-vpp-perf-verify-1904-3n-hsw:
+        - 9   # MRR sel
     vpp-performance-changes-3n-hsw-mrr-cmp:
       csit-vpp-perf-verify-1904-3n-hsw:
         - 9   # MRR sel
+      # TODO: Add data
+      # csit-vpp-perf-verify-1908-3n-hsw:
     vpp-performance-changes-3n-hsw-mrr:
       - "vpp-performance-changes-3n-hsw-mrr-h1"
       - "vpp-performance-changes-3n-hsw-mrr-ref"
       - "vpp-performance-changes-3n-hsw-mrr-cmp"
 
     vpp-performance-changes-3n-skx-mrr-h1:
-      csit-vpp-perf-verify-1810-3n-skx:
-        - 9   # MRR sel
-        - 11  # MRR sel
-        - 12  # MRR sel
-        - 13  # MRR sel
-    vpp-performance-changes-3n-skx-mrr-ref:
       csit-vpp-perf-verify-1901-3n-skx:
         - 32  # MRR sel
+    vpp-performance-changes-3n-skx-mrr-ref:
+      csit-vpp-perf-verify-1904-3n-skx:
+        - 7   # MRR sel
     vpp-performance-changes-3n-skx-mrr-cmp:
       csit-vpp-perf-verify-1904-3n-skx:
         - 7   # MRR sel
+      # TODO: Add data
+      # csit-vpp-perf-verify-1908-3n-skx:
     vpp-performance-changes-3n-skx-mrr:
       - "vpp-performance-changes-3n-skx-mrr-h1"
       - "vpp-performance-changes-3n-skx-mrr-ref"
       - "vpp-performance-changes-3n-skx-mrr-cmp"
 
     vpp-performance-changes-2n-skx-mrr-h1:
-      csit-vpp-perf-verify-1810-2n-skx:
-        - 8   # MRR sel
-        - 10  # MRR sel
-        - 11  # MRR sel
-        - 12  # MRR sel
-    vpp-performance-changes-2n-skx-mrr-ref:
       csit-vpp-perf-verify-1901-2n-skx:
         - 22  # MRR sel
+    vpp-performance-changes-2n-skx-mrr-ref:
+      csit-vpp-perf-verify-1904-2n-skx:
+        - 11  # MRR sel
     vpp-performance-changes-2n-skx-mrr-cmp:
       csit-vpp-perf-verify-1904-2n-skx:
         - 11  # MRR sel
+      # TODO: Add data
+      # csit-vpp-perf-verify-1908-2n-skx:
     vpp-performance-changes-2n-skx-mrr:
       - "vpp-performance-changes-2n-skx-mrr-h1"
       - "vpp-performance-changes-2n-skx-mrr-ref"
       - "vpp-performance-changes-2n-skx-mrr-cmp"
 
     dpdk-performance-changes-3n-hsw-h1:
-      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-performance-changes-3n-hsw-ref:
       csit-dpdk-perf-verify-1901-3n-hsw:
         - 13  # NDRPDR sel
         - 14  # NDRPDR sel
@@ -690,6 +731,18 @@
         - 21  # NDRPDR sel
         - 22  # NDRPDR sel
         - 23  # NDRPDR sel
+    dpdk-performance-changes-3n-hsw-ref:
+      csit-dpdk-perf-verify-1904-3n-hsw:
+        - 2   # NDRPDR sel
+        - 3   # NDRPDR sel
+        - 5   # NDRPDR sel
+        - 6   # NDRPDR sel
+        - 13  # NDRPDR sel
+        - 14  # NDRPDR sel
+        - 15  # NDRPDR sel
+        - 18  # NDRPDR sel
+        - 19  # NDRPDR sel
+        - 20  # NDRPDR sel
     dpdk-performance-changes-3n-hsw-cmp:
       csit-dpdk-perf-verify-1904-3n-hsw:
         - 2   # NDRPDR sel
@@ -702,15 +755,17 @@
         - 18  # NDRPDR sel
         - 19  # NDRPDR sel
         - 20  # NDRPDR sel
+      # TODO: Add data
+      # csit-dpdk-perf-verify-1908-3n-hsw:
     dpdk-performance-changes-3n-hsw:
       - "dpdk-performance-changes-3n-hsw-h1"
       - "dpdk-performance-changes-3n-hsw-ref"
       - "dpdk-performance-changes-3n-hsw-cmp"
 
     dpdk-performance-changes-3n-skx-h1:
-      csit-dpdk-perf-verify-1810-3n-skx:
+      csit-dpdk-perf-verify-1901-3n-skx:
         - 3   # NDRPDR sel
-        - 4   # NDRPDR sel
+        - 5   # NDRPDR sel
         - 6   # NDRPDR sel
         - 7   # NDRPDR sel
         - 8   # NDRPDR sel
@@ -720,17 +775,17 @@
         - 12  # NDRPDR sel
         - 13  # NDRPDR sel
     dpdk-performance-changes-3n-skx-ref:
-      csit-dpdk-perf-verify-1901-3n-skx:
+      csit-dpdk-perf-verify-1904-3n-skx:
+        - 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
         - 11  # NDRPDR sel
         - 12  # NDRPDR sel
         - 13  # NDRPDR sel
+        - 14  # NDRPDR sel
     dpdk-performance-changes-3n-skx-cmp:
       csit-dpdk-perf-verify-1904-3n-skx:
         - 2   # NDRPDR sel
@@ -743,24 +798,14 @@
         - 12  # NDRPDR sel
         - 13  # NDRPDR sel
         - 14  # NDRPDR sel
+      # TODO: Add data
+      # csit-dpdk-perf-verify-1908-3n-skx:
     dpdk-performance-changes-3n-skx:
       - "dpdk-performance-changes-3n-skx-h1"
       - "dpdk-performance-changes-3n-skx-ref"
       - "dpdk-performance-changes-3n-skx-cmp"
 
     dpdk-performance-changes-2n-skx-h1:
-      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
-    dpdk-performance-changes-2n-skx-ref:
       csit-dpdk-perf-verify-1901-2n-skx:
         - 12  # NDRPDR sel
         - 13  # NDRPDR sel
@@ -772,6 +817,18 @@
         - 19  # NDRPDR sel
         - 20  # NDRPDR sel
         - 21  # NDRPDR sel
+    dpdk-performance-changes-2n-skx-ref:
+      csit-dpdk-perf-verify-1904-2n-skx:
+        - 2   # NDRPDR sel
+        - 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
     dpdk-performance-changes-2n-skx-cmp:
       csit-dpdk-perf-verify-1904-2n-skx:
         - 2   # NDRPDR sel
@@ -784,6 +841,8 @@
         - 10  # NDRPDR sel
         - 11  # NDRPDR sel
         - 12  # NDRPDR sel
+      # TODO: Add data
+      # csit-dpdk-perf-verify-1904-2n-skx:
     dpdk-performance-changes-2n-skx:
       - "dpdk-performance-changes-2n-skx-h1"
       - "dpdk-performance-changes-2n-skx-ref"
@@ -803,6 +862,8 @@
         - 26  # NDRPDR sel
         - 29  # NDRPDR sel
         - 30  # NDRPDR sel
+      # TODO: Add data
+      # csit-vpp-perf-verify-1908-3n-hsw:
     vpp-compare-testbeds-cmp:
       csit-vpp-perf-verify-1904-3n-skx:
         - 8   # NDRPDR sel
@@ -815,6 +876,8 @@
         - 21  # NDRPDR sel
         - 23  # NDRPDR sel
         - 25  # NDRPDR sel
+      # TODO: Add data
+      # csit-vpp-perf-verify-1908-3n-skx:
     vpp-compare-testbeds:
       - "vpp-compare-testbeds-ref"
       - "vpp-compare-testbeds-cmp"
@@ -822,9 +885,13 @@
     vpp-compare-testbeds-mrr-ref:
       csit-vpp-perf-verify-1904-3n-hsw:
         - 9   # MRR sel
+      # TODO: Add data
+      # csit-vpp-perf-verify-1908-3n-hsw:
     vpp-compare-testbeds-mrr-cmp:
       csit-vpp-perf-verify-1904-3n-skx:
         - 7   # MRR sel
+      # TODO: Add data
+      # csit-vpp-perf-verify-1908-3n-skx:
     vpp-compare-testbeds-mrr:
       - "vpp-compare-testbeds-mrr-ref"
       - "vpp-compare-testbeds-mrr-cmp"
@@ -841,6 +908,8 @@
         - 18  # NDRPDR sel
         - 19  # NDRPDR sel
         - 20  # NDRPDR sel
+      # TODO: Add data
+      # csit-dpdk-perf-verify-1908-3n-hsw:
     dpdk-compare-testbeds-cmp:
       csit-dpdk-perf-verify-1904-3n-skx:
         - 2   # NDRPDR sel
@@ -853,6 +922,8 @@
         - 12  # NDRPDR sel
         - 13  # NDRPDR sel
         - 14  # NDRPDR sel
+      # TODO: Add data
+      # csit-dpdk-perf-verify-1908-3n-skx:
     dpdk-compare-testbeds:
       - "dpdk-compare-testbeds-ref"
       - "dpdk-compare-testbeds-cmp"
@@ -871,6 +942,8 @@
         - 21  # NDRPDR sel
         - 23  # NDRPDR sel
         - 25  # NDRPDR sel
+      # TODO: Add data
+      # csit-vpp-perf-verify-1908-3n-skx:
     vpp-compare-topologies-cmp:
       csit-vpp-perf-verify-1904-2n-skx:
         - 12  # NDRPDR sel
@@ -883,6 +956,8 @@
         - 30  # NDRPDR sel
         - 31  # NDRPDR sel
         - 32  # NDRPDR sel
+      # TODO: Add data
+      # csit-vpp-perf-verify-1908-2n-skx:
     vpp-compare-topologies:
       - "vpp-compare-topologies-ref"
       - "vpp-compare-topologies-cmp"
@@ -890,9 +965,13 @@
     vpp-compare-topologies-mrr-ref:
       csit-vpp-perf-verify-1904-3n-skx:
         - 7   # MRR sel
+      # TODO: Add data
+      # csit-vpp-perf-verify-1908-3n-skx:
     vpp-compare-topologies-mrr-cmp:
       csit-vpp-perf-verify-1904-2n-skx:
         - 11  # MRR sel
+      # TODO: Add data
+      # csit-vpp-perf-verify-1908-2n-skx:
     vpp-compare-topologies-mrr:
       - "vpp-compare-topologies-mrr-ref"
       - "vpp-compare-topologies-mrr-cmp"
@@ -909,6 +988,8 @@
         - 12  # NDRPDR sel
         - 13  # NDRPDR sel
         - 14  # NDRPDR sel
+      # TODO: Add data
+      # csit-dpdk-perf-verify-1908-3n-skx:
     dpdk-compare-topologies-cmp:
       csit-dpdk-perf-verify-1904-2n-skx:
         - 2   # NDRPDR sel
@@ -921,6 +1002,8 @@
         - 10  # NDRPDR sel
         - 11  # NDRPDR sel
         - 12  # NDRPDR sel
+      # TODO: Add data
+      # csit-dpdk-perf-verify-1908-2n-skx:
     dpdk-compare-topologies:
       - "dpdk-compare-topologies-ref"
       - "dpdk-compare-topologies-cmp"
@@ -948,12 +1031,12 @@
           size: 16
         zeroline: False
       yaxis:
-        title: "<b>Packet Throughput [Mpps]</b>"
+        title: "<b>Critical Rate Lower Bound [Mpps]</b>"
         titlefont:
           size: 16
         gridcolor: "rgb(230, 230, 230)"
-        hoverformat: ".4s"
-        tickformat: ".3s"
+        hoverformat: ".4r"
+        tickformat: ".3r"
         linecolor: "rgb(220, 220, 220)"
         linewidth: 1
         showgrid: True
@@ -1137,8 +1220,8 @@
         titlefont:
           size: 16
         gridcolor: "rgb(230, 230, 230)"
-        hoverformat: ".4s"
-        tickformat: ".3s"
+        hoverformat: ".4r"
+        tickformat: ".3r"
         linecolor: "rgb(220, 220, 220)"
         linewidth: 1
         showgrid: True
@@ -1326,38 +1409,12 @@
     extract: "robot-plugin/output.xml"
 
   builds:
-#    # TODO: Add 1904 data
-##    intel-dnv-vpp-release-1904:
-##      - 1
-#
-#    intel-dnv-vpp-release-1901:
+#    intel-dnv-vpp-release-1904:
 #      - 1
 #
-#    intel-dnv-vpp-release-1810:
+#    intel-dnv-vpp-release-1901:
 #      - 1
 
-    csit-vpp-perf-verify-1810-3n-hsw:
-      - 9   # MRR sel
-      - 8   # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 14  # NDRPDR sel
-      - 18  # NDRPDR sel
-      - 23  # NDRPDR sel
-      - 25  # NDRPDR sel
-      - 38  # NDRPDR sel
-      - 39  # NDRPDR sel
-      - 41  # NDRPDR sel
-      - 42  # 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-1901-3n-hsw:
       - 35  # MRR sel
       - 10  # NDRPDR sel
@@ -1380,7 +1437,6 @@
       - 69  # NDRPDR LB
       - 70  # NDRPDR LB
       - 71  # NDRPDR LB
-    # TODO: Add 1904 Data
     csit-vpp-perf-verify-1904-3n-hsw:
       - 9   # MRR sel
       - 11  # NDRPDR sel
@@ -1393,22 +1449,9 @@
       - 26  # NDRPDR sel
       - 29  # NDRPDR sel
       - 30  # NDRPDR sel
+    # TODO: Add data
+    # csit-vpp-perf-verify-1908-3n-hsw:
 
-    csit-vpp-perf-verify-1810-3n-skx:
-      - 9   # MRR sel
-      - 11  # MRR sel
-      - 12  # MRR sel
-      - 13  # MRR sel
-      - 10  # NDRPDR sel
-      - 14  # NDRPDR sel
-      - 15  # NDRPDR sel
-      - 16  # NDRPDR sel
-      - 17  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 21  # NDRPDR sel
-      - 22  # NDRPDR sel
-      - 25  # NDRPDR sel
     csit-vpp-perf-verify-1901-3n-skx:
       - 32  # MRR sel
       - 18  # NDRPDR sel
@@ -1433,10 +1476,6 @@
       - 67  # NDRPDR LB
     csit-vpp-perf-verify-1904-3n-skx:
       - 7   # MRR sel
-      - 26  # NDRPDR full
-      - 27  # NDRPDR full
-      - 30  # NDRPDR full
-      - 31  # NDRPDR full
       - 8   # NDRPDR sel
       - 9   # NDRPDR sel
       - 10  # NDRPDR sel
@@ -1447,22 +1486,9 @@
       - 21  # NDRPDR sel
       - 23  # NDRPDR sel
       - 25  # NDRPDR sel
+    # TODO: Add data
+    # csit-vpp-perf-verify-1908-3n-skx:
 
-    csit-vpp-perf-verify-1810-2n-skx:
-      - 8   # MRR sel
-      - 10  # MRR sel
-      - 11  # MRR sel
-      - 12  # MRR sel
-      - 9   # NDRPDR sel
-      - 13  # NDRPDR sel
-      - 14  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 21  # NDRPDR sel
-      - 22  # NDRPDR sel
-      - 23  # NDRPDR sel
-      - 24  # NDRPDR sel
-      - 27  # NDRPDR sel
     csit-vpp-perf-verify-1901-2n-skx:
       - 22  # MRR sel
       - 5   # NDRPDR sel
@@ -1475,13 +1501,8 @@
       - 40  # NDRPDR sel
       - 42  # NDRPDR sel
       - 43  # NDRPDR sel
-    # TODO: Add 1904 data
     csit-vpp-perf-verify-1904-2n-skx:
       - 11  # MRR sel
-      - 33  # NDRPDR full
-      - 39  # NDRPDR full
-      - 58  # NDRPDR full
-      - 62  # NDRPDR full
       - 12  # NDRPDR sel
       - 14  # NDRPDR sel
       - 16  # NDRPDR sel
@@ -1492,6 +1513,7 @@
       - 30  # NDRPDR sel
       - 31  # NDRPDR sel
       - 32  # NDRPDR sel
+      # TODO: Remove
       - 40  # NFV MRR 64b
       - 41  # NFV MRR 64b
       - 42  # NFV MRR 64b
@@ -1510,36 +1532,18 @@
       - 66  # NFV NDRPDR IMIX
       - 67  # NFV NDRPDR IMIX
       - 69  # NFV NDRPDR IMIX
-      - 70  # SOAK
-      - 71  # SOAK
-
-#    csit-ligato-perf-verify-1901-3n-hsw:
-#      - 10  # NDRPDR full
-#      - 8   # NDRPDR sel
-#      - 9   # NDRPDR sel
-#      - 11  # NDRPDR sel
-#      - 12  # NDRPDR sel
-#      - 13  # NDRPDR sel
-#      - 14  # NDRPDR sel
-#      - 15  # NDRPDR sel
-#      - 16  # NDRPDR sel
-#      - 17  # NDRPDR sel
-#      - 18  # NDRPDR sel
-#    # TODO: Add 1904 data
-##    csit-ligato-perf-verify-1904-3n-hsw:
-##      -
-
-    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
+      - 82  # NFV NDRPDR IMIX
+      - 83  # NFV NDRPDR IMIX
+      - 80  # NFV MRR NDRPDR 64b IMIX
+      - 81  # NFV MRR NDRPDR 64b IMIX
+      - 84  # NFV MRR NDRPDR 64b IMIX
+      - 85  # NFV MRR NDRPDR 64b IMIX
+      - 86  # NFV MRR NDRPDR 64b IMIX
+      - 70  # soak
+      - 71  # soak
+    # TODO: Add data
+    # csit-vpp-perf-verify-1908-2n-skx:
+
     csit-dpdk-perf-verify-1901-3n-hsw:
       - 13  # NDRPDR sel
       - 14  # NDRPDR sel
@@ -1562,18 +1566,9 @@
       - 18  # NDRPDR sel
       - 19  # NDRPDR sel
       - 20  # NDRPDR sel
+    # TODO: Add data
+    # csit-dpdk-perf-verify-1908-3n-hsw:
 
-    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-1901-3n-skx:
       - 3   # NDRPDR sel
       - 5   # NDRPDR sel
@@ -1596,18 +1591,9 @@
       - 12  # NDRPDR sel
       - 13  # NDRPDR sel
       - 14  # NDRPDR sel
+    # TODO: Add data
+    # csit-dpdk-perf-verify-1908-3n-skx:
 
-    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-dpdk-perf-verify-1901-2n-skx:
       - 12  # NDRPDR sel
       - 13  # NDRPDR sel
@@ -1630,82 +1616,64 @@
       - 10  # NDRPDR sel
       - 11  # NDRPDR sel
       - 12  # NDRPDR sel
+    # TODO: Add data
+    # csit-dpdk-perf-verify-1908-2n-skx:
 
+    # TODO: Replace
     csit-vpp-functional-1904-ubuntu1604-virl:
       - 33
     csit-vpp-functional-1904-centos7-virl:
       - 32
     csit-vpp-device-1904-ubuntu1804-1n-skx:
       - 32
-#    # Not used
-#    csit-nsh_sfc-verify-func-1810-ubuntu1604-virl:
-#      - 1
     csit-dmm-functional-1904-ubuntu1604-virl:
       - 1
     csit-hc2vpp-verify-func-1904-ubuntu1604:
       - 4
 
+#    csit-vpp-functional-1908-ubuntu1604-virl:
+#      -
+#    csit-vpp-functional-1908-centos7-virl:
+#      -
+#    csit-vpp-device-1908-ubuntu1804-1n-skx:
+#      -
+#    csit-dmm-functional-1908-ubuntu1604-virl:
+#      -
+#    csit-hc2vpp-verify-func-1908-ubuntu1604:
+#      -
+
 - type: "output"
   output: "report"
   format:
     html:
     - full
-#    pdf:
-#    - minimal
+    pdf:
+    - minimal
 
 ################################################################################
 ###                               T A B L E S                                ###
 ################################################################################
 
-# VPP SOAK vs NDR
+# VPP Soak vs NDR
 - type: "table"
-  title: "VPP SOAK vs NDR 2n-skx"
+  title: "VPP Soak vs NDR 2n-skx"
   algorithm: "table_soak_vs_ndr"
   output-file: "{DIR[STATIC,VPP]}/soak-vs-ndr-2n-skx"
   reference:
     title: "NDR"
     data: "vpp-soak-vs-ndr-2n-skx-ref"
   compare:
-    title: "SOAK"
+    title: "Soak"
     data: "vpp-soak-vs-ndr-2n-skx-cmp"
   data: "vpp-soak-vs-ndr-2n-skx"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  include-tests: "NDR"
   filter: "('NDRPDR' or 'SOAK')"
   parameters:
     - "throughput"
     - "name"
     - "parent"
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+################################################################################
 
 # VPP Compare NICs 3n-hsw 1t1c ndr
 - type: "table"
@@ -3025,7 +2993,7 @@
     data: "data msg"
   rows: "generated"
   data: "vpp-perf-results-3n-hsw"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  filter: "not ('CFS_OPT' or ('NIC_Intel-X520-DA2' and 'IPSECHW') or ('NIC_Cisco-VIC-1385' and '9000B'))"
   parameters:
   - "name"
   - "parent"
@@ -3044,7 +3012,7 @@
     data: "data msg"
   rows: "generated"
   data: "vpp-perf-results-3n-skx"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  filter: "not 'CFS_OPT'"
   parameters:
   - "name"
   - "parent"
@@ -3063,7 +3031,7 @@
     data: "data msg"
   rows: "generated"
   data: "vpp-perf-results-2n-skx"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  filter: "not 'CFS_OPT'"
   parameters:
   - "name"
   - "parent"
@@ -3101,7 +3069,7 @@
     data: "data conf-history"
   rows: "generated"
   data: "vpp-perf-results-3n-hsw"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  filter: "not ('CFS_OPT' or ('NIC_Intel-X520-DA2' and 'IPSECHW') or ('NIC_Cisco-VIC-1385' and '9000B'))"
   parameters:
   - "parent"
   - "name"
@@ -3120,7 +3088,7 @@
     data: "data conf-history"
   rows: "generated"
   data: "vpp-perf-results-3n-skx"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  filter: "not 'CFS_OPT'"
   parameters:
   - "parent"
   - "name"
@@ -3139,7 +3107,7 @@
     data: "data conf-history"
   rows: "generated"
   data: "vpp-perf-results-2n-skx"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  filter: "not 'CFS_OPT'"
   parameters:
   - "parent"
   - "name"
@@ -3177,7 +3145,7 @@
     data: "data show-run"
   rows: "generated"
   data: "vpp-perf-results-3n-hsw"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  filter: "not ('CFS_OPT' or ('NIC_Intel-X520-DA2' and 'IPSECHW') or ('NIC_Cisco-VIC-1385' and '9000B'))"
   parameters:
   - "parent"
   - "name"
@@ -3196,7 +3164,7 @@
     data: "data show-run"
   rows: "generated"
   data: "vpp-perf-results-3n-skx"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  filter: "not 'CFS_OPT'"
   parameters:
   - "parent"
   - "name"
@@ -3215,7 +3183,7 @@
     data: "data show-run"
   rows: "generated"
   data: "vpp-perf-results-2n-skx"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  filter: "not 'CFS_OPT'"
   parameters:
   - "parent"
   - "name"
@@ -4024,7 +3992,7 @@
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
   dir-tables: "{DIR[DTR,PERF,VPP,3N,HSW]}"
   data: "vpp-perf-results-3n-hsw"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  filter: "not ('CFS_OPT' or ('NIC_Intel-X520-DA2' and 'IPSECHW') or ('NIC_Cisco-VIC-1385' and '9000B'))"
   parameters:
   - "name"
   - "doc"
@@ -4041,7 +4009,7 @@
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
   dir-tables: "{DIR[DTR,PERF,VPP,3N,SKX]}"
   data: "vpp-perf-results-3n-skx"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  filter: "not 'CFS_OPT'"
   parameters:
   - "name"
   - "doc"
@@ -4058,7 +4026,7 @@
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
   dir-tables: "{DIR[DTR,PERF,VPP,2N,SKX]}"
   data: "vpp-perf-results-2n-skx"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  filter: "not 'CFS_OPT'"
   parameters:
   - "name"
   - "doc"
@@ -4092,7 +4060,7 @@
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
   dir-tables: "{DIR[DTC,PERF,VPP,3N,HSW]}"
   data: "vpp-perf-results-3n-hsw"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  filter: "not ('CFS_OPT' or ('NIC_Intel-X520-DA2' and 'IPSECHW') or ('NIC_Cisco-VIC-1385' and '9000B'))"
   parameters:
   - "name"
   - "doc"
@@ -4109,7 +4077,7 @@
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
   dir-tables: "{DIR[DTC,PERF,VPP,3N,SKX]}"
   data: "vpp-perf-results-3n-skx"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  filter: "not 'CFS_OPT'"
   parameters:
   - "name"
   - "doc"
@@ -4126,7 +4094,7 @@
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
   dir-tables: "{DIR[DTC,PERF,VPP,2N,SKX]}"
   data: "vpp-perf-results-2n-skx"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  filter: "not 'CFS_OPT'"
   parameters:
   - "name"
   - "doc"
@@ -4160,7 +4128,7 @@
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
   dir-tables: "{DIR[DTO,PERF,VPP,3N,HSW]}"
   data: "vpp-perf-results-3n-hsw"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  filter: "not ('CFS_OPT' or ('NIC_Intel-X520-DA2' and 'IPSECHW') or ('NIC_Cisco-VIC-1385' and '9000B'))"
   parameters:
   - "name"
   - "doc"
@@ -4177,7 +4145,7 @@
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
   dir-tables: "{DIR[DTO,PERF,VPP,3N,SKX]}"
   data: "vpp-perf-results-3n-skx"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  filter: "not 'CFS_OPT'"
   parameters:
   - "name"
   - "doc"
@@ -4194,7 +4162,7 @@
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
   dir-tables: "{DIR[DTO,PERF,VPP,2N,SKX]}"
   data: "vpp-perf-results-2n-skx"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  filter: "not 'CFS_OPT'"
   parameters:
   - "name"
   - "doc"
@@ -4586,50 +4554,56 @@
 ###                                P L O T S                                 ###
 ################################################################################
 
-# Soak test - 30min Soak Test (PLRsearch), boxes
+# Soak Test (PLRsearch), boxes
 - type: "plot"
-  title: "VPP Throughput: 30min Soak Test (PLRsearch) boxes"
-  algorithm: "plot_soak_boxes"
+  title: "VPP Critical rate: 2 Hours Soak Test (PLRsearch)"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/example-soak-boxes"
+  output-file: "{DIR[STATIC,VPP]}/soak-test-1"
   data: "plot-vpp-soak-2n-skx"
-  filter: "'SOAK'"
+  filter: "('L2BDMACLRN' or 'L2PATCH' or 'L2XCBASE') and not 'VHOST' and not 'MEMIF'"
   parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "L2PATCH"
-#  - "L2XCBASE"
-#  - "L2BDMACLRN"
-#  - "IP4FWD"
-#  - "IP6FWD"
-  - "VHOST"
+    - "throughput"
+    - "parent"
+    - "tags"
+  sort:
+    - "DRV_AVF"
+    - "DRV_AVF"
+    - "DRV_AVF"
+    - "L2BDMACLRN"
+    - "L2XCBASE"
+    - "L2PATCH"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "all"
+    whiskerwidth: 0
   layout:
-    title: "30min Soak Test (PLRsearch)"
+    title: "2 Hours Soak Test (PLRsearch)"
     layout: "plot-soak-throughput"
 
-# Soak test - example, not used
+# Soak Test (PLRsearch), boxes
 - type: "plot"
-  title: "VPP Throughput: 30min Soak Test (PLRsearch) bars"
-  algorithm: "plot_soak_bars"
+  title: "VPP Critical rate: 2 Hours Soak Test (PLRsearch)"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/example-soak-bars"
+  output-file: "{DIR[STATIC,VPP]}/soak-test-2"
   data: "plot-vpp-soak-2n-skx"
-  filter: "'SOAK'"
+  filter: "'L2BDMACLRN' and ('VHOST' or 'MEMIF') or 'IP4BASE' or 'IP6BASE'"
   parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "L2PATCH"
-#  - "L2XCBASE"
-#  - "L2BDMACLRN"
-#  - "IP4FWD"
-#  - "IP6FWD"
-  - "VHOST"
+    - "throughput"
+    - "parent"
+    - "tags"
+  sort:
+    - "VHOST"
+    - "MEMIF"
+    - "IP4FWD"
+    - "IP6FWD"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "all"
+    whiskerwidth: 0
   layout:
-    title: "30min Soak Test (PLRsearch)"
+    title: "2 Hours Soak Test (PLRsearch)"
     layout: "plot-soak-throughput"
 
 ################################################################################
@@ -14339,7 +14313,6 @@
            'BASE' and
            '1T1C' and
            'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -14366,7 +14339,6 @@
            'BASE' and
            '1T1C' and
            'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -14393,7 +14365,6 @@
            'BASE' and
            '2T2C' and
            'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -14420,7 +14391,6 @@
            'BASE' and
            '2T2C' and
            'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -14448,7 +14418,6 @@
            'SCALE' and
            '1T1C' and
            'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -14475,7 +14444,6 @@
            'SCALE' and
            '1T1C' and
            'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -14502,7 +14470,6 @@
            'SCALE' and
            '2T2C' and
            'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -14529,7 +14496,6 @@
            'SCALE' and
            '2T2C' and
            'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -14556,7 +14522,6 @@
            'NDRPDR' and
            '1T1C' and
            'IPSECSW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -14582,7 +14547,6 @@
            'NDRPDR' and
            '1T1C' and
            'IPSECSW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -14608,7 +14572,6 @@
            'NDRPDR' and
            '2T2C' and
            'IPSECSW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -14634,7 +14597,6 @@
            'NDRPDR' and
            '2T2C' and
            'IPSECSW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -21501,7 +21463,6 @@
            'BASE' and
            '1T1C' and
            'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
   - "latency"
@@ -21524,7 +21485,6 @@
            'BASE' and
            '2T2C' and
            'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
   - "latency"
@@ -21548,7 +21508,6 @@
            'SCALE' and
            '1T1C' and
            'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
   - "latency"
@@ -21571,7 +21530,6 @@
            'SCALE' and
            '2T2C' and
            'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
   - "latency"
@@ -21594,7 +21552,6 @@
            'NDRPDR' and
            '1T1C' and
            'IPSECSW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
   - "latency"
@@ -21616,7 +21573,6 @@
            'NDRPDR' and
            '2T2C' and
            'IPSECSW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
   - "latency"
@@ -25783,7 +25739,6 @@
            'NDRPDR' and
            'BASE' and
            'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -25805,7 +25760,6 @@
            'NDRPDR' and
            'BASE' and
            'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -25828,7 +25782,6 @@
            'NDRPDR' and
            'SCALE' and
            'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -25850,7 +25803,6 @@
            'NDRPDR' and
            'SCALE' and
            'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -25872,7 +25824,6 @@
            'IP4FWD' and
            'NDRPDR' and
            'IPSECSW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -25893,7 +25844,6 @@
            'IP4FWD' and
            'NDRPDR' and
            'IPSECSW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
   - "throughput"