X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=docs%2Freport%2Fvpp_performance_tests%2Fpacket_latency_graphs%2Fl2.rst;h=3aae134c624348487e4262db479a0be3679f17da;hb=124101d22151239b0411a73ae4d2bf8d70970937;hp=508d33c43a3b21243d319b1d3fe517b71bbd82b4;hpb=e312d70bfe230efcdce9ff933aa61a6bcc1a8f3c;p=csit.git

diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/l2.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/l2.rst
index 508d33c43a..3aae134c62 100644
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/l2.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/l2.rst
@@ -1,53 +1,52 @@
-L2 Ethernet Switching
-=====================
 
-This section includes summary graphs of VPP Phy-to-Phy packet latency
-with L2 Ethernet switching measured at 50% of discovered NDR throughput
-rate. Latency 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.
 
-VPP packet latency in 1t1c setup (1thread, 1core) is presented in the graph below.
+.. raw:: latex
 
-.. raw:: html
-
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/64B-1t1c-l2-sel1-ndrdisc-lat50.html"></iframe>
-
-*Figure 1a. VPP 1thread 1core - packet latency for Phy-to-Phy L2 Ethernet
-Switching (base).*
+    \clearpage
 
 .. raw:: html
 
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/64B-1t1c-l2-sel2-ndrdisc-lat50.html"></iframe>
-
-*Figure 1b. VPP 1thread 1core - packet latency for Phy-to-Phy L2 Ethernet
-Switching (feature).*
-
-CSIT source code for the test cases used for above plots can be found in CSIT
-git repository:
-
-.. program-output:: cd ../../ && set -x && cd tests/vpp/perf/l2 && grep -E "64B-1t1c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn)-(iacl50-state(ful|less)-flows10k.*|oacl50-state(ful|less)-flows10k.*|eth.*)*ndrdisc" *
-   :shell:
-
-VPP packet latency in 2t2c setup (2thread, 2core) is presented in the graph below.
+    <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>
 
-.. raw:: html
-
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/64B-2t2c-l2-sel1-ndrdisc-lat50.html"></iframe>
-
-*Figure 2a. VPP 2threads 2cores - packet latency for Phy-to-Phy L2 Ethernet
-Switching (base).*
-
-.. raw:: html
-
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/64B-2t2c-l2-sel2-ndrdisc-lat50.html"></iframe>
+L2 Ethernet Switching
+=====================
 
-*Figure 2b. VPP 2threads 2cores - packet latency for Phy-to-Phy L2 Ethernet
-Switching (feature).*
+This section includes summary graphs of VPP Phy-to-Phy packet latency
+with L2 Ethernet switching measured at 100% of discovered NDR throughput
+rate. Latency 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.
 
-CSIT source code for the test cases used for above plots can be found in CSIT
-git repository:
+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/l2?h=rls1810>`_.
 
-.. program-output:: cd ../../ && set -x && cd tests/vpp/perf/l2 && grep -E "64B-1t1c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn)-(iacl50-state(ful|less)-flows10k.*|oacl50-state(ful|less)-flows10k.*|eth.*)*ndrdisc" *
-   :shell:
+.. toctree::
 
+    l2-3n-hsw-x520
+    l2-3n-hsw-x710
+    l2-3n-hsw-xl710
+    l2-3n-skx-x710
+    l2-3n-skx-xxv710
+    l2-2n-skx-x710
+    l2-2n-skx-xxv710