X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fspecification.yaml;h=d91fae5b9a440649fd1ca41b69b348307a09143f;hp=e1ce00cfe8ff9947f16a9c1d48b29032622b24a3;hb=898aeaa4efbbfcffea77471220ffa903600d3b06;hpb=c01120c62b3d3649a5c7e6962c077b88c5512622

diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml
index e1ce00cfe8..d91fae5b9a 100644
--- a/resources/tools/presentation/specification.yaml
+++ b/resources/tools/presentation/specification.yaml
@@ -38,19 +38,21 @@
     DIR[DTR]: "{DIR[WORKING,SRC]}/detailed_test_results"
     DIR[DTR,PERF,DPDK]: "{DIR[DTR]}/dpdk_performance_results"
     DIR[DTR,PERF,VPP]: "{DIR[DTR]}/vpp_performance_results"
+    DIR[DTR,MRR,VPP]: "{DIR[DTR]}/vpp_mrr_results"
     DIR[DTR,PERF,COT]: "{DIR[DTR]}/cot_performance_results"
     DIR[DTR,PERF,HC]: "{DIR[DTR]}/honeycomb_performance_results"
     DIR[DTR,FUNC,VPP]: "{DIR[DTR]}/vpp_functional_results"
+    DIR[DTR,FUNC,VPP,CENTOS]: "{DIR[DTR]}/vpp_functional_results_centos"
     DIR[DTR,FUNC,HC]: "{DIR[DTR]}/honeycomb_functional_results"
     DIR[DTR,FUNC,NSHSFC]: "{DIR[DTR]}/nshsfc_functional_results"
     DIR[DTR,PERF,VPP,IMPRV]: "{DIR[WORKING,SRC]}/vpp_performance_tests/performance_improvements"
-    DIR[DTR,PERF,VPP,IMPACT,SPECTRE]: "{DIR[WORKING,SRC]}/vpp_performance_tests/performance_impact_spectre"
-    DIR[DTR,PERF,VPP,IMPACT,MELTDOWN]: "{DIR[WORKING,SRC]}/vpp_performance_tests/performance_improvements"
 
     # Detailed test configurations
     DIR[DTC]: "{DIR[WORKING,SRC]}/test_configuration"
     DIR[DTC,PERF,VPP]: "{DIR[DTC]}/vpp_performance_configuration"
+    DIR[DTC,MRR,VPP]: "{DIR[DTC]}/vpp_mrr_configuration"
     DIR[DTC,FUNC,VPP]: "{DIR[DTC]}/vpp_functional_configuration"
+    DIR[DTC,FUNC,VPP,CENTOS]: "{DIR[DTC]}/vpp_functional_configuration_centos"
 
     # Detailed tests operational data
     DIR[DTO]: "{DIR[WORKING,SRC]}/test_operational_data"
@@ -63,6 +65,8 @@
   urls:
     URL[JENKINS,CSIT]: "https://jenkins.fd.io/view/csit/job"
     URL[JENKINS,HC]: "https://jenkins.fd.io/view/hc2vpp/job"
+    URL[NEXUS]: "https://docs.fd.io/csit"
+    DIR[NEXUS]: "report/_static/archive"
 
   make-dirs:
   # List the directories which are created while preparing the environment.
@@ -79,6 +83,7 @@
   # List the directories which are deleted while cleaning the environment.
   # All directories MUST be defined in "paths" section.
   #- "DIR[BUILD,HTML]"
+  - "DIR[WORKING,DATA]"
 
   build-dirs:
   # List the directories where the results (build) is stored.
@@ -89,38 +94,41 @@
 -
   type: "configuration"
   data-sets:
-    vpp-meltdown-impact:
-# TODO: specify data sources
-#      csit-vpp-perf-1801-all:
-#      - 1
-#      - 2
-    plot-throughput-speedup-analysis:
+    plot-vpp-http-server-performance:
 # TODO: Add the data sources
-#      csit-vpp-perf-1801-all:
-#      - 1
-#      - 2
-    vpp-spectre-impact:
-# TODO: specify data sources
-#      csit-vpp-perf-1801-all:
-#      - 1
-#      - 2
-    plot-throughput-speedup-analysis:
+      csit-vpp-perf-1801-all:
+      - 157
+      - 158
+      - 159
+      - 160
+      - 161
+      - 164
+      - 165
+      - 166
+      - 168
+      - 169
+      - 170
 # TODO: Add the data sources
-#      csit-vpp-perf-1801-all:
-#      - 1
-#      - 2
-    performance-improvements:
-      csit-vpp-perf-1707-all:
-      - 9
-      - 10
-      - 13
-      - 14
-      - 15
-      - 16
-      - 17
-      - 18
-      - 19
-      - 21
+#    vpp-meltdown-impact:
+#      csit-vpp-perf-1707-all:
+#      - 9
+#      - 10
+#      - 13
+#      csit-vpp-perf-1710-all:
+#      - 11l
+#      - 12
+#      - 13
+# TODO: Add the data sources
+#    vpp-spectre-impact:
+#      csit-vpp-perf-1707-all:
+#      - 9
+#      - 10
+#      - 13
+#      csit-vpp-perf-1710-all:
+#      - 11
+#      - 12
+#      - 13
+    vpp-performance-changes:
       csit-vpp-perf-1710-all:
       - 11
       - 12
@@ -132,52 +140,173 @@
       - 18
       - 19
       - 20
-      csit-ligato-perf-1710-all:
+      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
+    vpp-performance-changes-mrr:
+      csit-vpp-perf-check-1801:
+      - 3
+      - 4
       - 5
+      - 6
       - 7
       - 8
       - 9
-      - 10
       - 11
       - 12
       - 13
-      - 16
-      - 17
+      csit-vpp-perf-check-1804:
+      - 6   # mrr - sel
+      - 7   # mrr - sel
+      - 8   # mrr - sel
+      - 9   # mrr - sel
+      - 10  # mrr - sel
+      - 11  # mrr - sel
+      - 12  # mrr - sel
+      - 13  # mrr - sel
+      - 14  # mrr - sel
+      - 15  # mrr - sel
+    plot-throughput-speedup-analysis:
+      csit-vpp-perf-1804-all:
+      - 19  # full
+      - 20  # full
+      - 25  # full
+      - 26  # full
+      - 21  # sel
+      - 22  # sel
+      - 23  # sel
+      - 24  # sel
+      - 27  # sel
+      - 28  # sel
+      - 29  # sel
+      - 30  # sel
+      - 31  # sel
+      - 35  # sel
+    plot-ligato-throughput-speedup-analysis:
+      csit-ligato-perf-1804-all:
+      - 5   # sel
+      - 6   # sel
+      - 7   # sel
+      - 8   # sel
+      - 9   # sel
+      - 10  # sel
+      - 11  # sel
+      - 12  # sel
+#    performance-improvements:
+#      csit-vpp-perf-1707-all:
+#      - 9
+#      - 10
+#      - 13
+#      - 14
+#      - 15
+#      - 16
+#      - 17
+#      - 18
+#      - 19
+#      - 21
+#      csit-vpp-perf-1710-all:
+#      - 11
+#      - 12
+#      - 13
+#      - 14
+#      - 15
+#      - 16
+#      - 17
+#      - 18
+#      - 19
+#      - 20
+#      csit-vpp-perf-1801-all:
+#      - 124
+#      - 127
+#      - 128
+#      csit-ligato-perf-1710-all:
+#      - 5
+#      - 7
+#      - 8
+#      - 9
+#      - 10
+#      - 11
+#      - 12
+#      - 13
+#      - 16
+#      - 17
+#      csit-ligato-perf-1801-all:
+#      - 16  # sel
+#      - 17  # sel
+#      - 18  # sel
+#      - 19  # sel
+#      - 20  # sel
+#      - 21  # sel
+#      - 22  # sel
+#      - 23  # sel
+#      - 24  # sel
     vpp-perf-results:
-      csit-vpp-perf-1710-all:
-      - 20
-      - 23
+      csit-vpp-perf-1804-all:
+      - 19  # full
+      - 20  # full
+      - 25  # full
+      - 26  # full
     vpp-func-results:
-      csit-vpp-functional-1710-ubuntu1604-virl:
-      - 126
+      csit-vpp-functional-1804-ubuntu1604-virl:
+      - 199
+    vpp-func-results-centos:
+      csit-vpp-functional-1804-centos7-virl:
+      - 207
+    vpp-mrr-results:
+      csit-vpp-perf-check-1804:
+      - 5   # mrr - full
     ligato-perf-results:
