X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=docs%2Freport%2Fvpp_performance_tests%2Fpacket_throughput_graphs%2Fipsec.rst;h=8b0f95d96627b0a8c090cb0cba0712da7d4bc2bd;hb=9d324eab35857dac39015da42ce4e7cd3554ffaf;hp=b0fd17d644ea73f89b0d950470addcb038b557f2;hpb=8443891dd9915ed3439b0045c0e47935606d5e61;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 b0fd17d644..8b0f95d966 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec.rst
@@ -1,149 +1,48 @@
-IPSec Crypto HW: IP4 Routed-Forwarding
-======================================
-
-Following sections include summary graphs of VPP Phy-to-Phy performance with
-IPSec encryption used in combination with IPv4 routed-forwarding,
-including NDR throughput (zero packet loss) and PDR throughput (<0.5%
-packet loss). VPP IPSec encryption is accelerated using DPDK cryptodev
-library driving Intel Quick Assist (QAT) crypto PCIe hardware cards.
-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
-~~~~~~~~~~~~~~
-
-VPP NDR 64B packet throughput in 1t1c setup (1thread, 1core) is presented
-in the graph below.
-
-.. raw:: html
-
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/64B-1t1c-ipsechw-ndrdisc.html"></iframe>
 
 .. 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}
-    \end{figure}
-
-*Figure 1. VPP 1thread 1core - 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:
-
-.. only:: html
-
-   .. program-output:: cd ../../../../../ && set +x && cd tests/vpp/perf/crypto && grep -E "64B-1t1c-(ethip4ipsecbasetnl|ethip4ipsecscale1000tnl|ethip4ipsectptlispgpe)-.*-ndrdisc" *
-      :shell:
-
-.. only:: latex
-
-   .. code-block:: bash
-
-      $ cd tests/vpp/perf/crypto
-      $ grep -E "64B-1t1c-(ethip4ipsecbasetnl|ethip4ipsecscale1000tnl|ethip4ipsectptlispgpe)-.*-ndrdisc" *
-
-VPP NDR 64B packet throughput in 2t2c setup (2thread, 2core) is presented
-in the graph below.
+    \clearpage
 
 .. raw:: html
 
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/64B-2t2c-ipsechw-ndrdisc.html"></iframe>
-
-.. raw:: latex
+    <script type="text/javascript">
 
-    \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}
-    \end{figure}
+        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;
+        }
 
-*Figure 2. VPP 2threads 2cores - NDR Throughput for Phy-to-Phy IPSEC HW.*
+        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';
+        }
 
-CSIT source code for the test cases used for above plots can be found in CSIT
-git repository:
+    </script>
 
-.. only:: html
+IPSec IPv4 Routing
+==================
 
-   .. program-output:: cd ../../../../../ && set +x && cd tests/vpp/perf/crypto && grep -E "64B-2t2c-(ethip4ipsecbasetnl|ethip4ipsecscale1000tnl|ethip4ipsectptlispgpe)-.*-ndrdisc" *
-      :shell:
-
-.. only:: latex
-
-   .. code-block:: bash
-
-      $ cd tests/vpp/perf/crypto
-      $ grep -E "64B-2t2c-(ethip4ipsecbasetnl|ethip4ipsecscale1000tnl|ethip4ipsectptlispgpe)-.*-ndrdisc" *
-
-PDR Throughput
-~~~~~~~~~~~~~~
-
-VPP PDR 64B packet throughput in 1t1c setup (1thread, 1core) is presented
-in the graph below. PDR measured for 0.5% packet loss ratio.
-
-.. raw:: html
-
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/64B-1t1c-ipsechw-pdrdisc.html"></iframe>
-
-.. 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}
-    \end{figure}
-
-*Figure 3. VPP 1thread 1core - 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:
-
-.. only:: html
-
-   .. program-output:: cd ../../../../../ && set +x && cd tests/vpp/perf/crypto && grep -E "64B-1t1c-(ethip4ipsecbasetnl|ethip4ipsecscale1000tnl|ethip4ipsectptlispgpe)-.*-pdrdisc" *
-      :shell:
-
-.. only:: latex
-
-   .. code-block:: bash
-
-      $ cd tests/vpp/perf/crypto
-      $ grep -E "64B-1t1c-(ethip4ipsecbasetnl|ethip4ipsecscale1000tnl|ethip4ipsectptlispgpe)-.*-pdrdisc" *
-
-VPP PDR 64B packet throughput in 2t2c setup (2thread, 2core) is presented
-in the graph below. PDR measured for 0.5% packet loss ratio.
-
-.. raw:: html
-
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/64B-2t2c-ipsechw-pdrdisc.html"></iframe>
-
-.. 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}
-    \end{figure}
-
-*Figure 4. VPP 2thread 2core - 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:
-
-.. only:: html
-
-   .. program-output:: cd ../../../../../ && set +x && cd tests/vpp/perf/crypto && grep -E "64B-2t2c-(ethip4ipsecbasetnl|ethip4ipsecscale1000tnl|ethip4ipsectptlispgpe)-.*-pdrdisc" *
-      :shell:
+Following sections include summary graphs of VPP Phy-to-Phy performance with
+IPSec encryption used in combination with IPv4 routed-forwarding,
+including NDR throughput (zero packet loss) and PDR throughput (<0.5%
+packet loss). VPP IPSec encryption is accelerated using DPDK cryptodev
+library driving Intel Quick Assist (QAT) crypto PCIe hardware cards.
+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.
 
-.. only:: latex
+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=rls1901>`_.
 
-   .. code-block:: bash
+.. toctree::
 
-      $ cd tests/vpp/perf/crypto
-      $ grep -E "64B-2t2c-(ethip4ipsecbasetnl|ethip4ipsecscale1000tnl|ethip4ipsectptlispgpe)-.*-pdrdisc" *
+    ipsec-3n-skx-x710