Report: Add 3n-icx

Change-Id: Ic9a90274f5e9791c34560725aaf29266c2a89ce4
Signed-off-by: Tibor Frank <tifrank@cisco.com>

26 files changed, 764 insertions, 499 deletions

diff --git a/docs/report/vpp_performance_tests/comparisons/3n-skx_vs_3n-icx_testbeds.rst b/docs/report/vpp_performance_tests/comparisons/3n-skx_vs_3n-icx_testbeds.rst
new file mode 100644
index 0000000000..52f9c50689
--- /dev/null
+++ b/docs/report/vpp_performance_tests/comparisons/3n-skx_vs_3n-icx_testbeds.rst
@@ -0,0 +1,59 @@
+
+.. _vpp_compare_topologies_3n-skx_vs_3n-icx:
+
+3n-Skx vs 3n-Icx Testbeds
+-------------------------
+
+Relative comparison of |vpp-release| packet throughput (NDR, PDR and
+MRR) is calculated for the same tests executed on 3-Node Skylake (3n-
+skx) and 3-Node Icelake (3n-icx) physical testbed types, in 1-core,
+2-core and 4-core configurations.
+
+.. note::
+
+    Test results are stored in
+    `build logs from FD.io vpp performance job 3n-skx`_ and
+    `build logs from FD.io vpp performance job 3n-icx`_
+    with RF result
+    files csit-vpp-perf-|srelease|-\*.zip
+    `archived here <../../_static/archive/>`_.
+
+NDR Comparison
+~~~~~~~~~~~~~~
+
+Comparison tables in HTML, ASCII and CSV formats:
+
+  - `HTML 1c NDR comparison <performance-compare-topologies-3n-skx-3n-icx-1c-ndr.html>`_
+  - `HTML 2c NDR comparison <performance-compare-topologies-3n-skx-3n-icx-2c-ndr.html>`_
+  - `ASCII 1c NDR comparison <../../_static/vpp/performance-compare-topologies-3n-skx-3n-icx-1c-ndr.txt>`_
+  - `ASCII 2c NDR comparison <../../_static/vpp/performance-compare-topologies-3n-skx-3n-icx-2c-ndr.txt>`_
+  - `CSV 1c NDR comparison <../../_static/vpp/performance-compare-topologies-3n-skx-3n-icx-1c-ndr-csv.csv>`_
+  - `CSV 2c NDR comparison <../../_static/vpp/performance-compare-topologies-3n-skx-3n-icx-2c-ndr-csv.csv>`_
+
+PDR Comparison
+~~~~~~~~~~~~~~
+
+Comparison tables in HTML, ASCII and CSV formats:
+
+  - `HTML 1c PDR comparison <performance-compare-topologies-3n-skx-3n-icx-1c-pdr.html>`_
+  - `HTML 2c PDR comparison <performance-compare-topologies-3n-skx-3n-icx-2c-pdr.html>`_
+  - `ASCII 1c PDR comparison <../../_static/vpp/performance-compare-topologies-3n-skx-3n-icx-1c-pdr.txt>`_
+  - `ASCII 2c PDR comparison <../../_static/vpp/performance-compare-topologies-3n-skx-3n-icx-2c-pdr.txt>`_
+  - `CSV 1c PDR comparison <../../_static/vpp/performance-compare-topologies-3n-skx-3n-icx-1c-pdr-csv.csv>`_
+  - `CSV 2c PDR comparison <../../_static/vpp/performance-compare-topologies-3n-skx-3n-icx-2c-pdr-csv.csv>`_
+
+..
+  MRR Comparison
+  ~~~~~~~~~~~~~~
+
+  Comparison tables in HTML, ASCII and CSV formats:
+
+    - `HTML 1c MRR comparison <performance-compare-topologies-3n-skx-3n-icx-1c-mrr.html>`_
+    - `HTML 2c MRR comparison <performance-compare-topologies-3n-skx-3n-icx-2c-mrr.html>`_
+    - `HTML 4c MRR comparison <performance-compare-topologies-3n-skx-3n-icx-4c-mrr.html>`_
+    - `ASCII 1c MRR comparison <../../_static/vpp/performance-compare-topologies-3n-skx-3n-icx-1c-mrr.txt>`_
+    - `ASCII 2c MRR comparison <../../_static/vpp/performance-compare-topologies-3n-skx-3n-icx-2c-mrr.txt>`_
+    - `ASCII 4c MRR comparison <../../_static/vpp/performance-compare-topologies-3n-skx-3n-icx-4c-mrr.txt>`_
+    - `CSV 1c MRR comparison <../../_static/vpp/performance-compare-topologies-3n-skx-3n-icx-1c-mrr-csv.csv>`_
+    - `CSV 2c MRR comparison <../../_static/vpp/performance-compare-topologies-3n-skx-3n-icx-2c-mrr-csv.csv>`_
+    - `CSV 4c MRR comparison <../../_static/vpp/performance-compare-topologies-3n-skx-3n-icx-4c-mrr-csv.csv>`_
diff --git a/docs/report/vpp_performance_tests/comparisons/index.rst b/docs/report/vpp_performance_tests/comparisons/index.rst
index be626191cd..13e543a034 100644
--- a/docs/report/vpp_performance_tests/comparisons/index.rst
+++ b/docs/report/vpp_performance_tests/comparisons/index.rst
@@ -14,5 +14,6 @@ Comparisons
     2n-skx_vs_2n-clx_testbeds
     2n-clx_vs_2n-icx_testbeds
     3n-skx_vs_2n-skx_testbeds
