Code Review / csit.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
CSIT-1350: Add new data to 1810 report
[csit.git] / resources / tools / presentation / specification.yaml
diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml
index d88bda6..024ed55 100644 (file)
--- a/resources/tools/presentation/specification.yaml
+++ b/resources/tools/presentation/specification.yaml
@@ -39,8 +39,10 @@
     DIR[DTR,PERF,COT,3N,HSW]: "{DIR[DTR]}/cot_performance_results_3n_hsw"
     DIR[DTR,FUNC,VPP,UBUNTU]: "{DIR[DTR]}/vpp_functional_results_ubuntu"
     DIR[DTR,FUNC,VPP,CENTOS]: "{DIR[DTR]}/vpp_functional_results_centos"
+    DIR[DTR,FUNC,VPP,DEVICE,UBUNTU]: "{DIR[DTR]}/vpp_device_results_ubuntu"
     DIR[DTR,FUNC,HC]: "{DIR[DTR]}/honeycomb_functional_results"
     DIR[DTR,FUNC,NSHSFC]: "{DIR[DTR]}/nshsfc_functional_results"
+    DIR[DTR,FUNC,DMM]: "{DIR[DTR]}/dmm_functional_results"
     DIR[DTR,PERF,VPP,IMPRV]: "{DIR[WORKING,SRC]}/vpp_performance_tests/performance_improvements"
 
     # Detailed test configurations
@@ -53,6 +55,7 @@
     DIR[DTC,MRR,VPP,2N,SKX]: "{DIR[DTC]}/vpp_mrr_configuration_2n_skx"
     DIR[DTC,FUNC,VPP,UBUNTU]: "{DIR[DTC]}/vpp_functional_configuration_ubuntu"
     DIR[DTC,FUNC,VPP,CENTOS]: "{DIR[DTC]}/vpp_functional_configuration_centos"
+    DIR[DTC,FUNC,VPP,DEVICE,UBUNTU]: "{DIR[DTC]}/vpp_device_configuration_ubuntu"
 
     # Detailed tests operational data
     DIR[DTO]: "{DIR[WORKING,SRC]}/test_operational_data"
@@ -96,23 +99,27 @@
 -
   type: "configuration"
 
+  limits:
+    nic:
+      x520: 24460000
+      x710: 35800000
+      xxv710: 35800000
+      xl710: 35800000
+
+    link:
+      10ge: 14880952.38
+      25ge: 37202380.95
+      40ge: 59523809.52
+      100ge: 148809523.81
+
+    pci:
+      pci-g3-x8: 74404761.90
+      pci-g3-x16: 148809523.81
+
   data-sets:
 
     # VPP Performance
     vpp-performance-changes:
-      csit-vpp-perf-1801-all:
-      - 124  # sel
-      - 127  # sel
-      - 128  # sel
-      - 141  # sel
-      - 142  # sel
-      - 143  # sel
-      - 145  # sel
-      - 146  # sel
-      - 162  # sel
-      - 163  # sel
-      - 167  # sel
-      - 172  # sel acl only
       csit-vpp-perf-1804-all:
       - 21  # sel
       - 22  # sel
@@ -124,58 +131,67 @@
       - 30  # sel
       - 31  # sel
       - 35  # sel
-      # TODO: Add Data sources
       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
 
     vpp-compare-testbeds:
-      # TODO: Add Data sources
-      csit-vpp-perf-verify-1807-3n-hsw:
+      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
+      csit-vpp-perf-verify-1810-3n-skx:
+      - 24  # NDRPDR full
+      - 10  # NDRPDR sel
+      - 14  # NDRPDR sel
       - 15  # NDRPDR sel
       - 16  # NDRPDR sel
+      - 17  # NDRPDR sel
       - 19  # NDRPDR sel
-      csit-vpp-perf-verify-1807-3n-skx:
-      - 33  # NDRPDR sel
-      - 35  # NDRPDR sel
-      - 37  # NDRPDR sel
-      - 38  # NDRPDR sel
-      - 39  # NDRPDR sel
-      - 43  # NDRPDR sel
-      - 44  # NDRPDR sel
-      - 49  # NDRPDR sel
-      - 50  # NDRPDR sel
-      - 56  # NDRPDR sel
+      - 20  # NDRPDR sel
+      - 21  # NDRPDR sel
+      - 22  # NDRPDR sel
+      - 25  # NDRPDR sel
 
     vpp-compare-testbeds-mrr:
-      # TODO: Add Data sources
-      csit-vpp-perf-verify-1807-3n-hsw:
+      csit-vpp-perf-verify-1810-3n-hsw:
       - 9   # MRR sel
-      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
+      csit-vpp-perf-verify-1810-3n-skx:
+      - 9   # MRR sel
+      - 11  # MRR sel
+      - 12  # MRR sel
+      - 13  # MRR sel
 
     vpp-performance-changes-mrr:
-      csit-vpp-perf-check-1801:
-      - 3
-      - 4
-      - 5
-      - 6
-      - 7
-      - 8
-      - 9
-      - 11
-      - 12
-      - 13
       csit-vpp-perf-check-1804:
       - 6   # mrr - sel
       - 13  # mrr - sel
@@ -187,135 +203,186 @@
       - 20  # mrr - sel
       - 21  # mrr - sel
       - 22  # mrr - sel
-      # TODO: Add Data sources
       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
+      csit-vpp-perf-verify-1810-3n-hsw:
       - 9   # MRR sel
 
     vpp-perf-results-3n-hsw:
-      # TODO: Add Data sources
-      csit-vpp-perf-verify-1807-3n-hsw:
-      - 11  # NDRPDR full 1
+      csit-vpp-perf-verify-1810-3n-hsw:
+      - 20  # NDRPDR full
+      - 21  # NDRPDR full
+      - 22  # NDRPDR full
+      - 27  # NDRPDR full
 
     vpp-perf-results-3n-skx:
-      csit-vpp-perf-verify-1807-3n-skx:
-      - 40  # NDRPDR full 1
-      - 41  # NDRPDR full 2
+      csit-vpp-perf-verify-1810-3n-skx:
+      - 23  # NDRPDR full
+      - 24  # NDRPDR full
 
     vpp-perf-results-2n-skx:
-      csit-vpp-perf-verify-1807-2n-skx:
-      - 32  # NDRPDR full
+      csit-vpp-perf-verify-1810-2n-skx:
+      - 25  # NDRPDR full
+      - 26  # NDRPDR full
 
     vpp-mrr-results-3n-hsw:
-      csit-vpp-perf-verify-1807-3n-hsw:
-      - 8   # MRR full
+      csit-vpp-perf-verify-1810-3n-hsw:
+      - 9   # MRR sel
 
     vpp-mrr-results-3n-skx:
-      # TODO: Replace with better results
-      csit-vpp-perf-verify-1807-3n-skx:
-      - 31  # MRR full
+      csit-vpp-perf-verify-1810-3n-skx:
+      - 9   # MRR sel
 
     vpp-mrr-results-2n-skx:
-      csit-vpp-perf-verify-1807-2n-skx:
-      - 27  # MRR full
+      csit-vpp-perf-verify-1810-2n-skx:
+      - 8   # MRR sel
 
     plot-throughput-speedup-analysis-3n-hsw:
-      # TODO: Add Data sources
-      csit-vpp-perf-verify-1807-3n-hsw:
+      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
+
+    plot-throughput-speedup-analysis-3n-skx:
+      csit-vpp-perf-verify-1810-3n-skx:
+      - 24  # NDRPDR full
+      - 10  # NDRPDR sel
+      - 14  # NDRPDR sel
       - 15  # NDRPDR sel
       - 16  # NDRPDR sel
+      - 17  # NDRPDR sel
       - 19  # NDRPDR sel
-
-    plot-throughput-speedup-analysis-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
+      - 20  # NDRPDR sel
+      - 21  # NDRPDR sel
+      - 22  # NDRPDR sel
+      - 25  # NDRPDR sel
 
     plot-throughput-speedup-analysis-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
+      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
+
+    plot-vpp-throughput-latency-3n-hsw:
+      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
-      - 40  # NDRPDR sel
+      - 41  # NDRPDR sel
       - 42  # NDRPDR sel
 
-    plot-vpp-throughput-latency-3n-hsw:
-      # TODO: Add Data sources
-      csit-vpp-perf-verify-1807-3n-hsw:
+    plot-vpp-throughput-latency-3n-skx:
+      csit-vpp-perf-verify-1810-3n-skx:
+      - 24  # NDRPDR full
+      - 10  # NDRPDR sel
+      - 14  # NDRPDR sel
       - 15  # NDRPDR sel
       - 16  # NDRPDR sel
+      - 17  # NDRPDR sel
       - 19  # NDRPDR sel
-
-    plot-vpp-throughput-latency-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
+      - 20  # NDRPDR sel
+      - 21  # NDRPDR sel
+      - 22  # NDRPDR sel
+      - 25  # NDRPDR sel
 
     plot-vpp-throughput-latency-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
 
     plot-vpp-http-server-performance:
-      # TODO: Add Data sources
-      csit-vpp-perf-verify-1807-3n-hsw:
-      - 24  # WRK
-      - 25  # WRK
+      csit-vpp-perf-verify-1810-3n-hsw:
+      - 28  # WRK
+      - 29  # WRK
+      - 30  # WRK
+      - 31  # WRK
+      - 32  # WRK
+      - 33  # WRK
+      - 34  # WRK
+      - 35  # WRK
+      - 36  # WRK
+      - 37  # WRK
 
     # VPP Functional
     vpp-func-results-ubuntu:
-      csit-vpp-functional-1807-ubuntu1604-virl:
-      # TODO: Add Data sources
-      - "lastSuccessfulBuild"
+      csit-vpp-functional-1810-ubuntu1604-virl:
+      - 44
 
     vpp-func-results-centos:
-      csit-vpp-functional-1807-centos7-virl:
-      # TODO: Add Data sources
-      - "lastSuccessfulBuild"
+      csit-vpp-functional-1810-centos7-virl:
+      - 44
+
+    vpp-device-results-ubuntu:
+      csit-vpp-device-1810-ubuntu1804-1n-skx:
+      - 2
 
     # VPP Ligato
     ligato-perf-results-3n-hsw:
-      # TODO: Replace with better results
-      csit-ligato-perf-1807-all:
-      - 3   # full ?
+      csit-ligato-perf-verify-1810-3n-hsw:
+      - 5   # full
 
     plot-ligato-throughput-speedup-analysis-3n-hsw:
-      # TODO: Add Data sources
-      csit-ligato-perf-1807-all:
-      - 4   # sel
+      csit-ligato-perf-verify-1810-3n-hsw:
+      - 5   # full
+      - 6   # sel
+      - 8   # sel
+      - 9   # sel
+      - 11  # sel
+      - 12  # sel
+      - 13  # sel
+      - 14  # sel
+      - 16  # sel
+      - 17  # sel
+      - 18  # sel
 
     plot-ligato-throughput-latency-3n-hsw:
-      # TODO: Add Data sources
-      csit-ligato-perf-1807-all:
-      - 4   # sel
+      csit-ligato-perf-verify-1810-3n-hsw:
+      - 5   # full
+      - 6   # sel
+      - 8   # sel
+      - 9   # sel
+      - 11  # sel
+      - 12  # sel
+      - 13  # sel
+      - 14  # sel
+      - 16  # sel
+      - 17  # sel
+      - 18  # sel
 
     # DPDK Performance
     dpdk-performance-changes:
@@ -341,120 +408,146 @@
       - 21
       - 22
       - 23
+      csit-dpdk-perf-verify-1810-3n-hsw:
+      - 1   # NDRPDR sel
+      - 2   # NDRPDR sel
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 5   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
 
     dpdk-compare-testbeds:
-      csit-dpdk-perf-verify-1807-3n-skx:
-      - 1
-      - 2
-      - 3
-      - 6
-      - 7
-      - 8
-      - 9
-      - 10
-      - 11
-      - 12
-      csit-dpdk-perf-verify-1807-3n-hsw:
-      - 11
-      - 12  # full
-      - 14
-      - 15
-      - 16
-      - 17
-      - 20
-      - 21
-      - 22
-      - 23
+      csit-dpdk-perf-verify-1810-3n-skx:
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
+      - 11  # NDRPDR sel
+      - 12  # NDRPDR sel
+      - 13  # NDRPDR sel
+      csit-dpdk-perf-verify-1810-3n-hsw:
+      - 1   # NDRPDR sel
+      - 2   # NDRPDR sel
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 5   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
 
     dpdk-perf-results-3n-hsw:
-      csit-dpdk-perf-verify-1807-3n-hsw:
-      - 12
+      csit-dpdk-perf-verify-1810-3n-hsw:
+      - 1
 
     dpdk-perf-results-3n-skx:
-      csit-dpdk-perf-verify-1807-3n-skx:
-      - 12
+      csit-dpdk-perf-verify-1810-3n-skx:
+      - 3   # NDRPDR sel
 
     dpdk-perf-results-2n-skx:
-      csit-dpdk-perf-verify-1807-2n-skx:
-      - 10
+      csit-dpdk-perf-verify-1810-2n-skx:
+      - 3
 
     plot-dpdk-throughput-latency-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
 
     plot-dpdk-throughput-latency-3n-skx:
-      csit-dpdk-perf-verify-1807-3n-skx:
-      - 1
-      - 2
-      - 3
-      - 6
-      - 7
-      - 8
-      - 9
-      - 10
-      - 11
-      - 12
+      csit-dpdk-perf-verify-1810-3n-skx:
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
+      - 11  # NDRPDR sel
+      - 12  # NDRPDR sel
+      - 13  # NDRPDR sel
 
     plot-dpdk-throughput-latency-2n-skx:
-      csit-dpdk-perf-verify-1807-2n-skx:
-      - 1
-      - 2
-      - 3
-      - 4
-      - 5
-      - 6
-      - 7
-      - 8
-      - 9
-      - 10
+      csit-dpdk-perf-verify-1810-2n-skx:
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 5   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
+      - 11  # NDRPDR sel
+      - 12  # NDRPDR sel
+      - 13  # NDRPDR sel
 
     # HoneyComb Functional
     hc-func-results:
-      csit-hc2vpp-verify-func-1807-ubuntu1604:
-      # TODO: Add Data sources
-      - "lastSuccessfulBuild"
+      csit-hc2vpp-verify-func-1810-ubuntu1604:
+      - 1
 
     # NSH SFC Functional
     nsh-func-results:
-      csit-nsh_sfc-verify-func-1807-ubuntu1604-virl:
-      - 2
+      csit-nsh_sfc-verify-func-1810-ubuntu1604-virl:
+      - 1
+
+    # DMM Functional
+    dmm-func-results:
+      csit-dmm-functional-1810-ubuntu1604-virl:
+      - 1
 
   plot-layouts:
 
     plot-cps:
+      titlefont:
+        size: 18
       xaxis:
+        title: "<b>Test Cases [Index]</b>"
+        titlefont:
+          size: 16
         autorange: True
         fixedrange: False
-        gridcolor: "rgb(238, 238, 238)"
-        linecolor: "rgb(238, 238, 238)"
+        gridcolor: "rgb(230, 230, 230)"
+        linecolor: "rgb(220, 220, 220)"
         linewidth: 1
         showgrid: True
         showline: True
         showticklabels: True
-        tickcolor: "rgb(238, 238, 238)"
+        tickcolor: "rgb(220, 220, 220)"
         tickmode: "linear"
-        title: "Indexed Test Cases"
+        tickfont:
+          size: 16
         zeroline: False
       yaxis:
-        gridcolor: "rgb(238, 238, 238)"
+        title: "<b>Connections Per Second [cps]</b>"
+        titlefont:
+          size: 16
+        gridcolor: "rgb(230, 230, 230)"
         hoverformat: ".4s"
-        linecolor: "rgb(238, 238, 238)"
+        linecolor: "rgb(220, 220, 220)"
         linewidth: 1
         rangemode: "tozero"
         showgrid: True
         showline: True
         showticklabels: True
-        tickcolor: "rgb(238, 238, 238)"
-        title: "Connections Per Second [cps]"
+        tickcolor: "rgb(220, 220, 220)"
+        tickformat: ".3s"
+        tickfont:
+          size: 16
         zeroline: False
       boxmode: "group"
       boxgroupgap: 0.5
@@ -467,34 +560,47 @@
       showlegend: True
       legend:
         orientation: "h"
+        font:
+          size: 16
       width: 700
-      height: 1000
+      height: 800
 
     plot-rps:
+      titlefont:
+        size: 18
       xaxis:
+        title: "<b>Test Cases [Index]</b>"
+        titlefont:
+          size: 16
         autorange: True
         fixedrange: False
-        gridcolor: "rgb(238, 238, 238)"
-        linecolor: "rgb(238, 238, 238)"
+        gridcolor: "rgb(230, 230, 230)"
+        linecolor: "rgb(220, 220, 220)"
         linewidth: 1
         showgrid: True
         showline: True
         showticklabels: True
-        tickcolor: "rgb(238, 238, 238)"
+        tickcolor: "rgb(220, 220, 220)"
         tickmode: "linear"
-        title: "Indexed Test Cases"
+        tickfont:
+          size: 16
         zeroline: False
       yaxis:
-        gridcolor: "rgb(238, 238, 238)"
+        title: "<b>Requests Per Second [rps]</b>"
+        titlefont:
+          size: 16
+        gridcolor: "rgb(230, 230, 230)"
         hoverformat: ".4s"
-        linecolor: "rgb(238, 238, 238)"
+        linecolor: "rgb(220, 220, 220)"
         linewidth: 1
         rangemode: "tozero"
         showgrid: True
         showline: True
         showticklabels: True
-        tickcolor: "rgb(238, 238, 238)"
-        title: "Requests Per Second [rps]"
+        tickcolor: "rgb(230, 230, 230)"
+        tickformat: ".3s"
+        tickfont:
+          size: 16
         zeroline: False
       boxmode: "group"
       boxgroupgap: 0.5
@@ -507,35 +613,48 @@
       showlegend: True
       legend:
         orientation: "h"
+        font:
+          size: 16
       width: 700
-      height: 1000
+      height: 800
 
     plot-throughput:
+      titlefont:
+        size: 18
       xaxis:
+        title: "<b>Test Cases [Index]</b>"
+        titlefont:
+          size: 16
         autorange: True
         fixedrange: False
-        gridcolor: "rgb(238, 238, 238)"
-        linecolor: "rgb(238, 238, 238)"
+        gridcolor: "rgb(230, 230, 230)"
+        linecolor: "rgb(220, 220, 220)"
         linewidth: 1
         showgrid: True
         showline: True
         showticklabels: True
-        tickcolor: "rgb(238, 238, 238)"
+        tickcolor: "rgb(220, 220, 220)"
         tickmode: "linear"
-        title: "Indexed Test Cases"
+        tickfont:
+          size: 16
         zeroline: False
       yaxis:
-        gridcolor: "rgb(238, 238, 238)"
+        title: "<b>Packet Throughput [Mpps]</b>"
+        titlefont:
+          size: 16
+        gridcolor: "rgb(230, 230, 230)"
         hoverformat: ".4s"
         tickformat: ".3s"
-        linecolor: "rgb(238, 238, 238)"
+        linecolor: "rgb(220, 220, 220)"
         linewidth: 1
         showgrid: True
         showline: True
         showticklabels: True
-        tickcolor: "rgb(238, 238, 238)"
-        title: "Packets Per Second [pps]"
+        tickcolor: "rgb(220, 220, 220)"
+        tickfont:
+          size: 16
         zeroline: False
+        range: [0,50]
       boxmode: "group"
       boxgroupgap: 0.5
       autosize: False
@@ -547,93 +666,159 @@
       showlegend: True
       legend:
         orientation: "h"
+        font:
+          size: 16
       width: 700
-      height: 1000
+      # height: 850
 
-    plot-latency:
+    plot-throughput-speedup-analysis:
+      titlefont:
+        size: 18
       xaxis:
+        title: "<b>Number of Cores [Qty]</b>"
+        titlefont:
+          size: 16
         autorange: True
         fixedrange: False
-        gridcolor: "rgb(238, 238, 238)"
-        linecolor: "rgb(238, 238, 238)"
+        gridcolor: "rgb(230, 230, 230)"
+        linecolor: "rgb(220, 220, 220)"
         linewidth: 1
         showgrid: True
         showline: True
         showticklabels: True
         tickcolor: "rgb(238, 238, 238)"
         tickmode: "linear"
-        title: "Indexed Test Cases"
+        tickfont:
+          size: 16
         zeroline: False
       yaxis:
-        gridcolor: "rgb(238, 238, 238)"
-        hoverformat: ""
-        linecolor: "rgb(238, 238, 238)"
+        title: "<b>Packet Throughput [Mpps]</b>"
+        titlefont:
+          size: 16
+        type: "linear"
+        gridcolor: "rgb(230, 230, 230)"
+        hoverformat: ".4s"
+        linecolor: "rgb(220, 220, 220)"
         linewidth: 1
         showgrid: True
         showline: True
         showticklabels: True
-        tickcolor: "rgb(238, 238, 238)"
-        title: "Latency min/avg/max [uSec]"
-        zeroline: False
-      boxmode: "group"
-      boxgroupgap: 0.5
+        tickcolor: "rgb(220, 220, 220)"
+        tickformat: ".4s"
+        tickfont:
+          size: 16
+        zeroline: True
+        rangemode: "tozero"
+        # range: [0,100]
+      legend:
+        orientation: "h"
+        font:
+          size: 16
+        xanchor: "left"
+        yanchor: "top"
+        x: 0
+        y: -0.2
+        bgcolor: "rgba(255, 255, 255, 0)"
+        bordercolor: "rgba(255, 255, 255, 0)"
+        traceorder: "normal"  # "grouped" does not work: bug https://github.com/plotly/plotly.js/issues/1913
       autosize: False
       margin:
-        t: 50
-        b: 20
-        l: 80
-        r: 20
+          't': 50
+          'b': 150
+          'l': 85
+          'r': 10
       showlegend: True
-      legend:
-        orientation: "h"
       width: 700
-      height: 1000
+      height: 700
+      hoverlabel:
+        namelength: -1
+      annotations: [
+        {
+          text: "_ _          __          ...",
+          align: "left",
+          showarrow: False,
+          xref: "paper",
+          yref: "paper",
+          xanchor: "left",
+          yanchor: "top",
+          x: 0,
+          y: -0.13,
+          font: {
+            family: "Consolas, Courier New",
+            size: 15
+          },
+        },
+        {
+          text: "    Perfect     Measured     Limit",
+          align: "left",
+          showarrow: False,
+          xref: "paper",
+          yref: "paper",
+          xanchor: "left",
+          yanchor: "top",
+          x: 0,
+          y: -0.15,
+          font: {
+            family: "Consolas, Courier New",
+            size: 15
+          },
+        },
+      ]
 
-    plot-throughput-speedup-analysis:
+    plot-latency:
+      titlefont:
+        size: 18
       xaxis:
+        title: "<b>Direction</b>"
+        titlefont:
+          size: 16
         autorange: True
         fixedrange: False
-        gridcolor: "rgb(238, 238, 238)"
-        linecolor: "rgb(238, 238, 238)"
+        gridcolor: "rgb(230, 230, 230)"
+        linecolor: "rgb(220, 220, 220)"
         linewidth: 1
         showgrid: True
         showline: True
-        showticklabels: True
-        tickcolor: "rgb(238, 238, 238)"
+        showticklabels: False
+        tickcolor: "rgb(220, 220, 220)"
         tickmode: "linear"
-        tickangle: 270
+        tickfont:
+          size: 16
         zeroline: False
       yaxis:
-        title: "Throughput speedup factor"
-        gridcolor: "rgb(238, 238, 238)"
+        title: "<b>Packet Latency [uSec]</b>"
+        titlefont:
+          size: 16
+        type: "linear"
+        gridcolor: "rgb(230, 230, 230)"
         hoverformat: ".4s"
-        linecolor: "rgb(238, 238, 238)"
+        linecolor: "rgb(220, 220, 220)"
         linewidth: 1
         showgrid: True
         showline: True
         showticklabels: True
-        tickcolor: "rgb(238, 238, 238)"
-        zeroline: False
+        tickcolor: "rgb(220, 220, 220)"
+        tickformat: ".4s"
+        tickfont:
+          size: 16
+        zeroline: True
+        rangemode: "tozero"
       legend:
         orientation: "h"
-        xanchor: "center"
-        yanchor: "top"
-        x: 0.5
-        y: 1
-        bgcolor: "rgba(255, 255, 255, 0)"
-        bordercolor: "rgba(255, 255, 255, 0)"
-      barmode: "group"
-      bargap: 0.15
-      bargroupgap: 0.1
+        font:
+          size: 16
+        traceorder: "normal"  # "grouped" does not work: bug https://github.com/plotly/plotly.js/issues/1913
       autosize: False
       margin:
           't': 50
-          'b': 300
-          'l': 50
-          'r': 20
+          'b': 150
+          'l': 80
+          'r': 10
       showlegend: True
       width: 700
-      height: 1000
+      height: 700
+      hoverlabel:
+        namelength: -1
 
 -
   type: "static"
@@ -650,19 +835,6 @@
 
   builds:
 
-    csit-vpp-perf-1801-all:
-    - 124  # sel
-    - 127  # sel
-    - 128  # sel
-    - 141  # sel
-    - 142  # sel
-    - 143  # sel
-    - 145  # sel
-    - 146  # sel
-    - 162  # sel
-    - 163  # sel
-    - 167  # sel
-    - 172  # sel acl only
     csit-vpp-perf-1804-all:
     - 21  # sel
     - 22  # sel
@@ -674,16 +846,65 @@
     - 30  # sel
     - 31  # sel
     - 35  # sel
-    # TODO: Add Data sources
     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
     - 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
+    - 21  # NDRPDR full
+    - 22  # NDRPDR full
+    - 27  # NDRPDR full
+    - 8   # NDRPDR sel
+    - 12  # NDRPDR sel
+    - 14  # NDRPDR sel
+    - 18  # NDRPDR sel
+    - 23  # NDRPDR sel
+    - 25  # NDRPDR sel
+    - 38  # NDRPDR sel
+    - 39  # NDRPDR sel
+    - 41  # NDRPDR sel
+    - 42  # NDRPDR sel
+    - 28  # WRK
+    - 29  # WRK
+    - 30  # WRK
+    - 31  # WRK
+    - 32  # WRK
+    - 33  # WRK
+    - 34  # WRK
+    - 35  # WRK
+    - 36  # WRK
+    - 37  # WRK
     csit-vpp-perf-verify-1807-3n-skx:
     - 31  # MRR full
     - 28  # MRR sel
@@ -708,6 +929,23 @@
     - 49  # NDRPDR sel
     - 50  # NDRPDR sel
     - 56  # NDRPDR sel
+    csit-vpp-perf-verify-1810-3n-skx:
+    - 9   # MRR sel
+    - 11  # MRR sel
+    - 12  # MRR sel
+    - 13  # MRR sel
+    - 23  # NDRPDR full
+    - 24  # NDRPDR full
+    - 10  # NDRPDR sel
+    - 14  # NDRPDR sel
+    - 15  # NDRPDR sel
+    - 16  # NDRPDR sel
+    - 17  # NDRPDR sel
+    - 19  # NDRPDR sel
+    - 20  # NDRPDR sel
+    - 21  # NDRPDR sel
+    - 22  # NDRPDR sel
+    - 25  # NDRPDR sel
     csit-vpp-perf-verify-1807-2n-skx:
     - 27  # MRR full
     - 31  # MRR sel
@@ -731,17 +969,23 @@
     - 39  # NDRPDR sel
     - 40  # NDRPDR sel
     - 42  # NDRPDR sel
-    csit-vpp-perf-check-1801:
-    - 3   # mrr
-    - 4   # mrr
-    - 5   # mrr
-    - 6   # mrr
-    - 7   # mrr
-    - 8   # mrr
-    - 9   # mrr
-    - 11  # mrr
-    - 12  # mrr
-    - 13  # mrr
+    csit-vpp-perf-verify-1810-2n-skx:
+    - 8   # MRR sel
+    - 10  # MRR sel
+    - 11  # MRR sel
+    - 12  # MRR sel
+    - 25  # NDRPDR full
+    - 26  # NDRPDR full
+    - 9   # NDRPDR sel
+    - 13  # NDRPDR sel
+    - 14  # NDRPDR sel
+    - 19  # NDRPDR sel
+    - 20  # NDRPDR sel
+    - 21  # NDRPDR sel
+    - 22  # NDRPDR sel
+    - 23  # NDRPDR sel
+    - 24  # NDRPDR sel
+    - 27  # NDRPDR sel
     csit-vpp-perf-check-1804:
     - 5   # mrr - full
     - 6   # mrr - sel
@@ -754,22 +998,18 @@
     - 20  # mrr - sel
     - 21  # mrr - sel
     - 22  # mrr - sel
-    csit-ligato-perf-1804-all:
-    - 4   # full
-    - 5   # sel
+    csit-ligato-perf-verify-1810-3n-hsw:
+    - 5   # full
     - 6   # sel
-    - 7   # sel
     - 8   # sel
     - 9   # sel
-    - 10  # sel
     - 11  # sel
     - 12  # sel
     - 13  # sel
     - 14  # sel
-    # TODO: Add Data sources
-    csit-ligato-perf-1807-all:
-    - 3   # full ?
-    - 4   # sel
+    - 16  # sel
+    - 17  # sel
+    - 18  # sel
     csit-dpdk-perf-1804-all:
     - 4
     - 5
@@ -792,6 +1032,17 @@
     - 21
     - 22
     - 23
+    csit-dpdk-perf-verify-1810-3n-hsw:
+    - 1   # NDRPDR sel
+    - 2   # NDRPDR sel
+    - 3   # NDRPDR sel
+    - 4   # NDRPDR sel
+    - 5   # NDRPDR sel
+    - 6   # NDRPDR sel
+    - 7   # NDRPDR sel
+    - 8   # NDRPDR sel
+    - 9   # NDRPDR sel
+    - 10  # NDRPDR sel
     csit-dpdk-perf-verify-1807-3n-skx:
     - 1
     - 2
@@ -803,28 +1054,41 @@
     - 10
     - 11
     - 12
-    csit-dpdk-perf-verify-1807-2n-skx:
-    - 1
-    - 2
-    - 3
-    - 4
-    - 5
-    - 6
-    - 7
-    - 8
-    - 9
-    - 10
-    csit-vpp-functional-1807-ubuntu1604-virl:
-    # TODO: Add Data sources
-    - "lastSuccessfulBuild"
-    csit-vpp-functional-1807-centos7-virl:
-    # TODO: Add Data sources
-    - "lastSuccessfulBuild"
-    csit-nsh_sfc-verify-func-1807-ubuntu1604-virl:
+    csit-dpdk-perf-verify-1810-3n-skx:
+    - 3   # NDRPDR sel
+    - 4   # NDRPDR sel
+    - 6   # NDRPDR sel
+    - 7   # NDRPDR sel
+    - 8   # NDRPDR sel
+    - 9   # NDRPDR sel
+    - 10  # NDRPDR sel
+    - 11  # NDRPDR sel
+    - 12  # NDRPDR sel
+    - 13  # NDRPDR sel
+    csit-dpdk-perf-verify-1810-2n-skx:
+    - 3   # NDRPDR sel
+    - 4   # NDRPDR sel
+    - 5   # NDRPDR sel
+    - 7   # NDRPDR sel
+    - 8   # NDRPDR sel
+    - 9   # NDRPDR sel
+    - 10  # NDRPDR sel
+    - 11  # NDRPDR sel
+    - 12  # NDRPDR sel
+    - 13  # NDRPDR sel
+
+    csit-vpp-functional-1810-ubuntu1604-virl:
+    - 44
+    csit-vpp-functional-1810-centos7-virl:
+    - 44
+    csit-vpp-device-1810-ubuntu1804-1n-skx:
     - 2
-    csit-hc2vpp-verify-func-1807-ubuntu1604:
-    # TODO: Add Data sources
-    - "lastSuccessfulBuild"
+    csit-nsh_sfc-verify-func-1810-ubuntu1604-virl:
+    - 1
+    csit-dmm-functional-1810-ubuntu1604-virl:
+    - 1
+    csit-hc2vpp-verify-func-1810-ubuntu1604:
+    - 1
 
 -
   type: "output"
@@ -841,6 +1105,8 @@
 
 ################################################################################
 # VPP
+
+# VPP Performance Changes 1t1c pdr
 -
   type: "table"
   title: "VPP Performance Changes 1t1c pdr"
@@ -848,43 +1114,50 @@
   output-file: "{DIR[STATIC,VPP]}/performance-changes-1t1c-pdr"
   history:
     -
-      title: "rls1801"
+      title: "rls1804"
       data:
-        csit-vpp-perf-1801-all:
-        - 124  # sel
-        - 127  # sel
-        - 128  # sel
-        - 141  # sel
-        - 142  # sel
-        - 143  # sel
-        - 145  # sel
-        - 146  # sel
-        - 162  # sel
-        - 163  # sel
-        - 167  # sel
-        - 172  # sel acl only
+        csit-vpp-perf-1804-all:
+        - 21  # sel
+        - 22  # sel
+        - 23  # sel
+        - 24  # sel
+        - 27  # sel
+        - 28  # sel
+        - 29  # sel
+        - 30  # sel
+        - 31  # sel
+        - 35  # sel
   reference:
-    title: "rls1804"
-    data:
-      csit-vpp-perf-1804-all:
-      - 21  # sel
-      - 22  # sel
-      - 23  # sel
-      - 24  # sel
-      - 27  # sel
-      - 28  # sel
-      - 29  # sel
-      - 30  # sel
-      - 31  # sel
-      - 35  # sel
-  compare:
     title: "rls1807"
     data:
-      # TODO: Add Data sources
       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
+  compare:
+    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"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -893,6 +1166,7 @@
   - "parent"
   - "throughput"
 
+# VPP Performance Changes 2t2c pdr
 -
   type: "table"
   title: "VPP Performance Changes 2t2c pdr"
@@ -900,43 +1174,50 @@
   output-file: "{DIR[STATIC,VPP]}/performance-changes-2t2c-pdr"
   history:
     -
-      title: "rls1801"
+      title: "rls1804"
       data:
-        csit-vpp-perf-1801-all:
-        - 124  # sel
-        - 127  # sel
-        - 128  # sel
-        - 141  # sel
-        - 142  # sel
-        - 143  # sel
-        - 145  # sel
-        - 146  # sel
-        - 162  # sel
-        - 163  # sel
-        - 167  # sel
-        - 172  # sel acl only
+        csit-vpp-perf-1804-all:
+        - 21  # sel
+        - 22  # sel
+        - 23  # sel
+        - 24  # sel
+        - 27  # sel
+        - 28  # sel
+        - 29  # sel
+        - 30  # sel
+        - 31  # sel
+        - 35  # sel
   reference:
-    title: "rls1804"
-    data:
-      csit-vpp-perf-1804-all:
-      - 21  # sel
-      - 22  # sel
-      - 23  # sel
-      - 24  # sel
-      - 27  # sel
-      - 28  # sel
-      - 29  # sel
-      - 30  # sel
-      - 31  # sel
-      - 35  # sel
-  compare:
     title: "rls1807"
     data:
-      # TODO: Add Data sources
       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
+  compare:
+    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"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -945,6 +1226,7 @@
   - "parent"
   - "throughput"
 
+# VPP Performance Changes 1t1c ndr
 -
   type: "table"
   title: "VPP Performance Changes 1t1c ndr"
@@ -952,43 +1234,50 @@
   output-file: "{DIR[STATIC,VPP]}/performance-changes-1t1c-ndr"
   history:
     -
-      title: "rls1801"
+      title: "rls1804"
       data:
-        csit-vpp-perf-1801-all:
-        - 124  # sel
-        - 127  # sel
-        - 128  # sel
-        - 141  # sel
-        - 142  # sel
-        - 143  # sel
-        - 145  # sel
-        - 146  # sel
-        - 162  # sel
-        - 163  # sel
-        - 167  # sel
-        - 172  # sel acl only
+        csit-vpp-perf-1804-all:
+        - 21  # sel
+        - 22  # sel
+        - 23  # sel
+        - 24  # sel
+        - 27  # sel
+        - 28  # sel
+        - 29  # sel
+        - 30  # sel
+        - 31  # sel
+        - 35  # sel
   reference:
-    title: "rls1804"
+    title: "rls1807"
     data:
-      csit-vpp-perf-1804-all:
-      - 21  # sel
-      - 22  # sel
-      - 23  # sel
-      - 24  # sel
-      - 27  # sel
-      - 28  # sel
-      - 29  # sel
-      - 30  # sel
-      - 31  # sel
-      - 35  # sel
-  compare:
-    title: "rls1807"
-    data:
-      # TODO: Add Data sources
       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
+  compare:
+    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"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -997,6 +1286,7 @@
   - "parent"
   - "throughput"
 
+# VPP Performance Changes 2t2c ndr
 -
   type: "table"
   title: "VPP Performance Changes 2t2c ndr"
@@ -1004,43 +1294,50 @@
   output-file: "{DIR[STATIC,VPP]}/performance-changes-2t2c-ndr"
   history:
     -
-      title: "rls1801"
+      title: "rls1804"
       data:
-        csit-vpp-perf-1801-all:
-        - 124  # sel
-        - 127  # sel
-        - 128  # sel
-        - 141  # sel
-        - 142  # sel
-        - 143  # sel
-        - 145  # sel
-        - 146  # sel
-        - 162  # sel
-        - 163  # sel
-        - 167  # sel
-        - 172  # sel acl only
+        csit-vpp-perf-1804-all:
+        - 21  # sel
+        - 22  # sel
+        - 23  # sel
+        - 24  # sel
+        - 27  # sel
+        - 28  # sel
+        - 29  # sel
+        - 30  # sel
+        - 31  # sel
+        - 35  # sel
   reference:
-    title: "rls1804"
-    data:
-      csit-vpp-perf-1804-all:
-      - 21  # sel
-      - 22  # sel
-      - 23  # sel
-      - 24  # sel
-      - 27  # sel
-      - 28  # sel
-      - 29  # sel
-      - 30  # sel
-      - 31  # sel
-      - 35  # sel
-  compare:
     title: "rls1807"
     data:
-      # TODO: Add Data sources
       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
+  compare:
+    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"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -1049,6 +1346,7 @@
   - "parent"
   - "throughput"
 
+# VPP Comparison Across Testbeds 3n-hsw to 3n-skx ndr
 -
   type: "table"
   title: "VPP Comparison Across Testbeds 3n-hsw to 3n-skx ndr"
@@ -1057,25 +1355,31 @@
   reference:
     title: "3-Node Hsw"
     data:
-      # TODO: Add Data sources
-      csit-vpp-perf-verify-1807-3n-hsw:
-      - 15  # NDRPDR sel
-      - 16  # NDRPDR sel
-      - 19  # 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
   compare:
     title: "3-Node Skx"
     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
+      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-compare-testbeds"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'NIC_Intel-X710' and 'NDRPDR'"
@@ -1084,6 +1388,7 @@
   - "parent"
   - "throughput"
 
+# VPP Comparison Across Testbeds 3n-hsw to 3n-skx pdr
 -
   type: "table"
   title: "VPP Comparison Across Testbeds 3n-hsw to 3n-skx pdr"
@@ -1092,25 +1397,31 @@
   reference:
     title: "3-Node Hsw"
     data:
-      # TODO: Add Data sources
-      csit-vpp-perf-verify-1807-3n-hsw:
-      - 15  # NDRPDR sel
-      - 16  # NDRPDR sel
-      - 19  # 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
   compare:
     title: "3-Node Skx"
     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
+      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-compare-testbeds"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'NIC_Intel-X710' and 'NDRPDR'"
@@ -1119,6 +1430,7 @@
   - "parent"
   - "throughput"
 
+# VPP Performance Changes - 1t1c MRR
 -
   type: "table"
   title: "VPP Performance Changes - 1t1c MRR"
@@ -1126,38 +1438,36 @@
   output-file: "{DIR[STATIC,VPP]}/performance-changes-1t1c-mrr"
   history:
     -
-      title: "rls1801"
+      title: "rls1804"
       data:
-        csit-vpp-perf-check-1801:
-        - 3
-        - 4
-        - 5
-        - 6
-        - 7
-        - 8
-        - 9
-        - 11
-        - 12
-        - 13
+        csit-vpp-perf-check-1804:
+        - 6   # mrr - sel
+        - 13  # mrr - sel
+        - 14  # mrr - sel
+        - 15  # mrr - sel
+        - 16  # mrr - sel
+        - 17  # mrr - sel
+        - 19  # mrr - sel
+        - 20  # mrr - sel
+        - 21  # mrr - sel
+        - 22  # mrr - sel
   reference:
-    title: "rls1804"
-    data:
-      csit-vpp-perf-check-1804:
-      - 6   # mrr - sel
-      - 13  # mrr - sel
-      - 14  # mrr - sel
-      - 15  # mrr - sel
-      - 16  # mrr - sel
-      - 17  # mrr - sel
-      - 19  # mrr - sel
-      - 20  # mrr - sel
-      - 21  # mrr - sel
-      - 22  # mrr - sel
-  compare:
     title: "rls1807"
     data:
-      # TODO: Add Data sources
       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
+  compare:
+    title: "rls1810"
+    data:
+      csit-vpp-perf-verify-1810-3n-hsw:
       - 9   # MRR sel
   data: "vpp-performance-changes-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
@@ -1167,6 +1477,7 @@
   - "parent"
   - "result"
 
+# VPP Performance Changes - 2t2c MRR
 -
   type: "table"
   title: "VPP Performance Changes - 2t2c MRR"
@@ -1174,38 +1485,36 @@
   output-file: "{DIR[STATIC,VPP]}/performance-changes-2t2c-mrr"
   history:
     -
-      title: "rls1801"
+      title: "rls1804"
       data:
-        csit-vpp-perf-check-1801:
-        - 3
-        - 4
-        - 5
-        - 6
-        - 7
-        - 8
-        - 9
-        - 11
-        - 12
-        - 13
+        csit-vpp-perf-check-1804:
+        - 6   # mrr - sel
+        - 13  # mrr - sel
+        - 14  # mrr - sel
+        - 15  # mrr - sel
+        - 16  # mrr - sel
+        - 17  # mrr - sel
+        - 19  # mrr - sel
+        - 20  # mrr - sel
+        - 21  # mrr - sel
+        - 22  # mrr - sel
   reference:
-    title: "rls1804"
-    data:
-      csit-vpp-perf-check-1804:
-      - 6   # mrr - sel
-      - 13  # mrr - sel
-      - 14  # mrr - sel
-      - 15  # mrr - sel
-      - 16  # mrr - sel
-      - 17  # mrr - sel
-      - 19  # mrr - sel
-      - 20  # mrr - sel
-      - 21  # mrr - sel
-      - 22  # mrr - sel
-  compare:
     title: "rls1807"
     data:
-      # TODO: Add Data sources
       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
+  compare:
+    title: "rls1810"
+    data:
+      csit-vpp-perf-verify-1810-3n-hsw:
       - 9   # MRR sel
   data: "vpp-performance-changes-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
@@ -1215,6 +1524,7 @@
   - "parent"
   - "result"
 
+# VPP Performance Changes - 4t4c MRR
 -
   type: "table"
   title: "VPP Performance Changes - 4t4c MRR"
@@ -1222,38 +1532,36 @@
   output-file: "{DIR[STATIC,VPP]}/performance-changes-4t4c-mrr"
   history:
     -
-      title: "rls1801"
+      title: "rls1804"
       data:
-        csit-vpp-perf-check-1801:
-        - 3
-        - 4
-        - 5
-        - 6
-        - 7
-        - 8
-        - 9
-        - 11
-        - 12
-        - 13
+        csit-vpp-perf-check-1804:
+        - 6   # mrr - sel
+        - 13  # mrr - sel
+        - 14  # mrr - sel
+        - 15  # mrr - sel
+        - 16  # mrr - sel
+        - 17  # mrr - sel
+        - 19  # mrr - sel
+        - 20  # mrr - sel
+        - 21  # mrr - sel
+        - 22  # mrr - sel
   reference:
-    title: "rls1804"
-    data:
-      csit-vpp-perf-check-1804:
-      - 6   # mrr - sel
-      - 13  # mrr - sel
-      - 14  # mrr - sel
-      - 15  # mrr - sel
-      - 16  # mrr - sel
-      - 17  # mrr - sel
-      - 19  # mrr - sel
-      - 20  # mrr - sel
-      - 21  # mrr - sel
-      - 22  # mrr - sel
-  compare:
     title: "rls1807"
     data:
-      # TODO: Add Data sources
       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
+  compare:
+    title: "rls1810"
+    data:
+      csit-vpp-perf-verify-1810-3n-hsw:
       - 9   # MRR sel
   data: "vpp-performance-changes-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
@@ -1263,6 +1571,7 @@
   - "parent"
   - "result"
 
+# VPP Comparison Across Testbeds 3n-hsw to 3n-skx mrr
 -
   type: "table"
   title: "VPP Comparison Across Testbeds 3n-hsw to 3n-skx mrr"
@@ -1271,23 +1580,16 @@
   reference:
     title: "3-Node Hsw"
     data:
-      # TODO: Add Data sources
-      csit-vpp-perf-verify-1807-3n-hsw:
+      csit-vpp-perf-verify-1810-3n-hsw:
       - 9   # MRR sel
   compare:
     title: "3-Node Skx"
     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
-      - 54  # MRR sel
+      csit-vpp-perf-verify-1810-3n-skx:
+      - 9   # MRR sel
+      - 11  # MRR sel
+      - 12  # MRR sel
+      - 13  # MRR sel
   data: "vpp-compare-testbeds-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'NIC_Intel-X710' and 'MRR'"
@@ -1296,6 +1598,7 @@
   - "parent"
   - "result"
 
+# Detailed Test Results - VPP Performance Results 3n-hsw
 -
   type: "table"
   title: "Detailed Test Results - VPP Performance Results 3n-hsw"
@@ -1306,9 +1609,6 @@
   -
     title: "Name"
     data: "data name"
-  -
-    title: "Documentation"
-    data: "data doc"
   -
     title: "Status"
     data: "data msg"
@@ -1318,9 +1618,9 @@
   parameters:
   - "name"
   - "parent"
-  - "doc"
   - "msg"
 
+# Detailed Test Results - VPP Performance Results 3n-skx
 -
   type: "table"
   title: "Detailed Test Results - VPP Performance Results 3n-skx"
@@ -1331,9 +1631,6 @@
   -
     title: "Name"
     data: "data name"
-  -
-    title: "Documentation"
-    data: "data doc"
   -
     title: "Status"
     data: "data msg"
@@ -1343,9 +1640,9 @@
   parameters:
   - "name"
   - "parent"
-  - "doc"
   - "msg"
 
+# Detailed Test Results - VPP Performance Results 2n-skx
 -
   type: "table"
   title: "Detailed Test Results - VPP Performance Results 2n-skx"
@@ -1356,9 +1653,6 @@
   -
     title: "Name"
     data: "data name"
-  -
-    title: "Documentation"
-    data: "data doc"
   -
     title: "Status"
     data: "data msg"
@@ -1368,9 +1662,9 @@
   parameters:
   - "name"
   - "parent"
-  - "doc"
   - "msg"
 
+# Test configuration - VPP Performance Test Configs 3n-hsw
 -
   type: "table"
   title: "Test configuration - VPP Performance Test Configs 3n-hsw"
@@ -1392,6 +1686,7 @@
   - "name"
   - "vat-history"
 
+# Test configuration - VPP Performance Test Configs 3n-skx
 -
   type: "table"
   title: "Test configuration - VPP Performance Test Configs 3n-skx"
@@ -1413,6 +1708,7 @@
   - "name"
   - "vat-history"
 
+# Test configuration - VPP Performance Test Configs 2n-skx
 -
   type: "table"
   title: "Test configuration - VPP Performance Test Configs 2n-skx"
@@ -1434,6 +1730,7 @@
   - "name"
   - "vat-history"
 
+# Test Operational Data - VPP Performance Operational Data 3n-hsw
 -
   type: "table"
   title: "Test Operational Data - VPP Performance Operational Data 3n-hsw"
@@ -1455,6 +1752,7 @@
   - "name"
   - "show-run"
 
+# Test Operational Data - VPP Performance Operational Data 3n-skx
 -
   type: "table"
   title: "Test Operational Data - VPP Performance Operational Data 3n-skx"
@@ -1476,6 +1774,7 @@
   - "name"
   - "show-run"
 
+# Test Operational Data - VPP Performance Operational Data 2n-skx
 -
   type: "table"
   title: "Test Operational Data - VPP Performance Operational Data 2n-skx"
@@ -1497,6 +1796,7 @@
   - "name"
   - "show-run"
 
+# Detailed Test Results - VPP MRR Results 3n-hsw
 -
   type: "table"
   title: "Detailed Test Results - VPP MRR Results 3n-hsw"
@@ -1507,9 +1807,6 @@
   -
     title: "Name"
     data: "data name"
-  -
-    title: "Documentation"
-    data: "data doc"
   -
     title: "Status"
     data: "data msg"
@@ -1519,9 +1816,9 @@
   parameters:
   - "name"
   - "parent"
-  - "doc"
   - "msg"
 
+# Detailed Test Results - VPP MRR Results 3n-skx
 -
   type: "table"
   title: "Detailed Test Results - VPP MRR Results 3n-skx"
@@ -1532,9 +1829,6 @@
   -
     title: "Name"
     data: "data name"
-  -
-    title: "Documentation"
-    data: "data doc"
   -
     title: "Status"
     data: "data msg"
@@ -1544,9 +1838,9 @@
   parameters:
   - "name"
   - "parent"
-  - "doc"
   - "msg"
 
+# Detailed Test Results - VPP MRR Results 2n-skx
 -
   type: "table"
   title: "Detailed Test Results - VPP MRR Results 2n-skx"
@@ -1557,9 +1851,6 @@
   -
     title: "Name"
     data: "data name"
-  -
-    title: "Documentation"
-    data: "data doc"
   -
     title: "Status"
     data: "data msg"
@@ -1569,9 +1860,9 @@
   parameters:
   - "name"
   - "parent"
-  - "doc"
   - "msg"
 
+# Test configuration - VPP MRR Test Configs 3n-hsw
 -
   type: "table"
   title: "Test configuration - VPP MRR Test Configs 3n-hsw"
@@ -1593,6 +1884,7 @@
   - "name"
   - "vat-history"
 
+# Test configuration - VPP MRR Test Configs 3n-skx
 -
   type: "table"
   title: "Test configuration - VPP MRR Test Configs 3n-skx"
@@ -1614,6 +1906,7 @@
   - "name"
   - "vat-history"
 
+# Test configuration - VPP MRR Test Configs 2n-skx
 -
   type: "table"
   title: "Test configuration - VPP MRR Test Configs 2n-skx"
@@ -1635,6 +1928,7 @@
   - "name"
   - "vat-history"
 
+# Detailed Test Results - VPP Functional Results - Ubuntu
 -
   type: "table"
   title: "Detailed Test Results - VPP Functional Results - Ubuntu"
@@ -1660,6 +1954,7 @@
   - "doc"
   - "status"
 
+# Detailed Test Results - VPP Functional Results - CentOS
 -
   type: "table"
   title: "Detailed Test Results - VPP Functional Results - CentOS"
@@ -1686,6 +1981,7 @@
   - "doc"
   - "status"
 
+# Test configuration - VPP Functional Test Configs - Ubuntu
 -
   type: "table"
   title: "Test configuration - VPP Functional Test Configs - Ubuntu"
@@ -1707,6 +2003,7 @@
   - "name"
   - "vat-history"
 
+# Test configuration - VPP Functional Test Configs - CentOS
 -
   type: "table"
   title: "Test configuration - VPP Functional Test Configs - CentOS"
@@ -1728,6 +2025,7 @@
   - "name"
   - "vat-history"
 
+# Detailed Test Results - Container Orchestrated Topologies Performance Results 3n-hsw
 -
   type: "table"
   title: "Detailed Test Results - Container Orchestrated Topologies Performance Results 3n-hsw"
@@ -1735,6 +2033,28 @@
   output-file-ext: ".csv"
   output-file: "{DIR[DTR,PERF,COT,3N,HSW]}/cot_performance_results_3n_hsw"
   columns:
+  -
+    title: "Name"
+    data: "data name"
+  -
+    title: "Status"
+    data: "data msg"
+  rows: "generated"
+  data: "ligato-perf-results-3n-hsw"
+  filter: "all"
+  parameters:
+  - "name"
+  - "parent"
+  - "msg"
+
+# Detailed Test Results - VPP Device Results - Ubuntu
+-
+  type: "table"
+  title: "Detailed Test Results - VPP Device Results - Ubuntu"
+  algorithm: "table_details"
+  output-file-ext: ".csv"
+  output-file: "{DIR[DTR,FUNC,VPP,DEVICE,UBUNTU]}/vpp_device_results_ubuntu"
+  columns:
   -
     title: "Name"
     data: "data name"
@@ -1743,38 +2063,62 @@
     data: "data doc"
   -
     title: "Status"
-    data: "data msg"
+    data: "data status"
   rows: "generated"
-  data: "ligato-perf-results-3n-hsw"
+  data: "vpp-device-results-ubuntu"
   filter: "all"
   parameters:
   - "name"
   - "parent"
   - "doc"
-  - "msg"
+  - "status"
+
+# Test configuration - VPP Device Test Configs - Ubuntu
+-
+  type: "table"
+  title: "Test configuration - VPP Device Test Configs - Ubuntu"
+  algorithm: "table_details"
+  output-file-ext: ".csv"
+  output-file: "{DIR[DTC,FUNC,VPP,DEVICE,UBUNTU]}/vpp_device_configuration_ubuntu"
+  columns:
+  -
+    title: "Name"
+    data: "data name"
+  -
+    title: "VPP API Test (VAT) Commands History - Commands Used Per Test Case"
+    data: "data vat-history"
+  rows: "generated"
+  data: "vpp-device-results-ubuntu"
+  filter: "all"
+  parameters:
+  - "parent"
+  - "name"
+  - "vat-history"
 
 ################################################################################
-# DPDK
+
+# DPDK Performance Changes 1t1c pdr
 -
   type: "table"
   title: "DPDK Performance Changes 1t1c pdr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-1t1c-pdr"
+  history:
+    -
+      title: "rls1804"
+      data:
+        csit-dpdk-perf-1804-all:
+        - 4
+        - 5
+        - 6
+        - 7
+        - 8
+        - 9
+        - 10
+        - 11
+        - 12
+        - 13
   reference:
-    title: "rls1804"
-    data:
-      csit-dpdk-perf-1804-all:
-      - 4
-      - 5
-      - 6
-      - 7
-      - 8
-      - 9
-      - 10
-      - 11
-      - 12
-      - 13
-  compare:
     title: "rls1807"
     data:
       csit-dpdk-perf-verify-1807-3n-hsw:
@@ -1788,6 +2132,20 @@
       - 21
       - 22
       - 23
+  compare:
+    title: "rls1810"
+    data:
+      csit-dpdk-perf-verify-1810-3n-hsw:
+      - 1   # NDRPDR sel
+      - 2   # NDRPDR sel
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 5   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
   data: "dpdk-performance-changes"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -1796,26 +2154,28 @@
   - "parent"
   - "throughput"
 
+# DPDK Performance Changes 2t2c pdr
 -
   type: "table"
   title: "DPDK Performance Changes 2t2c pdr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-2t2c-pdr"
-  reference:
-    title: "rls1804"
-    data:
-      csit-dpdk-perf-1804-all:
-      - 4
-      - 5
-      - 6
-      - 7
-      - 8
-      - 9
-      - 10
-      - 11
-      - 12
-      - 13
-  compare:
+  history:
+    -
+      title: "rls1804"
+      data:
+        csit-dpdk-perf-1804-all:
+        - 4
+        - 5
+        - 6
+        - 7
+        - 8
+        - 9
+        - 10
+        - 11
+        - 12
+        - 13
+  reference:
     title: "rls1807"
     data:
       csit-dpdk-perf-verify-1807-3n-hsw:
@@ -1829,6 +2189,20 @@
       - 21
       - 22
       - 23
+  compare:
+    title: "rls1810"
+    data:
+      csit-dpdk-perf-verify-1810-3n-hsw:
+      - 1   # NDRPDR sel
+      - 2   # NDRPDR sel
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 5   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
   data: "dpdk-performance-changes"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -1837,26 +2211,28 @@
   - "parent"
   - "throughput"
 
+# DPDK Performance Changes 1t1c ndr
 -
   type: "table"
   title: "DPDK Performance Changes 1t1c ndr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-1t1c-ndr"
+  history:
+    -
+      title: "rls1804"
+      data:
+        csit-dpdk-perf-1804-all:
+        - 4
+        - 5
+        - 6
+        - 7
+        - 8
+        - 9
+        - 10
+        - 11
+        - 12
+        - 13
   reference:
-    title: "rls1804"
-    data:
-      csit-dpdk-perf-1804-all:
-      - 4
-      - 5
-      - 6
-      - 7
-      - 8
-      - 9
-      - 10
-      - 11
-      - 12
-      - 13
-  compare:
     title: "rls1807"
     data:
       csit-dpdk-perf-verify-1807-3n-hsw:
@@ -1870,6 +2246,20 @@
       - 21
       - 22
       - 23
+  compare:
+    title: "rls1810"
+    data:
+      csit-dpdk-perf-verify-1810-3n-hsw:
+      - 1   # NDRPDR sel
+      - 2   # NDRPDR sel
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 5   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
   data: "dpdk-performance-changes"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -1878,26 +2268,28 @@
   - "parent"
   - "throughput"
 
+# DPDK Performance Changes 2t2c ndr
 -
   type: "table"
   title: "DPDK Performance Changes 2t2c ndr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-2t2c-ndr"
+  history:
+    -
+      title: "rls1804"
+      data:
+        csit-dpdk-perf-1804-all:
+        - 4
+        - 5
+        - 6
+        - 7
+        - 8
+        - 9
+        - 10
+        - 11
+        - 12
+        - 13
   reference:
-    title: "rls1804"
-    data:
-      csit-dpdk-perf-1804-all:
-      - 4
-      - 5
-      - 6
-      - 7
-      - 8
-      - 9
-      - 10
-      - 11
-      - 12
-      - 13
-  compare:
     title: "rls1807"
     data:
       csit-dpdk-perf-verify-1807-3n-hsw:
@@ -1911,6 +2303,20 @@
       - 21
       - 22
       - 23
+  compare:
+    title: "rls1810"
+    data:
+      csit-dpdk-perf-verify-1810-3n-hsw:
+      - 1   # NDRPDR sel
+      - 2   # NDRPDR sel
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 5   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
   data: "dpdk-performance-changes"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -1919,6 +2325,7 @@
   - "parent"
   - "throughput"
 
+# DPDK Comparison Across Testbeds 3n-hsw to 3n-skx ndr
 -
   type: "table"
   title: "DPDK Comparison Across Testbeds 3n-hsw to 3n-skx ndr"
@@ -1927,31 +2334,31 @@
   reference:
     title: "3-Node Hsw"
     data:
-      csit-dpdk-perf-verify-1807-3n-hsw:
-      - 11
-      - 12  # full
-      - 14
-      - 15
-      - 16
-      - 17
-      - 20
-      - 21
-      - 22
-      - 23
+      csit-dpdk-perf-verify-1810-3n-hsw:
+      - 1   # NDRPDR sel
+      - 2   # NDRPDR sel
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 5   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
   compare:
     title: "3-Node Skx"
     data:
-      csit-dpdk-perf-verify-1807-3n-skx:
-      - 1
-      - 2
-      - 3
-      - 6
-      - 7
-      - 8
-      - 9
-      - 10
-      - 11
-      - 12
+      csit-dpdk-perf-verify-1810-3n-skx:
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
+      - 11  # NDRPDR sel
+      - 12  # NDRPDR sel
+      - 13  # NDRPDR sel
   data: "dpdk-compare-testbeds"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'NIC_Intel-X710' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -1960,6 +2367,7 @@
   - "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"
@@ -1968,31 +2376,31 @@
   reference:
     title: "3-Node Hsw"
     data:
-      csit-dpdk-perf-verify-1807-3n-hsw:
-      - 11
-      - 12  # full
-      - 14
-      - 15
-      - 16
-      - 17
-      - 20
-      - 21
-      - 22
-      - 23
+      csit-dpdk-perf-verify-1810-3n-hsw:
+      - 1   # NDRPDR sel
+      - 2   # NDRPDR sel
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 5   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
   compare:
     title: "3-Node Skx"
     data:
-      csit-dpdk-perf-verify-1807-3n-skx:
-      - 1
-      - 2
-      - 3
-      - 6
-      - 7
-      - 8
-      - 9
-      - 10
-      - 11
-      - 12
+      csit-dpdk-perf-verify-1810-3n-skx:
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
+      - 11  # NDRPDR sel
+      - 12  # NDRPDR sel
+      - 13  # NDRPDR sel
   data: "dpdk-compare-testbeds"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'NIC_Intel-X710' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -2001,47 +2409,50 @@
   - "parent"
   - "throughput"
 
--
-  type: "table"
-  title: "DPDK Comparison Across Testbeds 3n-hsw to 3n-skx mrr"
-  algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-compare-testbeds-3n-hsw-3n-skx-mrr"
-  reference:
-    title: "3-Node Hsw"
-    data:
-      csit-dpdk-perf-verify-1807-3n-hsw:
-      - 11
-      - 12  # full
-      - 14
-      - 15
-      - 16
-      - 17
-      - 20
-      - 21
-      - 22
-      - 23
-  compare:
-    title: "3-Node Skx"
-    data:
-      csit-dpdk-perf-verify-1807-3n-skx:
-      - 1
-      - 2
-      - 3
-      - 6
-      - 7
-      - 8
-      - 9
-      - 10
-      - 11
-      - 12
-  data: "dpdk-compare-testbeds"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'NIC_Intel-X710' and MRR" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
-  parameters:
-  - "name"
-  - "parent"
-  - "throughput"
-
+# 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"
+
+# Detailed Test Results - DPDK Performance Results 3n-hsw
 -
   type: "table"
   title: "Detailed Test Results - DPDK Performance Results 3n-hsw"
@@ -2063,6 +2474,7 @@
   - "parent"
   - "msg"
 
+# Detailed Test Results - DPDK Performance Results 3n-skx
 -
   type: "table"
   title: "Detailed Test Results - DPDK Performance Results 3n-skx"
@@ -2084,6 +2496,7 @@
   - "parent"
   - "msg"
 
+# Detailed Test Results - DPDK Performance Results 2n-skx
 -
   type: "table"
   title: "Detailed Test Results - DPDK Performance Results 2n-skx"
@@ -2105,7 +2518,6 @@
   - "parent"
   - "msg"
 
-
 ################################################################################
 # HoneyComb
 -
@@ -2162,10 +2574,39 @@
   - "doc"
   - "status"
 
+################################################################################
+# DMM
+-
+  type: "table"
+  title: "Detailed Test Results - DMM Functional Results"
+  algorithm: "table_details"
+  output-file-ext: ".csv"
+  output-file: "{DIR[DTR,FUNC,DMM]}/dmm_functional_results"
+  columns:
+  -
+    title: "Name"
+    data: "data name"
+  -
+    title: "Documentation"
+    data: "data doc"
+  -
+    title: "Status"
+    data: "data status"
+  rows: "generated"
+  data:
+    "dmm-func-results"
+  filter: "all"
+  parameters:
+  - "name"
+  - "parent"
+  - "doc"
+  - "status"
+
 ################################################################################
 ###                                F I L E S                                 ###
 ################################################################################
 
+# VPP Performance Results 3n-hsw
 -
   type: "file"
   title: "VPP Performance Results 3n-hsw"
@@ -2183,6 +2624,7 @@
   - "parent"
   data-start-level: 3
 
+# VPP Performance Results 3n-skx
 -
   type: "file"
   title: "VPP Performance Results 3n-skx"
@@ -2200,6 +2642,7 @@
   - "parent"
   data-start-level: 3
 
+# VPP Performance Results 2n-skx
 -
   type: "file"
   title: "VPP Performance Results 2n-skx"
@@ -2217,6 +2660,7 @@
   - "parent"
   data-start-level: 3
 
+# VPP Performance Configuration 3n-hsw
 -
   type: "file"
   title: "VPP Performance Configuration 3n-hsw"
@@ -2234,6 +2678,7 @@
   - "parent"
   data-start-level: 3
 
+# VPP Performance Configuration 3n-skx
 -
   type: "file"
   title: "VPP Performance Configuration 3n-skx"
@@ -2251,6 +2696,7 @@
   - "parent"
   data-start-level: 3
 
+# VPP Performance Configuration 2n-skx
 -
   type: "file"
   title: "VPP Performance Configuration 2n-skx"
@@ -2268,6 +2714,7 @@
   - "parent"
   data-start-level: 3
 
+# VPP Performance Operational Data 3n-hsw
 -
   type: "file"
   title: "VPP Performance Operational Data 3n-hsw"
@@ -2285,6 +2732,7 @@
   - "parent"
   data-start-level: 3
 
+# VPP Performance Operational Data 3n-skx
 -
   type: "file"
   title: "VPP Performance Operational Data 3n-skx"
@@ -2302,6 +2750,7 @@
   - "parent"
   data-start-level: 3
 
+# VPP Performance Operational Data 2n-skx
 -
   type: "file"
   title: "VPP Performance Operational Data 2n-skx"
@@ -2319,6 +2768,7 @@
   - "parent"
   data-start-level: 3
 
+# VPP MRR Results 3n-hsw
 -
   type: "file"
   title: "VPP MRR Results 3n-hsw"
@@ -2336,6 +2786,7 @@
   - "parent"
   data-start-level: 3
 
+# VPP MRR Results 3n-skx
 -
   type: "file"
   title: "VPP MRR Results 3n-skx"
@@ -2353,6 +2804,7 @@
   - "parent"
   data-start-level: 3
 
+# VPP MRR Results 2n-skx
 -
   type: "file"
   title: "VPP MRR Results 2n-skx"
@@ -2370,6 +2822,7 @@
   - "parent"
   data-start-level: 3
 
+# VPP MRR Configuration 3n-hsw
 -
   type: "file"
   title: "VPP MRR Configuration 3n-hsw"
@@ -2387,6 +2840,7 @@
   - "parent"
   data-start-level: 3
 
+# VPP MRR Configuration 3n-skx
 -
   type: "file"
   title: "VPP MRR Configuration 3n-skx"
@@ -2404,6 +2858,7 @@
   - "parent"
   data-start-level: 3
 
+# VPP MRR Configuration 2n-skx
 -
   type: "file"
   title: "VPP MRR Configuration 2n-skx"
@@ -2421,6 +2876,7 @@
   - "parent"
   data-start-level: 3
 
+# VPP Functional Results - Ubuntu
 -
   type: "file"
   title: "VPP Functional Results - Ubuntu"
@@ -2436,8 +2892,9 @@
   - "doc"
   - "level"
   - "parent"
-  data-start-level: 4
+  data-start-level: 3
 
+# VPP Functional Results - CentOS
 -
   type: "file"
   title: "VPP Functional Results - CentOS"
@@ -2454,8 +2911,9 @@
   - "doc"
   - "level"
   - "parent"
-  data-start-level: 4
+  data-start-level: 3
 
+# VPP Functional Configuration - Ubuntu
 -
   type: "file"
   title: "VPP Functional Configuration - Ubuntu"
@@ -2471,8 +2929,9 @@
   - "doc"
   - "level"
   - "parent"
-  data-start-level: 4
+  data-start-level: 3
 
+# VPP Functional Configuration - CentOS
 -
   type: "file"
   title: "VPP Functional Configuration - CentOS"
@@ -2489,8 +2948,45 @@
   - "doc"
   - "level"
   - "parent"
-  data-start-level: 4
+  data-start-level: 3
+
+# VPP Device Results - Ubuntu
+-
+  type: "file"
+  title: "VPP Device Results - Ubuntu"
+  algorithm: "file_test_results"
+  output-file-ext: ".rst"
+  output-file: "{DIR[DTR,FUNC,VPP,DEVICE,UBUNTU]}/vpp_device_results_ubuntu"
+  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
+  dir-tables: "{DIR[DTR,FUNC,VPP,DEVICE,UBUNTU]}"
+  data: "vpp-device-results-ubuntu"
+  filter: "all"
+  parameters:
+  - "name"
+  - "doc"
+  - "level"
+  - "parent"
+  data-start-level: 2
+
+# VPP Device Configuration - Ubuntu
+-
+  type: "file"
+  title: "VPP Device Configuration - Ubuntu"
+  algorithm: "file_test_results"
+  output-file-ext: ".rst"
+  output-file: "{DIR[DTC,FUNC,VPP,DEVICE,UBUNTU]}/vpp_device_configuration_ubuntu"
+  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
+  dir-tables: "{DIR[DTC,FUNC,VPP,DEVICE,UBUNTU]}"
+  data: "vpp-device-results-ubuntu"
+  filter: "all"
+  parameters:
+  - "name"
+  - "doc"
+  - "level"
+  - "parent"
+  data-start-level: 2
 
+# Container Orchestrated Performance Results 3n-hsw
 -
   type: "file"
   title: "Container Orchestrated Performance Results 3n-hsw"
@@ -2508,6 +3004,7 @@
   - "parent"
   data-start-level: 3
 
+# DPDK Performance Results 3n-hsw
 -
   type: "file"
   title: "DPDK Performance Results 3n-hsw"
@@ -2525,6 +3022,7 @@
   - "parent"
   data-start-level: 3
 
+# DPDK Performance Results 3n-skx
 -
   type: "file"
   title: "DPDK Performance Results 3n-skx"
@@ -2542,6 +3040,7 @@
   - "parent"
   data-start-level: 3
 
+# DPDK Performance Results 2n-skx
 -
   type: "file"
   title: "DPDK Performance Results 2n-skx"
@@ -2559,6 +3058,7 @@
   - "parent"
   data-start-level: 3
 
+# Honeycomb Functional Results
 -
   type: "file"
   title: "Honeycomb Functional Results"
@@ -2577,6 +3077,7 @@
   - "parent"
   data-start-level: 3
 
+# NSH SFC Functional Results
 -
   type: "file"
   title: "NSH SFC Functional Results"
@@ -2595,6 +3096,25 @@
   - "parent"
   data-start-level: 3
 
+# DMM Functional Results
+-
+  type: "file"
+  title: "DMM Functional Results"
+  algorithm: "file_test_results"
+  output-file-ext: ".rst"
+  output-file: "{DIR[DTR,FUNC,DMM]}/dmm_functional_results"
+  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
+  dir-tables: "{DIR[DTR,FUNC,DMM]}"
+  data:
+    "dmm-func-results"
+  filter: "all"
+  parameters:
+  - "name"
+  - "doc"
+  - "level"
+  - "parent"
+  data-start-level: 3
+
 ################################################################################
 ###                                P L O T S                                 ###
 ################################################################################
@@ -2647,7 +3167,7 @@
 
 ################################################################################
 
-# Packet Throughput - VPP L2 3n-hsw-x520
+# Packet Throughput - VPP L2 3n-hsw-x520 base and scale
 -
   type: "plot"
   title: "VPP Throughput: l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
@@ -2659,6 +3179,7 @@
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
+           'ETH' and
            '1T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
@@ -2666,12 +3187,20 @@
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
@@ -2685,6 +3214,7 @@
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
+           'ETH' and
            '1T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
@@ -2692,12 +3222,20 @@
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
 -
@@ -2711,6 +3249,7 @@
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
+           'ETH' and
            '2T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
@@ -2718,12 +3257,20 @@
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
@@ -2737,6 +3284,7 @@
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
+           'ETH' and
            '2T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
@@ -2744,14 +3292,23 @@
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
+# Packet Throughput - VPP L2 3n-hsw-x520 features
 -
   type: "plot"
   title: "VPP Throughput: l2sw-3n-hsw-x520-64b-1t1c-features-ndr"
@@ -2761,22 +3318,27 @@
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
            'NDRPDR' and
            '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
+           not 'ACL' and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "L2XCBASE"    # l2xcbase
+  - "L2BDBASE"    # l2bdbase
+  - "L2XCFWD"     # dot1q-l2xcbase
+  - "L2BDMACLRN"  # dot1q-l2bdbase
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "l2sw-3n-hsw-x520-64b-1t1c-features-ndr"
     layout: "plot-throughput"
 
 -
@@ -2788,22 +3350,27 @@
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
            'NDRPDR' and
            '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
+           not 'ACL' and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "L2XCBASE"    # l2xcbase
+  - "L2BDBASE"    # l2bdbase
+  - "L2XCFWD"     # dot1q-l2xcbase
+  - "L2BDMACLRN"  # dot1q-l2bdbase
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "l2sw-3n-hsw-x520-64b-1t1c-features-pdr"
     layout: "plot-throughput"
 
 -
@@ -2815,22 +3382,27 @@
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
            'NDRPDR' and
            '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
+           not 'ACL' and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "L2XCBASE"    # l2xcbase
+  - "L2BDBASE"    # l2bdbase
+  - "L2XCFWD"     # dot1q-l2xcbase
+  - "L2BDMACLRN"  # dot1q-l2bdbase
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "l2sw-3n-hsw-x520-64b-2t2c-features-ndr"
     layout: "plot-throughput"
 
 -
@@ -2842,25 +3414,30 @@
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
            'NDRPDR' and
            '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
+           not 'ACL' and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "L2XCBASE"    # l2xcbase
+  - "L2BDBASE"    # l2bdbase
+  - "L2XCFWD"     # dot1q-l2xcbase
+  - "L2BDMACLRN"  # dot1q-l2bdbase
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "l2sw-3n-hsw-x520-64b-2t2c-features-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - VPP L2 3n-hsw-x710
+# Packet Throughput - VPP L2 3n-hsw-x710 base and scale
 -
   type: "plot"
   title: "VPP Throughput: l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
@@ -2872,6 +3449,7 @@
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
+           'ETH' and
            '1T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
@@ -2879,12 +3457,20 @@
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
@@ -2898,6 +3484,7 @@
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
+           'ETH' and
            '1T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
@@ -2905,12 +3492,20 @@
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
 -
@@ -2924,6 +3519,7 @@
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
+           'ETH' and
            '2T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
@@ -2931,12 +3527,20 @@
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
@@ -2950,6 +3554,7 @@
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
+           'ETH' and
            '2T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
@@ -2957,14 +3562,23 @@
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
+# Packet Throughput - VPP L2 3n-hsw-x710 features
 -
   type: "plot"
   title: "VPP Throughput: l2sw-3n-hsw-x710-64b-1t1c-features-ndr"
@@ -2974,22 +3588,27 @@
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
            'NDRPDR' and
            '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
+           not 'ACL' and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "L2XCBASE"    # l2xcbase
+  - "L2BDBASE"    # l2bdbase
+  - "L2XCFWD"     # dot1q-l2xcbase
+  - "L2BDMACLRN"  # dot1q-l2bdbase
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "l2sw-3n-hsw-x710-64b-1t1c-features-ndr"
     layout: "plot-throughput"
 
 -
@@ -3001,22 +3620,27 @@
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
            'NDRPDR' and
            '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
+           not 'ACL' and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "L2XCBASE"    # l2xcbase
+  - "L2BDBASE"    # l2bdbase
+  - "L2XCFWD"     # dot1q-l2xcbase
+  - "L2BDMACLRN"  # dot1q-l2bdbase
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "l2sw-3n-hsw-x710-64b-1t1c-features-pdr"
     layout: "plot-throughput"
 
 -
@@ -3028,22 +3652,27 @@
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
            'NDRPDR' and
            '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
+           not 'ACL' and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "L2XCBASE"    # l2xcbase
+  - "L2BDBASE"    # l2bdbase
+  - "L2XCFWD"     # dot1q-l2xcbase
+  - "L2BDMACLRN"  # dot1q-l2bdbase
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "l2sw-3n-hsw-x710-64b-2t2c-features-ndr"
     layout: "plot-throughput"
 
 -
@@ -3055,25 +3684,30 @@
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
            'NDRPDR' and
            '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
+           not 'ACL' and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "L2XCBASE"    # l2xcbase
+  - "L2BDBASE"    # l2bdbase
+  - "L2XCFWD"     # dot1q-l2xcbase
+  - "L2BDMACLRN"  # dot1q-l2bdbase
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "l2sw-3n-hsw-x710-64b-2t2c-features-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - VPP L2 3n-hsw-xl710
+# Packet Throughput - VPP L2 3n-hsw-xl710 base and scale
 -
   type: "plot"
   title: "VPP Throughput: l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
@@ -3085,6 +3719,7 @@
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
+           'ETH' and
            '1T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
@@ -3092,12 +3727,20 @@
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
@@ -3111,6 +3754,7 @@
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
+           'ETH' and
            '1T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
@@ -3118,12 +3762,20 @@
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
 -
@@ -3137,6 +3789,7 @@
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
+           'ETH' and
            '2T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
@@ -3144,12 +3797,20 @@
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
@@ -3163,6 +3824,7 @@
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
+           'ETH' and
            '2T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
@@ -3170,15 +3832,23 @@
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - VPP L2 3n-skx-x710
+# Packet Throughput - VPP L2 3n-skx-x710 base and scale
 -
   type: "plot"
   title: "VPP Throughput: l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
@@ -3190,6 +3860,7 @@
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
+           'ETH' and
            '2T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
@@ -3197,12 +3868,20 @@
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
@@ -3216,6 +3895,7 @@
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
+           'ETH' and
            '2T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
@@ -3223,12 +3903,20 @@
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "l2sw-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
 -
@@ -3242,6 +3930,7 @@
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
+           'ETH' and
            '4T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
@@ -3249,12 +3938,20 @@
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
@@ -3268,6 +3965,7 @@
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
+           'ETH' and
            '4T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
@@ -3275,14 +3973,23 @@
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "l2sw-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
+# Packet Throughput - VPP L2 3n-skx-x710 features
 -
   type: "plot"
   title: "VPP Throughput: l2sw-3n-skx-x710-64b-2t1c-features-ndr"
@@ -3292,22 +3999,27 @@
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
            'NDRPDR' and
            '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
+           not 'ACL' and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "L2XCBASE"    # l2xcbase
+  - "L2BDBASE"    # l2bdbase
+  - "L2XCFWD"     # dot1q-l2xcbase
+  - "L2BDMACLRN"  # dot1q-l2bdbase
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "l2sw-3n-skx-x710-64b-2t1c-features-ndr"
     layout: "plot-throughput"
 
 -
@@ -3319,22 +4031,27 @@
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
            'NDRPDR' and
            '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
+           not 'ACL' and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "L2XCBASE"    # l2xcbase
+  - "L2BDBASE"    # l2bdbase
+  - "L2XCFWD"     # dot1q-l2xcbase
+  - "L2BDMACLRN"  # dot1q-l2bdbase
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "l2sw-3n-skx-x710-64b-2t1c-features-pdr"
     layout: "plot-throughput"
 
 -
@@ -3346,22 +4063,27 @@
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
            'NDRPDR' and
            '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
+           not 'ACL' and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "L2XCBASE"    # l2xcbase
+  - "L2BDBASE"    # l2bdbase
+  - "L2XCFWD"     # dot1q-l2xcbase
+  - "L2BDMACLRN"  # dot1q-l2bdbase
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "l2sw-3n-skx-x710-64b-4t2c-features-ndr"
     layout: "plot-throughput"
 
 -
@@ -3373,25 +4095,30 @@
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
            'NDRPDR' and
            '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
+           not 'ACL' and
            not 'VHOST' and
            not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "L2XCBASE"    # l2xcbase
+  - "L2BDBASE"    # l2bdbase
+  - "L2XCFWD"     # dot1q-l2xcbase
+  - "L2BDMACLRN"  # dot1q-l2bdbase
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "l2sw-3n-skx-x710-64b-4t2c-features-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - VPP L2 3n-skx-xxv710
+# Packet Throughput - VPP L2 3n-skx-xxv710 base and scale
 -
   type: "plot"
   title: "VPP Throughput: l2sw-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
@@ -3403,6 +4130,7 @@
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
+           'ETH' and
            '2T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
@@ -3410,12 +4138,20 @@
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "l2sw-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
@@ -3429,6 +4165,7 @@
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
+           'ETH' and
            '2T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
@@ -3436,12 +4173,20 @@
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "l2sw-3n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
 -
@@ -3455,6 +4200,7 @@
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
+           'ETH' and
            '4T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
@@ -3462,12 +4208,20 @@
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "l2sw-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
@@ -3481,6 +4235,7 @@
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
+           'ETH' and
            '4T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
@@ -3488,15 +4243,23 @@
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "l2sw-3n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - VPP L2 2n-skx-x710
+# Packet Throughput - VPP L2 2n-skx-x710 base and scale
 -
   type: "plot"
   title: "VPP Throughput: l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
@@ -3508,6 +4271,7 @@
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
+           'ETH' and
            '2T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
@@ -3515,12 +4279,20 @@
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
@@ -3534,6 +4306,7 @@
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
+           'ETH' and
            '2T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
@@ -3541,12 +4314,20 @@
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "l2sw-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
 -
@@ -3560,6 +4341,7 @@
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
+           'ETH' and
            '4T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
@@ -3567,12 +4349,20 @@
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
@@ -3586,6 +4376,7 @@
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
+           'ETH' and
            '4T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
@@ -3593,15 +4384,23 @@
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "l2sw-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - VPP L2 2n-skx-xxv710
+# Packet Throughput - VPP L2 2n-skx-xxv710 base and scale
 -
   type: "plot"
   title: "VPP Throughput: l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
@@ -3613,6 +4412,7 @@
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
+           'ETH' and
            '2T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
@@ -3620,12 +4420,20 @@
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
@@ -3639,6 +4447,7 @@
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
+           'ETH' and
            '2T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
@@ -3646,12 +4455,20 @@
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
 -
@@ -3665,6 +4482,7 @@
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
+           'ETH' and
            '4T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
@@ -3672,12 +4490,20 @@
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
@@ -3691,6 +4517,7 @@
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
+           'ETH' and
            '4T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
@@ -3698,12 +4525,20 @@
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
 ################################################################################
@@ -3727,12 +4562,20 @@
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "memif-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
@@ -3753,12 +4596,20 @@
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "memif-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
 -
@@ -3779,12 +4630,20 @@
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "memif-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
@@ -3805,12 +4664,20 @@
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "memif-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
 # Packet Throughput - VPP Container Memif 3n-hsw-x710
@@ -3832,12 +4699,20 @@
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "memif-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
@@ -3858,12 +4733,20 @@
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "memif-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
 -
@@ -3884,12 +4767,20 @@
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "memif-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
@@ -3910,12 +4801,20 @@
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "memif-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
 # Packet Throughput - VPP Container Memif 3n-hsw-xl710
@@ -3937,12 +4836,20 @@
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "memif-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
@@ -3963,12 +4870,20 @@
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "memif-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
 -
@@ -3989,12 +4904,20 @@
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "memif-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
@@ -4015,12 +4938,20 @@
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "memif-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
 # Packet Throughput - VPP Container Memif 3n-skx-x710
@@ -4042,12 +4973,20 @@
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "memif-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
@@ -4064,16 +5003,24 @@
            '2T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-            'MEMIF'"
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "memif-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
 -
@@ -4094,12 +5041,20 @@
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "memif-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
@@ -4120,665 +5075,843 @@
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "memif-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
-################################################################################
-
-# Packet Throughput - VPP Container Orchestrated Memif 3n-hsw-x520
+# Packet Throughput - VPP Container Memif 2n-skx-x710
 -
   type: "plot"
-  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
+  title: "VPP Throughput: memif-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
-  data: "plot-ligato-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '1T1C' and
+           '2T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "memif-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
+  title: "VPP Throughput: memif-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
-  data: "plot-ligato-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '1T1C' and
+           '2T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "memif-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
+  title: "VPP Throughput: memif-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
-  data: "plot-ligato-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '2T2C' and
+           '4T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "memif-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
+  title: "VPP Throughput: memif-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
-  data: "plot-ligato-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '2T2C' and
+           '4T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "memif-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - VPP Container Orchestrated Memif 3n-hsw-x710
+# Packet Throughput - VPP Container Memif 2n-skx-xxv710
 -
   type: "plot"
-  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
+  title: "VPP Throughput: memif-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
-  data: "plot-ligato-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '1T1C' and
+           '2T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "memif-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
+  title: "VPP Throughput: memif-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
-  data: "plot-ligato-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '1T1C' and
+           '2T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "memif-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+  title: "VPP Throughput: memif-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
-  data: "plot-ligato-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '2T2C' and
+           '4T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "memif-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
+  title: "VPP Throughput: memif-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
-  data: "plot-ligato-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '2T2C' and
+           '4T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "memif-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
 ################################################################################
 
-# Packet Throughput - VPP IPv4 3n-hsw-x520
+# Packet Throughput - VPP Container Orchestrated Memif 3n-hsw-x520 l2xc
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
+  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-ndr"
+  data: "plot-ligato-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '1T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           'L2XCFWD' and
+           not 'VHOST' and
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "1VNF"
+  - "2VNF"
+  - "4VNF"
+  - "2VNF"
+  - "4VNF"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
+  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-pdr"
+  data: "plot-ligato-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '1T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           'L2XCFWD' and
+           not 'VHOST' and
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "1VNF"
+  - "2VNF"
+  - "4VNF"
+  - "2VNF"
+  - "4VNF"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
+  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-ndr"
+  data: "plot-ligato-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           'L2XCFWD' and
+           not 'VHOST' and
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "1VNF"
+  - "2VNF"
+  - "4VNF"
+  - "2VNF"
+  - "4VNF"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
+  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-pdr"
+  data: "plot-ligato-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           'L2XCFWD' and
+           not 'VHOST' and
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "1VNF"
+  - "2VNF"
+  - "4VNF"
+  - "2VNF"
+  - "4VNF"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-pdr"
     layout: "plot-throughput"
 
+# Packet Throughput - VPP Container Orchestrated Memif 3n-hsw-x520 l2bd
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-features-ndr"
+  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-ndr"
+  data: "plot-ligato-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
            '1T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+           not 'VHOST' and
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "1VNF"
+  - "2VNF"
+  - "4VNF"
+  - "2VNF"
+  - "4VNF"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-features-pdr"
+  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-pdr"
+  data: "plot-ligato-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
            '1T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+           not 'VHOST' and
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "1VNF"
+  - "2VNF"
+  - "4VNF"
+  - "2VNF"
+  - "4VNF"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-features-ndr"
+  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-ndr"
+  data: "plot-ligato-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+           not 'VHOST' and
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "1VNF"
+  - "2VNF"
+  - "4VNF"
+  - "2VNF"
+  - "4VNF"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-features-pdr"
+  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-pdr"
+  data: "plot-ligato-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+           not 'VHOST' and
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "1VNF"
+  - "2VNF"
+  - "4VNF"
+  - "2VNF"
+  - "4VNF"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - VPP IPv4 3n-hsw-x710
+# Packet Throughput - VPP Container Orchestrated Memif 3n-hsw-x710 l2xc
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
+  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-ndr"
+  data: "plot-ligato-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '1T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           'L2XCFWD' and
+           not 'VHOST' and
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "1VNF"
+  - "2VNF"
+  - "4VNF"
+  - "2VNF"
+  - "4VNF"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
+  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-pdr"
+  data: "plot-ligato-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '1T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           'L2XCFWD' and
+           not 'VHOST' and
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "1VNF"
+  - "2VNF"
+  - "4VNF"
+  - "2VNF"
+  - "4VNF"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-ndr"
+  data: "plot-ligato-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           'L2XCFWD' and
+           not 'VHOST' and
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "1VNF"
+  - "2VNF"
+  - "4VNF"
+  - "2VNF"
+  - "4VNF"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
+  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-pdr"
+  data: "plot-ligato-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           'L2XCFWD' and
+           not 'VHOST' and
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "1VNF"
+  - "2VNF"
+  - "4VNF"
+  - "2VNF"
+  - "4VNF"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-pdr"
     layout: "plot-throughput"
 
+# Packet Throughput - VPP Container Orchestrated Memif 3n-hsw-x710 l2bd
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-features-ndr"
+  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-ndr"
+  data: "plot-ligato-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
            '1T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+           not 'VHOST' and
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "1VNF"
+  - "2VNF"
+  - "4VNF"
+  - "2VNF"
+  - "4VNF"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-features-pdr"
+  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-pdr"
+  data: "plot-ligato-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
            '1T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+           not 'VHOST' and
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "1VNF"
+  - "2VNF"
+  - "4VNF"
+  - "2VNF"
+  - "4VNF"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-features-ndr"
+  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-ndr"
+  data: "plot-ligato-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+           not 'VHOST' and
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "1VNF"
+  - "2VNF"
+  - "4VNF"
+  - "2VNF"
+  - "4VNF"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-features-pdr"
+  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-pdr"
+  data: "plot-ligato-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+           not 'VHOST' and
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "1VNF"
+  - "2VNF"
+  - "4VNF"
+  - "2VNF"
+  - "4VNF"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - VPP IPv4 3n-hsw-xl710
+################################################################################
+
+# Packet Throughput - VPP IPv4 3n-hsw-x520 base and scale
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
+  title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           ('BASE' or 'SCALE') and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            '1T1C' and
            'IP4FWD' and
@@ -4787,24 +5920,30 @@
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
+  title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           ('BASE' or 'SCALE') and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            '1T1C' and
            'IP4FWD' and
@@ -4813,24 +5952,30 @@
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
+  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           ('BASE' or 'SCALE') and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            '2T2C' and
            'IP4FWD' and
@@ -4839,24 +5984,30 @@
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
+  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           ('BASE' or 'SCALE') and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            '2T2C' and
            'IP4FWD' and
@@ -4865,8645 +6016,19918 @@
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - VPP IPv4 3n-skx-x710
+# Packet Throughput - VPP IPv4 3n-hsw-x520 features
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+  title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           ('BASE' or 'SCALE') and
+           ('IP4BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            ('NAT44' and 'BASE') or
+            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
            'NDRPDR' and
-           '2T1C' and
+           '1T1C' and
            'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "NAT44"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACL"
+  - "OACL"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip4-3n-hsw-x520-64b-1t1c-features-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
+  title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           ('BASE' or 'SCALE') and
+           ('IP4BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            ('NAT44' and 'BASE') or
+            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
            'NDRPDR' and
-           '2T1C' and
+           '1T1C' and
            'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "NAT44"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACL"
+  - "OACL"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip4-3n-hsw-x520-64b-1t1c-features-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
+  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           ('BASE' or 'SCALE') and
+           ('IP4BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            ('NAT44' and 'BASE') or
+            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
            'NDRPDR' and
-           '4T2C' and
+           '2T2C' and
            'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "NAT44"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACL"
+  - "OACL"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip4-3n-hsw-x520-64b-2t2c-features-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
+  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           ('BASE' or 'SCALE') and
+           ('IP4BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            ('NAT44' and 'BASE') or
+            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
            'NDRPDR' and
-           '4T2C' and
+           '2T2C' and
            'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "NAT44"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACL"
+  - "OACL"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip4-3n-hsw-x520-64b-2t2c-features-pdr"
     layout: "plot-throughput"
 
+# Packet Throughput - VPP IPv4 3n-hsw-x520 features nat44
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-ndr"
+  title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-features-nat44-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-nat44-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
            'NDRPDR' and
-           '2T1C' and
+           '1T1C' 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: ""  # No title
+    title: "ip4-3n-hsw-x520-64b-1t1c-features-nat44-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-pdr"
+  title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-features-nat44-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-nat44-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
            'NDRPDR' and
-           '2T1C' and
+           '1T1C' 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: ""  # No title
+    title: "ip4-3n-hsw-x520-64b-1t1c-features-nat44-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-ndr"
+  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-features-nat44-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-nat44-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
            'NDRPDR' and
-           '4T2C' 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: ""  # No title
+    title: "ip4-3n-hsw-x520-64b-2t2c-features-nat44-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-pdr"
+  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-features-nat44-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-nat44-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
            'NDRPDR' and
-           '4T2C' 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: ""  # No title
+    title: "ip4-3n-hsw-x520-64b-2t2c-features-nat44-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - VPP IPv4 2n-skx-x710
+# Packet Throughput - VPP IPv4 3n-hsw-x520 features iacl
 -
   type: "plot"
-  title: "VPP Throughput: ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
+  title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-features-iacl-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-iacl-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '2T1C' 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: ""  # No title
+    title: "ip4-3n-hsw-x520-64b-1t1c-features-iacl-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
+  title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-features-iacl-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-iacl-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '2T1C' 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: ""  # No title
+    title: "ip4-3n-hsw-x520-64b-1t1c-features-iacl-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
+  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-features-iacl-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-iacl-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '4T2C' 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"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip4-3n-hsw-x520-64b-2t2c-features-iacl-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
+  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-features-iacl-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-iacl-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '4T2C' 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"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip4-3n-hsw-x520-64b-2t2c-features-iacl-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - VPP IPv4 2n-skx-xxv710
+# Packet Throughput - VPP IPv4 3n-hsw-x520 features oacl
 -
   type: "plot"
-  title: "VPP Throughput: ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
+  title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-features-oacl-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-oacl-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '2T1C' 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: ""  # No title
+    title: "ip4-3n-hsw-x520-64b-1t1c-features-oacl-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
+  title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-features-oacl-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-oacl-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '2T1C' 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: ""  # No title
+    title: "ip4-3n-hsw-x520-64b-1t1c-features-oacl-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
+  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-features-oacl-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-oacl-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '4T2C' 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: ""  # No title
+    title: "ip4-3n-hsw-x520-64b-2t2c-features-oacl-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
+  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-features-oacl-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-oacl-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '4T2C' 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: ""  # No title
+    title: "ip4-3n-hsw-x520-64b-2t2c-features-oacl-pdr"
     layout: "plot-throughput"
 
-################################################################################
-
-# Packet Throughput - VPP IPv4 tunnels 3n-hsw-x520
+# Packet Throughput - VPP IPv4 3n-hsw-x710 base and scale
 -
   type: "plot"
-  title: "VPP Throughput: ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
+  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           'ENCAP' and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            '1T1C' and
-           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
+  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           'ENCAP' and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            '1T1C' and
-           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
+  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           'ENCAP' and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            '2T2C' and
-           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
+  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           'ENCAP' and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            '2T2C' and
-           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip4-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - VPP IPv4 tunnels 3n-hsw-x710
+# Packet Throughput - VPP IPv4 3n-hsw-x710 features
 -
   type: "plot"
-  title: "VPP Throughput: ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
+  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           'ENCAP' and
+           ('IP4BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            ('NAT44' and 'BASE') or
+            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
            'NDRPDR' and
            '1T1C' and
-           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "NAT44"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACL"
+  - "OACL"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip4-3n-hsw-x710-64b-1t1c-features-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
+  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           'ENCAP' and
+           ('IP4BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            ('NAT44' and 'BASE') or
+            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
            'NDRPDR' and
            '1T1C' and
-           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "NAT44"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACL"
+  - "OACL"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip4-3n-hsw-x710-64b-1t1c-features-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           'ENCAP' and
+           ('IP4BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            ('NAT44' and 'BASE') or
+            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
            'NDRPDR' and
            '2T2C' and
-           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "NAT44"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACL"
+  - "OACL"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip4-3n-hsw-x710-64b-2t2c-features-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
+  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           'ENCAP' and
+           ('IP4BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            ('NAT44' and 'BASE') or
+            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
            'NDRPDR' and
            '2T2C' and
-           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "NAT44"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACL"
+  - "OACL"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip4-3n-hsw-x710-64b-2t2c-features-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - VPP IPv4 tunnels 3n-skx-x710
+# Packet Throughput - VPP IPv4 3n-hsw-x710 features nat44
 -
   type: "plot"
-  title: "VPP Throughput: ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-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]}/ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-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
-           'ENCAP' and
            'NDRPDR' and
            '2T1C' and
-           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           '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: ""  # No title
+    title: "ip4-3n-skx-x710-64b-2t1c-features-nat44-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-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]}/ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-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
-           'ENCAP' and
            'NDRPDR' and
            '2T1C' and
-           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           '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: ""  # No title
+    title: "ip4-3n-skx-x710-64b-2t1c-features-nat44-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-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]}/ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-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
-           'ENCAP' and
            'NDRPDR' and
            '4T2C' and
-           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           '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: ""  # No title
+    title: "ip4-3n-skx-x710-64b-4t2c-features-nat44-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-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]}/ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-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
-           'ENCAP' and
            'NDRPDR' and
            '4T2C' and
-           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           '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: ""  # No title
+    title: "ip4-3n-skx-x710-64b-4t2c-features-nat44-pdr"
     layout: "plot-throughput"
 
-################################################################################
-
-# Packet Throughput - VPP IPv6 3n-hsw-x520
+# Packet Throughput - VPP IPv4 3n-hsw-x710 features iacl
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-x520-78b-1t1c-base_and_scale-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]}/ip6-3n-hsw-x520-78b-1t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           ('BASE' or 'SCALE') and
+  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
-           '1T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
+           '2T1C' 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: ""  # No title
+    title: "ip4-3n-skx-x710-64b-2t1c-features-iacl-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-x520-78b-1t1c-base_and_scale-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]}/ip6-3n-hsw-x520-78b-1t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           ('BASE' or 'SCALE') and
+  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
-           '1T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
+           '2T1C' 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: ""  # No title
+    title: "ip4-3n-skx-x710-64b-2t1c-features-iacl-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-x520-78b-2t2c-base_and_scale-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]}/ip6-3n-hsw-x520-78b-2t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           ('BASE' or 'SCALE') and
+  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
-           '2T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
+           '4T2C' 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: ""  # No title
+    title: "ip4-3n-skx-x710-64b-4t2c-features-iacl-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-x520-78b-2t2c-base_and_scale-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]}/ip6-3n-hsw-x520-78b-2t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           ('BASE' or 'SCALE') and
+  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
-           '2T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
+           '4T2C' 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: ""  # No title
+    title: "ip4-3n-skx-x710-64b-4t2c-features-iacl-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - VPP IPv6 3n-hsw-x710
+# Packet Throughput - VPP IPv4 3n-hsw-x710 features oacl
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-x710-78b-1t1c-base_and_scale-ndr"
+  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]}/ip6-3n-hsw-x710-78b-1t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  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
-           '78B' and
-           ('BASE' or 'SCALE') and
+           '64B' and
            'NDRPDR' and
-           '1T1C' and
-           'IP6FWD' and
-           not 'SRv6' 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: ""  # No title
+    title: "ip4-3n-skx-x710-64b-2t1c-features-oacl-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-x710-78b-1t1c-base_and_scale-pdr"
+  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]}/ip6-3n-hsw-x710-78b-1t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  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
-           '78B' and
-           ('BASE' or 'SCALE') and
+           '64B' and
            'NDRPDR' and
-           '1T1C' and
-           'IP6FWD' and
-           not 'SRv6' 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: ""  # No title
+    title: "ip4-3n-skx-x710-64b-2t1c-features-oacl-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-x710-78b-2t2c-base_and_scale-ndr"
+  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]}/ip6-3n-hsw-x710-78b-2t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  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
-           '78B' and
-           ('BASE' or 'SCALE') and
+           '64B' and
            'NDRPDR' and
-           '2T2C' and
-           'IP6FWD' and
-           not 'SRv6' 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: ""  # No title
+    title: "ip4-3n-skx-x710-64b-4t2c-features-oacl-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-x710-78b-2t2c-base_and_scale-pdr"
+  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]}/ip6-3n-hsw-x710-78b-2t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  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
-           '78B' and
-           ('BASE' or 'SCALE') and
+           '64B' and
            'NDRPDR' and
-           '2T2C' and
-           'IP6FWD' and
-           not 'SRv6' 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: ""  # No title
+    title: "ip4-3n-skx-x710-64b-4t2c-features-oacl-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - VPP IPv6 3n-hsw-xl710
+# Packet Throughput - VPP IPv4 3n-hsw-xl710 base and scale
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-xl710-78b-1t1c-base_and_scale-ndr"
+  title: "VPP Throughput: ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-1t1c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-XL710' and
-           '78B' and
-           ('BASE' or 'SCALE') and
+           '64B' and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            '1T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
+           'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-xl710-78b-1t1c-base_and_scale-pdr"
+  title: "VPP Throughput: ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-1t1c-base_and_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-XL710' and
-           '78B' and
-           ('BASE' or 'SCALE') and
+           '64B' and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            '1T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
+           'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-xl710-78b-2t2c-base_and_scale-ndr"
+  title: "VPP Throughput: ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-2t2c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-XL710' and
-           '78B' and
-           ('BASE' or 'SCALE') and
+           '64B' and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            '2T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
+           'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-xl710-78b-2t2c-base_and_scale-pdr"
+  title: "VPP Throughput: ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-2t2c-base_and_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-XL710' and
-           '78B' and
-           ('BASE' or 'SCALE') and
+           '64B' and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            '2T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
+           'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - VPP IPv6 3n-skx-x710
+# Packet Throughput - VPP IPv4 3n-skx-x710 base and scale
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-skx-x710-78b-2t1c-base_and_scale-ndr"
+  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-2t1c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('BASE' or 'SCALE') and
+           '64B' and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            '2T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
+           'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-skx-x710-78b-2t1c-base_and_scale-pdr"
+  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-2t1c-base_and_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('BASE' or 'SCALE') and
+           '64B' and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            '2T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
+           'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip4-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-skx-x710-78b-4t2c-base_and_scale-ndr"
+  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-4t2c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('BASE' or 'SCALE') and
+           '64B' and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            '4T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
+           'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-skx-x710-78b-4t2c-base_and_scale-pdr"
+  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-4t2c-base_and_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('BASE' or 'SCALE') and
+           '64B' and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            '4T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
+           'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip4-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - VPP IPv6 2n-skx-x710
+# Packet Throughput - VPP IPv4 3n-skx-x710 features
 -
   type: "plot"
-  title: "VPP Throughput: ip6-2n-skx-x710-78b-2t1c-base_and_scale-ndr"
+  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-ndr"
+  data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('BASE' or 'SCALE') and
+           '64B' and
+           ('IP4BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            ('NAT44' and 'BASE') or
+            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
            'NDRPDR' and
            '2T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
+           'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "NAT44"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACL"
+  - "OACL"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip4-3n-skx-x710-64b-2t1c-features-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-2n-skx-x710-78b-2t1c-base_and_scale-pdr"
+  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-pdr"
+  data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('BASE' or 'SCALE') and
+           '64B' and
+           ('IP4BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            ('NAT44' and 'BASE') or
+            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
            'NDRPDR' and
            '2T1C' and
-           'IP6FWD' and
+           'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "NAT44"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACL"
+  - "OACL"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip4-3n-skx-x710-64b-2t1c-features-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-2n-skx-x710-78b-4t2c-base_and_scale-ndr"
+  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-ndr"
+  data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('BASE' or 'SCALE') and
+           '64B' and
+           ('IP4BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            ('NAT44' and 'BASE') or
+            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
            'NDRPDR' and
            '4T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
+           'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "NAT44"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACL"
+  - "OACL"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip4-3n-skx-x710-64b-4t2c-features-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-2n-skx-x710-78b-4t2c-base_and_scale-pdr"
+  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-pdr"
+  data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('BASE' or 'SCALE') and
+           '64B' and
+           ('IP4BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            ('NAT44' and 'BASE') or
+            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
            'NDRPDR' and
            '4T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
+           'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "NAT44"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACL"
+  - "OACL"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip4-3n-skx-x710-64b-4t2c-features-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - VPP IPv6 2n-skx-xxv710
+# Packet Throughput - VPP IPv4 3n-skx-x710 features nat44
 -
   type: "plot"
-  title: "VPP Throughput: ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr"
+  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-features-nat44-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '78B' and
-           ('BASE' or 'SCALE') and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-nat44-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
            'NDRPDR' and
-           '2T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
+           '1T1C' 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: ""  # No title
+    title: "ip4-3n-hsw-x710-64b-1t1c-features-nat44-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-pdr"
+  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-features-nat44-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '78B' and
-           ('BASE' or 'SCALE') and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-nat44-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
            'NDRPDR' and
-           '2T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
+           '1T1C' 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: ""  # No title
+    title: "ip4-3n-hsw-x710-64b-1t1c-features-nat44-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr"
+  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-features-nat44-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '78B' and
-           ('BASE' or 'SCALE') and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-nat44-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
            'NDRPDR' and
-           '4T2C' and
-           'IP6FWD' and
-           not 'SRv6' 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: ""  # No title
+    title: "ip4-3n-hsw-x710-64b-2t2c-features-nat44-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-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]}/ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '78B' and
-           ('BASE' or 'SCALE') and
+  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
-           '4T2C' and
-           'IP6FWD' and
-           not 'SRv6' 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: ""  # No title
+    title: "ip4-3n-hsw-x710-64b-2t2c-features-nat44-pdr"
     layout: "plot-throughput"
 
-################################################################################
-
-# Packet Throughput - VPP IPv6 tunnels 3n-hsw-x520
+# Packet Throughput - VPP IPv4 3n-skx-x710 features iacl
 -
   type: "plot"
-  title: "VPP Throughput: ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-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]}/ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-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-X520-DA2' and
-           '78B' and
-           'ENCAP' and
+  filter: "'NIC_Intel-X710' and
+           '64B' and
            'NDRPDR' and
            '1T1C' and
-           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') 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: ""  # No title
+    title: "ip4-3n-hsw-x710-64b-1t1c-features-iacl-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-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]}/ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-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-X520-DA2' and
-           '78B' and
-           'ENCAP' and
+  filter: "'NIC_Intel-X710' and
+           '64B' and
            'NDRPDR' and
            '1T1C' and
-           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') 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: ""  # No title
+    title: "ip4-3n-hsw-x710-64b-1t1c-features-iacl-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6tun-3n-hsw-x520-78b-2t2c-base_and_scale-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]}/ip6tun-3n-hsw-x520-78b-2t2c-base_and_scale-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-X520-DA2' and
-           '78B' and
-           'ENCAP' and
+  filter: "'NIC_Intel-X710' and
+           '64B' and
            'NDRPDR' and
            '2T2C' and
-           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') 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: ""  # No title
+    title: "ip4-3n-hsw-x710-64b-2t2c-features-iacl-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6tun-3n-hsw-x520-78b-2t2c-base_and_scale-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]}/ip6tun-3n-hsw-x520-78b-2t2c-base_and_scale-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-X520-DA2' and
-           '78B' and
-           'ENCAP' and
+  filter: "'NIC_Intel-X710' and
+           '64B' and
            'NDRPDR' and
            '2T2C' and
-           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') 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: ""  # No title
+    title: "ip4-3n-hsw-x710-64b-2t2c-features-iacl-pdr"
     layout: "plot-throughput"
 
-################################################################################
-
-# Packet Throughput - VPP IPSec 3n-hsw-xl710
+# Packet Throughput - VPP IPv4 3n-skx-x710 features oacl
 -
   type: "plot"
-  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
+  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]}/ipsec-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-oacl-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           'IP4FWD' and
            'NDRPDR' and
            '1T1C' and
-           'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') 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: ""  # No title
+    title: "ip4-3n-hsw-x710-64b-1t1c-features-oacl-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
+  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]}/ipsec-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-oacl-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           'IP4FWD' and
            'NDRPDR' and
            '1T1C' and
-           'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') 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: ""  # No title
+    title: "ip4-3n-hsw-x710-64b-1t1c-features-oacl-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
+  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]}/ipsec-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-oacl-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           'IP4FWD' and
            'NDRPDR' and
            '2T2C' and
-           'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') 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: ""  # No title
+    title: "ip4-3n-hsw-x710-64b-2t2c-features-oacl-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
+  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]}/ipsec-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-oacl-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           'IP4FWD' and
            'NDRPDR' and
            '2T2C' and
-           'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') 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: ""  # No title
+    title: "ip4-3n-hsw-x710-64b-2t2c-features-oacl-pdr"
     layout: "plot-throughput"
 
-################################################################################
-
-# Packet Throughput - VPP SRv6 3n-hsw-x520
+# Packet Throughput - VPP IPv4 2n-skx-x710 base and scale
 -
   type: "plot"
-  title: "VPP Throughput: srv6-3n-hsw-x520-78b-1t1c-features-ndr"
+  title: "VPP Throughput: ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-1t1c-features-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           'FEATURE' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
-           '1T1C' and
-           'IP6FWD' and
-           'SRv6'"
+           '2T1C' and
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: srv6-3n-hsw-x520-78b-1t1c-features-pdr"
+  title: "VPP Throughput: ip4-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-1t1c-features-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           'FEATURE' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
-           '1T1C' and
-           'IP6FWD' and
-           'SRv6'"
+           '2T1C' and
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip4-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: srv6-3n-hsw-x520-78b-2t2c-features-ndr"
+  title: "VPP Throughput: ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-2t2c-features-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           'FEATURE' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
-           '2T2C' and
-           'IP6FWD' and
-           'SRv6'"
+           '4T2C' and
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: srv6-3n-hsw-x520-78b-2t2c-features-pdr"
+  title: "VPP Throughput: ip4-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-2t2c-features-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           'FEATURE' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
-           '2T2C' and
-           'IP6FWD' and
-           'SRv6'"
+           '4T2C' and
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip4-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
-################################################################################
-
-# Packet Throughput - VPP vhost ip4 3n-hsw-x520
+# Packet Throughput - VPP IPv4 2n-skx-xxv710 base and scale
 -
   type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
+  title: "VPP Throughput: ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
-           '1T1C' and
-           'VHOST' and
-           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           '2T1C' and
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
+  title: "VPP Throughput: ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
-           '2T2C' and
-           'VHOST' and
-           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           '2T1C' and
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
+  title: "VPP Throughput: ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
-           '1T1C' and
-           'VHOST' and
-           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           '4T2C' and
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
+  title: "VPP Throughput: ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
-           '2T2C' and
-           'VHOST' and
-           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           '4T2C' and
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - VPP vhost l2sw 3n-hsw-x520
+################################################################################
+
+# Packet Throughput - VPP IPv4 tunnels 3n-hsw-x520 base and scale
 -
   type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
+  title: "VPP Throughput: ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
+  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
-           'VHOST' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'DOT1Q' and
-           not '2VM'"
+           'VXLAN' and
+           'L2BDMACLRN' 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: ""  # No title
+    title: "ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
+  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]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
+  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
-           '2T2C' and
-           'VHOST' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'DOT1Q' and
-           not '2VM'"
+           '1T1C' and
+           'VXLAN' and
+           'L2BDMACLRN' 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: ""  # No title
+    title: "ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
+  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]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
+  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
-           '1T1C' and
-           'VHOST' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'DOT1Q' and
-           not '2VM'"
+           '2T2C' and
+           'VXLAN' and
+           'L2BDMACLRN' 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: ""  # No title
+    title: "ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
+  title: "VPP Throughput: ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
+  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
-           'VHOST' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'DOT1Q' and
-           not '2VM'"
+           'VXLAN' and
+           'L2BDMACLRN' 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: ""  # No title
+    title: "ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - VPP vhost ip4 3n-hsw-x710
+# Packet Throughput - VPP IPv4 tunnels 3n-hsw-x520 - features
 -
   type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
+  title: "VPP Throughput: ip4tun-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
+           'ENCAP' and
            'NDRPDR' and
            '1T1C' and
-           'VHOST' and
-           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') and
+           not 'DOT1Q' and
+           not 'VHOST' and
+           not 'IPSECHW'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "LISP"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip4tun-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+  title: "VPP Throughput: ip4tun-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
+           'ENCAP' and
            'NDRPDR' and
            '2T2C' and
-           'VHOST' and
-           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') and
+           not 'DOT1Q' and
+           not 'VHOST' and
+           not 'IPSECHW'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "LISP"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip4tun-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
+  title: "VPP Throughput: ip4tun-3n-hsw-x520-64b-1t1c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-1t1c-base_and_features-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
+           'ENCAP' and
            'NDRPDR' and
            '1T1C' and
-           'VHOST' and
-           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') and
+           not 'DOT1Q' and
+           not 'VHOST' and
+           not 'IPSECHW'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "LISP"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip4tun-3n-hsw-x520-64b-1t1c-base_and_features-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
+  title: "VPP Throughput: ip4tun-3n-hsw-x520-64b-2t2c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-2t2c-base_and_features-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
+           'ENCAP' and
            'NDRPDR' and
            '2T2C' and
-           'VHOST' and
-           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') and
+           not 'DOT1Q' and
+           not 'VHOST' and
+           not 'IPSECHW'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "LISP"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip4tun-3n-hsw-x520-64b-2t2c-base_and_features-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - VPP vhost l2sw 3n-hsw-x710
+# Packet Throughput - VPP IPv4 tunnels 3n-hsw-x710 base and scale
 -
   type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
+  title: "VPP Throughput: ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
+           'ENCAP' and
            'NDRPDR' and
            '1T1C' and
-           'VHOST' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'DOT1Q' and
-           not '2VM'"
+           'VXLAN' and
+           'L2BDMACLRN' 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: ""  # No title
+    title: "ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+  title: "VPP Throughput: ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
+           'ENCAP' and
            'NDRPDR' and
-           '2T2C' and
-           'VHOST' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'DOT1Q' and
-           not '2VM'"
+           '1T1C' and
+           'VXLAN' and
+           'L2BDMACLRN' 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: ""  # No title
+    title: "ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
+  title: "VPP Throughput: ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
+           'ENCAP' and
            'NDRPDR' and
-           '1T1C' and
-           'VHOST' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'DOT1Q' and
-           not '2VM'"
+           '2T2C' and
+           'VXLAN' and
+           'L2BDMACLRN' 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: ""  # No title
+    title: "ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
+  title: "VPP Throughput: ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
+           'ENCAP' and
            'NDRPDR' and
            '2T2C' and
-           'VHOST' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'DOT1Q' and
-           not '2VM'"
+           'VXLAN' and
+           'L2BDMACLRN' 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: ""  # No title
+    title: "ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - VPP vhost ip4 3n-hsw-xl710
+# Packet Throughput - VPP IPv4 tunnels 3n-hsw-x710 - features
 -
   type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
+  title: "VPP Throughput: ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  filter: "'NIC_Intel-X710' and
            '64B' and
+           'ENCAP' and
            'NDRPDR' and
            '1T1C' and
-           'VHOST' and
-           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') and
+           not 'DOT1Q' and
+           not 'VHOST' and
+           not 'IPSECHW'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "LISP"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
+  title: "VPP Throughput: ip4tun-3n-hsw-x710-64b-2t2c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-2t2c-base_and_features-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  filter: "'NIC_Intel-X710' and
            '64B' and
+           'ENCAP' and
            'NDRPDR' and
            '2T2C' and
-           'VHOST' and
-           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') and
+           not 'DOT1Q' and
+           not 'VHOST' and
+           not 'IPSECHW'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "LISP"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip4tun-3n-hsw-x710-64b-2t2c-base_and_features-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
+  title: "VPP Throughput: ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  filter: "'NIC_Intel-X710' and
            '64B' and
+           'ENCAP' and
            'NDRPDR' and
            '1T1C' and
-           'VHOST' and
-           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') and
+           not 'DOT1Q' and
+           not 'VHOST' and
+           not 'IPSECHW'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "LISP"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
+  title: "VPP Throughput: ip4tun-3n-hsw-x710-64b-2t2c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-2t2c-base_and_features-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  filter: "'NIC_Intel-X710' and
            '64B' and
+           'ENCAP' and
            'NDRPDR' and
            '2T2C' and
-           'VHOST' and
-           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') and
+           not 'DOT1Q' and
+           not 'VHOST' and
+           not 'IPSECHW'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "LISP"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip4tun-3n-hsw-x710-64b-2t2c-base_and_features-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - VPP vhost l2sw 3n-hsw-xl710
+# Packet Throughput - VPP IPv4 tunnels 3n-skx-x710 base and scale
 -
   type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
+  title: "VPP Throughput: ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
+           'ENCAP' and
            'NDRPDR' and
-           '1T1C' and
-           'VHOST' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'DOT1Q' and
-           not '2VM'"
+           '2T1C' and
+           'VXLAN' and
+           'L2BDMACLRN' 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: ""  # No title
+    title: "ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
+  title: "VPP Throughput: ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
+           'ENCAP' and
            'NDRPDR' and
-           '2T2C' and
-           'VHOST' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'DOT1Q' and
-           not '2VM'"
+           '2T1C' and
+           'VXLAN' and
+           'L2BDMACLRN' 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: ""  # No title
+    title: "ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
+  title: "VPP Throughput: ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
+           'ENCAP' and
            'NDRPDR' and
-           '1T1C' and
-           'VHOST' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'DOT1Q' and
-           not '2VM'"
+           '4T2C' and
+           'VXLAN' and
+           'L2BDMACLRN' 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: ""  # No title
+    title: "ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
+  title: "VPP Throughput: ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
+           'ENCAP' and
            'NDRPDR' and
-           '2T2C' and
-           'VHOST' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'DOT1Q' and
-           not '2VM'"
+           '4T2C' and
+           'VXLAN' and
+           'L2BDMACLRN' 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: ""  # No title
+    title: "ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
-################################################################################
-
-# Packet Throughput - VPP VTS 3n-hsw-x520
+# Packet Throughput - VPP IPv4 tunnels 3n-skx-x710 - features
 -
   type: "plot"
-  title: "VPP Throughput: vts-3n-hsw-x520-114b-1t1c-ndr"
+  title: "VPP Throughput: ip4tun-3n-skx-x710-64b-2t1c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-114b-1t1c-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '114B' and
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-2t1c-base_and_features-ndr"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'ENCAP' and
            'NDRPDR' and
-           '1T1C' and
-           'VTS'"
+           '2T1C' and
+           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') and
+           not 'DOT1Q' and
+           not 'VHOST' and
+           not 'IPSECHW'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "LISP"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip4tun-3n-skx-x710-64b-2t1c-base_and_features-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: vts-3n-hsw-x520-114b-2t2c-ndr"
+  title: "VPP Throughput: ip4tun-3n-skx-x710-64b-4t2c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-114b-2t2c-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '114B' and
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-4t2c-base_and_features-ndr"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'ENCAP' and
            'NDRPDR' and
-           '2T2C' and
-           'VTS'"
+           '4T2C' and
+           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') and
+           not 'DOT1Q' and
+           not 'VHOST' and
+           not 'IPSECHW'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "LISP"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip4tun-3n-skx-x710-64b-4t2c-base_and_features-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: vts-3n-hsw-x520-114b-1t1c-pdr"
+  title: "VPP Throughput: ip4tun-3n-skx-x710-64b-2t1c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-114b-1t1c-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '114B' and
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-2t1c-base_and_features-pdr"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'ENCAP' and
            'NDRPDR' and
-           '1T1C' and
-           'VTS'"
+           '2T1C' and
+           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') and
+           not 'DOT1Q' and
+           not 'VHOST' and
+           not 'IPSECHW'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "LISP"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip4tun-3n-skx-x710-64b-2t1c-base_and_features-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: vts-3n-hsw-x520-114b-2t2c-pdr"
+  title: "VPP Throughput: ip4tun-3n-skx-x710-64b-4t2c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-114b-2t2c-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '114B' and
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-4t2c-base_and_features-pdr"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'ENCAP' and
            'NDRPDR' and
-           '2T2C' and
-           'VTS'"
+           '4T2C' and
+           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') and
+           not 'DOT1Q' and
+           not 'VHOST' and
+           not 'IPSECHW'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "LISP"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip4tun-3n-skx-x710-64b-4t2c-base_and_features-pdr"
     layout: "plot-throughput"
 
 ################################################################################
 
-# Packet Throughput - DPDK l3fwd 3n-hsw-x520
+# Packet Throughput - VPP IPv6 3n-hsw-x520
 -
   type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-hsw-x520-64b-1t1c-base-ndr"
+  title: "VPP Throughput: ip6-3n-hsw-x520-78b-1t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x520-64b-1t1c-base-ndr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-1t1c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'BASE' and
+           '78B' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            '1T1C' and
-           'IP4FWD'"
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip6-3n-hsw-x520-78b-1t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-hsw-x520-64b-2t2c-base-ndr"
+  title: "VPP Throughput: ip6-3n-hsw-x520-78b-1t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x520-64b-2t2c-base-ndr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-1t1c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'BASE' and
+           '78B' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
-           '2T2C' and
-           'IP4FWD'"
+           '1T1C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip6-3n-hsw-x520-78b-1t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-hsw-x520-64b-1t1c-base-pdr"
+  title: "VPP Throughput: ip6-3n-hsw-x520-78b-2t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x520-64b-1t1c-base-pdr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-2t2c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'BASE' and
+           '78B' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
-           '1T1C' and
-           'IP4FWD'"
+           '2T2C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip6-3n-hsw-x520-78b-2t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-hsw-x520-64b-2t2c-base-pdr"
+  title: "VPP Throughput: ip6-3n-hsw-x520-78b-2t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x520-64b-2t2c-base-pdr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-2t2c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'BASE' and
+           '78B' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            '2T2C' and
-           'IP4FWD'"
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip6-3n-hsw-x520-78b-2t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - DPDK l3fwd 3n-hsw-x710
+# Packet Throughput - VPP IPv6 3n-hsw-x520 - features
 -
   type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-hsw-x710-64b-1t1c-base-ndr"
+  title: "VPP Throughput: ip6-3n-hsw-x520-78b-1t1c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x710-64b-1t1c-base-ndr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'BASE' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-1t1c-base_and_features-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '78B' and
+           ('IP6BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            'IACLDST') and
            'NDRPDR' and
            '1T1C' and
-           'IP4FWD'"
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "IP6BASE"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACLDST"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip6-3n-hsw-x520-78b-1t1c-base_and_features-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-hsw-x710-64b-2t2c-base-ndr"
+  title: "VPP Throughput: ip6-3n-hsw-x520-78b-2t2c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x710-64b-2t2c-base-ndr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'BASE' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-2t2c-base_and_features-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '78B' and
+           ('IP6BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            'IACLDST') and
            'NDRPDR' and
            '2T2C' and
-           'IP4FWD'"
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "IP6BASE"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACLDST"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip6-3n-hsw-x520-78b-2t2c-base_and_features-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-hsw-x710-64b-1t1c-base-pdr"
+  title: "VPP Throughput: ip6-3n-hsw-x520-78b-1t1c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x710-64b-1t1c-base-pdr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'BASE' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-1t1c-base_and_features-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '78B' and
+           ('IP6BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            'IACLDST') and
            'NDRPDR' and
            '1T1C' and
-           'IP4FWD'"
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "IP6BASE"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACLDST"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip6-3n-hsw-x520-78b-1t1c-base_and_features-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-hsw-x710-64b-2t2c-base-pdr"
+  title: "VPP Throughput: ip6-3n-hsw-x520-78b-2t2c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x710-64b-2t2c-base-pdr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'BASE' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-2t2c-base_and_features-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '78B' and
+           ('IP6BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            'IACLDST') and
            'NDRPDR' and
            '2T2C' and
-           'IP4FWD'"
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "IP6BASE"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACLDST"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip6-3n-hsw-x520-78b-2t2c-base_and_features-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - DPDK l3fwd 3n-hsw-xl710
+# Packet Throughput - VPP IPv6 3n-hsw-x710
 -
   type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-hsw-xl710-64b-1t1c-base-ndr"
+  title: "VPP Throughput: ip6-3n-hsw-x710-78b-1t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-xl710-64b-1t1c-base-ndr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'BASE' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-1t1c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
+           '78B' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            '1T1C' and
-           'IP4FWD'"
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip6-3n-hsw-x710-78b-1t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-hsw-xl710-64b-2t2c-base-ndr"
+  title: "VPP Throughput: ip6-3n-hsw-x710-78b-1t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-xl710-64b-2t2c-base-ndr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'BASE' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-1t1c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
+           '78B' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
-           '2T2C' and
-           'IP4FWD'"
+           '1T1C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip6-3n-hsw-x710-78b-1t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-hsw-xl710-64b-1t1c-base-pdr"
+  title: "VPP Throughput: ip6-3n-hsw-x710-78b-2t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-xl710-64b-1t1c-base-pdr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'BASE' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-2t2c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
+           '78B' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
-           '1T1C' and
-           'IP4FWD'"
+           '2T2C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip6-3n-hsw-x710-78b-2t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-hsw-xl710-64b-2t2c-base-pdr"
+  title: "VPP Throughput: ip6-3n-hsw-x710-78b-2t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-xl710-64b-2t2c-base-pdr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'BASE' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-2t2c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
+           '78B' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            '2T2C' and
-           'IP4FWD'"
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip6-3n-hsw-x710-78b-2t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - DPDK l3fwd 3n-skx-x710
+# Packet Throughput - VPP IPv6 3n-hsw-x710 - features
 -
   type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-skx-x710-64b-2t1c-base-ndr"
+  title: "VPP Throughput: ip6-3n-hsw-x710-78b-1t1c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-skx-x710-64b-2t1c-base-ndr"
-  data: "plot-dpdk-throughput-latency-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-1t1c-base_and_features-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
-           '64B' and
-           'BASE' and
+           '78B' and
+           ('IP6BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            'IACLDST') and
            'NDRPDR' and
-           '2T1C' and
-           'IP4FWD'"
+           '1T1C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "IP6BASE"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACLDST"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip6-3n-hsw-x710-78b-1t1c-base_and_features-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-skx-x710-64b-4t2c-base-ndr"
+  title: "VPP Throughput: ip6-3n-hsw-x710-78b-2t2c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-skx-x710-64b-4t2c-base-ndr"
-  data: "plot-dpdk-throughput-latency-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-2t2c-base_and_features-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
-           '64B' and
-           'BASE' and
+           '78B' and
+           ('IP6BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            'IACLDST') and
            'NDRPDR' and
-           '4T2C' and
-           'IP4FWD'"
+           '2T2C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "IP6BASE"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACLDST"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip6-3n-hsw-x710-78b-2t2c-base_and_features-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-skx-x710-64b-2t1c-base-pdr"
+  title: "VPP Throughput: ip6-3n-hsw-x710-78b-1t1c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-skx-x710-64b-2t1c-base-pdr"
-  data: "plot-dpdk-throughput-latency-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-1t1c-base_and_features-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
-           '64B' and
-           'BASE' and
+           '78B' and
+           ('IP6BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            'IACLDST') and
            'NDRPDR' and
-           '2T1C' and
-           'IP4FWD'"
+           '1T1C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "IP6BASE"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACLDST"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip6-3n-hsw-x710-78b-1t1c-base_and_features-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-skx-x710-64b-4t2c-base-pdr"
+  title: "VPP Throughput: ip6-3n-hsw-x710-78b-2t2c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-skx-x710-64b-4t2c-base-pdr"
-  data: "plot-dpdk-throughput-latency-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-2t2c-base_and_features-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
-           '64B' and
-           'BASE' and
+           '78B' and
+           ('IP6BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            'IACLDST') and
            'NDRPDR' and
-           '4T2C' and
-           'IP4FWD'"
+           '2T2C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "IP6BASE"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACLDST"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip6-3n-hsw-x710-78b-2t2c-base_and_features-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - DPDK l3fwd 3n-skx-xxv710
+# Packet Throughput - VPP IPv6 3n-hsw-xl710
 -
   type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-skx-xxv710-64b-2t1c-base-ndr"
+  title: "VPP Throughput: ip6-3n-hsw-xl710-78b-1t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-skx-xxv710-64b-2t1c-base-ndr"
-  data: "plot-dpdk-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'BASE' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-1t1c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
+           '78B' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
-           '2T1C' and
-           'IP4FWD'"
+           '1T1C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip6-3n-hsw-xl710-78b-1t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-skx-xxv710-64b-4t2c-base-ndr"
+  title: "VPP Throughput: ip6-3n-hsw-xl710-78b-1t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-skx-xxv710-64b-4t2c-base-ndr"
-  data: "plot-dpdk-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'BASE' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-1t1c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
+           '78B' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
-           '4T2C' and
-           'IP4FWD'"
+           '1T1C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip6-3n-hsw-xl710-78b-1t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-skx-xxv710-64b-2t1c-base-pdr"
+  title: "VPP Throughput: ip6-3n-hsw-xl710-78b-2t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-skx-xxv710-64b-2t1c-base-pdr"
-  data: "plot-dpdk-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'BASE' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-2t2c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
+           '78B' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
-           '2T1C' and
-           'IP4FWD'"
+           '2T2C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip6-3n-hsw-xl710-78b-2t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "DPDK Throughput: l3fwd-3n-skx-xxv710-64b-4t2c-base-pdr"
+  title: "VPP Throughput: ip6-3n-hsw-xl710-78b-2t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-skx-xxv710-64b-4t2c-base-pdr"
-  data: "plot-dpdk-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'BASE' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-2t2c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
+           '78B' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
-           '4T2C' and
-           'IP4FWD'"
+           '2T2C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip6-3n-hsw-xl710-78b-2t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - DPDK l3fwd 2n-skx-x710
+# Packet Throughput - VPP IPv6 3n-skx-x710
 -
   type: "plot"
-  title: "DPDK Throughput: l3fwd-2n-skx-x710-64b-2t1c-base-ndr"
+  title: "VPP Throughput: ip6-3n-skx-x710-78b-2t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-2n-skx-x710-64b-2t1c-base-ndr"
-  data: "plot-dpdk-throughput-latency-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-2t1c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
-           '64B' and
-           'BASE' and
+           '78B' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            '2T1C' and
-           'IP4FWD'"
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip6-3n-skx-x710-78b-2t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "DPDK Throughput: l3fwd-2n-skx-x710-64b-4t2c-base-ndr"
+  title: "VPP Throughput: ip6-3n-skx-x710-78b-2t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-2n-skx-x710-64b-4t2c-base-ndr"
-  data: "plot-dpdk-throughput-latency-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-2t1c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
-           '64B' and
-           'BASE' and
+           '78B' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
-           '4T2C' and
-           'IP4FWD'"
+           '2T1C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip6-3n-skx-x710-78b-2t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "DPDK Throughput: l3fwd-2n-skx-x710-64b-2t1c-base-pdr"
+  title: "VPP Throughput: ip6-3n-skx-x710-78b-4t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-2n-skx-x710-64b-2t1c-base-pdr"
-  data: "plot-dpdk-throughput-latency-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-4t2c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
-           '64B' and
-           'BASE' and
+           '78B' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
-           '2T1C' and
-           'IP4FWD'"
+           '4T2C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip6-3n-skx-x710-78b-4t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "DPDK Throughput: l3fwd-2n-skx-x710-64b-4t2c-base-pdr"
+  title: "VPP Throughput: ip6-3n-skx-x710-78b-4t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-2n-skx-x710-64b-4t2c-base-pdr"
-  data: "plot-dpdk-throughput-latency-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-4t2c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
-           '64B' and
-           'BASE' and
+           '78B' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            '4T2C' and
-           'IP4FWD'"
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip6-3n-skx-x710-78b-4t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - DPDK l3fwd 2n-skx-xxv710
+# Packet Throughput - VPP IPv6 3n-skx-x710 - features
 -
   type: "plot"
-  title: "DPDK Throughput: l3fwd-2n-skx-xxv710-64b-2t1c-base-ndr"
+  title: "VPP Throughput: ip6-3n-skx-x710-78b-2t1c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-2n-skx-xxv710-64b-2t1c-base-ndr"
-  data: "plot-dpdk-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'BASE' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-2t1c-base_and_features-ndr"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '78B' and
+           ('IP6BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            'IACLDST') and
            'NDRPDR' and
            '2T1C' and
-           'IP4FWD'"
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "IP6BASE"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACLDST"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip6-3n-skx-x710-78b-2t1c-base_and_features-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "DPDK Throughput: l3fwd-2n-skx-xxv710-64b-4t2c-base-ndr"
+  title: "VPP Throughput: ip6-3n-skx-x710-78b-4t2c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-2n-skx-xxv710-64b-4t2c-base-ndr"
-  data: "plot-dpdk-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'BASE' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-4t2c-base_and_features-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
+           '78B' and
+           ('IP6BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            'IACLDST') and
            'NDRPDR' and
            '4T2C' and
-           'IP4FWD'"
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "IP6BASE"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACLDST"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip6-3n-skx-x710-78b-4t2c-base_and_features-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "DPDK Throughput: l3fwd-2n-skx-xxv710-64b-2t1c-base-pdr"
+  title: "VPP Throughput: ip6-3n-skx-x710-78b-2t1c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-2n-skx-xxv710-64b-2t1c-base-pdr"
-  data: "plot-dpdk-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'BASE' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-2t1c-base_and_features-pdr"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '78B' and
+           ('IP6BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            'IACLDST') and
            'NDRPDR' and
            '2T1C' and
-           'IP4FWD'"
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "IP6BASE"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACLDST"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip6-3n-skx-x710-78b-2t1c-base_and_features-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "DPDK Throughput: l3fwd-2n-skx-xxv710-64b-4t2c-base-pdr"
+  title: "VPP Throughput: ip6-3n-skx-x710-78b-4t2c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-2n-skx-xxv710-64b-4t2c-base-pdr"
-  data: "plot-dpdk-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'BASE' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-4t2c-base_and_features-pdr"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '78B' and
+           ('IP6BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            'IACLDST') and
            'NDRPDR' and
            '4T2C' and
-           'IP4FWD'"
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "IP6BASE"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACLDST"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip6-3n-skx-x710-78b-4t2c-base_and_features-pdr"
     layout: "plot-throughput"
 
-################################################################################
-
-# Packet Throughput - DPDK testpmd 3n-hsw-x520
+# Packet Throughput - VPP IPv6 2n-skx-x710
 -
   type: "plot"
-  title: "DPDK Throughput: testpmd-3n-hsw-x520-64b-1t1c-base-ndr"
+  title: "VPP Throughput: ip6-2n-skx-x710-78b-2t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x520-64b-1t1c-base-ndr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'BASE' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-2t1c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           '78B' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           '2T1C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip6-2n-skx-x710-78b-2t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "DPDK Throughput: testpmd-3n-hsw-x520-64b-2t2c-base-ndr"
+  title: "VPP Throughput: ip6-2n-skx-x710-78b-2t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x520-64b-2t2c-base-ndr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'BASE' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-2t1c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           '78B' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           '2T1C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip6-2n-skx-x710-78b-2t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "DPDK Throughput: testpmd-3n-hsw-x520-64b-1t1c-base-pdr"
+  title: "VPP Throughput: ip6-2n-skx-x710-78b-4t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x520-64b-1t1c-base-pdr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'BASE' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-4t2c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           '78B' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           '4T2C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip6-2n-skx-x710-78b-4t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "DPDK Throughput: testpmd-3n-hsw-x520-64b-2t2c-base-pdr"
+  title: "VPP Throughput: ip6-2n-skx-x710-78b-4t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x520-64b-2t2c-base-pdr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'BASE' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-4t2c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           '78B' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           '4T2C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip6-2n-skx-x710-78b-4t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - DPDK testpmd 3n-hsw-x710
+# Packet Throughput - VPP IPv6 2n-skx-xxv710
 -
   type: "plot"
-  title: "DPDK Throughput: testpmd-3n-hsw-x710-64b-1t1c-base-ndr"
+  title: "VPP Throughput: ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x710-64b-1t1c-base-ndr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'BASE' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
+           '78B' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           '2T1C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "DPDK Throughput: testpmd-3n-hsw-x710-64b-2t2c-base-ndr"
+  title: "VPP Throughput: ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x710-64b-2t2c-base-ndr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'BASE' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
+           '78B' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           '2T1C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "DPDK Throughput: testpmd-3n-hsw-x710-64b-1t1c-base-pdr"
+  title: "VPP Throughput: ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x710-64b-1t1c-base-pdr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'BASE' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
+           '78B' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           '4T2C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "DPDK Throughput: testpmd-3n-hsw-x710-64b-2t2c-base-pdr"
+  title: "VPP Throughput: ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x710-64b-2t2c-base-pdr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'BASE' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
+           '78B' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           '4T2C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - DPDK testpmd 3n-hsw-xl710
+################################################################################
+
+# Packet Throughput - VPP IPv6 tunnels 3n-hsw-x520
 -
   type: "plot"
-  title: "DPDK Throughput: testpmd-3n-hsw-xl710-64b-1t1c-base-ndr"
+  title: "VPP Throughput: ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-xl710-64b-1t1c-base-ndr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'BASE' and
+  output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '78B' and
+           'ENCAP' and
            'NDRPDR' and
            '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           'LISP' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "IP4UNRLAY"
+  - "IP6UNRLAY"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "DPDK Throughput: testpmd-3n-hsw-xl710-64b-2t2c-base-ndr"
+  title: "VPP Throughput: ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-xl710-64b-2t2c-base-ndr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'BASE' and
+  output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '78B' and
+           'ENCAP' and
            'NDRPDR' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           '1T1C' and
+           'LISP' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "IP4UNRLAY"
+  - "IP6UNRLAY"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "DPDK Throughput: testpmd-3n-hsw-xl710-64b-1t1c-base-pdr"
+  title: "VPP Throughput: ip6tun-3n-hsw-x520-78b-2t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-xl710-64b-1t1c-base-pdr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'BASE' and
+  output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-2t2c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '78B' and
+           'ENCAP' and
            'NDRPDR' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           '2T2C' and
+           'LISP' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "IP4UNRLAY"
+  - "IP6UNRLAY"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip6tun-3n-hsw-x520-78b-2t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "DPDK Throughput: testpmd-3n-hsw-xl710-64b-2t2c-base-pdr"
+  title: "VPP Throughput: ip6tun-3n-hsw-x520-78b-2t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-xl710-64b-2t2c-base-pdr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'BASE' and
+  output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-2t2c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '78B' and
+           'ENCAP' and
            'NDRPDR' and
            '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           'LISP' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "IP4UNRLAY"
+  - "IP6UNRLAY"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ip6tun-3n-hsw-x520-78b-2t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - DPDK testpmd 3n-skx-x710
+################################################################################
+
+# Packet Throughput - VPP IPSec 3n-hsw-xl710 base
 -
   type: "plot"
-  title: "DPDK Throughput: testpmd-3n-skx-x710-64b-2t1c-base-ndr"
+  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-1t1c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-skx-x710-64b-2t1c-base-ndr"
-  data: "plot-dpdk-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-base-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '64B' and
-           'BASE' and
+           'IP4FWD' and
            'NDRPDR' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           'BASE' and
+           '1T1C' and
+           'IPSECHW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ipsec-3n-hsw-xl710-64b-1t1c-base-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "DPDK Throughput: testpmd-3n-skx-x710-64b-4t2c-base-ndr"
+  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-1t1c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-skx-x710-64b-4t2c-base-ndr"
-  data: "plot-dpdk-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-base-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '64B' and
-           'BASE' and
+           'IP4FWD' and
            'NDRPDR' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           'BASE' and
+           '1T1C' and
+           'IPSECHW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ipsec-3n-hsw-xl710-64b-1t1c-base-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "DPDK Throughput: testpmd-3n-skx-x710-64b-2t1c-base-pdr"
+  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-2t2c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-skx-x710-64b-2t1c-base-pdr"
-  data: "plot-dpdk-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-base-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '64B' and
-           'BASE' and
+           'IP4FWD' and
            'NDRPDR' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           'BASE' and
+           '2T2C' and
+           'IPSECHW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ipsec-3n-hsw-xl710-64b-2t2c-base-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "DPDK Throughput: testpmd-3n-skx-x710-64b-4t2c-base-pdr"
+  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-2t2c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-skx-x710-64b-4t2c-base-pdr"
-  data: "plot-dpdk-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-base-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '64B' and
-           'BASE' and
+           'IP4FWD' and
            'NDRPDR' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           'BASE' and
+           '2T2C' and
+           'IPSECHW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ipsec-3n-hsw-xl710-64b-2t2c-base-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - DPDK testpmd 3n-skx-xxv710
+# Packet Throughput - VPP IPSec 3n-hsw-xl710 scale
 -
   type: "plot"
-  title: "DPDK Throughput: testpmd-3n-skx-xxv710-64b-2t1c-base-ndr"
+  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-1t1c-scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-skx-xxv710-64b-2t1c-base-ndr"
-  data: "plot-dpdk-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-scale-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '64B' and
-           'BASE' and
+           'IP4FWD' and
            'NDRPDR' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           'SCALE' and
+           '1T1C' and
+           'IPSECHW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ipsec-3n-hsw-xl710-64b-1t1c-scale-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "DPDK Throughput: testpmd-3n-skx-xxv710-64b-4t2c-base-ndr"
+  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-1t1c-scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-skx-xxv710-64b-4t2c-base-ndr"
-  data: "plot-dpdk-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-scale-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '64B' and
-           'BASE' and
+           'IP4FWD' and
            'NDRPDR' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           'SCALE' and
+           '1T1C' and
+           'IPSECHW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ipsec-3n-hsw-xl710-64b-1t1c-scale-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "DPDK Throughput: testpmd-3n-skx-xxv710-64b-2t1c-base-pdr"
+  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-2t2c-scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-skx-xxv710-64b-2t1c-base-pdr"
-  data: "plot-dpdk-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-scale-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '64B' and
-           'BASE' and
+           'IP4FWD' and
            'NDRPDR' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           'SCALE' and
+           '2T2C' and
+           'IPSECHW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ipsec-3n-hsw-xl710-64b-2t2c-scale-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "DPDK Throughput: testpmd-3n-skx-xxv710-64b-4t2c-base-pdr"
+  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-2t2c-scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-skx-xxv710-64b-4t2c-base-pdr"
-  data: "plot-dpdk-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-scale-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '64B' and
-           'BASE' and
+           'IP4FWD' and
            'NDRPDR' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           'SCALE' and
+           '2T2C' and
+           'IPSECHW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ipsec-3n-hsw-xl710-64b-2t2c-scale-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - DPDK testpmd 2n-skx-x710
+# Packet Throughput - VPP IPSec 3n-hsw-xl710 SW
 -
   type: "plot"
-  title: "DPDK Throughput: testpmd-2n-skx-x710-64b-2t1c-base-ndr"
+  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-1t1c-sw-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-x710-64b-2t1c-base-ndr"
-  data: "plot-dpdk-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-sw-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '64B' and
-           'BASE' and
+           'IP4FWD' and
            'NDRPDR' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           '1T1C' and
+           'IPSECSW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ipsec-3n-hsw-xl710-64b-1t1c-sw-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "DPDK Throughput: testpmd-2n-skx-x710-64b-4t2c-base-ndr"
+  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-1t1c-sw-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-x710-64b-4t2c-base-ndr"
-  data: "plot-dpdk-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-sw-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '64B' and
-           'BASE' and
+           'IP4FWD' and
            'NDRPDR' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           '1T1C' and
+           'IPSECSW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ipsec-3n-hsw-xl710-64b-1t1c-sw-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "DPDK Throughput: testpmd-2n-skx-x710-64b-2t1c-base-pdr"
+  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-2t2c-sw-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-x710-64b-2t1c-base-pdr"
-  data: "plot-dpdk-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-sw-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '64B' and
-           'BASE' and
+           'IP4FWD' and
            'NDRPDR' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           '2T2C' and
+           'IPSECSW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ipsec-3n-hsw-xl710-64b-2t2c-sw-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "DPDK Throughput: testpmd-2n-skx-x710-64b-4t2c-base-pdr"
+  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-2t2c-sw-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-x710-64b-4t2c-base-pdr"
-  data: "plot-dpdk-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-sw-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '64B' and
-           'BASE' and
+           'IP4FWD' and
            'NDRPDR' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           '2T2C' and
+           'IPSECSW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "ipsec-3n-hsw-xl710-64b-2t2c-sw-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - DPDK testpmd 2n-skx-xxv710
+################################################################################
+
+# Packet Throughput - VPP SRv6 3n-hsw-x520
 -
   type: "plot"
-  title: "DPDK Throughput: testpmd-2n-skx-xxv710-64b-2t1c-base-ndr"
+  title: "VPP Throughput: srv6-3n-hsw-x520-78b-1t1c-features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-xxv710-64b-2t1c-base-ndr"
-  data: "plot-dpdk-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'BASE' and
+  output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-1t1c-features-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '78B' and
+           'FEATURE' and
            'NDRPDR' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           '1T1C' and
+           'IP6FWD' and
+           'SRv6'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "srv6-3n-hsw-x520-78b-1t1c-features-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "DPDK Throughput: testpmd-2n-skx-xxv710-64b-4t2c-base-ndr"
+  title: "VPP Throughput: srv6-3n-hsw-x520-78b-1t1c-features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-xxv710-64b-4t2c-base-ndr"
-  data: "plot-dpdk-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'BASE' and
+  output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-1t1c-features-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '78B' and
+           'FEATURE' and
            'NDRPDR' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           '1T1C' and
+           'IP6FWD' and
+           'SRv6'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "srv6-3n-hsw-x520-78b-1t1c-features-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "DPDK Throughput: testpmd-2n-skx-xxv710-64b-2t1c-base-pdr"
+  title: "VPP Throughput: srv6-3n-hsw-x520-78b-2t2c-features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-xxv710-64b-2t1c-base-pdr"
-  data: "plot-dpdk-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'BASE' and
+  output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-2t2c-features-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '78B' and
+           'FEATURE' and
            'NDRPDR' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           '2T2C' and
+           'IP6FWD' and
+           'SRv6'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "srv6-3n-hsw-x520-78b-2t2c-features-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "DPDK Throughput: testpmd-2n-skx-xxv710-64b-4t2c-base-pdr"
+  title: "VPP Throughput: srv6-3n-hsw-x520-78b-2t2c-features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-xxv710-64b-4t2c-base-pdr"
-  data: "plot-dpdk-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'BASE' and
+  output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-2t2c-features-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '78B' and
+           'FEATURE' and
            'NDRPDR' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           '2T2C' and
+           'IP6FWD' and
+           'SRv6'"
   parameters:
   - "throughput"
   - "parent"
+  - "tags"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
+    title: "srv6-3n-hsw-x520-78b-2t2c-features-pdr"
     layout: "plot-throughput"
 
-
-
-
-
-
-
-
 ################################################################################
 
-# Packet Latency - VPP L2 3n-hsw-x520
+# Packet Throughput - VPP vhost ip4 3n-hsw-x520
 -
   type: "plot"
-  title: "VPP Latency: l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
+           'ETH' and
+           'IP4FWD' and
            '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'DOT1Q'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "not CFS_OPT"
+  - "1VM"
+  - "2VM"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
+    layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Latency: l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
+           'ETH' and
+           'IP4FWD' and
            '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'DOT1Q'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "not CFS_OPT"
+  - "1VM"
+  - "2VM"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
+    layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Latency: l2sw-3n-hsw-x520-64b-1t1c-features-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-1t1c-features-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
            'NDRPDR' and
+           'ETH' and
+           'IP4FWD' and
            '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'DOT1Q'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "not CFS_OPT"
+  - "1VM"
+  - "2VM"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
+    layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Latency: l2sw-3n-hsw-x520-64b-2t2c-features-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-2t2c-features-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
            'NDRPDR' and
+           'ETH' and
+           'IP4FWD' and
            '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'DOT1Q'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "not CFS_OPT"
+  - "1VM"
+  - "2VM"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
+    layout: "plot-throughput"
 
-# Packet Latency - VPP L2 3n-hsw-x710
+# Packet Throughput - VPP vhost l2sw 3n-hsw-x520
 -
   type: "plot"
-  title: "VPP Latency: l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
+           ('ETH' or 'DOT1Q') and
            '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
+           'L2BDMACLRN' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+#  sort:
+#  - "VM"  # "not CFS_OPT"
+#  - "CFS_OPT"
+#  - "FIB_10K"
+#  - "FIB_100K"
+#  - "FIB_1M"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
+    layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Latency: l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
+           ('ETH' or 'DOT1Q') and
            '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
+           'L2BDMACLRN' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+#  sort:
+#  - "VM"  # "not CFS_OPT"
+#  - "CFS_OPT"
+#  - "FIB_10K"
+#  - "FIB_100K"
+#  - "FIB_1M"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
+    layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Latency: l2sw-3n-hsw-x710-64b-1t1c-features-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-1t1c-features-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
            'NDRPDR' and
+           ('ETH' or 'DOT1Q') and
            '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
+           'L2BDMACLRN' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+#  sort:
+#  - "VM"  # "not CFS_OPT"
+#  - "CFS_OPT"
+#  - "FIB_10K"
+#  - "FIB_100K"
+#  - "FIB_1M"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
+    layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Latency: l2sw-3n-hsw-x710-64b-2t2c-features-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-2t2c-features-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
            'NDRPDR' and
+           ('ETH' or 'DOT1Q') and
            '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
+           'L2BDMACLRN' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+#  sort:
+#  - "VM"  # "not CFS_OPT"
+#  - "CFS_OPT"
+#  - "FIB_10K"
+#  - "FIB_100K"
+#  - "FIB_1M"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
+    layout: "plot-throughput"
 
-# Packet Latency - VPP L2 3n-hsw-xl710
+# Packet Throughput - VPP vhost l2sw 3n-hsw-x520 - base
 -
   type: "plot"
-  title: "VPP Latency: l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-1t1c-base-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
+           ('ETH' or 'DOT1Q') and
+           'BASE' and
            '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base-ndr"
+    layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Latency: l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-1t1c-base-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
+           ('ETH' or 'DOT1Q') and
+           'BASE' and
+           '1T1C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base-pdr"
+    layout: "plot-throughput"
 
-# Packet Latency - VPP L2 3n-skx-x710
 -
   type: "plot"
-  title: "VPP Latency: l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-2t2c-base-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
+           ('ETH' or 'DOT1Q') and
+           'BASE' and
+           '2T2C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vhost-l2sw-3n-hsw-x520-64b-2t2c-base-ndr"
+    layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Latency: l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-2t2c-base-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
+           ('ETH' or 'DOT1Q') and
+           'BASE' and
+           '2T2C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vhost-l2sw-3n-hsw-x520-64b-2t2c-base-pdr"
+    layout: "plot-throughput"
 
+# Packet Throughput - VPP vhost l2sw 3n-hsw-x520 - base vm
 -
   type: "plot"
-  title: "VPP Latency: l2sw-3n-skx-x710-64b-2t1c-features-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-2t1c-features-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
            'NDRPDR' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
+           ('ETH' or 'DOT1Q') and
+           '1T1C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'CFS_OPT' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not 'LBOND'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-ndr"
+    layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Latency: l2sw-3n-skx-x710-64b-4t2c-features-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-4t2c-features-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
            'NDRPDR' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
+           ('ETH' or 'DOT1Q') and
+           '1T1C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'CFS_OPT' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not 'LBOND'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-pdr"
+    layout: "plot-throughput"
 
-# Packet Latency - VPP L2 3n-skx-xxv710
 -
   type: "plot"
-  title: "VPP Latency: l2sw-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
+           ('ETH' or 'DOT1Q') and
+           '2T2C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'CFS_OPT' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not 'LBOND'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-ndr"
+    layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Latency: l2sw-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
+           ('ETH' or 'DOT1Q') and
+           '2T2C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'CFS_OPT' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not 'LBOND'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-pdr"
+    layout: "plot-throughput"
 
-# Packet Latency - VPP L2 2n-skx-x710
+# Packet Throughput - VPP vhost ip4 3n-hsw-x710
 -
   type: "plot"
-  title: "VPP Latency: l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
+           'ETH' and
+           'IP4FWD' and
+           '1T1C' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'DOT1Q'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "not CFS_OPT"
+  - "1VM"
+  - "2VM"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
+    layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Latency: l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
+           'ETH' and
+           'IP4FWD' and
+           '2T2C' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'DOT1Q'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "not CFS_OPT"
+  - "1VM"
+  - "2VM"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+    layout: "plot-throughput"
 
-# Packet Latency - VPP L2 2n-skx-xxv710
 -
   type: "plot"
-  title: "VPP Latency: l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
+           'ETH' and
+           'IP4FWD' and
+           '1T1C' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'DOT1Q'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "not CFS_OPT"
+  - "1VM"
+  - "2VM"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
+    layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Latency: l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
+           'ETH' and
+           'IP4FWD' and
+           '2T2C' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'DOT1Q'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "not CFS_OPT"
+  - "1VM"
+  - "2VM"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
-
-################################################################################
+    title: "vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
+    layout: "plot-throughput"
 
-# Packet Latency - VPP Container Memif 3n-hsw-x520
+# Packet Throughput - VPP vhost l2sw 3n-hsw-x710
 -
   type: "plot"
-  title: "VPP Latency: memif-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
+           ('ETH' or 'DOT1Q') and
            '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           'MEMIF'"
+           'L2BDMACLRN' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+#  sort:
+#  - "VM"  # "not CFS_OPT"
+#  - "CFS_OPT"
+#  - "FIB_10K"
+#  - "FIB_100K"
+#  - "FIB_1M"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
+    layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Latency: memif-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
+           ('ETH' or 'DOT1Q') and
            '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           'MEMIF'"
+           'L2BDMACLRN' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+#  sort:
+#  - "VM"  # "not CFS_OPT"
+#  - "CFS_OPT"
+#  - "FIB_10K"
+#  - "FIB_100K"
+#  - "FIB_1M"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+    layout: "plot-throughput"
 
-# Packet Latency - VPP Container Memif 3n-hsw-x710
 -
   type: "plot"
-  title: "VPP Latency: memif-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
+           ('ETH' or 'DOT1Q') and
            '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           'MEMIF'"
+           'L2BDMACLRN' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+#  sort:
+#  - "VM"  # "not CFS_OPT"
+#  - "CFS_OPT"
+#  - "FIB_10K"
+#  - "FIB_100K"
+#  - "FIB_1M"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
+    layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Latency: memif-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
+           ('ETH' or 'DOT1Q') and
            '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           'MEMIF'"
+           'L2BDMACLRN' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+#  sort:
+#  - "VM"  # "not CFS_OPT"
+#  - "CFS_OPT"
+#  - "FIB_10K"
+#  - "FIB_100K"
+#  - "FIB_1M"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
+    layout: "plot-throughput"
 
-# Packet Latency - VPP Container Memif 3n-hsw-xl710
+# Packet Throughput - VPP vhost l2sw 3n-hsw-x710 - base
 -
   type: "plot"
-  title: "VPP Latency: memif-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-1t1c-base-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
+           ('ETH' or 'DOT1Q') and
+           'BASE' and
            '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           'MEMIF'"
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base-ndr"
+    layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Latency: memif-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-1t1c-base-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           'MEMIF'"
+           ('ETH' or 'DOT1Q') and
+           'BASE' and
+           '1T1C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
   traces:
-    boxmean: False
-  layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base-pdr"
+    layout: "plot-throughput"
 
-# Packet Latency - VPP Container Memif 3n-skx-x710
 -
   type: "plot"
-  title: "VPP Latency: memif-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-2t2c-base-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           'MEMIF'"
+           ('ETH' or 'DOT1Q') and
+           'BASE' and
+           '2T2C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base-ndr"
+    layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Latency: memif-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-2t2c-base-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           'MEMIF'"
+           ('ETH' or 'DOT1Q') and
+           'BASE' and
+           '2T2C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
-
-################################################################################
+    title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base-pdr"
+    layout: "plot-throughput"
 
-# Packet Latency - VPP Container Memif 3n-hsw-x520
+# Packet Throughput - VPP vhost l2sw 3n-hsw-x710 - base vm
 -
   type: "plot"
-  title: "VPP Latency: k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-1t1c-base-vm-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
-  data: "plot-ligato-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base-vm-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
+           ('ETH' or 'DOT1Q') and
            '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           'MEMIF'"
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'CFS_OPT' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not 'LBOND'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base-vm-ndr"
+    layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Latency: k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-1t1c-base-vm-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
-  data: "plot-ligato-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base-vm-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           'MEMIF'"
+           ('ETH' or 'DOT1Q') and
+           '1T1C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'CFS_OPT' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not 'LBOND'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base-vm-pdr"
+    layout: "plot-throughput"
 
-# Packet Latency - VPP Container Memif 3n-hsw-x710
 -
   type: "plot"
-  title: "VPP Latency: k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-2t2c-base-vm-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
-  data: "plot-ligato-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base-vm-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           'MEMIF'"
+           ('ETH' or 'DOT1Q') and
+           '2T2C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'CFS_OPT' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not 'LBOND'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base-vm-ndr"
+    layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Latency: k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-2t2c-base-vm-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
-  data: "plot-ligato-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base-vm-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
+           ('ETH' or 'DOT1Q') and
            '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           'MEMIF'"
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'CFS_OPT' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not 'LBOND'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
-
-################################################################################
+    title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base-vm-pdr"
+    layout: "plot-throughput"
 
-# Packet Latency - VPP IPv4 3n-hsw-x520
+# Packet Throughput - VPP vhost ip4 3n-hsw-xl710
 -
   type: "plot"
-  title: "VPP Latency: ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  filter: "'NIC_Intel-XL710' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '1T1C' and
+           'ETH' and
            'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '1T1C' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'DOT1Q'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "not CFS_OPT"
+  - "1VM"
+  - "2VM"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
+    layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Latency: ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  filter: "'NIC_Intel-XL710' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '2T2C' and
+           'ETH' and
            'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '2T2C' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'DOT1Q'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "not CFS_OPT"
+  - "1VM"
+  - "2VM"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
+    layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Latency: ip4-3n-hsw-x520-64b-1t1c-features-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  filter: "'NIC_Intel-XL710' and
            '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
            'NDRPDR' and
-           '1T1C' and
+           'ETH' and
            'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '1T1C' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'DOT1Q'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "not CFS_OPT"
+  - "1VM"
+  - "2VM"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
+    layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Latency: ip4-3n-hsw-x520-64b-2t2c-features-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  filter: "'NIC_Intel-XL710' and
            '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
            'NDRPDR' and
-           '2T2C' and
+           'ETH' and
            'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '2T2C' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'DOT1Q'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "not CFS_OPT"
+  - "1VM"
+  - "2VM"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
+    layout: "plot-throughput"
 
-# Packet Latency - VPP IPv4 3n-hsw-x710
+# Packet Throughput - VPP vhost l2sw 3n-hsw-xl710
 -
   type: "plot"
-  title: "VPP Latency: ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  filter: "'NIC_Intel-XL710' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
+           ('ETH' or 'DOT1Q') and
            '1T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           'L2BDMACLRN' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+#  sort:
+#  - "VM"  # "not CFS_OPT"
+#  - "CFS_OPT"
+#  - "FIB_10K"
+#  - "FIB_100K"
+#  - "FIB_1M"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
+    layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Latency: ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  filter: "'NIC_Intel-XL710' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
+           ('ETH' or 'DOT1Q') and
            '2T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           'L2BDMACLRN' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+#  sort:
+#  - "VM"  # "not CFS_OPT"
+#  - "CFS_OPT"
+#  - "FIB_10K"
+#  - "FIB_100K"
+#  - "FIB_1M"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
+    layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Latency: ip4-3n-hsw-x710-64b-1t1c-features-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  filter: "'NIC_Intel-XL710' and
            '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
            'NDRPDR' and
+           ('ETH' or 'DOT1Q') and
            '1T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           'L2BDMACLRN' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+#  sort:
+#  - "VM"  # "not CFS_OPT"
+#  - "CFS_OPT"
+#  - "FIB_10K"
+#  - "FIB_100K"
+#  - "FIB_1M"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
+    layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Latency: ip4-3n-hsw-x710-64b-2t2c-features-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  filter: "'NIC_Intel-XL710' and
            '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
            'NDRPDR' and
+           ('ETH' or 'DOT1Q') and
            '2T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           'L2BDMACLRN' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+#  sort:
+#  - "VM"  # "not CFS_OPT"
+#  - "CFS_OPT"
+#  - "FIB_10K"
+#  - "FIB_100K"
+#  - "FIB_1M"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
+    layout: "plot-throughput"
 
-# Packet Latency - VPP IPv4 3n-hsw-xl710
+# Packet Throughput - VPP vhost l2sw 3n-hsw-xl710 - base
 -
   type: "plot"
-  title: "VPP Latency: ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
+           ('ETH' or 'DOT1Q') and
+           'BASE' and
            '1T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-ndr"
+    layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Latency: ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-XL710' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '2T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('ETH' or 'DOT1Q') and
+           'BASE' and
+           '1T1C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-pdr"
+    layout: "plot-throughput"
 
-# Packet Latency - VPP IPv4 3n-skx-x710
 -
   type: "plot"
-  title: "VPP Latency: ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '2T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('ETH' or 'DOT1Q') and
+           'BASE' and
+           '2T2C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-ndr"
+    layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Latency: ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '4T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('ETH' or 'DOT1Q') and
+           'BASE' and
+           '2T2C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-pdr"
+    layout: "plot-throughput"
 
+# Packet Throughput - VPP vhost l2sw 3n-hsw-xl710 - base vm
 -
   type: "plot"
-  title: "VPP Latency: ip4-3n-skx-x710-64b-2t1c-features-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-vm-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-vm-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
            'NDRPDR' and
-           '2T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('ETH' or 'DOT1Q') and
+           '1T1C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'CFS_OPT' and
+           not 'VXLAN' and
+           not 'IP4FWD'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-vm-ndr"
+    layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Latency: ip4-3n-skx-x710-64b-4t2c-features-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-vm-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-vm-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
            'NDRPDR' and
-           '4T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('ETH' or 'DOT1Q') and
+           '1T1C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'CFS_OPT' and
+           not 'VXLAN' and
+           not 'IP4FWD'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-vm-pdr"
+    layout: "plot-throughput"
 
-# Packet Latency - VPP IPv4 2n-skx-x710
 -
   type: "plot"
-  title: "VPP Latency: ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-vm-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-vm-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '2T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('ETH' or 'DOT1Q') and
+           '2T2C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'CFS_OPT' and
+           not 'VXLAN' and
+           not 'IP4FWD'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-vm-ndr"
+    layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Latency: ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-vm-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-vm-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '4T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('ETH' or 'DOT1Q') and
+           '2T2C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'CFS_OPT' and
+           not 'VXLAN' and
+           not 'IP4FWD'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-vm-pdr"
+    layout: "plot-throughput"
 
-# Packet Latency - VPP IPv4 2n-skx-xxv710
+# Packet Throughput - VPP vhost ip4 3n-skx-x710
 -
   type: "plot"
-  title: "VPP Latency: ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '2T1C' and
+           'ETH' and
            'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '2T1C' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'DOT1Q'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "not CFS_OPT"
+  - "1VM"
+  - "2VM"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+    layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Latency: ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '4T2C' and
+           'ETH' and
            'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '4T2C' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'DOT1Q'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "not CFS_OPT"
+  - "1VM"
+  - "2VM"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
-
-################################################################################
+    title: "vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
+    layout: "plot-throughput"
 
-# Packet Latency - VPP Ipv4 tunnels 3n-hsw-x520
 -
   type: "plot"
-  title: "VPP Latency: ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-ip4-3n-skx-x710-64b-2t1c-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-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           'ENCAP' and
            'NDRPDR' and
-           '1T1C' and
-           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           'ETH' and
+           'IP4FWD' and
+           '2T1C' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'DOT1Q'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "not CFS_OPT"
+  - "1VM"
+  - "2VM"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
+    layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Latency: ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-ip4-3n-skx-x710-64b-4t2c-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-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           'ENCAP' and
            'NDRPDR' and
-           '2T2C' and
-           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           'ETH' and
+           'IP4FWD' and
+           '4T2C' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'DOT1Q'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "not CFS_OPT"
+  - "1VM"
+  - "2VM"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
+    layout: "plot-throughput"
 
-# Packet Latency - VPP Ipv4 tunnels 3n-hsw-x710
+# Packet Throughput - VPP vhost l2sw 3n-skx-x710
 -
   type: "plot"
-  title: "VPP Latency: ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           'ENCAP' and
            'NDRPDR' and
-           '1T1C' and
-           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           ('ETH' or 'DOT1Q') and
+           '2T1C' and
+           'L2BDMACLRN' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+#  sort:
+#  - "VM"  # "not CFS_OPT"
+#  - "CFS_OPT"
+#  - "FIB_10K"
+#  - "FIB_100K"
+#  - "FIB_1M"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+    layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Latency: ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           'ENCAP' and
            'NDRPDR' and
-           '2T2C' and
-           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           ('ETH' or 'DOT1Q') and
+           '4T2C' and
+           'L2BDMACLRN' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+#  sort:
+#  - "VM"  # "not CFS_OPT"
+#  - "CFS_OPT"
+#  - "FIB_10K"
+#  - "FIB_100K"
+#  - "FIB_1M"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
+    layout: "plot-throughput"
 
-# Packet Latency - VPP Ipv4 tunnels 3n-skx-x710
 -
   type: "plot"
-  title: "VPP Latency: ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           'ENCAP' and
            'NDRPDR' and
+           ('ETH' or 'DOT1Q') and
            '2T1C' and
-           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           'L2BDMACLRN' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+#  sort:
+#  - "VM"  # "not CFS_OPT"
+#  - "CFS_OPT"
+#  - "FIB_10K"
+#  - "FIB_100K"
+#  - "FIB_1M"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
+    layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Latency: ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           'ENCAP' and
            'NDRPDR' and
+           ('ETH' or 'DOT1Q') and
            '4T2C' and
-           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           'L2BDMACLRN' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+#  sort:
+#  - "VM"  # "not CFS_OPT"
+#  - "CFS_OPT"
+#  - "FIB_10K"
+#  - "FIB_100K"
+#  - "FIB_1M"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
-
-################################################################################
+    title: "vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
+    layout: "plot-throughput"
 
-# Packet Latency - VPP IPv6 3n-hsw-x520
+# Packet Throughput - VPP vhost l2sw 3n-skx-x710 - base
 -
   type: "plot"
-  title: "VPP Latency: ip6-3n-hsw-x520-78b-1t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-2t1c-base-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-1t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           ('BASE' or 'SCALE') and
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-2t1c-base-ndr"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
            'NDRPDR' and
-           '1T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('ETH' or 'DOT1Q') and
+           'BASE' and
+           '2T1C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM' and
+           not 'LBOND'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vhost-l2sw-3n-skx-x710-64b-2t1c-base-ndr"
+    layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Latency: ip6-3n-hsw-x520-78b-2t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-2t1c-base-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-2t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           ('BASE' or 'SCALE') and
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-2t1c-base-pdr"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
            'NDRPDR' and
-           '2T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('ETH' or 'DOT1Q') and
+           'BASE' and
+           '2T1C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM' and
+           not 'LBOND'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vhost-l2sw-3n-skx-x710-64b-2t1c-base-pdr"
+    layout: "plot-throughput"
 
-# Packet Latency - VPP IPv6 3n-hsw-x710
 -
   type: "plot"
-  title: "VPP Latency: ip6-3n-hsw-x710-78b-1t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-4t2c-base-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-1t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-4t2c-base-ndr"
+  data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('BASE' or 'SCALE') and
+           '64B' and
            'NDRPDR' and
-           '1T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('ETH' or 'DOT1Q') and
+           'BASE' and
+           '4T2C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM' and
+           not 'LBOND'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vhost-l2sw-3n-skx-x710-64b-4t2c-base-ndr"
+    layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Latency: ip6-3n-hsw-x710-78b-2t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-4t2c-base-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-2t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-4t2c-base-pdr"
+  data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('BASE' or 'SCALE') and
+           '64B' and
            'NDRPDR' and
-           '2T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('ETH' or 'DOT1Q') and
+           'BASE' and
+           '4T2C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM' and
+           not 'LBOND'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vhost-l2sw-3n-skx-x710-64b-4t2c-base-pdr"
+    layout: "plot-throughput"
 
-# Packet Latency - VPP IPv6 3n-hsw-xl710
+# Packet Throughput - VPP vhost l2sw 3n-skx-x710 - base vm
 -
   type: "plot"
-  title: "VPP Latency: ip6-3n-hsw-xl710-78b-1t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-2t1c-base-vm-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-1t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '78B' and
-           ('BASE' or 'SCALE') and
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-2t1c-base-vm-ndr"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
            'NDRPDR' and
-           '1T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('ETH' or 'DOT1Q') and
+           '2T1C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'CFS_OPT' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not 'LBOND'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vhost-l2sw-3n-skx-x710-64b-2t1c-base-vm-ndr"
+    layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Latency: ip6-3n-hsw-xl710-78b-2t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-2t1c-base-vm-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-2t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '78B' and
-           ('BASE' or 'SCALE') and
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-2t1c-base-vm-pdr"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
            'NDRPDR' and
-           '2T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('ETH' or 'DOT1Q') and
+           '2T1C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'CFS_OPT' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not 'LBOND'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vhost-l2sw-3n-skx-x710-64b-2t1c-base-vm-pdr"
+    layout: "plot-throughput"
 
-# Packet Latency - VPP IPv6 3n-skx-x710
 -
   type: "plot"
-  title: "VPP Latency: ip6-3n-skx-x710-78b-2t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-4t2c-base-vm-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-2t1c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-4t2c-base-vm-ndr"
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('BASE' or 'SCALE') and
+           '64B' and
            'NDRPDR' and
-           '2T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('ETH' or 'DOT1Q') and
+           '4T2C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'CFS_OPT' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not 'LBOND'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vhost-l2sw-3n-skx-x710-64b-4t2c-base-vm-ndr"
+    layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Latency: ip6-3n-skx-x710-78b-4t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-4t2c-base-vm-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-4t2c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-4t2c-base-vm-pdr"
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('BASE' or 'SCALE') and
+           '64B' and
            'NDRPDR' and
+           ('ETH' or 'DOT1Q') and
            '4T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'CFS_OPT' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not 'LBOND'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vhost-l2sw-3n-skx-x710-64b-4t2c-base-vm-pdr"
+    layout: "plot-throughput"
 
-# Packet Latency - VPP IPv6 2n-skx-x710
+# Packet Throughput - VPP vhost ip4 2n-skx-x710
 -
   type: "plot"
-  title: "VPP Latency: ip6-2n-skx-x710-78b-2t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-2t1c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
   data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('BASE' or 'SCALE') and
+           '64B' and
            'NDRPDR' and
+           'ETH' and
+           'IP4FWD' and
            '2T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'DOT1Q'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "not CFS_OPT"
+  - "1VM"
+  - "2VM"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vhost-ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
+    layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Latency: ip6-2n-skx-x710-78b-4t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-4t2c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
   data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('BASE' or 'SCALE') and
+           '64B' and
            'NDRPDR' and
+           'ETH' and
+           'IP4FWD' and
            '4T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'DOT1Q'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "not CFS_OPT"
+  - "1VM"
+  - "2VM"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vhost-ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
+    layout: "plot-throughput"
 
-# Packet Latency - VPP IPv6 2n-skx-xxv710
 -
   type: "plot"
-  title: "VPP Latency: ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-ip4-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
   data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '78B' and
-           ('BASE' or 'SCALE') and
+  filter: "'NIC_Intel-X710' and
+           '64B' and
            'NDRPDR' and
+           'ETH' and
+           'IP4FWD' and
            '2T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'DOT1Q'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "not CFS_OPT"
+  - "1VM"
+  - "2VM"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vhost-ip4-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
+    layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Latency: ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-ip4-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
   data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '78B' and
-           ('BASE' or 'SCALE') and
+  filter: "'NIC_Intel-X710' and
+           '64B' and
            'NDRPDR' and
+           'ETH' and
+           'IP4FWD' and
            '4T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'DOT1Q'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "not CFS_OPT"
+  - "1VM"
+  - "2VM"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
-
-################################################################################
+    title: "vhost-ip4-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
+    layout: "plot-throughput"
 
-# Packet Latency - VPP IPv6 tunnels 3n-hsw-x520
+# Packet Throughput - VPP vhost l2sw 2n-skx-x710
 -
   type: "plot"
-  title: "VPP Latency: ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           'ENCAP' and
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
            'NDRPDR' and
-           '1T1C' and
-           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
-           not 'VHOST'"
+           ('ETH' or 'DOT1Q') and
+           '2T1C' and
+           'L2BDMACLRN' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+#  sort:
+#  - "VM"  # "not CFS_OPT"
+#  - "CFS_OPT"
+#  - "FIB_10K"
+#  - "FIB_100K"
+#  - "FIB_1M"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
+    layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Latency: ip6tun-3n-hsw-x520-78b-2t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-2t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           'ENCAP' and
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
            'NDRPDR' and
-           '2T2C' and
-           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
-           not 'VHOST'"
+           ('ETH' or 'DOT1Q') and
+           '4T2C' and
+           'L2BDMACLRN' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+#  sort:
+#  - "VM"  # "not CFS_OPT"
+#  - "CFS_OPT"
+#  - "FIB_10K"
+#  - "FIB_100K"
+#  - "FIB_1M"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
-
-################################################################################
+    title: "vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
+    layout: "plot-throughput"
 
-# Packet Latency - VPP IPSec 3n-hsw-xl710
 -
   type: "plot"
-  title: "VPP Latency: ipsec-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           'IP4FWD' and
            'NDRPDR' and
-           '1T1C' and
-           'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
-           not 'VHOST'"
+           ('ETH' or 'DOT1Q') and
+           '2T1C' and
+           'L2BDMACLRN' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+#  sort:
+#  - "VM"  # "not CFS_OPT"
+#  - "CFS_OPT"
+#  - "FIB_10K"
+#  - "FIB_100K"
+#  - "FIB_1M"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
+    layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Latency: ipsec-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           'IP4FWD' and
            'NDRPDR' and
-           '2T2C' and
-           'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
-           not 'VHOST'"
+           ('ETH' or 'DOT1Q') and
+           '4T2C' and
+           'L2BDMACLRN' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+#  sort:
+#  - "VM"  # "not CFS_OPT"
+#  - "CFS_OPT"
+#  - "FIB_10K"
+#  - "FIB_100K"
+#  - "FIB_1M"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
-
-################################################################################
+    title: "vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
+    layout: "plot-throughput"
 
-# Packet Latency - VPP SRv6 3n-hsw-x520
+# Packet Throughput - VPP vhost l2sw 2n-skx-x710 - base
 -
   type: "plot"
-  title: "VPP Latency: srv6-3n-hsw-x520-78b-1t1c-features-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-2t1c-base-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-1t1c-features-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           'FEATURE' and
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-2t1c-base-ndr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
            'NDRPDR' and
-           '1T1C' and
-           'IP6FWD' and
-           'SRv6'"
+           ('ETH' or 'DOT1Q') and
+           'BASE' and
+           '2T1C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vhost-l2sw-2n-skx-x710-64b-2t1c-base-ndr"
+    layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Latency: srv6-3n-hsw-x520-78b-2t2c-features-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-2t1c-base-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-2t2c-features-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           'FEATURE' and
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-2t1c-base-pdr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
            'NDRPDR' and
-           '2T2C' and
-           'IP6FWD' and
-           'SRv6'"
+           ('ETH' or 'DOT1Q') and
+           'BASE' and
+           '2T1C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
-
-################################################################################
+    title: "vhost-l2sw-2n-skx-x710-64b-2t1c-base-pdr"
+    layout: "plot-throughput"
 
-# Packet Latency - VPP vhost ip4 3n-hsw-x520
 -
   type: "plot"
-  title: "VPP Latency: vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-4t2c-base-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-4t2c-base-ndr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           '1T1C' and
-           'VHOST' and
-           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           ('ETH' or 'DOT1Q') and
+           'BASE' and
+           '4T2C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vhost-l2sw-2n-skx-x710-64b-4t2c-base-ndr"
+    layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Latency: vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-4t2c-base-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-4t2c-base-pdr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           '2T2C' and
-           'VHOST' and
-           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           ('ETH' or 'DOT1Q') and
+           'BASE' and
+           '4T2C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vhost-l2sw-2n-skx-x710-64b-4t2c-base-pdr"
+    layout: "plot-throughput"
 
-# Packet Latency - VPP vhost l2sw 3n-hsw-x520
+# Packet Throughput - VPP vhost l2sw 2n-skx-x710 - base vm
 -
   type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-2t1c-base-vm-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-2t1c-base-vm-ndr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           '1T1C' and
-           'VHOST' and
+           ('ETH' or 'DOT1Q') and
+           '2T1C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'CFS_OPT' and
            not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'DOT1Q' and
-           not '2VM'"
+           not 'IP4FWD'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vhost-l2sw-2n-skx-x710-64b-2t1c-base-vm-ndr"
+    layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-2t1c-base-vm-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-2t1c-base-vm-pdr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           '2T2C' and
-           'VHOST' and
+           ('ETH' or 'DOT1Q') and
+           '2T1C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'CFS_OPT' and
            not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'DOT1Q' and
-           not '2VM'"
+           not 'IP4FWD'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vhost-l2sw-2n-skx-x710-64b-2t1c-base-vm-pdr"
+    layout: "plot-throughput"
 
-# Packet Latency - VPP vhost ip4 3n-hsw-x710
 -
   type: "plot"
-  title: "VPP Latency: vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-4t2c-base-vm-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-4t2c-base-vm-ndr"
+  data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           '1T1C' and
-           'VHOST' and
-           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           ('ETH' or 'DOT1Q') and
+           '4T2C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'CFS_OPT' and
+           not 'VXLAN' and
+           not 'IP4FWD'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vhost-l2sw-2n-skx-x710-64b-4t2c-base-vm-ndr"
+    layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Latency: vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-4t2c-base-vm-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-4t2c-base-vm-pdr"
+  data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           '2T2C' and
-           'VHOST' and
-           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           ('ETH' or 'DOT1Q') and
+           '4T2C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'CFS_OPT' and
+           not 'VXLAN' and
+           not 'IP4FWD'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vhost-l2sw-2n-skx-x710-64b-4t2c-base-vm-pdr"
+    layout: "plot-throughput"
 
-# Packet Latency - VPP vhost l2sw 3n-hsw-x710
+# Packet Throughput - VPP vhost ip4 2n-skx-xxv710
 -
   type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
            'NDRPDR' and
-           '1T1C' and
-           'VHOST' and
+           'ETH' and
+           'IP4FWD' and
+           '2T1C' and
+           'VHOST_1024' and
            not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'DOT1Q' and
-           not '2VM'"
+           not 'DOT1Q'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "not CFS_OPT"
+  - "1VM"
+  - "2VM"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vhost-ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
+    layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
            'NDRPDR' and
-           '2T2C' and
-           'VHOST' and
+           'ETH' and
+           'IP4FWD' and
+           '4T2C' and
+           'VHOST_1024' and
            not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'DOT1Q' and
-           not '2VM'"
+           not 'DOT1Q'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "not CFS_OPT"
+  - "1VM"
+  - "2VM"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vhost-ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
+    layout: "plot-throughput"
 
-# Packet Latency - VPP vhost ip4 3n-hsw-xl710
 -
   type: "plot"
-  title: "VPP Latency: vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
            'NDRPDR' and
-           '1T1C' and
-           'VHOST' and
-           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           'ETH' and
+           'IP4FWD' and
+           '2T1C' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'DOT1Q'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "not CFS_OPT"
+  - "1VM"
+  - "2VM"
   traces:
-    boxmean: False
-  layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "vhost-ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
+    layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Latency: vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
            'NDRPDR' and
-           '2T2C' and
-           'VHOST' and
-           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           'ETH' and
+           'IP4FWD' and
+           '4T2C' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'DOT1Q'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+  sort:
+  - "not CFS_OPT"
+  - "1VM"
+  - "2VM"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vhost-ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
+    layout: "plot-throughput"
 
-# Packet Latency - VPP vhost l2sw 3n-hsw-xl710
+# Packet Throughput - VPP vhost l2sw 2n-skx-xxv710
 -
   type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
            'NDRPDR' and
-           '1T1C' and
-           'VHOST' and
+           ('ETH' or 'DOT1Q') and
+           '2T1C' and
+           'L2BDMACLRN' and
+           'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+#  sort:
+#  - "VM"  # "not CFS_OPT"
+#  - "CFS_OPT"
+#  - "FIB_10K"
+#  - "FIB_100K"
+#  - "FIB_1M"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
+    layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Latency: vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
            'NDRPDR' and
-           '2T2C' and
-           'VHOST' and
+           ('ETH' or 'DOT1Q') and
+           '4T2C' and
+           'L2BDMACLRN' and
+           'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+#  sort:
+#  - "VM"  # "not CFS_OPT"
+#  - "CFS_OPT"
+#  - "FIB_10K"
+#  - "FIB_100K"
+#  - "FIB_1M"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
-
-################################################################################
+    title: "vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
+    layout: "plot-throughput"
 
-# Packet Latency - VPP VTS 3n-hsw-x520
 -
   type: "plot"
-  title: "VPP Latency: vts-3n-hsw-x520-114b-1t1c-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-114b-1t1c-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '114B' and
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
+           '64B' and
            'NDRPDR' and
-           '1T1C' and
-           'VTS'"
+           ('ETH' or 'DOT1Q') and
+           '2T1C' and
+           'L2BDMACLRN' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+#  sort:
+#  - "VM"  # "not CFS_OPT"
+#  - "CFS_OPT"
+#  - "FIB_10K"
+#  - "FIB_100K"
+#  - "FIB_1M"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
+    layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Latency: vts-3n-hsw-x520-114b-2t2c-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-114b-2t2c-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '114B' and
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
+           '64B' and
            'NDRPDR' and
-           '2T2C' and
-           'VTS'"
+           ('ETH' or 'DOT1Q') and
+           '4T2C' and
+           'L2BDMACLRN' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+#  sort:
+#  - "VM"  # "not CFS_OPT"
+#  - "CFS_OPT"
+#  - "FIB_10K"
+#  - "FIB_100K"
+#  - "FIB_1M"
   traces:
-    boxmean: False
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
-    
-################################################################################
+    title: "vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
+    layout: "plot-throughput"
 
-# Packet Latency - DPDK l3fwd 3n-hsw-x520
+# Packet Throughput - VPP vhost l2sw 2n-skx-xxv710 - base
 -
   type: "plot"
-  title: "DPDK Latency: l3fwd-3n-hsw-x520-64b-1t1c-base-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x520-64b-1t1c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-ndr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
-           'BASE' and
            'NDRPDR' and
-           '1T1C' and
-           'IP4FWD'"
+           ('ETH' or 'DOT1Q') and
+           'BASE' and
+           '2T1C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-ndr"
+    layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "DPDK Latency: l3fwd-3n-hsw-x520-64b-2t2c-base-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x520-64b-2t2c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-pdr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
-           'BASE' and
            'NDRPDR' and
-           '2T2C' and
-           'IP4FWD'"
+           ('ETH' or 'DOT1Q') and
+           'BASE' and
+           '2T1C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-pdr"
+    layout: "plot-throughput"
 
-# Packet Latency - DPDK l3fwd 3n-hsw-x710
 -
   type: "plot"
-  title: "DPDK Latency: l3fwd-3n-hsw-x710-64b-1t1c-base-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x710-64b-1t1c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-ndr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
-           'BASE' and
            'NDRPDR' and
-           '1T1C' and
-           'IP4FWD'"
+           ('ETH' or 'DOT1Q') and
+           'BASE' and
+           '4T2C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-ndr"
+    layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "DPDK Latency: l3fwd-3n-hsw-x710-64b-2t2c-base-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x710-64b-2t2c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-pdr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
-           'BASE' and
            'NDRPDR' and
-           '2T2C' and
-           'IP4FWD'"
+           ('ETH' or 'DOT1Q') and
+           'BASE' and
+           '4T2C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-pdr"
+    layout: "plot-throughput"
 
-# Packet Latency - DPDK l3fwd 3n-hsw-xl710
+# Packet Throughput - VPP vhost l2sw 2n-skx-xxv710 - base vm
 -
   type: "plot"
-  title: "DPDK Latency: l3fwd-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-vm-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-vm-ndr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
-           'BASE' and
            'NDRPDR' and
-           '1T1C' and
-           'IP4FWD'"
+           ('ETH' or 'DOT1Q') and
+           '2T1C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'CFS_OPT' and
+           not 'VXLAN' and
+           not 'IP4FWD'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-vm-ndr"
+    layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "DPDK Latency: l3fwd-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-vm-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-vm-pdr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
-           'BASE' and
            'NDRPDR' and
-           '2T2C' and
-           'IP4FWD'"
+           ('ETH' or 'DOT1Q') and
+           '2T1C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'CFS_OPT' and
+           not 'VXLAN' and
+           not 'IP4FWD'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-vm-pdr"
+    layout: "plot-throughput"
 
-# Packet Latency - DPDK l3fwd 3n-skx-x710
 -
   type: "plot"
-  title: "DPDK Latency: l3fwd-3n-skx-x710-64b-2t1c-base-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-skx-x710-64b-2t1c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-ndr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
-           'BASE' and
            'NDRPDR' and
-           '2T1C' and
-           'IP4FWD'"
+           ('ETH' or 'DOT1Q') and
+           '4T2C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'CFS_OPT' and
+           not 'VXLAN' and
+           not 'IP4FWD'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-ndr"
+    layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "DPDK Latency: l3fwd-3n-skx-x710-64b-4t2c-base-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-skx-x710-64b-4t2c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-pdr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
-           'BASE' and
            'NDRPDR' and
+           ('ETH' or 'DOT1Q') and
            '4T2C' and
-           'IP4FWD'"
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'CFS_OPT' and
+           not 'VXLAN' and
+           not 'IP4FWD'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-pdr"
+    layout: "plot-throughput"
 
-# Packet Latency - DPDK l3fwd 3n-skx-xxv710
+################################################################################
+
+# Packet Throughput - VPP VTS 3n-hsw-x520
 -
   type: "plot"
-  title: "DPDK Latency: l3fwd-3n-skx-xxv710-64b-2t1c-base-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vts-3n-hsw-x520-114b-1t1c-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-skx-xxv710-64b-2t1c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'BASE' and
+  output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-114b-1t1c-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '114B' and
            'NDRPDR' and
-           '2T1C' and
-           'IP4FWD'"
+           '1T1C' and
+           'VTS'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vts-3n-hsw-x520-114b-1t1c-ndr"
+    layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "DPDK Latency: l3fwd-3n-skx-xxv710-64b-4t2c-base-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vts-3n-hsw-x520-114b-2t2c-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-skx-xxv710-64b-4t2c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'BASE' and
+  output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-114b-2t2c-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '114B' and
            'NDRPDR' and
-           '4T2C' and
-           'IP4FWD'"
+           '2T2C' and
+           'VTS'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vts-3n-hsw-x520-114b-2t2c-ndr"
+    layout: "plot-throughput"
 
-# Packet Latency - DPDK l3fwd 2n-skx-x710
 -
   type: "plot"
-  title: "DPDK Latency: l3fwd-2n-skx-x710-64b-2t1c-base-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vts-3n-hsw-x520-114b-1t1c-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-2n-skx-x710-64b-2t1c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'BASE' and
+  output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-114b-1t1c-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '114B' and
            'NDRPDR' and
-           '2T1C' and
-           'IP4FWD'"
+           '1T1C' and
+           'VTS'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vts-3n-hsw-x520-114b-1t1c-pdr"
+    layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "DPDK Latency: l3fwd-2n-skx-x710-64b-4t2c-base-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "VPP Throughput: vts-3n-hsw-x520-114b-2t2c-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-2n-skx-x710-64b-4t2c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'BASE' and
+  output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-114b-2t2c-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '114B' and
            'NDRPDR' and
-           '4T2C' and
-           'IP4FWD'"
+           '2T2C' and
+           'VTS'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "vts-3n-hsw-x520-114b-2t2c-pdr"
+    layout: "plot-throughput"
 
-# Packet Latency - DPDK l3fwd 2n-skx-xxv710
+################################################################################
+
+# Packet Throughput - DPDK l3fwd 3n-hsw-x520
 -
   type: "plot"
-  title: "DPDK Latency: l3fwd-2n-skx-xxv710-64b-2t1c-base-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "DPDK Throughput: l3fwd-3n-hsw-x520-64b-1t1c-base-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-2n-skx-xxv710-64b-2t1c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x520-64b-1t1c-base-ndr"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'BASE' and
            'NDRPDR' and
-           '2T1C' and
+           '1T1C' and
            'IP4FWD'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "l3fwd-3n-hsw-x520-64b-1t1c-base-ndr"
+    layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "DPDK Latency: l3fwd-2n-skx-xxv710-64b-4t2c-base-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "DPDK Throughput: l3fwd-3n-hsw-x520-64b-2t2c-base-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/l3fwd-2n-skx-xxv710-64b-4t2c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x520-64b-2t2c-base-ndr"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'BASE' and
            'NDRPDR' and
-           '4T2C' and
+           '2T2C' and
            'IP4FWD'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
-
-################################################################################
+    title: "l3fwd-3n-hsw-x520-64b-2t2c-base-ndr"
+    layout: "plot-throughput"
 
-# Packet Latency - DPDK testpmd 3n-hsw-x520
 -
   type: "plot"
-  title: "DPDK Latency: testpmd-3n-hsw-x520-64b-1t1c-base-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "DPDK Throughput: l3fwd-3n-hsw-x520-64b-1t1c-base-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x520-64b-1t1c-base-ndr-lat"
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x520-64b-1t1c-base-pdr"
   data: "plot-dpdk-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'BASE' and
            'NDRPDR' and
            '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           'IP4FWD'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "l3fwd-3n-hsw-x520-64b-1t1c-base-pdr"
+    layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "DPDK Latency: testpmd-3n-hsw-x520-64b-2t2c-base-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "DPDK Throughput: l3fwd-3n-hsw-x520-64b-2t2c-base-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x520-64b-2t2c-base-ndr-lat"
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x520-64b-2t2c-base-pdr"
   data: "plot-dpdk-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'BASE' and
            'NDRPDR' and
            '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           'IP4FWD'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "l3fwd-3n-hsw-x520-64b-2t2c-base-pdr"
+    layout: "plot-throughput"
 
-# Packet Latency - DPDK testpmd 3n-hsw-x710
+# Packet Throughput - DPDK l3fwd 3n-hsw-x710
 -
   type: "plot"
-  title: "DPDK Latency: testpmd-3n-hsw-x710-64b-1t1c-base-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "DPDK Throughput: l3fwd-3n-hsw-x710-64b-1t1c-base-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x710-64b-1t1c-base-ndr-lat"
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x710-64b-1t1c-base-ndr"
   data: "plot-dpdk-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'BASE' and
            'NDRPDR' and
            '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           'IP4FWD'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "l3fwd-3n-hsw-x710-64b-1t1c-base-ndr"
+    layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "DPDK Latency: testpmd-3n-hsw-x710-64b-2t2c-base-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "DPDK Throughput: l3fwd-3n-hsw-x710-64b-2t2c-base-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x710-64b-2t2c-base-ndr-lat"
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x710-64b-2t2c-base-ndr"
   data: "plot-dpdk-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'BASE' and
            'NDRPDR' and
            '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           'IP4FWD'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "l3fwd-3n-hsw-x710-64b-2t2c-base-ndr"
+    layout: "plot-throughput"
 
-# Packet Latency - DPDK testpmd 3n-hsw-xl710
 -
   type: "plot"
-  title: "DPDK Latency: testpmd-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "DPDK Throughput: l3fwd-3n-hsw-x710-64b-1t1c-base-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x710-64b-1t1c-base-pdr"
   data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  filter: "'NIC_Intel-X710' and
            '64B' and
            'BASE' and
            'NDRPDR' and
            '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           'IP4FWD'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "l3fwd-3n-hsw-x710-64b-1t1c-base-pdr"
+    layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "DPDK Latency: testpmd-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "DPDK Throughput: l3fwd-3n-hsw-x710-64b-2t2c-base-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x710-64b-2t2c-base-pdr"
   data: "plot-dpdk-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  filter: "'NIC_Intel-X710' and
            '64B' and
            'BASE' and
            'NDRPDR' and
            '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           'IP4FWD'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "l3fwd-3n-hsw-x710-64b-2t2c-base-pdr"
+    layout: "plot-throughput"
 
-# Packet Latency - DPDK testpmd 3n-skx-x710
+# Packet Throughput - DPDK l3fwd 3n-hsw-xl710
 -
   type: "plot"
-  title: "DPDK Latency: testpmd-3n-skx-x710-64b-2t1c-base-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "DPDK Throughput: l3fwd-3n-hsw-xl710-64b-1t1c-base-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-skx-x710-64b-2t1c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-xl710-64b-1t1c-base-ndr"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '64B' and
            'BASE' and
            'NDRPDR' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           '1T1C' and
+           'IP4FWD'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "l3fwd-3n-hsw-xl710-64b-1t1c-base-ndr"
+    layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "DPDK Latency: testpmd-3n-skx-x710-64b-4t2c-base-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "DPDK Throughput: l3fwd-3n-hsw-xl710-64b-2t2c-base-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-skx-x710-64b-4t2c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-xl710-64b-2t2c-base-ndr"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '64B' and
            'BASE' and
            'NDRPDR' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           '2T2C' and
+           'IP4FWD'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "l3fwd-3n-hsw-xl710-64b-2t2c-base-ndr"
+    layout: "plot-throughput"
 
-# Packet Latency - DPDK testpmd 3n-skx-xxv710
 -
   type: "plot"
-  title: "DPDK Latency: testpmd-3n-skx-xxv710-64b-2t1c-base-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "DPDK Throughput: l3fwd-3n-hsw-xl710-64b-1t1c-base-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-skx-xxv710-64b-2t1c-base-ndr-lat"
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-xl710-64b-1t1c-base-pdr"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
+           '64B' and
+           'BASE' and
+           'NDRPDR' and
+           '1T1C' and
+           'IP4FWD'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "l3fwd-3n-hsw-xl710-64b-1t1c-base-pdr"
+    layout: "plot-throughput"
+
+-
+  type: "plot"
+  title: "DPDK Throughput: l3fwd-3n-hsw-xl710-64b-2t2c-base-pdr"
+  algorithm: "plot_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-xl710-64b-2t2c-base-pdr"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
+           '64B' and
+           'BASE' and
+           'NDRPDR' and
+           '2T2C' and
+           'IP4FWD'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "l3fwd-3n-hsw-xl710-64b-2t2c-base-pdr"
+    layout: "plot-throughput"
+
+# Packet Throughput - DPDK l3fwd 3n-skx-x710
+-
+  type: "plot"
+  title: "DPDK Throughput: l3fwd-3n-skx-x710-64b-2t1c-base-ndr"
+  algorithm: "plot_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-skx-x710-64b-2t1c-base-ndr"
+  data: "plot-dpdk-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'BASE' and
+           'NDRPDR' and
+           '2T1C' and
+           'IP4FWD'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "l3fwd-3n-skx-x710-64b-2t1c-base-ndr"
+    layout: "plot-throughput"
+
+-
+  type: "plot"
+  title: "DPDK Throughput: l3fwd-3n-skx-x710-64b-4t2c-base-ndr"
+  algorithm: "plot_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-skx-x710-64b-4t2c-base-ndr"
+  data: "plot-dpdk-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'BASE' and
+           'NDRPDR' and
+           '4T2C' and
+           'IP4FWD'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "l3fwd-3n-skx-x710-64b-4t2c-base-ndr"
+    layout: "plot-throughput"
+
+-
+  type: "plot"
+  title: "DPDK Throughput: l3fwd-3n-skx-x710-64b-2t1c-base-pdr"
+  algorithm: "plot_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-skx-x710-64b-2t1c-base-pdr"
+  data: "plot-dpdk-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'BASE' and
+           'NDRPDR' and
+           '2T1C' and
+           'IP4FWD'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "l3fwd-3n-skx-x710-64b-2t1c-base-pdr"
+    layout: "plot-throughput"
+
+-
+  type: "plot"
+  title: "DPDK Throughput: l3fwd-3n-skx-x710-64b-4t2c-base-pdr"
+  algorithm: "plot_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-skx-x710-64b-4t2c-base-pdr"
+  data: "plot-dpdk-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'BASE' and
+           'NDRPDR' and
+           '4T2C' and
+           'IP4FWD'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "l3fwd-3n-skx-x710-64b-4t2c-base-pdr"
+    layout: "plot-throughput"
+
+# Packet Throughput - DPDK l3fwd 3n-skx-xxv710
+-
+  type: "plot"
+  title: "DPDK Throughput: l3fwd-3n-skx-xxv710-64b-2t1c-base-ndr"
+  algorithm: "plot_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-skx-xxv710-64b-2t1c-base-ndr"
   data: "plot-dpdk-throughput-latency-3n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'BASE' and
            'NDRPDR' and
            '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           'IP4FWD'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "l3fwd-3n-skx-xxv710-64b-2t1c-base-ndr"
+    layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "DPDK Latency: testpmd-3n-skx-xxv710-64b-4t2c-base-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "DPDK Throughput: l3fwd-3n-skx-xxv710-64b-4t2c-base-ndr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-skx-xxv710-64b-4t2c-base-ndr-lat"
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-skx-xxv710-64b-4t2c-base-ndr"
   data: "plot-dpdk-throughput-latency-3n-skx"
   filter: "'NIC_Intel-XXV710' and
            '64B' and
            'BASE' and
            'NDRPDR' and
            '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           'IP4FWD'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
+  - "tags"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "l3fwd-3n-skx-xxv710-64b-4t2c-base-ndr"
+    layout: "plot-throughput"
 
-# Packet Latency - DPDK testpmd 2n-skx-x710
 -
   type: "plot"
-  title: "DPDK Latency: testpmd-2n-skx-x710-64b-2t1c-base-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "DPDK Throughput: l3fwd-3n-skx-xxv710-64b-2t1c-base-pdr"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-x710-64b-2t1c-base-ndr-lat"
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-skx-xxv710-64b-2t1c-base-pdr"
+  data: "plot-dpdk-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-XXV710' and
+           '64B' and
+           'BASE' and
+           'NDRPDR' and
+           '2T1C' and
+           'IP4FWD'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "l3fwd-3n-skx-xxv710-64b-2t1c-base-pdr"
+    layout: "plot-throughput"
+
+-
+  type: "plot"
+  title: "DPDK Throughput: l3fwd-3n-skx-xxv710-64b-4t2c-base-pdr"
+  algorithm: "plot_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-skx-xxv710-64b-4t2c-base-pdr"
+  data: "plot-dpdk-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-XXV710' and
+           '64B' and
+           'BASE' and
+           'NDRPDR' and
+           '4T2C' and
+           'IP4FWD'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "l3fwd-3n-skx-xxv710-64b-4t2c-base-pdr"
+    layout: "plot-throughput"
+
+# Packet Throughput - DPDK l3fwd 2n-skx-x710
+-
+  type: "plot"
+  title: "DPDK Throughput: l3fwd-2n-skx-x710-64b-2t1c-base-ndr"
+  algorithm: "plot_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-2n-skx-x710-64b-2t1c-base-ndr"
   data: "plot-dpdk-throughput-latency-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'BASE' and
            'NDRPDR' and
            '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           'IP4FWD'"
   parameters:
-  - "latency"
+  - "throughput"
+  - "parent"
+  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "l3fwd-2n-skx-x710-64b-2t1c-base-ndr"
+    layout: "plot-throughput"
+
+-
+  type: "plot"
+  title: "DPDK Throughput: l3fwd-2n-skx-x710-64b-4t2c-base-ndr"
+  algorithm: "plot_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-2n-skx-x710-64b-4t2c-base-ndr"
+  data: "plot-dpdk-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'BASE' and
+           'NDRPDR' and
+           '4T2C' and
+           'IP4FWD'"
+  parameters:
+  - "throughput"
   - "parent"
+  - "tags"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "l3fwd-2n-skx-x710-64b-4t2c-base-ndr"
+    layout: "plot-throughput"
+
+-
+  type: "plot"
+  title: "DPDK Throughput: l3fwd-2n-skx-x710-64b-2t1c-base-pdr"
+  algorithm: "plot_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-2n-skx-x710-64b-2t1c-base-pdr"
+  data: "plot-dpdk-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'BASE' and
+           'NDRPDR' and
+           '2T1C' and
+           'IP4FWD'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "l3fwd-2n-skx-x710-64b-2t1c-base-pdr"
+    layout: "plot-throughput"
+
+-
+  type: "plot"
+  title: "DPDK Throughput: l3fwd-2n-skx-x710-64b-4t2c-base-pdr"
+  algorithm: "plot_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-2n-skx-x710-64b-4t2c-base-pdr"
+  data: "plot-dpdk-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'BASE' and
+           'NDRPDR' and
+           '4T2C' and
+           'IP4FWD'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "l3fwd-2n-skx-x710-64b-4t2c-base-pdr"
+    layout: "plot-throughput"
+
+# Packet Throughput - DPDK l3fwd 2n-skx-xxv710
+-
+  type: "plot"
+  title: "DPDK Throughput: l3fwd-2n-skx-xxv710-64b-2t1c-base-ndr"
+  algorithm: "plot_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-2n-skx-xxv710-64b-2t1c-base-ndr"
+  data: "plot-dpdk-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
+           '64B' and
+           'BASE' and
+           'NDRPDR' and
+           '2T1C' and
+           'IP4FWD'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "l3fwd-2n-skx-xxv710-64b-2t1c-base-ndr"
+    layout: "plot-throughput"
+
+-
+  type: "plot"
+  title: "DPDK Throughput: l3fwd-2n-skx-xxv710-64b-4t2c-base-ndr"
+  algorithm: "plot_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-2n-skx-xxv710-64b-4t2c-base-ndr"
+  data: "plot-dpdk-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
+           '64B' and
+           'BASE' and
+           'NDRPDR' and
+           '4T2C' and
+           'IP4FWD'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "l3fwd-2n-skx-xxv710-64b-4t2c-base-ndr"
+    layout: "plot-throughput"
+
+-
+  type: "plot"
+  title: "DPDK Throughput: l3fwd-2n-skx-xxv710-64b-2t1c-base-pdr"
+  algorithm: "plot_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-2n-skx-xxv710-64b-2t1c-base-pdr"
+  data: "plot-dpdk-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
+           '64B' and
+           'BASE' and
+           'NDRPDR' and
+           '2T1C' and
+           'IP4FWD'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "l3fwd-2n-skx-xxv710-64b-2t1c-base-pdr"
+    layout: "plot-throughput"
+
+-
+  type: "plot"
+  title: "DPDK Throughput: l3fwd-2n-skx-xxv710-64b-4t2c-base-pdr"
+  algorithm: "plot_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-2n-skx-xxv710-64b-4t2c-base-pdr"
+  data: "plot-dpdk-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
+           '64B' and
+           'BASE' and
+           'NDRPDR' and
+           '4T2C' and
+           'IP4FWD'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "l3fwd-2n-skx-xxv710-64b-4t2c-base-pdr"
+    layout: "plot-throughput"
+
+################################################################################
+
+# Packet Throughput - DPDK testpmd 3n-hsw-x520
+-
+  type: "plot"
+  title: "DPDK Throughput: testpmd-3n-hsw-x520-64b-1t1c-base-ndr"
+  algorithm: "plot_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x520-64b-1t1c-base-ndr"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           'BASE' and
+           'NDRPDR' and
+           '1T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "testpmd-3n-hsw-x520-64b-1t1c-base-ndr"
+    layout: "plot-throughput"
+
+-
+  type: "plot"
+  title: "DPDK Throughput: testpmd-3n-hsw-x520-64b-2t2c-base-ndr"
+  algorithm: "plot_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x520-64b-2t2c-base-ndr"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           'BASE' and
+           'NDRPDR' and
+           '2T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "testpmd-3n-hsw-x520-64b-2t2c-base-ndr"
+    layout: "plot-throughput"
+
+-
+  type: "plot"
+  title: "DPDK Throughput: testpmd-3n-hsw-x520-64b-1t1c-base-pdr"
+  algorithm: "plot_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x520-64b-1t1c-base-pdr"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           'BASE' and
+           'NDRPDR' and
+           '1T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "testpmd-3n-hsw-x520-64b-1t1c-base-pdr"
+    layout: "plot-throughput"
+
+-
+  type: "plot"
+  title: "DPDK Throughput: testpmd-3n-hsw-x520-64b-2t2c-base-pdr"
+  algorithm: "plot_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x520-64b-2t2c-base-pdr"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           'BASE' and
+           'NDRPDR' and
+           '2T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "testpmd-3n-hsw-x520-64b-2t2c-base-pdr"
+    layout: "plot-throughput"
+
+# Packet Throughput - DPDK testpmd 3n-hsw-x710
+-
+  type: "plot"
+  title: "DPDK Throughput: testpmd-3n-hsw-x710-64b-1t1c-base-ndr"
+  algorithm: "plot_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x710-64b-1t1c-base-ndr"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'BASE' and
+           'NDRPDR' and
+           '1T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "testpmd-3n-hsw-x710-64b-1t1c-base-ndr"
+    layout: "plot-throughput"
+
+-
+  type: "plot"
+  title: "DPDK Throughput: testpmd-3n-hsw-x710-64b-2t2c-base-ndr"
+  algorithm: "plot_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x710-64b-2t2c-base-ndr"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'BASE' and
+           'NDRPDR' and
+           '2T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "testpmd-3n-hsw-x710-64b-2t2c-base-ndr"
+    layout: "plot-throughput"
+
+-
+  type: "plot"
+  title: "DPDK Throughput: testpmd-3n-hsw-x710-64b-1t1c-base-pdr"
+  algorithm: "plot_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x710-64b-1t1c-base-pdr"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'BASE' and
+           'NDRPDR' and
+           '1T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "testpmd-3n-hsw-x710-64b-1t1c-base-pdr"
+    layout: "plot-throughput"
+
+-
+  type: "plot"
+  title: "DPDK Throughput: testpmd-3n-hsw-x710-64b-2t2c-base-pdr"
+  algorithm: "plot_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x710-64b-2t2c-base-pdr"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'BASE' and
+           'NDRPDR' and
+           '2T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "testpmd-3n-hsw-x710-64b-2t2c-base-pdr"
+    layout: "plot-throughput"
+
+# Packet Throughput - DPDK testpmd 3n-hsw-xl710
+-
+  type: "plot"
+  title: "DPDK Throughput: testpmd-3n-hsw-xl710-64b-1t1c-base-ndr"
+  algorithm: "plot_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-xl710-64b-1t1c-base-ndr"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
+           '64B' and
+           'BASE' and
+           'NDRPDR' and
+           '1T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "testpmd-3n-hsw-xl710-64b-1t1c-base-ndr"
+    layout: "plot-throughput"
+
+-
+  type: "plot"
+  title: "DPDK Throughput: testpmd-3n-hsw-xl710-64b-2t2c-base-ndr"
+  algorithm: "plot_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-xl710-64b-2t2c-base-ndr"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
+           '64B' and
+           'BASE' and
+           'NDRPDR' and
+           '2T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "testpmd-3n-hsw-xl710-64b-2t2c-base-ndr"
+    layout: "plot-throughput"
+
+-
+  type: "plot"
+  title: "DPDK Throughput: testpmd-3n-hsw-xl710-64b-1t1c-base-pdr"
+  algorithm: "plot_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-xl710-64b-1t1c-base-pdr"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
+           '64B' and
+           'BASE' and
+           'NDRPDR' and
+           '1T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "testpmd-3n-hsw-xl710-64b-1t1c-base-pdr"
+    layout: "plot-throughput"
+
+-
+  type: "plot"
+  title: "DPDK Throughput: testpmd-3n-hsw-xl710-64b-2t2c-base-pdr"
+  algorithm: "plot_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-xl710-64b-2t2c-base-pdr"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
+           '64B' and
+           'BASE' and
+           'NDRPDR' and
+           '2T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "testpmd-3n-hsw-xl710-64b-2t2c-base-pdr"
+    layout: "plot-throughput"
+
+# Packet Throughput - DPDK testpmd 3n-skx-x710
+-
+  type: "plot"
+  title: "DPDK Throughput: testpmd-3n-skx-x710-64b-2t1c-base-ndr"
+  algorithm: "plot_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-skx-x710-64b-2t1c-base-ndr"
+  data: "plot-dpdk-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'BASE' and
+           'NDRPDR' and
+           '2T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "testpmd-3n-skx-x710-64b-2t1c-base-ndr"
+    layout: "plot-throughput"
+
+-
+  type: "plot"
+  title: "DPDK Throughput: testpmd-3n-skx-x710-64b-4t2c-base-ndr"
+  algorithm: "plot_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-skx-x710-64b-4t2c-base-ndr"
+  data: "plot-dpdk-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'BASE' and
+           'NDRPDR' and
+           '4T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "testpmd-3n-skx-x710-64b-4t2c-base-ndr"
+    layout: "plot-throughput"
+
+-
+  type: "plot"
+  title: "DPDK Throughput: testpmd-3n-skx-x710-64b-2t1c-base-pdr"
+  algorithm: "plot_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-skx-x710-64b-2t1c-base-pdr"
+  data: "plot-dpdk-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'BASE' and
+           'NDRPDR' and
+           '2T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "testpmd-3n-skx-x710-64b-2t1c-base-pdr"
+    layout: "plot-throughput"
+
+-
+  type: "plot"
+  title: "DPDK Throughput: testpmd-3n-skx-x710-64b-4t2c-base-pdr"
+  algorithm: "plot_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-skx-x710-64b-4t2c-base-pdr"
+  data: "plot-dpdk-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'BASE' and
+           'NDRPDR' and
+           '4T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "testpmd-3n-skx-x710-64b-4t2c-base-pdr"
+    layout: "plot-throughput"
+
+# Packet Throughput - DPDK testpmd 3n-skx-xxv710
+-
+  type: "plot"
+  title: "DPDK Throughput: testpmd-3n-skx-xxv710-64b-2t1c-base-ndr"
+  algorithm: "plot_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-skx-xxv710-64b-2t1c-base-ndr"
+  data: "plot-dpdk-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-XXV710' and
+           '64B' and
+           'BASE' and
+           'NDRPDR' and
+           '2T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "testpmd-3n-skx-xxv710-64b-2t1c-base-ndr"
+    layout: "plot-throughput"
+
+-
+  type: "plot"
+  title: "DPDK Throughput: testpmd-3n-skx-xxv710-64b-4t2c-base-ndr"
+  algorithm: "plot_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-skx-xxv710-64b-4t2c-base-ndr"
+  data: "plot-dpdk-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-XXV710' and
+           '64B' and
+           'BASE' and
+           'NDRPDR' and
+           '4T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "testpmd-3n-skx-xxv710-64b-4t2c-base-ndr"
+    layout: "plot-throughput"
+
+-
+  type: "plot"
+  title: "DPDK Throughput: testpmd-3n-skx-xxv710-64b-2t1c-base-pdr"
+  algorithm: "plot_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-skx-xxv710-64b-2t1c-base-pdr"
+  data: "plot-dpdk-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-XXV710' and
+           '64B' and
+           'BASE' and
+           'NDRPDR' and
+           '2T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "testpmd-3n-skx-xxv710-64b-2t1c-base-pdr"
+    layout: "plot-throughput"
+
+-
+  type: "plot"
+  title: "DPDK Throughput: testpmd-3n-skx-xxv710-64b-4t2c-base-pdr"
+  algorithm: "plot_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-skx-xxv710-64b-4t2c-base-pdr"
+  data: "plot-dpdk-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-XXV710' and
+           '64B' and
+           'BASE' and
+           'NDRPDR' and
+           '4T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "testpmd-3n-skx-xxv710-64b-4t2c-base-pdr"
+    layout: "plot-throughput"
+
+# Packet Throughput - DPDK testpmd 2n-skx-x710
+-
+  type: "plot"
+  title: "DPDK Throughput: testpmd-2n-skx-x710-64b-2t1c-base-ndr"
+  algorithm: "plot_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-x710-64b-2t1c-base-ndr"
+  data: "plot-dpdk-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'BASE' and
+           'NDRPDR' and
+           '2T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "testpmd-2n-skx-x710-64b-2t1c-base-ndr"
+    layout: "plot-throughput"
+
+-
+  type: "plot"
+  title: "DPDK Throughput: testpmd-2n-skx-x710-64b-4t2c-base-ndr"
+  algorithm: "plot_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-x710-64b-4t2c-base-ndr"
+  data: "plot-dpdk-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'BASE' and
+           'NDRPDR' and
+           '4T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "testpmd-2n-skx-x710-64b-4t2c-base-ndr"
+    layout: "plot-throughput"
+
+-
+  type: "plot"
+  title: "DPDK Throughput: testpmd-2n-skx-x710-64b-2t1c-base-pdr"
+  algorithm: "plot_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-x710-64b-2t1c-base-pdr"
+  data: "plot-dpdk-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'BASE' and
+           'NDRPDR' and
+           '2T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "testpmd-2n-skx-x710-64b-2t1c-base-pdr"
+    layout: "plot-throughput"
+
+-
+  type: "plot"
+  title: "DPDK Throughput: testpmd-2n-skx-x710-64b-4t2c-base-pdr"
+  algorithm: "plot_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-x710-64b-4t2c-base-pdr"
+  data: "plot-dpdk-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'BASE' and
+           'NDRPDR' and
+           '4T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "testpmd-2n-skx-x710-64b-4t2c-base-pdr"
+    layout: "plot-throughput"
+
+# Packet Throughput - DPDK testpmd 2n-skx-xxv710
+-
+  type: "plot"
+  title: "DPDK Throughput: testpmd-2n-skx-xxv710-64b-2t1c-base-ndr"
+  algorithm: "plot_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-xxv710-64b-2t1c-base-ndr"
+  data: "plot-dpdk-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
+           '64B' and
+           'BASE' and
+           'NDRPDR' and
+           '2T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "testpmd-2n-skx-xxv710-64b-2t1c-base-ndr"
+    layout: "plot-throughput"
+
+-
+  type: "plot"
+  title: "DPDK Throughput: testpmd-2n-skx-xxv710-64b-4t2c-base-ndr"
+  algorithm: "plot_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-xxv710-64b-4t2c-base-ndr"
+  data: "plot-dpdk-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
+           '64B' and
+           'BASE' and
+           'NDRPDR' and
+           '4T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "testpmd-2n-skx-xxv710-64b-4t2c-base-ndr"
+    layout: "plot-throughput"
+
+-
+  type: "plot"
+  title: "DPDK Throughput: testpmd-2n-skx-xxv710-64b-2t1c-base-pdr"
+  algorithm: "plot_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-xxv710-64b-2t1c-base-pdr"
+  data: "plot-dpdk-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
+           '64B' and
+           'BASE' and
+           'NDRPDR' and
+           '2T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "testpmd-2n-skx-xxv710-64b-2t1c-base-pdr"
+    layout: "plot-throughput"
+
+-
+  type: "plot"
+  title: "DPDK Throughput: testpmd-2n-skx-xxv710-64b-4t2c-base-pdr"
+  algorithm: "plot_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-xxv710-64b-4t2c-base-pdr"
+  data: "plot-dpdk-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
+           '64B' and
+           'BASE' and
+           'NDRPDR' and
+           '4T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "testpmd-2n-skx-xxv710-64b-4t2c-base-pdr"
+    layout: "plot-throughput"
+
+################################################################################
+
+# Packet Latency - VPP L2 3n-hsw-x520 base and scale
+-
+  type: "plot"
+  title: "VPP Latency: l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
+           'ETH' and
+           '1T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           not 'MEMIF'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
+  layout:
+    title: "l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "VPP Latency: l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
+           'ETH' and
+           '2T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           not 'MEMIF'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
+  layout:
+    title: "l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
+    layout: "plot-latency"
+
+# Packet Latency - VPP L2 3n-hsw-x520 features
+-
+  type: "plot"
+  title: "VPP Latency: l2sw-3n-hsw-x520-64b-1t1c-features-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-1t1c-features-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           'NDRPDR' and
+           '1T1C' and
+           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
+           not 'ACL' and
+           not 'VHOST' and
+           not 'MEMIF'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "L2XCBASE"    # l2xcbase
+  - "L2BDBASE"    # l2bdbase
+  - "L2XCFWD"     # dot1q-l2xcbase
+  - "L2BDMACLRN"  # dot1q-l2bdbase
+  layout:
+    title: "l2sw-3n-hsw-x520-64b-1t1c-features-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "VPP Latency: l2sw-3n-hsw-x520-64b-2t2c-features-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-2t2c-features-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           'NDRPDR' and
+           '2T2C' and
+           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
+           not 'ACL' and
+           not 'VHOST' and
+           not 'MEMIF'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "L2XCBASE"    # l2xcbase
+  - "L2BDBASE"    # l2bdbase
+  - "L2XCFWD"     # dot1q-l2xcbase
+  - "L2BDMACLRN"  # dot1q-l2bdbase
+  layout:
+    title: "l2sw-3n-hsw-x520-64b-2t2c-features-ndr"
+    layout: "plot-latency"
+
+# Packet Latency - VPP L2 3n-hsw-x710 base and scale
+-
+  type: "plot"
+  title: "VPP Latency: l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
+           'ETH' and
+           '1T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           not 'MEMIF'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
+  layout:
+    title: "l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "VPP Latency: l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
+           'ETH' and
+           '2T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           not 'MEMIF'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
+  layout:
+    title: "l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+    layout: "plot-latency"
+
+# Packet Latency - VPP L2 3n-hsw-x710 features
+-
+  type: "plot"
+  title: "VPP Latency: l2sw-3n-hsw-x710-64b-1t1c-features-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-1t1c-features-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'NDRPDR' and
+           '1T1C' and
+           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
+           not 'ACL' and
+           not 'VHOST' and
+           not 'MEMIF'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "L2XCBASE"    # l2xcbase
+  - "L2BDBASE"    # l2bdbase
+  - "L2XCFWD"     # dot1q-l2xcbase
+  - "L2BDMACLRN"  # dot1q-l2bdbase
+  layout:
+    title: "l2sw-3n-hsw-x710-64b-1t1c-features-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "VPP Latency: l2sw-3n-hsw-x710-64b-2t2c-features-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-2t2c-features-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'NDRPDR' and
+           '2T2C' and
+           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
+           not 'ACL' and
+           not 'VHOST' and
+           not 'MEMIF'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "L2XCBASE"    # l2xcbase
+  - "L2BDBASE"    # l2bdbase
+  - "L2XCFWD"     # dot1q-l2xcbase
+  - "L2BDMACLRN"  # dot1q-l2bdbase
+  layout:
+    title: "l2sw-3n-hsw-x710-64b-2t2c-features-ndr"
+    layout: "plot-latency"
+
+# Packet Latency - VPP L2 3n-hsw-xl710 base and scale
+-
+  type: "plot"
+  title: "VPP Latency: l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
+           '64B' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
+           'ETH' and
+           '1T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           not 'MEMIF'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
+  layout:
+    title: "l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "VPP Latency: l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
+           '64B' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
+           'ETH' and
+           '2T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           not 'MEMIF'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
+  layout:
+    title: "l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
+    layout: "plot-latency"
+
+# Packet Latency - VPP L2 3n-skx-x710 base and scale
+-
+  type: "plot"
+  title: "VPP Latency: l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
+           'ETH' and
+           '2T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           not 'MEMIF'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
+  layout:
+    title: "l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "VPP Latency: l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
+           'ETH' and
+           '4T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           not 'MEMIF'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
+  layout:
+    title: "l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
+    layout: "plot-latency"
+
+# Packet Latency - VPP L2 3n-skx-x710 features
+-
+  type: "plot"
+  title: "VPP Latency: l2sw-3n-skx-x710-64b-2t1c-features-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-2t1c-features-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'NDRPDR' and
+           '2T1C' and
+           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
+           not 'ACL' and
+           not 'VHOST' and
+           not 'MEMIF'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "L2XCBASE"    # l2xcbase
+  - "L2BDBASE"    # l2bdbase
+  - "L2XCFWD"     # dot1q-l2xcbase
+  - "L2BDMACLRN"  # dot1q-l2bdbase
+  layout:
+    title: "l2sw-3n-skx-x710-64b-2t1c-features-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "VPP Latency: l2sw-3n-skx-x710-64b-4t2c-features-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-4t2c-features-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'NDRPDR' and
+           '4T2C' and
+           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
+           not 'ACL' and
+           not 'VHOST' and
+           not 'MEMIF'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "L2XCBASE"    # l2xcbase
+  - "L2BDBASE"    # l2bdbase
+  - "L2XCFWD"     # dot1q-l2xcbase
+  - "L2BDMACLRN"  # dot1q-l2bdbase
+  layout:
+    title: "l2sw-3n-skx-x710-64b-4t2c-features-ndr"
+    layout: "plot-latency"
+
+# Packet Latency - VPP L2 3n-skx-xxv710 base and scale
+-
+  type: "plot"
+  title: "VPP Latency: l2sw-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-XXV710' and
+           '64B' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
+           'ETH' and
+           '2T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           not 'MEMIF'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
+  layout:
+    title: "l2sw-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "VPP Latency: l2sw-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-XXV710' and
+           '64B' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
+           'ETH' and
+           '4T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           not 'MEMIF'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
+  layout:
+    title: "l2sw-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
+    layout: "plot-latency"
+
+# Packet Latency - VPP L2 2n-skx-x710 base and scale
+-
+  type: "plot"
+  title: "VPP Latency: l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'ETH' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
+           '2T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           not 'MEMIF'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
+  layout:
+    title: "l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "VPP Latency: l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
+           'ETH' and
+           '4T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           not 'MEMIF'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
+  layout:
+    title: "l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
+    layout: "plot-latency"
+
+# Packet Latency - VPP L2 2n-skx-xxv710 base and scale
+-
+  type: "plot"
+  title: "VPP Latency: l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
+           '64B' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
+           'ETH' and
+           '2T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           not 'MEMIF'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
+  layout:
+    title: "l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "VPP Latency: l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
+           '64B' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
+           'ETH' and
+           '4T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           not 'MEMIF'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
+  layout:
+    title: "l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
+    layout: "plot-latency"
+
+################################################################################
+
+# Packet Latency - VPP Container Memif 3n-hsw-x520
+-
+  type: "plot"
+  title: "VPP Latency: memif-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/memif-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
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
+           '1T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           'MEMIF'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  layout:
+    title: "memif-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "VPP Latency: memif-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/memif-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
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
+           '2T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           'MEMIF'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  layout:
+    title: "memif-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
+    layout: "plot-latency"
+
+# Packet Latency - VPP Container Memif 3n-hsw-x710
+-
+  type: "plot"
+  title: "VPP Latency: memif-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
+           '1T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           'MEMIF'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  layout:
+    title: "memif-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "VPP Latency: memif-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
+           '2T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           'MEMIF'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  layout:
+    title: "memif-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+    layout: "plot-latency"
+
+# Packet Latency - VPP Container Memif 3n-hsw-xl710
+-
+  type: "plot"
+  title: "VPP Latency: memif-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
+           '64B' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
+           '1T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           'MEMIF'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  layout:
+    title: "memif-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "VPP Latency: memif-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
+           '64B' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
+           '2T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           'MEMIF'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  layout:
+    title: "memif-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
+    layout: "plot-latency"
+
+# Packet Latency - VPP Container Memif 3n-skx-x710
+-
+  type: "plot"
+  title: "VPP Latency: memif-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
+           '2T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           'MEMIF'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  layout:
+    title: "memif-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "VPP Latency: memif-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
+           '4T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           'MEMIF'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  layout:
+    title: "memif-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
+    layout: "plot-latency"
+
+# Packet Latency - VPP Container Memif 2n-skx-x710
+-
+  type: "plot"
+  title: "VPP Latency: memif-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
+           '2T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           'MEMIF'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  layout:
+    title: "memif-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "VPP Latency: memif-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
+           '4T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           'MEMIF'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  layout:
+    title: "memif-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
+    layout: "plot-latency"
+
+# Packet Latency - VPP Container Memif 2n-skx-xxv710
+-
+  type: "plot"
+  title: "VPP Latency: memif-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
+           '64B' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
+           '2T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           'MEMIF'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  layout:
+    title: "memif-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "VPP Latency: memif-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
+           '64B' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
+           '4T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           'MEMIF'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  layout:
+    title: "memif-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
+    layout: "plot-latency"
+
+################################################################################
+
+# Packet Latency - VPP Container Memif 3n-hsw-x520 - l2xc
+-
+  type: "plot"
+  title: "VPP Latency: k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-ndr-lat"
+  data: "plot-ligato-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
+           '1T1C' and
+           'L2XCFWD' and
+           not 'VHOST' and
+           'MEMIF'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "1VNF"
+  - "2VNF"
+  - "4VNF"
+  - "2VNF"
+  - "4VNF"
+  layout:
+    title: "k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "VPP Latency: k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-ndr-lat"
+  data: "plot-ligato-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
+           '2T2C' and
+           'L2XCFWD' and
+           not 'VHOST' and
+           'MEMIF'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "1VNF"
+  - "2VNF"
+  - "4VNF"
+  - "2VNF"
+  - "4VNF"
+  layout:
+    title: "k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-ndr"
+    layout: "plot-latency"
+
+# Packet Latency - VPP Container Memif 3n-hsw-x520 - l2bd
+-
+  type: "plot"
+  title: "VPP Latency: k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-ndr-lat"
+  data: "plot-ligato-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
+           '1T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+           not 'VHOST' and
+           'MEMIF'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "1VNF"
+  - "2VNF"
+  - "4VNF"
+  - "2VNF"
+  - "4VNF"
+  layout:
+    title: "k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "VPP Latency: k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-ndr-lat"
+  data: "plot-ligato-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
+           '2T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+           not 'VHOST' and
+           'MEMIF'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "1VNF"
+  - "2VNF"
+  - "4VNF"
+  - "2VNF"
+  - "4VNF"
+  layout:
+    title: "k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-ndr"
+    layout: "plot-latency"
+
+# Packet Latency - VPP Container Memif 3n-hsw-x710 - l2xc
+-
+  type: "plot"
+  title: "VPP Latency: k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-ndr-lat"
+  data: "plot-ligato-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
+           '1T1C' and
+           'L2XCFWD' and
+           not 'VHOST' and
+           'MEMIF'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "1VNF"
+  - "2VNF"
+  - "4VNF"
+  - "2VNF"
+  - "4VNF"
+  layout:
+    title: "k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "VPP Latency: k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-ndr-lat"
+  data: "plot-ligato-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
+           '2T2C' and
+           'L2XCFWD' and
+           not 'VHOST' and
+           'MEMIF'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "1VNF"
+  - "2VNF"
+  - "4VNF"
+  - "2VNF"
+  - "4VNF"
+  layout:
+    title: "k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-ndr"
+    layout: "plot-latency"
+
+# Packet Latency - VPP Container Memif 3n-hsw-x710 - l2bd
+-
+  type: "plot"
+  title: "VPP Latency: k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-ndr-lat"
+  data: "plot-ligato-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
+           '1T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+           not 'VHOST' and
+           'MEMIF'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "1VNF"
+  - "2VNF"
+  - "4VNF"
+  - "2VNF"
+  - "4VNF"
+  layout:
+    title: "k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "VPP Latency: k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-ndr-lat"
+  data: "plot-ligato-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
+           '2T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+           not 'VHOST' and
+           'MEMIF'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "1VNF"
+  - "2VNF"
+  - "4VNF"
+  - "2VNF"
+  - "4VNF"
+  layout:
+    title: "k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-ndr"
+    layout: "plot-latency"
+
+################################################################################
+
+# Packet Latency - VPP IPv4 3n-hsw-x520 base and scale
+-
+  type: "plot"
+  title: "VPP Latency: ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           'NDRPDR' and
+           '1T1C' and
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
+  layout:
+    title: "ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "VPP Latency: ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           'NDRPDR' and
+           '2T2C' and
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
+  layout:
+    title: "ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
+    layout: "plot-latency"
+
+# Packet Latency - VPP IPv4 3n-hsw-x520 features
+-
+  type: "plot"
+  title: "VPP Latency: ip4-3n-hsw-x520-64b-1t1c-features-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           ('IP4BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            ('NAT44' and 'BASE') or
+            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
+           'NDRPDR' and
+           '1T1C' and
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "NAT44"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACL"
+  - "OACL"
+  layout:
+    title: "ip4-3n-hsw-x520-64b-1t1c-features-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "VPP Latency: ip4-3n-hsw-x520-64b-2t2c-features-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           ('IP4BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            ('NAT44' and 'BASE') or
+            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
+           'NDRPDR' and
+           '2T2C' and
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "NAT44"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACL"
+  - "OACL"
+  layout:
+    title: "ip4-3n-hsw-x520-64b-2t2c-features-ndr"
+    layout: "plot-latency"
+
+# Packet Latency - VPP IPv4 3n-hsw-x520 features nat44
+-
+  type: "plot"
+  title: "VPP Latency: ip4-3n-hsw-x520-64b-1t1c-features-nat44-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-nat44-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           'NDRPDR' and
+           '1T1C' and
+           'IP4FWD' and
+           'NAT44' and
+           not 'IPSEC' and
+           not 'VHOST'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "BASE"
+  - "BASE"
+  - "SRC_USER_10"
+  - "SRC_USER_100"
+  - "SRC_USER_1000"
+  - "SRC_USER_2000"
+  layout:
+    title: "ip4-3n-hsw-x520-64b-1t1c-features-nat44-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "VPP Latency: ip4-3n-hsw-x520-64b-2t2c-features-nat44-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-nat44-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           'NDRPDR' and
+           '2T2C' and
+           'IP4FWD' and
+           'NAT44' and
+           not 'IPSEC' and
+           not 'VHOST'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "BASE"
+  - "BASE"
+  - "SRC_USER_10"
+  - "SRC_USER_100"
+  - "SRC_USER_1000"
+  - "SRC_USER_2000"
+  layout:
+    title: "ip4-3n-hsw-x520-64b-2t2c-features-nat44-ndr"
+    layout: "plot-latency"
+
+# Packet Latency - VPP IPv4 3n-hsw-x520 features iacl
+-
+  type: "plot"
+  title: "VPP Latency: ip4-3n-hsw-x520-64b-1t1c-features-iacl-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-iacl-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           'NDRPDR' and
+           '1T1C' 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-x520-64b-1t1c-features-iacl-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "VPP Latency: ip4-3n-hsw-x520-64b-2t2c-features-iacl-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-iacl-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           '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-x520-64b-2t2c-features-iacl-ndr"
+    layout: "plot-latency"
+
+# Packet Latency - VPP IPv4 3n-hsw-x520 features oacl
+-
+  type: "plot"
+  title: "VPP Latency: ip4-3n-hsw-x520-64b-1t1c-features-oacl-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-oacl-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' 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-x520-64b-1t1c-features-oacl-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "VPP Latency: ip4-3n-hsw-x520-64b-2t2c-features-oacl-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-oacl-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' 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-x520-64b-2t2c-features-oacl-ndr"
+    layout: "plot-latency"
+
+# Packet Latency - VPP IPv4 3n-hsw-x710 base and scale
+-
+  type: "plot"
+  title: "VPP Latency: ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           'NDRPDR' and
+           '1T1C' and
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
+  layout:
+    title: "ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "VPP Latency: ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           'NDRPDR' and
+           '2T2C' and
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
+  layout:
+    title: "ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+    layout: "plot-latency"
+
+# Packet Latency - VPP IPv4 3n-hsw-x710 features
+-
+  type: "plot"
+  title: "VPP Latency: ip4-3n-hsw-x710-64b-1t1c-features-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           ('IP4BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            ('NAT44' and 'BASE') or
+            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
+           'NDRPDR' and
+           '1T1C' and
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "NAT44"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACL"
+  - "OACL"
+  layout:
+    title: "ip4-3n-hsw-x710-64b-1t1c-features-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "VPP Latency: ip4-3n-hsw-x710-64b-2t2c-features-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           ('IP4BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            ('NAT44' and 'BASE') or
+            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
+           'NDRPDR' and
+           '2T2C' and
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "NAT44"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACL"
+  - "OACL"
+  layout:
+    title: "ip4-3n-hsw-x710-64b-2t2c-features-ndr"
+    layout: "plot-latency"
+
+# Packet Latency - VPP IPv4 3n-hsw-x710 features nat44
+-
+  type: "plot"
+  title: "VPP Latency: ip4-3n-hsw-x710-64b-1t1c-features-nat44-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-nat44-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'NDRPDR' and
+           '1T1C' and
+           'IP4FWD' and
+           'NAT44' and
+           not 'IPSEC' and
+           not 'VHOST'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "BASE"
+  - "BASE"
+  - "SRC_USER_10"
+  - "SRC_USER_100"
+  - "SRC_USER_1000"
+  - "SRC_USER_2000"
+  layout:
+    title: "ip4-3n-hsw-x710-64b-1t1c-features-nat44-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "VPP Latency: ip4-3n-hsw-x710-64b-2t2c-features-nat44-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-nat44-ndr-lat"
+  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:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "BASE"
+  - "BASE"
+  - "SRC_USER_10"
+  - "SRC_USER_100"
+  - "SRC_USER_1000"
+  - "SRC_USER_2000"
+  layout:
+    title: "ip4-3n-hsw-x710-64b-2t2c-features-nat44-ndr"
+    layout: "plot-latency"
+
+# Packet Latency - VPP IPv4 3n-hsw-x710 features iacl
+-
+  type: "plot"
+  title: "VPP Latency: ip4-3n-hsw-x710-64b-1t1c-features-iacl-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-iacl-ndr-lat"
+  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:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
+  layout:
+    title: "ip4-3n-hsw-x710-64b-1t1c-features-iacl-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "VPP Latency: ip4-3n-hsw-x710-64b-2t2c-features-iacl-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-iacl-ndr-lat"
+  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:
+  - "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
+           ('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"
+  title: "VPP Latency: ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
+           '64B' and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           'NDRPDR' and
+           '1T1C' and
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
+  layout:
+    title: "ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "VPP Latency: ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
+           '64B' and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           'NDRPDR' and
+           '2T2C' and
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
+  layout:
+    title: "ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
+    layout: "plot-latency"
+
+# Packet Latency - VPP IPv4 3n-skx-x710 base and scale
+-
+  type: "plot"
+  title: "VPP Latency: ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           'NDRPDR' and
+           '2T1C' and
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
+  layout:
+    title: "ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "VPP Latency: ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           'NDRPDR' and
+           '4T2C' and
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
+  layout:
+    title: "ip4-3n-skx-x710-64b-4t2c-base_and_scale-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-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           ('IP4BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            ('NAT44' and 'BASE') or
+            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
+           'NDRPDR' and
+           '2T1C' and
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "NAT44"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACL"
+  - "OACL"
+  layout:
+    title: "ip4-3n-skx-x710-64b-2t1c-features-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "VPP Latency: ip4-3n-skx-x710-64b-4t2c-features-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           ('IP4BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            ('NAT44' and 'BASE') or
+            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
+           'NDRPDR' and
+           '4T2C' and
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "NAT44"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACL"
+  - "OACL"
+  layout:
+    title: "ip4-3n-skx-x710-64b-4t2c-features-ndr"
+    layout: "plot-latency"
+
+# Packet Latency - VPP IPv4 3n-skx-x710 features nat44
+-
+  type: "plot"
+  title: "VPP Latency: ip4-3n-skx-x710-64b-2t1c-features-nat44-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-nat44-ndr-lat"
+  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:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "BASE"
+  - "BASE"
+  - "SRC_USER_10"
+  - "SRC_USER_100"
+  - "SRC_USER_1000"
+  - "SRC_USER_2000"
+  layout:
+    title: "ip4-3n-skx-x710-64b-2t1c-features-nat44-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "VPP Latency: ip4-3n-skx-x710-64b-4t2c-features-nat44-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-nat44-ndr-lat"
+  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:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "BASE"
+  - "BASE"
+  - "SRC_USER_10"
+  - "SRC_USER_100"
+  - "SRC_USER_1000"
+  - "SRC_USER_2000"
+  layout:
+    title: "ip4-3n-skx-x710-64b-4t2c-features-nat44-ndr"
+    layout: "plot-latency"
+
+# Packet Latency - VPP IPv4 3n-skx-x710 features iacl
+-
+  type: "plot"
+  title: "VPP Latency: ip4-3n-skx-x710-64b-2t1c-features-iacl-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-iacl-ndr-lat"
+  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
+           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-iacl-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "VPP Latency: ip4-3n-skx-x710-64b-4t2c-features-iacl-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-iacl-ndr-lat"
+  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
+           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-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 2n-skx-x710 base and scale
+-
+  type: "plot"
+  title: "VPP Latency: ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           'NDRPDR' and
+           '2T1C' and
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
+  layout:
+    title: "ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "VPP Latency: ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           'NDRPDR' and
+           '4T2C' and
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
+  layout:
+    title: "ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
+    layout: "plot-latency"
+
+# Packet Latency - VPP IPv4 2n-skx-xxv710 base and scale
+-
+  type: "plot"
+  title: "VPP Latency: ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
+           '64B' and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           'NDRPDR' and
+           '2T1C' and
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
+  layout:
+    title: "ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "VPP Latency: ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
+           '64B' and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           'NDRPDR' and
+           '4T2C' and
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
+  layout:
+    title: "ip4-2n-skx-xxv710-64b-4t2c-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' and
+           'L2BDMACLRN' 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' and
+           'L2BDMACLRN' 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
+-
+  type: "plot"
+  title: "VPP Latency: ip4tun-3n-hsw-x520-64b-1t1c-base_and_features-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-1t1c-base_and_features-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           'ENCAP' and
+           'NDRPDR' and
+           '1T1C' and
+           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') and
+           not 'DOT1Q' and
+           not 'VHOST' and
+           not 'IPSECHW'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "LISP"
+  layout:
+    title: "ip4tun-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "VPP Latency: ip4tun-3n-hsw-x520-64b-2t2c-base_and_features-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-2t2c-base_and_features-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           'ENCAP' and
+           'NDRPDR' and
+           '2T2C' and
+           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') and
+           not 'DOT1Q' and
+           not 'VHOST' and
+           not 'IPSECHW'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "LISP"
+  layout:
+    title: "ip4tun-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
+    layout: "plot-latency"
+
+# Packet Latency - VPP Ipv4 tunnels 3n-hsw-x710
+-
+  type: "plot"
+  title: "VPP Latency: ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'ENCAP' and
+           'NDRPDR' and
+           '1T1C' and
+           'VXLAN' and
+           'L2BDMACLRN' 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-x710-64b-1t1c-base_and_scale-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "VPP Latency: ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'ENCAP' and
+           'NDRPDR' and
+           '2T2C' and
+           'VXLAN' and
+           'L2BDMACLRN' 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-x710-64b-2t2c-base_and_scale-ndr"
+    layout: "plot-latency"
+
+# Packet Latency - VPP Ipv4 tunnels 3n-hsw-x710 - features
+-
+  type: "plot"
+  title: "VPP Latency: ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'ENCAP' and
+           'NDRPDR' and
+           '1T1C' and
+           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') and
+           not 'DOT1Q' and
+           not 'VHOST' and
+           not 'IPSECHW'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "LISP"
+  layout:
+    title: "ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "VPP Latency: ip4tun-3n-hsw-x710-64b-2t2c-base_and_features-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-2t2c-base_and_features-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'ENCAP' and
+           'NDRPDR' and
+           '2T2C' and
+           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') and
+           not 'DOT1Q' and
+           not 'VHOST' and
+           not 'IPSECHW'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "LISP"
+  layout:
+    title: "ip4tun-3n-hsw-x710-64b-2t2c-base_and_features-ndr"
+    layout: "plot-latency"
+
+# Packet Latency - VPP Ipv4 tunnels 3n-skx-x710
+-
+  type: "plot"
+  title: "VPP Latency: ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'ENCAP' and
+           'NDRPDR' and
+           '2T1C' and
+           'VXLAN' and
+           'L2BDMACLRN' 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-skx-x710-64b-2t1c-base_and_scale-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "VPP Latency: ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'ENCAP' and
+           'NDRPDR' and
+           '4T2C' and
+           'VXLAN' and
+           'L2BDMACLRN' 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-skx-x710-64b-4t2c-base_and_scale-ndr"
+    layout: "plot-latency"
+
+# Packet Latency - VPP Ipv4 tunnels 3n-skx-x710 - features
+-
+  type: "plot"
+  title: "VPP Latency: ip4tun-3n-skx-x710-64b-2t1c-base_and_features-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-2t1c-base_and_features-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'ENCAP' and
+           'NDRPDR' and
+           '2T1C' and
+           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') and
+           not 'DOT1Q' and
+           not 'VHOST' and
+           not 'IPSECHW'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "LISP"
+  layout:
+    title: "ip4tun-3n-skx-x710-64b-2t1c-base_and_features-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "VPP Latency: ip4tun-3n-skx-x710-64b-4t2c-base_and_features-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-4t2c-base_and_features-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'ENCAP' and
+           'NDRPDR' and
+           '4T2C' and
+           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') and
+           not 'DOT1Q' and
+           not 'VHOST' and
+           not 'IPSECHW'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "LISP"
+  layout:
+    title: "ip4tun-3n-skx-x710-64b-4t2c-base_and_features-ndr"
+    layout: "plot-latency"
+
+################################################################################
+
+# Packet Latency - VPP IPv6 3n-hsw-x520
+-
+  type: "plot"
+  title: "VPP Latency: ip6-3n-hsw-x520-78b-1t1c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-1t1c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '78B' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           'NDRPDR' and
+           '1T1C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
+  layout:
+    title: "ip6-3n-hsw-x520-78b-1t1c-base_and_scale-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "VPP Latency: ip6-3n-hsw-x520-78b-2t2c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-2t2c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '78B' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           'NDRPDR' and
+           '2T2C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
+  layout:
+    title: "ip6-3n-hsw-x520-78b-2t2c-base_and_scale-ndr"
+    layout: "plot-latency"
+
+# Packet Latency - VPP IPv6 3n-hsw-x710
+-
+  type: "plot"
+  title: "VPP Latency: ip6-3n-hsw-x710-78b-1t1c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-1t1c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
+           '78B' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           'NDRPDR' and
+           '1T1C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
+  layout:
+    title: "ip6-3n-hsw-x710-78b-1t1c-base_and_scale-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "VPP Latency: ip6-3n-hsw-x710-78b-2t2c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-2t2c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
+           '78B' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           'NDRPDR' and
+           '2T2C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
+  layout:
+    title: "ip6-3n-hsw-x710-78b-2t2c-base_and_scale-ndr"
+    layout: "plot-latency"
+
+# Packet Latency - VPP IPv6 3n-hsw-xl710
+-
+  type: "plot"
+  title: "VPP Latency: ip6-3n-hsw-xl710-78b-1t1c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-1t1c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
+           '78B' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           'NDRPDR' and
+           '1T1C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
+  layout:
+    title: "ip6-3n-hsw-xl710-78b-1t1c-base_and_scale-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "VPP Latency: ip6-3n-hsw-xl710-78b-2t2c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-2t2c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
+           '78B' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           'NDRPDR' and
+           '2T2C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
+  layout:
+    title: "ip6-3n-hsw-xl710-78b-2t2c-base_and_scale-ndr"
+    layout: "plot-latency"
+
+# Packet Latency - VPP IPv6 3n-skx-x710
+-
+  type: "plot"
+  title: "VPP Latency: ip6-3n-skx-x710-78b-2t1c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-2t1c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '78B' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           'NDRPDR' and
+           '2T1C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
+  layout:
+    title: "ip6-3n-skx-x710-78b-2t1c-base_and_scale-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "VPP Latency: ip6-3n-skx-x710-78b-4t2c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-4t2c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '78B' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           'NDRPDR' and
+           '4T2C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
+  layout:
+    title: "ip6-3n-skx-x710-78b-4t2c-base_and_scale-ndr"
+    layout: "plot-latency"
+
+# Packet Latency - VPP IPv6 2n-skx-x710
+-
+  type: "plot"
+  title: "VPP Latency: ip6-2n-skx-x710-78b-2t1c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-2t1c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           '78B' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           'NDRPDR' and
+           '2T1C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
+  layout:
+    title: "ip6-2n-skx-x710-78b-2t1c-base_and_scale-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "VPP Latency: ip6-2n-skx-x710-78b-4t2c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-4t2c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           '78B' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           'NDRPDR' and
+           '4T2C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
+  layout:
+    title: "ip6-2n-skx-x710-78b-4t2c-base_and_scale-ndr"
+    layout: "plot-latency"
+
+# Packet Latency - VPP IPv6 2n-skx-xxv710
+-
+  type: "plot"
+  title: "VPP Latency: ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
+           '78B' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           'NDRPDR' and
+           '2T1C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
+  layout:
+    title: "ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "VPP Latency: ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
+           '78B' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           'NDRPDR' and
+           '4T2C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
+  layout:
+    title: "ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr"
+    layout: "plot-latency"
+
+################################################################################
+
+# Packet Latency - VPP IPv6 tunnels 3n-hsw-x520
+-
+  type: "plot"
+  title: "VPP Latency: ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '78B' and
+           'ENCAP' and
+           'NDRPDR' and
+           '1T1C' and
+           'LISP' and
+           not 'VHOST'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "IP4UNRLAY"
+  - "IP6UNRLAY"
+  layout:
+    title: "ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "VPP Latency: ip6tun-3n-hsw-x520-78b-2t2c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-2t2c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '78B' and
+           'ENCAP' and
+           'NDRPDR' and
+           '2T2C' and
+           'LISP' and
+           not 'VHOST'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "IP4UNRLAY"
+  - "IP6UNRLAY"
+  layout:
+    title: "ip6tun-3n-hsw-x520-78b-2t2c-base_and_scale-ndr"
+    layout: "plot-latency"
+
+################################################################################
+
+# Packet Latency - VPP IPSec 3n-hsw-xl710 base
+-
+  type: "plot"
+  title: "VPP Latency: ipsec-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
+           '64B' and
+           'IP4FWD' and
+           'NDRPDR' and
+           'BASE' and
+           '1T1C' and
+           'IPSECHW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
+           not 'VHOST'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  layout:
+    title: "ipsec-3n-hsw-xl710-64b-1t1c-base-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "VPP Latency: ipsec-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
+           '64B' and
+           'IP4FWD' and
+           'NDRPDR' and
+           'BASE' and
+           '2T2C' and
+           'IPSECHW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
+           not 'VHOST'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  layout:
+    title: "ipsec-3n-hsw-xl710-64b-2t2c-base-ndr"
+    layout: "plot-latency"
+
+# Packet Latency - VPP IPSec 3n-hsw-xl710 scale
+-
+  type: "plot"
+  title: "VPP Latency: ipsec-3n-hsw-xl710-64b-1t1c-scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
+           '64B' and
+           'IP4FWD' and
+           'NDRPDR' and
+           'SCALE' and
+           '1T1C' and
+           'IPSECHW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
+           not 'VHOST'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  layout:
+    title: "ipsec-3n-hsw-xl710-64b-1t1c-scale-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "VPP Latency: ipsec-3n-hsw-xl710-64b-2t2c-scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
+           '64B' and
+           'IP4FWD' and
+           'NDRPDR' and
+           'SCALE' and
+           '2T2C' and
+           'IPSECHW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
+           not 'VHOST'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  layout:
+    title: "ipsec-3n-hsw-xl710-64b-2t2c-scale-ndr"
+    layout: "plot-latency"
+
+# Packet Latency - VPP IPSec 3n-hsw-xl710 sw
+-
+  type: "plot"
+  title: "VPP Latency: ipsec-3n-hsw-xl710-64b-1t1c-sw-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-sw-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
+           '64B' and
+           'IP4FWD' and
+           'NDRPDR' and
+           '1T1C' and
+           'IPSECSW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
+           not 'VHOST'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  layout:
+    title: "ipsec-3n-hsw-xl710-64b-1t1c-sw-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "VPP Latency: ipsec-3n-hsw-xl710-64b-2t2c-sw-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-sw-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
+           '64B' and
+           'IP4FWD' and
+           'NDRPDR' and
+           '2T2C' and
+           'IPSECSW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
+           not 'VHOST'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  layout:
+    title: "ipsec-3n-hsw-xl710-64b-2t2c-sw-ndr"
+    layout: "plot-latency"
+
+################################################################################
+
+# Packet Latency - VPP SRv6 3n-hsw-x520
+-
+  type: "plot"
+  title: "VPP Latency: srv6-3n-hsw-x520-78b-1t1c-features-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-1t1c-features-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '78B' and
+           'FEATURE' and
+           'NDRPDR' and
+           '1T1C' and
+           'IP6FWD' and
+           'SRv6'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  layout:
+    title: "srv6-3n-hsw-x520-78b-1t1c-features-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "VPP Latency: srv6-3n-hsw-x520-78b-2t2c-features-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-2t2c-features-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '78B' and
+           'FEATURE' and
+           'NDRPDR' and
+           '2T2C' and
+           'IP6FWD' and
+           'SRv6'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  layout:
+    title: "srv6-3n-hsw-x520-78b-2t2c-features-ndr"
+    layout: "plot-latency"
+
+################################################################################
+
+# Packet Latency - VPP vhost ip4 3n-hsw-x520
+-
+  type: "plot"
+  title: "VPP Latency: vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           'NDRPDR' and
+           'ETH' and
+           'IP4FWD' and
+           '1T1C' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'DOT1Q'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "not CFS_OPT"
+  - "1VM"
+  - "2VM"
+  layout:
+    title: "vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "VPP Latency: vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           'NDRPDR' and
+           'ETH' and
+           'IP4FWD' and
+           '2T2C' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'DOT1Q'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "not CFS_OPT"
+  - "1VM"
+  - "2VM"
+  layout:
+    title: "vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
+    layout: "plot-latency"
+
+# Packet Latency - VPP vhost l2sw 3n-hsw-x520
+-
+  type: "plot"
+  title: "VPP Latency: vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           'NDRPDR' and
+           ('ETH' or 'DOT1Q') and
+           '1T1C' and
+           'L2BDMACLRN' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+#  sort:
+#  - "VM"  # "not CFS_OPT"
+#  - "CFS_OPT"
+#  - "FIB_10K"
+#  - "FIB_100K"
+#  - "FIB_1M"
+  layout:
+    title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "VPP Latency: vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           'NDRPDR' and
+           ('ETH' or 'DOT1Q') and
+           '2T2C' and
+           'L2BDMACLRN' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+#  sort:
+#  - "VM"  # "not CFS_OPT"
+#  - "CFS_OPT"
+#  - "FIB_10K"
+#  - "FIB_100K"
+#  - "FIB_1M"
+  layout:
+    title: "vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
+    layout: "plot-latency"
+
+# Packet Latency - VPP vhost l2sw 3n-hsw-x520 - base
+-
+  type: "plot"
+  title: "VPP Latency: vhost-l2sw-3n-hsw-x520-64b-1t1c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           'NDRPDR' and
+           ('ETH' or 'DOT1Q') and
+           'BASE' and
+           '1T1C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
+  layout:
+    title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "VPP Latency: vhost-l2sw-3n-hsw-x520-64b-2t2c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           'NDRPDR' and
+           ('ETH' or 'DOT1Q') and
+           'BASE' and
+           '2T2C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
+  layout:
+    title: "vhost-l2sw-3n-hsw-x520-64b-2t2c-base-ndr"
+    layout: "plot-latency"
+
+# Packet Latency - VPP vhost l2sw 3n-hsw-x520 - base vm
+-
+  type: "plot"
+  title: "VPP Latency: vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           'NDRPDR' and
+           ('ETH' or 'DOT1Q') and
+           '1T1C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'CFS_OPT' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not 'LBOND'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
+  layout:
+    title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "VPP Latency: vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           'NDRPDR' and
+           ('ETH' or 'DOT1Q') and
+           '2T2C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'CFS_OPT' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not 'LBOND'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
+  layout:
+    title: "vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-ndr"
+    layout: "plot-latency"
+
+# Packet Latency - VPP vhost ip4 3n-hsw-x710
+-
+  type: "plot"
+  title: "VPP Latency: vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'NDRPDR' and
+           'ETH' and
+           'IP4FWD' and
+           '1T1C' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'DOT1Q'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "not CFS_OPT"
+  - "1VM"
+  - "2VM"
+  layout:
+    title: "vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "VPP Latency: vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'NDRPDR' and
+           'ETH' and
+           'IP4FWD' and
+           '2T2C' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'DOT1Q'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "not CFS_OPT"
+  - "1VM"
+  - "2VM"
+  layout:
+    title: "vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+    layout: "plot-latency"
+
+# Packet Latency - VPP vhost l2sw 3n-hsw-x710
+-
+  type: "plot"
+  title: "VPP Latency: vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'NDRPDR' and
+           ('ETH' or 'DOT1Q') and
+           '1T1C' and
+           'L2BDMACLRN' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+#  sort:
+#  - "VM"  # "not CFS_OPT"
+#  - "CFS_OPT"
+#  - "FIB_10K"
+#  - "FIB_100K"
+#  - "FIB_1M"
+  layout:
+    title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "VPP Latency: vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'NDRPDR' and
+           ('ETH' or 'DOT1Q') and
+           '2T2C' and
+           'L2BDMACLRN' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+#  sort:
+#  - "VM"  # "not CFS_OPT"
+#  - "CFS_OPT"
+#  - "FIB_10K"
+#  - "FIB_100K"
+#  - "FIB_1M"
+  layout:
+    title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+    layout: "plot-latency"
+
+# Packet Latency - VPP vhost l2sw 3n-hsw-x710 - base
+-
+  type: "plot"
+  title: "VPP Latency: vhost-l2sw-3n-hsw-x710-64b-1t1c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'NDRPDR' and
+           ('ETH' or 'DOT1Q') and
+           'BASE' and
+           '1T1C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
+  layout:
+    title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "VPP Latency: vhost-l2sw-3n-hsw-x710-64b-2t2c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'NDRPDR' and
+           ('ETH' or 'DOT1Q') and
+           'BASE' and
+           '2T2C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
+  layout:
+    title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base-ndr"
+    layout: "plot-latency"
+
+# Packet Latency - VPP vhost l2sw 3n-hsw-x710 - base vm
+-
+  type: "plot"
+  title: "VPP Latency: vhost-l2sw-3n-hsw-x710-64b-1t1c-base-vm-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base-vm-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'NDRPDR' and
+           ('ETH' or 'DOT1Q') and
+           '1T1C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'CFS_OPT' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not 'LBOND'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
+  layout:
+    title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base-vm-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "VPP Latency: vhost-l2sw-3n-hsw-x710-64b-2t2c-base-vm-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base-vm-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'NDRPDR' and
+           ('ETH' or 'DOT1Q') and
+           '2T2C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'CFS_OPT' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not 'LBOND'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
+  layout:
+    title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base-vm-ndr"
+    layout: "plot-latency"
+
+# Packet Latency - VPP vhost ip4 3n-hsw-xl710
+-
+  type: "plot"
+  title: "VPP Latency: vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
+           '64B' and
+           'NDRPDR' and
+           'ETH' and
+           'IP4FWD' and
+           '1T1C' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'DOT1Q'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "not CFS_OPT"
+  - "1VM"
+  - "2VM"
+  layout:
+    title: "vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "VPP Latency: vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
+           '64B' and
+           'NDRPDR' and
+           'ETH' and
+           'IP4FWD' and
+           '2T2C' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'DOT1Q'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "not CFS_OPT"
+  - "1VM"
+  - "2VM"
+  layout:
+    title: "vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
+    layout: "plot-latency"
+
+# Packet Latency - VPP vhost l2sw 3n-hsw-xl710
+-
+  type: "plot"
+  title: "VPP Latency: vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
+           '64B' and
+           'NDRPDR' and
+           ('ETH' or 'DOT1Q') and
+           '1T1C' and
+           'L2BDMACLRN' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+#  sort:
+#  - "VM"  # "not CFS_OPT"
+#  - "CFS_OPT"
+#  - "FIB_10K"
+#  - "FIB_100K"
+#  - "FIB_1M"
+  layout:
+    title: "vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "VPP Latency: vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
+           '64B' and
+           'NDRPDR' and
+           ('ETH' or 'DOT1Q') and
+           '2T2C' and
+           'L2BDMACLRN' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+#  sort:
+#  - "VM"  # "not CFS_OPT"
+#  - "CFS_OPT"
+#  - "FIB_10K"
+#  - "FIB_100K"
+#  - "FIB_1M"
+  layout:
+    title: "vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
+    layout: "plot-latency"
+
+# Packet Latency - VPP vhost l2sw 3n-hsw-xl710 - base
+-
+  type: "plot"
+  title: "VPP Latency: vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
+           '64B' and
+           'NDRPDR' and
+           ('ETH' or 'DOT1Q') and
+           'BASE' and
+           '1T1C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
+  layout:
+    title: "vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "VPP Latency: vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
+           '64B' and
+           'NDRPDR' and
+           ('ETH' or 'DOT1Q') and
+           'BASE' and
+           '2T2C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
+  layout:
+    title: "vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-ndr"
+    layout: "plot-latency"
+
+# Packet Latency - VPP vhost l2sw 3n-hsw-xl710 - base vm
+-
+  type: "plot"
+  title: "VPP Latency: vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-vm-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-vm-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
+           '64B' and
+           'NDRPDR' and
+           ('ETH' or 'DOT1Q') and
+           '1T1C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'CFS_OPT' and
+           not 'VXLAN' and
+           not 'IP4FWD'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
+  layout:
+    title: "vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-vm-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "VPP Latency: vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-vm-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-vm-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
+           '64B' and
+           'NDRPDR' and
+           ('ETH' or 'DOT1Q') and
+           '2T2C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'CFS_OPT' and
+           not 'VXLAN' and
+           not 'IP4FWD'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
+  layout:
+    title: "vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-vm-ndr"
+    layout: "plot-latency"
+
+# Packet Latency - VPP vhost ip4 3n-skx-x710
+-
+  type: "plot"
+  title: "VPP Latency: vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'NDRPDR' and
+           'ETH' and
+           'IP4FWD' and
+           '2T1C' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'DOT1Q'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "not CFS_OPT"
+  - "1VM"
+  - "2VM"
+  layout:
+    title: "vhost-ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "VPP Latency: vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'NDRPDR' and
+           'ETH' and
+           'IP4FWD' and
+           '4T2C' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'DOT1Q'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "not CFS_OPT"
+  - "1VM"
+  - "2VM"
+  layout:
+    title: "vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
+    layout: "plot-latency"
+
+# Packet Latency - VPP vhost l2sw 3n-skx-x710
+-
+  type: "plot"
+  title: "VPP Latency: vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'NDRPDR' and
+           ('ETH' or 'DOT1Q') and
+           '2T1C' and
+           'L2BDMACLRN' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+#  sort:
+#  - "VM"  # "not CFS_OPT"
+#  - "CFS_OPT"
+#  - "FIB_10K"
+#  - "FIB_100K"
+#  - "FIB_1M"
+  layout:
+    title: "vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "VPP Latency: vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'NDRPDR' and
+           ('ETH' or 'DOT1Q') and
+           '4T2C' and
+           'L2BDMACLRN' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+#  sort:
+#  - "VM"  # "not CFS_OPT"
+#  - "CFS_OPT"
+#  - "FIB_10K"
+#  - "FIB_100K"
+#  - "FIB_1M"
+  layout:
+    title: "vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
+    layout: "plot-latency"
+
+# Packet Latency - VPP vhost l2sw 3n-skx-x710 - base
+-
+  type: "plot"
+  title: "VPP Latency: vhost-l2sw-3n-skx-x710-64b-2t1c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-2t1c-base-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'NDRPDR' and
+           ('ETH' or 'DOT1Q') and
+           'BASE' and
+           '2T1C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM' and
+           not 'LBOND'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
+  layout:
+    title: "vhost-l2sw-3n-skx-x710-64b-2t1c-base-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "VPP Latency: vhost-l2sw-3n-skx-x710-64b-4t2c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-4t2c-base-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'NDRPDR' and
+           ('ETH' or 'DOT1Q') and
+           'BASE' and
+           '4T2C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM' and
+           not 'LBOND'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
+  layout:
+    title: "vhost-l2sw-3n-skx-x710-64b-4t2c-base-ndr"
+    layout: "plot-latency"
+
+# Packet Latency - VPP vhost l2sw 3n-skx-x710 - base vm
+-
+  type: "plot"
+  title: "VPP Latency: vhost-l2sw-3n-skx-x710-64b-2t1c-base-vm-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-2t1c-base-vm-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'NDRPDR' and
+           ('ETH' or 'DOT1Q') and
+           '2T1C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'CFS_OPT' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not 'LBOND'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
+  layout:
+    title: "vhost-l2sw-3n-skx-x710-64b-2t1c-base-vm-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "VPP Latency: vhost-l2sw-3n-skx-x710-64b-4t2c-base-vm-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-4t2c-base-vm-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'NDRPDR' and
+           ('ETH' or 'DOT1Q') and
+           '4T2C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'CFS_OPT' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not 'LBOND'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
+  layout:
+    title: "vhost-l2sw-3n-skx-x710-64b-4t2c-base-vm-ndr"
+    layout: "plot-latency"
+
+# Packet Latency - VPP vhost ip4 2n-skx-x710
+-
+  type: "plot"
+  title: "VPP Latency: vhost-ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'NDRPDR' and
+           'ETH' and
+           'IP4FWD' and
+           '2T1C' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'DOT1Q'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "not CFS_OPT"
+  - "1VM"
+  - "2VM"
+  layout:
+    title: "vhost-ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "VPP Latency: vhost-ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'NDRPDR' and
+           'ETH' and
+           'IP4FWD' and
+           '4T2C' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'DOT1Q'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "not CFS_OPT"
+  - "1VM"
+  - "2VM"
+  layout:
+    title: "vhost-ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
+    layout: "plot-latency"
+
+# Packet Latency - VPP vhost l2sw 2n-skx-x710
+-
+  type: "plot"
+  title: "VPP Latency: vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'NDRPDR' and
+           ('ETH' or 'DOT1Q') and
+           '2T1C' and
+           'L2BDMACLRN' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+#  sort:
+#  - "VM"  # "not CFS_OPT"
+#  - "CFS_OPT"
+#  - "FIB_10K"
+#  - "FIB_100K"
+#  - "FIB_1M"
+  layout:
+    title: "vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "VPP Latency: vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'NDRPDR' and
+           ('ETH' or 'DOT1Q') and
+           '4T2C' and
+           'L2BDMACLRN' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+#  sort:
+#  - "VM"  # "not CFS_OPT"
+#  - "CFS_OPT"
+#  - "FIB_10K"
+#  - "FIB_100K"
+#  - "FIB_1M"
+  layout:
+    title: "vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
+    layout: "plot-latency"
+
+# Packet Latency - VPP vhost l2sw 2n-skx-x710 - base
+-
+  type: "plot"
+  title: "VPP Latency: vhost-l2sw-2n-skx-x710-64b-2t1c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-2t1c-base-ndr-lat"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'NDRPDR' and
+           ('ETH' or 'DOT1Q') and
+           'BASE' and
+           '2T1C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
+  layout:
+    title: "vhost-l2sw-2n-skx-x710-64b-2t1c-base-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "VPP Latency: vhost-l2sw-2n-skx-x710-64b-4t2c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-4t2c-base-ndr-lat"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'NDRPDR' and
+           ('ETH' or 'DOT1Q') and
+           'BASE' and
+           '4T2C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
+  layout:
+    title: "vhost-l2sw-2n-skx-x710-64b-4t2c-base-ndr"
+    layout: "plot-latency"
+
+# Packet Latency - VPP vhost l2sw 2n-skx-x710 - base vm
+-
+  type: "plot"
+  title: "VPP Latency: vhost-l2sw-2n-skx-x710-64b-2t1c-base-vm-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-2t1c-base-vm-ndr-lat"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'NDRPDR' and
+           ('ETH' or 'DOT1Q') and
+           '2T1C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'CFS_OPT' and
+           not 'VXLAN' and
+           not 'IP4FWD'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
+  layout:
+    title: "vhost-l2sw-2n-skx-x710-64b-2t1c-base-vm-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "VPP Latency: vhost-l2sw-2n-skx-x710-64b-4t2c-base-vm-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-4t2c-base-vm-ndr-lat"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'NDRPDR' and
+           ('ETH' or 'DOT1Q') and
+           '4T2C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'CFS_OPT' and
+           not 'VXLAN' and
+           not 'IP4FWD'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
+  layout:
+    title: "vhost-l2sw-2n-skx-x710-64b-4t2c-base-vm-ndr"
+    layout: "plot-latency"
+
+# Packet Latency - VPP vhost ip4 2n-skx-xxv710
+-
+  type: "plot"
+  title: "VPP Latency: vhost-ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
+           '64B' and
+           'NDRPDR' and
+           'ETH' and
+           'IP4FWD' and
+           '2T1C' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'DOT1Q'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "not CFS_OPT"
+  - "1VM"
+  - "2VM"
+  layout:
+    title: "vhost-ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "VPP Latency: vhost-ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
+           '64B' and
+           'NDRPDR' and
+           'ETH' and
+           'IP4FWD' and
+           '4T2C' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'DOT1Q'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  sort:
+  - "not CFS_OPT"
+  - "1VM"
+  - "2VM"
+  layout:
+    title: "vhost-ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
+    layout: "plot-latency"
+
+# Packet Latency - VPP vhost l2sw 2n-skx-xxv710
+-
+  type: "plot"
+  title: "VPP Latency: vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
+           '64B' and
+           'NDRPDR' and
+           ('ETH' or 'DOT1Q') and
+           '2T1C' and
+           'L2BDMACLRN' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+#  sort:
+#  - "VM"  # "not CFS_OPT"
+#  - "CFS_OPT"
+#  - "FIB_10K"
+#  - "FIB_100K"
+#  - "FIB_1M"
+  layout:
+    title: "vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "VPP Latency: vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
+           '64B' and
+           'NDRPDR' and
+           ('ETH' or 'DOT1Q') and
+           '4T2C' and
+           'L2BDMACLRN' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+#  sort:
+#  - "VM"  # "not CFS_OPT"
+#  - "CFS_OPT"
+#  - "FIB_10K"
+#  - "FIB_100K"
+#  - "FIB_1M"
+  layout:
+    title: "vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
+    layout: "plot-latency"
+
+# Packet Latency - VPP vhost l2sw 2n-skx-xxv710 - base
+-
+  type: "plot"
+  title: "VPP Latency: vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-ndr-lat"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
+           '64B' and
+           'NDRPDR' and
+           ('ETH' or 'DOT1Q') and
+           'BASE' and
+           '2T1C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
+  layout:
+    title: "vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "VPP Latency: vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-ndr-lat"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
+           '64B' and
+           'NDRPDR' and
+           ('ETH' or 'DOT1Q') and
+           'BASE' and
+           '4T2C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
+  layout:
+    title: "vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-ndr"
+    layout: "plot-latency"
+
+# Packet Latency - VPP vhost l2sw 2n-skx-xxv710 - base vm
+-
+  type: "plot"
+  title: "VPP Latency: vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-vm-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-vm-ndr-lat"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
+           '64B' and
+           'NDRPDR' and
+           ('ETH' or 'DOT1Q') and
+           '2T1C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'CFS_OPT' and
+           not 'VXLAN' and
+           not 'IP4FWD'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
+  layout:
+    title: "vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-vm-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "VPP Latency: vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-ndr-lat"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
+           '64B' and
+           'NDRPDR' and
+           ('ETH' or 'DOT1Q') and
+           '4T2C' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'CFS_OPT' and
+           not 'VXLAN' and
+           not 'IP4FWD'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
+  layout:
+    title: "vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-vm-ndr"
+    layout: "plot-latency"
+
+################################################################################
+
+# Packet Latency - VPP VTS 3n-hsw-x520
+-
+  type: "plot"
+  title: "VPP Latency: vts-3n-hsw-x520-114b-1t1c-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-114b-1t1c-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '114B' and
+           'NDRPDR' and
+           '1T1C' and
+           'VTS'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  layout:
+    title: "vts-3n-hsw-x520-114b-1t1c-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "VPP Latency: vts-3n-hsw-x520-114b-2t2c-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-114b-2t2c-ndr-lat"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '114B' and
+           'NDRPDR' and
+           '2T2C' and
+           'VTS'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  layout:
+    title: "vts-3n-hsw-x520-114b-2t2c-ndr"
+    layout: "plot-latency"
+
+################################################################################
+
+# Packet Latency - DPDK l3fwd 3n-hsw-x520
+-
+  type: "plot"
+  title: "DPDK Latency: l3fwd-3n-hsw-x520-64b-1t1c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x520-64b-1t1c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           'BASE' and
+           'NDRPDR' and
+           '1T1C' and
+           'IP4FWD'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  layout:
+    title: "l3fwd-3n-hsw-x520-64b-1t1c-base-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "DPDK Latency: l3fwd-3n-hsw-x520-64b-2t2c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x520-64b-2t2c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           'BASE' and
+           'NDRPDR' and
+           '2T2C' and
+           'IP4FWD'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  layout:
+    title: "l3fwd-3n-hsw-x520-64b-2t2c-base-ndr"
+    layout: "plot-latency"
+
+# Packet Latency - DPDK l3fwd 3n-hsw-x710
+-
+  type: "plot"
+  title: "DPDK Latency: l3fwd-3n-hsw-x710-64b-1t1c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x710-64b-1t1c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'BASE' and
+           'NDRPDR' and
+           '1T1C' and
+           'IP4FWD'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  layout:
+    title: "l3fwd-3n-hsw-x710-64b-1t1c-base-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "DPDK Latency: l3fwd-3n-hsw-x710-64b-2t2c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-x710-64b-2t2c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'BASE' and
+           'NDRPDR' and
+           '2T2C' and
+           'IP4FWD'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  layout:
+    title: "l3fwd-3n-hsw-x710-64b-2t2c-base-ndr"
+    layout: "plot-latency"
+
+# Packet Latency - DPDK l3fwd 3n-hsw-xl710
+-
+  type: "plot"
+  title: "DPDK Latency: l3fwd-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
+           '64B' and
+           'BASE' and
+           'NDRPDR' and
+           '1T1C' and
+           'IP4FWD'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  layout:
+    title: "l3fwd-3n-hsw-xl710-64b-1t1c-base-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "DPDK Latency: l3fwd-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
+           '64B' and
+           'BASE' and
+           'NDRPDR' and
+           '2T2C' and
+           'IP4FWD'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  layout:
+    title: "l3fwd-3n-hsw-xl710-64b-2t2c-base-ndr"
+    layout: "plot-latency"
+
+# Packet Latency - DPDK l3fwd 3n-skx-x710
+-
+  type: "plot"
+  title: "DPDK Latency: l3fwd-3n-skx-x710-64b-2t1c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-skx-x710-64b-2t1c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'BASE' and
+           'NDRPDR' and
+           '2T1C' and
+           'IP4FWD'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  layout:
+    title: "l3fwd-3n-skx-x710-64b-2t1c-base-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "DPDK Latency: l3fwd-3n-skx-x710-64b-4t2c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-skx-x710-64b-4t2c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'BASE' and
+           'NDRPDR' and
+           '4T2C' and
+           'IP4FWD'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  layout:
+    title: "l3fwd-3n-skx-x710-64b-4t2c-base-ndr"
+    layout: "plot-latency"
+
+# Packet Latency - DPDK l3fwd 3n-skx-xxv710
+-
+  type: "plot"
+  title: "DPDK Latency: l3fwd-3n-skx-xxv710-64b-2t1c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-skx-xxv710-64b-2t1c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-XXV710' and
+           '64B' and
+           'BASE' and
+           'NDRPDR' and
+           '2T1C' and
+           'IP4FWD'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  layout:
+    title: "l3fwd-3n-skx-xxv710-64b-2t1c-base-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "DPDK Latency: l3fwd-3n-skx-xxv710-64b-4t2c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-3n-skx-xxv710-64b-4t2c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-XXV710' and
+           '64B' and
+           'BASE' and
+           'NDRPDR' and
+           '4T2C' and
+           'IP4FWD'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  layout:
+    title: "l3fwd-3n-skx-xxv710-64b-4t2c-base-ndr"
+    layout: "plot-latency"
+
+# Packet Latency - DPDK l3fwd 2n-skx-x710
+-
+  type: "plot"
+  title: "DPDK Latency: l3fwd-2n-skx-x710-64b-2t1c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-2n-skx-x710-64b-2t1c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'BASE' and
+           'NDRPDR' and
+           '2T1C' and
+           'IP4FWD'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  layout:
+    title: "l3fwd-2n-skx-x710-64b-2t1c-base-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "DPDK Latency: l3fwd-2n-skx-x710-64b-4t2c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-2n-skx-x710-64b-4t2c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'BASE' and
+           'NDRPDR' and
+           '4T2C' and
+           'IP4FWD'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  layout:
+    title: "l3fwd-2n-skx-x710-64b-4t2c-base-ndr"
+    layout: "plot-latency"
+
+# Packet Latency - DPDK l3fwd 2n-skx-xxv710
+-
+  type: "plot"
+  title: "DPDK Latency: l3fwd-2n-skx-xxv710-64b-2t1c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-2n-skx-xxv710-64b-2t1c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
+           '64B' and
+           'BASE' and
+           'NDRPDR' and
+           '2T1C' and
+           'IP4FWD'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  layout:
+    title: "l3fwd-2n-skx-xxv710-64b-2t1c-base-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "DPDK Latency: l3fwd-2n-skx-xxv710-64b-4t2c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,DPDK]}/l3fwd-2n-skx-xxv710-64b-4t2c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
+           '64B' and
+           'BASE' and
+           'NDRPDR' and
+           '4T2C' and
+           'IP4FWD'"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  layout:
+    title: "l3fwd-2n-skx-xxv710-64b-4t2c-base-ndr"
+    layout: "plot-latency"
+
+################################################################################
+
+# Packet Latency - DPDK testpmd 3n-hsw-x520
+-
+  type: "plot"
+  title: "DPDK Latency: testpmd-3n-hsw-x520-64b-1t1c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x520-64b-1t1c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           'BASE' and
+           'NDRPDR' and
+           '1T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  layout:
+    title: "testpmd-3n-hsw-x520-64b-1t1c-base-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "DPDK Latency: testpmd-3n-hsw-x520-64b-2t2c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x520-64b-2t2c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           'BASE' and
+           'NDRPDR' and
+           '2T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  layout:
+    title: "testpmd-3n-hsw-x520-64b-2t2c-base-ndr"
+    layout: "plot-latency"
+
+# Packet Latency - DPDK testpmd 3n-hsw-x710
+-
+  type: "plot"
+  title: "DPDK Latency: testpmd-3n-hsw-x710-64b-1t1c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x710-64b-1t1c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'BASE' and
+           'NDRPDR' and
+           '1T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  layout:
+    title: "testpmd-3n-hsw-x710-64b-1t1c-base-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "DPDK Latency: testpmd-3n-hsw-x710-64b-2t2c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-x710-64b-2t2c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'BASE' and
+           'NDRPDR' and
+           '2T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  layout:
+    title: "testpmd-3n-hsw-x710-64b-2t2c-base-ndr"
+    layout: "plot-latency"
+
+# Packet Latency - DPDK testpmd 3n-hsw-xl710
+-
+  type: "plot"
+  title: "DPDK Latency: testpmd-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-xl710-64b-1t1c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
+           '64B' and
+           'BASE' and
+           'NDRPDR' and
+           '1T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  layout:
+    title: "testpmd-3n-hsw-xl710-64b-1t1c-base-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "DPDK Latency: testpmd-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-hsw-xl710-64b-2t2c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
+           '64B' and
+           'BASE' and
+           'NDRPDR' and
+           '2T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  layout:
+    title: "testpmd-3n-hsw-xl710-64b-2t2c-base-ndr"
+    layout: "plot-latency"
+
+# Packet Latency - DPDK testpmd 3n-skx-x710
+-
+  type: "plot"
+  title: "DPDK Latency: testpmd-3n-skx-x710-64b-2t1c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-skx-x710-64b-2t1c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'BASE' and
+           'NDRPDR' and
+           '2T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  layout:
+    title: "testpmd-3n-skx-x710-64b-2t1c-base-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "DPDK Latency: testpmd-3n-skx-x710-64b-4t2c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-skx-x710-64b-4t2c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'BASE' and
+           'NDRPDR' and
+           '4T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  layout:
+    title: "testpmd-3n-skx-x710-64b-4t2c-base-ndr"
+    layout: "plot-latency"
+
+# Packet Latency - DPDK testpmd 3n-skx-xxv710
+-
+  type: "plot"
+  title: "DPDK Latency: testpmd-3n-skx-xxv710-64b-2t1c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-skx-xxv710-64b-2t1c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-XXV710' and
+           '64B' and
+           'BASE' and
+           'NDRPDR' and
+           '2T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  layout:
+    title: "testpmd-3n-skx-xxv710-64b-2t1c-base-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "DPDK Latency: testpmd-3n-skx-xxv710-64b-4t2c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-3n-skx-xxv710-64b-4t2c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-XXV710' and
+           '64B' and
+           'BASE' and
+           'NDRPDR' and
+           '4T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  layout:
+    title: "testpmd-3n-skx-xxv710-64b-4t2c-base-ndr"
+    layout: "plot-latency"
+
+# Packet Latency - DPDK testpmd 2n-skx-x710
+-
+  type: "plot"
+  title: "DPDK Latency: testpmd-2n-skx-x710-64b-2t1c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-x710-64b-2t1c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'BASE' and
+           'NDRPDR' and
+           '2T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  layout:
+    title: "testpmd-2n-skx-x710-64b-2t1c-base-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "DPDK Latency: testpmd-2n-skx-x710-64b-4t2c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-x710-64b-4t2c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'BASE' and
+           'NDRPDR' and
+           '4T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  layout:
+    title: "testpmd-2n-skx-x710-64b-4t2c-base-ndr"
+    layout: "plot-latency"
+
+# Packet Latency - DPDK testpmd 2n-skx-xxv710
+-
+  type: "plot"
+  title: "DPDK Latency: testpmd-2n-skx-xxv710-64b-2t1c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-xxv710-64b-2t1c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
+           '64B' and
+           'BASE' and
+           'NDRPDR' and
+           '2T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  layout:
+    title: "testpmd-2n-skx-xxv710-64b-2t1c-base-ndr"
+    layout: "plot-latency"
+
+-
+  type: "plot"
+  title: "DPDK Latency: testpmd-2n-skx-xxv710-64b-4t2c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-xxv710-64b-4t2c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
+           '64B' and
+           'BASE' and
+           'NDRPDR' and
+           '4T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+  parameters:
+  - "latency"
+  - "parent"
+  - "tags"
+  layout:
+    title: "testpmd-2n-skx-xxv710-64b-4t2c-base-ndr"
+    layout: "plot-latency"
+
+################################################################################
+
+# Speedup - VPP Container Memif 3n-hsw-x520
+-
+  type: "plot"
+  title: "Speedup: memif-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           'MEMIF'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  sort:
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  layout:
+    title: "memif-3n-hsw-x520-64b-base_and_scale-ndr"
+    layout: "plot-throughput-speedup-analysis"
+
+-
+  type: "plot"
+  title: "Speedup: memif-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           'MEMIF'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  sort:
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  layout:
+    title: "memif-3n-hsw-x520-64b-base_and_scale-pdr"
+    layout: "plot-throughput-speedup-analysis"
+
+# Speedup - VPP Container Memif 3n-hsw-x710
+-
+  type: "plot"
+  title: "Speedup: memif-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           'MEMIF'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  sort:
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  layout:
+    title: "memif-3n-hsw-x710-64b-base_and_scale-ndr"
+    layout: "plot-throughput-speedup-analysis"
+
+-
+  type: "plot"
+  title: "Speedup: memif-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           'MEMIF'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  sort:
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  layout:
+    title: "memif-3n-hsw-x710-64b-base_and_scale-pdr"
+    layout: "plot-throughput-speedup-analysis"
+
+# Speedup - VPP Container Memif 3n-hsw-xl710
+-
+  type: "plot"
+  title: "Speedup: memif-3n-hsw-xl710-64b-base_and_scale-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-base_and_scale-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
+           '64B' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           'MEMIF'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  sort:
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  layout:
+    title: "memif-3n-hsw-xl710-64b-base_and_scale-ndr"
+    layout: "plot-throughput-speedup-analysis"
+
+-
+  type: "plot"
+  title: "Speedup: memif-3n-hsw-xl710-64b-base_and_scale-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-base_and_scale-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
+           '64B' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           'MEMIF'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  sort:
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  layout:
+    title: "memif-3n-hsw-xl710-64b-base_and_scale-pdr"
+    layout: "plot-throughput-speedup-analysis"
+
+# Speedup - VPP Container Memif 3n-skx-x710
+-
+  type: "plot"
+  title: "Speedup: memif-3n-skx-x710-64b-base_and_scale-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-base_and_scale-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           'MEMIF'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  sort:
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  layout:
+    title: "memif-3n-skx-x710-64b-base_and_scale-ndr"
+    layout: "plot-throughput-speedup-analysis"
+
+-
+  type: "plot"
+  title: "Speedup: memif-3n-skx-x710-64b-base_and_scale-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-base_and_scale-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+            'MEMIF'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  sort:
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  layout:
+    title: "memif-3n-skx-x710-64b-base_and_scale-pdr"
+    layout: "plot-throughput-speedup-analysis"
+
+# Speedup - VPP Container Memif 2n-skx-x710
+-
+  type: "plot"
+  title: "Speedup: memif-2n-skx-x710-64b-base_and_scale-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-base_and_scale-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           'MEMIF'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  sort:
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  layout:
+    title: "memif-2n-skx-x710-64b-base_and_scale-ndr"
+    layout: "plot-throughput-speedup-analysis"
+
+-
+  type: "plot"
+  title: "Speedup: memif-2n-skx-x710-64b-base_and_scale-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-base_and_scale-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+            'MEMIF'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  sort:
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  layout:
+    title: "memif-2n-skx-x710-64b-base_and_scale-pdr"
+    layout: "plot-throughput-speedup-analysis"
+
+# Speedup - VPP Container Memif 2n-skx-xxv710
+-
+  type: "plot"
+  title: "Speedup: memif-2n-skx-xxv710-64b-base_and_scale-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-xxv710-64b-base_and_scale-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
+           '64B' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           'MEMIF'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  sort:
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  layout:
+    title: "memif-2n-skx-xxv710-64b-base_and_scale-ndr"
+    layout: "plot-throughput-speedup-analysis"
+
+-
+  type: "plot"
+  title: "Speedup: memif-2n-skx-xxv710-64b-base_and_scale-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-xxv710-64b-base_and_scale-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
+           '64B' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+            'MEMIF'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  sort:
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  layout:
+    title: "memif-2n-skx-xxv710-64b-base_and_scale-pdr"
+    layout: "plot-throughput-speedup-analysis"
+
+################################################################################
+
+# Speedup - VPP Container k8s memif 3n-hsw-x520 - l2xc
+-
+  type: "plot"
+  title: "Speedup: k8s-memif-3n-hsw-x520-64b-base_and_scale-l2xc-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-base_and_scale-l2xc-ndr-tsa"
+  data: "plot-ligato-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
+           'L2XCFWD' and
+           not 'VHOST' and
+           'MEMIF'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  sort:
+  - "1VNF"
+  - "2VNF"
+  - "4VNF"
+  - "2VNF"
+  - "4VNF"
+  layout:
+    title: "k8s-memif-3n-hsw-x520-64b-base_and_scale-ndr-l2xc"
+    layout: "plot-throughput-speedup-analysis"
+
+-
+  type: "plot"
+  title: "Speedup: k8s-memif-3n-hsw-x520-64b-base_and_scale-l2xc-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-base_and_scale-l2xc-pdr-tsa"
+  data: "plot-ligato-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
+           'L2XCFWD' and
+           not 'VHOST' and
+           'MEMIF'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  sort:
+  - "1VNF"
+  - "2VNF"
+  - "4VNF"
+  - "2VNF"
+  - "4VNF"
+  layout:
+    title: "k8s-memif-3n-hsw-x520-64b-base_and_scale-l2xc-pdr"
+    layout: "plot-throughput-speedup-analysis"
+
+# Speedup - VPP Container k8s memif 3n-hsw-x520 - l2bd
+-
+  type: "plot"
+  title: "Speedup: k8s-memif-3n-hsw-x520-64b-base_and_scale-l2bd-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-base_and_scale-l2bd-ndr-tsa"
+  data: "plot-ligato-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+           not 'VHOST' and
+           'MEMIF'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  sort:
+  - "1VNF"
+  - "2VNF"
+  - "4VNF"
+  - "2VNF"
+  - "4VNF"
+  layout:
+    title: "k8s-memif-3n-hsw-x520-64b-base_and_scale-ndr-l2bd"
+    layout: "plot-throughput-speedup-analysis"
+
+-
+  type: "plot"
+  title: "Speedup: k8s-memif-3n-hsw-x520-64b-base_and_scale-l2bd-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-base_and_scale-l2bd-pdr-tsa"
+  data: "plot-ligato-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+           not 'VHOST' and
+           'MEMIF'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  sort:
+  - "1VNF"
+  - "2VNF"
+  - "4VNF"
+  - "2VNF"
+  - "4VNF"
+  layout:
+    title: "k8s-memif-3n-hsw-x520-64b-base_and_scale-l2bd-pdr"
+    layout: "plot-throughput-speedup-analysis"
+
+# Speedup - VPP Container Memif 3n-hsw-x710 - l2xc
+-
+  type: "plot"
+  title: "Speedup: k8s-memif-3n-hsw-x710-64b-base_and_scale-l2xc-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-base_and_scale-l2xc-ndr-tsa"
+  data: "plot-ligato-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
+           'L2XCFWD' and
+           not 'VHOST' and
+           'MEMIF'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  sort:
+  - "1VNF"
+  - "2VNF"
+  - "4VNF"
+  - "2VNF"
+  - "4VNF"
+  layout:
+    title: "k8s-memif-3n-hsw-x710-64b-base_and_scale-l2xc-ndr"
+    layout: "plot-throughput-speedup-analysis"
+
+-
+  type: "plot"
+  title: "Speedup: k8s-memif-3n-hsw-x710-64b-base_and_scale-l2xc-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-base_and_scale-l2xc-pdr-tsa"
+  data: "plot-ligato-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
+           'L2XCFWD' and
+           not 'VHOST' and
+           'MEMIF'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  sort:
+  - "1VNF"
+  - "2VNF"
+  - "4VNF"
+  - "2VNF"
+  - "4VNF"
+  layout:
+    title: "k8s-memif-3n-hsw-x710-64b-base_and_scale-l2xc-pdr"
+    layout: "plot-throughput-speedup-analysis"
+
+# Speedup - VPP Container Memif 3n-hsw-x710 - l2bd
+-
+  type: "plot"
+  title: "Speedup: k8s-memif-3n-hsw-x710-64b-base_and_scale-l2bd-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-base_and_scale-l2bd-ndr-tsa"
+  data: "plot-ligato-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+           not 'VHOST' and
+           'MEMIF'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  sort:
+  - "1VNF"
+  - "2VNF"
+  - "4VNF"
+  - "2VNF"
+  - "4VNF"
+  layout:
+    title: "k8s-memif-3n-hsw-x710-64b-base_and_scale-l2bd-ndr"
+    layout: "plot-throughput-speedup-analysis"
+
+-
+  type: "plot"
+  title: "Speedup: k8s-memif-3n-hsw-x710-64b-base_and_scale-l2bd-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-base_and_scale-l2bd-pdr-tsa"
+  data: "plot-ligato-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+           not 'VHOST' and
+           'MEMIF'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  sort:
+  - "1VNF"
+  - "2VNF"
+  - "4VNF"
+  - "2VNF"
+  - "4VNF"
+  layout:
+    title: "k8s-memif-3n-hsw-x710-64b-base_and_scale-l2bd-pdr"
+    layout: "plot-throughput-speedup-analysis"
+
+################################################################################
+
+# Speedup - VPP IPv4 3n-hsw-x520 base and scale
+-
+  type: "plot"
+  title: "Speedup: ip4-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           'NDRPDR' and
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
+  layout:
+    title: "ip4-3n-hsw-x520-64b-base_and_scale-ndr"
+    layout: "plot-throughput-speedup-analysis"
+
+-
+  type: "plot"
+  title: "Speedup: ip4-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           'NDRPDR' and
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
+  layout:
+    title: "ip4-3n-hsw-x520-64b-base_and_scale-pdr"
+    layout: "plot-throughput-speedup-analysis"
+
+# Speedup - VPP IPv4 3n-hsw-x520 features
+-
+  type: "plot"
+  title: "Speedup: ip4-3n-hsw-x520-64b-features-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-features-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           ('IP4BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            ('NAT44' and 'BASE') or
+            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
+           'NDRPDR' and
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "NAT44"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACL"
+  - "OACL"
+  layout:
+    title: "ip4-3n-hsw-x520-64b-features-ndr"
+    layout: "plot-throughput-speedup-analysis"
+
+-
+  type: "plot"
+  title: "Speedup: ip4-3n-hsw-x520-64b-features-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-features-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           ('IP4BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            ('NAT44' and 'BASE') or
+            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
+           'NDRPDR' and
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "NAT44"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACL"
+  - "OACL"
+  layout:
+    title: "ip4-3n-hsw-x520-64b-features-pdr"
+    layout: "plot-throughput-speedup-analysis"
+
+# Speedup - VPP IPv4 3n-hsw-x520 features nat44
+-
+  type: "plot"
+  title: "Speedup: ip4-3n-hsw-x520-64b-features-nat44-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-features-nat44-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           'NDRPDR' 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"
+  layout:
+    title: "ip4-3n-hsw-x520-64b-features-nat44-ndr"
+    layout: "plot-throughput-speedup-analysis"
+
+-
+  type: "plot"
+  title: "Speedup: ip4-3n-hsw-x520-64b-features-nat44-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-features-nat44-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           'NDRPDR' 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"
+  layout:
+    title: "ip4-3n-hsw-x520-64b-features-nat44-pdr"
+    layout: "plot-throughput-speedup-analysis"
+
+# Speedup - VPP IPv4 3n-hsw-x520 features iacl
+-
+  type: "plot"
+  title: "Speedup: ip4-3n-hsw-x520-64b-features-iacl-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-features-iacl-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           'NDRPDR' 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"
+  layout:
+    title: "ip4-3n-hsw-x520-64b-features-iacl-ndr"
+    layout: "plot-throughput-speedup-analysis"
+
+-
+  type: "plot"
+  title: "Speedup: ip4-3n-hsw-x520-64b-features-iacl-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-features-iacl-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           'NDRPDR' 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"
+  layout:
+    title: "ip4-3n-hsw-x520-64b-features-iacl-pdr"
+    layout: "plot-throughput-speedup-analysis"
+
+# Speedup - VPP IPv4 3n-hsw-x520 features oacl
+-
+  type: "plot"
+  title: "Speedup: ip4-3n-hsw-x520-64b-features-oacl-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-features-oacl-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' 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-x520-64b-features-oacl-ndr"
+    layout: "plot-throughput-speedup-analysis"
+
+-
+  type: "plot"
+  title: "Speedup: ip4-3n-hsw-x520-64b-features-oacl-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-features-oacl-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' 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-x520-64b-features-oacl-pdr"
+    layout: "plot-throughput-speedup-analysis"
+
+# Speedup - VPP IPv4 3n-hsw-x710 base and scale
+-
+  type: "plot"
+  title: "Speedup: ip4-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           'NDRPDR' and
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
+  layout:
+    title: "ip4-3n-hsw-x710-64b-base_and_scale-ndr"
+    layout: "plot-throughput-speedup-analysis"
+
+-
+  type: "plot"
+  title: "Speedup: ip4-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           'NDRPDR' and
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
+  layout:
+    title: "ip4-3n-hsw-x710-64b-base_and_scale-pdr"
+    layout: "plot-throughput-speedup-analysis"
+
+# Speedup - VPP IPv4 3n-hsw-x710 features
+-
+  type: "plot"
+  title: "Speedup: ip4-3n-hsw-x710-64b-features-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-features-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           ('IP4BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            ('NAT44' and 'BASE') or
+            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
+           'NDRPDR' and
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "NAT44"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACL"
+  - "OACL"
+  layout:
+    title: "ip4-3n-hsw-x710-64b-features-ndr"
+    layout: "plot-throughput-speedup-analysis"
+
+-
+  type: "plot"
+  title: "Speedup: ip4-3n-hsw-x710-64b-features-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-features-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           ('IP4BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            ('NAT44' and 'BASE') or
+            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
+           'NDRPDR' and
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "NAT44"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACL"
+  - "OACL"
+  layout:
+    title: "ip4-3n-hsw-x710-64b-features-pdr"
+    layout: "plot-throughput-speedup-analysis"
+
+# Speedup - VPP IPv4 3n-hsw-x710 features nat44
+-
+  type: "plot"
+  title: "Speedup: ip4-3n-hsw-x710-64b-features-nat44-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-features-nat44-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'NDRPDR' 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"
+  layout:
+    title: "ip4-3n-hsw-x710-64b-features-nat44-ndr"
+    layout: "plot-throughput-speedup-analysis"
+
+-
+  type: "plot"
+  title: "Speedup: ip4-3n-hsw-x710-64b-features-nat44-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-features-nat44-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'NDRPDR' 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"
+  layout:
+    title: "ip4-3n-hsw-x710-64b-features-nat44-pdr"
+    layout: "plot-throughput-speedup-analysis"
+
+# Speedup - VPP IPv4 3n-hsw-x710 features iacl
+-
+  type: "plot"
+  title: "Speedup: ip4-3n-hsw-x710-64b-features-iacl-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-features-iacl-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'NDRPDR' 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"
+  layout:
+    title: "ip4-3n-hsw-x710-64b-features-iacl-ndr"
+    layout: "plot-throughput-speedup-analysis"
+
+-
+  type: "plot"
+  title: "Speedup: ip4-3n-hsw-x710-64b-features-iacl-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-features-iacl-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'NDRPDR' 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"
+  layout:
+    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-xl710 base and scale
+-
+  type: "plot"
+  title: "Speedup: ip4-3n-hsw-xl710-64b-base_and_scale-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-base_and_scale-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
+           '64B' and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           'NDRPDR' and
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
+  layout:
+    title: "ip4-3n-hsw-xl710-64b-base_and_scale-ndr"
+    layout: "plot-throughput-speedup-analysis"
+
+-
+  type: "plot"
+  title: "Speedup: ip4-3n-hsw-xl710-64b-base_and_scale-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-base_and_scale-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
+           '64B' and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           'NDRPDR' and
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
+  layout:
+    title: "ip4-3n-hsw-xl710-64b-base_and_scale-pdr"
+    layout: "plot-throughput-speedup-analysis"
+
+# Speedup - VPP IPv4 3n-skx-x710 base and scale
+-
+  type: "plot"
+  title: "Speedup: ip4-3n-skx-x710-64b-base_and_scale-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-base_and_scale-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           'NDRPDR' and
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
+  layout:
+    title: "ip4-3n-skx-x710-64b-base_and_scale-ndr"
+    layout: "plot-throughput-speedup-analysis"
+
+-
+  type: "plot"
+  title: "Speedup: ip4-3n-skx-x710-64b-base_and_scale-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-base_and_scale-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           'NDRPDR' and
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
+  layout:
+    title: "ip4-3n-skx-x710-64b-base_and_scale-pdr"
+    layout: "plot-throughput-speedup-analysis"
+
+# Speedup - VPP IPv4 3n-skx-x710 features
+-
+  type: "plot"
+  title: "Speedup: ip4-3n-skx-x710-64b-features-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-features-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           ('IP4BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            ('NAT44' and 'BASE') or
+            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
+           'NDRPDR' and
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "NAT44"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACL"
+  - "OACL"
+  layout:
+    title: "ip4-3n-skx-x710-64b-features-ndr"
+    layout: "plot-throughput-speedup-analysis"
+
+-
+  type: "plot"
+  title: "Speedup: ip4-3n-skx-x710-64b-features-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-features-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           ('IP4BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            ('NAT44' and 'BASE') or
+            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
+           'NDRPDR' and
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "NAT44"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACL"
+  - "OACL"
+  layout:
+    title: "ip4-3n-skx-x710-64b-features-pdr"
+    layout: "plot-throughput-speedup-analysis"
+
+# Speedup - VPP IPv4 3n-skx-x710 features nat44
+-
+  type: "plot"
+  title: "Speedup: ip4-3n-skx-x710-64b-features-nat44-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-features-nat44-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'NDRPDR' 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"
+  layout:
+    title: "ip4-3n-skx-x710-64b-features-nat44-ndr"
+    layout: "plot-throughput-speedup-analysis"
+
+-
+  type: "plot"
+  title: "Speedup: ip4-3n-skx-x710-64b-features-nat44-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-features-nat44-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'NDRPDR' 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"
+  layout:
+    title: "ip4-3n-skx-x710-64b-features-nat44-pdr"
+    layout: "plot-throughput-speedup-analysis"
+
+# Speedup - VPP IPv4 3n-skx-x710 features iacl
+-
+  type: "plot"
+  title: "Speedup: ip4-3n-skx-x710-64b-features-iacl-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-features-iacl-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'NDRPDR' 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"
+  layout:
+    title: "ip4-3n-skx-x710-64b-features-iacl-ndr"
+    layout: "plot-throughput-speedup-analysis"
+
+-
+  type: "plot"
+  title: "Speedup: ip4-3n-skx-x710-64b-features-iacl-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-features-iacl-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'NDRPDR' 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"
+  layout:
+    title: "ip4-3n-skx-x710-64b-features-iacl-pdr"
+    layout: "plot-throughput-speedup-analysis"
+
+# Speedup - VPP IPv4 3n-skx-x710 features oacl
+-
+  type: "plot"
+  title: "Speedup: ip4-3n-skx-x710-64b-features-oacl-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-features-oacl-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-skx"
+  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-skx-x710-64b-features-oacl-ndr"
+    layout: "plot-throughput-speedup-analysis"
+
+-
+  type: "plot"
+  title: "Speedup: ip4-3n-skx-x710-64b-features-oacl-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-features-oacl-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-skx"
+  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-skx-x710-64b-features-oacl-pdr"
+    layout: "plot-throughput-speedup-analysis"
+
+# Speedup - VPP IPv4 2n-skx-x710 base and scale
+-
+  type: "plot"
+  title: "Speedup: ip4-2n-skx-x710-64b-base_and_scale-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-base_and_scale-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           'NDRPDR' and
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
+  layout:
+    title: "ip4-2n-skx-x710-64b-base_and_scale-ndr"
+    layout: "plot-throughput-speedup-analysis"
+
+-
+  type: "plot"
+  title: "Speedup: ip4-2n-skx-x710-64b-base_and_scale-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-base_and_scale-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           'NDRPDR' and
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
+  layout:
+    title: "ip4-2n-skx-x710-64b-base_and_scale-pdr"
+    layout: "plot-throughput-speedup-analysis"
+
+# Speedup - VPP IPv4 2n-skx-xxv710 base and scale
+-
+  type: "plot"
+  title: "Speedup: ip4-2n-skx-xxv710-64b-base_and_scale-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-base_and_scale-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
+           '64B' and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           'NDRPDR' and
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
+  layout:
+    title: "ip4-2n-skx-xxv710-64b-base_and_scale-ndr"
+    layout: "plot-throughput-speedup-analysis"
+
+-
+  type: "plot"
+  title: "Speedup: ip4-2n-skx-xxv710-64b-base_and_scale-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-base_and_scale-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
+           '64B' and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           'NDRPDR' and
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
+  layout:
+    title: "ip4-2n-skx-xxv710-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' and
+           'L2BDMACLRN' 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' and
+           'L2BDMACLRN' 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
+-
+  type: "plot"
+  title: "Speedup: ip4tun-3n-hsw-x520-64b-base_and_features-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-base_and_features-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           'ENCAP' and
+           'NDRPDR' and
+           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') and
+           not 'DOT1Q' and
+           not 'VHOST' and
+           not 'IPSECHW'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  sort:
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "LISP"
+  layout:
+    title: "ip4tun-3n-hsw-x520-64b-base_and_features-ndr"
+    layout: "plot-throughput-speedup-analysis"
+
+-
+  type: "plot"
+  title: "Speedup: ip4tun-3n-hsw-x520-64b-base_and_features-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-base_and_features-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           'ENCAP' and
+           'NDRPDR' and
+           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') and
+           not 'DOT1Q' and
+           not 'VHOST' and
+           not 'IPSECHW'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  sort:
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "LISP"
+  layout:
+    title: "ip4tun-3n-hsw-x520-64b-base_and_features-pdr"
+    layout: "plot-throughput-speedup-analysis"
+
+# Speedup - VPP IPv4 Tunnels 3n-hsw-x710
+-
+  type: "plot"
+  title: "Speedup: ip4tun-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'ENCAP' and
+           'NDRPDR' and
+           'VXLAN' and
+           'L2BDMACLRN' 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-x710-64b-base_and_scale-ndr"
+    layout: "plot-throughput-speedup-analysis"
+
+-
+  type: "plot"
+  title: "Speedup: ip4tun-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'ENCAP' and
+           'NDRPDR' and
+           'VXLAN' and
+           'L2BDMACLRN' 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-x710-64b-base_and_scale-pdr"
+    layout: "plot-throughput-speedup-analysis"
+
+# Speedup - VPP IPv4 Tunnels 3n-hsw-x710 - features
+-
+  type: "plot"
+  title: "Speedup: ip4tun-3n-hsw-x710-64b-base_and_features-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-base_and_features-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'ENCAP' and
+           'NDRPDR' and
+           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') and
+           not 'DOT1Q' and
+           not 'VHOST' and
+           not 'IPSECHW'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  sort:
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "LISP"
+  layout:
+    title: "ip4tun-3n-hsw-x710-64b-base_and_features-ndr"
+    layout: "plot-throughput-speedup-analysis"
+
+-
+  type: "plot"
+  title: "Speedup: ip4tun-3n-hsw-x710-64b-base_and_features-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-base_and_features-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'ENCAP' and
+           'NDRPDR' and
+           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') and
+           not 'DOT1Q' and
+           not 'VHOST' and
+           not 'IPSECHW'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  sort:
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "LISP"
+  layout:
+    title: "ip4tun-3n-hsw-x710-64b-base_and_features-pdr"
+    layout: "plot-throughput-speedup-analysis"
+
+# Speedup - VPP IPv4 Tunnels 3n-skx-x710
+-
+  type: "plot"
+  title: "Speedup: ip4tun-3n-skx-x710-64b-base_and_scale-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-base_and_scale-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'ENCAP' and
+           'NDRPDR' and
+           'VXLAN' and
+           'L2BDMACLRN' 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-skx-x710-64b-base_and_scale-ndr"
+    layout: "plot-throughput-speedup-analysis"
+
+-
+  type: "plot"
+  title: "Speedup: ip4tun-3n-skx-x710-64b-base_and_scale-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-base_and_scale-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'ENCAP' and
+           'NDRPDR' and
+           'VXLAN' and
+           'L2BDMACLRN' 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-skx-x710-64b-base_and_scale-pdr"
+    layout: "plot-throughput-speedup-analysis"
+
+# Speedup - VPP IPv4 Tunnels 3n-skx-x710 - features
+-
+  type: "plot"
+  title: "Speedup: ip4tun-3n-skx-x710-64b-base_and_features-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-base_and_features-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'ENCAP' and
+           'NDRPDR' and
+           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') and
+           not 'DOT1Q' and
+           not 'VHOST' and
+           not 'IPSECHW'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  sort:
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "LISP"
+  layout:
+    title: "ip4tun-3n-skx-x710-64b-base_and_features-ndr"
+    layout: "plot-throughput-speedup-analysis"
+
+-
+  type: "plot"
+  title: "Speedup: ip4tun-3n-skx-x710-64b-base_and_features-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-base_and_features-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'ENCAP' and
+           'NDRPDR' and
+           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') and
+           not 'DOT1Q' and
+           not 'VHOST' and
+           not 'IPSECHW'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  sort:
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "LISP"
+  layout:
+    title: "ip4tun-3n-skx-x710-64b-base_and_features-pdr"
+    layout: "plot-throughput-speedup-analysis"
+
+################################################################################
+
+# Speedup - VPP IPv6 3n-hsw-x520
+-
+  type: "plot"
+  title: "Speedup: ip6-3n-hsw-x520-78b-base_and_scale-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-base_and_scale-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '78B' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           'NDRPDR' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  sort:
+  - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
+  layout:
+    title: "ip6-3n-hsw-x520-78b-base_and_scale-ndr"
+    layout: "plot-throughput-speedup-analysis"
+
+-
+  type: "plot"
+  title: "Speedup: ip6-3n-hsw-x520-78b-base_and_scale-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-base_and_scale-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '78B' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           'NDRPDR' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  sort:
+  - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
+  layout:
+    title: "ip6-3n-hsw-x520-78b-base_and_scale-pdr"
+    layout: "plot-throughput-speedup-analysis"
+
+# Speedup - VPP IPv6 3n-hsw-x520 features
+-
+  type: "plot"
+  title: "Speedup: ip6-3n-hsw-x520-78b-base_and_features-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-base_and_features-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '78B' and
+           ('IP6BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            'IACLDST') and
+           'NDRPDR' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  sort:
+  - "IP6BASE"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACLDST"
+  layout:
+    title: "ip6-3n-hsw-x520-78b-base_and_features-ndr"
+    layout: "plot-throughput-speedup-analysis"
+
+-
+  type: "plot"
+  title: "Speedup: ip6-3n-hsw-x520-78b-base_and_features-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-base_and_features-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '78B' and
+           ('IP6BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            'IACLDST') and
+           'NDRPDR' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  sort:
+  - "IP6BASE"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACLDST"
+  layout:
+    title: "ip6-3n-hsw-x520-78b-base_and_features-pdr"
+    layout: "plot-throughput-speedup-analysis"
+
+# Speedup - VPP IPv6 3n-hsw-x710
+-
+  type: "plot"
+  title: "Speedup: ip6-3n-hsw-x710-78b-base_and_scale-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-base_and_scale-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-X710' and
+           '78B' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           'NDRPDR' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  sort:
+  - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
+  layout:
+    title: "ip6-3n-hsw-x710-78b-base_and_scale-ndr"
+    layout: "plot-throughput-speedup-analysis"
 
 -
   type: "plot"
-  title: "DPDK Latency: testpmd-2n-skx-x710-64b-4t2c-base-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "Speedup: ip6-3n-hsw-x710-78b-base_and_scale-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-x710-64b-4t2c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-base_and_scale-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
   filter: "'NIC_Intel-X710' and
-           '64B' and
-           'BASE' and
+           '78B' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  - "tags"
+  sort:
+  - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "ip6-3n-hsw-x710-78b-base_and_scale-pdr"
+    layout: "plot-throughput-speedup-analysis"
 
-# Packet Latency - DPDK testpmd 2n-skx-xxv710
+# Speedup - VPP IPv6 3n-hsw-x710 features
 -
   type: "plot"
-  title: "DPDK Latency: testpmd-2n-skx-xxv710-64b-2t1c-base-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "Speedup: ip6-3n-hsw-x710-78b-base_and_features-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-xxv710-64b-2t1c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'BASE' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-base_and_features-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-X710' and
+           '78B' and
+           ('IP6BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            'IACLDST') and
            'NDRPDR' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  - "tags"
+  sort:
+  - "IP6BASE"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACLDST"
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
+    title: "ip6-3n-hsw-x710-78b-base_and_features-ndr"
+    layout: "plot-throughput-speedup-analysis"
 
 -
   type: "plot"
-  title: "DPDK Latency: testpmd-2n-skx-xxv710-64b-4t2c-base-ndr-lat"
-  algorithm: "plot_latency_box"
+  title: "Speedup: ip6-3n-hsw-x710-78b-base_and_features-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-xxv710-64b-4t2c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'BASE' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-base_and_features-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-X710' and
+           '78B' and
+           ('IP6BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            'IACLDST') and
            'NDRPDR' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
-  - "latency"
+  - "throughput"
   - "parent"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  - "tags"
+  sort:
+  - "IP6BASE"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACLDST"
   layout:
-    title: ""  # No title
-    layout: "plot-latency"
-
-################################################################################
+    title: "ip6-3n-hsw-x710-78b-base_and_features-pdr"
+    layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP Container Memif 3n-hsw-x520
+# Speedup - VPP IPv6 3n-hsw-xl710
 -
   type: "plot"
-  title: "Speedup: memif-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
+  title: "Speedup: ip6-3n-hsw-xl710-78b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-base_and_scale-ndr-tsa"
   data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('BASE' or 'SCALE') and
+  filter: "'NIC_Intel-XL710' and
+           '78B' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           'MEMIF'"
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   layout:
-    title: ""  # No title
+    title: "ip6-3n-hsw-xl710-78b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
 -
   type: "plot"
-  title: "Speedup: memif-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
+  title: "Speedup: ip6-3n-hsw-xl710-78b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-base_and_scale-pdr-tsa"
   data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('BASE' or 'SCALE') and
+  filter: "'NIC_Intel-XL710' and
+           '78B' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           'MEMIF'"
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   layout:
-    title: ""  # No title
+    title: "ip6-3n-hsw-xl710-78b-base_and_scale-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP Container Memif 3n-hsw-x710
+# Speedup - VPP IPv6 3n-skx-x710
 -
   type: "plot"
-  title: "Speedup: memif-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
+  title: "Speedup: ip6-3n-skx-x710-78b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-base_and_scale-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-skx"
   filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
+           '78B' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           'MEMIF'"
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   layout:
-    title: ""  # No title
+    title: "ip6-3n-skx-x710-78b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
 -
   type: "plot"
-  title: "Speedup: memif-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
+  title: "Speedup: ip6-3n-skx-x710-78b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-base_and_scale-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-skx"
   filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
+           '78B' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           'MEMIF'"
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   layout:
-    title: ""  # No title
+    title: "ip6-3n-skx-x710-78b-base_and_scale-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP Container Memif 3n-hsw-xl710
+# Speedup - VPP IPv6 3n-skx-x710 features
 -
   type: "plot"
-  title: "Speedup: memif-3n-hsw-xl710-64b-base_and_scale-ndr-tsa"
+  title: "Speedup: ip6-3n-skx-x710-78b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-base_and_scale-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '78B' and
+           ('IP6BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            'IACLDST') and
            'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           'MEMIF'"
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "IP6BASE"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACLDST"
   layout:
-    title: ""  # No title
+    title: "ip6-3n-skx-x710-78b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
 -
   type: "plot"
-  title: "Speedup: memif-3n-hsw-xl710-64b-base_and_scale-pdr-tsa"
+  title: "Speedup: ip6-3n-skx-x710-78b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-base_and_scale-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '78B' and
+           ('IP6BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            'IACLDST') and
            'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           'MEMIF'"
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "IP6BASE"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACLDST"
   layout:
-    title: ""  # No title
+    title: "ip6-3n-skx-x710-78b-base_and_scale-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP Container Memif 3n-skx-x710
+# Speedup - VPP IPv6 2n-skx-x710
 -
   type: "plot"
-  title: "Speedup: memif-3n-skx-x710-64b-base_and_scale-ndr-tsa"
+  title: "Speedup: ip6-2n-skx-x710-78b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-base_and_scale-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-2n-skx"
   filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
+           '78B' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           'MEMIF'"
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   layout:
-    title: ""  # No title
+    title: "ip6-2n-skx-x710-78b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
 -
   type: "plot"
-  title: "Speedup: memif-3n-skx-x710-64b-base_and_scale-pdr-tsa"
+  title: "Speedup: ip6-2n-skx-x710-78b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-base_and_scale-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-2n-skx"
   filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
+           '78B' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-            'MEMIF'"
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   layout:
-    title: ""  # No title
+    title: "ip6-2n-skx-x710-78b-base_and_scale-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-################################################################################
+# Speedup - VPP IPv6 2n-skx-xxv710
+-
+  type: "plot"
+  title: "Speedup: ip6-2n-skx-xxv710-78b-base_and_scale-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-base_and_scale-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
+           '78B' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           'NDRPDR' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  sort:
+  - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
+  layout:
+    title: "ip6-2n-skx-xxv710-78b-base_and_scale-ndr"
+    layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP Container k8s memif 3n-hsw-x520
 -
   type: "plot"
-  title: "Speedup: k8s-memif-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
+  title: "Speedup: ip6-2n-skx-xxv710-78b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
-  data: "plot-ligato-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('BASE' or 'SCALE') and
+  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-base_and_scale-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
+           '78B' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           'MEMIF'"
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   layout:
-    title: ""  # No title
+    title: "ip6-2n-skx-xxv710-78b-base_and_scale-pdr"
     layout: "plot-throughput-speedup-analysis"
 
+################################################################################
+
+# Speedup - VPP IPv6 tunnels 3n-hsw-x520
 -
   type: "plot"
-  title: "Speedup: k8s-memif-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
+  title: "Speedup: ip6tun-3n-hsw-x520-78b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
-  data: "plot-ligato-throughput-speedup-analysis-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-base_and_scale-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('BASE' or 'SCALE') and
+           '78B' and
+           'ENCAP' and
            'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           'MEMIF'"
+           'LISP' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "IP4UNRLAY"
+  - "IP6UNRLAY"
   layout:
-    title: ""  # No title
+    title: "ip6tun-3n-hsw-x520-78b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP Container Memif 3n-hsw-x710
 -
   type: "plot"
-  title: "Speedup: k8s-memif-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
+  title: "Speedup: ip6tun-3n-hsw-x520-78b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
-  data: "plot-ligato-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
+  output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-base_and_scale-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '78B' and
+           'ENCAP' and
            'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           'MEMIF'"
+           'LISP' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "IP4UNRLAY"
+  - "IP6UNRLAY"
   layout:
-    title: ""  # No title
+    title: "ip6tun-3n-hsw-x520-78b-base_and_scale-pdr"
     layout: "plot-throughput-speedup-analysis"
 
+################################################################################
+
+# Speedup - VPP IPSec 3n-hsw-xl710 base
 -
   type: "plot"
-  title: "Speedup: k8s-memif-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
+  title: "Speedup: ipsec-3n-hsw-xl710-64b-base-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
-  data: "plot-ligato-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-base-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '64B' and
-           ('BASE' or 'SCALE') and
+           'IP4FWD' and
            'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           'MEMIF'"
+           'BASE' and
+           'IPSECHW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   layout:
-    title: ""  # No title
+    title: "ipsec-3n-hsw-xl710-64b-base-ndr"
     layout: "plot-throughput-speedup-analysis"
 
-################################################################################
-
-# Speedup - VPP IPv4 3n-hsw-x520
 -
   type: "plot"
-  title: "Speedup: ip4-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
+  title: "Speedup: ipsec-3n-hsw-xl710-64b-base-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-base-pdr-tsa"
   data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  filter: "'NIC_Intel-XL710' and
            '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
            'IP4FWD' and
-           not 'IPSEC' and
+           'NDRPDR' and
+           'BASE' and
+           'IPSECHW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   layout:
-    title: ""  # No title
+    title: "ipsec-3n-hsw-xl710-64b-base-pdr"
     layout: "plot-throughput-speedup-analysis"
 
+# Speedup - VPP IPSec 3n-hsw-xl710 scale
 -
   type: "plot"
-  title: "Speedup: ip4-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
+  title: "Speedup: ipsec-3n-hsw-xl710-64b-scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-scale-ndr-tsa"
   data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  filter: "'NIC_Intel-XL710' and
            '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
            'IP4FWD' and
-           not 'IPSEC' and
+           'NDRPDR' and
+           'SCALE' and
+           'IPSECHW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   layout:
-    title: ""  # No title
+    title: "ipsec-3n-hsw-xl710-64b-scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
 -
   type: "plot"
-  title: "Speedup: ip4-3n-hsw-x520-64b-features-ndr-tsa"
+  title: "Speedup: ipsec-3n-hsw-xl710-64b-scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-features-ndr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-scale-pdr-tsa"
   data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  filter: "'NIC_Intel-XL710' and
            '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRPDR' and
            'IP4FWD' and
-           not 'IPSEC' and
+           'NDRPDR' and
+           'SCALE' and
+           'IPSECHW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   layout:
-    title: ""  # No title
+    title: "ipsec-3n-hsw-xl710-64b-scale-pdr"
     layout: "plot-throughput-speedup-analysis"
 
+# Speedup - VPP IPSec 3n-hsw-xl710 sw
 -
   type: "plot"
-  title: "Speedup: ip4-3n-hsw-x520-64b-features-pdr-tsa"
+  title: "Speedup: ipsec-3n-hsw-xl710-64b-sw-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-features-pdr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-sw-ndr-tsa"
   data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  filter: "'NIC_Intel-XL710' and
            '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRPDR' and
            'IP4FWD' and
-           not 'IPSEC' and
+           'NDRPDR' and
+           'IPSECSW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   layout:
-    title: ""  # No title
+    title: "ipsec-3n-hsw-xl710-64b-sw-ndr"
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP IPv4 3n-hsw-x710
 -
   type: "plot"
-  title: "Speedup: ip4-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
+  title: "Speedup: ipsec-3n-hsw-xl710-64b-sw-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-sw-pdr-tsa"
   data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  filter: "'NIC_Intel-XL710' and
            '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
            'IP4FWD' and
-           not 'IPSEC' and
+           'NDRPDR' and
+           'IPSECSW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   layout:
-    title: ""  # No title
+    title: "ipsec-3n-hsw-xl710-64b-sw-pdr"
     layout: "plot-throughput-speedup-analysis"
 
+################################################################################
+
+# Speedup - VPP SRv6 3n-hsw-x520
 -
   type: "plot"
-  title: "Speedup: ip4-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
+  title: "Speedup: srv6-3n-hsw-x520-78b-features-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-features-ndr-tsa"
   data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
+  filter: "'NIC_Intel-X520-DA2' and
+           '78B' and
+           'FEATURE' and
            'NDRPDR' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           'IP6FWD' and
+           'SRv6'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   layout:
-    title: ""  # No title
+    title: "srv6-3n-hsw-x520-78b-features-ndr"
     layout: "plot-throughput-speedup-analysis"
 
 -
   type: "plot"
-  title: "Speedup: ip4-3n-hsw-x710-64b-features-ndr-tsa"
+  title: "Speedup: srv6-3n-hsw-x520-78b-features-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-features-ndr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-features-pdr-tsa"
   data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
+  filter: "'NIC_Intel-X520-DA2' and
+           '78B' and
            'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
            'NDRPDR' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           'IP6FWD' and
+           'SRv6'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   layout:
-    title: ""  # No title
+    title: "srv6-3n-hsw-x520-78b-features-pdr"
     layout: "plot-throughput-speedup-analysis"
 
+################################################################################
+
+# Speedup - VPP L2 3n-hsw-x520 base and scale
 -
   type: "plot"
-  title: "Speedup: ip4-3n-hsw-x710-64b-features-pdr-tsa"
+  title: "Speedup: l2sw-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-features-pdr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
   data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           'ETH' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  layout:
-    title: ""  # No title
+  sort:
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
+  layout:
+    title: "l2sw-3n-hsw-x520-64b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP IPv4 3n-hsw-xl710
 -
   type: "plot"
-  title: "Speedup: ip4-3n-hsw-xl710-64b-base_and_scale-ndr-tsa"
+  title: "Speedup: l2sw-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-base_and_scale-ndr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
   data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           'ETH' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  layout:
-    title: ""  # No title
+  sort:
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
+  layout:
+    title: "l2sw-3n-hsw-x520-64b-base_and_scale-pdr"
     layout: "plot-throughput-speedup-analysis"
 
+# Speedup - VPP L2 3n-hsw-x520 features
 -
   type: "plot"
-  title: "Speedup: ip4-3n-hsw-xl710-64b-base_and_scale-pdr-tsa"
+  title: "Speedup: l2sw-3n-hsw-x520-64b-features-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-base_and_scale-pdr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-features-ndr-tsa"
   data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
+           not 'ACL' and
+           not 'VHOST' and
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "L2XCBASE"    # l2xcbase
+  - "L2BDBASE"    # l2bdbase
+  - "L2XCFWD"     # dot1q-l2xcbase
+  - "L2BDMACLRN"  # dot1q-l2bdbase
   layout:
-    title: ""  # No title
+    title: "l2sw-3n-hsw-x520-64b-features-ndr"
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP IPv4 3n-skx-x710
 -
   type: "plot"
-  title: "Speedup: ip4-3n-skx-x710-64b-base_and_scale-ndr-tsa"
+  title: "Speedup: l2sw-3n-hsw-x520-64b-features-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-features-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
+           not 'ACL' and
+           not 'VHOST' and
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "L2XCBASE"    # l2xcbase
+  - "L2BDBASE"    # l2bdbase
+  - "L2XCFWD"     # dot1q-l2xcbase
+  - "L2BDMACLRN"  # dot1q-l2bdbase
   layout:
-    title: ""  # No title
+    title: "l2sw-3n-hsw-x520-64b-features-pdr"
     layout: "plot-throughput-speedup-analysis"
 
+# Speedup - VPP L2 3n-hsw-x710 base and scale
 -
   type: "plot"
-  title: "Speedup: ip4-3n-skx-x710-64b-base_and_scale-pdr-tsa"
+  title: "Speedup: l2sw-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           'ETH' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  layout:
-    title: ""  # No title
+  sort:
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
+  layout:
+    title: "l2sw-3n-hsw-x710-64b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
 -
   type: "plot"
-  title: "Speedup: ip4-3n-skx-x710-64b-features-ndr-tsa"
+  title: "Speedup: l2sw-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-features-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           'ETH' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  layout:
-    title: ""  # No title
+  sort:
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
+  layout:
+    title: "l2sw-3n-hsw-x710-64b-base_and_scale-pdr"
     layout: "plot-throughput-speedup-analysis"
 
+# Speedup - VPP L2 3n-hsw-x710 features
 -
   type: "plot"
-  title: "Speedup: ip4-3n-skx-x710-64b-features-pdr-tsa"
+  title: "Speedup: l2sw-3n-hsw-x710-64b-features-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-features-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-features-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
            'NDRPDR' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
+           not 'ACL' and
+           not 'VHOST' and
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "L2XCBASE"    # l2xcbase
+  - "L2BDBASE"    # l2bdbase
+  - "L2XCFWD"     # dot1q-l2xcbase
+  - "L2BDMACLRN"  # dot1q-l2bdbase
   layout:
-    title: ""  # No title
+    title: "l2sw-3n-hsw-x710-64b-features-ndr"
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP IPv4 2n-skx-x710
 -
   type: "plot"
-  title: "Speedup: ip4-2n-skx-x710-64b-base_and_scale-ndr-tsa"
+  title: "Speedup: l2sw-3n-hsw-x710-64b-features-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-features-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
+           not 'ACL' and
+           not 'VHOST' and
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "L2XCBASE"    # l2xcbase
+  - "L2BDBASE"    # l2bdbase
+  - "L2XCFWD"     # dot1q-l2xcbase
+  - "L2BDMACLRN"  # dot1q-l2bdbase
   layout:
-    title: ""  # No title
+    title: "l2sw-3n-hsw-x710-64b-features-pdr"
     layout: "plot-throughput-speedup-analysis"
 
+# Speedup - VPP L2 3n-hsw-xl710 base and scale
 -
   type: "plot"
-  title: "Speedup: ip4-2n-skx-x710-64b-base_and_scale-pdr-tsa"
+  title: "Speedup: l2sw-3n-hsw-xl710-64b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-xl710-64b-base_and_scale-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           'ETH' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  layout:
-    title: ""  # No title
+  sort:
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
+  layout:
+    title: "l2sw-3n-hsw-xl710-64b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP IPv4 2n-skx-xxv710
 -
   type: "plot"
-  title: "Speedup: ip4-2n-skx-xxv710-64b-base_and_scale-ndr-tsa"
+  title: "Speedup: l2sw-3n-hsw-xl710-64b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-xl710-64b-base_and_scale-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           'ETH' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  layout:
-    title: ""  # No title
+  sort:
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
+  layout:
+    title: "l2sw-3n-hsw-xl710-64b-base_and_scale-pdr"
     layout: "plot-throughput-speedup-analysis"
 
+# Speedup - VPP L2 3n-skx-x710 base and scale
 -
   type: "plot"
-  title: "Speedup: ip4-2n-skx-xxv710-64b-base_and_scale-pdr-tsa"
+  title: "Speedup: l2sw-3n-skx-x710-64b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-base_and_scale-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           'ETH' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  layout:
-    title: ""  # No title
+  sort:
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
+  layout:
+    title: "l2sw-3n-skx-x710-64b-base_and_scale-ndr"
     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"
+  title: "Speedup: l2sw-3n-skx-x710-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-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-base_and_scale-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           'ENCAP' and
-           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           'ETH' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  layout:
-    title: ""  # No title
+  sort:
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
+  layout:
+    title: "l2sw-3n-skx-x710-64b-base_and_scale-pdr"
     layout: "plot-throughput-speedup-analysis"
 
+# Speedup - VPP L2 3n-skx-x710 features
 -
   type: "plot"
-  title: "Speedup: ip4tun-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
+  title: "Speedup: l2sw-3n-skx-x710-64b-features-ndr-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
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-features-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           'ENCAP' and
-           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
            'NDRPDR' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
+           not 'ACL' and
+           not 'VHOST' and
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "L2XCBASE"    # l2xcbase
+  - "L2BDBASE"    # l2bdbase
+  - "L2XCFWD"     # dot1q-l2xcbase
+  - "L2BDMACLRN"  # dot1q-l2bdbase
   layout:
-    title: ""  # No title
+    title: "l2sw-3n-skx-x710-64b-features-ndr"
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP IPv4 Tunnels 3n-hsw-x710
 -
   type: "plot"
-  title: "Speedup: ip4tun-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
+  title: "Speedup: l2sw-3n-skx-x710-64b-features-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-features-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           'ENCAP' and
-           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
            'NDRPDR' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
+           not 'ACL' and
+           not 'VHOST' and
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "L2XCBASE"    # l2xcbase
+  - "L2BDBASE"    # l2bdbase
+  - "L2XCFWD"     # dot1q-l2xcbase
+  - "L2BDMACLRN"  # dot1q-l2bdbase
   layout:
-    title: ""  # No title
+    title: "l2sw-3n-skx-x710-64b-features-pdr"
     layout: "plot-throughput-speedup-analysis"
 
+# Speedup - VPP L2 3n-skx-xxv710 base and scale
 -
   type: "plot"
-  title: "Speedup: ip4tun-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
+  title: "Speedup: l2sw-3n-skx-xxv710-64b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-base_and_scale-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
-           'ENCAP' and
-           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           'ETH' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  layout:
-    title: ""  # No title
+  sort:
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
+  layout:
+    title: "l2sw-3n-skx-xxv710-64b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP IPv4 Tunnels 3n-skx-x710
 -
   type: "plot"
-  title: "Speedup: ip4tun-3n-skx-x710-64b-base_and_scale-ndr-tsa"
+  title: "Speedup: l2sw-3n-skx-xxv710-64b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-base_and_scale-ndr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-base_and_scale-pdr-tsa"
   data: "plot-throughput-speedup-analysis-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
-           'ENCAP' and
-           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           'ETH' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  layout:
-    title: ""  # No title
+  sort:
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
+  layout:
+    title: "l2sw-3n-skx-xxv710-64b-base_and_scale-pdr"
     layout: "plot-throughput-speedup-analysis"
 
+# Speedup - VPP L2 2n-skx-x710 base and scale
 -
   type: "plot"
-  title: "Speedup: ip4tun-3n-skx-x710-64b-base_and_scale-pdr-tsa"
+  title: "Speedup: l2sw-2n-skx-x710-64b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-x710-64b-base_and_scale-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           'ENCAP' and
-           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           'ETH' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  layout:
-    title: ""  # No title
+  sort:
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
+  layout:
+    title: "l2sw-2n-skx-x710-64b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
-################################################################################
-
-# Speedup - VPP IPv6 3n-hsw-x520
 -
   type: "plot"
-  title: "Speedup: ip6-3n-hsw-x520-78b-base_and_scale-ndr-tsa"
+  title: "Speedup: l2sw-2n-skx-x710-64b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-x710-64b-base_and_scale-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           'ETH' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  layout:
-    title: ""  # No title
+  sort:
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
+  layout:
+    title: "l2sw-2n-skx-x710-64b-base_and_scale-pdr"
     layout: "plot-throughput-speedup-analysis"
 
+# Speedup - VPP L2 2n-skx-xxv710 base and scale
 -
   type: "plot"
-  title: "Speedup: ip6-3n-hsw-x520-78b-base_and_scale-pdr-tsa"
+  title: "Speedup: l2sw-2n-skx-xxv710-64b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-xxv710-64b-base_and_scale-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
+           '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           'ETH' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  layout:
-    title: ""  # No title
+  sort:
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
+  layout:
+    title: "l2sw-2n-skx-xxv710-64b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP IPv6 3n-hsw-x710
 -
   type: "plot"
-  title: "Speedup: ip6-3n-hsw-x710-78b-base_and_scale-ndr-tsa"
+  title: "Speedup: l2sw-2n-skx-xxv710-64b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-xxv710-64b-base_and_scale-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
+           '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           'ETH' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  layout:
-    title: ""  # No title
+  sort:
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
+  layout:
+    title: "l2sw-2n-skx-xxv710-64b-base_and_scale-pdr"
     layout: "plot-throughput-speedup-analysis"
 
+################################################################################
+
+# Packet Speedup - VPP vhost ip4 3n-hsw-x520
 -
   type: "plot"
-  title: "Speedup: ip6-3n-hsw-x710-78b-base_and_scale-pdr-tsa"
+  title: "VPP Speedup: vhost-ip4-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-base_and_scale-pdr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
   data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('BASE' or 'SCALE') and
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
            'NDRPDR' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           'ETH' and
+           'IP4FWD' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "not CFS_OPT"
+  - "1VM"
+  - "2VM"
   layout:
-    title: ""  # No title
+    title: "vhost-ip4-3n-hsw-x520-64b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP IPv6 3n-hsw-xl710
 -
   type: "plot"
-  title: "Speedup: ip6-3n-hsw-xl710-78b-base_and_scale-ndr-tsa"
+  title: "VPP Speedup: vhost-ip4-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-base_and_scale-ndr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
   data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '78B' and
-           ('BASE' or 'SCALE') and
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
            'NDRPDR' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           'ETH' and
+           'IP4FWD' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "not CFS_OPT"
+  - "1VM"
+  - "2VM"
   layout:
-    title: ""  # No title
+    title: "vhost-ip4-3n-hsw-x520-64b-base_and_scale-pdr"
     layout: "plot-throughput-speedup-analysis"
 
+# Packet Speedup - VPP vhost l2sw 3n-hsw-x520
 -
   type: "plot"
-  title: "Speedup: ip6-3n-hsw-xl710-78b-base_and_scale-pdr-tsa"
+  title: "VPP Speedup: vhost-l2sw-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-base_and_scale-pdr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
   data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '78B' and
-           ('BASE' or 'SCALE') and
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
            'NDRPDR' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('ETH' or 'DOT1Q') and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  layout:
-    title: ""  # No title
+#  sort:
+#  - "VM"  # "not CFS_OPT"
+#  - "CFS_OPT"
+#  - "FIB_10K"
+#  - "FIB_100K"
+#  - "FIB_1M"
+  layout:
+    title: "vhost-l2sw-3n-hsw-x520-64b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP IPv6 3n-skx-x710
 -
   type: "plot"
-  title: "Speedup: ip6-3n-skx-x710-78b-base_and_scale-ndr-tsa"
+  title: "VPP Speedup: vhost-l2sw-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('BASE' or 'SCALE') and
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           'NDRPDR' and
+           ('ETH' or 'DOT1Q') and
+           'L2BDMACLRN' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+#  sort:
+#  - "VM"  # "not CFS_OPT"
+#  - "CFS_OPT"
+#  - "FIB_10K"
+#  - "FIB_100K"
+#  - "FIB_1M"
+  layout:
+    title: "vhost-l2sw-3n-hsw-x520-64b-base_and_scale-pdr"
+    layout: "plot-throughput-speedup-analysis"
+
+# Packet Speedup - VPP vhost l2sw 3n-hsw-x520 - base
+-
+  type: "plot"
+  title: "VPP Speedup: vhost-l2sw-3n-hsw-x520-64b-base-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-base-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
            'NDRPDR' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('ETH' or 'DOT1Q') and
+           'BASE' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
   layout:
-    title: ""  # No title
+    title: "vhost-l2sw-3n-hsw-x520-64b-base-ndr"
     layout: "plot-throughput-speedup-analysis"
 
 -
   type: "plot"
-  title: "Speedup: ip6-3n-skx-x710-78b-base_and_scale-pdr-tsa"
+  title: "VPP Speedup: vhost-l2sw-3n-hsw-x520-64b-base-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('BASE' or 'SCALE') and
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-base-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
            'NDRPDR' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('ETH' or 'DOT1Q') and
+           'BASE' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
   layout:
-    title: ""  # No title
+    title: "vhost-l2sw-3n-hsw-x520-64b-base-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP IPv6 2n-skx-x710
+# Packet Speedup - VPP vhost l2sw 3n-hsw-x520 - base vm
 -
   type: "plot"
-  title: "Speedup: ip6-2n-skx-x710-78b-base_and_scale-ndr-tsa"
+  title: "VPP Speedup: vhost-l2sw-3n-hsw-x520-64b-base-vm-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('BASE' or 'SCALE') and
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-base-vm-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
            'NDRPDR' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('ETH' or 'DOT1Q') and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'CFS_OPT' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not 'LBOND'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   layout:
-    title: ""  # No title
+    title: "vhost-l2sw-3n-hsw-x520-64b-base-vm-ndr"
     layout: "plot-throughput-speedup-analysis"
 
 -
   type: "plot"
-  title: "Speedup: ip6-2n-skx-x710-78b-base_and_scale-pdr-tsa"
+  title: "VPP Speedup: vhost-l2sw-3n-hsw-x520-64b-base-vm-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('BASE' or 'SCALE') and
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-base-vm-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
            'NDRPDR' and
-           'IP6FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('ETH' or 'DOT1Q') and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'CFS_OPT' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not 'LBOND'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   layout:
-    title: ""  # No title
+    title: "vhost-l2sw-3n-hsw-x520-64b-base-vm-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP IPv6 2n-skx-xxv710
+# Packet Speedup - VPP vhost ip4 3n-hsw-x710
 -
   type: "plot"
-  title: "Speedup: ip6-2n-skx-xxv710-78b-base_and_scale-ndr-tsa"
+  title: "VPP Speedup: vhost-ip4-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '78B' and
-           ('BASE' or 'SCALE') and
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
            'NDRPDR' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           'ETH' and
+           'IP4FWD' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "not CFS_OPT"
+  - "1VM"
+  - "2VM"
   layout:
-    title: ""  # No title
+    title: "vhost-ip4-3n-hsw-x710-64b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
 -
   type: "plot"
-  title: "Speedup: ip6-2n-skx-xxv710-78b-base_and_scale-pdr-tsa"
+  title: "VPP Speedup: vhost-ip4-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '78B' and
-           ('BASE' or 'SCALE') and
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
            'NDRPDR' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           'ETH' and
+           'IP4FWD' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "not CFS_OPT"
+  - "1VM"
+  - "2VM"
   layout:
-    title: ""  # No title
+    title: "vhost-ip4-3n-hsw-x710-64b-base_and_scale-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-################################################################################
-
-# Speedup - VPP IPv6 tunnels 3n-hsw-x520
+# Packet Speedup - VPP vhost l2sw 3n-hsw-x710
 -
   type: "plot"
-  title: "Speedup: ip6tun-3n-hsw-x520-78b-base_and_scale-ndr-tsa"
+  title: "VPP Speedup: vhost-l2sw-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-base_and_scale-ndr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
   data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           'ENCAP' and
+  filter: "'NIC_Intel-X710' and
+           '64B' and
            'NDRPDR' and
-           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
-           not 'VHOST'"
+           ('ETH' or 'DOT1Q') and
+           'L2BDMACLRN' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  layout:
-    title: ""  # No title
+#  sort:
+#  - "VM"  # "not CFS_OPT"
+#  - "CFS_OPT"
+#  - "FIB_10K"
+#  - "FIB_100K"
+#  - "FIB_1M"
+  layout:
+    title: "vhost-l2sw-3n-hsw-x710-64b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
 -
   type: "plot"
-  title: "Speedup: ip6tun-3n-hsw-x520-78b-base_and_scale-pdr-tsa"
+  title: "VPP Speedup: vhost-l2sw-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-base_and_scale-pdr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
   data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           'ENCAP' and
+  filter: "'NIC_Intel-X710' and
+           '64B' and
            'NDRPDR' and
-           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
-           not 'VHOST'"
+           ('ETH' or 'DOT1Q') and
+           'L2BDMACLRN' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  layout:
-    title: ""  # No title
+#  sort:
+#  - "VM"  # "not CFS_OPT"
+#  - "CFS_OPT"
+#  - "FIB_10K"
+#  - "FIB_100K"
+#  - "FIB_1M"
+  layout:
+    title: "vhost-l2sw-3n-hsw-x710-64b-base_and_scale-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-################################################################################
-
-# Speedup - VPP IPSec 3n-hsw-xl710
+# Packet Speedup - VPP vhost l2sw 3n-hsw-x710 - base
 -
   type: "plot"
-  title: "Speedup: ipsec-3n-hsw-xl710-64b-base_and_scale-ndr-tsa"
+  title: "VPP Speedup: vhost-l2sw-3n-hsw-x710-64b-base-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-base_and_scale-ndr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-base-ndr-tsa"
   data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           'IP4FWD' and
            'NDRPDR' and
-           'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
-           not 'VHOST'"
+           ('ETH' or 'DOT1Q') and
+           'BASE' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
   layout:
-    title: ""  # No title
+    title: "vhost-l2sw-3n-hsw-x710-64b-base-ndr"
     layout: "plot-throughput-speedup-analysis"
 
 -
   type: "plot"
-  title: "Speedup: ipsec-3n-hsw-xl710-64b-base_and_scale-pdr-tsa"
+  title: "VPP Speedup: vhost-l2sw-3n-hsw-x710-64b-base-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-base_and_scale-pdr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-base-pdr-tsa"
   data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           'IP4FWD' and
            'NDRPDR' and
-           'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
-           not 'VHOST'"
+           ('ETH' or 'DOT1Q') and
+           'BASE' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
   layout:
-    title: ""  # No title
+    title: "vhost-l2sw-3n-hsw-x710-64b-base-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-################################################################################
-
-# Speedup - VPP SRv6 3n-hsw-x520
+# Packet Speedup - VPP vhost l2sw 3n-hsw-x710 - base vm
 -
   type: "plot"
-  title: "Speedup: srv6-3n-hsw-x520-78b-features-ndr-tsa"
+  title: "VPP Speedup: vhost-l2sw-3n-hsw-x710-64b-base-vm-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-features-ndr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-base-vm-ndr-tsa"
   data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           'FEATURE' and
+  filter: "'NIC_Intel-X710' and
+           '64B' and
            'NDRPDR' and
-           'IP6FWD' and
-           'SRv6'"
+           ('ETH' or 'DOT1Q') and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'CFS_OPT' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not 'LBOND'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   layout:
-    title: ""  # No title
+    title: "vhost-l2sw-3n-hsw-x710-64b-base-vm-ndr"
     layout: "plot-throughput-speedup-analysis"
 
 -
   type: "plot"
-  title: "Speedup: srv6-3n-hsw-x520-78b-features-pdr-tsa"
+  title: "VPP Speedup: vhost-l2sw-3n-hsw-x710-64b-base-vm-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-features-pdr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-base-vm-pdr-tsa"
   data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           'FEATURE' and
+  filter: "'NIC_Intel-X710' and
+           '64B' and
            'NDRPDR' and
-           'IP6FWD' and
-           'SRv6'"
+           ('ETH' or 'DOT1Q') and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'CFS_OPT' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not 'LBOND'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   layout:
-    title: ""  # No title
+    title: "vhost-l2sw-3n-hsw-x710-64b-base-vm-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-################################################################################
-
-# Speedup - VPP L2 3n-hsw-x520
+# Packet Speedup - VPP vhost ip4 3n-hsw-xl710
 -
   type: "plot"
-  title: "Speedup: l2sw-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
+  title: "VPP Speedup: vhost-ip4-3n-hsw-xl710-64b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-xl710-64b-base_and_scale-ndr-tsa"
   data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  filter: "'NIC_Intel-XL710' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
+           'ETH' and
+           'IP4FWD' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "not CFS_OPT"
+  - "1VM"
+  - "2VM"
   layout:
-    title: ""  # No title
+    title: "vhost-ip4-3n-hsw-xl710-64b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
 -
   type: "plot"
-  title: "Speedup: l2sw-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
+  title: "VPP Speedup: vhost-ip4-3n-hsw-xl710-64b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-xl710-64b-base_and_scale-pdr-tsa"
   data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  filter: "'NIC_Intel-XL710' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
+           'ETH' and
+           'IP4FWD' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "not CFS_OPT"
+  - "1VM"
+  - "2VM"
   layout:
-    title: ""  # No title
+    title: "vhost-ip4-3n-hsw-xl710-64b-base_and_scale-pdr"
     layout: "plot-throughput-speedup-analysis"
 
+# Packet Speedup - VPP vhost l2sw 3n-hsw-xl710
 -
   type: "plot"
-  title: "Speedup: l2sw-3n-hsw-x520-64b-features-ndr-tsa"
+  title: "VPP Speedup: vhost-l2sw-3n-hsw-xl710-64b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-features-ndr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-base_and_scale-ndr-tsa"
   data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  filter: "'NIC_Intel-XL710' and
            '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
            'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
+           ('ETH' or 'DOT1Q') and
+           'L2BDMACLRN' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  layout:
-    title: ""  # No title
+#  sort:
+#  - "VM"  # "not CFS_OPT"
+#  - "CFS_OPT"
+#  - "FIB_10K"
+#  - "FIB_100K"
+#  - "FIB_1M"
+  layout:
+    title: "vhost-l2sw-3n-hsw-xl710-64b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
 -
   type: "plot"
-  title: "Speedup: l2sw-3n-hsw-x520-64b-features-pdr-tsa"
+  title: "VPP Speedup: vhost-l2sw-3n-hsw-xl710-64b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-features-pdr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-base_and_scale-pdr-tsa"
   data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  filter: "'NIC_Intel-XL710' and
            '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
            'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
+           ('ETH' or 'DOT1Q') and
+           'L2BDMACLRN' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  layout:
-    title: ""  # No title
+#  sort:
+#  - "VM"  # "not CFS_OPT"
+#  - "CFS_OPT"
+#  - "FIB_10K"
+#  - "FIB_100K"
+#  - "FIB_1M"
+  layout:
+    title: "vhost-l2sw-3n-hsw-xl710-64b-base_and_scale-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP L2 3n-hsw-x710
+# Packet Speedup - VPP vhost l2sw 3n-hsw-xl710 - base
 -
   type: "plot"
-  title: "Speedup: l2sw-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
+  title: "VPP Speedup: vhost-l2sw-3n-hsw-xl710-64b-base-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-base-ndr-tsa"
   data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  filter: "'NIC_Intel-XL710' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
+           ('ETH' or 'DOT1Q') and
+           'BASE' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
   layout:
-    title: ""  # No title
+    title: "vhost-l2sw-3n-hsw-xl710-64b-base-ndr"
     layout: "plot-throughput-speedup-analysis"
 
 -
   type: "plot"
-  title: "Speedup: l2sw-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
+  title: "VPP Speedup: vhost-l2sw-3n-hsw-xl710-64b-base-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-base-pdr-tsa"
   data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  filter: "'NIC_Intel-XL710' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
+           ('ETH' or 'DOT1Q') and
+           'BASE' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
   layout:
-    title: ""  # No title
+    title: "vhost-l2sw-3n-hsw-xl710-64b-base-pdr"
     layout: "plot-throughput-speedup-analysis"
 
+# Packet Speedup - VPP vhost l2sw 3n-hsw-xl710 - base vm
 -
   type: "plot"
-  title: "Speedup: l2sw-3n-hsw-x710-64b-features-ndr-tsa"
+  title: "VPP Speedup: vhost-l2sw-3n-hsw-xl710-64b-base-vm-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-features-ndr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-base-vm-ndr-tsa"
   data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  filter: "'NIC_Intel-XL710' and
            '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
            'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
+           ('ETH' or 'DOT1Q') and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'CFS_OPT' and
+           not 'VXLAN' and
+           not 'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   layout:
-    title: ""  # No title
+    title: "vhost-l2sw-3n-hsw-xl710-64b-base-vm-ndr"
     layout: "plot-throughput-speedup-analysis"
 
 -
   type: "plot"
-  title: "Speedup: l2sw-3n-hsw-x710-64b-features-pdr-tsa"
+  title: "VPP Speedup: vhost-l2sw-3n-hsw-xl710-64b-base-vm-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-features-pdr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-base-vm-pdr-tsa"
   data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  filter: "'NIC_Intel-XL710' and
            '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
            'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
+           ('ETH' or 'DOT1Q') and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'CFS_OPT' and
+           not 'VXLAN' and
+           not 'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   layout:
-    title: ""  # No title
+    title: "vhost-l2sw-3n-hsw-xl710-64b-base-vm-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP L2 3n-hsw-xl710
+# Packet Speedup - VPP vhost ip4 3n-skx-x710
 -
   type: "plot"
-  title: "Speedup: l2sw-3n-hsw-xl710-64b-base_and_scale-ndr-tsa"
+  title: "VPP Speedup: vhost-ip4-3n-skx-x710-64b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-xl710-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-skx-x710-64b-base_and_scale-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
+           'ETH' and
+           'IP4FWD' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "not CFS_OPT"
+  - "1VM"
+  - "2VM"
   layout:
-    title: ""  # No title
+    title: "vhost-ip4-3n-skx-x710-64b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
 -
   type: "plot"
-  title: "Speedup: l2sw-3n-hsw-xl710-64b-base_and_scale-pdr-tsa"
+  title: "VPP Speedup: vhost-ip4-3n-skx-x710-64b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-xl710-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-skx-x710-64b-base_and_scale-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
+           'ETH' and
+           'IP4FWD' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "not CFS_OPT"
+  - "1VM"
+  - "2VM"
   layout:
-    title: ""  # No title
+    title: "vhost-ip4-3n-skx-x710-64b-base_and_scale-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP L2 3n-skx-x710
+# Packet Speedup - VPP vhost l2sw 3n-skx-x710
 -
   type: "plot"
-  title: "Speedup: l2sw-3n-skx-x710-64b-base_and_scale-ndr-tsa"
+  title: "VPP Speedup: vhost-l2sw-3n-skx-x710-64b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-base_and_scale-ndr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-base_and_scale-ndr-tsa"
   data: "plot-throughput-speedup-analysis-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
+           ('ETH' or 'DOT1Q') and
+           'L2BDMACLRN' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  layout:
-    title: ""  # No title
+#  sort:
+#  - "VM"  # "not CFS_OPT"
+#  - "CFS_OPT"
+#  - "FIB_10K"
+#  - "FIB_100K"
+#  - "FIB_1M"
+  layout:
+    title: "vhost-l2sw-3n-skx-x710-64b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
 -
   type: "plot"
-  title: "Speedup: l2sw-3n-skx-x710-64b-base_and_scale-pdr-tsa"
+  title: "VPP Speedup: vhost-l2sw-3n-skx-x710-64b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-base_and_scale-pdr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-base_and_scale-pdr-tsa"
   data: "plot-throughput-speedup-analysis-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
+           ('ETH' or 'DOT1Q') and
+           'L2BDMACLRN' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  layout:
-    title: ""  # No title
+#  sort:
+#  - "VM"  # "not CFS_OPT"
+#  - "CFS_OPT"
+#  - "FIB_10K"
+#  - "FIB_100K"
+#  - "FIB_1M"
+  layout:
+    title: "vhost-l2sw-3n-skx-x710-64b-base_and_scale-pdr"
     layout: "plot-throughput-speedup-analysis"
 
+# Packet Speedup - VPP vhost l2sw 3n-skx-x710 - base
 -
   type: "plot"
-  title: "Speedup: l2sw-3n-skx-x710-64b-features-ndr-tsa"
+  title: "VPP Speedup: vhost-l2sw-3n-skx-x710-64b-base-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-features-ndr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-base-ndr-tsa"
   data: "plot-throughput-speedup-analysis-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
            'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
+           ('ETH' or 'DOT1Q') and
+           'BASE' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM' and
+           not 'LBOND'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
   layout:
-    title: ""  # No title
+    title: "vhost-l2sw-3n-skx-x710-64b-base-ndr"
     layout: "plot-throughput-speedup-analysis"
 
 -
   type: "plot"
-  title: "Speedup: l2sw-3n-skx-x710-64b-features-pdr-tsa"
+  title: "VPP Speedup: vhost-l2sw-3n-skx-x710-64b-base-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-features-pdr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-base-pdr-tsa"
   data: "plot-throughput-speedup-analysis-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
            'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
+           ('ETH' or 'DOT1Q') and
+           'BASE' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM' and
+           not 'LBOND'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
   layout:
-    title: ""  # No title
+    title: "vhost-l2sw-3n-skx-x710-64b-base-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP L2 3n-skx-xxv710
+# Packet Speedup - VPP vhost l2sw 3n-skx-x710 - base vm
 -
   type: "plot"
-  title: "Speedup: l2sw-3n-skx-xxv710-64b-base_and_scale-ndr-tsa"
+  title: "VPP Speedup: vhost-l2sw-3n-skx-x710-64b-base-vm-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-base_and_scale-ndr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-base-vm-ndr-tsa"
   data: "plot-throughput-speedup-analysis-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
+           ('ETH' or 'DOT1Q') and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'CFS_OPT' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not 'LBOND'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   layout:
-    title: ""  # No title
+    title: "vhost-l2sw-3n-skx-x710-64b-base-vm-ndr"
     layout: "plot-throughput-speedup-analysis"
 
 -
   type: "plot"
-  title: "Speedup: l2sw-3n-skx-xxv710-64b-base_and_scale-pdr-tsa"
+  title: "VPP Speedup: vhost-l2sw-3n-skx-x710-64b-base-vm-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-base_and_scale-pdr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-base-vm-pdr-tsa"
   data: "plot-throughput-speedup-analysis-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
+           ('ETH' or 'DOT1Q') and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'CFS_OPT' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not 'LBOND'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   layout:
-    title: ""  # No title
+    title: "vhost-l2sw-3n-skx-x710-64b-base-vm-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP L2 2n-skx-x710
+# Packet Speedup - VPP vhost ip4 2n-skx-x710
 -
   type: "plot"
-  title: "Speedup: l2sw-2n-skx-x710-64b-base_and_scale-ndr-tsa"
+  title: "VPP Speedup: vhost-ip4-2n-skx-x710-64b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-x710-64b-base_and_scale-ndr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-x710-64b-base_and_scale-ndr-tsa"
   data: "plot-throughput-speedup-analysis-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
+           'ETH' and
+           'IP4FWD' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "not CFS_OPT"
+  - "1VM"
+  - "2VM"
   layout:
-    title: ""  # No title
+    title: "vhost-ip4-2n-skx-x710-64b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
 -
   type: "plot"
-  title: "Speedup: l2sw-2n-skx-x710-64b-base_and_scale-pdr-tsa"
+  title: "VPP Speedup: vhost-ip4-2n-skx-x710-64b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-x710-64b-base_and_scale-pdr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-x710-64b-base_and_scale-pdr-tsa"
   data: "plot-throughput-speedup-analysis-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
+           'ETH' and
+           'IP4FWD' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "not CFS_OPT"
+  - "1VM"
+  - "2VM"
   layout:
-    title: ""  # No title
+    title: "vhost-ip4-2n-skx-x710-64b-base_and_scale-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP L2 2n-skx-xxv710
+# Packet Speedup - VPP vhost l2sw 2n-skx-x710
 -
   type: "plot"
-  title: "Speedup: l2sw-2n-skx-xxv710-64b-base_and_scale-ndr-tsa"
+  title: "VPP Speedup: vhost-l2sw-2n-skx-x710-64b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-xxv710-64b-base_and_scale-ndr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-base_and_scale-ndr-tsa"
   data: "plot-throughput-speedup-analysis-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
+           ('ETH' or 'DOT1Q') and
+           'L2BDMACLRN' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  layout:
-    title: ""  # No title
+#  sort:
+#  - "VM"  # "not CFS_OPT"
+#  - "CFS_OPT"
+#  - "FIB_10K"
+#  - "FIB_100K"
+#  - "FIB_1M"
+  layout:
+    title: "vhost-l2sw-2n-skx-x710-64b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
 -
   type: "plot"
-  title: "Speedup: l2sw-2n-skx-xxv710-64b-base_and_scale-pdr-tsa"
+  title: "VPP Speedup: vhost-l2sw-2n-skx-x710-64b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-xxv710-64b-base_and_scale-pdr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-base_and_scale-pdr-tsa"
   data: "plot-throughput-speedup-analysis-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  filter: "'NIC_Intel-X710' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
+           ('ETH' or 'DOT1Q') and
+           'L2BDMACLRN' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  layout:
-    title: ""  # No title
+#  sort:
+#  - "VM"  # "not CFS_OPT"
+#  - "CFS_OPT"
+#  - "FIB_10K"
+#  - "FIB_100K"
+#  - "FIB_1M"
+  layout:
+    title: "vhost-l2sw-2n-skx-x710-64b-base_and_scale-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-################################################################################
-
-# Speedup - VPP vhost ip4 3n-hsw-x520
+# Packet Speedup - VPP vhost l2sw 2n-skx-x710 - base
 -
   type: "plot"
-  title: "VPP Speedup: vhost-ip4-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
+  title: "VPP Speedup: vhost-l2sw-2n-skx-x710-64b-base-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-base-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-2n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           'VHOST' and
-           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           ('ETH' or 'DOT1Q') and
+           'BASE' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
   layout:
-    title: ""  # No title
+    title: "vhost-l2sw-2n-skx-x710-64b-base-ndr"
     layout: "plot-throughput-speedup-analysis"
 
 -
   type: "plot"
-  title: "VPP Speedup: vhost-ip4-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
+  title: "VPP Speedup: vhost-l2sw-2n-skx-x710-64b-base-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-base-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-2n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           'VHOST' and
-           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           ('ETH' or 'DOT1Q') and
+           'BASE' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
   layout:
-    title: ""  # No title
+    title: "vhost-l2sw-2n-skx-x710-64b-base-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP vhost l2sw 3n-hsw-x520
+# Packet Speedup - VPP vhost l2sw 2n-skx-x710 - base vm
 -
   type: "plot"
-  title: "VPP Speedup: vhost-l2sw-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
+  title: "VPP Speedup: vhost-l2sw-2n-skx-x710-64b-base-vm-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-base-vm-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-2n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           'VHOST' and
+           ('ETH' or 'DOT1Q') and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'CFS_OPT' and
            not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'DOT1Q' and
-           not '2VM'"
+           not 'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   layout:
-    title: ""  # No title
+    title: "vhost-l2sw-2n-skx-x710-64b-base-vm-ndr"
     layout: "plot-throughput-speedup-analysis"
 
 -
   type: "plot"
-  title: "VPP Speedup: vhost-l2sw-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
+  title: "VPP Speedup: vhost-l2sw-2n-skx-x710-64b-base-vm-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-base-vm-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-2n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           'VHOST' and
+           ('ETH' or 'DOT1Q') and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'CFS_OPT' and
            not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'DOT1Q' and
-           not '2VM'"
+           not 'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   layout:
-    title: ""  # No title
+    title: "vhost-l2sw-2n-skx-x710-64b-base-vm-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP vhost ip4 3n-hsw-x710
+# Packet Speedup - VPP vhost ip4 2n-skx-xxv710
 -
   type: "plot"
-  title: "VPP Speedup: vhost-ip4-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
+  title: "VPP Speedup: vhost-ip4-2n-skx-xxv710-64b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-xxv710-64b-base_and_scale-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
            'NDRPDR' and
-           'VHOST' and
-           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           'ETH' and
+           'IP4FWD' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "not CFS_OPT"
+  - "1VM"
+  - "2VM"
   layout:
-    title: ""  # No title
+    title: "vhost-ip4-2n-skx-xxv710-64b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
 -
   type: "plot"
-  title: "VPP Speedup: vhost-ip4-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
+  title: "VPP Speedup: vhost-ip4-2n-skx-xxv710-64b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-2n-skx-xxv710-64b-base_and_scale-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
            'NDRPDR' and
-           'VHOST' and
-           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           'ETH' and
+           'IP4FWD' and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "not CFS_OPT"
+  - "1VM"
+  - "2VM"
   layout:
-    title: ""  # No title
+    title: "vhost-ip4-2n-skx-xxv710-64b-base_and_scale-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP vhost l2sw 3n-hsw-x710
+# Packet Speedup - VPP vhost l2sw 2n-skx-xxv710
 -
   type: "plot"
-  title: "VPP Speedup: vhost-l2sw-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
+  title: "VPP Speedup: vhost-l2sw-2n-skx-xxv710-64b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-base_and_scale-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
            'NDRPDR' and
-           'VHOST' and
+           ('ETH' or 'DOT1Q') and
+           'L2BDMACLRN' and
+           'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  layout:
-    title: ""  # No title
+#  sort:
+#  - "VM"  # "not CFS_OPT"
+#  - "CFS_OPT"
+#  - "FIB_10K"
+#  - "FIB_100K"
+#  - "FIB_1M"
+  layout:
+    title: "vhost-l2sw-2n-skx-xxv710-64b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
 -
   type: "plot"
-  title: "VPP Speedup: vhost-l2sw-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
+  title: "VPP Speedup: vhost-l2sw-2n-skx-xxv710-64b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-base_and_scale-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
            'NDRPDR' and
-           'VHOST' and
+           ('ETH' or 'DOT1Q') and
+           'L2BDMACLRN' and
+           'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not 'DOT1Q' and
            not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  layout:
-    title: ""  # No title
+#  sort:
+#  - "VM"  # "not CFS_OPT"
+#  - "CFS_OPT"
+#  - "FIB_10K"
+#  - "FIB_100K"
+#  - "FIB_1M"
+  layout:
+    title: "vhost-l2sw-2n-skx-xxv710-64b-base_and_scale-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP vhost ip4 3n-hsw-xl710
+# Packet Speedup - VPP vhost l2sw 2n-skx-xxv710 - base
 -
   type: "plot"
-  title: "VPP Speedup: vhost-ip4-3n-hsw-xl710-64b-base_and_scale-ndr-tsa"
+  title: "VPP Speedup: vhost-l2sw-2n-skx-xxv710-64b-base-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-xl710-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-base-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
            'NDRPDR' and
-           'VHOST' and
-           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           ('ETH' or 'DOT1Q') and
+           'BASE' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
   layout:
-    title: ""  # No title
+    title: "vhost-l2sw-2n-skx-xxv710-64b-base-ndr"
     layout: "plot-throughput-speedup-analysis"
 
 -
   type: "plot"
-  title: "VPP Speedup: vhost-ip4-3n-hsw-xl710-64b-base_and_scale-pdr-tsa"
+  title: "VPP Speedup: vhost-l2sw-2n-skx-xxv710-64b-base-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-xl710-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-base-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
            'NDRPDR' and
-           'VHOST' and
-           not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
+           ('ETH' or 'DOT1Q') and
+           'BASE' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'VXLAN' and
+           not 'IP4FWD' and
+           not '2VM'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+#  sort:
+#  - "not CFS_OPT"
+#  - "L2XCFWD"
+#  - "not CFS_OPT"
+#  - "CFS_OPT"
   layout:
-    title: ""  # No title
+    title: "vhost-l2sw-2n-skx-xxv710-64b-base-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP vhost l2sw 3n-hsw-xl710
+# Packet Speedup - VPP vhost l2sw 2n-skx-xxv710 - base vm
 -
   type: "plot"
-  title: "VPP Speedup: vhost-l2sw-3n-hsw-xl710-64b-base_and_scale-ndr-tsa"
+  title: "VPP Speedup: vhost-l2sw-2n-skx-xxv710-64b-base-vm-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-base-vm-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
            'NDRPDR' and
-           'VHOST' and
+           ('ETH' or 'DOT1Q') and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'CFS_OPT' and
            not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'DOT1Q' and
-           not '2VM'"
+           not 'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   layout:
-    title: ""  # No title
+    title: "vhost-l2sw-2n-skx-xxv710-64b-base-vm-ndr"
     layout: "plot-throughput-speedup-analysis"
 
 -
   type: "plot"
-  title: "VPP Speedup: vhost-l2sw-3n-hsw-xl710-64b-base_and_scale-pdr-tsa"
+  title: "VPP Speedup: vhost-l2sw-2n-skx-xxv710-64b-base-vm-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-base-vm-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
            'NDRPDR' and
-           'VHOST' and
+           ('ETH' or 'DOT1Q') and
+           ('L2BDMACLRN' or 'L2XCFWD') and
+           'VHOST_1024' and
+           not 'CFS_OPT' and
            not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'DOT1Q' and
-           not '2VM'"
+           not 'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+#  sort:
+#  - "1VM"
+#  - "L2XCFWD"
+#  - "1VM"
+#  - "L2BDMACLRN"
   layout:
-    title: ""  # No title
+    title: "vhost-l2sw-2n-skx-xxv710-64b-base-vm-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP vhost l2sw 3n-hsw-x520
+################################################################################
+
+# Speedup - VPP vts 3n-hsw-x520
 -
   type: "plot"
   title: "VPP Speedup: vts-3n-hsw-x520-114b-base_and_scale-ndr-tsa"
@@ -13520,7 +25944,7 @@
   - "parent"
   - "tags"
   layout:
-    title: ""  # No title
+    title: "vts-3n-hsw-x520-114b-base_and_scale-ndr"
     layout: "plot-throughput-speedup-analysis"
 
 -
@@ -13539,5 +25963,5 @@
   - "parent"
   - "tags"
   layout:
-    title: ""  # No title
-    layout: "plot-throughput-speedup-analysis"
+    title: "vts-3n-hsw-x520-114b-base_and_scale-pdr-tsa"
+    layout: "plot-throughput-speedup-analysis"
\ No newline at end of file
Integration tests