X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=docs%2Freport%2Fvpp_performance_tests%2Fpacket_latency_graphs%2Fip6_tunnels.rst;h=a193e7913a8548dab365d69bcfc90c62995dffc6;hp=07f4884fac781f1625b87373536f3088ca2cc082;hb=8243ea78854683f2f80da53d8f197f10316e4801;hpb=eecad36d7d2275fa47fbcab40dbcf56108ab0a51

diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/ip6_tunnels.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/ip6_tunnels.rst
index 07f4884fac..a193e7913a 100644
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/ip6_tunnels.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/ip6_tunnels.rst
@@ -1,73 +1,98 @@
-IPv6 Overlay Tunnels
-====================
 
-This section includes summary graphs of VPP Phy-to-Phy packet latency
-with IPv6 Overlay Tunnels measured at 50% of discovered NDR throughput
-rate. Latency is reported for VPP running in multiple configurations of
-VPP worker thread(s), a.k.a. VPP data plane thread(s), and their
-physical CPU core(s) placement.
+.. raw:: latex
 
-VPP packet latency in 1t1c setup (1thread, 1core) is presented in the graph below.
+    \clearpage
 
 .. raw:: html
 
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/78B-1t1c-ethip6-ndrdisc-lat50.html"></iframe>
+    <script type="text/javascript">
 
-.. raw:: latex
+        function getDocHeight(doc) {
+            doc = doc || document;
+            var body = doc.body, html = doc.documentElement;
+            var height = Math.max( body.scrollHeight, body.offsetHeight,
+                html.clientHeight, html.scrollHeight, html.offsetHeight );
+            return height;
+        }
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{78B-1t1c-ethip6-ndrdisc-lat50}
-            \label{fig:78B-1t1c-ethip6-ndrdisc-lat50}
-    \end{figure}
+        function setIframeHeight(id) {
+            var ifrm = document.getElementById(id);
+            var doc = ifrm.contentDocument? ifrm.contentDocument:
+                ifrm.contentWindow.document;
+            ifrm.style.visibility = 'hidden';
+            ifrm.style.height = "10px"; // reset to minimal height ...
+            // IE opt. for bing/msn needs a bit added or scrollbar appears
+            ifrm.style.height = getDocHeight( doc ) + 4 + "px";
+            ifrm.style.visibility = 'visible';
+        }
 
-*Figure 1. VPP 1thread 1core - packet latency for Phy-to-Phy IPv6 Overlay Tunnels.*
+    </script>
 
-CSIT source code for the test cases used for above plots can be found in CSIT
-git repository:
+IPv6 Tunnels
+============
+
+This section includes summary graphs of VPP Phy-to-Phy packet latency
+with IPv6 Overlay Tunnels measured at 100% of discovered NDR throughput
+rate. Latency is reported for VPP running in multiple configurations of
+VPP worker thread(s), a.k.a. VPP data plane thread(s), and their
+physical CPU core(s) placement.
 
-.. only:: html
+CSIT source code for the test cases used for plots can be found in
+`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/ip6_tunnels?h=rls1810>`_.
 
-   .. program-output:: cd ../../../../../ && set -x && cd tests/vpp/perf/ip6_tunnels && grep -E "78B-1t1c-ethip6[a-z0-9]+-[a-z0-9]*-ndrdisc" *
-      :shell:
+3n-hsw-x520
+~~~~~~~~~~~
 
-.. only:: latex
+78b-1t1c-base_and_scale
+-----------------------
 
-   .. code-block:: bash
+.. raw:: html
 
-      $ cd tests/vpp/perf/ip6_tunnels
-      $ grep -E "78B-1t1c-ethip6[a-z0-9]+-[a-z0-9]*-ndrdisc" *
+    <center><b>
 
-VPP packet latency in 2t2c setup (2thread, 2core) is presented in the graph below.
+:index:`Packet Latency: ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-ndr`
 
 .. raw:: html
 
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/78B-2t2c-ethip6-ndrdisc-lat50.html"></iframe>
+    </b>
+    <iframe id="ifrm01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-ndr-lat.html"></iframe>
+    <p><br><br></p>
+    </center>
 
 .. raw:: latex
 
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{78B-2t2c-ethip6-ndrdisc-lat50}
-            \label{fig:78B-2t2c-ethip6-ndrdisc-lat50}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-ndr-lat}
+            \label{fig:ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-ndr-lat}
     \end{figure}
 
-*Figure 2. VPP 2threads 2cores - packet latency for Phy-to-Phy IPv6 Overlay Tunnels.*
+.. raw:: latex
 
-CSIT source code for the test cases used for above plots can be found in CSIT
-git repository:
+    \clearpage
 
-.. only:: html
+78b-2t2c-base_and_scale
+-----------------------
 
-   .. program-output:: cd ../../../../../ && set -x && cd tests/vpp/perf/ip6_tunnels && grep -E "78B-2t2c-ethip6[a-z0-9]+-[a-z0-9]*-ndrdisc" *
-      :shell:
+.. raw:: html
+
+    <center><b>
 
-.. only:: latex
+:index:`Packet Latency: ip6tun-3n-hsw-x520-78b-2t2c-base_and_scale-ndr`
 
-   .. code-block:: bash
+.. raw:: html
 
-      $ cd tests/vpp/perf/ip6_tunnels
-      $ grep -E "78B-2t2c-ethip6[a-z0-9]+-[a-z0-9]*-ndrdisc" *
+    </b>
+    <iframe id="ifrm02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6tun-3n-hsw-x520-78b-2t2c-base_and_scale-ndr-lat.html"></iframe>
+    <p><br><br></p>
+    </center>
 
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip6tun-3n-hsw-x520-78b-2t2c-base_and_scale-ndr-lat}
+            \label{fig:ip6tun-3n-hsw-x520-78b-2t2c-base_and_scale-ndr-lat}
+    \end{figure}