X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=docs%2Freport%2Fvpp_performance_tests%2Fthroughput_speedup_multi_core%2Fsrv6.rst;h=3c50d7d894ad297fc2d7ef39e872ab1d82efb63e;hb=e0806c8358f38406432d1c6f09de7b90fadb8646;hp=9f96654891dfd506ae4d2e7060af594373f2bcb2;hpb=23a620dd663d58e433e62dc417f4f053ae599e88;p=csit.git

diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/srv6.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/srv6.rst
index 9f96654891..3c50d7d894 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/srv6.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/srv6.rst
@@ -1,5 +1,35 @@
-SRv6
-====
+
+.. 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>
+
+SRv6 Routing
+============
 
 Following sections include Throughput Speedup Analysis for VPP multi-
 core multi-thread configurations with no Hyper-Threading, specifically
@@ -9,84 +39,63 @@ used for the graphs comes from Phy-to-Phy 78B performance tests with VPP
 SRv6, including NDR throughput (zero packet loss) and
 PDR throughput (<0.5% packet loss).
 
-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/srv6?h=rls1810>`_.
+
+.. raw:: latex
+
+    \clearpage
+
+3n-hsw-x520
+~~~~~~~~~~~
+
+78b-features
+------------
 
-VPP NDR 78B packet throughput speedup ratio is presented in the graphs
-below for 10ge2p1x520 network interface card.
+.. raw:: html
 
+    <center><b>
 
-NIC 10ge2p1x520
-~~~~~~~~~~~~~~~
+:index:`Speedup Multi-core: srv6-3n-hsw-x520-78b-1t1c-features-ndr`
 
 .. raw:: html
 
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/10ge2p1x520-78B-srv6-tsa-ndrdisc.html"></iframe>
+    </b>
+    <iframe id="ifrm01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/srv6-3n-hsw-x520-78b-features-ndr-tsa.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]{10ge2p1x520-78B-srv6-tsa-ndrdisc}
-            \label{fig:10ge2p1x520-78B-srv6-tsa-ndrdisc}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{srv6-3n-hsw-x520-78b-features-ndr-tsa}
+            \label{fig:srv6-3n-hsw-x520-78b-features-ndr-tsa}
     \end{figure}
 
-*Figure 1. Throughput Speedup Analysis - Multi-Core Speedup Ratio - Normalized
-NDR Throughput for Phy-to-Phy SRv6.*
-
-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/srv6 && grep -E '78B-(1t1c|2t2c|4t4c)-ethip6.*srv6.*ndrdisc' 10ge2p1x520*
-      :shell:
-
-.. only:: latex
-
-   .. code-block:: bash
+.. raw:: html
 
-      $ cd tests/vpp/perf/srv6
-      $ grep -E '78B-(1t1c|2t2c|4t4c)-ethip6.*srv6.*ndrdisc' 10ge2p1x520*
+    <center><b>
 
-PDR Throughput
---------------
+.. raw:: latex
 
-VPP PDR 78B packet throughput speedup ratio is presented in the graphs
-below for 10ge2p1x520 network interface card. PDR
-measured for 0.5% packet loss ratio.
+    \clearpage
 
-NIC 10ge2p1x520
-~~~~~~~~~~~~~~~
+:index:`Speedup Multi-core: srv6-3n-hsw-x520-78b-1t1c-features-pdr`
 
 .. raw:: html
 
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/10ge2p1x520-78B-srv6-tsa-pdrdisc.html"></iframe>
+    </b>
+    <iframe id="ifrm02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/srv6-3n-hsw-x520-78b-features-pdr-tsa.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]{10ge2p1x520-78B-srv6-tsa-pdrdisc}
-            \label{fig:10ge2p1x520-78B-srv6-tsa-pdrdisc}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{srv6-3n-hsw-x520-78b-features-pdr-tsa}
+            \label{fig:srv6-3n-hsw-x520-78b-features-pdr-tsa}
     \end{figure}
-
-*Figure 3. Throughput Speedup Analysis - Multi-Core Speedup Ratio - Normalized
-PDR Throughput for Phy-to-Phy SRv6.*
-
-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/srv6 && grep -E '78B-(1t1c|2t2c|4t4c)-ethip6.*srv6.*pdrdisc' 10ge2p1x520*
-      :shell:
-
-.. only:: latex
-
-   .. code-block:: bash
-
-      $ cd tests/vpp/perf/srv6
-      $ grep -E '78B-(1t1c|2t2c|4t4c)-ethip6.*srv6.*pdrdisc' 10ge2p1x520*