-      csit-ligato-perf-1710-all:
-      - 17
+      csit-ligato-perf-1804-all:
+      - 4  # full
     dpdk-perf-results:
-      csit-dpdk-perf-1710-all:
+      csit-dpdk-perf-1804-all:
       - 13
     hc-func-results:
-      csit-hc2vpp-verify-func-1710-ubuntu1604:
-      - "lastSuccessfulBuild"
+      csit-hc2vpp-verify-func-1804-ubuntu1604:
+      - 3
     nsh-func-results:
-      csit-nsh_sfc-verify-func-1710-ubuntu1604-virl:
+      csit-nsh_sfc-verify-func-1804-ubuntu1604-virl:
       - 7
     plot-vpp-throughput-latency:
-      csit-vpp-perf-1710-all:
-      - 11
-      - 12
-      - 13
-      - 14
-      - 15
-      - 16
-      - 17
-      - 18
-      - 19
-      - 20
+      csit-vpp-perf-1804-all:
+      - 19  # full
+      - 20  # full
+      - 25  # full
+      - 26  # full
+      - 21  # sel
+      - 22  # sel
+      - 23  # sel
+      - 24  # sel
+      - 27  # sel
+      - 28  # sel
+      - 29  # sel
+      - 30  # sel
+      - 31  # sel
+      - 35  # sel
     plot-dpdk-throughput-latency:
-      csit-dpdk-perf-1710-all:
-      - 2
-      - 3
+      csit-dpdk-perf-1804-all:
+      - 4
       - 5
       - 6
       - 7
@@ -185,20 +314,105 @@
       - 9
       - 10
       - 11
-      - 13
-    plot-ligato-throughput-latency:
-      csit-ligato-perf-1710-all:
-      - 5
-      - 7
-      - 8
-      - 9
-      - 10
-      - 11
       - 12
       - 13
-      - 16
-      - 17
+    plot-ligato-throughput-latency:
+      csit-ligato-perf-1804-all:
+      - 5   # sel
+      - 6   # sel
+      - 7   # sel
+      - 8   # sel
+      - 9   # sel
+      - 10  # sel
+      - 11  # sel
+      - 12  # sel
+
   plot-layouts:
+
+    plot-cps:
+      xaxis:
+        autorange: True
+        autotick: False
+        fixedrange: False
+        gridcolor: "rgb(238, 238, 238)"
+        linecolor: "rgb(238, 238, 238)"
+        linewidth: 1
+        showgrid: True
+        showline: True
+        showticklabels: True
+        tickcolor: "rgb(238, 238, 238)"
+        tickmode: "linear"
+        title: "Indexed Test Cases"
+        zeroline: False
+      yaxis:
+        gridcolor: "rgb(238, 238, 238)'"
+        hoverformat: ".4s"
+        linecolor: "rgb(238, 238, 238)"
+        linewidth: 1
+        range: []
+        rangemode: "tozero"
+        showgrid: True
+        showline: True
+        showticklabels: True
+        tickcolor: "rgb(238, 238, 238)"
+        title: "Connections Per Second [cps]"
+        zeroline: False
+      boxmode: "group"
+      boxgroupgap: 0.5
+      autosize: False
+      margin:
+        t: 50
+        b: 20
+        l: 50
+        r: 20
+      showlegend: True
+      legend:
+        orientation: "h"
+      width: 700
+      height: 1000
+
+    plot-rps:
+      xaxis:
+        autorange: True
+        autotick: False
+        fixedrange: False
+        gridcolor: "rgb(238, 238, 238)"
+        linecolor: "rgb(238, 238, 238)"
+        linewidth: 1
+        showgrid: True
+        showline: True
+        showticklabels: True
+        tickcolor: "rgb(238, 238, 238)"
+        tickmode: "linear"
+        title: "Indexed Test Cases"
+        zeroline: False
+      yaxis:
+        gridcolor: "rgb(238, 238, 238)'"
+        hoverformat: ".4s"
+        linecolor: "rgb(238, 238, 238)"
+        linewidth: 1
+        range: []
+        rangemode: "tozero"
+        showgrid: True
+        showline: True
+        showticklabels: True
+        tickcolor: "rgb(238, 238, 238)"
+        title: "Requests Per Second [rps]"
+        zeroline: False
+      boxmode: "group"
+      boxgroupgap: 0.5
+      autosize: False
+      margin:
+        t: 50
+        b: 20
+        l: 50
+        r: 20
+      showlegend: True
+      legend:
+        orientation: "h"
+      width: 700
+      height: 1000
+
     plot-throughput:
       xaxis:
         autorange: True
@@ -239,6 +453,7 @@
         orientation: "h"
       width: 700
       height: 1000
+
     plot-latency:
       xaxis:
         autorange: True
@@ -279,9 +494,9 @@
         orientation: "h"
       width: 700
       height: 1000
+
     plot-throughput-speedup-analysis:
       xaxis:
-        # title: "Test Cases"
         autorange: True
         autotick: False
         fixedrange: False
@@ -342,32 +557,12 @@
     -
       build: 2
       file: "{DIR[WORKING,DATA]}/output.xml"
-#    csit-dpdk-perf-1707-all:
-#    -
-#      build: 10
-#      file: "{DIR[WORKING,DATA]}/csit-dpdk-perf-1707-all__10.xml"
-#    -
-#      build: 9
-#      file: "{DIR[WORKING,DATA]}/csit-dpdk-perf-1707-all__9.xml"
-#    csit-nsh_sfc-verify-func-1707-ubuntu1604-virl:
-#    -
-#      build: 2
-#      file: "{DIR[WORKING,DATA]}/csit-nsh_sfc-verify-func-1707-ubuntu1604-virl-2.xml"
-#    csit-vpp-functional-1707-ubuntu1604-virl:
-#    -
-#      build: lastSuccessfulBuild
-#      file: "{DIR[WORKING,DATA]}/csit-vpp-functional-1707-ubuntu1604-virl-lastSuccessfulBuild.xml"
-#    hc2vpp-csit-integration-1707-ubuntu1604:
-#    -
-#      build: lastSuccessfulBuild
-#      file: "{DIR[WORKING,DATA]}/hc2vpp-csit-integration-1707-ubuntu1604-lastSuccessfulBuild.xml"
-#    csit-vpp-perf-1707-all:
-#    -
-#      build: 16
-#      file: "{DIR[WORKING,DATA]}/csit-vpp-perf-1707-all__16__output.xml"
-#    -
-#      build: 17
-#      file: "{DIR[WORKING,DATA]}/csit-vpp-perf-1707-all__17__output.xml"
+    -
+      build: 3
+      file: "{DIR[WORKING,DATA]}/output.xml"
+    -
+      build: 4
+      file: "{DIR[WORKING,DATA]}/output.xml"
 
 -
   type: "static"
@@ -382,17 +577,17 @@
     download-path: "{job}/{build}/robot/report/*zip*/{filename}"
     extract: "robot-plugin/output.xml"
   builds:
-    csit-vpp-perf-1707-all:
-    - 9
-    - 10
-    - 13
-    - 14
-    - 15
-    - 16
-    - 17
-    - 18
-    - 19
-    - 21
+#    csit-vpp-perf-1707-all:
+#    - 9
+#    - 10
+#    - 13
+#    - 14
+#    - 15
+#    - 16
+#    - 17
+#    - 18
+#    - 19
+#    - 21
     csit-vpp-perf-1710-all:
     - 11
     - 12
@@ -404,10 +599,106 @@
     - 18
     - 19
     - 20
