FIX: Report TSA
[csit.git] / resources / tools / presentation / specification.yaml
index 543f698..3295aec 100644 (file)
   format:
     html:
     - full
-    pdf:
-    - minimal
+#    pdf:
+#    - minimal
 
 ################################################################################
 ###                               T A B L E S                                ###
     title: ""  # No title
     layout: "plot-throughput"
 
-# Packet Throughput - VPP Container Memif 3n-skx-xxv710
--
-  type: "plot"
-  title: "VPP Throughput: memif-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: memif-3n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: memif-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: memif-3n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput"
-
 ################################################################################
 
 # Packet Throughput - VPP Container Orchestrated Memif 3n-hsw-x520
     title: ""  # No title
     layout: "plot-latency"
 
-# Packet Latency - VPP Container Memif 3n-skx-xxv710
--
-  type: "plot"
-  title: "VPP Latency: memif-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  traces:
-    boxmean: False
-  layout:
-    title: ""  # No title
-    layout: "plot-latency"
-
--
-  type: "plot"
-  title: "VPP Latency: memif-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
-  algorithm: "plot_latency_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  traces:
-    boxmean: False
-  layout:
-    title: ""  # No title
-    layout: "plot-latency"
-
 ################################################################################
 
 # Packet Latency - VPP Container Memif 3n-hsw-x520
     title: ""  # No title
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP Container Memif 3n-skx-xxv710
+################################################################################
+
+# Speedup - VPP Container k8s memif 3n-hsw-x520
 -
   type: "plot"
-  title: "Speedup: memif-3n-skx-xxv710-64b-base_and_scale-ndr-tsa"
+  title: "Speedup: k8s-memif-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-xxv710-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  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
            'NDRPDR' and
 
 -
   type: "plot"
-  title: "Speedup: memif-3n-skx-xxv710-64b-base_and_scale-pdr-tsa"
+  title: "Speedup: k8s-memif-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-xxv710-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
+  data: "plot-ligato-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
     title: ""  # No title
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP Container Memif 2n-skx-x710
+# Speedup - VPP Container Memif 3n-hsw-x710
 -
   type: "plot"
-  title: "Speedup: memif-2n-skx-x710-64b-base_and_scale-ndr-tsa"
+  title: "Speedup: k8s-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-2n-skx-x710-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
+  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
 
 -
   type: "plot"
-  title: "Speedup: memif-2n-skx-x710-64b-base_and_scale-pdr-tsa"
+  title: "Speedup: k8s-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-2n-skx-x710-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
+  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
            '64B' and
            ('BASE' or 'SCALE') and
     title: ""  # No title
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP Container Memif 2n-skx-xxv710
+################################################################################
+
+# Speedup - VPP IPv4 3n-hsw-x520
 -
   type: "plot"
-  title: "Speedup: memif-2n-skx-xxv710-64b-base_and_scale-ndr-tsa"
+  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]}/memif-2n-skx-xxv710-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/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
            ('BASE' or 'SCALE') and
            'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           not 'VHOST' and
-           'MEMIF'"
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
 
 -
   type: "plot"
-  title: "Speedup: memif-2n-skx-xxv710-64b-base_and_scale-pdr-tsa"
+  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]}/memif-2n-skx-xxv710-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/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
            ('BASE' or 'SCALE') and
            'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           not 'VHOST' and
-           'MEMIF'"
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
     title: ""  # No title
     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: ip4-3n-hsw-x520-64b-features-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-ndr-tsa"
-  data: "plot-ligato-throughput-speedup-analysis-3n-hsw"
+  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
-           ('BASE' or 'SCALE') and
+           'FEATURE' and
+           ('ACL10' or 'ACL50') and '10k_FLOWS' and
            'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           not 'VHOST' and
-           'MEMIF'"
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
 
 -
   type: "plot"
-  title: "Speedup: k8s-memif-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
+  title: "Speedup: ip4-3n-hsw-x520-64b-features-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-pdr-tsa"
-  data: "plot-ligato-throughput-speedup-analysis-3n-hsw"
+  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
-           ('BASE' or 'SCALE') and
+           'FEATURE' and
+           ('ACL10' or 'ACL50') and '10k_FLOWS' and
            'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           not 'VHOST' and
-           'MEMIF'"
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
     title: ""  # No title
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP Container Memif 3n-hsw-x710
+# Speedup - VPP IPv4 3n-hsw-x710
 -
   type: "plot"
