Report: Add data

[csit.git] / resources / tools / presentation / specification.yaml
diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml

index db075b7..e734e51 100644 (file)
--- a/resources/tools/presentation/specification.yaml
+++ b/resources/tools/presentation/specification.yaml
@@ -126,625 +126,798 @@
  
    data-sets:
  
-    # Denverton:
-    intel-dnv-vpp:
-      # TODO: Replace with new data
-      intel-dnv-vpp-release-1810:
-      - 1
+    ###########################################################################
+    # Plots:
  
-    # VPP Performance
-    vpp-performance-changes-3n-hsw:
-      csit-vpp-perf-verify-1807-3n-hsw:
-      - 11  # NDRPDR full 1
-      - 22  # NDRPDR full 2
-      - 45  # NDRPDR full 3
-      - 46  # NDRPDR full 4
-      - 15  # NDRPDR sel
-      - 16  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 18  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 38  # NDRPDR sel
-      - 40  # NDRPDR sel
-      - 44  # NDRPDR sel
-      - 47  # NDRPDR sel
-      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
-      # TODO Add new data
+    # 3n-hsw
+
+    plot-vpp-throughput-latency-3n-hsw:
        csit-vpp-perf-verify-1901-3n-hsw:
-      - 10  # NDRPDR sel
-      - 18  # NDRPDR sel F
-      - 19  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 36  # NDRPDR sel
+        - 10  # NDRPDR sel
+        - 19  # NDRPDR sel
+        - 31  # NDRPDR sel
+        - 36  # NDRPDR sel
+        - 40  # NDRPDR sel
+        - 42  # NDRPDR sel
+        - 44  # NDRPDR sel
+        - 46  # NDRPDR sel
+        - 47  # NDRPDR sel
+        - 48  # NDRPDR sel
  
-    vpp-nic-comparison-3n-hsw:
-      # TODO: Add new data
+    plot-throughput-speedup-analysis-3n-hsw:
        csit-vpp-perf-verify-1901-3n-hsw:
-      - 10  # NDRPDR sel
-      - 18  # NDRPDR sel F
-      - 19  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 36  # NDRPDR sel
+        - 10  # NDRPDR sel
+        - 19  # NDRPDR sel
+        - 31  # NDRPDR sel
+        - 36  # NDRPDR sel
+        - 40  # NDRPDR sel
+        - 42  # NDRPDR sel
+        - 44  # NDRPDR sel
+        - 46  # NDRPDR sel
+        - 47  # NDRPDR sel
+        - 48  # NDRPDR sel
  
-    vpp-performance-changes-3n-skx:
-      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
-      - 56  # NDRPDR sel
-      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
-      # TODO Add new data:
+    plot-vpp-http-server-performance:
+      # TODO: Replace with new data
+      # csit-vpp-perf-verify-1901-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-latency-3n-hsw:
+      # TODO: Replace with new data
+      # csit-ligato-perf-verify-1901-3n-hsw:
+      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-speedup-analysis-3n-hsw:
+      # TODO: Replace with new data
+      # csit-ligato-perf-verify-1901-3n-hsw:
+      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-dpdk-throughput-latency-3n-hsw:
+      csit-dpdk-perf-verify-1901-3n-hsw:
+        - 13  # NDRPDR sel
+        - 14  # NDRPDR sel
+        - 16  # NDRPDR sel
+        - 17  # NDRPDR sel
+        - 18  # NDRPDR sel
+        - 19  # NDRPDR sel
+        - 20  # NDRPDR sel
+        - 21  # NDRPDR sel
+        - 22  # NDRPDR sel
+        - 23  # NDRPDR sel
+
+    # 3n-skx
+
+    plot-vpp-throughput-latency-3n-skx:
        csit-vpp-perf-verify-1901-3n-skx:
-      - 18  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 28  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 33  # NDRPDR sel
-      - 36  # NDRPDR sel
-      - 38  # NDRPDR sel
+        - 18  # NDRPDR sel
+        - 19  # NDRPDR sel
+        - 20  # NDRPDR sel
+        - 28  # NDRPDR sel
+        - 31  # NDRPDR sel
+        - 33  # NDRPDR sel
+        - 36  # NDRPDR sel
+        - 38  # NDRPDR sel
+        - 47  # NDRPDR sel
+        - 48  # NDRPDR sel
  
-    vpp-nic-comparison-3n-skx:
-      # TODO: Add new data
+    plot-throughput-speedup-analysis-3n-skx:
        csit-vpp-perf-verify-1901-3n-skx:
-      - 18  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 28  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 33  # NDRPDR sel
-      - 36  # NDRPDR sel
-      - 38  # NDRPDR sel
+        - 18  # NDRPDR sel
+        - 19  # NDRPDR sel
+        - 20  # NDRPDR sel
+        - 28  # NDRPDR sel
+        - 31  # NDRPDR sel
+        - 33  # NDRPDR sel
+        - 36  # NDRPDR sel
+        - 38  # NDRPDR sel
+        - 47  # NDRPDR sel
+        - 48  # NDRPDR sel
  
-    vpp-performance-changes-2n-skx:
-      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
-      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
-      # TODO Add new data:
+    plot-dpdk-throughput-latency-3n-skx:
+      csit-dpdk-perf-verify-1901-3n-skx:
+        - 3   # 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
+
+    # 2n-skx
+
+    plot-vpp-throughput-latency-2n-skx:
        csit-vpp-perf-verify-1901-2n-skx:
-      - 5   # NDRPDR sel
-      - 10  # NDRPDR sel fails
-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
-      - 16  # NDRPDR sel fails
-      - 21  # NDRPDR sel
-      - 23  # NDRPDR sel
+        - 5   # NDRPDR sel
+        - 12  # NDRPDR sel
+        - 13  # NDRPDR sel
+        - 21  # NDRPDR sel
+        - 23  # NDRPDR sel
+        - 31  # NDRPDR sel
+        - 34  # NDRPDR sel
+        - 40  # NDRPDR sel
+        - 42  # NDRPDR sel
+        - 43  # NDRPDR sel
  
-    vpp-nic-comparison-2n-skx:
+    plot-throughput-speedup-analysis-2n-skx:
+      csit-vpp-perf-verify-1901-2n-skx:
+        - 5   # NDRPDR sel
+        - 12  # NDRPDR sel
+        - 13  # NDRPDR sel
+        - 21  # NDRPDR sel
+        - 23  # NDRPDR sel
+        - 31  # NDRPDR sel
+        - 34  # NDRPDR sel
+        - 40  # NDRPDR sel
+        - 42  # NDRPDR sel
+        - 43  # NDRPDR sel
+
+    plot-vpp-soak-2n-skx:
+      csit-vpp-perf-verify-1901-2n-skx:
+        - 45  # SOAK sel
+
+    plot-vpp-nfv-2n-skx:
        # TODO: Add new data
        csit-vpp-perf-verify-1901-2n-skx:
-      - 5   # NDRPDR sel
-      - 10  # NDRPDR sel fails
-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
-      - 16  # NDRPDR sel fails
-      - 21  # NDRPDR sel
-      - 23  # NDRPDR sel
+        - 28  # NFV NDRPDR
+        - 29  # NFV NDRPDR
+        - 32  # NFV NDRPDR
+        - 39  # NFV NDRPDR
+        - 46  # NFV NDRPDR
  
-    vpp-compare-testbeds:
+    plot-vpp-nfv-2n-skx-mrr:
        # TODO: Add new data
+      csit-vpp-perf-verify-1901-2n-skx:
+        - 24  # NFV MRR
+        - 26  # NFV MRR
+        - 27  # NFV MRR
+        - 35  # NFV MRR
+        - 37  # NFV MRR
+
+    plot-dpdk-throughput-latency-2n-skx:
+      csit-dpdk-perf-verify-1901-2n-skx:
+        - 12  # NDRPDR sel
+        - 13  # NDRPDR sel
+        - 14  # NDRPDR sel
+        - 15  # NDRPDR sel
+        - 16  # NDRPDR sel
+        - 17  # NDRPDR sel
+        - 18  # NDRPDR sel
+        - 19  # NDRPDR sel
+        - 20  # NDRPDR sel
+        - 21  # NDRPDR sel
+
+    # 3rd party
+
+    # Denverton:
+    intel-dnv-vpp:
+      # TODO: Replace with new data
+      intel-dnv-vpp-release-1810:
+        - 1
+
+    ###########################################################################
+    # Simple tables (only one data set):
+
+    # NIC Comparisons
+
+    vpp-nic-comparison-3n-hsw:
        csit-vpp-perf-verify-1901-3n-hsw:
-      - 10  # NDRPDR sel
-      - 18  # NDRPDR sel F
-      - 19  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 36  # NDRPDR sel
-      # TODO: Add new data
+        - 10  # NDRPDR sel
+        - 19  # NDRPDR sel
+        - 31  # NDRPDR sel
+        - 36  # NDRPDR sel
+        - 40  # NDRPDR sel
+        - 42  # NDRPDR sel
+        - 44  # NDRPDR sel
+        - 46  # NDRPDR sel
+        - 47  # NDRPDR sel
+        - 48  # NDRPDR sel
+
+    vpp-nic-comparison-3n-skx:
        csit-vpp-perf-verify-1901-3n-skx:
-      - 18  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 28  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 33  # NDRPDR sel
-      - 36  # NDRPDR sel
-      - 38  # NDRPDR sel
+        - 18  # NDRPDR sel
+        - 19  # NDRPDR sel
+        - 20  # NDRPDR sel
+        - 28  # NDRPDR sel
+        - 31  # NDRPDR sel
+        - 33  # NDRPDR sel
+        - 36  # NDRPDR sel
+        - 38  # NDRPDR sel
+        - 47  # NDRPDR sel
+        - 48  # NDRPDR sel
  
-    vpp-compare-testbeds-mrr:
-      # TODO: Add new data
+    vpp-nic-comparison-2n-skx:
+      csit-vpp-perf-verify-1901-2n-skx:
+        - 5   # NDRPDR sel
+        - 12  # NDRPDR sel
+        - 13  # NDRPDR sel
+        - 21  # NDRPDR sel
+        - 23  # NDRPDR sel
+        - 31  # NDRPDR sel
+        - 34  # NDRPDR sel
+        - 40  # NDRPDR sel
+        - 42  # NDRPDR sel
+        - 43  # NDRPDR sel
+
+    vpp-nic-comparison-3n-hsw-mrr:
        csit-vpp-perf-verify-1901-3n-hsw:
-      - 35  # MRR sel
-      # TODO: Add new data
+        - 35  # MRR sel
+
+    vpp-nic-comparison-3n-skx-mrr:
        csit-vpp-perf-verify-1901-3n-skx:
-      - 32  # MRR sel
+        - 32  # MRR sel
  
-    vpp-compare-topologies:
-      # TODO: Add new data
+    vpp-nic-comparison-2n-skx-mrr:
+      csit-vpp-perf-verify-1901-2n-skx:
+        - 22  # MRR sel
+
+    # Results
+
+    vpp-perf-results-3n-hsw:
+      # TODO: Add FULL data
+      csit-vpp-perf-verify-1901-3n-hsw:
+        - 38  # NDRPDR full
+        - 43  # NDRPDR full
+        - 45  # NDRPDR full
+
+    vpp-perf-results-3n-skx:
        csit-vpp-perf-verify-1901-3n-skx:
-      - 18  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 28  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 33  # NDRPDR sel
-      - 36  # NDRPDR sel
-      - 38  # NDRPDR sel
-      # TODO: Add new data
+        - 37  # NDRPDR full
+        - 39  # NDRPDR full
+        - 40  # NDRPDR full
+        - 49  # NDRPDR full
+
+    vpp-perf-results-2n-skx:
        csit-vpp-perf-verify-1901-2n-skx:
-      - 5   # NDRPDR sel
-      - 10  # NDRPDR sel fails
-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
-      - 16  # NDRPDR sel fails
-      - 21  # NDRPDR sel
-      - 23  # NDRPDR sel
+        - 25  # NDRPDR full
+        - 30  # NDRPDR full
+        - 33  # NDRPDR full
+        - 44  # NDRPDR full
  
-    vpp-compare-topologies-mrr:
-      # TODO: Add new data
+    vpp-mrr-results-3n-hsw:
+      csit-vpp-perf-verify-1901-3n-hsw:
+        - 35  # MRR sel
+
+    vpp-mrr-results-3n-skx:
        csit-vpp-perf-verify-1901-3n-skx:
-      - 32  # MRR sel
-      # TODO: Add new data
+        - 32  # MRR sel
+
+    vpp-mrr-results-2n-skx:
        csit-vpp-perf-verify-1901-2n-skx:
-      - 22  # MRR sel
+        - 22  # MRR sel
  
-    vpp-performance-changes-3n-hsw-mrr:
+    vpp-func-results-ubuntu:
+      csit-vpp-functional-1901-ubuntu1604-virl:
+        - 48
+
+    vpp-func-results-centos:
+      csit-vpp-functional-1901-centos7-virl:
+        - 50
+
+    vpp-device-results-ubuntu:
+      csit-vpp-device-1901-ubuntu1804-1n-skx:
+        - 49
+
+    # VPP Ligato
+    ligato-perf-results-3n-hsw:
+      # TODO: Replace with new data
+      # csit-ligato-perf-verify-1901-3n-hsw:
+      csit-ligato-perf-verify-1810-3n-hsw:
+        - 5   # full
+
+    dpdk-perf-results-3n-hsw:
+      csit-dpdk-perf-verify-1901-3n-hsw:
+        - 20  # NDRPDR sel
+
+    dpdk-perf-results-3n-skx:
+      csit-dpdk-perf-verify-1901-3n-skx:
+        - 13  # NDRPDR sel
+
+    dpdk-perf-results-2n-skx:
+      csit-dpdk-perf-verify-1901-2n-skx:
+        - 21  # NDRPDR sel
+
+    # HoneyComb Functional
+    hc-func-results:
+      csit-hc2vpp-verify-func-1901-ubuntu1604:
+        - 3
+
+    # NSH SFC Functional
+    nsh-func-results:
+      # TODO: Replace with new data
+      # csit-nsh_sfc-verify-func-1901-ubuntu1604-virl:
+      csit-nsh_sfc-verify-func-1810-ubuntu1604-virl:
+        - 1
+
+    # DMM Functional
+    dmm-func-results:
+      csit-dmm-functional-1901-ubuntu1604-virl:
+        - 2
+
+    ###########################################################################
+    # Tables (more than one data set)
+
+    # Performance changes
+
+    vpp-performance-changes-3n-hsw-h1:
        csit-vpp-perf-verify-1807-3n-hsw:
-      - 8   # MRR full
-      - 9   # MRR sel
-      - 21  # MRR sel
-      - 31  # MRR sel
-      - 33  # MRR sel
-      - 36  # MRR sel
-      - 41  # MRR sel
-      - 42  # MRR sel
-      - 48  # MRR sel
+        - 11  # NDRPDR full 1
+        - 22  # NDRPDR full 2
+        - 45  # NDRPDR full 3
+        - 46  # NDRPDR full 4
+        - 15  # NDRPDR sel
+        - 16  # NDRPDR sel
+        - 19  # NDRPDR sel
+        - 18  # NDRPDR sel
+        - 20  # NDRPDR sel
+        - 38  # NDRPDR sel
+        - 40  # NDRPDR sel
+        - 44  # NDRPDR sel
+        - 47  # NDRPDR sel
+    vpp-performance-changes-3n-hsw-ref:
        csit-vpp-perf-verify-1810-3n-hsw:
-      - 9   # MRR sel
-      # TODO: Add new data
-      csit-vpp-perf-verify-1901-3n-hsw:
-      - 35  # MRR sel
-
-    vpp-nic-comparison-3n-hsw-mrr:
-      # TODO: Add new data
+        - 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-cmp:
        csit-vpp-perf-verify-1901-3n-hsw:
-      - 35  # MRR sel
+      - 10  # NDRPDR sel
+      - 19  # NDRPDR sel
+      - 31  # NDRPDR sel
+      - 36  # NDRPDR sel
+      - 40  # NDRPDR sel
+      - 42  # NDRPDR sel
+      - 44  # NDRPDR sel
+      - 46  # NDRPDR sel
+      - 47  # NDRPDR sel
+      - 48  # NDRPDR sel
+    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-mrr:
+    vpp-performance-changes-3n-skx-h1:
        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
