Report: data, figures desc

Change-Id: I6751b6ae833610456e1dea938d5262c28b93439d
Signed-off-by: Tibor Frank <tifrank@cisco.com>
(cherry picked from commit f56e629f1628f938b2a6e1bf27a74375ca3839cf)

8 files changed, 78 insertions, 75 deletions

diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif.rst
index c95b3f57ee..f2c8323d49 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif.rst
@@ -31,6 +31,9 @@ NIC 10ge2p1x520
             \label{fig:10ge2p1x520-64B-container-memif-tsa-ndrdisc}
     \end{figure}
 
+*Figure 1. Throughput Speedup Analysis - Multi-Core Speedup Ratio - Normalized
+NDR Throughput for Phy-to-Phy L2 Ethernet Switching (base).*
+
 CSIT source code for the test cases used for above plots can be found in CSIT
 git repository:
 
@@ -46,9 +49,6 @@ git repository:
       $ cd tests/vpp/perf/container_memif
       $ grep -E "64B-(1t1c|2t2c|4t4c)-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn)-.*ndrdisc" *
 
-*Figure 1. Throughput Speedup Analysis - Multi-Core Speedup Ratio - Normalized
-NDR Throughput for Phy-to-Phy L2 Ethernet Switching (base).*
-
 PDR Throughput
 --------------
 
@@ -71,6 +71,9 @@ NIC 10ge2p1x520
             \label{fig:10ge2p1x520-64B-container-memif-tsa-pdrdisc}
     \end{figure}
 
+*Figure 2. Throughput Speedup Analysis - Multi-Core Speedup Ratio - Normalized
+PDR Throughput for Phy-to-Phy L2 Ethernet Switching (base).*
+
 CSIT source code for the test cases used for above plots can be found in CSIT
 git repository:
 
@@ -85,6 +88,3 @@ git repository:
 
       $ cd tests/vpp/perf/container_memif
       $ grep -E "64B-(1t1c|2t2c|4t4c)-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn)-.*pdrdisc" *
-
-*Figure 2. Throughput Speedup Analysis - Multi-Core Speedup Ratio - Normalized
-PDR Throughput for Phy-to-Phy L2 Ethernet Switching (base).*
\ No newline at end of file
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4.rst
index af9bd255be..5f2e7d2824 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4.rst
@@ -31,6 +31,9 @@ NIC 10ge2p1x520
             \label{fig:10ge2p1x520-64B-ip4-tsa-ndrdisc}
     \end{figure}
 
+*Figure 1. Throughput Speedup Analysis - Multi-Core Speedup Ratio - Normalized
+NDR Throughput for Phy-to-Phy IPv4 Routed-Forwarding.*
+
 CSIT source code for the test cases used for above plots can be found in CSIT
 git repository:
 
@@ -46,9 +49,6 @@ git repository:
       $ cd tests/vpp/perf/ip4
       $ grep -E '64B-(1t1c|2t2c|4t4c)-ethip4-ip4(base|scale[a-z0-9]*)*-ndrdisc' 10ge2p1x520*
 
-*Figure 1. Throughput Speedup Analysis - Multi-Core Speedup Ratio - Normalized
-NDR Throughput for Phy-to-Phy IPv4 Routed-Forwarding.*
-
 NIC 40ge2p1xl710
 ~~~~~~~~~~~~~~~~
 
@@ -65,6 +65,9 @@ NIC 40ge2p1xl710
             \label{fig:40ge2p1xl710-64B-ip4-tsa-ndrdisc}
     \end{figure}
 
+*Figure 2. Throughput Speedup Analysis - Multi-Core Speedup Ratio - Normalized
+NDR Throughput for Phy-to-Phy IPv4 Routed-Forwarding.*
+
 CSIT source code for the test cases used for above plots can be found in CSIT
 git repository:
 
@@ -80,9 +83,6 @@ git repository:
       $ cd tests/vpp/perf/ip4
       $ grep -P '64B-(1t1c|2t2c|4t4c)-ethip4-ip4(base|scale[a-z0-9]*)*-ndrdisc' 40ge2p1xl710*
 