+    3n-skx_vs_3n-icx_testbeds
     nic_comparison
     soak_vs_ndr
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-3n-icx-e810cq.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-3n-icx-e810cq.rst
new file mode 100644
index 0000000000..88d007cf2a
--- /dev/null
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-3n-icx-e810cq.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>
+
+3n-icx-e810cq
+~~~~~~~~~~~~~
+
+64b-2t1c-ip4routing-base-[avf,dpdk]
+-----------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-64b-2t1c-ip4routing-base-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]{3n-icx-e810cq-64b-2t1c-ip4routing-base-ndr}
+            \label{fig:3n-icx-e810cq-64b-2t1c-ip4routing-base-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/3n-icx-e810cq-64b-2t1c-ip4routing-base-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]{3n-icx-e810cq-64b-2t1c-ip4routing-base-pdr}
+            \label{fig:3n-icx-e810cq-64b-2t1c-ip4routing-base-pdr}
+    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4.rst
index 3523a29d0b..159583598a 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4.rst
@@ -25,6 +25,7 @@ CSIT source code for the test cases used for plots can be found in
     ip4-2n-clx-x710
     ip4-2n-clx-cx556a
     ip4-2n-icx-e810cq
+    ip4-3n-icx-e810cq
     ip4-2n-zn2-xxv710
     ip4-2n-zn2-x710
     ip4-2n-zn2-cx556a
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4_tunnels-3n-icx-e810cq.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4_tunnels-3n-icx-e810cq.rst
index c13ae227f9..e98af3e52c 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4_tunnels-3n-icx-e810cq.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4_tunnels-3n-icx-e810cq.rst
@@ -31,34 +31,13 @@
 3n-icx-e810cq
 ~~~~~~~~~~~~~
 
-64b-2t1c-ip4tunnel-base-avf
----------------------------
-
-..
-    .. raw:: html
-
-        <center>
-        <iframe id="101" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-64b-2t1c-ip4tunnel-base-avf-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]{3n-icx-e810cq-64b-2t1c-ip4tunnel-base-avf-ndr}
-                \label{fig:3n-icx-e810cq-64b-2t1c-ip4tunnel-base-avf-ndr}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
+64b-2t1c-ip4tunnel-base-[avf,dpdk]
+----------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="102" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-64b-2t1c-ip4tunnel-base-avf-pdr.html"></iframe>
+    <iframe id="101" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-64b-2t1c-ip4tunnel-base-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -67,86 +46,18 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-64b-2t1c-ip4tunnel-base-avf-avf-pdr}
-            \label{fig:3n-icx-e810cq-64b-2t1c-ip4tunnel-base-avf-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-64b-2t1c-ip4tunnel-base-ndr}
+            \label{fig:3n-icx-e810cq-64b-2t1c-ip4tunnel-base-ndr}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-1518b-2t1c-ip4tunnel-base-avf
------------------------------
-
-..
-    .. raw:: html
-
-        <center>
-        <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-1518b-2t1c-ip4tunnel-base-avf-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]{3n-icx-e810cq-1518b-2t1c-ip4tunnel-base-avf-ndr}
-                \label{fig:3n-icx-e810cq-1518b-2t1c-ip4tunnel-base-avf-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/3n-icx-e810cq-1518b-2t1c-ip4tunnel-base-avf-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]{3n-icx-e810cq-1518b-2t1c-ip4tunnel-base-avf-avf-pdr}
-            \label{fig:3n-icx-e810cq-1518b-2t1c-ip4tunnel-base-avf-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-imix-2t1c-ip4tunnel-base-avf
-----------------------------
-
-..
-    .. raw:: html
-
-        <center>
-        <iframe id="1" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-imix-2t1c-ip4tunnel-base-avf-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]{3n-icx-e810cq-imix-2t1c-ip4tunnel-base-avf-ndr}
-                \label{fig:3n-icx-e810cq-imix-2t1c-ip4tunnel-base-avf-ndr}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
 .. raw:: html
 
     <center>
-    <iframe id="2" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-imix-2t1c-ip4tunnel-base-avf-pdr.html"></iframe>
+    <iframe id="102" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-64b-2t1c-ip4tunnel-base-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -155,6 +66,6 @@ imix-2t1c-ip4tunnel-base-avf
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-imix-2t1c-ip4tunnel-base-avf-avf-pdr}
-            \label{fig:3n-icx-e810cq-imix-2t1c-ip4tunnel-base-avf-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-64b-2t1c-ip4tunnel-base-pdr}
+            \label{fig:3n-icx-e810cq-64b-2t1c-ip4tunnel-base-pdr}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4_tunnels.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4_tunnels.rst
index 15fb12d38e..73ff3cf4cd 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4_tunnels.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4_tunnels.rst
@@ -20,10 +20,8 @@ CSIT source code for the test cases used for plots can be found in
     ip4_tunnels-2n-skx-xxv710
     ip4_tunnels-2n-clx-xxv710
     ip4_tunnels-2n-icx-e810cq
+    ip4_tunnels-3n-icx-e810cq
     ip4_tunnels-2n-zn2-xxv710
     ip4_tunnels-3n-skx-xxv710
     ip4_tunnels-3n-tsh-x520
     ip4_tunnels-3n-dnv-x553