-      - 53  # MRR sel
-      - 54  # MRR sel
+        - 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
+        - 56  # NDRPDR sel
+    vpp-performance-changes-3n-skx-ref:
        csit-vpp-perf-verify-1810-3n-skx:
-      - 9   # MRR sel
-      - 11  # MRR sel
-      - 12  # MRR sel
-      - 13  # MRR sel
-      # TODO: Add new data
-      csit-vpp-perf-verify-1901-3n-skx:
-      - 32  # MRR sel
-
-    vpp-nic-comparison-3n-skx-mrr:
-      # TODO: Replace with new data
+        - 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-cmp:
        csit-vpp-perf-verify-1901-3n-skx:
-      - 32  # MRR sel
+        - 18  # NDRPDR sel
+        - 19  # NDRPDR sel
+        - 20  # NDRPDR sel
+        - 28  # NDRPDR sel
+        - 31  # NDRPDR sel
+        - 33  # NDRPDR sel
+        - 36  # NDRPDR sel
+        - 38  # NDRPDR sel
+        - 47  # NDRPDR sel
+        - 48  # NDRPDR sel
+    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-mrr:
+    vpp-performance-changes-2n-skx-h1:
        csit-vpp-perf-verify-1807-2n-skx:
-      - 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
+        - 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
+    vpp-performance-changes-2n-skx-ref:
        csit-vpp-perf-verify-1810-2n-skx:
-      - 8   # MRR sel
-      - 10  # MRR sel
-      - 11  # MRR sel
-      - 12  # MRR sel
-      # TODO: Add new data
-      csit-vpp-perf-verify-1901-2n-skx:
-      - 22  # MRR sel
-
-    vpp-nic-comparison-2n-skx-mrr:
-      # TODO: Add new data
+        - 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-cmp:
        csit-vpp-perf-verify-1901-2n-skx:
-      - 22  # MRR sel
+        - 5   # NDRPDR sel
+        - 12  # NDRPDR sel
+        - 13  # NDRPDR sel
+        - 21  # NDRPDR sel
+        - 23  # NDRPDR sel
+        - 31  # NDRPDR sel
+        - 34  # NDRPDR sel
+        - 40  # NDRPDR sel
+        - 42  # NDRPDR sel
+        - 43  # NDRPDR sel
+    vpp-performance-changes-2n-skx:
+      - "vpp-performance-changes-2n-skx-h1"
+      - "vpp-performance-changes-2n-skx-ref"
+      - "vpp-performance-changes-2n-skx-cmp"
  
-    vpp-perf-results-3n-hsw:
-      # TODO: Replace with FULL data
+    vpp-performance-changes-3n-hsw-mrr-h1:
+      csit-vpp-perf-verify-1807-3n-hsw:
+        - 8   # MRR full
+        - 9   # MRR sel
+        - 21  # MRR sel
+        - 31  # MRR sel
+        - 33  # MRR sel
+        - 36  # MRR sel
+        - 41  # MRR sel
+        - 42  # MRR sel
+        - 48  # MRR sel
+    vpp-performance-changes-3n-hsw-mrr-ref:
+      csit-vpp-perf-verify-1810-3n-hsw:
+        - 9   # MRR sel
+    vpp-performance-changes-3n-hsw-mrr-cmp:
        csit-vpp-perf-verify-1901-3n-hsw:
-      - 19  # NDRPDR sel
+        - 35  # MRR sel
+    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-perf-results-3n-skx:
-      # TODO: Add FULL data
+    vpp-performance-changes-3n-skx-mrr-h1:
+      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
+        - 53  # MRR sel
+        - 54  # MRR sel
+    vpp-performance-changes-3n-skx-mrr-ref:
+      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-cmp:
        csit-vpp-perf-verify-1901-3n-skx:
-      - 37  # NDRPDR full
-      - 39  # NDRPDR full
+        - 32  # MRR sel
+    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-perf-results-2n-skx:
-      # TODO: Add FULL data
+    vpp-performance-changes-2n-skx-mrr-h1:
+      csit-vpp-perf-verify-1807-2n-skx:
+        - 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
+    vpp-performance-changes-2n-skx-mrr-ref:
+      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-cmp:
        csit-vpp-perf-verify-1901-2n-skx:
-      - 25  # NDRPDR full
-      - 30  # NDRPDR full
+        - 22  # MRR sel
+    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"
  
-    vpp-mrr-results-3n-hsw:
-      # TODO: Replace with FULL data
-      csit-vpp-perf-verify-1901-3n-hsw:
-      - 35  # MRR sel
+    dpdk-performance-changes-3n-hsw-h1:
+      csit-dpdk-perf-verify-1807-3n-hsw:
+        - 11
+        - 12  # full
+        - 14
+        - 15
+        - 16
+        - 17
+        - 20
+        - 21
+        - 22
+        - 23
+    dpdk-performance-changes-3n-hsw-ref:
+      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-cmp:
+      csit-dpdk-perf-verify-1901-3n-hsw:
+        - 13  # NDRPDR sel
+        - 14  # NDRPDR sel
+        - 16  # NDRPDR sel
+        - 17  # NDRPDR sel
+        - 18  # NDRPDR sel
+        - 19  # NDRPDR sel
+        - 20  # NDRPDR sel
+        - 21  # NDRPDR sel
+        - 22  # NDRPDR sel
+        - 23  # NDRPDR sel
+    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-1807-3n-skx:
+        - 1   # NDRPDR sel
+        - 2   # NDRPDR sel
+        - 3   # NDRPDR sel
+        - 6   # NDRPDR sel
+        - 7   # NDRPDR sel
+        - 8   # NDRPDR sel
+        - 9   # NDRPDR sel
+        - 10  # NDRPDR sel
+        - 11  # NDRPDR sel
+        - 12  # NDRPDR sel
+    dpdk-performance-changes-3n-skx-ref:
+      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
+    dpdk-performance-changes-3n-skx-cmp:
+      csit-dpdk-perf-verify-1901-3n-skx:
+        - 3   # 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
+    dpdk-performance-changes-3n-skx:
+      - "dpdk-performance-changes-3n-skx-h1"
+      - "dpdk-performance-changes-3n-skx-ref"
+      - "dpdk-performance-changes-3n-skx-cmp"
  
-    vpp-mrr-results-3n-skx:
-      # TODO: Replace with FULL data
-      csit-vpp-perf-verify-1901-3n-skx:
-      - 32  # MRR sel
+    dpdk-performance-changes-2n-skx-ref:
+      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-cmp:
+      csit-dpdk-perf-verify-1901-2n-skx:
+        - 12  # NDRPDR sel
+        - 13  # NDRPDR sel
+        - 14  # NDRPDR sel
+        - 15  # NDRPDR sel
+        - 16  # NDRPDR sel
+        - 17  # NDRPDR sel
+        - 18  # NDRPDR sel
+        - 19  # NDRPDR sel
+        - 20  # NDRPDR sel
+        - 21  # NDRPDR sel
+    dpdk-performance-changes-2n-skx:
+      - "dpdk-performance-changes-2n-skx-ref"
+      - "dpdk-performance-changes-2n-skx-cmp"
  
-    vpp-mrr-results-2n-skx:
-      # TODO: Replace with FULL data
-      csit-vpp-perf-verify-1901-2n-skx:
-      - 22  # MRR sel
+    # Compare testbeds
  
-    plot-throughput-speedup-analysis-3n-hsw:
-      # TODO: Add new data
+    vpp-compare-testbeds-ref:
        csit-vpp-perf-verify-1901-3n-hsw:
        - 10  # NDRPDR sel
-      - 18  # NDRPDR sel F
        - 19  # NDRPDR sel
        - 31  # NDRPDR sel
        - 36  # NDRPDR sel
-
-    plot-throughput-speedup-analysis-3n-skx:
-      # TODO: Add new data
+      - 40  # NDRPDR sel
+      - 42  # NDRPDR sel
+      - 44  # NDRPDR sel
+      - 46  # NDRPDR sel
+      - 47  # NDRPDR sel
+      - 48  # NDRPDR sel
+    vpp-compare-testbeds-cmp:
        csit-vpp-perf-verify-1901-3n-skx:
-      - 18  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 28  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 33  # NDRPDR sel
-      - 36  # NDRPDR sel
-      - 38  # NDRPDR sel
-
-    plot-throughput-speedup-analysis-2n-skx:
-      # TODO: Add new data
-      csit-vpp-perf-verify-1901-2n-skx:
-      - 5   # NDRPDR sel
-      - 10  # NDRPDR sel fails
-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
-      - 16  # NDRPDR sel fails
-      - 21  # NDRPDR sel
-      - 23  # NDRPDR sel
+        - 18  # NDRPDR sel
+        - 19  # NDRPDR sel
+        - 20  # NDRPDR sel
+        - 28  # NDRPDR sel
+        - 31  # NDRPDR sel
+        - 33  # NDRPDR sel
+        - 36  # NDRPDR sel
+        - 38  # NDRPDR sel
+        - 47  # NDRPDR sel
+        - 48  # NDRPDR sel
+    vpp-compare-testbeds:
+      - "vpp-compare-testbeds-ref"
+      - "vpp-compare-testbeds-cmp"
  
-    plot-vpp-throughput-latency-3n-hsw:
-      # TODO: Add new data
+    vpp-compare-testbeds-mrr-ref:
        csit-vpp-perf-verify-1901-3n-hsw:
-      - 10  # NDRPDR sel
-      - 18  # NDRPDR sel F
-      - 19  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 36  # NDRPDR sel
-
-    plot-vpp-soak-2n-skx:
-      # TODO: Replace with new data
-      # csit-vpp-perf-verify-1901-2n-skx:
-      csit-vpp-perf-verify-master-2n-skx:
-      - 248  # SOAK sel
-      - 251  # SOAK sel
-
-    plot-vpp-nfv-2n-skx:
-      # TODO: Add new data
-      csit-vpp-perf-verify-1901-2n-skx:
-      - 28  # NFV NDRPDR
-      - 29  # NFV NDRPDR
-      # - 32  # NFV NDRPDR
-
-    plot-vpp-nfv-2n-skx-mrr:
-      # TODO: Add new data
-      csit-vpp-perf-verify-1901-2n-skx:
-      - 24  # NFV MRR
-      - 26  # NFV MRR
-      - 27  # NFV MRR
-
-    plot-vpp-throughput-latency-3n-skx:
-      # TODO: Add new data
+        - 35  # MRR sel
+    vpp-compare-testbeds-mrr-cmp:
        csit-vpp-perf-verify-1901-3n-skx:
-      - 18  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 28  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 33  # NDRPDR sel
-      - 36  # NDRPDR sel
-      - 38  # NDRPDR sel
-
-    plot-vpp-throughput-latency-2n-skx:
-      # TODO: Add new data
-      csit-vpp-perf-verify-1901-2n-skx:
-      - 5   # NDRPDR sel
-      - 10  # NDRPDR sel fails
-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
-      - 16  # NDRPDR sel fails
-      - 21  # NDRPDR sel
-      - 23  # NDRPDR sel
-
-    plot-vpp-http-server-performance:
-      # TODO: Replace with new data
-      # csit-vpp-perf-verify-1901-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
-
-    # VPP Functional
-    vpp-func-results-ubuntu:
-      csit-vpp-functional-1901-ubuntu1604-virl:
-      - 48
-
-    vpp-func-results-centos:
-      csit-vpp-functional-1901-centos7-virl:
-      - 50
-
-    vpp-device-results-ubuntu:
-      csit-vpp-device-1901-ubuntu1804-1n-skx:
-      - 49
-
-    # VPP Ligato
-    ligato-perf-results-3n-hsw:
-      # TODO: Replace with new data
-      # csit-ligato-perf-verify-1901-3n-hsw:
-      csit-ligato-perf-verify-1810-3n-hsw:
-      - 5   # full
-
-    plot-ligato-throughput-speedup-analysis-3n-hsw:
-      # TODO: Replace with new data
-      # csit-ligato-perf-verify-1901-3n-hsw:
-      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
+        - 32  # MRR sel
+    vpp-compare-testbeds-mrr:
+      - "vpp-compare-testbeds-mrr-ref"
+      - "vpp-compare-testbeds-mrr-cmp"
  
-    plot-ligato-throughput-latency-3n-hsw:
-      # TODO: Replace with new data
-      # csit-ligato-perf-verify-1901-3n-hsw:
-      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-3n-hsw:
-      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
-      # TODO: Add new data
+    dpdk-compare-testbeds-ref:
        csit-dpdk-perf-verify-1901-3n-hsw:
-      - 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
-
-    dpdk-performance-changes-3n-skx:
-      csit-dpdk-perf-verify-1807-3n-skx:
-      - 1   # NDRPDR sel
-      - 2   # NDRPDR sel
-      - 3   # NDRPDR sel
-      - 6   # NDRPDR sel
-      - 7   # NDRPDR sel
-      - 8   # NDRPDR sel
-      - 9   # NDRPDR sel
-      - 10  # NDRPDR sel
-      - 11  # NDRPDR sel
-      - 12  # NDRPDR sel
-      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
-      # TODO: Add new data
+        - 13  # NDRPDR sel
+        - 14  # NDRPDR sel
+        - 16  # NDRPDR sel
+        - 17  # NDRPDR sel
+        - 18  # NDRPDR sel
+        - 19  # NDRPDR sel
+        - 20  # NDRPDR sel
+        - 21  # NDRPDR sel
+        - 22  # NDRPDR sel
+        - 23  # NDRPDR sel
+    dpdk-compare-testbeds-cmp:
        csit-dpdk-perf-verify-1901-3n-skx:
-      - 1   # NDRPDR sel F
-      - 2   # NDRPDR sel F
-
+        - 3   # 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
      dpdk-compare-testbeds:
-      # TODO: Replace with new data
-      csit-dpdk-perf-verify-1901-3n-skx:
-      - 1   # NDRPDR sel F
-      - 2   # NDRPDR sel F
-      # TODO: Add new data
-      csit-dpdk-perf-verify-1901-3n-hsw:
-      - 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
-
-    dpdk-compare-topologies:
-      # TODO: Replace with new data
-      csit-dpdk-perf-verify-1901-3n-skx:
-      - 1   # NDRPDR sel F
-      - 2   # NDRPDR sel F
-      # TODO: Add new data
-      csit-dpdk-perf-verify-1901-2n-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
-
-    dpdk-perf-results-3n-hsw:
-      # TODO: Replace with FULL data
-      csit-dpdk-perf-verify-1901-3n-hsw:
-      - 6   # NDRPDR sel
+      - "dpdk-compare-testbeds-ref"
+      - "dpdk-compare-testbeds-cmp"
  
-    dpdk-perf-results-3n-skx:
-      # TODO: Replace with new data
-      csit-dpdk-perf-verify-1901-3n-skx:
-      - 2   # NDRPDR sel F
+    # Compare topologies
  
-    dpdk-perf-results-2n-skx:
-      # TODO: Replace with FULL data
-      csit-dpdk-perf-verify-1901-2n-skx:
-      - 2   # NDRPDR sel
+    vpp-compare-topologies-ref:
+      csit-vpp-perf-verify-1901-3n-skx:
+        - 18  # NDRPDR sel
+        - 19  # NDRPDR sel
+        - 20  # NDRPDR sel
+        - 28  # NDRPDR sel
+        - 31  # NDRPDR sel
+        - 33  # NDRPDR sel
+        - 36  # NDRPDR sel
+        - 38  # NDRPDR sel
+        - 47  # NDRPDR sel
+        - 48  # NDRPDR sel
+    vpp-compare-topologies-cmp:
+      csit-vpp-perf-verify-1901-2n-skx:
+        - 5   # NDRPDR sel
+        - 12  # NDRPDR sel
+        - 13  # NDRPDR sel
+        - 21  # NDRPDR sel
+        - 23  # NDRPDR sel
+        - 31  # NDRPDR sel
+        - 34  # NDRPDR sel
+        - 40  # NDRPDR sel
+        - 42  # NDRPDR sel
+        - 43  # NDRPDR sel
+    vpp-compare-topologies:
+      - "vpp-compare-topologies-ref"
+      - "vpp-compare-topologies-cmp"
  