-*Figure 2. Throughput Speedup Analysis - Multi-Core Speedup Ratio - Normalized
-NDR Throughput for Phy-to-Phy IPv4 Routed-Forwarding.*
-
 PDR Throughput
 --------------
 
@@ -106,6 +106,9 @@ NIC 10ge2p1x520
             \label{fig:10ge2p1x520-64B-ip4-tsa-pdrdisc}
     \end{figure}
 
+*Figure 3. Throughput Speedup Analysis - Multi-Core Speedup Ratio - Normalized
+PDR Throughput for Phy-to-Phy IPv4 Routed-Forwarding.*
+
 CSIT source code for the test cases used for above plots can be found in CSIT
 git repository:
 
@@ -120,6 +123,3 @@ git repository:
 
       $ cd tests/vpp/perf/ip4
       $ grep -E '64B-(1t1c|2t2c|4t4c)-ethip4-ip4(base|scale[a-z0-9]*)*-ndrdisc' 10ge2p1x520*
-
-*Figure 3. Throughput Speedup Analysis - Multi-Core Speedup Ratio - Normalized
-PDR Throughput for Phy-to-Phy IPv4 Routed-Forwarding.*
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4_tunnels.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4_tunnels.rst
index 222046e4c2..4b4777cd68 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4_tunnels.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4_tunnels.rst
@@ -31,6 +31,9 @@ NIC 10ge2p1x520
             \label{fig:10ge2p1x520-64B-ethip4-tsa-ndrdisc}
     \end{figure}
 
+*Figure 1. Throughput Speedup Analysis - Multi-Core Speedup Ratio - Normalized
+NDR Throughput for Phy-to-Phy IPv4 Overlay Tunnels.*
+
 CSIT source code for the test cases used for above plots can be found in CSIT
 git repository:
 
@@ -46,9 +49,6 @@ git repository:
       $ cd tests/vpp/perf/ip4_tunnels
       $ grep -E "64B-(1t1c|2t2c|4t4c)-ethip4[a-z0-9]+-[a-z0-9]*-ndrdisc" *
 
-*Figure 1. Throughput Speedup Analysis - Multi-Core Speedup Ratio - Normalized
-NDR Throughput for Phy-to-Phy IPv4 Overlay Tunnels.*
-
 PDR Throughput
 --------------
 
@@ -71,6 +71,9 @@ NIC 10ge2p1x520
             \label{fig:10ge2p1x520-64B-ethip4-tsa-pdrdisc}
     \end{figure}
 
+*Figure 2. Throughput Speedup Analysis - Multi-Core Speedup Ratio - Normalized
+PDR Throughput for Phy-to-Phy IPv4 Overlay Tunnels.*
+
 CSIT source code for the test cases used for above plots can be found in CSIT
 git repository:
 
@@ -85,6 +88,3 @@ git repository:
 
       $ cd tests/vpp/perf/ip4_tunnels
       $ grep -E "64B-(1t1c|2t2c|4t4c)-ethip4[a-z0-9]+-[a-z0-9]*-pdrdisc" *
-
-*Figure 2. Throughput Speedup Analysis - Multi-Core Speedup Ratio - Normalized
-PDR Throughput for Phy-to-Phy IPv4 Overlay Tunnels.*
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6.rst
index 077b330652..d17f76da24 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6.rst
@@ -32,6 +32,9 @@ NIC 10ge2p1x520
             \label{fig:10ge2p1x520-78B-ip6-tsa-ndrdisc}
     \end{figure}
 
+*Figure 1. Throughput Speedup Analysis - Multi-Core Speedup Ratio - Normalized
+NDR Throughput for Phy-to-Phy IPv6 Routed-Forwarding.*
+
 CSIT source code for the test cases used for above plots can be found in CSIT
 git repository:
 