-    - 23
-    csit-dpdk-perf-1710-all:
-    - 2
-    - 3
+    csit-vpp-perf-1801-all:
+#    - 122  # full
+#    - 126  # full
+#    - 129  # full
+#    - 140  # full
+    - 124  # sel
+    - 127  # sel
+    - 128  # sel
+    - 141  # sel
+    - 142  # sel
+    - 143  # sel
+    - 145  # sel
+    - 146  # sel
+    - 157  # wrk
+    - 158  # wrk
+    - 159  # wrk
+    - 160  # wrk
+    - 161  # wrk
+    - 162  # sel
+    - 163  # sel
+    - 164  # wrk
+    - 165  # wrk
+    - 166  # wrk
+    - 167  # sel
+    - 168  # wrk
+    - 169  # wrk
+    - 170  # wrk
+    - 172  # sel acl only
+    csit-vpp-perf-1804-all:
+    - 19  # full
+    - 20  # full
+    - 25  # full
+    - 26  # full
+    - 21  # sel
+    - 22  # sel
+    - 23  # sel
+    - 24  # sel
+    - 27  # sel
+    - 28  # sel
+    - 29  # sel
+    - 30  # sel
+    - 31  # sel
+    - 35  # 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-check-1804:
+    - 5   # mrr - full
+    - 6   # mrr - sel
+    - 7   # mrr - sel
+    - 8   # mrr - sel
+    - 9   # mrr - sel
+    - 10  # mrr - sel
+    - 11  # mrr - sel
+    - 12  # mrr - sel
+    - 13  # mrr - sel
+    - 14  # mrr - sel
+    - 15  # mrr - sel
+#    csit-ligato-perf-1710-all:
+#    - 5
+#    - 7
+#    - 8
+#    - 9
+#    - 10
+#    - 11
+#    - 12
+#    - 13
+#    - 16
+#    - 17
+#    csit-ligato-perf-1801-all:
+#    - 16  # sel
+#    - 17  # sel
+#    - 18  # sel
+#    - 19  # sel
+#    - 20  # sel
+#    - 21  # sel
+#    - 22  # sel
+#    - 23  # sel
+#    - 24  # sel
+#    - 25  # full
+    csit-ligato-perf-1804-all:
+    - 4   # full
+    - 5   # sel
+    - 6   # sel
+    - 7   # sel
+    - 8   # sel
+    - 9   # sel
+    - 10  # sel
+    - 11  # sel
+    - 12  # sel
+    csit-dpdk-perf-1804-all:
+    - 4
     - 5
     - 6
     - 7
@@ -415,27 +706,20 @@
     - 9
     - 10
     - 11
-    - 13
-    csit-ligato-perf-1710-all:
-    - 5
-    - 7
-    - 8
-    - 9
-    - 10
-    - 11
     - 12
     - 13
-    - 16
-    - 17
-    csit-vpp-functional-1710-ubuntu1604-virl:
-    - 126
-    csit-nsh_sfc-verify-func-1710-ubuntu1604-virl:
+    csit-vpp-functional-1804-ubuntu1604-virl:
+    - 199
+    csit-vpp-functional-1804-centos7-virl:
+    - 207
+    csit-nsh_sfc-verify-func-1804-ubuntu1604-virl:
     - 7
-    csit-hc2vpp-verify-func-1710-ubuntu1604:
-    - lastSuccessfulBuild
+    csit-hc2vpp-verify-func-1804-ubuntu1604:
+    - 3
 
 -
   type: "output"
+  output: "report"
   format:
     html:
     - full
@@ -446,29 +730,125 @@
 ###                               T A B L E S                                ###
 ################################################################################
 
+#-
+#  type: "table"
+#  title: "Performance Impact of Meltdown Patches"
+#  algorithm: "table_performance_comparison"
+#  output-file-ext: ".csv"
+## TODO: specify dir
+#  output-file: "{DIR[STATIC,VPP]}/meltdown-impact"
+#  reference:
+#    title: "No Meltdown"
+## TODO: specify data sources
+#    data:
+#      csit-vpp-perf-1707-all:
+#      - 9
+#      - 10
+#      - 13
+#  compare:
+#    title: "Meltdown Patches Applied"
+## TODO: specify data sources
+#    data:
+#      csit-vpp-perf-1710-all:
+#      - 11
+#      - 12
+#      - 13
+#  data:
+#    "vpp-meltdown-impact"
+#  filter: "all"
+#  parameters:
+#  - "name"
+#  - "parent"
+#  - "throughput"
+#  # Number of the best and the worst tests presented in the table. Use 0 (zero)
+#  # to present all tests.
+#  nr-of-tests-shown: 20
+#
+#-
+#  type: "table"
+#  title: "Performance Impact of Spectre Patches"
+#  algorithm: "table_performance_comparison"
+#  output-file-ext: ".csv"
+## TODO: specify dir
+#  output-file: "{DIR[STATIC,VPP]}/meltdown-spectre-impact"
+#  reference:
+#    title: "No Spectre"
+## TODO: specify data sources
+#    data:
+#      csit-vpp-perf-1707-all:
+#      - 9
+#      - 10
+#      - 13
+#  compare:
+#    title: "Spectre Patches Applied"
+## TODO: specify data sources
+#    data:
+#      csit-vpp-perf-1710-all:
+#      - 11
+#      - 12
+#      - 13
+#  data:
+#    "vpp-spectre-impact"
+#  filter: "all"
+#  parameters:
+#  - "name"
+#  - "parent"
+#  - "throughput"
+#  # Number of the best and the worst tests presented in the table. Use 0 (zero)
+#  # to present all tests.
+#  nr-of-tests-shown: 20
+
 -
   type: "table"
-  title: "Performance Impact of Meltdown Patches"
+  title: "VPP Performance Changes"
   algorithm: "table_performance_comparison"
   output-file-ext: ".csv"
-# TODO: specify dir
-  output-file: "{DIR[DTR,PERF,VPP,IMPACT,MELTDOWN]}/meltdown-impact"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes"
+  history:
+    -
+      title: "rls1710"
+      data:
+        csit-vpp-perf-1710-all:
+        - 11
+        - 12
+        - 13
+        - 14
+        - 15
+        - 16
+        - 17
+        - 18
+        - 19
+        - 20
   reference:
-    title: "No Meltdown"
-# TODO: specify data sources
-#    data:
-#      csit-vpp-perf-1801-all:
-#      - 1
-#      - 2
+    title: "rls1801"
+    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
   compare:
-    title: "Meltdown Patches Applied"
-# TODO: specify data sources
-#    data:
-#      csit-vpp-perf-1801-all:
-#      - 1
-#      - 2
-  data:
-    "vpp-meltdown-impact"
+    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
+  data: "vpp-performance-changes"
   filter: "all"
   parameters:
   - "name"
@@ -477,80 +857,95 @@
   # Number of the best and the worst tests presented in the table. Use 0 (zero)
   # to present all tests.
   nr-of-tests-shown: 20
+  outlier-const: 1.5
 
 -
   type: "table"
-  title: "Performance Impact of Spectre Patches"
-  algorithm: "table_performance_comparison"
+  title: "VPP Performance Changes - MRR"
+  algorithm: "table_performance_comparison_mrr"
   output-file-ext: ".csv"
-# TODO: specify dir
-  output-file: "{DIR[DTR,PERF,VPP,IMPACT,SPECTRE]}/spectre-impact"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-mrr"
   reference:
-    title: "No Spectre"
-# TODO: specify data sources
-#    data:
-#      csit-vpp-perf-1801-all:
+    title: "Release 1801"
+    data:
+      csit-vpp-perf-check-1801:
 #      - 1
 #      - 2
+      - 3
+      - 4
+      - 5
+      - 6
+      - 7
+      - 8
+      - 9
+      - 11
+      - 12
+      - 13
   compare:
-    title: "Spectre Patches Applied"
-# TODO: specify data sources
-#    data:
-#      csit-vpp-perf-1801-all:
-#      - 1
-#      - 2
-  data:
-    "vpp-spectre-impact"
+    title: "Release 1804"
+    data:
+      csit-vpp-perf-check-1804:
+      - 5   # mrr - full
+      - 6   # mrr - sel
+      - 7   # mrr - sel
+      - 8   # mrr - sel
+      - 9   # mrr - sel
+      - 10  # mrr - sel
+      - 11  # mrr - sel
+      - 12  # mrr - sel
+      - 13  # mrr - sel
+  data: "vpp-performance-changes-mrr"
   filter: "all"
   parameters:
   - "name"
   - "parent"
-  - "throughput"
+  - "result"
   # Number of the best and the worst tests presented in the table. Use 0 (zero)
   # to present all tests.
   nr-of-tests-shown: 20