-  title: "Speedup: k8s-memif-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
+  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]}/k8s-memif-3n-hsw-x710-64b-base_and_scale-ndr-tsa"
-  data: "plot-ligato-throughput-speedup-analysis-3n-hsw"
+  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
            ('BASE' or 'SCALE') and
            'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           not 'VHOST' and
-           'MEMIF'"
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
 
 -
   type: "plot"
-  title: "Speedup: k8s-memif-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
+  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]}/k8s-memif-3n-hsw-x710-64b-base_and_scale-pdr-tsa"
-  data: "plot-ligato-throughput-speedup-analysis-3n-hsw"
+  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
            ('BASE' or 'SCALE') and
            'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           not 'VHOST' and
-           'MEMIF'"
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
     title: ""  # No title
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP Container Memif 3n-hsw-xl710
 -
   type: "plot"
-  title: "Speedup: k8s-memif-3n-hsw-xl710-64b-base_and_scale-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-xl710-64b-base_and_scale-ndr-tsa"
-  data: "plot-ligato-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput-speedup-analysis"
-
--
-  type: "plot"
-  title: "Speedup: k8s-memif-3n-hsw-xl710-64b-base_and_scale-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-xl710-64b-base_and_scale-pdr-tsa"
-  data: "plot-ligato-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput-speedup-analysis"
-
-################################################################################
-
-# Speedup - VPP IPv4 3n-hsw-x520
--
-  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
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput-speedup-analysis"
-
--
-  type: "plot"
-  title: "Speedup: ip4-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
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput-speedup-analysis"
-
--
-  type: "plot"
-  title: "Speedup: ip4-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
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRPDR' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput-speedup-analysis"
-
--
-  type: "plot"
-  title: "Speedup: ip4-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
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRPDR' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  layout:
-    title: ""  # No title
-    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"
-  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
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput-speedup-analysis"
-
--
-  type: "plot"
-  title: "Speedup: ip4-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
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput-speedup-analysis"
-
--
-  type: "plot"
-  title: "Speedup: ip4-3n-hsw-x710-64b-features-ndr-tsa"
+  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"
     title: ""  # No title
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
-  title: "Speedup: ip4-2n-skx-x710-64b-features-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-features-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRPDR' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput-speedup-analysis"
-
--
-  type: "plot"
-  title: "Speedup: ip4-2n-skx-x710-64b-features-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-features-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRPDR' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput-speedup-analysis"
-
 # Speedup - VPP IPv4 2n-skx-xxv710
 -
   type: "plot"
     title: ""  # No title
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
-  title: "Speedup: ip4-2n-skx-xxv710-64b-features-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-features-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRPDR' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput-speedup-analysis"
-
--
-  type: "plot"
-  title: "Speedup: ip4-2n-skx-xxv710-64b-features-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-features-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRPDR' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput-speedup-analysis"
-
 ################################################################################
 
 # Speedup - VPP IPv4 Tunnels 3n-hsw-x520
   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
-           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
-           'NDRPDR' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput-speedup-analysis"
-
--
-  type: "plot"
-  title: "Speedup: ip4tun-3n-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
-           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
-           'NDRPDR' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput-speedup-analysis"
-
-# Speedup - VPP IPv4 Tunnels 3n-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
-           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
-           'NDRPDR' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput-speedup-analysis"
-
--
-  type: "plot"
-  title: "Speedup: ip4tun-3n-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
-           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
-           'NDRPDR' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput-speedup-analysis"
-
-# Speedup - VPP IPv4 Tunnels 3n-hsw-xl710
--
-  type: "plot"
-  title: "Speedup: ip4tun-3n-hsw-xl710-64b-base_and_scale-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-xl710-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'ENCAP' and
-           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
-           'NDRPDR' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput-speedup-analysis"
-
--
-  type: "plot"
-  title: "Speedup: ip4tun-3n-hsw-xl710-64b-base_and_scale-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-xl710-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'ENCAP' and
-           ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
-           'NDRPDR' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput-speedup-analysis"
-
-# Speedup - VPP IPv4 Tunnels 3n-skx-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
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'ENCAP' and
            ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
 
 -
   type: "plot"
-  title: "Speedup: ip4tun-3n-skx-x710-64b-base_and_scale-pdr-tsa"
+  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-skx-x710-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/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
            ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
     title: ""  # No title
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP IPv4 Tunnels 3n-skx-xxv710
+# Speedup - VPP IPv4 Tunnels 3n-hsw-x710
 -
   type: "plot"