-    plot-dpdk-throughput-latency-3n-hsw:
-      # TODO: Replace with new data
-      csit-dpdk-perf-verify-1901-3n-hsw:
-      - 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
+    vpp-compare-topologies-mrr-ref:
+      csit-vpp-perf-verify-1901-3n-skx:
+        - 32  # MRR sel
+    vpp-compare-topologies-mrr-cmp:
+      csit-vpp-perf-verify-1901-2n-skx:
+        - 22  # MRR sel
+    vpp-compare-topologies-mrr:
+      - "vpp-compare-topologies-mrr-ref"
+      - "vpp-compare-topologies-mrr-cmp"
  
-    plot-dpdk-throughput-latency-3n-skx:
-      # TODO: Replace with new data
+    dpdk-compare-topologies-ref:
        csit-dpdk-perf-verify-1901-3n-skx:
-      - 1   # NDRPDR sel F
-      - 2   # NDRPDR sel F
-
-    plot-dpdk-throughput-latency-2n-skx:
-      # TODO: Add new data
+        - 3   # 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
+    dpdk-compare-topologies-cmp:
        csit-dpdk-perf-verify-1901-2n-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
-
-    # HoneyComb Functional
-    hc-func-results:
-      csit-hc2vpp-verify-func-1901-ubuntu1604:
-      - 3
-
-    # NSH SFC Functional
-    nsh-func-results:
-      # TODO: Replace with new data
-      # csit-nsh_sfc-verify-func-1901-ubuntu1604-virl:
-      csit-nsh_sfc-verify-func-1810-ubuntu1604-virl:
-      - 1
-
-    # DMM Functional
-    dmm-func-results:
-      # TODO: Replace with new data
-      # csit-dmm-functional-1901-ubuntu1604-virl:
-      csit-dmm-functional-1810-ubuntu1604-virl:
-      - 1
+        - 12  # NDRPDR sel
+        - 13  # NDRPDR sel
+        - 14  # NDRPDR sel
+        - 15  # NDRPDR sel
+        - 16  # NDRPDR sel
+        - 17  # NDRPDR sel
+        - 18  # NDRPDR sel
+        - 19  # NDRPDR sel
+        - 20  # NDRPDR sel
+        - 21  # NDRPDR sel
+    dpdk-compare-topologies:
+      - "dpdk-compare-topologies-ref"
+      - "dpdk-compare-topologies-cmp"
  
    plot-layouts:
  
@@ -1150,6 +1323,7 @@
  
    builds:
  
+    # TODO: Replace with 1901 data
      intel-dnv-vpp-release-1810:
      - 1
  
@@ -1176,16 +1350,6 @@
      - 40  # NDRPDR sel
      - 44  # NDRPDR sel
      - 47  # NDRPDR sel
-    - 24  # WRK
-    - 25  # WRK
-    - 23  # WRK
-    - 26  # WRK
-    - 27  # WRK
-    - 28  # WRK
-    - 29  # WRK
-    - 30  # WRK
-    - 32  # WRK
-    - 35  # WRK
      csit-vpp-perf-verify-1810-3n-hsw:
      - 9   # MRR sel
      - 20  # NDRPDR full
@@ -1214,11 +1378,19 @@
      - 37  # WRK
      csit-vpp-perf-verify-1901-3n-hsw:
      - 35  # MRR sel
+    - 38  # NDRPDR full
+    - 43  # NDRPDR full
+    - 45  # NDRPDR full
      - 10  # NDRPDR sel
-    - 18  # NDRPDR sel F
      - 19  # NDRPDR sel
      - 31  # NDRPDR sel
      - 36  # NDRPDR sel
+    - 40  # NDRPDR sel
+    - 42  # NDRPDR sel
+    - 44  # NDRPDR sel
+    - 46  # NDRPDR sel
+    - 47  # NDRPDR sel
+    - 48  # NDRPDR sel
      csit-vpp-perf-verify-1807-3n-skx:
      - 31  # MRR full
      - 28  # MRR sel
@@ -1264,6 +1436,8 @@
      - 32  # MRR sel
      - 37  # NDRPDR full
      - 39  # NDRPDR full
+    - 40  # NDRPDR full
+    - 49  # NDRPDR full
      - 18  # NDRPDR sel
      - 19  # NDRPDR sel
      - 20  # NDRPDR sel
@@ -1272,6 +1446,8 @@
      - 33  # NDRPDR sel
      - 36  # NDRPDR sel
      - 38  # NDRPDR sel
+    - 47  # NDRPDR sel
+    - 48  # NDRPDR sel
      csit-vpp-perf-verify-1807-2n-skx:
      - 27  # MRR full
      - 31  # MRR sel
@@ -1316,22 +1492,29 @@
      - 22  # MRR sel
      - 25  # NDRPDR full
      - 30  # NDRPDR full
+    - 33  # NDRPDR full
+    - 44  # NDRPDR full
      - 5   # NDRPDR sel
-    - 10  # NDRPDR sel fails
      - 12  # NDRPDR sel
      - 13  # NDRPDR sel
-    - 16  # NDRPDR sel fails
      - 21  # NDRPDR sel
      - 23  # NDRPDR sel
+    - 31  # NDRPDR sel
+    - 34  # NDRPDR sel
+    - 40  # NDRPDR sel
+    - 42  # NDRPDR sel
+    - 43  # NDRPDR sel
      - 24  # NFV MRR
      - 26  # NFV MRR
      - 27  # NFV MRR
+    - 35  # NFV MRR
+    - 37  # NFV MRR
      - 28  # NFV NDRPDR
      - 29  # NFV NDRPDR
-    # - 32  # NFV NDRPDR
-    csit-vpp-perf-verify-master-2n-skx:
-    - 248  # SOAK sel
-    - 251  # SOAK sel
+    - 32  # NFV NDRPDR
+    - 39  # NFV NDRPDR
+    - 46  # NFV NDRPDR
+    - 45  # SOAK
      csit-ligato-perf-verify-1810-3n-hsw:
      - 5   # full
      - 6   # sel
@@ -1369,15 +1552,16 @@
      - 9   # NDRPDR sel
      - 10  # NDRPDR sel
      csit-dpdk-perf-verify-1901-3n-hsw:
-    - 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
+    - 13  # NDRPDR sel
+    - 14  # NDRPDR sel
+    - 16  # NDRPDR sel
+    - 17  # NDRPDR sel
+    - 18  # NDRPDR sel
+    - 19  # NDRPDR sel
+    - 20  # NDRPDR sel
+    - 21  # NDRPDR sel
+    - 22  # NDRPDR sel
+    - 23  # NDRPDR sel
      csit-dpdk-perf-verify-1807-3n-skx:
      - 1   # NDRPDR sel
      - 2   # NDRPDR sel
@@ -1401,40 +1585,49 @@
      - 12  # NDRPDR sel
      - 13  # NDRPDR sel
      csit-dpdk-perf-verify-1901-3n-skx:
-    - 1   # NDRPDR sel
-    - 2   # 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-dpdk-perf-verify-1901-2n-skx:
-    - 2   # NDRPDR sel
+    - 3   # 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
+    csit-dpdk-perf-verify-1810-2n-skx:
      - 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
+    csit-dpdk-perf-verify-1901-2n-skx:
+    - 12  # NDRPDR sel
+    - 13  # NDRPDR sel
+    - 14  # NDRPDR sel
+    - 15  # NDRPDR sel
+    - 16  # NDRPDR sel
+    - 17  # NDRPDR sel
+    - 18  # NDRPDR sel
+    - 19  # NDRPDR sel
+    - 20  # NDRPDR sel
+    - 21  # NDRPDR sel
      csit-vpp-functional-1901-ubuntu1604-virl:
      - 48
      csit-vpp-functional-1901-centos7-virl:
      - 50
      csit-vpp-device-1901-ubuntu1804-1n-skx:
      - 49
+    # TODO: Replace with 1901 data
      csit-nsh_sfc-verify-func-1810-ubuntu1604-virl:
      - 1
-    csit-dmm-functional-1810-ubuntu1604-virl:
-    - 1
+    csit-dmm-functional-1901-ubuntu1604-virl:
+    - 2
      csit-hc2vpp-verify-func-1901-ubuntu1604:
      - 3
  
@@ -1444,8 +1637,8 @@
    format:
      html:
      - full
-#    pdf:
-#    - minimal
+    pdf:
+    - minimal
  
  ################################################################################
  ###                               T A B L E S                                ###
@@ -1905,44 +2098,13 @@
    history:
      -
        title: "rls1807"
-      data:
-        csit-vpp-perf-verify-1807-3n-hsw:
-        - 11  # NDRPDR full 1
-        - 22  # NDRPDR full 2
-        - 45  # NDRPDR full 3
-        - 46  # NDRPDR full 4
-        - 15  # NDRPDR sel
-        - 16  # NDRPDR sel
-        - 19  # NDRPDR sel
-        - 18  # NDRPDR sel
-        - 20  # NDRPDR sel
-        - 38  # NDRPDR sel
-        - 40  # NDRPDR sel
-        - 44  # NDRPDR sel
+      data: "vpp-performance-changes-3n-hsw-h1"
    reference:
      title: "rls1810"
-    data:
-      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
+    data: "vpp-performance-changes-3n-hsw-ref"
    compare:
      title: "rls1901"
-    data:
-      # TODO: Add new data:
-      csit-vpp-perf-verify-1901-3n-hsw:
-      - 10  # NDRPDR sel
-      - 18  # NDRPDR sel F
-      - 19  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 36  # NDRPDR sel
+    data: "vpp-performance-changes-3n-hsw-cmp"
    data: "vpp-performance-changes-3n-hsw"
    include-tests: "PDR" # "PDR" | "NDR" | "MRR"
    filter: "'1T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -1960,45 +2122,13 @@
    history:
      -
        title: "rls1807"
-      data:
-        csit-vpp-perf-verify-1807-3n-hsw:
-        - 11  # NDRPDR full 1
-        - 22  # NDRPDR full 2
-        - 45  # NDRPDR full 3
-        - 46  # NDRPDR full 4
-        - 15  # NDRPDR sel
-        - 16  # NDRPDR sel
-        - 19  # NDRPDR sel
-        - 18  # NDRPDR sel
-        - 20  # NDRPDR sel
-        - 38  # NDRPDR sel
-        - 40  # NDRPDR sel
-        - 44  # NDRPDR sel
-        - 47  # NDRPDR sel
+      data: "vpp-performance-changes-3n-hsw-h1"
    reference:
      title: "rls1810"
-    data:
-      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
+    data: "vpp-performance-changes-3n-hsw-ref"
    compare:
      title: "rls1901"
-    data:
-      # TODO: Add new data:
-      csit-vpp-perf-verify-1901-3n-hsw:
-      - 10  # NDRPDR sel
-      - 18  # NDRPDR sel F
-      - 19  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 36  # NDRPDR sel
+    data: "vpp-performance-changes-3n-hsw-cmp"
    data: "vpp-performance-changes-3n-hsw"
    include-tests: "PDR" # "PDR" | "NDR" | "MRR"
    filter: "'2T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -2016,45 +2146,13 @@
    history:
      -
        title: "rls1807"
-      data:
-        csit-vpp-perf-verify-1807-3n-hsw:
-        - 11  # NDRPDR full 1
-        - 22  # NDRPDR full 2
-        - 45  # NDRPDR full 3
-        - 46  # NDRPDR full 4
-        - 15  # NDRPDR sel
-        - 16  # NDRPDR sel
-        - 19  # NDRPDR sel
-        - 18  # NDRPDR sel
-        - 20  # NDRPDR sel
-        - 38  # NDRPDR sel
-        - 40  # NDRPDR sel
-        - 44  # NDRPDR sel
-        - 47  # NDRPDR sel
+      data: "vpp-performance-changes-3n-hsw-h1"
    reference:
      title: "rls1810"
-    data:
-      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
+    data: "vpp-performance-changes-3n-hsw-ref"
    compare:
      title: "rls1901"
-    data:
-      # TODO: Add new data:
-      csit-vpp-perf-verify-1901-3n-hsw:
-      - 10  # NDRPDR sel
-      - 18  # NDRPDR sel F
-      - 19  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 36  # NDRPDR sel
+    data: "vpp-performance-changes-3n-hsw-cmp"
    data: "vpp-performance-changes-3n-hsw"
    include-tests: "NDR" # "PDR" | "NDR" | "MRR"
    filter: "'1T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -2072,45 +2170,13 @@
    history:
      -
        title: "rls1807"
-      data:
-        csit-vpp-perf-verify-1807-3n-hsw:
-        - 11  # NDRPDR full 1
-        - 22  # NDRPDR full 2
-        - 45  # NDRPDR full 3
-        - 46  # NDRPDR full 4
-        - 15  # NDRPDR sel
-        - 16  # NDRPDR sel
-        - 19  # NDRPDR sel
-        - 18  # NDRPDR sel
-        - 20  # NDRPDR sel
-        - 38  # NDRPDR sel
-        - 40  # NDRPDR sel
-        - 44  # NDRPDR sel
-        - 47  # NDRPDR sel
+      data: "vpp-performance-changes-3n-hsw-h1"
    reference:
      title: "rls1810"
-    data:
-      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
+    data: "vpp-performance-changes-3n-hsw-ref"
    compare:
      title: "rls1901"
-    data:
-      # TODO: Add new data:
-      csit-vpp-perf-verify-1901-3n-hsw:
-      - 10  # NDRPDR sel
-      - 18  # NDRPDR sel F
-      - 19  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 36  # NDRPDR sel
+    data: "vpp-performance-changes-3n-hsw-cmp"
    data: "vpp-performance-changes-3n-hsw"
    include-tests: "NDR" # "PDR" | "NDR" | "MRR"
    filter: "'2T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -2128,45 +2194,13 @@
    history:
      -
        title: "rls1807"
-      data:
-        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
-        - 56  # NDRPDR sel
+      data: "vpp-performance-changes-3n-skx-h1"
    reference:
      title: "rls1810"
-    data:
-      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
+    data: "vpp-performance-changes-3n-skx-ref"
    compare:
      title: "rls1901"
-    data:
-      # TODO: Add new data:
-      csit-vpp-perf-verify-1901-3n-skx:
-      - 18  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 28  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 33  # NDRPDR sel
-      - 36  # NDRPDR sel
-      - 38  # NDRPDR sel
+    data: "vpp-performance-changes-3n-skx-cmp"
    data: "vpp-performance-changes-3n-skx"
    include-tests: "PDR" # "PDR" | "NDR" | "MRR"
    filter: "'2T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -2184,45 +2218,13 @@
    history:
      -
        title: "rls1807"
-      data:
-        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
-        - 56  # NDRPDR sel
+      data: "vpp-performance-changes-3n-skx-h1"
    reference:
      title: "rls1810"
-    data:
-      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
+    data: "vpp-performance-changes-3n-skx-ref"
    compare:
      title: "rls1901"
-    data:
-      # TODO: Add new data:
-      csit-vpp-perf-verify-1901-3n-skx:
-      - 18  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 28  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 33  # NDRPDR sel
-      - 36  # NDRPDR sel
-      - 38  # NDRPDR sel
+    data: "vpp-performance-changes-3n-skx-cmp"
    data: "vpp-performance-changes-3n-skx"
    include-tests: "PDR" # "PDR" | "NDR" | "MRR"
    filter: "'4T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -2240,45 +2242,13 @@
    history:
      -
        title: "rls1807"
-      data:
-        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
-        - 56  # NDRPDR sel
+      data: "vpp-performance-changes-3n-skx-h1"
    reference:
      title: "rls1810"
-    data:
-      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
+    data: "vpp-performance-changes-3n-skx-ref"
    compare:
      title: "rls1901"
-    data:
-      # TODO: Add new data:
-      csit-vpp-perf-verify-1901-3n-skx:
-      - 18  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 28  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 33  # NDRPDR sel
-      - 36  # NDRPDR sel
-      - 38  # NDRPDR sel
+    data: "vpp-performance-changes-3n-skx-cmp"
    data: "vpp-performance-changes-3n-skx"
    include-tests: "NDR" # "PDR" | "NDR" | "MRR"
    filter: "'2T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -2296,45 +2266,13 @@
    history:
      -
        title: "rls1807"
