X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=docs%2Freport%2Fvpp_performance_tests%2Fpacket_throughput_graphs%2Fip6_tunnels.rst;h=cfd1be7eec0c52439ee113792bb24c229d0137a8;hb=e0806c8358f38406432d1c6f09de7b90fadb8646;hp=b54bdfeccdf75472a70c6c6c3dbb6b66ab996f52;hpb=d9a08e59581aafe44d446b5bc1ce6ff86b2b173b;p=csit.git

diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6_tunnels.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6_tunnels.rst
index b54bdfeccd..cfd1be7eec 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6_tunnels.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6_tunnels.rst
@@ -1,5 +1,35 @@
-IPv6 Overlay Tunnels
-====================
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <script type="text/javascript">
+
+        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;
+        }
+
+        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';
+        }
+
+    </script>
+
+IPv6 Tunnels
+============
 
 Following sections include summary graphs of VPP Phy-to-Phy performance
 with IPv6 Overlay Tunnels, including NDR throughput (zero packet loss)
@@ -7,92 +37,118 @@ and PDR throughput (<0.5% packet loss). Performance 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.
 
-NDR Throughput
-~~~~~~~~~~~~~~
+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>`_.
 
-VPP NDR 78B packet throughput in 1t1c setup (1thread, 1core) is presented
-in the graph below.
+.. raw:: latex
 
-.. raw:: html
+    \clearpage
 
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/78B-1t1c-ethip6-ndrdisc.html"></iframe>
+3n-hsw-x520
+~~~~~~~~~~~
 
-*Figure 1. VPP 1thread 1core - NDR Throughput for Phy-to-Phy IPv6 Overlay
-Tunnels.*
+78b-1t1c-base_and_scale
+-----------------------
 
-CSIT source code for the test cases used for above plots can be found in CSIT
-git repository:
+.. raw:: html
 
-.. code-block:: bash
+    <center><b>
 
-    $ cd $CSIT/tests/vpp/perf/ip6_tunnels
-    $ grep -E "78B-1t1c-ethip6[a-z0-9]+-[a-z0-9]*-ndrdisc" *
+:index:`Packet Throughput: ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-ndr`
 
-    10ge2p1x520-ethip6lispip4-ip6base-ndrdisc.robot:| tc01-78B-1t1c-ethip6lispip4-ip6base-ndrdisc
-    10ge2p1x520-ethip6lispip6-ip6base-ndrdisc.robot:| tc01-78B-1t1c-ethip6lispip6-ip6base-ndrdisc
+.. raw:: html
 
-VPP NDR 78B packet throughput in 2t2c setup (2thread, 2core) is presented
-in the graph below.
+    </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.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-1t1c-base_and_scale-ndr}
+            \label{fig:ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-ndr}
+    \end{figure}
 
 .. raw:: html
 
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/78B-2t2c-ethip6-ndrdisc.html"></iframe>
+    <center><b>
 
-*Figure 2. VPP 2threads 2cores - NDR Throughput 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
 
-.. code-block:: bash
+:index:`Packet Throughput: ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-pdr`
 
-    $ cd $CSIT/tests/vpp/perf/ip6_tunnels
-    $ grep -E "78B-2t2c-ethip6[a-z0-9]+-[a-z0-9]*-ndrdisc" *
+.. raw:: html
 
-    10ge2p1x520-ethip6lispip4-ip6base-ndrdisc.robot:| tc07-78B-2t2c-ethip6lispip4-ip6base-ndrdisc
-    10ge2p1x520-ethip6lispip6-ip6base-ndrdisc.robot:| tc07-78B-2t2c-ethip6lispip6-ip6base-ndrdisc
+    </b>
+    <iframe id="ifrm02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-pdr.html"></iframe>
+    <p><br><br></p>
+    </center>
 
-PDR Throughput
-~~~~~~~~~~~~~~
+.. raw:: latex
 
-VPP PDR 78B packet throughput in 1t1c setup (1thread, 1core) is presented
-in the graph below. PDR measured for 0.5% packet loss ratio.
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-pdr}
+            \label{fig:ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-pdr}
+    \end{figure}
 
-.. raw:: html
+.. raw:: latex
 
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/78B-1t1c-ethip6-pdrdisc.html"></iframe>
+    \clearpage
 
-*Figure 3. VPP 1thread 1core - PDR Throughput for Phy-to-Phy IPv6 Overlay
-Tunnels.*
+78b-2t2c-base_and_scale
+-----------------------
 
-CSIT source code for the test cases used for above plots can be found in CSIT
-git repository:
+.. raw:: html
 
-.. code-block:: bash
+    <center><b>
 
-    $ cd $CSIT/tests/vpp/perf/ip6_tunnels
-    $ grep -E "78B-1t1c-ethip6[a-z0-9]+-[a-z0-9]*-pdrdisc" *
+:index:`Packet Throughput: ip6tun-3n-hsw-x520-78b-2t2c-base_and_scale-ndr`
 
-    10ge2p1x520-ethip6lispip4-ip6base-ndrdisc.robot:| tc02-78B-1t1c-ethip6lispip4-ip6base-pdrdisc
-    10ge2p1x520-ethip6lispip6-ip6base-ndrdisc.robot:| tc02-78B-1t1c-ethip6lispip6-ip6base-pdrdisc
+.. raw:: html
 
-VPP PDR 78B packet throughput in 2t2c setup (2thread, 2core) is presented
-in the graph below. PDR measured for 0.5% packet loss ratio.
+    </b>
+    <iframe id="ifrm03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6tun-3n-hsw-x520-78b-2t2c-base_and_scale-ndr.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}
+            \label{fig:ip6tun-3n-hsw-x520-78b-2t2c-base_and_scale-ndr}
+    \end{figure}
 
 .. raw:: html
 
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/78B-2t2c-ethip6-pdrdisc.html"></iframe>
+    <center><b>
+
+.. raw:: latex
 
-*Figure 4. VPP 2thread 2core - PDR Throughput for Phy-to-Phy IPv6 Overlay
-Tunnels.*
+    \clearpage
 
-CSIT source code for the test cases used for above plots can be found in CSIT
-git repository:
+:index:`Packet Throughput: ip6tun-3n-hsw-x520-78b-2t2c-base_and_scale-pdr`
+
+.. raw:: html
 
-.. code-block:: bash
+    </b>
+    <iframe id="ifrm04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6tun-3n-hsw-x520-78b-2t2c-base_and_scale-pdr.html"></iframe>
+    <p><br><br></p>
+    </center>
 
-    $ cd $CSIT/tests/vpp/perf/ip6_tunnels
-    $ grep -E "78B-2t2c-ethip6[a-z0-9]+-[a-z0-9]*-pdrdisc" *
+.. raw:: latex
 
-    10ge2p1x520-ethip6lispip4-ip6base-ndrdisc.robot:| tc08-78B-2t2c-ethip6lispip4-ip6base-pdrdisc
-    10ge2p1x520-ethip6lispip6-ip6base-ndrdisc.robot:| tc08-78B-2t2c-ethip6lispip6-ip6base-pdrdisc
+    \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-pdr}
+            \label{fig:ip6tun-3n-hsw-x520-78b-2t2c-base_and_scale-pdr}
+    \end{figure}