From d448485d152d3273fe4ef4db28566d99e23efd30 Mon Sep 17 00:00:00 2001
From: Tibor Frank <tifrank@cisco.com>
Date: Mon, 1 Aug 2022 10:34:34 +0200
Subject: [PATCH] Report: Add 2n-tx2 LXC/DRC Container Memif graphs

- Packet Throughput
- Speedup Multi-Core
- Packet Latency

Change-Id: Ia98a44a5fad8676832d8c5beb687e1fd68e30d41
Signed-off-by: Tibor Frank <tifrank@cisco.com>
---
 docs/report/introduction/report_history.rst        |  5 +-
 .../container_memif-2n-tx2-xl710.rst               | 91 ++++++++++++++++++++++
 .../packet_latency/container_memif.rst             |  1 +
 .../container_memif-2n-tx2-xl710.rst               | 71 +++++++++++++++++
 .../packet_throughput_graphs/container_memif.rst   |  1 +
 .../container_memif-2n-tx2-xl710.rst               | 71 +++++++++++++++++
 .../container_memif.rst                            |  1 +
 .../specifications/report/elements.yaml            | 27 +++++++
 .../tools/presentation/sphinx_conf/report/conf.py  |  2 +-
 9 files changed, 268 insertions(+), 2 deletions(-)
 create mode 100644 docs/report/vpp_performance_tests/packet_latency/container_memif-2n-tx2-xl710.rst
 create mode 100644 docs/report/vpp_performance_tests/packet_throughput_graphs/container_memif-2n-tx2-xl710.rst
 create mode 100644 docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif-2n-tx2-xl710.rst

diff --git a/docs/report/introduction/report_history.rst b/docs/report/introduction/report_history.rst
index 3613fe9c22..360a9ca252 100644
--- a/docs/report/introduction/report_history.rst
+++ b/docs/report/introduction/report_history.rst
@@ -7,12 +7,15 @@ below.
 +----------------+-------------------------------------------------------------+
 | .[ww] Revision | Changes                                                     |
 +================+=============================================================+
+| .31            | 1. Added packet throughput, speedup multi-core and packet   |
+|                |    latency graphs for 2n-tx2 LXC/DRC Container Memif.       |
+|                |                                                             |
++----------------+-------------------------------------------------------------+
 | .30            | 1. Added VPP iterative data from 2n-clx, 2n-icx, 2n-skx     |
 |                |    - 100B-ethip4tcp-ip4base-tput                            |
 |                |    - 100B-ethip4tcp-nat44ed-tput                            |
 |                |    - 100B-ethip4udp-ip4base-tput                            |
 |                |                                                             |
-|                |                                                             |
 +----------------+-------------------------------------------------------------+
 | .29            | 1. Added VPP iterative data:                                |
 |                |                                                             |
diff --git a/docs/report/vpp_performance_tests/packet_latency/container_memif-2n-tx2-xl710.rst b/docs/report/vpp_performance_tests/packet_latency/container_memif-2n-tx2-xl710.rst
new file mode 100644
index 0000000000..748d1401ab
--- /dev/null
+++ b/docs/report/vpp_performance_tests/packet_latency/container_memif-2n-tx2-xl710.rst
@@ -0,0 +1,91 @@
+
+.. 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>
+
+2n-tx2-xl710
+~~~~~~~~~~~~
+
+64b-1t1c-memif-base-dpdk
+------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="1" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-tx2-40ge2p1xl710-64b-1t1c-eth-l2bdbasemaclrn-eth-2memif-1dcr.html"></iframe>
+    <p><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-tx2-40ge2p1xl710-64b-1t1c-eth-l2bdbasemaclrn-eth-2memif-1dcr}
+            \label{fig:hdrh-lat-percentile-2n-tx2-40ge2p1xl710-64b-1t1c-eth-l2bdbasemaclrn-eth-2memif-1dcr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="2" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-tx2-40ge2p1xl710-64b-1t1c-eth-l2xcbase-eth-2memif-1dcr.html"></iframe>
+    <p><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-tx2-40ge2p1xl710-64b-1t1c-eth-l2xcbase-eth-2memif-1dcr}
+            \label{fig:hdrh-lat-percentile-2n-tx2-40ge2p1xl710-64b-1t1c-eth-l2xcbase-eth-2memif-1dcr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="3" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-tx2-40ge2p1xl710-64b-1t1c-ethip4-ip4base-eth-2memif-1dcr.html"></iframe>
+    <p><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-tx2-40ge2p1xl710-64b-1t1c-ethip4-ip4base-eth-2memif-1dcr}
+            \label{fig:hdrh-lat-percentile-2n-tx2-40ge2p1xl710-64b-1t1c-ethip4-ip4base-eth-2memif-1dcr}
+    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency/container_memif.rst b/docs/report/vpp_performance_tests/packet_latency/container_memif.rst
index 245ceb472a..23c740c667 100644
--- a/docs/report/vpp_performance_tests/packet_latency/container_memif.rst
+++ b/docs/report/vpp_performance_tests/packet_latency/container_memif.rst
@@ -16,6 +16,7 @@ CSIT source code for the test cases used for plots can be found in
     container_memif-2n-clx-xxv710
     container_memif-2n-clx-cx556a
     container_memif-2n-clx-e810cq
