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

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 b0fd17d644..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,5 +1,35 @@
-IPSec Crypto HW: IP4 Routed-Forwarding
-======================================
+
+.. 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
+==================
 
 Following sections include summary graphs of VPP Phy-to-Phy performance with
 IPSec encryption used in combination with IPv4 routed-forwarding,
@@ -10,140 +40,338 @@ 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/crypto?h=rls1810>`_.
+
+.. raw:: latex
+
+    \clearpage
+
+3n-hsw-xl710
+~~~~~~~~~~~~
+
+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:`Packet Throughput: ipsec-3n-hsw-xl710-64b-2t2c-base-ndr`
+
+.. raw:: html
+
+    </b>
+    <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>
+
+.. 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-base-ndr}
+            \label{fig:ipsec-3n-hsw-xl710-64b-2t2c-base-ndr}
+    \end{figure}
+
+.. raw:: html
+
+    <center><b>
+
+.. raw:: latex
+
+    \clearpage
+
+:index:`Packet Throughput: ipsec-3n-hsw-xl710-64b-2t2c-base-pdr`
+
+.. raw:: html
+
+    </b>
+    <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>
 
-VPP NDR 64B packet throughput in 1t1c setup (1thread, 1core) is presented
-in the graph below.
+.. 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-base-pdr}
+            \label{fig:ipsec-3n-hsw-xl710-64b-2t2c-base-pdr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+64b-1t1c-scale
+--------------
 
 .. raw:: html
 
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/64B-1t1c-ipsechw-ndrdisc.html"></iframe>
+    <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 8cm 5cm 0cm, width=0.70\textwidth]{64B-1t1c-ipsechw-ndrdisc}
-            \label{fig:64B-1t1c-ipsechw-ndrdisc}
+            \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}
 
-*Figure 1. VPP 1thread 1core - NDR Throughput for Phy-to-Phy IPSEC HW.*
+.. raw:: html
 
-CSIT source code for the test cases used for above plots can be found in CSIT
-git repository:
+    <center><b>
 
-.. only:: html
+.. raw:: latex
 
-   .. program-output:: cd ../../../../../ && set +x && cd tests/vpp/perf/crypto && grep -E "64B-1t1c-(ethip4ipsecbasetnl|ethip4ipsecscale1000tnl|ethip4ipsectptlispgpe)-.*-ndrdisc" *
-      :shell:
+    \clearpage
 
-.. only:: latex
+:index:`Packet Throughput: ipsec-3n-hsw-xl710-64b-1t1c-scale-pdr`
 
-   .. code-block:: bash
+.. raw:: html
 
-      $ cd tests/vpp/perf/crypto
-      $ grep -E "64B-1t1c-(ethip4ipsecbasetnl|ethip4ipsecscale1000tnl|ethip4ipsectptlispgpe)-.*-ndrdisc" *
+    </b>
+    <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>
 
-VPP NDR 64B packet throughput in 2t2c setup (2thread, 2core) is presented
-in the graph below.
+.. 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-pdr}
+            \label{fig:ipsec-3n-hsw-xl710-64b-1t1c-scale-pdr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+64b-2t2c-scale
+--------------
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Packet Throughput: ipsec-3n-hsw-xl710-64b-2t2c-scale-ndr`
 
 .. raw:: html
 
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/64B-2t2c-ipsechw-ndrdisc.html"></iframe>
+    </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 8cm 5cm 0cm, width=0.70\textwidth]{64B-2t2c-ipsechw-ndrdisc}
-            \label{fig:64B-2t2c-ipsechw-ndrdisc}
+            \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}
 
-*Figure 2. VPP 2threads 2cores - NDR Throughput for Phy-to-Phy IPSEC HW.*
+.. raw:: html
+
+    <center><b>
+
+.. raw:: latex
+
+    \clearpage
+
+:index:`Packet Throughput: ipsec-3n-hsw-xl710-64b-2t2c-scale-pdr`
 
-CSIT source code for the test cases used for above plots can be found in CSIT
-git repository:
+.. 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>
 
-.. only:: html
+.. 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}
 