-
-..
-    ip4_tunnels-3n-icx-e810cq
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-3n-icx-e810cq.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-3n-icx-e810cq.rst
new file mode 100644
index 0000000000..50e976d722
--- /dev/null
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-3n-icx-e810cq.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>
+
+3n-icx-e810cq
+~~~~~~~~~~~~~
+
+78b-2t1c-ip6routing-base-[avf,dpdk]
+-----------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-78b-2t1c-ip6routing-base-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]{3n-icx-e810cq-78b-2t1c-ip6routing-base-ndr}
+            \label{fig:3n-icx-e810cq-78b-2t1c-ip6routing-base-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/3n-icx-e810cq-78b-2t1c-ip6routing-base-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]{3n-icx-e810cq-78b-2t1c-ip6routing-base-pdr}
+            \label{fig:3n-icx-e810cq-78b-2t1c-ip6routing-base-pdr}
+    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6.rst
index 2558442f82..1f183f4451 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6.rst
@@ -25,6 +25,7 @@ CSIT source code for the test cases used for plots can be found in
     ip6-2n-clx-x710
     ip6-2n-clx-cx556a
     ip6-2n-icx-e810cq
+    ip6-3n-icx-e810cq
     ip6-2n-zn2-xxv710
     ip6-2n-zn2-x710
     ip6-2n-zn2-cx556a
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec-3n-icx-e810cq.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec-3n-icx-e810cq.rst
index a4d947d41a..d9ee2b3152 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec-3n-icx-e810cq.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec-3n-icx-e810cq.rst
@@ -31,34 +31,13 @@
 3n-icx-e810cq
 ~~~~~~~~~~~~~
 
-64b-2t1c-ipsec-aes128gcm-ip4routing-scale-avf
----------------------------------------------
-
-..
-    .. raw:: html
-
-        <center>
-        <iframe id="101" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-64b-2t1c-ipsec-aes128gcm-ip4routing-scale-avf-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]{3n-icx-e810cq-64b-2t1c-ipsec-aes128gcm-ip4routing-scale-avf-ndr}
-                \label{fig:3n-icx-e810cq-64b-2t1c-ipsec-aes128gcm-ip4routing-scale-avf-ndr}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
+imix-2t1c-ipsec-ip4routing-scale-avf
+------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="102" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-64b-2t1c-ipsec-aes128gcm-ip4routing-scale-avf-pdr.html"></iframe>
+    <iframe id="1" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-imix-2t1c-ipsec-ip4routing-base-scale-avf-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -67,42 +46,18 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-64b-2t1c-ipsec-aes128gcm-ip4routing-scale-avf-avf-pdr}
-            \label{fig:3n-icx-e810cq-64b-2t1c-ipsec-aes128gcm-ip4routing-scale-avf-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-imix-2t1c-ipsec-ip4routing-base-scale-avf-ndr}
+            \label{fig:3n-icx-e810cq-imix-2t1c-ipsec-ip4routing-base-scale-avf-ndr}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-1518b-2t1c-ipsec-aes128gcm-ip4routing-scale-avf
------------------------------------------------
-
-..
-    .. raw:: html
-
-        <center>
-        <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-1518b-2t1c-ipsec-aes128gcm-ip4routing-scale-avf-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]{3n-icx-e810cq-1518b-2t1c-ipsec-aes128gcm-ip4routing-scale-avf-ndr}
-                \label{fig:3n-icx-e810cq-1518b-2t1c-ipsec-aes128gcm-ip4routing-scale-avf-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/3n-icx-e810cq-1518b-2t1c-ipsec-aes128gcm-ip4routing-scale-avf-pdr.html"></iframe>
+    <iframe id="2" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-imix-2t1c-ipsec-ip4routing-base-scale-avf-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -111,42 +66,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-1518b-2t1c-ipsec-aes128gcm-ip4routing-scale-avf-avf-pdr}
-            \label{fig:3n-icx-e810cq-1518b-2t1c-ipsec-aes128gcm-ip4routing-scale-avf-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-imix-2t1c-ipsec-ip4routing-base-scale-avf-pdr}
+            \label{fig:3n-icx-e810cq-imix-2t1c-ipsec-ip4routing-base-scale-avf-pdr}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-imix-2t1c-ipsec-aes128gcm-ip4routing-scale-avf
-----------------------------------------------
-
-..
-    .. raw:: html
-
-        <center>
-        <iframe id="1" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-imix-2t1c-ipsec-aes128gcm-ip4routing-scale-avf-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]{3n-icx-e810cq-imix-2t1c-ipsec-aes128gcm-ip4routing-scale-avf-ndr}
-                \label{fig:3n-icx-e810cq-imix-2t1c-ipsec-aes128gcm-ip4routing-scale-avf-ndr}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
+1518b-2t1c-ipsec-ip4routing-scale-avf
+-------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="2" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-imix-2t1c-ipsec-aes128gcm-ip4routing-scale-avf-pdr.html"></iframe>
+    <iframe id="3" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-1518b-2t1c-ipsec-ip4routing-base-scale-avf-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -155,42 +89,18 @@ imix-2t1c-ipsec-aes128gcm-ip4routing-scale-avf
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-imix-2t1c-ipsec-aes128gcm-ip4routing-scale-avf-avf-pdr}
-            \label{fig:3n-icx-e810cq-imix-2t1c-ipsec-aes128gcm-ip4routing-scale-avf-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-1518b-2t1c-ipsec-ip4routing-base-scale-avf-ndr}
+            \label{fig:3n-icx-e810cq-1518b-2t1c-ipsec-ip4routing-base-scale-avf-ndr}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-2t1c-ipsec-aes256gcm-ip4routing-scale-avf
----------------------------------------------
-
-..
-    .. raw:: html
-
-        <center>
-        <iframe id="2101" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-64b-2t1c-ipsec-aes256gcm-ip4routing-scale-avf-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]{3n-icx-e810cq-64b-2t1c-ipsec-aes256gcm-ip4routing-scale-avf-ndr}
-                \label{fig:3n-icx-e810cq-64b-2t1c-ipsec-aes256gcm-ip4routing-scale-avf-ndr}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
 .. raw:: html
 
     <center>