-      data:
-        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
-        - 56  # NDRPDR sel
+      data: "vpp-performance-changes-3n-skx-h1"
    reference:
      title: "rls1810"
-    data:
-      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
+    data: "vpp-performance-changes-3n-skx-ref"
    compare:
      title: "rls1901"
-    data:
-      # TODO: Add new data:
-      csit-vpp-perf-verify-1901-3n-skx:
-      - 18  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 28  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 33  # NDRPDR sel
-      - 36  # NDRPDR sel
-      - 38  # NDRPDR sel
+    data: "vpp-performance-changes-3n-skx-cmp"
    data: "vpp-performance-changes-3n-skx"
    include-tests: "NDR" # "PDR" | "NDR" | "MRR"
    filter: "'4T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -2352,44 +2290,13 @@
    history:
      -
        title: "rls1807"
-      data:
-        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
+      data: "vpp-performance-changes-2n-skx-h1"
    reference:
      title: "rls1810"
-    data:
-      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
+    data: "vpp-performance-changes-2n-skx-ref"
    compare:
      title: "rls1901"
-    data:
-      # TODO: Add new data:
-      csit-vpp-perf-verify-1901-2n-skx:
-      - 5   # NDRPDR sel
-      - 10  # NDRPDR sel fails
-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
-      - 16  # NDRPDR sel fails
-      - 21  # NDRPDR sel
-      - 23  # NDRPDR sel
+    data: "vpp-performance-changes-2n-skx-cmp"
    data: "vpp-performance-changes-2n-skx"
    include-tests: "PDR" # "PDR" | "NDR" | "MRR"
    filter: "'2T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -2406,44 +2313,13 @@
    output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-4t2c-pdr"
    history:
      - title: "rls1807"
-      data:
-        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
+      data: "vpp-performance-changes-2n-skx-h1"
    reference:
      title: "rls1810"
-    data:
-      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
+    data: "vpp-performance-changes-2n-skx-ref"
    compare:
      title: "rls1901"
-    data:
-      # TODO: Add new data:
-      csit-vpp-perf-verify-1901-2n-skx:
-      - 5   # NDRPDR sel
-      - 10  # NDRPDR sel fails
-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
-      - 16  # NDRPDR sel fails
-      - 21  # NDRPDR sel
-      - 23  # NDRPDR sel
+    data: "vpp-performance-changes-2n-skx-cmp"
    data: "vpp-performance-changes-2n-skx"
    include-tests: "PDR" # "PDR" | "NDR" | "MRR"
    filter: "'4T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -2460,44 +2336,13 @@
    output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-2t1c-ndr"
    history:
      - title: "rls1807"
-      data:
-        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
+      data: "vpp-performance-changes-2n-skx-h1"
    reference:
      title: "rls1810"
-    data:
-      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
+    data: "vpp-performance-changes-2n-skx-ref"
    compare:
      title: "rls1901"
-    data:
-      # TODO: Add new data:
-      csit-vpp-perf-verify-1901-2n-skx:
-      - 5   # NDRPDR sel
-      - 10  # NDRPDR sel fails
-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
-      - 16  # NDRPDR sel fails
-      - 21  # NDRPDR sel
-      - 23  # NDRPDR sel
+    data: "vpp-performance-changes-2n-skx-cmp"
    data: "vpp-performance-changes-2n-skx"
    include-tests: "NDR" # "PDR" | "NDR" | "MRR"
    filter: "'2T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -2514,44 +2359,13 @@
    output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-4t2c-ndr"
    history:
      - title: "rls1807"
-      data:
-        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
+      data: "vpp-performance-changes-2n-skx-h1"
    reference:
      title: "rls1810"
-    data:
-      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
+    data: "vpp-performance-changes-2n-skx-ref"
    compare:
      title: "rls1901"
-    data:
-      # TODO: Add new data:
-      csit-vpp-perf-verify-1901-2n-skx:
-      - 5   # NDRPDR sel
-      - 10  # NDRPDR sel fails
-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
-      - 16  # NDRPDR sel fails
-      - 21  # NDRPDR sel
-      - 23  # NDRPDR sel
+    data: "vpp-performance-changes-2n-skx-cmp"
    data: "vpp-performance-changes-2n-skx"
    include-tests: "NDR" # "PDR" | "NDR" | "MRR"
    filter: "'4T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -2568,27 +2382,10 @@
    output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-hsw-3n-skx-1c-ndr"
    reference:
      title: "3-Node Hsw"
-    data:
-      # TODO: Add new data:
-      csit-vpp-perf-verify-1901-3n-hsw:
-      - 10  # NDRPDR sel
-      - 18  # NDRPDR sel F
-      - 19  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 36  # NDRPDR sel
+    data: "vpp-compare-testbeds-ref"
    compare:
      title: "3-Node Skx"
-    data:
-      # TODO: Add new data:
-      csit-vpp-perf-verify-1901-3n-skx:
-      - 18  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 28  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 33  # NDRPDR sel
-      - 36  # NDRPDR sel
-      - 38  # NDRPDR sel
+    data: "vpp-compare-testbeds-cmp"
    data: "vpp-compare-testbeds"
    include-tests: "NDR" # "PDR" | "NDR" | "MRR"
    filter: "'NIC_Intel-X710' and 'NDRPDR' and '1C'"
@@ -2605,27 +2402,10 @@
    output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-hsw-3n-skx-2c-ndr"
    reference:
      title: "3-Node Hsw"
-    data:
-      # TODO: Add new data:
-      csit-vpp-perf-verify-1901-3n-hsw:
-      - 10  # NDRPDR sel
-      - 18  # NDRPDR sel F
-      - 19  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 36  # NDRPDR sel
+    data: "vpp-compare-testbeds-ref"
    compare:
      title: "3-Node Skx"
-    data:
-      # TODO: Add new data:
-      csit-vpp-perf-verify-1901-3n-skx:
-      - 18  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 28  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 33  # NDRPDR sel
-      - 36  # NDRPDR sel
-      - 38  # NDRPDR sel
+    data: "vpp-compare-testbeds-cmp"
    data: "vpp-compare-testbeds"
    include-tests: "NDR" # "PDR" | "NDR" | "MRR"
    filter: "'NIC_Intel-X710' and 'NDRPDR' and '2C'"
@@ -2642,27 +2422,10 @@
    output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-hsw-3n-skx-1c-pdr"
    reference:
      title: "3-Node Hsw"
-    data:
-      # TODO: Add new data:
-      csit-vpp-perf-verify-1901-3n-hsw:
-      - 10  # NDRPDR sel
-      - 18  # NDRPDR sel F
-      - 19  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 36  # NDRPDR sel
+    data: "vpp-compare-testbeds-ref"
    compare:
      title: "3-Node Skx"
-    data:
-      # TODO: Add new data:
-      csit-vpp-perf-verify-1901-3n-skx:
-      - 18  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 28  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 33  # NDRPDR sel
-      - 36  # NDRPDR sel
-      - 38  # NDRPDR sel
+    data: "vpp-compare-testbeds-cmp"
    data: "vpp-compare-testbeds"
    include-tests: "PDR" # "PDR" | "NDR" | "MRR"
    filter: "'NIC_Intel-X710' and 'NDRPDR' and '1C'"
@@ -2679,27 +2442,10 @@
    output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-hsw-3n-skx-2c-pdr"
    reference:
      title: "3-Node Hsw"
-    data:
-      # TODO: Add new data:
-      csit-vpp-perf-verify-1901-3n-hsw:
-      - 10  # NDRPDR sel
-      - 18  # NDRPDR sel F
-      - 19  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 36  # NDRPDR sel
-  compare:
-    title: "3-Node Skx"
-    data:
-      # TODO: Add new data:
-      csit-vpp-perf-verify-1901-3n-skx:
-      - 18  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 28  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 33  # NDRPDR sel
-      - 36  # NDRPDR sel
-      - 38  # NDRPDR sel
+    data: "vpp-compare-testbeds-ref"
+  compare:
+    title: "3-Node Skx"
+    data: "vpp-compare-testbeds-cmp"
    data: "vpp-compare-testbeds"
    include-tests: "PDR" # "PDR" | "NDR" | "MRR"
    filter: "'NIC_Intel-X710' and 'NDRPDR' and '2C'"
@@ -2716,29 +2462,10 @@
    output-file: "{DIR[STATIC,VPP]}/performance-compare-topologies-3n-skx-2n-skx-1c-ndr"
    reference:
      title: "3-Node Skx"
-    data:
-      # TODO: Add new data:
-      csit-vpp-perf-verify-1901-3n-skx:
-      - 18  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 28  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 33  # NDRPDR sel
-      - 36  # NDRPDR sel
-      - 38  # NDRPDR sel
+    data: "vpp-compare-topologies-ref"
    compare:
      title: "2-Node Skx"
-    data:
-      # TODO: Add new data:
-      csit-vpp-perf-verify-1901-2n-skx:
-      - 5   # NDRPDR sel
-      - 10  # NDRPDR sel fails
-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
-      - 16  # NDRPDR sel fails
-      - 21  # NDRPDR sel
-      - 23  # NDRPDR sel
+    data: "vpp-compare-topologies-cmp"
    data: "vpp-compare-topologies"
    include-tests: "NDR" # "PDR" | "NDR" | "MRR"
    filter: "'NDRPDR' and '1C'"
@@ -2755,29 +2482,10 @@
    output-file: "{DIR[STATIC,VPP]}/performance-compare-topologies-3n-skx-2n-skx-2c-ndr"
    reference:
      title: "3-Node Skx"
-    data:
-      # TODO: Add new data:
-      csit-vpp-perf-verify-1901-3n-skx:
-      - 18  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 28  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 33  # NDRPDR sel
-      - 36  # NDRPDR sel
-      - 38  # NDRPDR sel
+    data: "vpp-compare-topologies-ref"
    compare:
      title: "2-Node Skx"
-    data:
-      # TODO: Add new data:
-      csit-vpp-perf-verify-1901-2n-skx:
-      - 5   # NDRPDR sel
-      - 10  # NDRPDR sel fails
-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
-      - 16  # NDRPDR sel fails
-      - 21  # NDRPDR sel
-      - 23  # NDRPDR sel
+    data: "vpp-compare-topologies-cmp"
    data: "vpp-compare-topologies"
    include-tests: "NDR" # "PDR" | "NDR" | "MRR"
    filter: "'NDRPDR' and '2C'"
@@ -2794,29 +2502,10 @@
    output-file: "{DIR[STATIC,VPP]}/performance-compare-topologies-3n-skx-2n-skx-1c-pdr"
    reference:
      title: "3-Node Skx"
-    data:
-      # TODO: Add new data:
-      csit-vpp-perf-verify-1901-3n-skx:
-      - 18  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 28  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 33  # NDRPDR sel
-      - 36  # NDRPDR sel
-      - 38  # NDRPDR sel
+    data: "vpp-compare-topologies-ref"
    compare:
      title: "2-Node Skx"
-    data:
-      # TODO: Add new data:
-      csit-vpp-perf-verify-1901-2n-skx:
-      - 5   # NDRPDR sel
-      - 10  # NDRPDR sel fails
-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
-      - 16  # NDRPDR sel fails
-      - 21  # NDRPDR sel
-      - 23  # NDRPDR sel
+    data: "vpp-compare-topologies-cmp"
    data: "vpp-compare-topologies"
    include-tests: "PDR" # "PDR" | "NDR" | "MRR"
    filter: "'NDRPDR' and '1C'"
@@ -2833,29 +2522,10 @@
    output-file: "{DIR[STATIC,VPP]}/performance-compare-topologies-3n-skx-2n-skx-2c-pdr"
    reference:
      title: "3-Node Skx"
-    data:
-      # TODO: Add new data:
-      csit-vpp-perf-verify-1901-3n-skx:
-      - 18  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 28  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 33  # NDRPDR sel
-      - 36  # NDRPDR sel
-      - 38  # NDRPDR sel
+    data: "vpp-compare-topologies-ref"
    compare:
      title: "2-Node Skx"
-    data:
-      # TODO: Add new data:
-      csit-vpp-perf-verify-1901-2n-skx:
-      - 5   # NDRPDR sel
-      - 10  # NDRPDR sel fails
-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
-      - 16  # NDRPDR sel fails
-      - 21  # NDRPDR sel
-      - 23  # NDRPDR sel
+    data: "vpp-compare-topologies-cmp"
    data: "vpp-compare-topologies"
    include-tests: "PDR" # "PDR" | "NDR" | "MRR"
    filter: "'NDRPDR' and '2C'"
@@ -2873,28 +2543,13 @@
    history:
      -
        title: "rls1807"
-      data:
-        csit-vpp-perf-verify-1807-3n-hsw:
-        - 8   # MRR full
-        - 9   # MRR sel
-        - 21  # MRR sel
-        - 31  # MRR sel
-        - 33  # MRR sel
-        - 36  # MRR sel
-        - 41  # MRR sel
-        - 42  # MRR sel
-        - 48  # MRR sel
+      data: "vpp-performance-changes-3n-hsw-mrr-h1"
    reference:
      title: "rls1810"
-    data:
-      csit-vpp-perf-verify-1810-3n-hsw:
-      - 9   # MRR sel
+    data: "vpp-performance-changes-3n-hsw-mrr-ref"
    compare:
      title: "rls1901"
-    data:
-      # TODO: Add new data
-      csit-vpp-perf-verify-1901-3n-hsw:
-      - 35  # MRR sel
+    data: "vpp-performance-changes-3n-hsw-mrr-cmp"
    data: "vpp-performance-changes-3n-hsw-mrr"
    include-tests: "MRR" # "PDR" | "NDR" | "MRR"
    filter: "'1T1C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -2912,28 +2567,13 @@
    history:
      -
        title: "rls1807"
-      data:
-        csit-vpp-perf-verify-1807-3n-hsw:
-        - 8   # MRR full
-        - 9   # MRR sel
-        - 21  # MRR sel
-        - 31  # MRR sel
-        - 33  # MRR sel
-        - 36  # MRR sel
-        - 41  # MRR sel
-        - 42  # MRR sel
-        - 48  # MRR sel
+      data: "vpp-performance-changes-3n-hsw-mrr-h1"
    reference:
      title: "rls1810"
-    data:
-      csit-vpp-perf-verify-1810-3n-hsw:
-      - 9   # MRR sel
+    data: "vpp-performance-changes-3n-hsw-mrr-ref"
    compare:
      title: "rls1901"
-    data:
-      # TODO: Add new data
-      csit-vpp-perf-verify-1901-3n-hsw:
-      - 35  # MRR sel
+    data: "vpp-performance-changes-3n-hsw-mrr-cmp"
    data: "vpp-performance-changes-3n-hsw-mrr"
    include-tests: "MRR" # "PDR" | "NDR" | "MRR"
    filter: "'2T2C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -2951,28 +2591,13 @@
    history:
      -
        title: "rls1807"
-      data:
-        csit-vpp-perf-verify-1807-3n-hsw:
-        - 8   # MRR full
-        - 9   # MRR sel
-        - 21  # MRR sel
-        - 31  # MRR sel
-        - 33  # MRR sel
-        - 36  # MRR sel
-        - 41  # MRR sel
-        - 42  # MRR sel
-        - 48  # MRR sel
+      data: "vpp-performance-changes-3n-hsw-mrr-h1"
    reference:
      title: "rls1810"
-    data:
-      csit-vpp-perf-verify-1810-3n-hsw:
-      - 9   # MRR sel
+    data: "vpp-performance-changes-3n-hsw-mrr-ref"
    compare:
      title: "rls1901"
-    data:
-      # TODO: Add new data
-      csit-vpp-perf-verify-1901-3n-hsw:
-      - 35  # MRR sel
+    data: "vpp-performance-changes-3n-hsw-mrr-cmp"
    data: "vpp-performance-changes-3n-hsw-mrr"
    include-tests: "MRR" # "PDR" | "NDR" | "MRR"
    filter: "'4T4C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -2990,31 +2615,13 @@
    history:
      -
        title: "rls1807"