-
--
-  type: "table"
-  title: "Performance improvements"
-  algorithm: "table_performance_improvements"
-  template: "{DIR[DTR,PERF,VPP,IMPRV]}/tmpl_performance_improvements.csv"
-  output-file-ext: ".csv"
-  output-file: "{DIR[DTR,PERF,VPP,IMPRV]}/performance_improvements"
-  columns:
-  -
-    title: "Functionality"
-    data: "template 1"
-  -
-    title: "Test Name"
-    data: "template 2"
-  -
-    title: "16.09 mean [Mpps]"
-    data: "template 3"
-  -
-    title: "17.01 mean [Mpps]"
-    data: "template 4"
-  -
-    title: "17.04 mean [Mpps]"
-    data: "template 5"
-  -
-    title: "17.07 mean [Mpps]"
-    data: "data csit-vpp-perf-1707-all mean"
-  -
-    title: "17.10 mean [Mpps]"
-    data: "data csit-vpp-perf-1710-all csit-ligato-perf-1710-all mean"
-  -
-    title: "17.10 stdev [Mpps]"
-    data: "data csit-vpp-perf-1710-all csit-ligato-perf-1710-all stdev"
-  -
-    title: "17.07 to 17.10 change [%]"
-    data: "operation relative_change 5 6"
-  rows: "generated"
-  data:
-    "performance-improvements"
-  filter: "template"
-  parameters:
-  - "throughput"
+  outlier-const: 1.5
+
+#-
+#  type: "table"
+#  title: "Performance improvements"
+#  algorithm: "table_performance_improvements"
+#  template: "{DIR[DTR,PERF,VPP,IMPRV]}/tmpl_performance_improvements.csv"
+#  output-file-ext: ".csv"
+#  output-file: "{DIR[DTR,PERF,VPP,IMPRV]}/performance_improvements"
+#  columns:
+#  -
+#    title: "Test Name"
+#    data: "template 1"
+#  -
+#    title: "16.09 mean [Mpps]"
+#    data: "template 2"
+#  -
+#    title: "17.01 mean [Mpps]"
+#    data: "template 3"
+#  -
+#    title: "17.04 mean [Mpps]"
+#    data: "template 4"
+#  -
+#    title: "17.07 mean [Mpps]"
+#    data: "data csit-vpp-perf-1707-all mean"
+#  -
+#    title: "17.10 mean [Mpps]"
+#    data: "data csit-vpp-perf-1710-all csit-ligato-perf-1710-all mean"
+#  -
+#    title: "18.01 mean [Mpps]"
+#    data: "data csit-vpp-perf-1801-all csit-ligato-perf-1801-all mean"
+#  -
+#    title: "18.01 stdev [Mpps]"
+#    data: "data csit-vpp-perf-1801-all csit-ligato-perf-1801-all stdev"
+#  -
+#    title: "17.10 to 18.01 change [%]"
+#    data: "operation relative_change 5 6"
+#  rows: "generated"
+#  data:
+#    "performance-improvements"
+#  filter: "template"
+#  parameters:
+#  - "throughput"
 
 -
   type: "table"
@@ -622,6 +1017,54 @@
   - "name"
   - "show-run"
 
+-
+  type: "table"
+  title: "Detailed Test Results - VPP MRR Results"
+  algorithm: "table_details"
+  output-file-ext: ".csv"
+  output-file: "{DIR[DTR,MRR,VPP]}/vpp_mrr_results"
+  columns:
+  -
+    title: "Name"
+    data: "data name"
+  -
+    title: "Documentation"
+    data: "data doc"
+  -
+    title: "Status"
+    data: "data msg"
+  rows: "generated"
+  data:
+    "vpp-mrr-results"
+  filter: "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "doc"
+  - "msg"
+
+-
+  type: "table"
+  title: "Test configuration - VPP MRR Test Configs"
+  algorithm: "table_details"
+  output-file-ext: ".csv"
+  output-file: "{DIR[DTC,MRR,VPP]}/vpp_mrr_test_configuration"
+  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-mrr-results"
+  filter: "'MRR'"
+  parameters:
+  - "parent"
+  - "name"
+  - "vat-history"
+
 -
   type: "table"
   title: "Detailed Test Results - VPP Functional Results"
@@ -648,6 +1091,32 @@
   - "doc"
   - "status"
 
+-
+  type: "table"
+  title: "Detailed Test Results - VPP Functional Results - CentOS"
+  algorithm: "table_details"
+  output-file-ext: ".csv"
+  output-file: "{DIR[DTR,FUNC,VPP,CENTOS]}/vpp_functional_results_centos"
+  columns:
+  -
+    title: "Name"
+    data: "data name"
+  -
+    title: "Documentation"
+    data: "data doc"
+  -
+    title: "Status"
+    data: "data status"
+  rows: "generated"
+  data:
+    "vpp-func-results-centos"
+  filter: "all"
+  parameters:
+  - "name"
+  - "parent"
+  - "doc"
+  - "status"
+
 -
   type: "table"
   title: "Test configuration - VPP Functional Test Configs"
@@ -670,6 +1139,28 @@
   - "name"
   - "vat-history"
 
+-
+  type: "table"
+  title: "Test configuration - VPP Functional Test Configs - CentOS"
+  algorithm: "table_details"
+  output-file-ext: ".csv"
+  output-file: "{DIR[DTC,FUNC,VPP,CENTOS]}/vpp_functional_configuration_centos"
+  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-func-results-centos"
+  filter: "all"
+  parameters:
+  - "parent"
+  - "name"
+  - "vat-history"
+
 -
   type: "table"
   title: "Detailed Test Results - Container Orchestrated Topologies Performance Results"
@@ -835,6 +1326,44 @@
   data-start-level: 3  # 0, 1, 2, ...
   chapters-start-level: 2  # 0, 1, 2, ...
 
+-
+  type: "file"
+  title: "VPP MRR Results"
+  algorithm: "file_test_results"
+  output-file-ext: ".rst"
+  output-file: "{DIR[DTR,MRR,VPP]}/vpp_mrr_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,MRR,VPP]}"
+  data:
+    "vpp-mrr-results"
+  filter: "'MRR'"
+  parameters:
+  - "name"
+  - "doc"
+  - "level"
+  - "parent"
+  data-start-level: 2  # 0, 1, 2, ...
+  chapters-start-level: 2  # 0, 1, 2, ...
+
+-
+  type: "file"
+  title: "VPP MRR Configuration"
+  algorithm: "file_test_results"
+  output-file-ext: ".rst"
+  output-file: "{DIR[DTC,MRR,VPP]}/vpp_mrr_configuration"
+  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,MRR,VPP]}"
+  data:
+    "vpp-mrr-results"
+  filter: "'MRR'"
+  parameters:
+  - "name"
+  - "doc"
+  - "level"
+  - "parent"
+  data-start-level: 2  # 0, 1, 2, ...
+  chapters-start-level: 2  # 0, 1, 2, ...
+
 -
   type: "file"
   title: "VPP Functional Results"
@@ -853,6 +1382,24 @@
   data-start-level: 3  # 0, 1, 2, ...
   chapters-start-level: 2  # 0, 1, 2, ...
 
+-
+  type: "file"
+  title: "VPP Functional Results - CentOS"
+  algorithm: "file_test_results"
+  output-file-ext: ".rst"
+  output-file: "{DIR[DTR,FUNC,VPP,CENTOS]}/vpp_functional_results_centos"
+  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,CENTOS]}"
+  data:
+    "vpp-func-results-centos"
+  filter: "all"
+  parameters:
+  - "name"
+  - "doc"
+  - "level"
+  data-start-level: 3  # 0, 1, 2, ...
+  chapters-start-level: 2  # 0, 1, 2, ...
+
 -
   type: "file"
   title: "VPP Functional Configuration"
@@ -871,6 +1418,24 @@
   data-start-level: 3  # 0, 1, 2, ...
   chapters-start-level: 2  # 0, 1, 2, ...
 
+-
+  type: "file"
+  title: "VPP Functional Configuration - CentOS"
+  algorithm: "file_test_results"
+  output-file-ext: ".rst"
+  output-file: "{DIR[DTC,FUNC,VPP,CENTOS]}/vpp_functional_configuration_centos"
+  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,CENTOS]}"
+  data:
+    "vpp-func-results-centos"
+  filter: "all"
+  parameters:
+  - "name"
+  - "doc"
+  - "level"
+  data-start-level: 3  # 0, 1, 2, ...
+  chapters-start-level: 2  # 0, 1, 2, ...
+
 -
   type: "file"
   title: "Container Orchestrated Performance Results"
@@ -953,6 +1518,51 @@
 ###                                P L O T S                                 ###
 ################################################################################
 
+# Plots VPP HTTP Server Performance
+-
+  type: "plot"
+  title: "VPP HTTP Server Performance"
+  algorithm: "plot_http_server_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/http-server-performance-cps"
+  data:
+    "plot-vpp-http-server-performance"
+  # Keep this formatting, the filter is enclosed with " (quotation mark) and
+  # each tag is enclosed with ' (apostrophe).
+  filter: "'HTTP' and 'TCP_CPS'"
+  parameters:
+  - "result"
+  - "name"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "VPP HTTP Server Performance"
+    layout:
+      "plot-cps"
+
+-
+  type: "plot"
+  title: "VPP HTTP Server Performance"
+  algorithm: "plot_http_server_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/http-server-performance-rps"
+  data:
+    "plot-vpp-http-server-performance"
+  filter: "'HTTP' and 'TCP_RPS'"
+  parameters:
+  - "result"
+  - "name"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "VPP HTTP Server Performance"
+    layout:
+      "plot-rps"
+
 # Plot Throughput Speedup Analysis
 
 # L2 - 10ge2p1x520 - NDR
