X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=docs%2Freport%2Fvpp_performance_tests%2Fpacket_throughput_graphs%2Fsrv6.rst;h=5e11278df7a5f31301f6517f097c476894d2fcd3;hp=5df30d20d9e58232d19d33212580bfd6355c8594;hb=b641b5bf12a0d1b63ac9afb7c89133297d3b63fe;hpb=01b9a636f84ad3b03e2845abd4ebf1a258705b55

diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/srv6.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/srv6.rst
index 5df30d20d9..5e11278df7 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/srv6.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/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 summary graphs of VPP Phy-to-Phy performance
 with SRv6, including NDR throughput (zero packet loss)
@@ -7,141 +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/srv6?h=rls1810>`_.
 
-VPP NDR 78B packet throughput in 1t1c setup (1thread, 1core) is presented
-in the graph below.
+.. raw:: latex
+
+    \clearpage
+
+3n-hsw-x520
+~~~~~~~~~~~
+
+78b-1t1c-features
+-----------------
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Packet Throughput: srv6-3n-hsw-x520-78b-1t1c-features-ndr`
 
 .. raw:: html
 
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/78B-1t1c-ethip6-srv6-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-1t1c-features-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]{78B-1t1c-ethip6-srv6-ndrdisc}
-            \label{fig:78B-1t1c-ethip6-srv6-ndrdisc}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{srv6-3n-hsw-x520-78b-1t1c-features-ndr}
+            \label{fig:srv6-3n-hsw-x520-78b-1t1c-features-ndr}
     \end{figure}
 
-*Figure 1. VPP 1thread 1core - 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-ethip6.*srv6.*ndrdisc" *
-      :shell:
+.. raw:: html
 
-.. only:: latex
+    <center><b>
 
-   .. code-block:: bash
+.. raw:: latex
 
-      $ cd tests/vpp/perf/srv6
-      $ grep -E "78B-1t1c-ethip6.*srv6.*ndrdisc" *
+    \clearpage
 
-VPP NDR 78B packet throughput in 2t2c setup (2thread, 2core) is presented
-in the graph below.
+:index:`Packet Throughput: srv6-3n-hsw-x520-78b-1t1c-features-pdr`
 
 .. raw:: html
 
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/78B-2t2c-ethip6-srv6-ndrdisc.html"></iframe>
+    </b>
+    <iframe id="ifrm02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/srv6-3n-hsw-x520-78b-1t1c-features-pdr.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]{78B-2t2c-ethip6-srv6-ndrdisc}
-            \label{fig:78B-2t2c-ethip6-srv6-ndrdisc}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{srv6-3n-hsw-x520-78b-1t1c-features-pdr}
+            \label{fig:srv6-3n-hsw-x520-78b-1t1c-features-pdr}
     \end{figure}
 
-*Figure 2. VPP 2threads 2cores - 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-2t2c-ethip6.*srv6.*ndrdisc" *
-      :shell:
+.. raw:: latex
 
-.. only:: latex
+    \clearpage
 
-   .. code-block:: bash
+78b-2t2c-features
+-----------------
 
-      $ cd tests/vpp/perf/srv6
-      $ grep -E "78B-2t2c-ethip6.*srv6.*ndrdisc" *
+.. raw:: html
 
-PDR Throughput
-~~~~~~~~~~~~~~
+    <center><b>
 
-VPP PDR 78B packet throughput in 1t1c setup (1thread, 1core) is presented
-in the graph below. PDR measured for 0.5% packet loss ratio.
+:index:`Packet Throughput: srv6-3n-hsw-x520-78b-2t2c-features-ndr`
 
 .. raw:: html
 
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/78B-1t1c-ethip6-srv6-pdrdisc.html"></iframe>
+    </b>
+    <iframe id="ifrm03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/srv6-3n-hsw-x520-78b-2t2c-features-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]{78B-1t1c-ethip6-srv6-pdrdisc}
-            \label{fig:78B-1t1c-ethip6-srv6-pdrdisc}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{srv6-3n-hsw-x520-78b-2t2c-features-ndr}
+            \label{fig:srv6-3n-hsw-x520-78b-2t2c-features-ndr}
     \end{figure}
 
-*Figure 3. VPP 1thread 1core - 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-ethip6.*srv6.*pdrdisc" *
-      :shell:
+.. raw:: html
 
-.. only:: latex
+    <center><b>
 
-   .. code-block:: bash
+.. raw:: latex
 
-      $ cd tests/vpp/perf/srv6
-      $ grep -E "78B-1t1c-ethip6.*srv6.*pdrdisc" *
+    \clearpage
 
-VPP PDR 78B packet throughput in 2t2c setup (2thread, 2core) is presented
-in the graph below. PDR measured for 0.5% packet loss ratio.
+:index:`Packet Throughput: srv6-3n-hsw-x520-78b-2t2c-features-pdr`
 
 .. raw:: html
 
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/78B-2t2c-ethip6-srv6-pdrdisc.html"></iframe>
+    </b>
+    <iframe id="ifrm04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/srv6-3n-hsw-x520-78b-2t2c-features-pdr.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]{78B-2t2c-ethip6-srv6-pdrdisc}
-            \label{fig:78B-2t2c-ethip6-srv6-pdrdisc}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{srv6-3n-hsw-x520-78b-2t2c-features-pdr}
+            \label{fig:srv6-3n-hsw-x520-78b-2t2c-features-pdr}
     \end{figure}
-
-*Figure 4. VPP 2thread 2core - PDR Throughput for Phy-to-Phy IPv6
-Routed-Forwarding.*
-
-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-2t2c-ethip6.*srv6.*pdrdisc" *
-      :shell:
-
-.. only:: latex
-
-   .. code-block:: bash
-
-      $ cd tests/vpp/perf/srv6
-      $ grep -E "78B-2t2c-ethip6.*srv6.*pdrdisc" *