-      data:
-        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
-        - 53  # MRR sel
+      data: "vpp-performance-changes-3n-skx-mrr-h1"
    reference:
      title: "rls1810"
-    data:
-      csit-vpp-perf-verify-1810-3n-skx:
-      - 9   # MRR sel
-      - 11  # MRR sel
-      - 12  # MRR sel
-      - 13  # MRR sel
+    data: "vpp-performance-changes-3n-skx-mrr-ref"
    compare:
      title: "rls1901"
-    data:
-      # TODO: Add new data
-      csit-vpp-perf-verify-1901-3n-skx:
-      - 32  # MRR sel
+    data: "vpp-performance-changes-3n-skx-mrr-cmp"
    data: "vpp-performance-changes-3n-skx-mrr"
    include-tests: "MRR" # "PDR" | "NDR" | "MRR"
    filter: "'2T1C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -3032,31 +2639,13 @@
    history:
      -
        title: "rls1807"
-      data:
-        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
-        - 53  # MRR sel
+      data: "vpp-performance-changes-3n-skx-mrr-h1"
    reference:
      title: "rls1810"
-    data:
-      csit-vpp-perf-verify-1810-3n-skx:
-      - 9   # MRR sel
-      - 11  # MRR sel
-      - 12  # MRR sel
-      - 13  # MRR sel
+    data: "vpp-performance-changes-3n-skx-mrr-ref"
    compare:
      title: "rls1901"
-    data:
-      # TODO: Add new data
-      csit-vpp-perf-verify-1901-3n-skx:
-      - 32  # MRR sel
+    data: "vpp-performance-changes-3n-skx-mrr-cmp"
    data: "vpp-performance-changes-3n-skx-mrr"
    include-tests: "MRR" # "PDR" | "NDR" | "MRR"
    filter: "'4T2C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -3074,31 +2663,13 @@
    history:
      -
        title: "rls1807"
-      data:
-        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
-        - 53  # MRR sel
+      data: "vpp-performance-changes-3n-skx-mrr-h1"
    reference:
      title: "rls1810"
-    data:
-      csit-vpp-perf-verify-1810-3n-skx:
-      - 9   # MRR sel
-      - 11  # MRR sel
-      - 12  # MRR sel
-      - 13  # MRR sel
+    data: "vpp-performance-changes-3n-skx-mrr-ref"
    compare:
      title: "rls1901"
-    data:
-      # TODO: Add new data
-      csit-vpp-perf-verify-1901-3n-skx:
-      - 32  # MRR sel
+    data: "vpp-performance-changes-3n-skx-mrr-cmp"
    data: "vpp-performance-changes-3n-skx-mrr"
    include-tests: "MRR" # "PDR" | "NDR" | "MRR"
    filter: "'8T4C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -3116,32 +2687,13 @@
    history:
      -
        title: "rls1807"
-      data:
-        csit-vpp-perf-verify-1807-2n-skx:
-        - 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
+      data: "vpp-performance-changes-2n-skx-mrr-h1"
    reference:
      title: "rls1810"
-    data:
-      csit-vpp-perf-verify-1810-2n-skx:
-      - 8   # MRR sel
-      - 10  # MRR sel
-      - 11  # MRR sel
-      - 12  # MRR sel
+    data: "vpp-performance-changes-2n-skx-mrr-ref"
    compare:
      title: "rls1901"
-    data:
-      # TODO: Add new data
-      csit-vpp-perf-verify-1901-2n-skx:
-      - 22  # MRR sel
+    data: "vpp-performance-changes-2n-skx-mrr-cmp"
    data: "vpp-performance-changes-2n-skx-mrr"
    include-tests: "MRR" # "PDR" | "NDR" | "MRR"
    filter: "'2T1C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -3159,32 +2711,13 @@
    history:
      -
        title: "rls1807"
-      data:
-        csit-vpp-perf-verify-1807-2n-skx:
-        - 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
+      data: "vpp-performance-changes-2n-skx-mrr-h1"
    reference:
      title: "rls1810"
-    data:
-      csit-vpp-perf-verify-1810-2n-skx:
-      - 8   # MRR sel
-      - 10  # MRR sel
-      - 11  # MRR sel
-      - 12  # MRR sel
+    data: "vpp-performance-changes-2n-skx-mrr-ref"
    compare:
      title: "rls1901"
-    data:
-      # TODO: Add new data
-      csit-vpp-perf-verify-1901-2n-skx:
-      - 22  # MRR sel
+    data: "vpp-performance-changes-2n-skx-mrr-cmp"
    data: "vpp-performance-changes-2n-skx-mrr"
    include-tests: "MRR" # "PDR" | "NDR" | "MRR"
    filter: "'4T2C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -3202,32 +2735,13 @@
    history:
      -
        title: "rls1807"
-      data:
-        csit-vpp-perf-verify-1807-2n-skx:
-        - 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
+      data: "vpp-performance-changes-2n-skx-mrr-h1"
    reference:
      title: "rls1810"
-    data:
-      csit-vpp-perf-verify-1810-2n-skx:
-      - 8   # MRR sel
-      - 10  # MRR sel
-      - 11  # MRR sel
-      - 12  # MRR sel
+    data: "vpp-performance-changes-2n-skx-mrr-ref"
    compare:
      title: "rls1901"
-    data:
-      # TODO: Add new data
-      csit-vpp-perf-verify-1901-2n-skx:
-      - 22  # MRR sel
+    data: "vpp-performance-changes-2n-skx-mrr-cmp"
    data: "vpp-performance-changes-2n-skx-mrr"
    include-tests: "MRR" # "PDR" | "NDR" | "MRR"
    filter: "'8T4C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -3244,16 +2758,10 @@
    output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-hsw-3n-skx-1c-mrr"
    reference:
      title: "3-Node Hsw"
-    data:
-      # TODO: Add new data
-      csit-vpp-perf-verify-1901-3n-hsw:
-      - 35  # MRR sel
+    data: "vpp-compare-testbeds-mrr-ref"
    compare:
      title: "3-Node Skx"
-    data:
-      # TODO: Add new data
-      csit-vpp-perf-verify-1901-3n-skx:
-      - 32  # MRR sel
+    data: "vpp-compare-testbeds-mrr-cmp"
    data: "vpp-compare-testbeds-mrr"
    include-tests: "MRR" # "PDR" | "NDR" | "MRR"
    filter: "'NIC_Intel-X710' and 'MRR' and '1C'"
@@ -3270,16 +2778,10 @@
    output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-hsw-3n-skx-2c-mrr"
    reference:
      title: "3-Node Hsw"
-    data:
-      # TODO: Add new data
-      csit-vpp-perf-verify-1901-3n-hsw:
-      - 35  # MRR sel
+    data: "vpp-compare-testbeds-mrr-ref"
    compare:
      title: "3-Node Skx"
-    data:
-      # TODO: Add new data
-      csit-vpp-perf-verify-1901-3n-skx:
-      - 32  # MRR sel
+    data: "vpp-compare-testbeds-mrr-cmp"
    data: "vpp-compare-testbeds-mrr"
    include-tests: "MRR" # "PDR" | "NDR" | "MRR"
    filter: "'NIC_Intel-X710' and 'MRR' and '2C'"
@@ -3296,16 +2798,10 @@
    output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-hsw-3n-skx-4c-mrr"
    reference:
      title: "3-Node Hsw"
-    data:
-      # TODO: Add new data
-      csit-vpp-perf-verify-1901-3n-hsw:
-      - 35  # MRR sel
+    data: "vpp-compare-testbeds-mrr-ref"
    compare:
      title: "3-Node Skx"
-    data:
-      # TODO: Add new data
-      csit-vpp-perf-verify-1901-3n-skx:
-      - 32  # MRR sel
+    data: "vpp-compare-testbeds-mrr-cmp"
    data: "vpp-compare-testbeds-mrr"
    include-tests: "MRR" # "PDR" | "NDR" | "MRR"
    filter: "'NIC_Intel-X710' and 'MRR' and '4C'"
@@ -3322,16 +2818,10 @@
    output-file: "{DIR[STATIC,VPP]}/performance-compare-topologies-3n-skx-2n-skx-1c-mrr"
    reference:
      title: "3-Node Skx"
-    data:
-      # TODO: Add new data
-      csit-vpp-perf-verify-1901-3n-skx:
-      - 32  # MRR sel
+    data: "vpp-compare-topologies-mrr-ref"
    compare:
      title: "2-Node Skx"
-    data:
-      # TODO: Add new data
-      csit-vpp-perf-verify-1901-2n-skx:
-      - 22  # MRR sel
+    data: "vpp-compare-topologies-mrr-cmp"
    data: "vpp-compare-topologies-mrr"
    include-tests: "MRR" # "PDR" | "NDR" | "MRR"
    filter: "'MRR' and '1C'"
@@ -3348,16 +2838,10 @@
    output-file: "{DIR[STATIC,VPP]}/performance-compare-topologies-3n-skx-2n-skx-2c-mrr"
    reference:
      title: "3-Node Skx"
-    data:
-      # TODO: Add new data
-      csit-vpp-perf-verify-1901-3n-skx:
-      - 32  # MRR sel
+    data: "vpp-compare-topologies-mrr-ref"
    compare:
      title: "2-Node Skx"
-    data:
-      # TODO: Add new data
-      csit-vpp-perf-verify-1901-2n-skx:
-      - 22  # MRR sel
+    data: "vpp-compare-topologies-mrr-cmp"
    data: "vpp-compare-topologies-mrr"
    include-tests: "MRR" # "PDR" | "NDR" | "MRR"
    filter: "'MRR' and '2C'"
@@ -3374,16 +2858,10 @@
    output-file: "{DIR[STATIC,VPP]}/performance-compare-topologies-3n-skx-2n-skx-4c-mrr"
    reference:
      title: "3-Node Skx"
-    data:
-      # TODO: Add new data
-      csit-vpp-perf-verify-1901-3n-skx:
-      - 32  # MRR sel
+    data: "vpp-compare-topologies-mrr-ref"
    compare:
      title: "2-Node Skx"
-    data:
-      # TODO: Add new data
-      csit-vpp-perf-verify-1901-2n-skx:
-      - 22  # MRR sel
+    data: "vpp-compare-topologies-mrr-cmp"
    data: "vpp-compare-topologies-mrr"
    include-tests: "MRR" # "PDR" | "NDR" | "MRR"
    filter: "'MRR' and '4C'"
@@ -4010,46 +3488,13 @@
    history:
      -
        title: "rls1807"
-      data:
-        csit-dpdk-perf-verify-1807-3n-hsw:
-        - 11
-        - 12  # full
-        - 14
-        - 15
-        - 16
-        - 17
-        - 20
-        - 21
-        - 22
-        - 23
+      data: "dpdk-performance-changes-3n-hsw-h1"
    reference:
      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-3n-hsw-ref"
    compare:
      title: "rls1901"
-    data:
-      # TODO: Add new data
-      csit-dpdk-perf-verify-1901-3n-hsw:
-      - 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
+    data: "dpdk-performance-changes-3n-hsw-cmp"
    data: "dpdk-performance-changes-3n-hsw"
    include-tests: "PDR" # "PDR" | "NDR" | "MRR"
    filter: "'1T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -4067,46 +3512,13 @@
    history:
      -
        title: "rls1807"
-      data:
-        csit-dpdk-perf-verify-1807-3n-hsw:
-        - 11
-        - 12  # full
-        - 14
-        - 15
-        - 16
-        - 17
-        - 20
-        - 21
-        - 22
-        - 23
+      data: "dpdk-performance-changes-3n-hsw-h1"
    reference:
      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-3n-hsw-ref"
    compare:
      title: "rls1901"
-    data:
-      # TODO: Add new data
-      csit-dpdk-perf-verify-1901-3n-hsw:
-      - 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
+    data: "dpdk-performance-changes-3n-hsw-cmp"
    data: "dpdk-performance-changes-3n-hsw"
    include-tests: "PDR" # "PDR" | "NDR" | "MRR"
    filter: "'2T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -4124,46 +3536,13 @@
    history:
      -
        title: "rls1807"
-      data:
-        csit-dpdk-perf-verify-1807-3n-hsw:
-        - 11
-        - 12  # full
-        - 14
-        - 15
-        - 16
-        - 17
-        - 20
-        - 21
-        - 22
-        - 23
+      data: "dpdk-performance-changes-3n-hsw-h1"
    reference:
      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-3n-hsw-ref"
    compare:
      title: "rls1901"
-    data:
-      # TODO: Add new data
-      csit-dpdk-perf-verify-1901-3n-hsw:
-      - 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
+    data: "dpdk-performance-changes-3n-hsw-cmp"
    data: "dpdk-performance-changes-3n-hsw"
    include-tests: "NDR" # "PDR" | "NDR" | "MRR"
    filter: "'1T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -4181,46 +3560,13 @@
    history:
      -
        title: "rls1807"
-      data:
-        csit-dpdk-perf-verify-1807-3n-hsw:
-        - 11
-        - 12  # full
-        - 14
-        - 15
-        - 16
-        - 17
-        - 20
-        - 21
-        - 22
-        - 23
+      data: "dpdk-performance-changes-3n-hsw-h1"
    reference:
      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-3n-hsw-ref"
    compare:
      title: "rls1901"
-    data:
-      # TODO: Add new data
-      csit-dpdk-perf-verify-1901-3n-hsw:
-      - 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
+    data: "dpdk-performance-changes-3n-hsw-cmp"
    data: "dpdk-performance-changes-3n-hsw"
    include-tests: "NDR" # "PDR" | "NDR" | "MRR"
    filter: "'2T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -4238,39 +3584,13 @@
    history:
      -
        title: "rls1807"
-      data:
-        csit-dpdk-perf-verify-1807-3n-skx:
-        - 1   # NDRPDR sel
-        - 2   # NDRPDR sel
-        - 3   # NDRPDR sel
-        - 6   # NDRPDR sel
-        - 7   # NDRPDR sel
-        - 8   # NDRPDR sel
-        - 9   # NDRPDR sel
-        - 10  # NDRPDR sel
-        - 11  # NDRPDR sel
-        - 12  # NDRPDR sel
+      data: "dpdk-performance-changes-3n-skx-h1"
    reference:
      title: "rls1810"
-    data:
-      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-performance-changes-3n-skx-ref"
    compare:
      title: "rls1901"
-    data:
-      # TODO: Add new data
-      csit-dpdk-perf-verify-1901-3n-skx:
-      - 1   # NDRPDR sel F
-      - 2   # NDRPDR sel F
+    data: "dpdk-performance-changes-3n-skx-cmp"
    data: "dpdk-performance-changes-3n-skx"
    include-tests: "PDR" # "PDR" | "NDR" | "MRR"
    filter: "'2T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -4288,39 +3608,13 @@
    history:
      -
        title: "rls1807"
-      data:
-        csit-dpdk-perf-verify-1807-3n-skx:
-        - 1   # NDRPDR sel
-        - 2   # NDRPDR sel
-        - 3   # NDRPDR sel
-        - 6   # NDRPDR sel
-        - 7   # NDRPDR sel
-        - 8   # NDRPDR sel
-        - 9   # NDRPDR sel
-        - 10  # NDRPDR sel
-        - 11  # NDRPDR sel
-        - 12  # NDRPDR sel
+      data: "dpdk-performance-changes-3n-skx-h1"
    reference:
      title: "rls1810"
-    data:
-      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-performance-changes-3n-skx-ref"
    compare:
      title: "rls1901"
-    data:
-      # TODO: Add new data
-      csit-dpdk-perf-verify-1901-3n-skx:
-      - 1   # NDRPDR sel F
-      - 2   # NDRPDR sel F
+    data: "dpdk-performance-changes-3n-skx-cmp"
    data: "dpdk-performance-changes-3n-skx"
    include-tests: "PDR" # "PDR" | "NDR" | "MRR"
    filter: "'4T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -4337,40 +3631,14 @@
    output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-skx-2t1c-ndr"
    history:
      -