@@ -964,7 +1574,7 @@
   output-file: "{DIR[STATIC,VPP]}/10ge2p1x520-64B-l2-tsa-ndrdisc"
   data:
     "plot-throughput-speedup-analysis"
-  filter: "'NIC_Intel-X520-DA2' and '64B' and 'BASE' and 'NDRDISC' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+  filter: "'NIC_Intel-X520-DA2' and '64B' and 'BASE' and 'NDRDISC' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'LXC' and not 'DOCKER'"
   parameters:
   - "throughput"
   - "parent"
@@ -983,7 +1593,7 @@
   output-file: "{DIR[STATIC,VPP]}/40ge2p1xl710-64B-l2-tsa-ndrdisc"
   data:
     "plot-throughput-speedup-analysis"
-  filter: "'NIC_Intel-XL710' and '64B' and 'BASE' and 'NDRDISC' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+  filter: "'NIC_Intel-XL710' and '64B' and 'BASE' and 'NDRDISC' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'LXC' and not 'DOCKER'"
   parameters:
   - "throughput"
   - "parent"
@@ -1002,7 +1612,7 @@
   output-file: "{DIR[STATIC,VPP]}/10ge2p1x520-64B-l2-tsa-pdrdisc"
   data:
     "plot-throughput-speedup-analysis"
-  filter: "'NIC_Intel-X520-DA2' and '64B' and 'BASE' and 'PDRDISC' and not 'NDRDISC' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+  filter: "'NIC_Intel-X520-DA2' and '64B' and 'BASE' and 'PDRDISC' and not 'NDRDISC' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'LXC' and not 'DOCKER'"
   parameters:
   - "throughput"
   - "parent"
@@ -1021,7 +1631,7 @@
   output-file: "{DIR[STATIC,VPP]}/10ge2p1x520-64B-ip4-tsa-ndrdisc"
   data:
     "plot-throughput-speedup-analysis"
-  filter: "'NIC_Intel-X520-DA2' and '64B' and ('BASE' or 'SCALE') and 'NDRDISC' and not 'VHOST'"
+  filter: "'NIC_Intel-X520-DA2' and '64B' and 'IP4FWD' and ('BASE' or 'SCALE') and 'NDRDISC' and not 'VHOST' and not 'FEATURE' and not 'DOT1Q' and not 'IPSEC'"
   parameters:
   - "throughput"
   - "parent"
@@ -1040,7 +1650,7 @@
   output-file: "{DIR[STATIC,VPP]}/40ge2p1xl710-64B-ip4-tsa-ndrdisc"
   data:
     "plot-throughput-speedup-analysis"
-  filter: "'NIC_Intel-XL710' and '64B' and ('BASE' or 'SCALE') and 'NDRDISC' and not 'VHOST'"
+  filter: "'NIC_Intel-XL710' and '64B' and 'IP4FWD' and ('BASE' or 'SCALE') and 'NDRDISC' and not 'VHOST' and not 'FEATURE' and not 'DOT1Q' and not 'IPSEC'"
   parameters:
   - "throughput"
   - "parent"
@@ -1059,7 +1669,7 @@
   output-file: "{DIR[STATIC,VPP]}/10ge2p1x520-64B-ip4-tsa-pdrdisc"
   data:
     "plot-throughput-speedup-analysis"
-  filter: "'NIC_Intel-X520-DA2' and '64B' and ('BASE' or 'SCALE') and 'PDRDISC' and not 'NDRDISC' and not 'VHOST'"
+  filter: "'NIC_Intel-X520-DA2' and '64B' and 'IP4FWD' and ('BASE' or 'SCALE') and 'PDRDISC' and not 'NDRDISC' and not 'VHOST' and not 'FEATURE' and not 'DOT1Q' and not 'IPSEC'"
   parameters:
   - "throughput"
   - "parent"
@@ -1078,7 +1688,7 @@
   output-file: "{DIR[STATIC,VPP]}/10ge2p1x520-78B-ip6-tsa-ndrdisc"
   data:
     "plot-throughput-speedup-analysis"
-  filter: "'NIC_Intel-X520-DA2' and '78B' and ('BASE' or 'SCALE') and 'NDRDISC' and not 'VHOST'"
+  filter: "'NIC_Intel-X520-DA2' and '78B' and 'IP6FWD' and ('BASE' or 'SCALE') and 'NDRDISC' and not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
@@ -1097,7 +1707,7 @@
   output-file: "{DIR[STATIC,VPP]}/40ge2p1xl710-78B-ip6-tsa-ndrdisc"
   data:
     "plot-throughput-speedup-analysis"
-  filter: "'NIC_Intel-XL710' and '78B' and ('BASE' or 'SCALE') and 'NDRDISC' and not 'VHOST'"
+  filter: "'NIC_Intel-XL710' and '78B' and 'IP6FWD' and ('BASE' or 'SCALE') and 'NDRDISC' and not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
@@ -1116,7 +1726,7 @@
   output-file: "{DIR[STATIC,VPP]}/10ge2p1x520-78B-ip6-tsa-pdrdisc"
   data:
     "plot-throughput-speedup-analysis"
-  filter: "'NIC_Intel-X520-DA2' and '78B' and ('BASE' or 'SCALE') and 'PDRDISC' and not 'NDRDISC' and not 'VHOST'"
+  filter: "'NIC_Intel-X520-DA2' and '78B' and 'IP6FWD' and ('BASE' or 'SCALE') and 'PDRDISC' and not 'NDRDISC' and not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
@@ -1126,6 +1736,413 @@
     layout:
       "plot-throughput-speedup-analysis"
 
