X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=docs%2Freport%2Fvpp_performance_tests%2Fpacket_throughput_graphs%2Fipsec.rst;h=31420b6845df01182fb33b09c71c75dba64ceda5;hb=e0806c8358f38406432d1c6f09de7b90fadb8646;hp=a84773ac5924527fa0283f6a2159237362fa0b96;hpb=43480e631defcb2fa40cc35e48ee40ce31b1dd68;p=csit.git

diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec.rst
index a84773ac59..31420b6845 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec.rst
@@ -1,3 +1,33 @@
+
+.. 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>
+
 IPSec IPv4 Routing
 ==================
 
@@ -11,24 +41,83 @@ VPP worker thread(s), a.k.a. VPP data plane thread(s), and their
 physical CPU core(s) placement.
 
 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/crypto?h=rls1807>`_.
+`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/crypto?h=rls1810>`_.
+
+.. raw:: latex
+
+    \clearpage
 
 3n-hsw-xl710
 ~~~~~~~~~~~~
 
-64b-1t1c-base_and_scale
------------------------
+64b-1t1c-base
+-------------
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Packet Throughput: ipsec-3n-hsw-xl710-64b-1t1c-base-ndr`
+
+.. raw:: html
+
+    </b>
+    <iframe id="ifrm01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-3n-hsw-xl710-64b-1t1c-base-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]{ipsec-3n-hsw-xl710-64b-1t1c-base-ndr}
+            \label{fig:ipsec-3n-hsw-xl710-64b-1t1c-base-ndr}
+    \end{figure}
+
+.. raw:: html
+
+    <center><b>
+
+.. raw:: latex
+
+    \clearpage
+
+:index:`Packet Throughput: ipsec-3n-hsw-xl710-64b-1t1c-base-pdr`
+
+.. raw:: html
+
+    </b>
+    <iframe id="ifrm02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-3n-hsw-xl710-64b-1t1c-base-pdr.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]{ipsec-3n-hsw-xl710-64b-1t1c-base-pdr}
+            \label{fig:ipsec-3n-hsw-xl710-64b-1t1c-base-pdr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+64b-2t2c-base
+-------------
 
 .. raw:: html
 
     <center><b>
 
-:index:`Throughput: ipsec-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr`
+:index:`Packet Throughput: ipsec-3n-hsw-xl710-64b-2t2c-base-ndr`
 
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr.html"></iframe>
+    <iframe id="ifrm03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-3n-hsw-xl710-64b-2t2c-base-ndr.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -37,20 +126,24 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ipsec-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr}
-            \label{fig:ipsec-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ipsec-3n-hsw-xl710-64b-2t2c-base-ndr}
+            \label{fig:ipsec-3n-hsw-xl710-64b-2t2c-base-ndr}
     \end{figure}
 
 .. raw:: html
 
     <center><b>
 
-:index:`Throughput: ipsec-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr`
+.. raw:: latex
+
+    \clearpage
+
+:index:`Packet Throughput: ipsec-3n-hsw-xl710-64b-2t2c-base-pdr`
 
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr.html"></iframe>
+    <iframe id="ifrm04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-3n-hsw-xl710-64b-2t2c-base-pdr.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -59,23 +152,53 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ipsec-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr}
-            \label{fig:ipsec-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ipsec-3n-hsw-xl710-64b-2t2c-base-pdr}
+            \label{fig:ipsec-3n-hsw-xl710-64b-2t2c-base-pdr}
     \end{figure}
 
-64b-2t2c-base_and_scale
------------------------
+.. raw:: latex
+
+    \clearpage
+
+64b-1t1c-scale
+--------------
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Packet Throughput: ipsec-3n-hsw-xl710-64b-1t1c-scale-ndr`
+
+.. raw:: html
+
+    </b>
+    <iframe id="ifrm05" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-3n-hsw-xl710-64b-1t1c-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]{ipsec-3n-hsw-xl710-64b-1t1c-scale-ndr}
+            \label{fig:ipsec-3n-hsw-xl710-64b-1t1c-scale-ndr}
+    \end{figure}
 
 .. raw:: html
 
     <center><b>
 
-:index:`Throughput: ipsec-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr`
+.. raw:: latex
+
+    \clearpage
+
+:index:`Packet Throughput: ipsec-3n-hsw-xl710-64b-1t1c-scale-pdr`
 
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr.html"></iframe>
+    <iframe id="ifrm06" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-3n-hsw-xl710-64b-1t1c-scale-pdr.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -84,20 +207,163 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ipsec-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr}
-            \label{fig:ipsec-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ipsec-3n-hsw-xl710-64b-1t1c-scale-pdr}
+            \label{fig:ipsec-3n-hsw-xl710-64b-1t1c-scale-pdr}
     \end{figure}
 
+.. raw:: latex
+
+    \clearpage
+
+64b-2t2c-scale
+--------------
+
 .. raw:: html
 
     <center><b>
 
-:index:`Throughput: ipsec-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr`
+:index:`Packet Throughput: ipsec-3n-hsw-xl710-64b-2t2c-scale-ndr`
+
+.. raw:: html
+
+    </b>
+    <iframe id="ifrm07" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-3n-hsw-xl710-64b-2t2c-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]{ipsec-3n-hsw-xl710-64b-2t2c-scale-ndr}
+            \label{fig:ipsec-3n-hsw-xl710-64b-2t2c-scale-ndr}
+    \end{figure}
+
+.. raw:: html
+
+    <center><b>
+
+.. raw:: latex
+
+    \clearpage
+
+:index:`Packet Throughput: ipsec-3n-hsw-xl710-64b-2t2c-scale-pdr`
+
+.. raw:: html
+
+    </b>
+    <iframe id="ifrm08" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-3n-hsw-xl710-64b-2t2c-scale-pdr.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]{ipsec-3n-hsw-xl710-64b-2t2c-scale-pdr}
+            \label{fig:ipsec-3n-hsw-xl710-64b-2t2c-scale-pdr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+64b-1t1c-sw
+-----------
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Packet Throughput: ipsec-3n-hsw-xl710-64b-1t1c-sw-ndr`
+
+.. raw:: html
+
+    </b>
+    <iframe id="ifrm09" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-3n-hsw-xl710-64b-1t1c-sw-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]{ipsec-3n-hsw-xl710-64b-1t1c-sw-ndr}
+            \label{fig:ipsec-3n-hsw-xl710-64b-1t1c-sw-ndr}
+    \end{figure}
+
+.. raw:: html
+
+    <center><b>
+
+.. raw:: latex
+
+    \clearpage
+
+:index:`Packet Throughput: ipsec-3n-hsw-xl710-64b-1t1c-sw-pdr`
+
+.. raw:: html
+
+    </b>
+    <iframe id="ifrm10" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-3n-hsw-xl710-64b-1t1c-sw-pdr.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]{ipsec-3n-hsw-xl710-64b-1t1c-sw-pdr}
+            \label{fig:ipsec-3n-hsw-xl710-64b-1t1c-sw-pdr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+64b-2t2c-sw
+-----------
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Packet Throughput: ipsec-3n-hsw-xl710-64b-2t2c-sw-ndr`
+
+.. raw:: html
+
+    </b>
+    <iframe id="ifrm11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-3n-hsw-xl710-64b-2t2c-sw-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]{ipsec-3n-hsw-xl710-64b-2t2c-sw-ndr}
+            \label{fig:ipsec-3n-hsw-xl710-64b-2t2c-sw-ndr}
+    \end{figure}
+
+.. raw:: html
+
+    <center><b>
+
+.. raw:: latex
+
+    \clearpage
+
+:index:`Packet Throughput: ipsec-3n-hsw-xl710-64b-2t2c-sw-pdr`
 
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr.html"></iframe>
+    <iframe id="ifrm12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-3n-hsw-xl710-64b-2t2c-sw-pdr.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -106,6 +372,6 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ipsec-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr}
-            \label{fig:ipsec-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ipsec-3n-hsw-xl710-64b-2t2c-sw-pdr}
+            \label{fig:ipsec-3n-hsw-xl710-64b-2t2c-sw-pdr}
     \end{figure}