-    <iframe id="2102" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-64b-2t1c-ipsec-aes256gcm-ip4routing-scale-avf-pdr.html"></iframe>
+    <iframe id="4" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-1518b-2t1c-ipsec-ip4routing-base-scale-avf-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -199,42 +109,41 @@ imix-2t1c-ipsec-aes128gcm-ip4routing-scale-avf
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-64b-2t1c-ipsec-aes256gcm-ip4routing-scale-avf-avf-pdr}
-            \label{fig:3n-icx-e810cq-64b-2t1c-ipsec-aes256gcm-ip4routing-scale-avf-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-1518b-2t1c-ipsec-ip4routing-base-scale-avf-pdr}
+            \label{fig:3n-icx-e810cq-1518b-2t1c-ipsec-ip4routing-base-scale-avf-pdr}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-1518b-2t1c-ipsec-aes256gcm-ip4routing-scale-avf
------------------------------------------------
+imix-2t1c-ipsec-ip4routing-scale-dpdk
+-------------------------------------
 
-..
-    .. raw:: html
+.. raw:: html
 
-        <center>
-        <iframe id="201" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-1518b-2t1c-ipsec-aes256gcm-ip4routing-scale-avf-ndr.html"></iframe>
-        <p><br></p>
-        </center>
+    <center>
+    <iframe id="5" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-imix-2t1c-ipsec-ip4routing-base-scale-dpdk-ndr.html"></iframe>
+    <p><br></p>
+    </center>
 
-    .. raw:: latex
+.. raw:: latex
 
-        \begin{figure}[H]
-            \centering
-                \graphicspath{{../_build/_static/vpp/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-1518b-2t1c-ipsec-aes256gcm-ip4routing-scale-avf-ndr}
-                \label{fig:3n-icx-e810cq-1518b-2t1c-ipsec-aes256gcm-ip4routing-scale-avf-ndr}
-        \end{figure}
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-imix-2t1c-ipsec-ip4routing-base-scale-dpdk-ndr}
+            \label{fig:3n-icx-e810cq-imix-2t1c-ipsec-ip4routing-base-scale-dpdk-ndr}
+    \end{figure}
 
-    .. raw:: latex
+.. raw:: latex
 
-        \clearpage
+    \clearpage
 
 .. raw:: html
 
     <center>
-    <iframe id="202" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-1518b-2t1c-ipsec-aes256gcm-ip4routing-scale-avf-pdr.html"></iframe>
+    <iframe id="6" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-imix-2t1c-ipsec-ip4routing-base-scale-dpdk-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -243,42 +152,41 @@ imix-2t1c-ipsec-aes128gcm-ip4routing-scale-avf
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-1518b-2t1c-ipsec-aes256gcm-ip4routing-scale-avf-avf-pdr}
-            \label{fig:3n-icx-e810cq-1518b-2t1c-ipsec-aes256gcm-ip4routing-scale-avf-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-imix-2t1c-ipsec-ip4routing-base-scale-dpdk-pdr}
+            \label{fig:3n-icx-e810cq-imix-2t1c-ipsec-ip4routing-base-scale-dpdk-pdr}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-imix-2t1c-ipsec-aes256gcm-ip4routing-scale-avf
-----------------------------------------------
+1518b-2t1c-ipsec-ip4routing-scale-dpdk
+--------------------------------------
 
-..
-    .. raw:: html
+.. raw:: html
 
-        <center>
-        <iframe id="21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-imix-2t1c-ipsec-aes256gcm-ip4routing-scale-avf-ndr.html"></iframe>
-        <p><br></p>
-        </center>
+    <center>
+    <iframe id="7" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-1518b-2t1c-ipsec-ip4routing-base-scale-dpdk-ndr.html"></iframe>
+    <p><br></p>
+    </center>
 
-    .. raw:: latex
+.. raw:: latex
 
-        \begin{figure}[H]
-            \centering
-                \graphicspath{{../_build/_static/vpp/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-imix-2t1c-ipsec-aes256gcm-ip4routing-scale-avf-ndr}
-                \label{fig:3n-icx-e810cq-imix-2t1c-ipsec-aes256gcm-ip4routing-scale-avf-ndr}
-        \end{figure}
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-1518b-2t1c-ipsec-ip4routing-base-scale-dpdk-ndr}
+            \label{fig:3n-icx-e810cq-1518b-2t1c-ipsec-ip4routing-base-scale-dpdk-ndr}
+    \end{figure}
 
-    .. raw:: latex
+.. raw:: latex
 
-        \clearpage
+    \clearpage
 
 .. raw:: html
 
     <center>