-  title: "Speedup: ip4tun-3n-skx-xxv710-64b-base_and_scale-ndr-tsa"
+  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-skx-xxv710-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/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
            ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
 
 -
   type: "plot"
-  title: "Speedup: ip4tun-3n-skx-xxv710-64b-base_and_scale-pdr-tsa"
+  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-skx-xxv710-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/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
            ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
     title: ""  # No title
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP IPv4 Tunnels 2n-skx-x710
+# Speedup - VPP IPv4 Tunnels 3n-hsw-xl710
 -
   type: "plot"
-  title: "Speedup: ip4tun-2n-skx-x710-64b-base_and_scale-ndr-tsa"
+  title: "Speedup: ip4tun-3n-hsw-xl710-64b-base_and_scale-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-2n-skx-x710-64b-base_and_scale-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-xl710-64b-base_and_scale-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '64B' and
            'ENCAP' and
            ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
 
 -
   type: "plot"
-  title: "Speedup: ip4tun-2n-skx-x710-64b-base_and_scale-pdr-tsa"
+  title: "Speedup: ip4tun-3n-hsw-xl710-64b-base_and_scale-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-2n-skx-x710-64b-base_and_scale-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-xl710-64b-base_and_scale-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '64B' and
            'ENCAP' and
            ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
     title: ""  # No title
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP IPv4 Tunnels 2n-skx-xxv710
+# Speedup - VPP IPv4 Tunnels 3n-skx-x710
 -
   type: "plot"
-  title: "Speedup: ip4tun-2n-skx-xxv710-64b-base_and_scale-ndr-tsa"
+  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-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]}/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
            ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
 
 -
   type: "plot"
-  title: "Speedup: ip4tun-2n-skx-xxv710-64b-base_and_scale-pdr-tsa"
+  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-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]}/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
            ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and
     title: ""  # No title
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
-  title: "Speedup: ip6-2n-skx-x710-78b-features-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-features-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRPDR' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput-speedup-analysis"
-
--
-  type: "plot"
-  title: "Speedup: ip6-2n-skx-x710-78b-features-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-features-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '78B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRPDR' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput-speedup-analysis"
-
 # Speedup - VPP IPv6 2n-skx-xxv710
 -
   type: "plot"
     title: ""  # No title
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
-  title: "Speedup: ip6-2n-skx-xxv710-78b-features-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-features-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '78B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRPDR' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput-speedup-analysis"
-
--
-  type: "plot"
-  title: "Speedup: ip6-2n-skx-xxv710-78b-features-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-features-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '78B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRPDR' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput-speedup-analysis"
-
 ################################################################################
 
 # Speedup - VPP IPv6 tunnels 3n-hsw-x520
     title: ""  # No title
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
-  title: "Speedup: l2sw-2n-skx-x710-64b-features-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-x710-64b-features-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput-speedup-analysis"
-
--
-  type: "plot"
-  title: "Speedup: l2sw-2n-skx-x710-64b-features-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-x710-64b-features-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput-speedup-analysis"
-
 # Speedup - VPP L2 2n-skx-xxv710
 -
   type: "plot"
     title: ""  # No title
     layout: "plot-throughput-speedup-analysis"
 
--
-  type: "plot"
-  title: "Speedup: l2sw-2n-skx-xxv710-64b-features-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-xxv710-64b-features-ndr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput-speedup-analysis"
-
--
-  type: "plot"
-  title: "Speedup: l2sw-2n-skx-xxv710-64b-features-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-xxv710-64b-features-pdr-tsa"
-  data: "plot-throughput-speedup-analysis-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'FEATURE' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  layout:
-    title: ""  # No title
-    layout: "plot-throughput-speedup-analysis"
-
 ################################################################################
 
 # Speedup - VPP vhost ip4 3n-hsw-x520
   layout:
     title: ""  # No title
     layout: "plot-throughput-speedup-analysis"
+
+# Speedup - VPP vhost l2sw 3n-hsw-x520
+-
+  type: "plot"
+  title: "VPP Speedup: vts-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-64b-base_and_scale-ndr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           'NDRPDR' and
+           'VTS'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  layout:
+    title: ""  # No title
+    layout: "plot-throughput-speedup-analysis"
+
+-
+  type: "plot"
+  title: "VPP Speedup: vts-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/vts-3n-hsw-x520-64b-base_and_scale-pdr-tsa"
+  data: "plot-throughput-speedup-analysis-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
+           '64B' and
+           'NDRPDR' and
+           'VTS'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  layout:
+    title: ""  # No title
+    layout: "plot-throughput-speedup-analysis"