@@ -47,9 +50,6 @@ git repository:
       $ cd tests/vpp/perf/ip6
       $ grep -E '78B-(1t1c|2t2c|4t4c)-ethip6-ip6(base|scale[a-z0-9]*)*-ndrdisc' 10ge2p1x520*
 
-*Figure 1. Throughput Speedup Analysis - Multi-Core Speedup Ratio - Normalized
-NDR Throughput for Phy-to-Phy IPv6 Routed-Forwarding.*
-
 NIC 40ge2p1xl710
 ~~~~~~~~~~~~~~~~
 
@@ -66,6 +66,9 @@ NIC 40ge2p1xl710
             \label{fig:40ge2p1xl710-78B-ip6-tsa-ndrdisc}
     \end{figure}
 
+*Figure 2. Throughput Speedup Analysis - Multi-Core Speedup Ratio - Normalized
+NDR Throughput for Phy-to-Phy IPv6 Routed-Forwarding.*
+
 CSIT source code for the test cases used for above plots can be found in CSIT
 git repository:
 
@@ -81,9 +84,6 @@ git repository:
       $ cd tests/vpp/perf/ip6
       $ grep -E '78B-(1t1c|2t2c|4t4c)-ethip6-ip6(base|scale[a-z0-9]*)*-ndrdisc' 40ge2p1xl710*
 
-*Figure 2. Throughput Speedup Analysis - Multi-Core Speedup Ratio - Normalized
-NDR Throughput for Phy-to-Phy IPv6 Routed-Forwarding.*
-
 PDR Throughput
 --------------
 
@@ -107,6 +107,9 @@ NIC 10ge2p1x520
             \label{fig:10ge2p1x520-78B-ip6-tsa-pdrdisc}
     \end{figure}
 
+*Figure 3. Throughput Speedup Analysis - Multi-Core Speedup Ratio - Normalized
+PDR Throughput for Phy-to-Phy IPv6 Routed-Forwarding.*
+
 CSIT source code for the test cases used for above plots can be found in CSIT
 git repository:
 
@@ -121,6 +124,3 @@ git repository:
 
       $ cd tests/vpp/perf/ip6
       $ grep -E '78B-(1t1c|2t2c|4t4c)-ethip6-ip6(base|scale[a-z0-9]*)*-pdrdisc' 10ge2p1x520*
-
-*Figure 3. Throughput Speedup Analysis - Multi-Core Speedup Ratio - Normalized
-PDR Throughput for Phy-to-Phy IPv6 Routed-Forwarding.*
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6_tunnels.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6_tunnels.rst
index eec062faef..8438aa748d 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6_tunnels.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6_tunnels.rst
@@ -31,6 +31,9 @@ NIC 10ge2p1x520
             \label{fig:10ge2p1x520-78B-ethip6-tsa-ndrdisc}
     \end{figure}
 
+*Figure 1. Throughput Speedup Analysis - Multi-Core Speedup Ratio - Normalized
+NDR Throughput for Phy-to-Phy IPv6 Overlay Tunnels.*
+
 CSIT source code for the test cases used for above plots can be found in CSIT
 git repository:
 
@@ -46,9 +49,6 @@ git repository:
       $ cd tests/vpp/perf/ip6_tunnels
       $ grep -E "78B-(1t1c|2t2c|4t4c)-ethip6[a-z0-9]+-[a-z0-9]*-ndrdisc" *
 
-*Figure 1. Throughput Speedup Analysis - Multi-Core Speedup Ratio - Normalized
-NDR Throughput for Phy-to-Phy IPv6 Overlay Tunnels.*
-
 PDR Throughput
 --------------
 
@@ -71,6 +71,9 @@ NIC 10ge2p1x520
             \label{fig:10ge2p1x520-78B-ethip6-tsa-pdrdisc}
     \end{figure}
 
+*Figure 2. Throughput Speedup Analysis - Multi-Core Speedup Ratio - Normalized
+PDR Throughput for Phy-to-Phy IPv6 Overlay Tunnels.*
+
 CSIT source code for the test cases used for above plots can be found in CSIT
 git repository:
 