+## IP4_overlay - NDR
+#-
+#  type: "plot"
+#  title: "TSA: 64B-*-ethip4[a-z0-9]+-[a-z0-9]*-ndrdisc"
+#  algorithm: "plot_throughput_speedup_analysis"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/10ge2p1x520-64B-ethip4-tsa-ndrdisc"
+#  data:
+#    "plot-throughput-speedup-analysis"
+#  filter: "'NIC_Intel-X520-DA2' and '64B' and 'ENCAP' and 'NDRDISC' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  layout:
+#    title: "64B-*-ethip4[a-z0-9]+-[a-z0-9]*-ndrdisc"
+#    layout:
+#      "plot-throughput-speedup-analysis"
+#
+## IP4_overlay - PDR
+#-
+#  type: "plot"
+#  title: "TSA: 64B-*-ethip4[a-z0-9]+-[a-z0-9]*-pdrdisc"
+#  algorithm: "plot_throughput_speedup_analysis"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/10ge2p1x520-64B-ethip4-tsa-pdrdisc"
+#  data:
+#    "plot-throughput-speedup-analysis"
+#  filter: "'NIC_Intel-X520-DA2' and '64B' and 'ENCAP' and 'PDRDISC' and not 'NDRDISC' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  layout:
+#    title: "64B-*-ethip4[a-z0-9]+-[a-z0-9]*-pdrdisc"
+#    layout:
+#      "plot-throughput-speedup-analysis"
+#
+## IP6_overlay - NDR
+#-
+#  type: "plot"
+#  title: "TSA: 78B-ethip6[a-z0-9]+-[a-z0-9]*-ndrdisc"
+#  algorithm: "plot_throughput_speedup_analysis"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/10ge2p1x520-78B-ethip6-tsa-ndrdisc"
+#  data:
+#    "plot-throughput-speedup-analysis"
+#  filter: "'NIC_Intel-X520-DA2' and '78B' and 'ENCAP' and 'NDRDISC' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  layout:
+#    title: "78B-*-ethip6[a-z0-9]+-[a-z0-9]*-ndrdisc"
+#    layout:
+#      "plot-throughput-speedup-analysis"
+#
+## IP6_overlay - PDR
+#-
+#  type: "plot"
+#  title: "TSA: 78B-*-ethip6[a-z0-9]+-[a-z0-9]*-pdrdisc"
+#  algorithm: "plot_throughput_speedup_analysis"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/10ge2p1x520-78B-ethip6-tsa-pdrdisc"
+#  data:
+#    "plot-throughput-speedup-analysis"
+#  filter: "'NIC_Intel-X520-DA2' and '78B' and 'ENCAP' and 'PDRDISC' and not 'NDRDISC' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  layout:
+#    title: "78B-*-ethip6[a-z0-9]+-[a-z0-9]*-pdrdisc"
+#    layout:
+#      "plot-throughput-speedup-analysis"
+#
+## VM VHOST - NDR
+#-
+#  type: "plot"
+#  title: "TSA: 64B-*-.*vhost.*-ndrdisc"
+#  algorithm: "plot_throughput_speedup_analysis"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/10ge2p1x520-64B-vhost-sel1-tsa-ndrdisc"
+#  data:
+#    "plot-throughput-speedup-analysis"
+#  filter: "'NIC_Intel-X520-DA2' and '64B' and 'NDRDISC' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  layout:
+#    title: "64B-*-.*vhost.*-ndrdisc"
+#    layout:
+#      "plot-throughput-speedup-analysis"
+#
+#-
+#  type: "plot"
+#  title: "TSA: 64B-*-.*vhost.*-ndrdisc"
+#  algorithm: "plot_throughput_speedup_analysis"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/40ge2p1xl710-64B-vhost-sel1-tsa-ndrdisc"
+#  data:
+#    "plot-throughput-speedup-analysis"
+#  filter: "'NIC_Intel-XL710' and '64B' and 'NDRDISC' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  layout:
+#    title: "64B-*-.*vhost.*-ndrdisc"
+#    layout:
+#      "plot-throughput-speedup-analysis"
+#
+#-
+#  type: "plot"
+#  title: "TSA: 64B-*-.*vhost.*-ndrdisc"
+#  algorithm: "plot_throughput_speedup_analysis"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/10ge2p1x520-64B-vhost-sel2-tsa-ndrdisc"
+#  data:
+#    "plot-throughput-speedup-analysis"
+#  filter: "'NIC_Intel-X520-DA2' and '64B' and 'NDRDISC' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'DOT1Q' and not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  layout:
+#    title: "64B-*-.*vhost.*-ndrdisc"
+#    layout:
+#      "plot-throughput-speedup-analysis"
+#
+#-
+#  type: "plot"
+#  title: "TSA: 64B-*-.*vhost.*-ndrdisc"
+#  algorithm: "plot_throughput_speedup_analysis"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/10ge2p1x710-64B-vhost-sel2-tsa-ndrdisc"
+#  data:
+#    "plot-throughput-speedup-analysis"
+#  filter: "'NIC_Intel-X710' and '64B' and 'NDRDISC' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'DOT1Q' and not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  layout:
+#    title: "64B-*-.*vhost.*-ndrdisc"
+#    layout:
+#      "plot-throughput-speedup-analysis"
+#
+#-
+#  type: "plot"
+#  title: "TSA: 64B-*-.*vhost.*-ndrdisc"
+#  algorithm: "plot_throughput_speedup_analysis"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/40ge2p1xl710-64B-vhost-sel2-tsa-ndrdisc"
+#  data:
+#    "plot-throughput-speedup-analysis"
+#  filter: "'NIC_Intel-XL710' and '64B' and 'NDRDISC' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'DOT1Q' and not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  layout:
+#    title: "64B-*-.*vhost.*-ndrdisc"
+#    layout:
+#      "plot-throughput-speedup-analysis"
+#
+## VM VHOST - PDR
+#-
+#  type: "plot"
+#  title: "TSA: 64B-*-.*vhost.*-pdrdisc"
+#  algorithm: "plot_throughput_speedup_analysis"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/10ge2p1x520-64B-vhost-sel1-tsa-pdrdisc"
+#  data:
+#    "plot-throughput-speedup-analysis"
+#  filter: "'NIC_Intel-X520-DA2' and '64B' and 'PDRDISC' and not 'NDRDISC' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  layout:
+#    title: "64B-*-.*vhost.*-pdrdisc"
+#    layout:
+#      "plot-throughput-speedup-analysis"
+#
+#-
+#  type: "plot"
+#  title: "TSA: 64B-*-.*vhost.*-pdrdisc"
+#  algorithm: "plot_throughput_speedup_analysis"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/40ge2p1xl710-64B-vhost-sel1-tsa-pdrdisc"
+#  data:
+#    "plot-throughput-speedup-analysis"
+#  filter: "'NIC_Intel-XL710' and '64B' and 'PDRDISC' and not 'NDRDISC' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  layout:
+#    title: "64B-*-.*vhost.*-pdrdisc"
+#    layout:
+#      "plot-throughput-speedup-analysis"
+#
+#-
+#  type: "plot"
+#  title: "TSA: 64B-*-.*vhost.*-pdrdisc"
+#  algorithm: "plot_throughput_speedup_analysis"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/10ge2p1x520-64B-vhost-sel2-tsa-pdrdisc"
+#  data:
+#    "plot-throughput-speedup-analysis"
+#  filter: "'NIC_Intel-X520-DA2' and '64B' and 'PDRDISC' and not 'NDRDISC' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'DOT1Q' and not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  layout:
+#    title: "64B-*-.*vhost.*-pdrdisc"
+#    layout:
+#      "plot-throughput-speedup-analysis"
+#
+#-
+#  type: "plot"
+#  title: "TSA: 64B-*-.*vhost.*-pdrdisc"
+#  algorithm: "plot_throughput_speedup_analysis"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/10ge2p1x710-64B-vhost-sel2-tsa-pdrdisc"
+#  data:
+#    "plot-throughput-speedup-analysis"
+#  filter: "'NIC_Intel-X710' and '64B' and 'PDRDISC' and not 'NDRDISC' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'DOT1Q' and not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  layout:
+#    title: "64B-*-.*vhost.*-pdrdisc"
+#    layout:
+#      "plot-throughput-speedup-analysis"
+#
+#-
+#  type: "plot"
+#  title: "TSA: 64B-*-.*vhost.*-pdrdisc"
+#  algorithm: "plot_throughput_speedup_analysis"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/40ge2p1xl710-64B-vhost-sel2-tsa-pdrdisc"
+#  data:
+#    "plot-throughput-speedup-analysis"
+#  filter: "'NIC_Intel-XL710' and '64B' and 'PDRDISC' and not 'NDRDISC' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'DOT1Q' and not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  layout:
+#    title: "64B-*-.*vhost.*-pdrdisc"
+#    layout:
+#      "plot-throughput-speedup-analysis"
+#
+## CRYPTO - NDR
+#-
+#  type: "plot"
+#  title: "TSA: 64B-*-.*ipsec.*-ndrdisc"
+#  algorithm: "plot_throughput_speedup_analysis"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/40ge2p1xl710-64B-ipsechw-tsa-ndrdisc"
+#  data:
+#    "plot-throughput-speedup-analysis"
+#  filter: "'NIC_Intel-XL710' and '64B' and not 'VHOST' and 'IP4FWD' and 'NDRDISC' and 'IPSECHW' and ('IPSECTRAN' or 'IPSECTUN')"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  layout:
+#    title: "64B-*-.*ipsec.*-ndrdisc"
+#    layout:
+#      "plot-throughput-speedup-analysis"
+#
+## CRYPTO - PDR
+#-
+#  type: "plot"
+#  title: "TSA: 64B-*-.*ipsec.*-pdrdisc"
+#  algorithm: "plot_throughput_speedup_analysis"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/40ge2p1xl710-64B-ipsechw-tsa-pdrdisc"
+#  data:
+#    "plot-throughput-speedup-analysis"
+#  filter: "'NIC_Intel-XL710' and '64B' and not 'VHOST' and 'IP4FWD' and 'PDRDISC' and not 'NDRDISC' and 'IPSECHW' and ('IPSECTRAN' or 'IPSECTUN')"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  layout:
+#    title: "64B-*-.*ipsec.*-pdrdisc"
+#    layout:
+#      "plot-throughput-speedup-analysis"
+#
+## Container memif - NDR
+#-
+#  type: "plot"
+#  title: "TSA: 64B-*-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn)-memif-ndrdisc"
+#  algorithm: "plot_throughput_speedup_analysis"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/10ge2p1x520-64B-container-memif-tsa-ndrdisc"
+#  data:
+#    "plot-throughput-speedup-analysis"
+#  filter: "'NIC_Intel-X520-DA2' and '64B' and 'BASE' and 'NDRDISC' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  layout:
+#    title: "64B-*-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn)-memif-ndrdisc"
+#    layout:
+#      "plot-throughput-speedup-analysis"
+#
+#-
+#  type: "plot"
+#  title: "TSA: 64B-*-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn)-memif-pdrdisc"
+#  algorithm: "plot_throughput_speedup_analysis"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/10ge2p1x520-64B-container-memif-tsa-pdrdisc"
+#  data:
+#    "plot-throughput-speedup-analysis"
+#  filter: "'NIC_Intel-X520-DA2' and '64B' and 'BASE' and 'PDRDISC' and not 'NDRDISC' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  layout:
+#    title: "64B-*-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn)-memif-pdrdisc"
+#    layout:
+#      "plot-throughput-speedup-analysis"
+#
+## Container orchestrated - NDR
+#-
+#  type: "plot"
+#  title: "TSA: 64B-*-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn)-memif-ndrdisc"
+#  algorithm: "plot_throughput_speedup_analysis"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/10ge2p1x520-64B-container-orchestrated-tsa-ndrdisc"
+#  data:
+#    "plot-ligato-throughput-speedup-analysis"
+#  filter: "'NIC_Intel-X520-DA2' and '64B' and ('BASE' or 'SCALE') and 'NDRDISC' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  layout:
+#    title: "64B-*-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn)-memif-ndrdisc"
+#    layout:
+#      "plot-throughput-speedup-analysis"
+#
+#-
+#  type: "plot"
+#  title: "TSA: 64B-*-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn)-memif-ndrdisc"
+#  algorithm: "plot_throughput_speedup_analysis"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/10ge2p1x710-64B-container-orchestrated-tsa-ndrdisc"
+#  data:
+#    "plot-ligato-throughput-speedup-analysis"
+#  filter: "'NIC_Intel-X710' and '64B' and ('BASE' or 'SCALE') and 'NDRDISC' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  layout:
+#    title: "64B-*-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn)-memif-ndrdisc"
+#    layout:
+#      "plot-throughput-speedup-analysis"
+#
+## Container orchestrated - PDR
+#-
+#  type: "plot"
+#  title: "TSA: 64B-*-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn)-memif-pdrdisc"
+#  algorithm: "plot_throughput_speedup_analysis"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/10ge2p1x520-64B-container-orchestrated-tsa-pdrdisc"
+#  data:
+#    "plot-ligato-throughput-speedup-analysis"
+#  filter: "'NIC_Intel-X520-DA2' and '64B' and ('BASE' or 'SCALE') and ''PDRDISC' and not 'NDRDISC' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  layout:
+#    title: "64B-*-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn)-memif-pdrdisc"
+#    layout:
+#      "plot-throughput-speedup-analysis"
+#
+#-
+#  type: "plot"
+#  title: "TSA: 64B-*-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn)-memif-pdrdisc"
+#  algorithm: "plot_throughput_speedup_analysis"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/10ge2p1x710-64B-container-orchestrated-tsa-pdrdisc"
+#  data:
+#    "plot-ligato-throughput-speedup-analysis"
+#  filter: "'NIC_Intel-X710' and '64B' and ('BASE' or 'SCALE') and 'PDRDISC' and not 'NDRDISC' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  layout:
+#    title: "64B-*-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn)-memif-pdrdisc"
+#    layout:
+#      "plot-throughput-speedup-analysis"
+
 # Plot packets per second
 
 # VPP L2 sel1