-      title: "rls1807"
-      data:
-        csit-dpdk-perf-verify-1807-3n-skx:
-        - 1   # NDRPDR sel
-        - 2   # NDRPDR sel
-        - 3   # NDRPDR sel
-        - 6   # NDRPDR sel
-        - 7   # NDRPDR sel
-        - 8   # NDRPDR sel
-        - 9   # NDRPDR sel
-        - 10  # NDRPDR sel
-        - 11  # NDRPDR sel
-        - 12  # NDRPDR sel
+      title: "rls1807"
+      data: "dpdk-performance-changes-3n-skx-h1"
    reference:
      title: "rls1810"
-    data:
-      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-performance-changes-3n-skx-ref"
    compare:
      title: "rls1901"
-    data:
-      # TODO: Add new data
-      csit-dpdk-perf-verify-1901-3n-skx:
-      - 1   # NDRPDR sel F
-      - 2   # NDRPDR sel F
+    data: "dpdk-performance-changes-3n-skx-cmp"
    data: "dpdk-performance-changes-3n-skx"
    include-tests: "NDR" # "PDR" | "NDR" | "MRR"
    filter: "'2T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -4388,39 +3656,13 @@
    history:
      -
        title: "rls1807"
-      data:
-        csit-dpdk-perf-verify-1807-3n-skx:
-        - 1   # NDRPDR sel
-        - 2   # NDRPDR sel
-        - 3   # NDRPDR sel
-        - 6   # NDRPDR sel
-        - 7   # NDRPDR sel
-        - 8   # NDRPDR sel
-        - 9   # NDRPDR sel
-        - 10  # NDRPDR sel
-        - 11  # NDRPDR sel
-        - 12  # NDRPDR sel
+      data: "dpdk-performance-changes-3n-skx-h1"
    reference:
      title: "rls1810"
-    data:
-      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-performance-changes-3n-skx-ref"
    compare:
      title: "rls1901"
-    data:
-      # TODO: Add new data
-      csit-dpdk-perf-verify-1901-3n-skx:
-      - 1   # NDRPDR sel F
-      - 2   # NDRPDR sel F
+    data: "dpdk-performance-changes-3n-skx-cmp"
    data: "dpdk-performance-changes-3n-skx"
    include-tests: "NDR" # "PDR" | "NDR" | "MRR"
    filter: "'4T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -4437,25 +3679,10 @@
    output-file: "{DIR[STATIC,DPDK]}/performance-compare-testbeds-3n-hsw-3n-skx-ndr"
    reference:
      title: "3-Node Hsw"
-    data:
-      # TODO: Add new data
-      csit-dpdk-perf-verify-1901-3n-hsw:
-      - 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
+    data: "dpdk-compare-testbeds-ref"
    compare:
      title: "3-Node Skx"
-    data:
-      # TODO: Add new data
-      csit-dpdk-perf-verify-1901-3n-skx:
-      - 1   # NDRPDR sel F
-      - 2   # NDRPDR sel F
+    data: "dpdk-compare-testbeds-cmp"
    data: "dpdk-compare-testbeds"
    include-tests: "NDR" # "PDR" | "NDR" | "MRR"
    filter: "'NIC_Intel-X710' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -4464,6 +3691,26 @@
    - "parent"
    - "throughput"
  
+# DPDK Comparison Across Testbeds 3n-hsw to 3n-skx pdr
+-
+  type: "table"
+  title: "DPDK Comparison Across Testbeds 3n-hsw to 3n-skx pdr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-compare-testbeds-3n-hsw-3n-skx-pdr"
+  reference:
+    title: "3-Node Hsw"
+    data: "dpdk-compare-testbeds-ref"
+  compare:
+    title: "3-Node Skx"
+    data: "dpdk-compare-testbeds-cmp"
+  data: "dpdk-compare-testbeds"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'NIC_Intel-X710' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+
  # DPDK Comparison Across Topologies 3n-skx to 2n-skx ndr
  -
    type: "table"
@@ -4472,26 +3719,10 @@
    output-file: "{DIR[STATIC,DPDK]}/performance-compare-topologies-3n-skx-2n-skx-ndr"
    reference:
      title: "3-Node Skx"
-    data:
-      # TODO: Add new data
-      csit-dpdk-perf-verify-1901-3n-skx:
-      - 1   # NDRPDR sel F
-      - 2   # NDRPDR sel F
+    data: "dpdk-compare-topologies-ref"
    compare:
      title: "2-Node Skx"
-    data:
-      # TODO: Add new data
-      csit-dpdk-perf-verify-1901-2n-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
+    data: "dpdk-compare-topologies-cmp"
    data: "dpdk-compare-topologies"
    include-tests: "NDR" # "PDR" | "NDR" | "MRR"
    filter: "'NDRPDR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -4508,26 +3739,10 @@
    output-file: "{DIR[STATIC,DPDK]}/performance-compare-topologies-3n-skx-2n-skx-pdr"
    reference:
      title: "3-Node Skx"
-    data:
-      # TODO: Add new data
-      csit-dpdk-perf-verify-1901-3n-skx:
-      - 1   # NDRPDR sel F
-      - 2   # NDRPDR sel F
+    data: "dpdk-compare-topologies-ref"
    compare:
      title: "2-Node Skx"
-    data:
-      # TODO: Add new data
-      csit-dpdk-perf-verify-1901-2n-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
+    data: "dpdk-compare-topologies-cmp"
    data: "dpdk-compare-topologies"
    include-tests: "PDR" # "PDR" | "NDR" | "MRR"
    filter: "'NDRPDR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -4536,83 +3751,85 @@
    - "parent"
    - "throughput"
  
-# DPDK Comparison Across Testbeds 3n-hsw to 3n-skx pdr
+# DPDK Performance Changes 2n-skx 2t1c pdr
  -
    type: "table"
-  title: "DPDK Comparison Across Testbeds 3n-hsw to 3n-skx pdr"
+  title: "DPDK Performance Changes 2n-skx 2t1c pdr"
    algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-compare-testbeds-3n-hsw-3n-skx-pdr"
+  output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-skx-2t1c-pdr"
    reference:
-    title: "3-Node Hsw"
-    data:
-      # TODO: Add new data
-      csit-dpdk-perf-verify-1901-3n-hsw:
-      - 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
+    title: "rls1810"
+    data: "dpdk-performance-changes-2n-skx-ref"
    compare:
-    title: "3-Node Skx"
-    data:
-      # TODO: Add new data
-      csit-dpdk-perf-verify-1901-3n-skx:
-      - 1   # NDRPDR sel F
-      - 2   # NDRPDR sel F
-  data: "dpdk-compare-testbeds"
+    title: "rls1901"
+    data: "dpdk-performance-changes-2n-skx-cmp"
+  data: "dpdk-performance-changes-2n-skx"
    include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'NIC_Intel-X710' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  filter: "'2T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
    parameters:
    - "name"
    - "parent"
    - "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"
-#  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"
-#  - "result"
+# DPDK Performance Changes 2n-skx 4t2c pdr
+-
+  type: "table"
+  title: "DPDK Performance Changes 2n-skx 4t2c pdr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-skx-4t2c-pdr"
+  reference:
+    title: "rls1810"
+    data: "dpdk-performance-changes-2n-skx-ref"
+  compare:
+    title: "rls1901"
+    data: "dpdk-performance-changes-2n-skx-cmp"
+  data: "dpdk-performance-changes-2n-skx"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+
+# DPDK Performance Changes 2n-skx 2t1c ndr
+-
+  type: "table"
+  title: "DPDK Performance Changes 2n-skx 2t1c ndr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-skx-2t1c-ndr"
+  reference:
+    title: "rls1810"
+    data: "dpdk-performance-changes-2n-skx-ref"
+  compare:
+    title: "rls1901"
+    data: "dpdk-performance-changes-2n-skx-cmp"
+  data: "dpdk-performance-changes-2n-skx"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+
+# DPDK Performance Changes 2n-skx 4t2c ndr
+-
+  type: "table"
+  title: "DPDK Performance Changes 2n-skx 4t2c ndr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-skx-4t2c-ndr"
+  reference:
+    title: "rls1810"
+    data: "dpdk-performance-changes-2n-skx-ref"
+  compare:
+    title: "rls1901"
+    data: "dpdk-performance-changes-2n-skx-cmp"
+  data: "dpdk-performance-changes-2n-skx"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
  
  # Detailed Test Results - DPDK Performance Results 3n-hsw
  -
@@ -5386,10 +4603,10 @@
    - "tags"
    sort:
    - "L2PATCH"
-  - "L2XCBASE"
-  - "L2BDMACLRN"
-  - "IP4FWD"
-  - "IP6FWD"
+#  - "L2XCBASE"
+#  - "L2BDMACLRN"
+#  - "IP4FWD"
+#  - "IP6FWD"
    - "VHOST"
    layout:
      title: "30min Soak Test (PLRsearch)"
@@ -5410,10 +4627,10 @@
    - "tags"
    sort:
    - "L2PATCH"
-  - "L2XCBASE"
-  - "L2BDMACLRN"
-  - "IP4FWD"
-  - "IP6FWD"
+#  - "L2XCBASE"
+#  - "L2BDMACLRN"
+#  - "IP4FWD"
+#  - "IP6FWD"
    - "VHOST"
    layout:
      title: "30min Soak Test (PLRsearch)"
@@ -10252,168 +9469,30 @@
    - "NAT44"
    - "POLICE_MARK"
    - "COPWHLIST"
-  - "IACL"
-  - "OACL"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-x710-64b-2t2c-features-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP IPv4 3n-hsw-x710 features nat44
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-nat44-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-nat44-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '2T1C' and
-           'IP4FWD' and
-           'NAT44' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "BASE"
-  - "BASE"
-  - "SRC_USER_10"
-  - "SRC_USER_100"
-  - "SRC_USER_1000"
-  - "SRC_USER_2000"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-skx-x710-64b-2t1c-features-nat44-ndr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-nat44-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-nat44-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '2T1C' and
-           'IP4FWD' and
-           'NAT44' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "BASE"
-  - "BASE"
-  - "SRC_USER_10"
-  - "SRC_USER_100"
-  - "SRC_USER_1000"
-  - "SRC_USER_2000"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-skx-x710-64b-2t1c-features-nat44-pdr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-nat44-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-nat44-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '4T2C' and
-           'IP4FWD' and
-           'NAT44' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "BASE"
-  - "BASE"
-  - "SRC_USER_10"
-  - "SRC_USER_100"
-  - "SRC_USER_1000"
-  - "SRC_USER_2000"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-skx-x710-64b-4t2c-features-nat44-ndr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-nat44-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-nat44-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '4T2C' and
-           'IP4FWD' and
-           'NAT44' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "BASE"
-  - "BASE"
-  - "SRC_USER_10"
-  - "SRC_USER_100"
-  - "SRC_USER_1000"
-  - "SRC_USER_2000"
+  - "IACL"
+  - "OACL"
    traces:
      hoverinfo: "x+y"
      boxpoints: "outliers"
      whiskerwidth: 0
    layout:
-    title: "ip4-3n-skx-x710-64b-4t2c-features-nat44-pdr"
+    title: "ip4-3n-hsw-x710-64b-2t2c-features-pdr"
      layout: "plot-throughput"
  
-# Packet Throughput - VPP IPv4 3n-hsw-x710 features iacl
+# Packet Throughput - VPP IPv4 3n-hsw-x710 features nat44
  -
    type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-iacl-ndr"
+  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-nat44-ndr"
    algorithm: "plot_performance_box"
    output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-iacl-ndr"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-nat44-ndr"
    data: "plot-vpp-throughput-latency-3n-skx"
    filter: "'NIC_Intel-X710' and
             '64B' and
             'NDRPDR' and
             '2T1C' and
             'IP4FWD' and
-           'IACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           'NAT44' and
             not 'IPSEC' and
             not 'VHOST'"
    parameters:
@@ -10421,32 +9500,33 @@
    - "parent"
    - "tags"
    sort:
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
+  - "BASE"
+  - "BASE"
+  - "SRC_USER_10"
+  - "SRC_USER_100"
+  - "SRC_USER_1000"
+  - "SRC_USER_2000"
    traces:
      hoverinfo: "x+y"
      boxpoints: "outliers"
      whiskerwidth: 0
    layout:
-    title: "ip4-3n-skx-x710-64b-2t1c-features-iacl-ndr"
+    title: "ip4-3n-skx-x710-64b-2t1c-features-nat44-ndr"
      layout: "plot-throughput"
  
  -
    type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-iacl-pdr"
+  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-nat44-pdr"
    algorithm: "plot_performance_box"
    output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-iacl-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-nat44-pdr"
    data: "plot-vpp-throughput-latency-3n-skx"
    filter: "'NIC_Intel-X710' and
             '64B' and
             'NDRPDR' and
             '2T1C' and
             'IP4FWD' and
-           'IACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           'NAT44' and
             not 'IPSEC' and
             not 'VHOST'"
    parameters:
@@ -10454,32 +9534,33 @@
    - "parent"
    - "tags"
    sort:
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
+  - "BASE"
+  - "BASE"
+  - "SRC_USER_10"
+  - "SRC_USER_100"
+  - "SRC_USER_1000"
+  - "SRC_USER_2000"
    traces:
      hoverinfo: "x+y"
      boxpoints: "outliers"
      whiskerwidth: 0
    layout:
-    title: "ip4-3n-skx-x710-64b-2t1c-features-iacl-pdr"
+    title: "ip4-3n-skx-x710-64b-2t1c-features-nat44-pdr"
      layout: "plot-throughput"
  
  -
    type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-iacl-ndr"
+  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-nat44-ndr"
    algorithm: "plot_performance_box"
    output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-iacl-ndr"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-nat44-ndr"
    data: "plot-vpp-throughput-latency-3n-skx"
    filter: "'NIC_Intel-X710' and
             '64B' and
             'NDRPDR' and
             '4T2C' and
             'IP4FWD' and
-           'IACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           'NAT44' and
             not 'IPSEC' and
             not 'VHOST'"
    parameters:
@@ -10487,32 +9568,33 @@
    - "parent"
    - "tags"
    sort:
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
+  - "BASE"
+  - "BASE"
+  - "SRC_USER_10"
+  - "SRC_USER_100"
+  - "SRC_USER_1000"
+  - "SRC_USER_2000"
    traces:
      hoverinfo: "x+y"
      boxpoints: "outliers"
      whiskerwidth: 0
    layout:
-    title: "ip4-3n-skx-x710-64b-4t2c-features-iacl-ndr"
+    title: "ip4-3n-skx-x710-64b-4t2c-features-nat44-ndr"
      layout: "plot-throughput"
  
  -
    type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-iacl-pdr"
+  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-nat44-pdr"
    algorithm: "plot_performance_box"
    output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-iacl-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-nat44-pdr"
    data: "plot-vpp-throughput-latency-3n-skx"
    filter: "'NIC_Intel-X710' and
             '64B' and
             'NDRPDR' and
             '4T2C' and
             'IP4FWD' and
-           'IACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           'NAT44' and
             not 'IPSEC' and
             not 'VHOST'"
    parameters:
@@ -10520,32 +9602,34 @@
    - "parent"
    - "tags"
    sort:
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
+  - "BASE"
+  - "BASE"
+  - "SRC_USER_10"
+  - "SRC_USER_100"
+  - "SRC_USER_1000"
+  - "SRC_USER_2000"
    traces:
      hoverinfo: "x+y"
      boxpoints: "outliers"
      whiskerwidth: 0
    layout:
-    title: "ip4-3n-skx-x710-64b-4t2c-features-iacl-pdr"
+    title: "ip4-3n-skx-x710-64b-4t2c-features-nat44-pdr"
      layout: "plot-throughput"
  
-# Packet Throughput - VPP IPv4 3n-hsw-x710 features oacl
+# Packet Throughput - VPP IPv4 3n-hsw-x710 features iacl
  -
    type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-oacl-ndr"
+  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-iacl-ndr"
    algorithm: "plot_performance_box"
    output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-oacl-ndr"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-iacl-ndr"
    data: "plot-vpp-throughput-latency-3n-skx"
    filter: "'NIC_Intel-X710' and
             '64B' and
             'NDRPDR' and
             '2T1C' and
             'IP4FWD' and
-           'OACL' and
+           'IACL' and
             ('ACL10' or 'ACL50') and '10k_FLOWS' and
             not 'IPSEC' and
             not 'VHOST'"