@@ -85,6 +88,3 @@ git repository:
 
       $ cd tests/vpp/perf/ip6_tunnels
       $ grep -E "78B-(1t1c|2t2c|4t4c)-ethip6[a-z0-9]+-[a-z0-9]*-pdrdisc" *
-
-*Figure 2. Throughput Speedup Analysis - Multi-Core Speedup Ratio - Normalized
-PDR Throughput for Phy-to-Phy IPv6 Overlay Tunnels.*
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ipsec.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ipsec.rst
index 678e00fec5..da260d009a 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ipsec.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ipsec.rst
@@ -33,6 +33,9 @@ NIC 40ge2p1xl710
             \label{fig:40ge2p1xl710-64B-ipsechw-tsa-ndrdisc}
     \end{figure}
 
+*Figure 1. Throughput Speedup Analysis - Multi-Core Speedup Ratio - Normalized
+NDR Throughput for Phy-to-Phy IPSEC HW.*
+
 CSIT source code for the test cases used for above plots can be found in CSIT
 git repository:
 
@@ -48,9 +51,6 @@ git repository:
       $ cd tests/vpp/perf/crypto
       $ grep -E "64B-(1t1c|2t2c|4t4c)-.*ipsec.*-ndrdisc" *
 
-*Figure 1. Throughput Speedup Analysis - Multi-Core Speedup Ratio - Normalized
-NDR Throughput for Phy-to-Phy IPSEC HW.*
-
 PDR Throughput
 --------------
 
@@ -76,6 +76,9 @@ in the graph below. PDR measured for 0.5% packet loss ratio.
             \label{fig:40ge2p1xl710-64B-ipsechw-tsa-pdrdisc}
     \end{figure}
 
+*Figure 2. Throughput Speedup Analysis - Multi-Core Speedup Ratio - Normalized
+PDR Throughput for Phy-to-Phy IPSEC HW.*
+
 CSIT source code for the test cases used for above plots can be found in CSIT
 git repository:
 
@@ -90,6 +93,3 @@ git repository:
 
       $ cd tests/vpp/perf/crypto
       $ grep -E "64B-(1t1c|2t2c|4t4c)-.*ipsec.*-pdrdisc" *
-
-*Figure 2. Throughput Speedup Analysis - Multi-Core Speedup Ratio - Normalized
-PDR Throughput for Phy-to-Phy IPSEC HW.*
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2.rst
index 2df3fb6229..f898534626 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2.rst
@@ -31,6 +31,9 @@ NIC 10ge2p1x520
             \label{fig:10ge2p1x520-64B-l2-tsa-ndrdisc}
     \end{figure}
 
+*Figure 1. Throughput Speedup Analysis - Multi-Core Speedup Ratio - Normalized
+NDR Throughput for Phy-to-Phy L2 Ethernet Switching.*
+
 CSIT source code for the test cases used for above plots can be found in CSIT
 git repository:
 
@@ -45,9 +48,6 @@ git repository:
 
       $ grep -E "64B-(1t1c|2t2c|4t4c)-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn|l2bdscale.*|l2dbscale.*)-(eth.*)*ndrdisc" tests/vpp/perf/l2/10ge2p1x520*
 
-*Figure 1. Throughput Speedup Analysis - Multi-Core Speedup Ratio - Normalized
-NDR Throughput for Phy-to-Phy L2 Ethernet Switching.*
-
 NIC 40ge2p1xl710
 ~~~~~~~~~~~~~~~~
 
@@ -64,6 +64,9 @@ NIC 40ge2p1xl710
             \label{fig:40ge2p1xl710-64B-l2-tsa-ndrdisc}
     \end{figure}
 
+*Figure 2. Throughput Speedup Analysis - Multi-Core Speedup Ratio - Normalized
+NDR Throughput for Phy-to-Phy L2 Ethernet Switching.*
+
 CSIT source code for the test cases used for above plots can be found in CSIT
 git repository:
 