-    <iframe id="22" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-imix-2t1c-ipsec-aes256gcm-ip4routing-scale-avf-pdr.html"></iframe>
+    <iframe id="8" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-1518b-2t1c-ipsec-ip4routing-base-scale-dpdk-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -287,6 +195,6 @@ imix-2t1c-ipsec-aes256gcm-ip4routing-scale-avf
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-imix-2t1c-ipsec-aes256gcm-ip4routing-scale-avf-avf-pdr}
-            \label{fig:3n-icx-e810cq-imix-2t1c-ipsec-aes256gcm-ip4routing-scale-avf-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-1518b-2t1c-ipsec-ip4routing-base-scale-dpdk-pdr}
+            \label{fig:3n-icx-e810cq-1518b-2t1c-ipsec-ip4routing-base-scale-dpdk-pdr}
     \end{figure}
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 cd14703836..4f51b7d6f0 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec.rst
@@ -21,10 +21,7 @@ CSIT source code for the test cases used for plots can be found in
 .. toctree::
 
     ipsec-3n-skx-xxv710
+    ipsec-3n-icx-e810cq
     ipsec-3n-tsh-x520
     ipsec-3n-dnv-x553
     ipsec-3n-aws-nitro50g
-
-..
-    ipsec-3n-icx-e810cq
-
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-3n-icx-e810cq.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-3n-icx-e810cq.rst
new file mode 100644
index 0000000000..25f4b790a2
--- /dev/null
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-3n-icx-e810cq.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>
+
+3n-icx-e810cq
+~~~~~~~~~~~~~
+
+64b-2t1c-l2switching-base
+-------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-64b-2t1c-l2switching-base-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]{3n-icx-e810cq-64b-2t1c-l2switching-base-ndr}
+            \label{fig:3n-icx-e810cq-64b-2t1c-l2switching-base-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/3n-icx-e810cq-64b-2t1c-l2switching-base-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]{3n-icx-e810cq-64b-2t1c-l2switching-base-pdr}
+            \label{fig:3n-icx-e810cq-64b-2t1c-l2switching-base-pdr}
+    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/l2.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/l2.rst
index 3fc056a4c4..492751adcb 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/l2.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/l2.rst
@@ -25,6 +25,7 @@ CSIT source code for the test cases used for plots can be found in
     l2-2n-clx-x710
     l2-2n-clx-cx556a
     l2-2n-icx-e810cq
+    l2-3n-icx-e810cq
     l2-2n-zn2-xxv710
     l2-2n-zn2-x710
     l2-2n-zn2-cx556a
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/srv6-3n-icx-e810cq.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/srv6-3n-icx-e810cq.rst
new file mode 100644
index 0000000000..200334c179
--- /dev/null
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/srv6-3n-icx-e810cq.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>
+
+3n-icx-e810cq
+~~~~~~~~~~~~~
+
+78b-2t1c-srv6-ip6routing-base-avf
+---------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-78b-2t1c-srv6-ip6routing-base-avf-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]{3n-icx-e810cq-78b-2t1c-srv6-ip6routing-base-avf-ndr}
+            \label{fig:3n-icx-e810cq-78b-2t1c-srv6-ip6routing-base-avf-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/3n-icx-e810cq-78b-2t1c-srv6-ip6routing-base-avf-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]{3n-icx-e810cq-78b-2t1c-srv6-ip6routing-base-avf-pdr}
+            \label{fig:3n-icx-e810cq-78b-2t1c-srv6-ip6routing-base-avf-pdr}
+    \end{figure}
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 d2661cd1b0..14cf66d600 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/srv6.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/srv6.rst
@@ -18,6 +18,7 @@ CSIT source code for the test cases used for plots can be found in
 .. toctree::
 
     srv6-3n-skx-xxv710
+    srv6-3n-icx-e810cq
     srv6-3n-tsh-x520
 
 ..
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-3n-icx-e810cq.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-3n-icx-e810cq.rst
new file mode 100644
index 0000000000..5eb03f79b6
--- /dev/null
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-3n-icx-e810cq.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>
+
+3n-icx-e810cq
+~~~~~~~~~~~~~
+
+64b-ip4routing-base-[avf,dpdk]
+------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-64b-ip4routing-base-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]{3n-icx-e810cq-64b-ip4routing-base-ndr-tsa}
+            \label{fig:3n-icx-e810cq-64b-ip4routing-base-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/3n-icx-e810cq-64b-ip4routing-base-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]{3n-icx-e810cq-64b-ip4routing-base-pdr-tsa}
+            \label{fig:3n-icx-e810cq-64b-ip4routing-base-pdr-tsa}
+    \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4.rst
index ab25119953..878b8d9c4f 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4.rst
@@ -27,6 +27,7 @@ CSIT source code for the test cases used for plots can be found in
     ip4-2n-clx-x710
     ip4-2n-clx-cx556a
     ip4-2n-icx-e810cq
+    ip4-3n-icx-e810cq
     ip4-2n-zn2-xxv710
     ip4-2n-zn2-x710
     ip4-2n-zn2-cx556a
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4_tunnels-3n-icx-e810cq.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4_tunnels-3n-icx-e810cq.rst
index 22717d7846..76fa235657 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4_tunnels-3n-icx-e810cq.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4_tunnels-3n-icx-e810cq.rst
@@ -31,34 +31,13 @@
 3n-icx-e810cq
 ~~~~~~~~~~~~~
 