-   .. program-output:: cd ../../../../../ && set +x && cd tests/vpp/perf/crypto && grep -E "64B-2t2c-(ethip4ipsecbasetnl|ethip4ipsecscale1000tnl|ethip4ipsectptlispgpe)-.*-ndrdisc" *
-      :shell:
+.. raw:: latex
 
-.. only:: latex
+    \clearpage
 
-   .. code-block:: bash
+64b-1t1c-sw
+-----------
 
-      $ cd tests/vpp/perf/crypto
-      $ grep -E "64B-2t2c-(ethip4ipsecbasetnl|ethip4ipsecscale1000tnl|ethip4ipsectptlispgpe)-.*-ndrdisc" *
+.. raw:: html
 
-PDR Throughput
-~~~~~~~~~~~~~~
+    <center><b>
 
-VPP PDR 64B packet throughput in 1t1c setup (1thread, 1core) is presented
-in the graph below. PDR measured for 0.5% packet loss ratio.
+:index:`Packet Throughput: ipsec-3n-hsw-xl710-64b-1t1c-sw-ndr`
 
 .. raw:: html
 
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/64B-1t1c-ipsechw-pdrdisc.html"></iframe>
+    </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 8cm 5cm 0cm, width=0.70\textwidth]{64B-1t1c-ipsechw-pdrdisc}
-            \label{fig:64B-1t1c-ipsechw-pdrdisc}
+            \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}
 
-*Figure 3. VPP 1thread 1core - PDR Throughput for Phy-to-Phy IPSEC HW.*
+.. raw:: html
 
-CSIT source code for the test cases used for above plots can be found in CSIT
-git repository:
+    <center><b>
 
-.. only:: html
+.. raw:: latex
 
-   .. program-output:: cd ../../../../../ && set +x && cd tests/vpp/perf/crypto && grep -E "64B-1t1c-(ethip4ipsecbasetnl|ethip4ipsecscale1000tnl|ethip4ipsectptlispgpe)-.*-pdrdisc" *
-      :shell:
+    \clearpage
 
-.. only:: latex
+:index:`Packet Throughput: ipsec-3n-hsw-xl710-64b-1t1c-sw-pdr`
 
-   .. code-block:: bash
+.. raw:: html
 
-      $ cd tests/vpp/perf/crypto
-      $ grep -E "64B-1t1c-(ethip4ipsecbasetnl|ethip4ipsecscale1000tnl|ethip4ipsectptlispgpe)-.*-pdrdisc" *
+    </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
 
-VPP PDR 64B packet throughput in 2t2c setup (2thread, 2core) 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]{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
 
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/64B-2t2c-ipsechw-pdrdisc.html"></iframe>
+    <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 8cm 5cm 0cm, width=0.70\textwidth]{64B-2t2c-ipsechw-pdrdisc}
-            \label{fig:64B-2t2c-ipsechw-pdrdisc}
+            \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}
 
-*Figure 4. VPP 2thread 2core - PDR Throughput for Phy-to-Phy IPSEC HW.*
+.. raw:: html
+
+    <center><b>
 
-CSIT source code for the test cases used for above plots can be found in CSIT
-git repository:
+.. raw:: latex
 
-.. only:: html
+    \clearpage
 
-   .. program-output:: cd ../../../../../ && set +x && cd tests/vpp/perf/crypto && grep -E "64B-2t2c-(ethip4ipsecbasetnl|ethip4ipsecscale1000tnl|ethip4ipsectptlispgpe)-.*-pdrdisc" *
-      :shell:
+:index:`Packet Throughput: ipsec-3n-hsw-xl710-64b-2t2c-sw-pdr`
 
-.. only:: latex
+.. raw:: html
 
-   .. code-block:: bash
+    </b>
+    <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>
+
+.. raw:: latex
 
-      $ cd tests/vpp/perf/crypto
-      $ grep -E "64B-2t2c-(ethip4ipsecbasetnl|ethip4ipsecscale1000tnl|ethip4ipsectptlispgpe)-.*-pdrdisc" *
+    \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-pdr}
+            \label{fig:ipsec-3n-hsw-xl710-64b-2t2c-sw-pdr}
+    \end{figure}