@@ -10563,22 +9647,22 @@
      boxpoints: "outliers"
      whiskerwidth: 0
    layout:
-    title: "ip4-3n-skx-x710-64b-2t1c-features-oacl-ndr"
+    title: "ip4-3n-skx-x710-64b-2t1c-features-iacl-ndr"
      layout: "plot-throughput"
  
  -
    type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-oacl-pdr"
+  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-iacl-pdr"
    algorithm: "plot_performance_box"
    output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-oacl-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-iacl-pdr"
    data: "plot-vpp-throughput-latency-3n-skx"
    filter: "'NIC_Intel-X710' and
             '64B' and
             'NDRPDR' and
             '2T1C' and
             'IP4FWD' and
-           'OACL' and
+           'IACL' and
             ('ACL10' or 'ACL50') and '10k_FLOWS' and
             not 'IPSEC' and
             not 'VHOST'"
@@ -10596,22 +9680,22 @@
      boxpoints: "outliers"
      whiskerwidth: 0
    layout:
-    title: "ip4-3n-skx-x710-64b-2t1c-features-oacl-pdr"
+    title: "ip4-3n-skx-x710-64b-2t1c-features-iacl-pdr"
      layout: "plot-throughput"
  
  -
    type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-oacl-ndr"
+  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-iacl-ndr"
    algorithm: "plot_performance_box"
    output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-oacl-ndr"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-iacl-ndr"
    data: "plot-vpp-throughput-latency-3n-skx"
    filter: "'NIC_Intel-X710' and
             '64B' and
             'NDRPDR' and
             '4T2C' and
             'IP4FWD' and
-           'OACL' and
+           'IACL' and
             ('ACL10' or 'ACL50') and '10k_FLOWS' and
             not 'IPSEC' and
             not 'VHOST'"
@@ -10629,22 +9713,22 @@
      boxpoints: "outliers"
      whiskerwidth: 0
    layout:
-    title: "ip4-3n-skx-x710-64b-4t2c-features-oacl-ndr"
+    title: "ip4-3n-skx-x710-64b-4t2c-features-iacl-ndr"
      layout: "plot-throughput"
  
  -
    type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-oacl-pdr"
+  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-iacl-pdr"
    algorithm: "plot_performance_box"
    output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-oacl-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-iacl-pdr"
    data: "plot-vpp-throughput-latency-3n-skx"
    filter: "'NIC_Intel-X710' and
             '64B' and
             'NDRPDR' and
             '4T2C' and
             'IP4FWD' and
-           'OACL' and
+           'IACL' and
             ('ACL10' or 'ACL50') and '10k_FLOWS' and
             not 'IPSEC' and
             not 'VHOST'"
@@ -10662,9 +9746,142 @@
      boxpoints: "outliers"
      whiskerwidth: 0
    layout:
-    title: "ip4-3n-skx-x710-64b-4t2c-features-oacl-pdr"
+    title: "ip4-3n-skx-x710-64b-4t2c-features-iacl-pdr"
      layout: "plot-throughput"
  
+## Packet Throughput - VPP IPv4 3n-hsw-x710 features oacl
+#-
+#  type: "plot"
+#  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-oacl-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-oacl-ndr"
+#  data: "plot-vpp-throughput-latency-3n-skx"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           '2T1C' and
+#           'IP4FWD' and
+#           'OACL' and
+#           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+#           not 'IPSEC' and
+#           not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "ACL_STATELESS"
+#  - "ACL_STATEFUL"
+#  - "ACL_STATELESS"
+#  - "ACL_STATEFUL"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "ip4-3n-skx-x710-64b-2t1c-features-oacl-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-oacl-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-oacl-pdr"
+#  data: "plot-vpp-throughput-latency-3n-skx"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           '2T1C' and
+#           'IP4FWD' and
+#           'OACL' and
+#           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+#           not 'IPSEC' and
+#           not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "ACL_STATELESS"
+#  - "ACL_STATEFUL"
+#  - "ACL_STATELESS"
+#  - "ACL_STATEFUL"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "ip4-3n-skx-x710-64b-2t1c-features-oacl-pdr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-oacl-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-oacl-ndr"
+#  data: "plot-vpp-throughput-latency-3n-skx"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           '4T2C' and
+#           'IP4FWD' and
+#           'OACL' and
+#           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+#           not 'IPSEC' and
+#           not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "ACL_STATELESS"
+#  - "ACL_STATEFUL"
+#  - "ACL_STATELESS"
+#  - "ACL_STATEFUL"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "ip4-3n-skx-x710-64b-4t2c-features-oacl-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-oacl-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-oacl-pdr"
+#  data: "plot-vpp-throughput-latency-3n-skx"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           '4T2C' and
+#           'IP4FWD' and
+#           'OACL' and
+#           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+#           not 'IPSEC' and
+#           not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "ACL_STATELESS"
+#  - "ACL_STATEFUL"
+#  - "ACL_STATELESS"
+#  - "ACL_STATEFUL"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "ip4-3n-skx-x710-64b-4t2c-features-oacl-pdr"
+#    layout: "plot-throughput"
+
  # Packet Throughput - VPP IPv4 3n-hsw-xl710 base and scale
  -
    type: "plot"
@@ -11165,168 +10382,33 @@
    - "parent"
    - "tags"
    sort:
-  - "BASE"
-  - "BASE"
-  - "SRC_USER_10"
-  - "SRC_USER_100"
-  - "SRC_USER_1000"
-  - "SRC_USER_2000"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-x710-64b-2t2c-features-nat44-ndr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-features-nat44-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-nat44-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '2T2C' and
-           'IP4FWD' and
-           'NAT44' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "BASE"
-  - "BASE"
-  - "SRC_USER_10"
-  - "SRC_USER_100"
-  - "SRC_USER_1000"
-  - "SRC_USER_2000"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-x710-64b-2t2c-features-nat44-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP IPv4 3n-skx-x710 features iacl
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-features-iacl-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-iacl-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '1T1C' and
-           'IP4FWD' and
-           'IACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-x710-64b-1t1c-features-iacl-ndr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-features-iacl-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-iacl-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '1T1C' and
-           'IP4FWD' and
-           'IACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-hsw-x710-64b-1t1c-features-iacl-pdr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-features-iacl-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-iacl-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '2T2C' and
-           'IP4FWD' and
-           'IACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
+  - "BASE"
+  - "BASE"
+  - "SRC_USER_10"
+  - "SRC_USER_100"
+  - "SRC_USER_1000"
+  - "SRC_USER_2000"
    traces:
      hoverinfo: "x+y"
      boxpoints: "outliers"
      whiskerwidth: 0
    layout:
-    title: "ip4-3n-hsw-x710-64b-2t2c-features-iacl-ndr"
+    title: "ip4-3n-hsw-x710-64b-2t2c-features-nat44-ndr"
      layout: "plot-throughput"
  
  -
    type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-features-iacl-pdr"
+  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-features-nat44-pdr"
    algorithm: "plot_performance_box"
    output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-iacl-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-nat44-pdr"
    data: "plot-vpp-throughput-latency-3n-hsw"
    filter: "'NIC_Intel-X710' and
             '64B' and
             'NDRPDR' and
             '2T2C' and
             'IP4FWD' and
-           'IACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           'NAT44' and
             not 'IPSEC' and
             not 'VHOST'"
    parameters:
@@ -11334,32 +10416,34 @@
    - "parent"
    - "tags"
    sort:
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
+  - "BASE"
+  - "BASE"
+  - "SRC_USER_10"
+  - "SRC_USER_100"
+  - "SRC_USER_1000"
+  - "SRC_USER_2000"
    traces:
      hoverinfo: "x+y"
      boxpoints: "outliers"
      whiskerwidth: 0
    layout:
-    title: "ip4-3n-hsw-x710-64b-2t2c-features-iacl-pdr"
+    title: "ip4-3n-hsw-x710-64b-2t2c-features-nat44-pdr"
      layout: "plot-throughput"
  
-# Packet Throughput - VPP IPv4 3n-skx-x710 features oacl
+# Packet Throughput - VPP IPv4 3n-skx-x710 features iacl
  -
    type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-features-oacl-ndr"
+  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-features-iacl-ndr"
    algorithm: "plot_performance_box"
    output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-oacl-ndr"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-iacl-ndr"
    data: "plot-vpp-throughput-latency-3n-hsw"
    filter: "'NIC_Intel-X710' and
             '64B' and
             'NDRPDR' and
             '1T1C' and
             'IP4FWD' and
-           'OACL' and
+           'IACL' and
             ('ACL10' or 'ACL50') and '10k_FLOWS' and
             not 'IPSEC' and
             not 'VHOST'"
@@ -11377,22 +10461,22 @@
      boxpoints: "outliers"
      whiskerwidth: 0
    layout:
-    title: "ip4-3n-hsw-x710-64b-1t1c-features-oacl-ndr"
+    title: "ip4-3n-hsw-x710-64b-1t1c-features-iacl-ndr"
      layout: "plot-throughput"
  
  -
    type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-features-oacl-pdr"
+  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-features-iacl-pdr"
    algorithm: "plot_performance_box"
    output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-oacl-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-iacl-pdr"
    data: "plot-vpp-throughput-latency-3n-hsw"
    filter: "'NIC_Intel-X710' and
             '64B' and
             'NDRPDR' and
             '1T1C' and
             'IP4FWD' and
-           'OACL' and
+           'IACL' and
             ('ACL10' or 'ACL50') and '10k_FLOWS' and
             not 'IPSEC' and
             not 'VHOST'"
@@ -11410,22 +10494,22 @@
      boxpoints: "outliers"
      whiskerwidth: 0
    layout:
-    title: "ip4-3n-hsw-x710-64b-1t1c-features-oacl-pdr"
+    title: "ip4-3n-hsw-x710-64b-1t1c-features-iacl-pdr"
      layout: "plot-throughput"
  
  -
    type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-features-oacl-ndr"
+  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-features-iacl-ndr"
    algorithm: "plot_performance_box"
    output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-oacl-ndr"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-iacl-ndr"
    data: "plot-vpp-throughput-latency-3n-hsw"
    filter: "'NIC_Intel-X710' and
             '64B' and
             'NDRPDR' and
             '2T2C' and
             'IP4FWD' and
-           'OACL' and
+           'IACL' and
             ('ACL10' or 'ACL50') and '10k_FLOWS' and
             not 'IPSEC' and
             not 'VHOST'"
@@ -11443,22 +10527,22 @@
      boxpoints: "outliers"
      whiskerwidth: 0
    layout:
-    title: "ip4-3n-hsw-x710-64b-2t2c-features-oacl-ndr"
+    title: "ip4-3n-hsw-x710-64b-2t2c-features-iacl-ndr"
      layout: "plot-throughput"
  
  -
    type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-features-oacl-pdr"
+  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-features-iacl-pdr"
    algorithm: "plot_performance_box"
    output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-oacl-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-iacl-pdr"
    data: "plot-vpp-throughput-latency-3n-hsw"
    filter: "'NIC_Intel-X710' and
             '64B' and
             'NDRPDR' and
             '2T2C' and
             'IP4FWD' and
-           'OACL' and
+           'IACL' and
             ('ACL10' or 'ACL50') and '10k_FLOWS' and
             not 'IPSEC' and
             not 'VHOST'"
@@ -11476,9 +10560,142 @@
      boxpoints: "outliers"
      whiskerwidth: 0
    layout:
-    title: "ip4-3n-hsw-x710-64b-2t2c-features-oacl-pdr"
+    title: "ip4-3n-hsw-x710-64b-2t2c-features-iacl-pdr"
      layout: "plot-throughput"
  
+## Packet Throughput - VPP IPv4 3n-skx-x710 features oacl
+#-
+#  type: "plot"
+#  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-features-oacl-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-oacl-ndr"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           '1T1C' and
+#           'IP4FWD' and
+#           'OACL' and
+#           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+#           not 'IPSEC' and
+#           not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "ACL_STATELESS"
+#  - "ACL_STATEFUL"
+#  - "ACL_STATELESS"
+#  - "ACL_STATEFUL"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "ip4-3n-hsw-x710-64b-1t1c-features-oacl-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-features-oacl-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-oacl-pdr"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           '1T1C' and
+#           'IP4FWD' and
+#           'OACL' and
+#           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+#           not 'IPSEC' and
+#           not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "ACL_STATELESS"
+#  - "ACL_STATEFUL"
+#  - "ACL_STATELESS"
+#  - "ACL_STATEFUL"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "ip4-3n-hsw-x710-64b-1t1c-features-oacl-pdr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-features-oacl-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-oacl-ndr"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           '2T2C' and
+#           'IP4FWD' and
+#           'OACL' and
+#           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+#           not 'IPSEC' and
+#           not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "ACL_STATELESS"
+#  - "ACL_STATEFUL"
+#  - "ACL_STATELESS"
+#  - "ACL_STATEFUL"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "ip4-3n-hsw-x710-64b-2t2c-features-oacl-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-features-oacl-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-oacl-pdr"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           '2T2C' and
+#           'IP4FWD' and
+#           'OACL' and
+#           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+#           not 'IPSEC' and
+#           not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "ACL_STATELESS"
+#  - "ACL_STATEFUL"
+#  - "ACL_STATELESS"
+#  - "ACL_STATEFUL"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "ip4-3n-hsw-x710-64b-2t2c-features-oacl-pdr"
+#    layout: "plot-throughput"
+
  # Packet Throughput - VPP IPv4 2n-skx-x710 base and scale
  -
    type: "plot"
@@ -11864,138 +11081,138 @@
  
  ################################################################################
  
-# Packet Throughput - VPP IPv4 tunnels 3n-hsw-x520 base and scale
--
-  type: "plot"
-  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-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
-           'NDRPDR' and
-           '1T1C' and
-           ('VXLAN' or 'LISP') and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "not DOT1Q"
-  - "VXLAN_1"
-  - "VXLAN_10"
-  - "VXLAN_100"
-  - "VXLAN_1000"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  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-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
-           'NDRPDR' and
-           '1T1C' and
-           ('VXLAN' or 'LISP') and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "not DOT1Q"
-  - "VXLAN_1"
-  - "VXLAN_10"
-  - "VXLAN_100"
-  - "VXLAN_1000"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  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-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
-           'NDRPDR' and
-           '2T2C' and
-           ('VXLAN' or 'LISP') and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "not DOT1Q"
-  - "VXLAN_1"
-  - "VXLAN_10"
-  - "VXLAN_100"
-  - "VXLAN_1000"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  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-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
-           'NDRPDR' and
-           '2T2C' and
-           ('VXLAN' or 'LISP') and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "not DOT1Q"
-  - "VXLAN_1"
-  - "VXLAN_10"
-  - "VXLAN_100"
-  - "VXLAN_1000"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
-    layout: "plot-throughput"
+## Packet Throughput - VPP IPv4 tunnels 3n-hsw-x520 base and scale
+#-
+#  type: "plot"
+#  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-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
+#           'NDRPDR' and
+#           '1T1C' and
+#           ('VXLAN' or 'LISP') and
+#           not 'VHOST' and
+#           not 'IPSECHW'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "not DOT1Q"
+#  - "VXLAN_1"
+#  - "VXLAN_10"
+#  - "VXLAN_100"
+#  - "VXLAN_1000"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  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-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
+#           'NDRPDR' and
+#           '1T1C' and
+#           ('VXLAN' or 'LISP') and
+#           not 'VHOST' and
+#           not 'IPSECHW'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "not DOT1Q"
+#  - "VXLAN_1"
+#  - "VXLAN_10"
+#  - "VXLAN_100"
+#  - "VXLAN_1000"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  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-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
+#           'NDRPDR' and
+#           '2T2C' and
+#           ('VXLAN' or 'LISP') and
+#           not 'VHOST' and
+#           not 'IPSECHW'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "not DOT1Q"
+#  - "VXLAN_1"
+#  - "VXLAN_10"
+#  - "VXLAN_100"
+#  - "VXLAN_1000"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  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-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
+#           'NDRPDR' and
+#           '2T2C' and
+#           ('VXLAN' or 'LISP') and
+#           not 'VHOST' and
+#           not 'IPSECHW'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "not DOT1Q"
+#  - "VXLAN_1"
+#  - "VXLAN_10"
+#  - "VXLAN_100"
+#  - "VXLAN_1000"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
+#    layout: "plot-throughput"
  
  # Packet Throughput - VPP IPv4 tunnels 3n-hsw-x520 - features
  -