-64b-ip4tunnel-base-avf
-----------------------
-
-..
-    .. raw:: html
-
-        <center>
-        <iframe id="101" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-64b-ip4tunnel-base-avf-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]{3n-icx-e810cq-64b-ip4tunnel-base-avf-ndr-tsa}
-                \label{fig:3n-icx-e810cq-64b-ip4tunnel-base-avf-ndr-tsa}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
+64b-ip4tunnel-base-[avf,dpdk]
+-----------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="102" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-64b-ip4tunnel-base-avf-pdr-tsa.html"></iframe>
+    <iframe id="101" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-64b-ip4tunnel-base-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -67,86 +46,18 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-64b-ip4tunnel-base-avf-pdr-tsa}
-            \label{fig:3n-icx-e810cq-64b-ip4tunnel-base-avf-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-64b-ip4tunnel-base-ndr-tsa}
+            \label{fig:3n-icx-e810cq-64b-ip4tunnel-base-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-1518b-ip4tunnel-base-avf
-------------------------
-
-..
-    .. raw:: html
-
-        <center>
-        <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-1518b-ip4tunnel-base-avf-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]{3n-icx-e810cq-1518b-ip4tunnel-base-avf-ndr-tsa}
-                \label{fig:3n-icx-e810cq-1518b-ip4tunnel-base-avf-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/3n-icx-e810cq-1518b-ip4tunnel-base-avf-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]{3n-icx-e810cq-1518b-ip4tunnel-base-avf-pdr-tsa}
-            \label{fig:3n-icx-e810cq-1518b-ip4tunnel-base-avf-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-imix-ip4tunnel-base-avf
------------------------
-
-..
-    .. raw:: html
-
-        <center>
-        <iframe id="1" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-imix-ip4tunnel-base-avf-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]{3n-icx-e810cq-imix-ip4tunnel-base-avf-ndr-tsa}
-                \label{fig:3n-icx-e810cq-imix-ip4tunnel-base-avf-ndr-tsa}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
 .. raw:: html
 
     <center>
-    <iframe id="2" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-imix-ip4tunnel-base-avf-pdr-tsa.html"></iframe>
+    <iframe id="102" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-64b-ip4tunnel-base-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -155,6 +66,6 @@ imix-ip4tunnel-base-avf
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-imix-ip4tunnel-base-avf-pdr-tsa}
-            \label{fig:3n-icx-e810cq-imix-ip4tunnel-base-avf-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-64b-ip4tunnel-base-pdr-tsa}
+            \label{fig:3n-icx-e810cq-64b-ip4tunnel-base-pdr-tsa}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4_tunnels.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4_tunnels.rst
index 2c3ca351ed..b7e8d774c8 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4_tunnels.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4_tunnels.rst
@@ -22,10 +22,8 @@ CSIT source code for the test cases used for plots can be found in
     ip4_tunnels-2n-skx-xxv710
     ip4_tunnels-2n-clx-xxv710
     ip4_tunnels-2n-icx-e810cq
+    ip4_tunnels-3n-icx-e810cq
     ip4_tunnels-2n-zn2-xxv710
     ip4_tunnels-3n-skx-xxv710
     ip4_tunnels-3n-tsh-x520
     ip4_tunnels-3n-dnv-x553
-
-..
-    ip4_tunnels-3n-icx-e810cq
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-3n-icx-e810cq.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-3n-icx-e810cq.rst
new file mode 100644
index 0000000000..62100d830e
--- /dev/null
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-3n-icx-e810cq.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>
+
+3n-icx-e810cq
+~~~~~~~~~~~~~
+
+78b-ip6routing-base-[avf,dpdk]
+------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-78b-ip6routing-base-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]{3n-icx-e810cq-78b-ip6routing-base-ndr-tsa}
+            \label{fig:3n-icx-e810cq-78b-ip6routing-base-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/3n-icx-e810cq-78b-ip6routing-base-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]{3n-icx-e810cq-78b-ip6routing-base-pdr-tsa}
+            \label{fig:3n-icx-e810cq-78b-ip6routing-base-pdr-tsa}
+    \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6.rst
index 55e7e85b51..d694d9fb04 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6.rst
@@ -27,6 +27,7 @@ CSIT source code for the test cases used for plots can be found in
     ip6-2n-clx-x710
     ip6-2n-clx-cx556a
     ip6-2n-icx-e810cq
+    ip6-3n-icx-e810cq
     ip6-2n-zn2-xxv710
     ip6-2n-zn2-x710
     ip6-2n-zn2-cx556a
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ipsec-3n-icx-e810cq.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ipsec-3n-icx-e810cq.rst
index df28b000f4..eab475d6fa 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ipsec-3n-icx-e810cq.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ipsec-3n-icx-e810cq.rst
@@ -31,34 +31,13 @@
 3n-icx-e810cq
 ~~~~~~~~~~~~~
 