@@ -78,9 +81,6 @@ git repository:
 
       $ grep -E "64B-(1t1c|2t2c|4t4c)-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn|l2bdscale.*|l2dbscale.*)-(eth.*)*ndrdisc" tests/vpp/perf/l2/40ge2p1xl710*
 
-*Figure 2. Throughput Speedup Analysis - Multi-Core Speedup Ratio - Normalized
-NDR Throughput for Phy-to-Phy L2 Ethernet Switching.*
-
 PDR Throughput
 --------------
 
@@ -104,6 +104,9 @@ NIC 10ge2p1x520
             \label{fig:10ge2p1x520-64B-l2-tsa-pdrdisc}
     \end{figure}
 
+*Figure 3. Throughput Speedup Analysis - Multi-Core Speedup Ratio - Normalized
+PDR Throughput for Phy-to-Phy L2 Ethernet Switching.*
+
 CSIT source code for the test cases used for above plots can be found in CSIT
 git repository:
 
@@ -117,6 +120,3 @@ git repository:
    .. code-block:: bash
 
       $ grep -E "64B-(1t1c|2t2c|4t4c)-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn|l2bdscale.*|l2dbscale.*)-(eth.*)*pdrdisc" tests/vpp/perf/l2/10ge2p1x520*
-
-*Figure 3. Throughput Speedup Analysis - Multi-Core Speedup Ratio - Normalized
-PDR Throughput for Phy-to-Phy L2 Ethernet Switching.*
diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml
index e4bf1893d8..a0fe4bcd10 100644
--- a/resources/tools/presentation/specification.yaml
+++ b/resources/tools/presentation/specification.yaml
@@ -96,18 +96,17 @@
   data-sets:
     plot-vpp-http-server-performance:
 # TODO: Add the data sources
-      csit-vpp-perf-1801-all:
-      - 157
-      - 158
-      - 159
-      - 160
-      - 161
-      - 164
-      - 165
-      - 166
-      - 168
-      - 169
-      - 170
+      csit-vpp-perf-1804-all:
+      - 39  # wrk
+      - 40  # wrk
+      - 41  # wrk
+      - 42  # wrk
+      - 43  # wrk
+      - 44  # wrk
+      - 45  # wrk
+      - 46  # wrk
+      - 47  # wrk
+      - 48  # wrk
 # TODO: Add the data sources
 #    vpp-meltdown-impact:
 #      csit-vpp-perf-1707-all:
@@ -213,6 +212,8 @@
       - 10  # sel
       - 11  # sel
       - 12  # sel
+      - 13  # sel
+      - 14  # sel
 #    performance-improvements:
 #      csit-vpp-perf-1707-all:
 #      - 9
@@ -326,6 +327,8 @@
       - 10  # sel
       - 11  # sel
       - 12  # sel
+      - 13  # sel
+      - 14  # sel
 
   plot-layouts:
 
@@ -612,20 +615,9 @@
     - 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
@@ -642,6 +634,16 @@
     - 30  # sel
     - 31  # sel
     - 35  # sel
+    - 39  # wrk
+    - 40  # wrk
+    - 41  # wrk
+    - 42  # wrk
+    - 43  # wrk
+    - 44  # wrk
+    - 45  # wrk
+    - 46  # wrk
+    - 47  # wrk
+    - 48  # wrk
     csit-vpp-perf-check-1801:
     - 3   # mrr
     - 4   # mrr
@@ -697,6 +699,8 @@
     - 10  # sel
     - 11  # sel
     - 12  # sel
+    - 13  # sel
+    - 14  # sel
     csit-dpdk-perf-1804-all:
     - 4
     - 5
@@ -884,7 +888,6 @@
     title: "Release 1804"
     data:
       csit-vpp-perf-check-1804:
-      - 5   # mrr - full
       - 6   # mrr - sel
       - 7   # mrr - sel
       - 8   # mrr - sel