@@ -13517,7 +12734,7 @@
    algorithm: "plot_performance_box"
    output-file-type: ".html"
    output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-4t2c-base_and_features-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  data: "plot-vpp-throughput-latency-3n-skx"
    filter: "'NIC_Intel-X710' and
             '78B' and
             ('IP6BASE' or
@@ -21174,66 +20391,7 @@
             'NDRPDR' and
             '2T2C' and
             'IP4FWD' and
-           'IACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  layout:
-    title: "ip4-3n-hsw-x710-64b-2t2c-features-iacl-ndr"
-    layout: "plot-latency"
-
-# Packet Latency - VPP IPv4 3n-hsw-x710 features oacl
--
-  type: "plot"
-  title: "VPP Latency: ip4-3n-hsw-x710-64b-1t1c-features-oacl-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-oacl-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '1T1C' and
-           'IP4FWD' and
-           'OACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  layout:
-    title: "ip4-3n-hsw-x710-64b-1t1c-features-oacl-ndr"
-    layout: "plot-latency"
-
--
-  type: "plot"
-  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-oacl-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '2T2C' and
-           'IP4FWD' and
-           'OACL' and
+           'IACL' and
             ('ACL10' or 'ACL50') and '10k_FLOWS' and
             not 'IPSEC' and
             not 'VHOST'"
@@ -21247,9 +20405,68 @@
    - "ACL_STATELESS"
    - "ACL_STATEFUL"
    layout:
-    title: "ip4-3n-hsw-x710-64b-2t2c-features-oacl-ndr"
+    title: "ip4-3n-hsw-x710-64b-2t2c-features-iacl-ndr"
      layout: "plot-latency"
  
+## Packet Latency - VPP IPv4 3n-hsw-x710 features oacl
+#-
+#  type: "plot"
+#  title: "VPP Latency: ip4-3n-hsw-x710-64b-1t1c-features-oacl-ndr-lat"
+#  algorithm: "plot_latency_error_bars"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-oacl-ndr-lat"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           '1T1C' and
+#           'IP4FWD' and
+#           'OACL' and
+#           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+#           not 'IPSEC' and
+#           not 'VHOST'"
+#  parameters:
+#  - "latency"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "ACL_STATELESS"
+#  - "ACL_STATEFUL"
+#  - "ACL_STATELESS"
+#  - "ACL_STATEFUL"
+#  layout:
+#    title: "ip4-3n-hsw-x710-64b-1t1c-features-oacl-ndr"
+#    layout: "plot-latency"
+#
+#-
+#  type: "plot"
+#  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-oacl-ndr-lat"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           '2T2C' and
+#           'IP4FWD' and
+#           'OACL' and
+#           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+#           not 'IPSEC' and
+#           not 'VHOST'"
+#  parameters:
+#  - "latency"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "ACL_STATELESS"
+#  - "ACL_STATEFUL"
+#  - "ACL_STATELESS"
+#  - "ACL_STATEFUL"
+#  layout:
+#    title: "ip4-3n-hsw-x710-64b-2t2c-features-oacl-ndr"
+#    layout: "plot-latency"
+
  # Packet Latency - VPP IPv4 3n-hsw-xl710 base and scale
  -
    type: "plot"
@@ -21553,64 +20770,64 @@
      title: "ip4-3n-skx-x710-64b-4t2c-features-iacl-ndr"
      layout: "plot-latency"
  
-# Packet Latency - VPP IPv4 3n-skx-x710 features oacl
--
-  type: "plot"
-  title: "VPP Latency: ip4-3n-skx-x710-64b-2t1c-features-oacl-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-oacl-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '2T1C' and
-           'IP4FWD' and
-           'OACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  layout:
-    title: "ip4-3n-skx-x710-64b-2t1c-features-oacl-ndr"
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: ip4-3n-skx-x710-64b-4t2c-features-oacl-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-ndr-oacl-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '4T2C' and
-           'IP4FWD' and
-           'OACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  layout:
-    title: "ip4-3n-skx-x710-64b-4t2c-features-oacl-ndr"
-    layout: "plot-latency"
+## Packet Latency - VPP IPv4 3n-skx-x710 features oacl
+#-
+#  type: "plot"
+#  title: "VPP Latency: ip4-3n-skx-x710-64b-2t1c-features-oacl-ndr-lat"
+#  algorithm: "plot_latency_error_bars"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-oacl-ndr-lat"
+#  data: "plot-vpp-throughput-latency-3n-skx"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           '2T1C' and
+#           'IP4FWD' and
+#           'OACL' and
+#           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+#           not 'IPSEC' and
+#           not 'VHOST'"
+#  parameters:
+#  - "latency"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "ACL_STATELESS"
+#  - "ACL_STATEFUL"
+#  - "ACL_STATELESS"
+#  - "ACL_STATEFUL"
+#  layout:
+#    title: "ip4-3n-skx-x710-64b-2t1c-features-oacl-ndr"
+#    layout: "plot-latency"
+#
+#-
+#  type: "plot"
+#  title: "VPP Latency: ip4-3n-skx-x710-64b-4t2c-features-oacl-ndr-lat"
+#  algorithm: "plot_latency_error_bars"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-ndr-oacl-lat"
+#  data: "plot-vpp-throughput-latency-3n-skx"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           '4T2C' and
+#           'IP4FWD' and
+#           'OACL' and
+#           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+#           not 'IPSEC' and
+#           not 'VHOST'"
+#  parameters:
+#  - "latency"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "ACL_STATELESS"
+#  - "ACL_STATEFUL"
+#  - "ACL_STATELESS"
+#  - "ACL_STATEFUL"
+#  layout:
+#    title: "ip4-3n-skx-x710-64b-4t2c-features-oacl-ndr"
+#    layout: "plot-latency"
  
  # Packet Latency - VPP IPv4 2n-skx-x710 base and scale
  -
@@ -21732,64 +20949,64 @@
  
  ################################################################################
  
-# 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_error_bars"
-  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
-           'NDRPDR' and
-           '1T1C' and
-           ('VXLAN' or 'LISP') and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "not DOT1Q"
-  - "VXLAN_1"
-  - "VXLAN_10"
-  - "VXLAN_100"
-  - "VXLAN_1000"
-  layout:
-    title: "ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  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
-           'NDRPDR' and
-           '2T2C' and
-           ('VXLAN' or 'LISP') and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "not DOT1Q"
-  - "VXLAN_1"
-  - "VXLAN_10"
-  - "VXLAN_100"
-  - "VXLAN_1000"
-  layout:
-    title: "ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
-    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_error_bars"
+#  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
+#           'NDRPDR' and
+#           '1T1C' and
+#           ('VXLAN' or 'LISP') and
+#           not 'VHOST' and
+#           not 'IPSECHW'"
+#  parameters:
+#  - "latency"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "not DOT1Q"
+#  - "VXLAN_1"
+#  - "VXLAN_10"
+#  - "VXLAN_100"
+#  - "VXLAN_1000"
+#  layout:
+#    title: "ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
+#    layout: "plot-latency"
+#
+#-
+#  type: "plot"
+#  title: "VPP Latency: ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
+#  algorithm: "plot_latency_error_bars"
+#  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
+#           'NDRPDR' and
+#           '2T2C' and
+#           ('VXLAN' or 'LISP') and
+#           not 'VHOST' and
+#           not 'IPSECHW'"
+#  parameters:
+#  - "latency"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "not DOT1Q"
+#  - "VXLAN_1"
+#  - "VXLAN_10"
+#  - "VXLAN_100"
+#  - "VXLAN_1000"
+#  layout:
+#    title: "ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
+#    layout: "plot-latency"
  
  # Packet Latency - VPP Ipv4 tunnels 3n-hsw-x520 - features
  -
@@ -21812,10 +21029,10 @@
    - "latency"
    - "parent"
    - "tags"
-  sort:
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "LISP"
+#  sort:
+#  - "L2BDMACLRN"
+#  - "L2XCFWD"
+#  - "LISP"
    layout:
      title: "ip4tun-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
      layout: "plot-latency"
@@ -25036,7 +24253,7 @@
             'NDRPDR' and
             ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
             not 'VHOST' and
-            'MEMIF'"
+           'MEMIF'"
    parameters:
    - "throughput"
    - "parent"
@@ -25066,6 +24283,7 @@
             'NDRPDR' and
             ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
             not 'VHOST' and
+           not 'NF_DENSITY' and
             'MEMIF'"
    parameters:
    - "throughput"
@@ -25095,7 +24313,8 @@
             'NDRPDR' and
             ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
             not 'VHOST' and
-            'MEMIF'"
+           not 'NF_DENSITY' and
+           'MEMIF'"
    parameters:
    - "throughput"
    - "parent"
@@ -25154,7 +24373,7 @@
             'NDRPDR' and
             ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
             not 'VHOST' and
-            'MEMIF'"
+           'MEMIF'"
    parameters:
    - "throughput"
    - "parent"
@@ -25941,62 +25160,62 @@
      title: "ip4-3n-hsw-x710-64b-features-iacl-pdr"
      layout: "plot-throughput-speedup-analysis"
  
-# Speedup - VPP IPv4 3n-hsw-x710 features oacl
--
-  type: "plot"
-  title: "Speedup: ip4-3n-hsw-x710-64b-features-oacl-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-features-oacl-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           'IP4FWD' and
-           'OACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  layout:
-    title: "ip4-3n-hsw-x710-64b-features-oacl-ndr"
-    layout: "plot-throughput-speedup-analysis"
-
--
-  type: "plot"
-  title: "Speedup: ip4-3n-hsw-x710-64b-features-oacl-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-features-oacl-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           'IP4FWD' and
-           'OACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  layout:
-    title: "ip4-3n-hsw-x710-64b-features-oacl-pdr"
-    layout: "plot-throughput-speedup-analysis"
+## Speedup - VPP IPv4 3n-hsw-x710 features oacl
+#-
+#  type: "plot"
+#  title: "Speedup: ip4-3n-hsw-x710-64b-features-oacl-ndr-tsa"
+#  algorithm: "plot_throughput_speedup_analysis"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-features-oacl-ndr-tsa"
+#  data: "plot-throughput-speedup-analysis-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           'IP4FWD' and
+#           'OACL' and
+#           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+#           not 'IPSEC' and
+#           not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "ACL_STATELESS"
+#  - "ACL_STATEFUL"
+#  - "ACL_STATELESS"
+#  - "ACL_STATEFUL"
+#  layout:
+#    title: "ip4-3n-hsw-x710-64b-features-oacl-ndr"
+#    layout: "plot-throughput-speedup-analysis"
+#
+#-
+#  type: "plot"
+#  title: "Speedup: ip4-3n-hsw-x710-64b-features-oacl-pdr-tsa"
+#  algorithm: "plot_throughput_speedup_analysis"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-features-oacl-pdr-tsa"
+#  data: "plot-throughput-speedup-analysis-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           'IP4FWD' and
+#           'OACL' and
+#           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+#           not 'IPSEC' and
+#           not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "ACL_STATELESS"
+#  - "ACL_STATEFUL"
+#  - "ACL_STATELESS"
+#  - "ACL_STATEFUL"
+#  layout:
+#    title: "ip4-3n-hsw-x710-64b-features-oacl-pdr"
+#    layout: "plot-throughput-speedup-analysis"
  
  # Speedup - VPP IPv4 3n-hsw-xl710 base and scale
  -
@@ -26513,62 +25732,62 @@
  
  ################################################################################
  
-# Speedup - VPP IPv4 Tunnels 3n-hsw-x520
--
-  type: "plot"
-  title: "Speedup: ip4tun-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X520_DA2' and
-           '64B' and
-           'ENCAP' and
-           'NDRPDR' and
-           ('VXLAN' or 'LISP') and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "not DOT1Q"
-  - "VXLAN_1"
-  - "VXLAN_10"
-  - "VXLAN_100"
-  - "VXLAN_1000"
-  layout:
-    title: "ip4tun-3n-hsw-x520-64b-base_and_scale-ndr"
-    layout: "plot-throughput-speedup-analysis"
-
--
-  type: "plot"
-  title: "Speedup: ip4tun-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X520_DA2' and
-           '64B' and
-           'ENCAP' and
-           'NDRPDR' and
-           ('VXLAN' or 'LISP') and
-           not 'VHOST' and
-           not 'IPSECHW'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "not DOT1Q"
-  - "VXLAN_1"
-  - "VXLAN_10"
-  - "VXLAN_100"
-  - "VXLAN_1000"
-  layout:
-    title: "ip4tun-3n-hsw-x520-64b-base_and_scale-pdr"
-    layout: "plot-throughput-speedup-analysis"
+## Speedup - VPP IPv4 Tunnels 3n-hsw-x520
+#-
+#  type: "plot"
+#  title: "Speedup: ip4tun-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
+#  algorithm: "plot_throughput_speedup_analysis"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
+#  data: "plot-throughput-speedup-analysis-3n-hsw"
+#  filter: "'NIC_Intel-X520_DA2' and
+#           '64B' and
+#           'ENCAP' and
+#           'NDRPDR' and
+#           ('VXLAN' or 'LISP') and
+#           not 'VHOST' and
+#           not 'IPSECHW'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "not DOT1Q"
+#  - "VXLAN_1"
+#  - "VXLAN_10"
+#  - "VXLAN_100"
+#  - "VXLAN_1000"
+#  layout:
+#    title: "ip4tun-3n-hsw-x520-64b-base_and_scale-ndr"
+#    layout: "plot-throughput-speedup-analysis"
+#
+#-
+#  type: "plot"
+#  title: "Speedup: ip4tun-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
+#  algorithm: "plot_throughput_speedup_analysis"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
+#  data: "plot-throughput-speedup-analysis-3n-hsw"
+#  filter: "'NIC_Intel-X520_DA2' and
+#           '64B' and
+#           'ENCAP' and
+#           'NDRPDR' and
+#           ('VXLAN' or 'LISP') and
+#           not 'VHOST' and
+#           not 'IPSECHW'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "not DOT1Q"
+#  - "VXLAN_1"
+#  - "VXLAN_10"
+#  - "VXLAN_100"
+#  - "VXLAN_1000"
+#  layout:
+#    title: "ip4tun-3n-hsw-x520-64b-base_and_scale-pdr"
+#    layout: "plot-throughput-speedup-analysis"
  
  # Speedup - VPP IPv4 Tunnels 3n-hsw-x520 - features
  -
@@ -27210,10 +26429,10 @@
  # Speedup - VPP IPv6 3n-skx-x710 features
  -
    type: "plot"
-  title: "Speedup: ip6-3n-skx-x710-78b-base_and_scale-ndr-tsa"
+  title: "Speedup: ip6-3n-skx-x710-78b-base_and_features-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"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-base_and_features-ndr-tsa"
    data: "plot-throughput-speedup-analysis-3n-skx"
    filter: "'NIC_Intel-X710' and
             '78B' and
@@ -27236,15 +26455,15 @@
    - "COPWHLIST"
    - "IACLDST"
    layout:
-    title: "ip6-3n-skx-x710-78b-base_and_scale-ndr"
+    title: "ip6-3n-skx-x710-78b-base_and_features-ndr"
      layout: "plot-throughput-speedup-analysis"
  
  -
    type: "plot"
-  title: "Speedup: ip6-3n-skx-x710-78b-base_and_scale-pdr-tsa"
+  title: "Speedup: ip6-3n-skx-x710-78b-base_and_features-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"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-base_and_features-pdr-tsa"
    data: "plot-throughput-speedup-analysis-3n-skx"
    filter: "'NIC_Intel-X710' and
             '78B' and
@@ -27267,7 +26486,7 @@
    - "COPWHLIST"
    - "IACLDST"
    layout:
-    title: "ip6-3n-skx-x710-78b-base_and_scale-pdr"
+    title: "ip6-3n-skx-x710-78b-base_and_features-pdr"
      layout: "plot-throughput-speedup-analysis"
  
  # Speedup - VPP IPv6 2n-skx-x710