-64b-ipsec-aes128gcm-ip4routing-scale-avf
-----------------------------------------
-
-..
-    .. raw:: html
-
-        <center>
-        <iframe id="101" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-64b-ipsec-aes128gcm-ip4routing-scale-avf-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]{3n-icx-e810cq-64b-ipsec-aes128gcm-ip4routing-scale-avf-ndr-tsa}
-                \label{fig:3n-icx-e810cq-64b-ipsec-aes128gcm-ip4routing-scale-avf-ndr-tsa}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
+imix-2t1c-ipsec-ip4routing-scale-avf
+------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="102" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-64b-ipsec-aes128gcm-ip4routing-scale-avf-pdr-tsa.html"></iframe>
+    <iframe id="1" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-imix-ipsec-ip4routing-base-scale-avf-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -67,42 +46,18 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-64b-ipsec-aes128gcm-ip4routing-scale-avf-pdr-tsa}
-            \label{fig:3n-icx-e810cq-64b-ipsec-aes128gcm-ip4routing-scale-avf-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-imix-ipsec-ip4routing-base-scale-avf-ndr-tsa}
+            \label{fig:3n-icx-e810cq-imix-ipsec-ip4routing-base-scale-avf-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-1518b-ipsec-aes128gcm-ip4routing-scale-avf
-------------------------------------------
-
-..
-    .. raw:: html
-
-        <center>
-        <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-1518b-ipsec-aes128gcm-ip4routing-scale-avf-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]{3n-icx-e810cq-1518b-ipsec-aes128gcm-ip4routing-scale-avf-ndr-tsa}
-                \label{fig:3n-icx-e810cq-1518b-ipsec-aes128gcm-ip4routing-scale-avf-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/3n-icx-e810cq-1518b-ipsec-aes128gcm-ip4routing-scale-avf-pdr-tsa.html"></iframe>
+    <iframe id="2" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-imix-ipsec-ip4routing-base-scale-avfv-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -111,42 +66,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-1518b-ipsec-aes128gcm-ip4routing-scale-avf-pdr-tsa}
-            \label{fig:3n-icx-e810cq-1518b-ipsec-aes128gcm-ip4routing-scale-avf-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-imix-ipsec-ip4routing-base-scale-avf-avf-pdr-tsa}
+            \label{fig:3n-icx-e810cq-imix-ipsec-ip4routing-base-scale-avf-pdr-tsa}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-imix-ipsec-aes128gcm-ip4routing-scale-avf
------------------------------------------
-
-..
-    .. raw:: html
-
-        <center>
-        <iframe id="1" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-imix-ipsec-aes128gcm-ip4routing-scale-avf-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]{3n-icx-e810cq-imix-ipsec-aes128gcm-ip4routing-scale-avf-ndr-tsa}
-                \label{fig:3n-icx-e810cq-imix-ipsec-aes128gcm-ip4routing-scale-avf-ndr-tsa}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
+1518b-2t1c-ipsec-ip4routing-scale-avf
+-------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="2" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-imix-ipsec-aes128gcm-ip4routing-scale-avf-pdr-tsa.html"></iframe>
+    <iframe id="3" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-1518b-ipsec-ip4routing-base-scale-avf-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -155,42 +89,18 @@ imix-ipsec-aes128gcm-ip4routing-scale-avf
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-imix-ipsec-aes128gcm-ip4routing-scale-avf-pdr-tsa}
-            \label{fig:3n-icx-e810cq-imix-ipsec-aes128gcm-ip4routing-scale-avf-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-1518b-ipsec-ip4routing-base-scale-avf-ndr-tsa}
+            \label{fig:3n-icx-e810cq-1518b-ipsec-ip4routing-base-scale-avf-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-ipsec-aes256gcm-ip4routing-scale-avf
-----------------------------------------
-
-..
-    .. raw:: html
-
-        <center>
-        <iframe id="2101" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-64b-ipsec-aes256gcm-ip4routing-scale-avf-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]{3n-icx-e810cq-64b-ipsec-aes256gcm-ip4routing-scale-avf-ndr-tsa}
-                \label{fig:3n-icx-e810cq-64b-ipsec-aes256gcm-ip4routing-scale-avf-ndr-tsa}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
 .. raw:: html
 
     <center>
-    <iframe id="2102" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-64b-ipsec-aes256gcm-ip4routing-scale-avf-pdr-tsa.html"></iframe>
+    <iframe id="4" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-1518b-ipsec-ip4routing-base-scale-avf-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -199,42 +109,41 @@ imix-ipsec-aes128gcm-ip4routing-scale-avf
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-64b-ipsec-aes256gcm-ip4routing-scale-avf-pdr-tsa}
-            \label{fig:3n-icx-e810cq-64b-ipsec-aes256gcm-ip4routing-scale-avf-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-1518b-ipsec-ip4routing-base-scale-avf-avf-pdr-tsa}
+            \label{fig:3n-icx-e810cq-1518b-ipsec-ip4routing-base-scale-avf-pdr-tsa}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-1518b-ipsec-aes256gcm-ip4routing-scale-avf
-------------------------------------------
+imix-2t1c-ipsec-ip4routing-scale-dpdk
+-------------------------------------
 
-..
-    .. raw:: html
+.. raw:: html
 
-        <center>
-        <iframe id="201" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-1518b-ipsec-aes256gcm-ip4routing-scale-avf-ndr-tsa.html"></iframe>
-        <p><br></p>
-        </center>
+    <center>
+    <iframe id="5" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-imix-ipsec-ip4routing-base-scale-dpdk-ndr-tsa.html"></iframe>
+    <p><br></p>
+    </center>
 
-    .. raw:: latex
+.. raw:: latex
 
-        \begin{figure}[H]
-            \centering
-                \graphicspath{{../_build/_static/vpp/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-1518b-ipsec-aes256gcm-ip4routing-scale-avf-ndr-tsa}
-                \label{fig:3n-icx-e810cq-1518b-ipsec-aes256gcm-ip4routing-scale-avf-ndr-tsa}
-        \end{figure}
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-imix-ipsec-ip4routing-base-scale-dpdk-ndr-tsa}
+            \label{fig:3n-icx-e810cq-imix-ipsec-ip4routing-base-scale-dpdk-ndr-tsa}
+    \end{figure}
 
-    .. raw:: latex
+.. raw:: latex
 
-        \clearpage
+    \clearpage
 
 .. raw:: html
 
     <center>