@@ -1139,7 +2156,7 @@
     "plot-vpp-throughput-latency"
   # Keep this formatting, the filter is enclosed with " (quotation mark) and
   # each tag is enclosed with ' (apostrophe).
-  filter: "'64B' and ('BASE' or 'SCALE') and 'NDRDISC' and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+  filter: "'64B' and ('BASE' or 'SCALE') and 'NDRDISC' and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
@@ -1160,7 +2177,7 @@
   output-file: "{DIR[STATIC,VPP]}/64B-2t2c-l2-sel1-ndrdisc"
   data:
     "plot-vpp-throughput-latency"
-  filter: "'64B' and ('BASE' or 'SCALE') and 'NDRDISC' and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+  filter: "'64B' and ('BASE' or 'SCALE') and 'NDRDISC' and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
@@ -1181,7 +2198,7 @@
   output-file: "{DIR[STATIC,VPP]}/64B-1t1c-l2-sel1-pdrdisc"
   data:
     "plot-vpp-throughput-latency"
-  filter: "'64B' and ('BASE' or 'SCALE') and 'PDRDISC' and not 'NDRDISC' and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+  filter: "'64B' and ('BASE' or 'SCALE') and 'PDRDISC' and not 'NDRDISC' and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
@@ -1202,7 +2219,7 @@
   output-file: "{DIR[STATIC,VPP]}/64B-2t2c-l2-sel1-pdrdisc"
   data:
     "plot-vpp-throughput-latency"
-  filter: "'64B' and ('BASE' or 'SCALE') and 'PDRDISC' and not 'NDRDISC' and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+  filter: "'64B' and ('BASE' or 'SCALE') and 'PDRDISC' and not 'NDRDISC' and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
@@ -1224,7 +2241,7 @@
   output-file: "{DIR[STATIC,VPP]}/64B-1t1c-l2-sel2-ndrdisc"
   data:
     "plot-vpp-throughput-latency"
-  filter: "'64B' and 'FEATURE' and ('ACL10' or 'ACL50') and '10k_FLOWS' and 'NDRDISC' and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+  filter: "'64B' and 'FEATURE' and ('ACL10' or 'ACL50') and '10k_FLOWS' and 'NDRDISC' and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
@@ -1245,7 +2262,7 @@
   output-file: "{DIR[STATIC,VPP]}/64B-2t2c-l2-sel2-ndrdisc"
   data:
     "plot-vpp-throughput-latency"
-  filter: "'64B' and 'FEATURE' and ('ACL10' or 'ACL50') and '10k_FLOWS' and 'NDRDISC' and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+  filter: "'64B' and 'FEATURE' and ('ACL10' or 'ACL50') and '10k_FLOWS' and 'NDRDISC' and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
@@ -1266,7 +2283,7 @@
   output-file: "{DIR[STATIC,VPP]}/64B-1t1c-l2-sel2-pdrdisc"
   data:
     "plot-vpp-throughput-latency"
-  filter: "'64B' and 'FEATURE' and ('ACL10' or 'ACL50') and '10k_FLOWS' and 'PDRDISC' and not 'NDRDISC' and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+  filter: "'64B' and 'FEATURE' and ('ACL10' or 'ACL50') and '10k_FLOWS' and 'PDRDISC' and not 'NDRDISC' and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
@@ -1287,7 +2304,7 @@
   output-file: "{DIR[STATIC,VPP]}/64B-2t2c-l2-sel2-pdrdisc"
   data:
     "plot-vpp-throughput-latency"
-  filter: "'64B' and 'FEATURE' and ('ACL10' or 'ACL50') and '10k_FLOWS' and 'PDRDISC' and not 'NDRDISC' and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+  filter: "'64B' and 'FEATURE' and ('ACL10' or 'ACL50') and '10k_FLOWS' and 'PDRDISC' and not 'NDRDISC' and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
@@ -1309,7 +2326,7 @@
   output-file: "{DIR[STATIC,VPP]}/64B-1t1c-ethip4-ip4-ndrdisc"
   data:
     "plot-vpp-throughput-latency"
-  filter: "'64B' and ('BASE' or 'SCALE' or 'FEATURE') and 'NDRDISC' and '1T1C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
+  filter: "'64B' and ('BASE' or 'SCALE' or 'FEATURE') and 'NDRDISC' and '1T1C' and 'IP4FWD' and not 'ACL1' and not 'ACL10' and not '100_FLOWS' and not '100k_FLOWS' and not 'IPSEC' and not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
@@ -1330,7 +2347,7 @@
   output-file: "{DIR[STATIC,VPP]}/64B-2t2c-ethip4-ip4-ndrdisc"
   data:
     "plot-vpp-throughput-latency"
-  filter: "'64B' and ('BASE' or 'SCALE' or 'FEATURE') and 'NDRDISC' and '2T2C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
+  filter: "'64B' and ('BASE' or 'SCALE' or 'FEATURE') and 'NDRDISC' and '2T2C' and 'IP4FWD' and not 'ACL1' and not 'ACL10' and not '100_FLOWS' and not '100k_FLOWS' and not 'IPSEC' and not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
@@ -1351,7 +2368,7 @@
   output-file: "{DIR[STATIC,VPP]}/64B-1t1c-ethip4-ip4-pdrdisc"
   data:
     "plot-vpp-throughput-latency"