+    container_memif-2n-tx2-xl710
     container_memif-2n-zn2-xxv710
 
 ..
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/container_memif-2n-tx2-xl710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/container_memif-2n-tx2-xl710.rst
new file mode 100644
index 0000000000..fddd17604d
--- /dev/null
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/container_memif-2n-tx2-xl710.rst
@@ -0,0 +1,71 @@
+
+.. 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>
+
+2n-tx2-xl710
+~~~~~~~~~~~~
+
+64b-1t1c-memif-base-dpdk
+------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-tx2-xl710-64b-1t1c-memif-base-dpdk-ndr.html"></iframe>
+    <p><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-tx2-xl710-64b-1t1c-memif-base-dpdk-ndr}
+            \label{fig:2n-tx2-xl710-64b-1t1c-memif-base-dpdk-ndr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-tx2-xl710-64b-1t1c-memif-base-dpdk-pdr.html"></iframe>
+    <p><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-tx2-xl710-64b-1t1c-memif-base-dpdk-pdr}
+            \label{fig:2n-tx2-xl710-64b-1t1c-memif-base-dpdk-pdr}
+    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/container_memif.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/container_memif.rst
index ddd9e87df4..d4e6d37962 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/container_memif.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/container_memif.rst
@@ -22,5 +22,6 @@ CSIT source code for the test cases used for plots can be found in
     container_memif-2n-clx-xxv710
     container_memif-2n-clx-cx556a
     container_memif-2n-clx-e810cq
+    container_memif-2n-tx2-xl710
     container_memif-2n-zn2-xxv710
     container_memif-2n-zn2-cx556a
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif-2n-tx2-xl710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif-2n-tx2-xl710.rst
new file mode 100644
index 0000000000..2df3bab585
--- /dev/null
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif-2n-tx2-xl710.rst
@@ -0,0 +1,71 @@
+
+.. 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>
+
+2n-tx2-xl710
+~~~~~~~~~~~~
+
+64b-memif-base-dpdk
+-------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-tx2-xl710-64b-memif-base-dpdk-ndr-tsa.html"></iframe>
+    <p><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-tx2-xl710-64b-memif-base-dpdk-ndr-tsa}
+            \label{fig:2n-tx2-xl710-64b-memif-base-dpdk-ndr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-tx2-xl710-64b-memif-base-dpdk-pdr-tsa.html"></iframe>
+    <p><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-tx2-xl710-64b-memif-base-dpdk-pdr-tsa}
+            \label{fig:2n-tx2-xl710-64b-memif-base-dpdk-pdr-tsa}
+    \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif.rst
index ecf0cbade7..5c91b2b9e8 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif.rst
@@ -24,5 +24,6 @@ CSIT source code for the test cases used for plots can be found in
     container_memif-2n-clx-xxv710
     container_memif-2n-clx-cx556a
     container_memif-2n-clx-e810cq
+    container_memif-2n-tx2-xl710
     container_memif-2n-zn2-xxv710
     container_memif-2n-zn2-cx556a
diff --git a/resources/tools/presentation/specifications/report/elements.yaml b/resources/tools/presentation/specifications/report/elements.yaml
index ebb3d2f649..73ea925b1f 100644
--- a/resources/tools/presentation/specifications/report/elements.yaml
+++ b/resources/tools/presentation/specifications/report/elements.yaml
@@ -10680,6 +10680,20 @@
     title: "2n-tx2-xl710-64b-{core}-features-l2switching-base-{test_type}"
     layout: "plot-throughput"
 
+- type: "plot"
+  title: "Throughput: 2n-tx2-xl710-64b-{core}-memif-base-dpdk-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-tx2-xl710-64b-{core}-memif-base-dpdk-{test_type}"
+  data: "vpp-2n-tx2-curr-iter"
+  core: ["1t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Container Memif.2N1L-40Ge2P1Xl710-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-{core}-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.2N1L-40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-{core}-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.2N1L-40Ge2P1Xl710-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Ndrpdr.64B-{core}-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
+  layout:
+    title: "2n-tx2-xl710-64b-{core}-memif-base-{test_type}"
+    layout: "plot-throughput"
+
 # 3n-alt
 
 - type: "plot"
@@ -12232,6 +12246,19 @@
     title: "2n-tx2-xl710-64b-features-l2switching-base-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
+- type: "plot"
+  title: "Speedup: 2n-tx2-xl710-64b-memif-base-dpdk-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-tx2-xl710-64b-memif-base-dpdk-{test_type}-tsa"
+  data: "vpp-2n-tx2-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.Container Memif.2N1L-40Ge2P1Xl710-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-.t.c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.2N1L-40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.2N1L-40Ge2P1Xl710-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Ndrpdr.64B-.t.c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
+  layout:
+    title: "2n-tx2-xl710-64b-memif-base-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
 ################################################################################
 
 # Packet Throughput - DPDK
diff --git a/resources/tools/presentation/sphinx_conf/report/conf.py b/resources/tools/presentation/sphinx_conf/report/conf.py
index 3615846427..4fbbebfbb0 100644
--- a/resources/tools/presentation/sphinx_conf/report/conf.py
+++ b/resources/tools/presentation/sphinx_conf/report/conf.py
@@ -46,7 +46,7 @@ source_suffix = [u'.rst', u'.md']
 master_doc = u'index'
 
 # General information about the project.
-report_week = u'30'
+report_week = u'31'
 project = u'FD.io CSIT-2206.{week}'.format(week=report_week)
 copyright = u'2022, FD.io'
 author = u'FD.io CSIT'
-- 
2.16.6