-    <iframe id="202" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-1518b-ipsec-aes256gcm-ip4routing-scale-avf-pdr-tsa.html"></iframe>
+    <iframe id="6" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-imix-ipsec-ip4routing-base-scale-dpdk-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -243,42 +152,41 @@ imix-ipsec-aes128gcm-ip4routing-scale-avf
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-1518b-ipsec-aes256gcm-ip4routing-scale-avf-pdr-tsa}
-            \label{fig:3n-icx-e810cq-1518b-ipsec-aes256gcm-ip4routing-scale-avf-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-imix-ipsec-ip4routing-base-scale-dpdk-avf-pdr-tsa}
+            \label{fig:3n-icx-e810cq-imix-ipsec-ip4routing-base-scale-dpdk-pdr-tsa}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-imix-ipsec-aes256gcm-ip4routing-scale-avf
------------------------------------------
+1518b-2t1c-ipsec-ip4routing-scale-avf
+-------------------------------------
 
-..
-    .. raw:: html
+.. raw:: html
 
-        <center>
-        <iframe id="21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-imix-ipsec-aes256gcm-ip4routing-scale-avf-ndr-tsa.html"></iframe>
-        <p><br></p>
-        </center>
+    <center>
+    <iframe id="7" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-1518b-ipsec-ip4routing-base-scale-dpdk-ndr-tsa.html"></iframe>
+    <p><br></p>
+    </center>
 
-    .. raw:: latex
+.. raw:: latex
 
-        \begin{figure}[H]
-            \centering
-                \graphicspath{{../_build/_static/vpp/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-imix-ipsec-aes256gcm-ip4routing-scale-avf-ndr-tsa}
-                \label{fig:3n-icx-e810cq-imix-ipsec-aes256gcm-ip4routing-scale-avf-ndr-tsa}
-        \end{figure}
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-1518b-ipsec-ip4routing-base-scale-dpdk-ndr-tsa}
+            \label{fig:3n-icx-e810cq-1518b-ipsec-ip4routing-base-scale-dpdk-ndr-tsa}
+    \end{figure}
 
-    .. raw:: latex
+.. raw:: latex
 
-        \clearpage
+    \clearpage
 
 .. raw:: html
 
     <center>
-    <iframe id="22" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-imix-ipsec-aes256gcm-ip4routing-scale-avf-pdr-tsa.html"></iframe>
+    <iframe id="8" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-1518b-ipsec-ip4routing-base-scale-dpdk-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -287,6 +195,6 @@ imix-ipsec-aes256gcm-ip4routing-scale-avf
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-imix-ipsec-aes256gcm-ip4routing-scale-avf-pdr-tsa}
-            \label{fig:3n-icx-e810cq-imix-ipsec-aes256gcm-ip4routing-scale-avf-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-1518b-ipsec-ip4routing-base-scale-dpdk-avf-pdr-tsa}
+            \label{fig:3n-icx-e810cq-1518b-ipsec-ip4routing-base-scale-dpdk-pdr-tsa}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ipsec.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ipsec.rst
index 37eb12fc32..46d57011f3 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ipsec.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ipsec.rst
@@ -22,8 +22,6 @@ CSIT source code for the test cases used for plots can be found in
 .. toctree::
 
     ipsec-3n-skx-xxv710
+    ipsec-3n-icx-e810cq
     ipsec-3n-tsh-x520
     ipsec-3n-dnv-x553
-
-..
-    ipsec-3n-icx-e810cq
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-3n-icx-e810cq.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-3n-icx-e810cq.rst
new file mode 100644
index 0000000000..7ecae4a581
--- /dev/null
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-3n-icx-e810cq.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>
+
+3n-icx-e810cq
+~~~~~~~~~~~~~
+
+64b-l2switching-base-[avf,dpdk]
+-------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-64b-l2switching-base-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]{3n-icx-e810cq-64b-l2switching-base-ndr-tsa}
+            \label{fig:3n-icx-e810cq-64b-l2switching-base-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/3n-icx-e810cq-64b-l2switching-base-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]{3n-icx-e810cq-64b-l2switching-base-pdr-tsa}
+            \label{fig:3n-icx-e810cq-64b-l2switching-base-pdr-tsa}
+    \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2.rst
index 5e515b1338..f1aad3520b 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2.rst
@@ -27,6 +27,7 @@ CSIT source code for the test cases used for plots can be found in
     l2-2n-clx-x710
     l2-2n-clx-cx556a
     l2-2n-icx-e810cq
+    l2-3n-icx-e810cq
     l2-2n-zn2-xxv710
     l2-2n-zn2-x710
     l2-2n-zn2-cx556a
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/srv6-3n-icx-e810cq.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/srv6-3n-icx-e810cq.rst
new file mode 100644
index 0000000000..b4ce456047
--- /dev/null
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/srv6-3n-icx-e810cq.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>
+
+3n-icx-e810cq
+~~~~~~~~~~~~~
+
+78b-srv6-ip6routing-base-avf
+----------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-78b-srv6-ip6routing-base-avf-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]{3n-icx-e810cq-78b-srv6-ip6routing-base-avf-ndr-tsa}
+            \label{fig:3n-icx-e810cq-78b-srv6-ip6routing-base-avf-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/3n-icx-e810cq-78b-srv6-ip6routing-base-avf-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]{3n-icx-e810cq-78b-srv6-ip6routing-base-avf-pdr-tsa}
+            \label{fig:3n-icx-e810cq-78b-srv6-ip6routing-base-avf-pdr-tsa}
+    \end{figure}
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 0b58be7975..b7335eb282 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
@@ -20,6 +20,7 @@ CSIT source code for the test cases used for plots can be found in
 .. toctree::
 
     srv6-3n-skx-xxv710
+    srv6-3n-icx-e810cq
     srv6-3n-tsh-x520
 
 ..