-  filter: "'64B' and ('BASE' or 'SCALE' or 'FEATURE') and 'PDRDISC' and not 'NDRDISC' and '1T1C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
+  filter: "'64B' and ('BASE' or 'SCALE' or 'FEATURE') and 'PDRDISC' and not 'NDRDISC' and '1T1C' and 'IP4FWD' and not 'ACL1' and not 'ACL10' and not '100_FLOWS' and not '100k_FLOWS' and not 'IPSEC' and not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
@@ -1372,7 +2389,7 @@
   output-file: "{DIR[STATIC,VPP]}/64B-2t2c-ethip4-ip4-pdrdisc"
   data:
     "plot-vpp-throughput-latency"
-  filter: "'64B' and ('BASE' or 'SCALE' or 'FEATURE') and 'PDRDISC' and not 'NDRDISC' and '2T2C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
+  filter: "'64B' and ('BASE' or 'SCALE' or 'FEATURE') and 'PDRDISC' and not 'NDRDISC' and '2T2C' and 'IP4FWD' and not 'ACL1' and not 'ACL10' and not '100_FLOWS' and not '100k_FLOWS' and not 'IPSEC' and not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
@@ -1574,8 +2591,45 @@
     whiskerwidth: 0
   layout:
     title: "78B-1t1c-ethip6[a-z0-9]+-[a-z0-9]*-ndrdisc"
-    layout:
-      "plot-throughput"
+    xaxis:
+      autorange: True
+      autotick: False
+      fixedrange: False
+      gridcolor: "rgb(238, 238, 238)"
+      linecolor: "rgb(238, 238, 238)"
+      linewidth: 1
+      showgrid: True
+      showline: True
+      showticklabels: True
+      tickcolor: "rgb(238, 238, 238)"
+      tickmode: "linear"
+      title: "Indexed Test Cases"
+      zeroline: False
+    yaxis:
+      gridcolor: "rgb(238, 238, 238)'"
+      hoverformat: ".4s"
+      linecolor: "rgb(238, 238, 238)"
+      linewidth: 1
+      range: [2000000, 6000000]
+      showgrid: True
+      showline: True
+      showticklabels: True
+      tickcolor: "rgb(238, 238, 238)"
+      title: "Packets Per Second [pps]"
+      zeroline: False
+    boxmode: "group"
+    boxgroupgap: 0.5
+    autosize: False
+    margin:
+      t: 50
+      b: 20
+      l: 50
+      r: 20
+    showlegend: True
+    legend:
+      orientation: "h"
+    width: 700
+    height: 1000
 
 -
   type: "plot"
@@ -1637,8 +2691,45 @@
     whiskerwidth: 0
   layout:
     title: "78B-2t2c-ethip6[a-z0-9]+-[a-z0-9]*-pdrdisc"
-    layout:
-      "plot-throughput"
+    xaxis:
+      autorange: True
+      autotick: False
+      fixedrange: False
+      gridcolor: "rgb(238, 238, 238)"
+      linecolor: "rgb(238, 238, 238)"
+      linewidth: 1
+      showgrid: True
+      showline: True
+      showticklabels: True
+      tickcolor: "rgb(238, 238, 238)"
+      tickmode: "linear"
+      title: "Indexed Test Cases"
+      zeroline: False
+    yaxis:
+      gridcolor: "rgb(238, 238, 238)'"
+      hoverformat: ".4s"
+      linecolor: "rgb(238, 238, 238)"
+      linewidth: 1
+      range: [4000000, 12000000]
+      showgrid: True
+      showline: True
+      showticklabels: True
+      tickcolor: "rgb(238, 238, 238)"
+      title: "Packets Per Second [pps]"
+      zeroline: False
+    boxmode: "group"
+    boxgroupgap: 0.5
+    autosize: False
+    margin:
+      t: 50
+      b: 20
+      l: 50
+      r: 20
+    showlegend: True
+    legend:
+      orientation: "h"
+    width: 700
+    height: 1000
 
 # VPP VM VHOST
 -
@@ -1659,8 +2750,45 @@
     whiskerwidth: 0
   layout:
     title: "64B-1t1c-.*vhost.*-ndrdisc"
-    layout:
-      "plot-throughput"
+    xaxis:
+      autorange: True
+      autotick: False
+      fixedrange: False
+      gridcolor: "rgb(238, 238, 238)"
+      linecolor: "rgb(238, 238, 238)"
+      linewidth: 1
+      showgrid: True
+      showline: True
+      showticklabels: True
+      tickcolor: "rgb(238, 238, 238)"
+      tickmode: "linear"
+      title: "Indexed Test Cases"
+      zeroline: False
+    yaxis:
+      gridcolor: "rgb(238, 238, 238)'"
+      hoverformat: ".4s"
+      linecolor: "rgb(238, 238, 238)"
+      linewidth: 1
+      range: [0, 3500000]
+      showgrid: True
+      showline: True
+      showticklabels: True
+      tickcolor: "rgb(238, 238, 238)"
+      title: "Packets Per Second [pps]"
+      zeroline: False
+    boxmode: "group"
+    boxgroupgap: 0.5
+    autosize: False
+    margin:
+      t: 50
+      b: 20
+      l: 50
+      r: 20
+    showlegend: True
+    legend:
+      orientation: "h"
+    width: 700
+    height: 1000
 
 -
   type: "plot"
@@ -2223,7 +3351,7 @@
   output-file: "{DIR[STATIC,VPP]}/64B-1t1c-l2-sel1-ndrdisc-lat50"
   data:
     "plot-vpp-throughput-latency"
-  filter: "'64B' and ('BASE' or 'SCALE') and 'NDRDISC' and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+  filter: "'64B' and ('BASE' or 'SCALE') and 'NDRDISC' and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
   parameters:
   - "latency"
   - "parent"
@@ -2242,7 +3370,7 @@
   output-file: "{DIR[STATIC,VPP]}/64B-2t2c-l2-sel1-ndrdisc-lat50"
   data:
     "plot-vpp-throughput-latency"
-  filter: "'64B' and ('BASE' or 'SCALE') and 'NDRDISC' and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+  filter: "'64B' and ('BASE' or 'SCALE') and 'NDRDISC' and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
   parameters:
   - "latency"
   - "parent"
@@ -2262,7 +3390,7 @@
   output-file: "{DIR[STATIC,VPP]}/64B-1t1c-l2-sel2-ndrdisc-lat50"
   data:
     "plot-vpp-throughput-latency"
-  filter: "'64B' and ('FEATURE' and 'ACL50' and '10k_FLOWS') and 'NDRDISC' and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+  filter: "'64B' and ('FEATURE' and 'ACL50' and '10k_FLOWS') and 'NDRDISC' and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
   parameters:
   - "latency"
   - "parent"
@@ -2281,7 +3409,7 @@
   output-file: "{DIR[STATIC,VPP]}/64B-2t2c-l2-sel2-ndrdisc-lat50"
   data:
     "plot-vpp-throughput-latency"
-  filter: "'64B' and ('FEATURE' and 'ACL50' and '10k_FLOWS') and 'NDRDISC' and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+  filter: "'64B' and ('FEATURE' and 'ACL50' and '10k_FLOWS') and 'NDRDISC' and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
   parameters:
   - "latency"
   - "parent"
@@ -2301,7 +3429,7 @@
   output-file: "{DIR[STATIC,VPP]}/64B-1t1c-ethip4-ip4-ndrdisc-lat50"
   data:
     "plot-vpp-throughput-latency"
-  filter: "'64B' and ('BASE' or 'SCALE' or 'FEATURE') and 'NDRDISC' and '1T1C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
+  filter: "'64B' and ('BASE' or 'SCALE' or 'FEATURE') and 'NDRDISC' and '1T1C' and 'IP4FWD' and not 'ACL1' and not 'ACL10' and not '100_FLOWS' and not '100k_FLOWS' and not 'IPSEC' and not 'VHOST'"
   parameters:
   - "latency"
   - "parent"
@@ -2320,7 +3448,7 @@
   output-file: "{DIR[STATIC,VPP]}/64B-2t2c-ethip4-ip4-ndrdisc-lat50"
   data:
     "plot-vpp-throughput-latency"
-  filter: "'64B' and ('BASE' or 'SCALE' or 'FEATURE') and 'NDRDISC' and '2T2C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
+  filter: "'64B' and ('BASE' or 'SCALE' or 'FEATURE') and 'NDRDISC' and '2T2C' and 'IP4FWD' and not 'ACL1' and not 'ACL10' and not '100_FLOWS' and not '100k_FLOWS' and not 'IPSEC' and not 'VHOST'"
   parameters:
   - "latency"
   - "parent"