From 31407268f1875d3701ed08896ec82ea678c6bbab Mon Sep 17 00:00:00 2001
From: Tibor Frank <tifrank@cisco.com>
Date: Thu, 9 Feb 2023 12:53:31 +0100
Subject: Report: Add 2n-icx e810cq

Signed-off-by: Tibor Frank <tifrank@cisco.com>
Change-Id: I78d67ff96a6fcd36e8d8e2d61c64d00dc11eba48
(cherry picked from commit ac578bf75f7056607d16a177edd2dc78d4166484)
---
 .../container_memif-2n-icx-e810cq.rst              |  71 ++++++++
 .../packet_throughput_graphs/container_memif.rst   |   1 +
 .../packet_throughput_graphs/ip4-2n-icx-e810cq.rst | 200 +++++++++++++++++++++
 .../packet_throughput_graphs/ip4.rst               |   1 +
 .../ip4_tunnels-2n-icx-e810cq.rst                  |  71 ++++++++
 .../packet_throughput_graphs/ip4_tunnels.rst       |   1 +
 .../packet_throughput_graphs/ip6-2n-icx-e810cq.rst | 157 ++++++++++++++++
 .../packet_throughput_graphs/ip6.rst               |   1 +
 .../packet_throughput_graphs/l2-2n-icx-e810cq.rst  | 114 ++++++++++++
 .../packet_throughput_graphs/l2.rst                |   1 +
 .../nat44-det-bidir-2n-clx-xxv710.rst              |  71 ++++++++
 .../nat44-det-bidir-2n-clx.rst                     |  71 --------
 .../nat44-det-bidir-2n-icx-e810cq.rst              |  71 ++++++++
 .../nat44-det-bidir-2n-icx-xxv710.rst              |  71 ++++++++
 .../nat44-det-bidir-2n-icx.rst                     |  71 --------
 .../packet_throughput_graphs/nat44-det-bidir.rst   |   5 +-
 .../nat44-ed-tcp-cps-2n-clx-xxv710.rst             |  71 ++++++++
 .../nat44-ed-tcp-cps-2n-clx.rst                    |  71 --------
 .../nat44-ed-tcp-cps-2n-icx-e810cq.rst             |  71 ++++++++
 .../nat44-ed-tcp-cps-2n-icx-xxv710.rst             |  71 ++++++++
 .../nat44-ed-tcp-cps-2n-icx.rst                    |  71 --------
 .../packet_throughput_graphs/nat44-ed-tcp-cps.rst  |   5 +-
 .../nat44-ed-tcp-tput-2n-clx-xxv710.rst            |  71 ++++++++
 .../nat44-ed-tcp-tput-2n-clx.rst                   |  71 --------
 .../nat44-ed-tcp-tput-2n-icx-e810cq.rst            |  71 ++++++++
 .../nat44-ed-tcp-tput-2n-icx-xxv710.rst            |  71 ++++++++
 .../nat44-ed-tcp-tput-2n-icx.rst                   |  71 --------
 .../packet_throughput_graphs/nat44-ed-tcp-tput.rst |   5 +-
 .../nat44-ed-udp-cps-2n-clx-xxv710.rst             |  71 ++++++++
 .../nat44-ed-udp-cps-2n-clx.rst                    |  71 --------
 .../nat44-ed-udp-cps-2n-icx-e810cq.rst             |  71 ++++++++
 .../nat44-ed-udp-cps-2n-icx-xxv710.rst             |  71 ++++++++
 .../nat44-ed-udp-cps-2n-icx.rst                    |  71 --------
 .../packet_throughput_graphs/nat44-ed-udp-cps.rst  |   5 +-
 .../nat44-ed-udp-tput-2n-clx-xxv710.rst            |  71 ++++++++
 .../nat44-ed-udp-tput-2n-clx.rst                   |  71 --------
 .../nat44-ed-udp-tput-2n-icx-e810cq.rst            |  71 ++++++++
 .../nat44-ed-udp-tput-2n-icx-xxv710.rst            |  71 ++++++++
 .../nat44-ed-udp-tput-2n-icx.rst                   |  71 --------
 .../packet_throughput_graphs/nat44-ed-udp-tput.rst |   5 +-
 .../nat44-ed-unidir-2n-clx-xxv710.rst              |  71 ++++++++
 .../nat44-ed-unidir-2n-clx.rst                     |  71 --------
 .../nat44-ed-unidir-2n-icx-e810cq.rst              |  71 ++++++++
 .../nat44-ed-unidir-2n-icx-xxv710.rst              |  71 ++++++++
 .../nat44-ed-unidir-2n-icx.rst                     |  71 --------
 .../packet_throughput_graphs/nat44-ed-unidir.rst   |   5 +-
 .../vm_vhost-2n-icx-e810cq.rst                     |  71 ++++++++
 .../packet_throughput_graphs/vm_vhost.rst          |   1 +
 .../container_memif-2n-icx-e810cq.rst              |  71 ++++++++
 .../container_memif.rst                            |   1 +
 .../ip4-2n-icx-e810cq.rst                          | 200 +++++++++++++++++++++
 .../throughput_speedup_multi_core/ip4.rst          |   1 +
 .../ip4_tunnels-2n-icx-e810cq.rst                  |  71 ++++++++
 .../throughput_speedup_multi_core/ip4_tunnels.rst  |   1 +
 .../ip6-2n-icx-e810cq.rst                          | 157 ++++++++++++++++
 .../throughput_speedup_multi_core/ip6.rst          |   1 +
 .../l2-2n-icx-e810cq.rst                           | 114 ++++++++++++
 .../l2-2n-icx-xxv710.rst                           |   2 +-
 .../throughput_speedup_multi_core/l2.rst           |   1 +
 .../nat44-det-bidir-2n-clx-xxv710.rst              |  71 ++++++++
 .../nat44-det-bidir-2n-clx.rst                     |  71 --------
 .../nat44-det-bidir-2n-icx-e810cq.rst              |  71 ++++++++
 .../nat44-det-bidir-2n-icx-xxv710.rst              |  71 ++++++++
 .../nat44-det-bidir-2n-icx.rst                     |  71 --------
 .../nat44-det-bidir.rst                            |   5 +-
 .../nat44-ed-tcp-cps-2n-clx-xxv710.rst             |  71 ++++++++
 .../nat44-ed-tcp-cps-2n-clx.rst                    |  71 --------
 .../nat44-ed-tcp-cps-2n-icx-e810cq.rst             |  71 ++++++++
 .../nat44-ed-tcp-cps-2n-icx-xxv710.rst             |  71 ++++++++
 .../nat44-ed-tcp-cps-2n-icx.rst                    |  71 --------
 .../nat44-ed-tcp-cps.rst                           |   5 +-
 .../nat44-ed-tcp-tput-2n-clx-xxv710.rst            |  71 ++++++++
 .../nat44-ed-tcp-tput-2n-clx.rst                   |  71 --------
 .../nat44-ed-tcp-tput-2n-icx-e810cq.rst            |  71 ++++++++
 .../nat44-ed-tcp-tput-2n-icx-xxv710.rst            |  71 ++++++++
 .../nat44-ed-tcp-tput-2n-icx.rst                   |  71 --------
 .../nat44-ed-tcp-tput.rst                          |   5 +-
 .../nat44-ed-udp-cps-2n-clx-xxv710.rst             |  71 ++++++++
 .../nat44-ed-udp-cps-2n-clx.rst                    |  71 --------
 .../nat44-ed-udp-cps-2n-icx-e810cq.rst             |  71 ++++++++
 .../nat44-ed-udp-cps-2n-icx-xxv710.rst             |  71 ++++++++
 .../nat44-ed-udp-cps-2n-icx.rst                    |  71 --------
 .../nat44-ed-udp-cps.rst                           |   5 +-
 .../nat44-ed-udp-tput-2n-clx-xxv710.rst            |  71 ++++++++
 .../nat44-ed-udp-tput-2n-clx.rst                   |  71 --------
 .../nat44-ed-udp-tput-2n-icx-e810cq.rst            |  71 ++++++++
 .../nat44-ed-udp-tput-2n-icx-xxv710.rst            |  71 ++++++++
 .../nat44-ed-udp-tput-2n-icx.rst                   |  71 --------
 .../nat44-ed-udp-tput.rst                          |   5 +-
 .../nat44-ed-unidir-2n-clx-xxv710.rst              |  71 ++++++++
 .../nat44-ed-unidir-2n-clx.rst                     |  71 --------
 .../nat44-ed-unidir-2n-icx-e810cq.rst              |  71 ++++++++
 .../nat44-ed-unidir-2n-icx-xxv710.rst              |  71 ++++++++
 .../nat44-ed-unidir-2n-icx.rst                     |  71 --------
 .../nat44-ed-unidir.rst                            |   5 +-
 .../vm_vhost-2n-icx-e810cq.rst                     |  71 ++++++++
 .../throughput_speedup_multi_core/vm_vhost.rst     |   1 +
 97 files changed, 3973 insertions(+), 1729 deletions(-)
 create mode 100644 docs/report/vpp_performance_tests/packet_throughput_graphs/container_memif-2n-icx-e810cq.rst
 create mode 100644 docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-icx-e810cq.rst
 create mode 100644 docs/report/vpp_performance_tests/packet_throughput_graphs/ip4_tunnels-2n-icx-e810cq.rst
 create mode 100644 docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-icx-e810cq.rst
 create mode 100644 docs/report/vpp_performance_tests/packet_throughput_graphs/l2-2n-icx-e810cq.rst
 create mode 100644 docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-det-bidir-2n-clx-xxv710.rst
 delete mode 100644 docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-det-bidir-2n-clx.rst
 create mode 100644 docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-det-bidir-2n-icx-e810cq.rst
 create mode 100644 docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-det-bidir-2n-icx-xxv710.rst
 delete mode 100644 docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-det-bidir-2n-icx.rst
 create mode 100644 docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-tcp-cps-2n-clx-xxv710.rst
 delete mode 100644 docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-tcp-cps-2n-clx.rst
 create mode 100644 docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-tcp-cps-2n-icx-e810cq.rst
 create mode 100644 docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-tcp-cps-2n-icx-xxv710.rst
 delete mode 100644 docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-tcp-cps-2n-icx.rst
 create mode 100644 docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-tcp-tput-2n-clx-xxv710.rst
 delete mode 100644 docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-tcp-tput-2n-clx.rst
 create mode 100644 docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-tcp-tput-2n-icx-e810cq.rst
 create mode 100644 docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-tcp-tput-2n-icx-xxv710.rst
 delete mode 100644 docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-tcp-tput-2n-icx.rst
 create mode 100644 docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-udp-cps-2n-clx-xxv710.rst
 delete mode 100644 docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-udp-cps-2n-clx.rst
 create mode 100644 docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-udp-cps-2n-icx-e810cq.rst
 create mode 100644 docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-udp-cps-2n-icx-xxv710.rst
 delete mode 100644 docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-udp-cps-2n-icx.rst
 create mode 100644 docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-udp-tput-2n-clx-xxv710.rst
 delete mode 100644 docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-udp-tput-2n-clx.rst
 create mode 100644 docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-udp-tput-2n-icx-e810cq.rst
 create mode 100644 docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-udp-tput-2n-icx-xxv710.rst
 delete mode 100644 docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-udp-tput-2n-icx.rst
 create mode 100644 docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-unidir-2n-clx-xxv710.rst
 delete mode 100644 docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-unidir-2n-clx.rst
 create mode 100644 docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-unidir-2n-icx-e810cq.rst
 create mode 100644 docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-unidir-2n-icx-xxv710.rst
 delete mode 100644 docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-unidir-2n-icx.rst
 create mode 100644 docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-2n-icx-e810cq.rst
 create mode 100644 docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif-2n-icx-e810cq.rst
 create mode 100644 docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-icx-e810cq.rst
 create mode 100644 docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4_tunnels-2n-icx-e810cq.rst
 create mode 100644 docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-icx-e810cq.rst
 create mode 100644 docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-2n-icx-e810cq.rst
 create mode 100644 docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-det-bidir-2n-clx-xxv710.rst
 delete mode 100644 docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-det-bidir-2n-clx.rst
 create mode 100644 docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-det-bidir-2n-icx-e810cq.rst
 create mode 100644 docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-det-bidir-2n-icx-xxv710.rst
 delete mode 100644 docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-det-bidir-2n-icx.rst
 create mode 100644 docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-tcp-cps-2n-clx-xxv710.rst
 delete mode 100644 docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-tcp-cps-2n-clx.rst
 create mode 100644 docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-tcp-cps-2n-icx-e810cq.rst
 create mode 100644 docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-tcp-cps-2n-icx-xxv710.rst
 delete mode 100644 docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-tcp-cps-2n-icx.rst
 create mode 100644 docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-tcp-tput-2n-clx-xxv710.rst
 delete mode 100644 docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-tcp-tput-2n-clx.rst
 create mode 100644 docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-tcp-tput-2n-icx-e810cq.rst
 create mode 100644 docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-tcp-tput-2n-icx-xxv710.rst
 delete mode 100644 docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-tcp-tput-2n-icx.rst
 create mode 100644 docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-udp-cps-2n-clx-xxv710.rst
 delete mode 100644 docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-udp-cps-2n-clx.rst
 create mode 100644 docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-udp-cps-2n-icx-e810cq.rst
 create mode 100644 docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-udp-cps-2n-icx-xxv710.rst
 delete mode 100644 docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-udp-cps-2n-icx.rst
 create mode 100644 docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-udp-tput-2n-clx-xxv710.rst
 delete mode 100644 docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-udp-tput-2n-clx.rst
 create mode 100644 docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-udp-tput-2n-icx-e810cq.rst
 create mode 100644 docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-udp-tput-2n-icx-xxv710.rst
 delete mode 100644 docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-udp-tput-2n-icx.rst
 create mode 100644 docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-unidir-2n-clx-xxv710.rst
 delete mode 100644 docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-unidir-2n-clx.rst
 create mode 100644 docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-unidir-2n-icx-e810cq.rst
 create mode 100644 docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-unidir-2n-icx-xxv710.rst
 delete mode 100644 docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-unidir-2n-icx.rst
 create mode 100644 docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-2n-icx-e810cq.rst

(limited to 'docs/report/vpp_performance_tests')

diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/container_memif-2n-icx-e810cq.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/container_memif-2n-icx-e810cq.rst
new file mode 100644
index 0000000000..62497bd85e
--- /dev/null
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/container_memif-2n-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>
+
+2n-icx-e810cq
+~~~~~~~~~~~~~
+
+64b-2t1c-memif-base
+-------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="101" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-2t1c-memif-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]{2n-icx-e810cq-64b-2t1c-memif-base-ndr}
+            \label{fig:2n-icx-e810cq-64b-2t1c-memif-base-ndr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="102" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-2t1c-memif-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]{2n-icx-e810cq-64b-2t1c-memif-base-pdr}
+            \label{fig:2n-icx-e810cq-64b-2t1c-memif-base-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 f299927ede..a71c0644fa 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
@@ -18,6 +18,7 @@ CSIT source code for the test cases used for plots can be found in
 .. toctree::
 
     container_memif-2n-icx-xxv710
+    container_memif-2n-icx-e810cq
     container_memif-2n-clx-xxv710
     container_memif-2n-clx-cx556a
     container_memif-2n-clx-e810cq
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-icx-e810cq.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-icx-e810cq.rst
new file mode 100644
index 0000000000..7662b31ddc
--- /dev/null
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-icx-e810cq.rst
@@ -0,0 +1,200 @@
+
+.. 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-icx-e810cq
+~~~~~~~~~~~~~
+
+64b-2t1c-ip4routing-base-scale-avf
+----------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-2t1c-ip4routing-base-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]{2n-icx-e810cq-64b-2t1c-ip4routing-base-scale-avf-ndr}
+            \label{fig:2n-icx-e810cq-64b-2t1c-ip4routing-base-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/2n-icx-e810cq-64b-2t1c-ip4routing-base-scale-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]{2n-icx-e810cq-64b-2t1c-ip4routing-base-scale-avf-pdr}
+            \label{fig:2n-icx-e810cq-64b-2t1c-ip4routing-base-scale-avf-pdr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+64b-2t1c-ip4routing-base-scale-dpdk
+-----------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-2t1c-ip4routing-base-scale-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-icx-e810cq-64b-2t1c-ip4routing-base-scale-dpdk-ndr}
+            \label{fig:2n-icx-e810cq-64b-2t1c-ip4routing-base-scale-dpdk-ndr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-2t1c-ip4routing-base-scale-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-icx-e810cq-64b-2t1c-ip4routing-base-scale-dpdk-pdr}
+            \label{fig:2n-icx-e810cq-64b-2t1c-ip4routing-base-scale-dpdk-pdr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+64b-2t1c-ip4routing-base-scale-af_xdp
+-------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="11a" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-2t1c-ip4routing-base-scale-af_xdp-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-icx-e810cq-64b-2t1c-ip4routing-base-scale-af_xdp-ndr}
+            \label{fig:2n-icx-e810cq-64b-2t1c-ip4routing-base-scale-af_xdp-ndr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="12a" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-2t1c-ip4routing-base-scale-af_xdp-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-icx-e810cq-64b-2t1c-ip4routing-base-scale-af_xdp-pdr}
+            \label{fig:2n-icx-e810cq-64b-2t1c-ip4routing-base-scale-af_xdp-pdr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+64b-2t1c-features-ip4routing-base-avf
+-------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="221" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-2t1c-features-ip4routing-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]{2n-icx-e810cq-64b-2t1c-features-ip4routing-base-avf-ndr}
+            \label{fig:2n-icx-e810cq-64b-2t1c-features-ip4routing-base-avf-ndr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="222" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-2t1c-features-ip4routing-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]{2n-icx-e810cq-64b-2t1c-features-ip4routing-base-avf-pdr}
+            \label{fig:2n-icx-e810cq-64b-2t1c-features-ip4routing-base-avf-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 bbdab6c2e9..7cca944d66 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4.rst
@@ -18,6 +18,7 @@ CSIT source code for the test cases used for plots can be found in
 .. toctree::
 
     ip4-2n-icx-xxv710
+    ip4-2n-icx-e810cq
     ip4-3n-icx-xxv710
     ip4-2n-clx-xxv710
     ip4-2n-clx-x710
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4_tunnels-2n-icx-e810cq.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4_tunnels-2n-icx-e810cq.rst
new file mode 100644
index 0000000000..67cce10b2f
--- /dev/null
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4_tunnels-2n-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>
+
+2n-icx-e810cq
+~~~~~~~~~~~~~
+
+64b-2t1c-ethip4--ethip4udpgeneve-avf
+------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="101" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-2t1c-ethip4--ethip4udpgeneve-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]{2n-icx-e810cq-64b-2t1c-ethip4--ethip4udpgeneve-avf-ndr}
+            \label{fig:2n-icx-e810cq-64b-2t1c-ethip4--ethip4udpgeneve-avf-ndr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="102" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-2t1c-ethip4--ethip4udpgeneve-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]{2n-icx-e810cq-64b-2t1c-ethip4--ethip4udpgeneve-avf-pdr}
+            \label{fig:2n-icx-e810cq-64b-2t1c-ethip4--ethip4udpgeneve-avf-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 dcac4d36ac..d3c13fcb67 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
@@ -18,6 +18,7 @@ CSIT source code for the test cases used for plots can be found in
 .. toctree::
 
     ip4_tunnels-2n-icx-xxv710
+    ip4_tunnels-2n-icx-e810cq
     ip4_tunnels-3n-icx-xxv710
     ip4_tunnels-3n-icx-e810xxv
     ip4_tunnels-2n-clx-xxv710
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-icx-e810cq.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-icx-e810cq.rst
new file mode 100644
index 0000000000..83b32bcb58
--- /dev/null
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-icx-e810cq.rst
@@ -0,0 +1,157 @@
+
+.. 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-icx-e810cq
+~~~~~~~~~~~~~
+
+78b-2t1c-ip6routing-base-scale-avf
+----------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="101" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-78b-2t1c-ip6routing-base-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]{2n-icx-e810cq-78b-2t1c-ip6routing-base-scale-avf-ndr}
+            \label{fig:2n-icx-e810cq-78b-2t1c-ip6routing-base-scale-avf-ndr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="102" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-78b-2t1c-ip6routing-base-scale-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]{2n-icx-e810cq-78b-2t1c-ip6routing-base-scale-avf-pdr}
+            \label{fig:2n-icx-e810cq-78b-2t1c-ip6routing-base-scale-avf-pdr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+78b-2t1c-ip6routing-base-scale-dpdk
+-----------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-78b-2t1c-ip6routing-base-scale-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-icx-e810cq-78b-2t1c-ip6routing-base-scale-dpdk-ndr}
+            \label{fig:2n-icx-e810cq-78b-2t1c-ip6routing-base-scale-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-icx-e810cq-78b-2t1c-ip6routing-base-scale-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-icx-e810cq-78b-2t1c-ip6routing-base-scale-dpdk-pdr}
+            \label{fig:2n-icx-e810cq-78b-2t1c-ip6routing-base-scale-dpdk-pdr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+78b-2t1c-ip6routing-base-scale-af_xdp
+-------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-78b-2t1c-ip6routing-base-scale-af_xdp-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-icx-e810cq-78b-2t1c-ip6routing-base-scale-af_xdp-ndr}
+            \label{fig:2n-icx-e810cq-78b-2t1c-ip6routing-base-scale-af_xdp-ndr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-78b-2t1c-ip6routing-base-scale-af_xdp-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-icx-e810cq-78b-2t1c-ip6routing-base-scale-af_xdp-pdr}
+            \label{fig:2n-icx-e810cq-78b-2t1c-ip6routing-base-scale-af_xdp-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 fb8bdc785d..4971afd837 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6.rst
@@ -18,6 +18,7 @@ CSIT source code for the test cases used for plots can be found in
 .. toctree::
 
     ip6-2n-icx-xxv710
+    ip6-2n-icx-e810cq
     ip6-3n-icx-xxv710
     ip6-2n-clx-xxv710
     ip6-2n-clx-x710
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-2n-icx-e810cq.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-2n-icx-e810cq.rst
new file mode 100644
index 0000000000..22829a3d67
--- /dev/null
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-2n-icx-e810cq.rst
@@ -0,0 +1,114 @@
+
+.. 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-icx-e810cq
+~~~~~~~~~~~~~
+
+64b-2t1c-l2switching-base-scale-avf
+-----------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="121" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-2t1c-l2switching-base-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]{2n-icx-e810cq-64b-2t1c-l2switching-base-scale-avf-ndr}
+            \label{fig:2n-icx-e810cq-64b-2t1c-l2switching-base-scale-avf-ndr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="122" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-2t1c-l2switching-base-scale-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]{2n-icx-e810cq-64b-2t1c-l2switching-base-scale-avf-pdr}
+            \label{fig:2n-icx-e810cq-64b-2t1c-l2switching-base-scale-avf-pdr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+64b-2t1c-l2switching-base-scale-dpdk
+------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-2t1c-l2switching-base-scale-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-icx-e810cq-64b-2t1c-l2switching-base-scale-dpdk-ndr}
+            \label{fig:2n-icx-e810cq-64b-2t1c-l2switching-base-scale-dpdk-ndr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="22" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-2t1c-l2switching-base-scale-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-icx-e810cq-64b-2t1c-l2switching-base-scale-dpdk-pdr}
+            \label{fig:2n-icx-e810cq-64b-2t1c-l2switching-base-scale-dpdk-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 f419b6e1be..0abd955533 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/l2.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/l2.rst
@@ -18,6 +18,7 @@ CSIT source code for the test cases used for plots can be found in
 .. toctree::
 
     l2-2n-icx-xxv710
+    l2-2n-icx-e810cq
     l2-3n-icx-xxv710
     l2-2n-clx-xxv710
     l2-2n-clx-x710
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-det-bidir-2n-clx-xxv710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-det-bidir-2n-clx-xxv710.rst
new file mode 100644
index 0000000000..ec56e7f4fc
--- /dev/null
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-det-bidir-2n-clx-xxv710.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-clx-xxv710
+~~~~~~~~~~~~~
+
+64b-nat44det-ip4routing-stl-bidir-avf
+-------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="01n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-stl-bidir-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]{2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-stl-bidir-avf-ndr}
+            \label{fig:2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-stl-bidir-avf-ndr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="01p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-stl-bidir-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]{2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-stl-bidir-avf-pdr}
+            \label{fig:2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-stl-bidir-avf-pdr}
+    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-det-bidir-2n-clx.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-det-bidir-2n-clx.rst
deleted file mode 100644
index ec56e7f4fc..0000000000
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-det-bidir-2n-clx.rst
+++ /dev/null
@@ -1,71 +0,0 @@
-
-.. 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-clx-xxv710
-~~~~~~~~~~~~~
-
-64b-nat44det-ip4routing-stl-bidir-avf
--------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="01n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-stl-bidir-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]{2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-stl-bidir-avf-ndr}
-            \label{fig:2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-stl-bidir-avf-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="01p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-stl-bidir-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]{2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-stl-bidir-avf-pdr}
-            \label{fig:2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-stl-bidir-avf-pdr}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-det-bidir-2n-icx-e810cq.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-det-bidir-2n-icx-e810cq.rst
new file mode 100644
index 0000000000..91c3e601ff
--- /dev/null
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-det-bidir-2n-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>
+
+2n-icx-e810cq
+~~~~~~~~~~~~~
+
+64b-nat44det-ip4routing-stl-bidir-avf
+-------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="01n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-2t1c-nat44det-ip4routing-stl-bidir-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]{2n-icx-e810cq-64b-2t1c-nat44det-ip4routing-stl-bidir-avf-ndr}
+            \label{fig:2n-icx-e810cq-64b-2t1c-nat44det-ip4routing-stl-bidir-avf-ndr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="01p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-2t1c-nat44det-ip4routing-stl-bidir-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]{2n-icx-e810cq-64b-2t1c-nat44det-ip4routing-stl-bidir-avf-pdr}
+            \label{fig:2n-icx-e810cq-64b-2t1c-nat44det-ip4routing-stl-bidir-avf-pdr}
+    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-det-bidir-2n-icx-xxv710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-det-bidir-2n-icx-xxv710.rst
new file mode 100644
index 0000000000..4fc1d8ae45
--- /dev/null
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-det-bidir-2n-icx-xxv710.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-icx-xxv710
+~~~~~~~~~~~~~
+
+64b-nat44det-ip4routing-stl-bidir-avf
+-------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="01n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-64b-2t1c-nat44det-ip4routing-stl-bidir-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]{2n-icx-xxv710-64b-2t1c-nat44det-ip4routing-stl-bidir-avf-ndr}
+            \label{fig:2n-icx-xxv710-64b-2t1c-nat44det-ip4routing-stl-bidir-avf-ndr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="01p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-64b-2t1c-nat44det-ip4routing-stl-bidir-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]{2n-icx-xxv710-64b-2t1c-nat44det-ip4routing-stl-bidir-avf-pdr}
+            \label{fig:2n-icx-xxv710-64b-2t1c-nat44det-ip4routing-stl-bidir-avf-pdr}
+    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-det-bidir-2n-icx.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-det-bidir-2n-icx.rst
deleted file mode 100644
index 4fc1d8ae45..0000000000
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-det-bidir-2n-icx.rst
+++ /dev/null
@@ -1,71 +0,0 @@
-
-.. 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-icx-xxv710
-~~~~~~~~~~~~~
-
-64b-nat44det-ip4routing-stl-bidir-avf
--------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="01n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-64b-2t1c-nat44det-ip4routing-stl-bidir-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]{2n-icx-xxv710-64b-2t1c-nat44det-ip4routing-stl-bidir-avf-ndr}
-            \label{fig:2n-icx-xxv710-64b-2t1c-nat44det-ip4routing-stl-bidir-avf-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="01p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-64b-2t1c-nat44det-ip4routing-stl-bidir-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]{2n-icx-xxv710-64b-2t1c-nat44det-ip4routing-stl-bidir-avf-pdr}
-            \label{fig:2n-icx-xxv710-64b-2t1c-nat44det-ip4routing-stl-bidir-avf-pdr}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-det-bidir.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-det-bidir.rst
index 29f1678a96..25b70c7cac 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-det-bidir.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-det-bidir.rst
@@ -8,5 +8,6 @@ Det BiDir
 
 .. toctree::
 
-    nat44-det-bidir-2n-icx
-    nat44-det-bidir-2n-clx
+    nat44-det-bidir-2n-icx-xxv710
+    nat44-det-bidir-2n-icx-e810cq
+    nat44-det-bidir-2n-clx-xxv710
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-tcp-cps-2n-clx-xxv710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-tcp-cps-2n-clx-xxv710.rst
new file mode 100644
index 0000000000..c0e55645fc
--- /dev/null
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-tcp-cps-2n-clx-xxv710.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-clx-xxv710
+~~~~~~~~~~~~~
+
+64b-nat44ed-ip4routing-tcp-stf-cps-avf
+--------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="07n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-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]{2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf-ndr}
+            \label{fig:2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf-ndr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="07p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-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]{2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf-pdr}
+            \label{fig:2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf-pdr}
+    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-tcp-cps-2n-clx.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-tcp-cps-2n-clx.rst
deleted file mode 100644
index c0e55645fc..0000000000
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-tcp-cps-2n-clx.rst
+++ /dev/null
@@ -1,71 +0,0 @@
-
-.. 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-clx-xxv710
-~~~~~~~~~~~~~
-
-64b-nat44ed-ip4routing-tcp-stf-cps-avf
---------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="07n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-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]{2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf-ndr}
-            \label{fig:2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="07p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-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]{2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf-pdr}
-            \label{fig:2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf-pdr}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-tcp-cps-2n-icx-e810cq.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-tcp-cps-2n-icx-e810cq.rst
new file mode 100644
index 0000000000..9325f13fc3
--- /dev/null
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-tcp-cps-2n-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>
+
+2n-icx-e810cq
+~~~~~~~~~~~~~
+
+64b-nat44ed-ip4routing-tcp-stf-cps-avf
+--------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="07n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-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]{2n-icx-e810cq-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf-ndr}
+            \label{fig:2n-icx-e810cq-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf-ndr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="07p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-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]{2n-icx-e810cq-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf-pdr}
+            \label{fig:2n-icx-e810cq-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf-pdr}
+    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-tcp-cps-2n-icx-xxv710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-tcp-cps-2n-icx-xxv710.rst
new file mode 100644
index 0000000000..482277f712
--- /dev/null
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-tcp-cps-2n-icx-xxv710.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-icx-xxv710
+~~~~~~~~~~~~~
+
+64b-nat44ed-ip4routing-tcp-stf-cps-avf
+--------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="07n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-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]{2n-icx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf-ndr}
+            \label{fig:2n-icx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf-ndr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="07p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-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]{2n-icx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf-pdr}
+            \label{fig:2n-icx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf-pdr}
+    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-tcp-cps-2n-icx.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-tcp-cps-2n-icx.rst
deleted file mode 100644
index 482277f712..0000000000
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-tcp-cps-2n-icx.rst
+++ /dev/null
@@ -1,71 +0,0 @@
-
-.. 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-icx-xxv710
-~~~~~~~~~~~~~
-
-64b-nat44ed-ip4routing-tcp-stf-cps-avf
---------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="07n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-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]{2n-icx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf-ndr}
-            \label{fig:2n-icx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="07p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-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]{2n-icx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf-pdr}
-            \label{fig:2n-icx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf-pdr}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-tcp-cps.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-tcp-cps.rst
index 0fa02ace89..de7e8cfaa5 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-tcp-cps.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-tcp-cps.rst
@@ -8,5 +8,6 @@ ED TCP CPS
 
 .. toctree::
 
-    nat44-ed-tcp-cps-2n-icx
-    nat44-ed-tcp-cps-2n-clx
+    nat44-ed-tcp-cps-2n-icx-xxv710
+    nat44-ed-tcp-cps-2n-icx-e810cq
+    nat44-ed-tcp-cps-2n-clx-xxv710
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-tcp-tput-2n-clx-xxv710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-tcp-tput-2n-clx-xxv710.rst
new file mode 100644
index 0000000000..bb3d928568
--- /dev/null
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-tcp-tput-2n-clx-xxv710.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-clx-xxv710
+~~~~~~~~~~~~~
+
+100b-nat44ed-ip4routing-tcp-tput-avf
+------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="07n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-100b-2t1c-nat44ed-ip4routing-tcp-tput-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]{2n-clx-xxv710-100b-2t1c-nat44ed-ip4routing-tcp-tput-avf-ndr}
+            \label{fig:2n-clx-xxv710-100b-2t1c-nat44ed-ip4routing-tcp-tput-avf-ndr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="07p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-100b-2t1c-nat44ed-ip4routing-tcp-tput-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]{2n-clx-xxv710-100b-2t1c-nat44ed-ip4routing-tcp-tput-avf-pdr}
+            \label{fig:2n-clx-xxv710-100b-2t1c-nat44ed-ip4routing-tcp-tput-avf-pdr}
+    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-tcp-tput-2n-clx.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-tcp-tput-2n-clx.rst
deleted file mode 100644
index bb3d928568..0000000000
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-tcp-tput-2n-clx.rst
+++ /dev/null
@@ -1,71 +0,0 @@
-
-.. 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-clx-xxv710
-~~~~~~~~~~~~~
-
-100b-nat44ed-ip4routing-tcp-tput-avf
-------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="07n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-100b-2t1c-nat44ed-ip4routing-tcp-tput-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]{2n-clx-xxv710-100b-2t1c-nat44ed-ip4routing-tcp-tput-avf-ndr}
-            \label{fig:2n-clx-xxv710-100b-2t1c-nat44ed-ip4routing-tcp-tput-avf-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="07p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-100b-2t1c-nat44ed-ip4routing-tcp-tput-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]{2n-clx-xxv710-100b-2t1c-nat44ed-ip4routing-tcp-tput-avf-pdr}
-            \label{fig:2n-clx-xxv710-100b-2t1c-nat44ed-ip4routing-tcp-tput-avf-pdr}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-tcp-tput-2n-icx-e810cq.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-tcp-tput-2n-icx-e810cq.rst
new file mode 100644
index 0000000000..a1d19d9c52
--- /dev/null
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-tcp-tput-2n-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>
+
+2n-icx-e810cq
+~~~~~~~~~~~~~
+
+100b-nat44ed-ip4routing-tcp-tput-avf
+------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="07n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-100b-2t1c-nat44ed-ip4routing-tcp-tput-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]{2n-icx-e810cq-100b-2t1c-nat44ed-ip4routing-tcp-tput-avf-ndr}
+            \label{fig:2n-icx-e810cq-100b-2t1c-nat44ed-ip4routing-tcp-tput-avf-ndr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="07p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-100b-2t1c-nat44ed-ip4routing-tcp-tput-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]{2n-icx-e810cq-100b-2t1c-nat44ed-ip4routing-tcp-tput-avf-pdr}
+            \label{fig:2n-icx-e810cq-100b-2t1c-nat44ed-ip4routing-tcp-tput-avf-pdr}
+    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-tcp-tput-2n-icx-xxv710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-tcp-tput-2n-icx-xxv710.rst
new file mode 100644
index 0000000000..e6bb7e78fb
--- /dev/null
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-tcp-tput-2n-icx-xxv710.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-icx-xxv710
+~~~~~~~~~~~~~
+
+100b-nat44ed-ip4routing-tcp-tput-avf
+------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="07n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-100b-2t1c-nat44ed-ip4routing-tcp-tput-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]{2n-icx-xxv710-100b-2t1c-nat44ed-ip4routing-tcp-tput-avf-ndr}
+            \label{fig:2n-icx-xxv710-100b-2t1c-nat44ed-ip4routing-tcp-tput-avf-ndr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="07p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-100b-2t1c-nat44ed-ip4routing-tcp-tput-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]{2n-icx-xxv710-100b-2t1c-nat44ed-ip4routing-tcp-tput-avf-pdr}
+            \label{fig:2n-icx-xxv710-100b-2t1c-nat44ed-ip4routing-tcp-tput-avf-pdr}
+    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-tcp-tput-2n-icx.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-tcp-tput-2n-icx.rst
deleted file mode 100644
index e6bb7e78fb..0000000000
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-tcp-tput-2n-icx.rst
+++ /dev/null
@@ -1,71 +0,0 @@
-
-.. 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-icx-xxv710
-~~~~~~~~~~~~~
-
-100b-nat44ed-ip4routing-tcp-tput-avf
-------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="07n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-100b-2t1c-nat44ed-ip4routing-tcp-tput-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]{2n-icx-xxv710-100b-2t1c-nat44ed-ip4routing-tcp-tput-avf-ndr}
-            \label{fig:2n-icx-xxv710-100b-2t1c-nat44ed-ip4routing-tcp-tput-avf-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="07p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-100b-2t1c-nat44ed-ip4routing-tcp-tput-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]{2n-icx-xxv710-100b-2t1c-nat44ed-ip4routing-tcp-tput-avf-pdr}
-            \label{fig:2n-icx-xxv710-100b-2t1c-nat44ed-ip4routing-tcp-tput-avf-pdr}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-tcp-tput.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-tcp-tput.rst
index 27a114e9d7..0152d22f3f 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-tcp-tput.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-tcp-tput.rst
@@ -8,5 +8,6 @@ ED TCP TPUT
 
 .. toctree::
 
-    nat44-ed-tcp-tput-2n-icx
-    nat44-ed-tcp-tput-2n-clx
+    nat44-ed-tcp-tput-2n-icx-xxv710
+    nat44-ed-tcp-tput-2n-icx-e810cq
+    nat44-ed-tcp-tput-2n-clx-xxv710
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-udp-cps-2n-clx-xxv710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-udp-cps-2n-clx-xxv710.rst
new file mode 100644
index 0000000000..9139b280b3
--- /dev/null
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-udp-cps-2n-clx-xxv710.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-clx-xxv710
+~~~~~~~~~~~~~
+
+64b-nat44ed-ip4routing-udp-stf-cps-avf
+--------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="03n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-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]{2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf-ndr}
+            \label{fig:2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf-ndr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="03p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-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]{2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf-pdr}
+            \label{fig:2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf-pdr}
+    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-udp-cps-2n-clx.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-udp-cps-2n-clx.rst
deleted file mode 100644
index 9139b280b3..0000000000
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-udp-cps-2n-clx.rst
+++ /dev/null
@@ -1,71 +0,0 @@
-
-.. 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-clx-xxv710
-~~~~~~~~~~~~~
-
-64b-nat44ed-ip4routing-udp-stf-cps-avf
---------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="03n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-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]{2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf-ndr}
-            \label{fig:2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="03p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-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]{2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf-pdr}
-            \label{fig:2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf-pdr}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-udp-cps-2n-icx-e810cq.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-udp-cps-2n-icx-e810cq.rst
new file mode 100644
index 0000000000..de60c73aca
--- /dev/null
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-udp-cps-2n-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>
+
+2n-icx-e810cq
+~~~~~~~~~~~~~
+
+64b-nat44ed-ip4routing-udp-stf-cps-avf
+--------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="03n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-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]{2n-icx-e810cq-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf-ndr}
+            \label{fig:2n-icx-e810cq-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf-ndr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="03p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-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]{2n-icx-e810cq-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf-pdr}
+            \label{fig:2n-icx-e810cq-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf-pdr}
+    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-udp-cps-2n-icx-xxv710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-udp-cps-2n-icx-xxv710.rst
new file mode 100644
index 0000000000..94ed2e7db7
--- /dev/null
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-udp-cps-2n-icx-xxv710.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-icx-xxv710
+~~~~~~~~~~~~~
+
+64b-nat44ed-ip4routing-udp-stf-cps-avf
+--------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="03n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-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]{2n-icx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf-ndr}
+            \label{fig:2n-icx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf-ndr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="03p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-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]{2n-icx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf-pdr}
+            \label{fig:2n-icx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf-pdr}
+    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-udp-cps-2n-icx.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-udp-cps-2n-icx.rst
deleted file mode 100644
index 94ed2e7db7..0000000000
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-udp-cps-2n-icx.rst
+++ /dev/null
@@ -1,71 +0,0 @@
-
-.. 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-icx-xxv710
-~~~~~~~~~~~~~
-
-64b-nat44ed-ip4routing-udp-stf-cps-avf
---------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="03n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-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]{2n-icx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf-ndr}
-            \label{fig:2n-icx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="03p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-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]{2n-icx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf-pdr}
-            \label{fig:2n-icx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf-pdr}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-udp-cps.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-udp-cps.rst
index 0995fbf4bb..311701d09d 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-udp-cps.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-udp-cps.rst
@@ -8,5 +8,6 @@ ED UDP CPS
 
 .. toctree::
 
-    nat44-ed-udp-cps-2n-icx
-    nat44-ed-udp-cps-2n-clx
+    nat44-ed-udp-cps-2n-icx-xxv710
+    nat44-ed-udp-cps-2n-icx-e810cq
+    nat44-ed-udp-cps-2n-clx-xxv710
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-udp-tput-2n-clx-xxv710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-udp-tput-2n-clx-xxv710.rst
new file mode 100644
index 0000000000..2e35dd5795
--- /dev/null
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-udp-tput-2n-clx-xxv710.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-clx-xxv710
+~~~~~~~~~~~~~
+
+100b-nat44ed-ip4routing-udp-tput-avf
+------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="103n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-100b-2t1c-nat44ed-ip4routing-udp-tput-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]{2n-clx-xxv710-100b-2t1c-nat44ed-ip4routing-udp-tput-avf-ndr}
+            \label{fig:2n-clx-xxv710-100b-2t1c-nat44ed-ip4routing-udp-tput-avf-ndr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="103p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-100b-2t1c-nat44ed-ip4routing-udp-tput-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]{2n-clx-xxv710-100b-2t1c-nat44ed-ip4routing-udp-tput-avf-pdr}
+            \label{fig:2n-clx-xxv710-100b-2t1c-nat44ed-ip4routing-udp-tput-avf-pdr}
+    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-udp-tput-2n-clx.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-udp-tput-2n-clx.rst
deleted file mode 100644
index 2e35dd5795..0000000000
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-udp-tput-2n-clx.rst
+++ /dev/null
@@ -1,71 +0,0 @@
-
-.. 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-clx-xxv710
-~~~~~~~~~~~~~
-
-100b-nat44ed-ip4routing-udp-tput-avf
-------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="103n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-100b-2t1c-nat44ed-ip4routing-udp-tput-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]{2n-clx-xxv710-100b-2t1c-nat44ed-ip4routing-udp-tput-avf-ndr}
-            \label{fig:2n-clx-xxv710-100b-2t1c-nat44ed-ip4routing-udp-tput-avf-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="103p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-100b-2t1c-nat44ed-ip4routing-udp-tput-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]{2n-clx-xxv710-100b-2t1c-nat44ed-ip4routing-udp-tput-avf-pdr}
-            \label{fig:2n-clx-xxv710-100b-2t1c-nat44ed-ip4routing-udp-tput-avf-pdr}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-udp-tput-2n-icx-e810cq.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-udp-tput-2n-icx-e810cq.rst
new file mode 100644
index 0000000000..65c2ebd95a
--- /dev/null
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-udp-tput-2n-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>
+
+2n-icx-e810cq
+~~~~~~~~~~~~~
+
+100b-nat44ed-ip4routing-udp-tput-avf
+------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="103n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-100b-2t1c-nat44ed-ip4routing-udp-tput-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]{2n-icx-e810cq-100b-2t1c-nat44ed-ip4routing-udp-tput-avf-ndr}
+            \label{fig:2n-icx-e810cq-100b-2t1c-nat44ed-ip4routing-udp-tput-avf-ndr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="103p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-100b-2t1c-nat44ed-ip4routing-udp-tput-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]{2n-icx-e810cq-100b-2t1c-nat44ed-ip4routing-udp-tput-avf-pdr}
+            \label{fig:2n-icx-e810cq-100b-2t1c-nat44ed-ip4routing-udp-tput-avf-pdr}
+    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-udp-tput-2n-icx-xxv710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-udp-tput-2n-icx-xxv710.rst
new file mode 100644
index 0000000000..ce697a0d08
--- /dev/null
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-udp-tput-2n-icx-xxv710.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-icx-xxv710
+~~~~~~~~~~~~~
+
+100b-nat44ed-ip4routing-udp-tput-avf
+------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="103n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-100b-2t1c-nat44ed-ip4routing-udp-tput-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]{2n-icx-xxv710-100b-2t1c-nat44ed-ip4routing-udp-tput-avf-ndr}
+            \label{fig:2n-icx-xxv710-100b-2t1c-nat44ed-ip4routing-udp-tput-avf-ndr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="103p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-100b-2t1c-nat44ed-ip4routing-udp-tput-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]{2n-icx-xxv710-100b-2t1c-nat44ed-ip4routing-udp-tput-avf-pdr}
+            \label{fig:2n-icx-xxv710-100b-2t1c-nat44ed-ip4routing-udp-tput-avf-pdr}
+    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-udp-tput-2n-icx.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-udp-tput-2n-icx.rst
deleted file mode 100644
index ce697a0d08..0000000000
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-udp-tput-2n-icx.rst
+++ /dev/null
@@ -1,71 +0,0 @@
-
-.. 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-icx-xxv710
-~~~~~~~~~~~~~
-
-100b-nat44ed-ip4routing-udp-tput-avf
-------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="103n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-100b-2t1c-nat44ed-ip4routing-udp-tput-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]{2n-icx-xxv710-100b-2t1c-nat44ed-ip4routing-udp-tput-avf-ndr}
-            \label{fig:2n-icx-xxv710-100b-2t1c-nat44ed-ip4routing-udp-tput-avf-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="103p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-100b-2t1c-nat44ed-ip4routing-udp-tput-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]{2n-icx-xxv710-100b-2t1c-nat44ed-ip4routing-udp-tput-avf-pdr}
-            \label{fig:2n-icx-xxv710-100b-2t1c-nat44ed-ip4routing-udp-tput-avf-pdr}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-udp-tput.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-udp-tput.rst
index 383558b8be..012d437fb7 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-udp-tput.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-udp-tput.rst
@@ -8,5 +8,6 @@ ED UDP TPUT
 
 .. toctree::
 
-    nat44-ed-udp-tput-2n-icx
-    nat44-ed-udp-tput-2n-clx
+    nat44-ed-udp-tput-2n-icx-xxv710
+    nat44-ed-udp-tput-2n-icx-e810cq
+    nat44-ed-udp-tput-2n-clx-xxv710
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-unidir-2n-clx-xxv710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-unidir-2n-clx-xxv710.rst
new file mode 100644
index 0000000000..3893362c22
--- /dev/null
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-unidir-2n-clx-xxv710.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-clx-xxv710
+~~~~~~~~~~~~~
+
+64b-nat44ed-ip4routing-stl-unidir-avf
+-------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="02n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-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]{2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf-ndr}
+            \label{fig:2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf-ndr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="02p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-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]{2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf-pdr}
+            \label{fig:2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf-pdr}
+    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-unidir-2n-clx.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-unidir-2n-clx.rst
deleted file mode 100644
index 3893362c22..0000000000
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-unidir-2n-clx.rst
+++ /dev/null
@@ -1,71 +0,0 @@
-
-.. 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-clx-xxv710
-~~~~~~~~~~~~~
-
-64b-nat44ed-ip4routing-stl-unidir-avf
--------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="02n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-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]{2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf-ndr}
-            \label{fig:2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="02p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-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]{2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf-pdr}
-            \label{fig:2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf-pdr}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-unidir-2n-icx-e810cq.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-unidir-2n-icx-e810cq.rst
new file mode 100644
index 0000000000..3750d19eb3
--- /dev/null
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-unidir-2n-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>
+
+2n-icx-e810cq
+~~~~~~~~~~~~~
+
+64b-nat44ed-ip4routing-stl-unidir-avf
+-------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="02n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-2t1c-nat44ed-ip4routing-stl-unidir-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]{2n-icx-e810cq-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf-ndr}
+            \label{fig:2n-icx-e810cq-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf-ndr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="02p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-2t1c-nat44ed-ip4routing-stl-unidir-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]{2n-icx-e810cq-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf-pdr}
+            \label{fig:2n-icx-e810cq-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf-pdr}
+    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-unidir-2n-icx-xxv710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-unidir-2n-icx-xxv710.rst
new file mode 100644
index 0000000000..0c4d630f82
--- /dev/null
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-unidir-2n-icx-xxv710.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-icx-xxv710
+~~~~~~~~~~~~~
+
+64b-nat44ed-ip4routing-stl-unidir-avf
+-------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="02n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-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]{2n-icx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf-ndr}
+            \label{fig:2n-icx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf-ndr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="02p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-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]{2n-icx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf-pdr}
+            \label{fig:2n-icx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf-pdr}
+    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-unidir-2n-icx.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-unidir-2n-icx.rst
deleted file mode 100644
index 0c4d630f82..0000000000
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-unidir-2n-icx.rst
+++ /dev/null
@@ -1,71 +0,0 @@
-
-.. 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-icx-xxv710
-~~~~~~~~~~~~~
-
-64b-nat44ed-ip4routing-stl-unidir-avf
--------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="02n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-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]{2n-icx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf-ndr}
-            \label{fig:2n-icx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="02p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-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]{2n-icx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf-pdr}
-            \label{fig:2n-icx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf-pdr}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-unidir.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-unidir.rst
index 6fc9d4f4a2..1c798900ff 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-unidir.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-ed-unidir.rst
@@ -8,5 +8,6 @@ ED UniDir
 
 .. toctree::
 
-    nat44-ed-unidir-2n-icx
-    nat44-ed-unidir-2n-clx
+    nat44-ed-unidir-2n-icx-xxv710
+    nat44-ed-unidir-2n-icx-e810cq
+    nat44-ed-unidir-2n-clx-xxv710
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-2n-icx-e810cq.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-2n-icx-e810cq.rst
new file mode 100644
index 0000000000..5c8d9e1f55
--- /dev/null
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-2n-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>
+
+2n-icx-e810cq
+~~~~~~~~~~~~~
+
+64b-2t1c-vhost-base
+-------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="101" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-2t1c-vhost-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]{2n-icx-e810cq-64b-2t1c-vhost-base-ndr}
+            \label{fig:2n-icx-e810cq-64b-2t1c-vhost-base-ndr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="102" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-2t1c-vhost-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]{2n-icx-e810cq-64b-2t1c-vhost-base-pdr}
+            \label{fig:2n-icx-e810cq-64b-2t1c-vhost-base-pdr}
+    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost.rst
index 2eba04aab1..fc1867cd8a 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost.rst
@@ -21,6 +21,7 @@ CSIT source code for the test cases used for plots can be found in
 .. toctree::
 
     vm_vhost-2n-icx-xxv710
+    vm_vhost-2n-icx-e810cq
     vm_vhost-2n-clx-xxv710
     vm_vhost-2n-clx-cx556a
     vm_vhost-2n-clx-e810cq
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif-2n-icx-e810cq.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif-2n-icx-e810cq.rst
new file mode 100644
index 0000000000..6e79a7cd58
--- /dev/null
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif-2n-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>
+
+2n-icx-e810cq
+~~~~~~~~~~~~~
+
+64b-memif-base
+--------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="101" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-memif-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]{2n-icx-e810cq-64b-memif-base-ndr-tsa}
+            \label{fig:2n-icx-e810cq-64b-memif-base-ndr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="102" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-memif-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]{2n-icx-e810cq-64b-memif-base-pdr-tsa}
+            \label{fig:2n-icx-e810cq-64b-memif-base-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 ad74dd24f6..bd78ff080a 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
@@ -20,6 +20,7 @@ CSIT source code for the test cases used for plots can be found in
 .. toctree::
 
     container_memif-2n-icx-xxv710
+    container_memif-2n-icx-e810cq
     container_memif-2n-clx-xxv710
     container_memif-2n-clx-cx556a
     container_memif-2n-clx-e810cq
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-icx-e810cq.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-icx-e810cq.rst
new file mode 100644
index 0000000000..7352ec47d9
--- /dev/null
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-icx-e810cq.rst
@@ -0,0 +1,200 @@
+
+.. 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-icx-e810cq
+~~~~~~~~~~~~~
+
+64b-ip4routing-base-scale-avf
+-----------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-ip4routing-base-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]{2n-icx-e810cq-64b-ip4routing-base-scale-avf-ndr-tsa}
+            \label{fig:2n-icx-e810cq-64b-ip4routing-base-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/2n-icx-e810cq-64b-ip4routing-base-scale-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]{2n-icx-e810cq-64b-ip4routing-base-scale-avf-pdr-tsa}
+            \label{fig:2n-icx-e810cq-64b-ip4routing-base-scale-avf-pdr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+64b-ip4routing-base-scale-dpdk
+------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-ip4routing-base-scale-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-icx-e810cq-64b-ip4routing-base-scale-dpdk-ndr-tsa}
+            \label{fig:2n-icx-e810cq-64b-ip4routing-base-scale-dpdk-ndr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-ip4routing-base-scale-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-icx-e810cq-64b-ip4routing-base-scale-dpdk-pdr-tsa}
+            \label{fig:2n-icx-e810cq-64b-ip4routing-base-scale-dpdk-pdr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+64b-ip4routing-base-scale-af_xdp
+--------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="11a" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-ip4routing-base-scale-af_xdp-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-icx-e810cq-64b-ip4routing-base-scale-af_xdp-ndr-tsa}
+            \label{fig:2n-icx-e810cq-64b-ip4routing-base-scale-af_xdp-ndr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="12a" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-ip4routing-base-scale-af_xdp-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-icx-e810cq-64b-ip4routing-base-scale-af_xdp-pdr-tsa}
+            \label{fig:2n-icx-e810cq-64b-ip4routing-base-scale-af_xdp-pdr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+64b-features-ip4routing-base-avf
+--------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="221" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-features-ip4routing-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]{2n-icx-e810cq-64b-features-ip4routing-base-avf-ndr-tsa}
+            \label{fig:2n-icx-e810cq-64b-features-ip4routing-base-avf-ndr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="222" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-features-ip4routing-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]{2n-icx-e810cq-64b-features-ip4routing-base-avf-pdr-tsa}
+            \label{fig:2n-icx-e810cq-64b-features-ip4routing-base-avf-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 39ac1667f6..2bfb9d57fb 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
@@ -20,6 +20,7 @@ CSIT source code for the test cases used for plots can be found in
 .. toctree::
 
     ip4-2n-icx-xxv710
+    ip4-2n-icx-e810cq
     ip4-3n-icx-xxv710
     ip4-2n-clx-xxv710
     ip4-2n-clx-x710
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4_tunnels-2n-icx-e810cq.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4_tunnels-2n-icx-e810cq.rst
new file mode 100644
index 0000000000..67fe1d744e
--- /dev/null
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4_tunnels-2n-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>
+
+2n-icx-e810cq
+~~~~~~~~~~~~~
+
+64b-2t1c-ethip4--ethip4udpgeneve-avf
+------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="101" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-ethip4--ethip4udpgeneve-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]{2n-icx-e810cq-64b-ethip4--ethip4udpgeneve-avf-ndr-tsa}
+            \label{fig:2n-icx-e810cq-64b-ethip4--ethip4udpgeneve-avf-ndr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="102" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-ethip4--ethip4udpgeneve-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]{2n-icx-e810cq-64b-ethip4--ethip4udpgeneve-avf-pdr-tsa}
+            \label{fig:2n-icx-e810cq-64b-ethip4--ethip4udpgeneve-avf-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 71c42a6900..0183d9b1c8 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
@@ -20,6 +20,7 @@ CSIT source code for the test cases used for plots can be found in
 .. toctree::
 
     ip4_tunnels-2n-icx-xxv710
+    ip4_tunnels-2n-icx-e810cq
     ip4_tunnels-3n-icx-xxv710
     ip4_tunnels-3n-icx-e810xxv
     ip4_tunnels-2n-clx-xxv710
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-icx-e810cq.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-icx-e810cq.rst
new file mode 100644
index 0000000000..4d67184439
--- /dev/null
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-icx-e810cq.rst
@@ -0,0 +1,157 @@
+
+.. 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-icx-e810cq
+~~~~~~~~~~~~~
+
+78b-ip6routing-base-scale-avf
+-----------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="101" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-78b-ip6routing-base-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]{2n-icx-e810cq-78b-ip6routing-base-scale-avf-ndr-tsa}
+            \label{fig:2n-icx-e810cq-78b-ip6routing-base-scale-avf-ndr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="102" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-78b-ip6routing-base-scale-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]{2n-icx-e810cq-78b-ip6routing-base-scale-avf-pdr-tsa}
+            \label{fig:2n-icx-e810cq-78b-ip6routing-base-scale-avf-pdr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+78b-ip6routing-base-scale-dpdk
+------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-78b-ip6routing-base-scale-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-icx-e810cq-78b-ip6routing-base-scale-dpdk-ndr-tsa}
+            \label{fig:2n-icx-e810cq-78b-ip6routing-base-scale-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-icx-e810cq-78b-ip6routing-base-scale-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-icx-e810cq-78b-ip6routing-base-scale-dpdk-pdr-tsa}
+            \label{fig:2n-icx-e810cq-78b-ip6routing-base-scale-dpdk-pdr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+78b-ip6routing-base-scale-af_xdp
+--------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="01a" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-78b-ip6routing-base-scale-af_xdp-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-icx-e810cq-78b-ip6routing-base-scale-af_xdp-ndr-tsa}
+            \label{fig:2n-icx-e810cq-78b-ip6routing-base-scale-af_xdp-ndr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="02a" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-78b-ip6routing-base-scale-af_xdp-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-icx-e810cq-78b-ip6routing-base-scale-af_xdp-pdr-tsa}
+            \label{fig:2n-icx-e810cq-78b-ip6routing-base-scale-af_xdp-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 92a39f34e3..89b85ad19e 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
@@ -20,6 +20,7 @@ CSIT source code for the test cases used for plots can be found in
 .. toctree::
 
     ip6-2n-icx-xxv710
+    ip6-2n-icx-e810cq
     ip6-3n-icx-xxv710
     ip6-2n-clx-xxv710
     ip6-2n-clx-x710
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-2n-icx-e810cq.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-2n-icx-e810cq.rst
new file mode 100644
index 0000000000..84434f8301
--- /dev/null
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-2n-icx-e810cq.rst
@@ -0,0 +1,114 @@
+
+.. 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-icx-e810cq
+~~~~~~~~~~~~~
+
+64b-l2switching-base-scale-avf
+------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="121" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-l2switching-base-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]{2n-icx-e810cq-64b-l2switching-base-scale-avf-ndr-tsa}
+            \label{fig:2n-icx-e810cq-64b-l2switching-base-scale-avf-ndr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="122" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-l2switching-base-scale-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]{2n-icx-e810cq-64b-l2switching-base-scale-avf-pdr-tsa}
+            \label{fig:2n-icx-e810cq-64b-l2switching-base-scale-avf-pdr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+64b-l2switching-base-scale-dpdk
+-------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-l2switching-base-scale-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-icx-e810cq-64b-l2switching-base-scale-dpdk-ndr-tsa}
+            \label{fig:2n-icx-e810cq-64b-l2switching-base-scale-dpdk-ndr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="22" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-l2switching-base-scale-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-icx-e810cq-64b-l2switching-base-scale-dpdk-pdr-tsa}
+            \label{fig:2n-icx-e810cq-64b-l2switching-base-scale-dpdk-pdr-tsa}
+    \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-2n-icx-xxv710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-2n-icx-xxv710.rst
index 2a9bdc5780..fe6592555d 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-2n-icx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-2n-icx-xxv710.rst
@@ -32,7 +32,7 @@
 ~~~~~~~~~~~~~
 
 64b-l2switching-base-scale-avf
--------------------------------
+------------------------------
 
 .. raw:: html
 
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 05c884c4a7..ffdd531970 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
@@ -20,6 +20,7 @@ CSIT source code for the test cases used for plots can be found in
 .. toctree::
 
     l2-2n-icx-xxv710
+    l2-2n-icx-e810cq
     l2-3n-icx-xxv710
     l2-2n-clx-xxv710
     l2-2n-clx-x710
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-det-bidir-2n-clx-xxv710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-det-bidir-2n-clx-xxv710.rst
new file mode 100644
index 0000000000..196b0daf40
--- /dev/null
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-det-bidir-2n-clx-xxv710.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-clx-xxv710
+~~~~~~~~~~~~~
+
+64b-nat44det-ip4routing-stl-bidir-avf
+-------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="01p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-nat44det-ip4routing-stl-bidir-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]{2n-clx-xxv710-64b-nat44det-ip4routing-stl-bidir-avf-ndr-tsa}
+            \label{fig:2n-clx-xxv710-64b-nat44det-ip4routing-stl-bidir-avf-ndr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="01n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-nat44det-ip4routing-stl-bidir-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]{2n-clx-xxv710-64b-nat44det-ip4routing-stl-bidir-avf-pdr-tsa}
+            \label{fig:2n-clx-xxv710-64b-nat44det-ip4routing-stl-bidir-avf-pdr-tsa}
+    \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-det-bidir-2n-clx.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-det-bidir-2n-clx.rst
deleted file mode 100644
index 196b0daf40..0000000000
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-det-bidir-2n-clx.rst
+++ /dev/null
@@ -1,71 +0,0 @@
-
-.. 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-clx-xxv710
-~~~~~~~~~~~~~
-
-64b-nat44det-ip4routing-stl-bidir-avf
--------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="01p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-nat44det-ip4routing-stl-bidir-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]{2n-clx-xxv710-64b-nat44det-ip4routing-stl-bidir-avf-ndr-tsa}
-            \label{fig:2n-clx-xxv710-64b-nat44det-ip4routing-stl-bidir-avf-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="01n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-nat44det-ip4routing-stl-bidir-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]{2n-clx-xxv710-64b-nat44det-ip4routing-stl-bidir-avf-pdr-tsa}
-            \label{fig:2n-clx-xxv710-64b-nat44det-ip4routing-stl-bidir-avf-pdr-tsa}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-det-bidir-2n-icx-e810cq.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-det-bidir-2n-icx-e810cq.rst
new file mode 100644
index 0000000000..728fbbee87
--- /dev/null
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-det-bidir-2n-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>
+
+2n-icx-e810cq
+~~~~~~~~~~~~~
+
+64b-nat44det-ip4routing-stl-bidir-avf
+-------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="01p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-nat44det-ip4routing-stl-bidir-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]{2n-icx-e810cq-64b-nat44det-ip4routing-stl-bidir-avf-ndr-tsa}
+            \label{fig:2n-icx-e810cq-64b-nat44det-ip4routing-stl-bidir-avf-ndr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="01n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-nat44det-ip4routing-stl-bidir-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]{2n-icx-e810cq-64b-nat44det-ip4routing-stl-bidir-avf-pdr-tsa}
+            \label{fig:2n-icx-e810cq-64b-nat44det-ip4routing-stl-bidir-avf-pdr-tsa}
+    \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-det-bidir-2n-icx-xxv710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-det-bidir-2n-icx-xxv710.rst
new file mode 100644
index 0000000000..2e6f350a6e
--- /dev/null
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-det-bidir-2n-icx-xxv710.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-icx-xxv710
+~~~~~~~~~~~~~
+
+64b-nat44det-ip4routing-stl-bidir-avf
+-------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="01p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-64b-nat44det-ip4routing-stl-bidir-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]{2n-icx-xxv710-64b-nat44det-ip4routing-stl-bidir-avf-ndr-tsa}
+            \label{fig:2n-icx-xxv710-64b-nat44det-ip4routing-stl-bidir-avf-ndr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="01n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-64b-nat44det-ip4routing-stl-bidir-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]{2n-icx-xxv710-64b-nat44det-ip4routing-stl-bidir-avf-pdr-tsa}
+            \label{fig:2n-icx-xxv710-64b-nat44det-ip4routing-stl-bidir-avf-pdr-tsa}
+    \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-det-bidir-2n-icx.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-det-bidir-2n-icx.rst
deleted file mode 100644
index 2e6f350a6e..0000000000
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-det-bidir-2n-icx.rst
+++ /dev/null
@@ -1,71 +0,0 @@
-
-.. 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-icx-xxv710
-~~~~~~~~~~~~~
-
-64b-nat44det-ip4routing-stl-bidir-avf
--------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="01p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-64b-nat44det-ip4routing-stl-bidir-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]{2n-icx-xxv710-64b-nat44det-ip4routing-stl-bidir-avf-ndr-tsa}
-            \label{fig:2n-icx-xxv710-64b-nat44det-ip4routing-stl-bidir-avf-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="01n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-64b-nat44det-ip4routing-stl-bidir-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]{2n-icx-xxv710-64b-nat44det-ip4routing-stl-bidir-avf-pdr-tsa}
-            \label{fig:2n-icx-xxv710-64b-nat44det-ip4routing-stl-bidir-avf-pdr-tsa}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-det-bidir.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-det-bidir.rst
index 29f1678a96..25b70c7cac 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-det-bidir.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-det-bidir.rst
@@ -8,5 +8,6 @@ Det BiDir
 
 .. toctree::
 
-    nat44-det-bidir-2n-icx
-    nat44-det-bidir-2n-clx
+    nat44-det-bidir-2n-icx-xxv710
+    nat44-det-bidir-2n-icx-e810cq
+    nat44-det-bidir-2n-clx-xxv710
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-tcp-cps-2n-clx-xxv710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-tcp-cps-2n-clx-xxv710.rst
new file mode 100644
index 0000000000..5b9cf42a0e
--- /dev/null
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-tcp-cps-2n-clx-xxv710.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-clx-xxv710
+~~~~~~~~~~~~~
+
+64b-nat44ed-ip4routing-tcp-stf-cps-avf
+--------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="07p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-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]{2n-clx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-ndr-tsa}
+            \label{fig:2n-clx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-ndr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="07n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-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]{2n-clx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-pdr-tsa}
+            \label{fig:2n-clx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-pdr-tsa}
+    \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-tcp-cps-2n-clx.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-tcp-cps-2n-clx.rst
deleted file mode 100644
index 5b9cf42a0e..0000000000
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-tcp-cps-2n-clx.rst
+++ /dev/null
@@ -1,71 +0,0 @@
-
-.. 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-clx-xxv710
-~~~~~~~~~~~~~
-
-64b-nat44ed-ip4routing-tcp-stf-cps-avf
---------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="07p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-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]{2n-clx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-ndr-tsa}
-            \label{fig:2n-clx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="07n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-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]{2n-clx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-pdr-tsa}
-            \label{fig:2n-clx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-pdr-tsa}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-tcp-cps-2n-icx-e810cq.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-tcp-cps-2n-icx-e810cq.rst
new file mode 100644
index 0000000000..0e83bd7940
--- /dev/null
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-tcp-cps-2n-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>
+
+2n-icx-e810cq
+~~~~~~~~~~~~~
+
+64b-nat44ed-ip4routing-tcp-stf-cps-avf
+--------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="07p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-nat44ed-ip4routing-tcp-stf-cps-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]{2n-icx-e810cq-64b-nat44ed-ip4routing-tcp-stf-cps-avf-ndr-tsa}
+            \label{fig:2n-icx-e810cq-64b-nat44ed-ip4routing-tcp-stf-cps-avf-ndr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="07n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-nat44ed-ip4routing-tcp-stf-cps-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]{2n-icx-e810cq-64b-nat44ed-ip4routing-tcp-stf-cps-avf-pdr-tsa}
+            \label{fig:2n-icx-e810cq-64b-nat44ed-ip4routing-tcp-stf-cps-avf-pdr-tsa}
+    \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-tcp-cps-2n-icx-xxv710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-tcp-cps-2n-icx-xxv710.rst
new file mode 100644
index 0000000000..ff6cbc7114
--- /dev/null
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-tcp-cps-2n-icx-xxv710.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-icx-xxv710
+~~~~~~~~~~~~~
+
+64b-nat44ed-ip4routing-tcp-stf-cps-avf
+--------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="07p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-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]{2n-icx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-ndr-tsa}
+            \label{fig:2n-icx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-ndr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="07n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-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]{2n-icx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-pdr-tsa}
+            \label{fig:2n-icx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-pdr-tsa}
+    \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-tcp-cps-2n-icx.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-tcp-cps-2n-icx.rst
deleted file mode 100644
index ff6cbc7114..0000000000
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-tcp-cps-2n-icx.rst
+++ /dev/null
@@ -1,71 +0,0 @@
-
-.. 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-icx-xxv710
-~~~~~~~~~~~~~
-
-64b-nat44ed-ip4routing-tcp-stf-cps-avf
---------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="07p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-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]{2n-icx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-ndr-tsa}
-            \label{fig:2n-icx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="07n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-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]{2n-icx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-pdr-tsa}
-            \label{fig:2n-icx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-pdr-tsa}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-tcp-cps.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-tcp-cps.rst
index 0fa02ace89..de7e8cfaa5 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-tcp-cps.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-tcp-cps.rst
@@ -8,5 +8,6 @@ ED TCP CPS
 
 .. toctree::
 
-    nat44-ed-tcp-cps-2n-icx
-    nat44-ed-tcp-cps-2n-clx
+    nat44-ed-tcp-cps-2n-icx-xxv710
+    nat44-ed-tcp-cps-2n-icx-e810cq
+    nat44-ed-tcp-cps-2n-clx-xxv710
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-tcp-tput-2n-clx-xxv710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-tcp-tput-2n-clx-xxv710.rst
new file mode 100644
index 0000000000..2044bc4d94
--- /dev/null
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-tcp-tput-2n-clx-xxv710.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-clx-xxv710
+~~~~~~~~~~~~~
+
+100b-nat44ed-ip4routing-tcp-tput-avf
+------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="07p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-100b-nat44ed-ip4routing-tcp-tput-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]{2n-clx-xxv710-100b-nat44ed-ip4routing-tcp-tput-avf-ndr-tsa}
+            \label{fig:2n-clx-xxv710-100b-nat44ed-ip4routing-tcp-tput-avf-ndr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="07n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-100b-nat44ed-ip4routing-tcp-tput-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]{2n-clx-xxv710-100b-nat44ed-ip4routing-tcp-tput-avf-pdr-tsa}
+            \label{fig:2n-clx-xxv710-100b-nat44ed-ip4routing-tcp-tput-avf-pdr-tsa}
+    \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-tcp-tput-2n-clx.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-tcp-tput-2n-clx.rst
deleted file mode 100644
index 2044bc4d94..0000000000
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-tcp-tput-2n-clx.rst
+++ /dev/null
@@ -1,71 +0,0 @@
-
-.. 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-clx-xxv710
-~~~~~~~~~~~~~
-
-100b-nat44ed-ip4routing-tcp-tput-avf
-------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="07p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-100b-nat44ed-ip4routing-tcp-tput-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]{2n-clx-xxv710-100b-nat44ed-ip4routing-tcp-tput-avf-ndr-tsa}
-            \label{fig:2n-clx-xxv710-100b-nat44ed-ip4routing-tcp-tput-avf-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="07n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-100b-nat44ed-ip4routing-tcp-tput-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]{2n-clx-xxv710-100b-nat44ed-ip4routing-tcp-tput-avf-pdr-tsa}
-            \label{fig:2n-clx-xxv710-100b-nat44ed-ip4routing-tcp-tput-avf-pdr-tsa}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-tcp-tput-2n-icx-e810cq.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-tcp-tput-2n-icx-e810cq.rst
new file mode 100644
index 0000000000..39cd763e37
--- /dev/null
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-tcp-tput-2n-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>
+
+2n-icx-e810cq
+~~~~~~~~~~~~~
+
+100b-nat44ed-ip4routing-tcp-tput-avf
+------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="07p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-100b-nat44ed-ip4routing-tcp-tput-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]{2n-icx-e810cq-100b-nat44ed-ip4routing-tcp-tput-avf-ndr-tsa}
+            \label{fig:2n-icx-e810cq-100b-nat44ed-ip4routing-tcp-tput-avf-ndr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="07n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-100b-nat44ed-ip4routing-tcp-tput-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]{2n-icx-e810cq-100b-nat44ed-ip4routing-tcp-tput-avf-pdr-tsa}
+            \label{fig:2n-icx-e810cq-100b-nat44ed-ip4routing-tcp-tput-avf-pdr-tsa}
+    \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-tcp-tput-2n-icx-xxv710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-tcp-tput-2n-icx-xxv710.rst
new file mode 100644
index 0000000000..0cedd97e71
--- /dev/null
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-tcp-tput-2n-icx-xxv710.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-icx-xxv710
+~~~~~~~~~~~~~
+
+100b-nat44ed-ip4routing-tcp-tput-avf
+------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="07p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-100b-nat44ed-ip4routing-tcp-tput-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]{2n-icx-xxv710-100b-nat44ed-ip4routing-tcp-tput-avf-ndr-tsa}
+            \label{fig:2n-icx-xxv710-100b-nat44ed-ip4routing-tcp-tput-avf-ndr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="07n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-100b-nat44ed-ip4routing-tcp-tput-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]{2n-icx-xxv710-100b-nat44ed-ip4routing-tcp-tput-avf-pdr-tsa}
+            \label{fig:2n-icx-xxv710-100b-nat44ed-ip4routing-tcp-tput-avf-pdr-tsa}
+    \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-tcp-tput-2n-icx.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-tcp-tput-2n-icx.rst
deleted file mode 100644
index 0cedd97e71..0000000000
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-tcp-tput-2n-icx.rst
+++ /dev/null
@@ -1,71 +0,0 @@
-
-.. 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-icx-xxv710
-~~~~~~~~~~~~~
-
-100b-nat44ed-ip4routing-tcp-tput-avf
-------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="07p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-100b-nat44ed-ip4routing-tcp-tput-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]{2n-icx-xxv710-100b-nat44ed-ip4routing-tcp-tput-avf-ndr-tsa}
-            \label{fig:2n-icx-xxv710-100b-nat44ed-ip4routing-tcp-tput-avf-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="07n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-100b-nat44ed-ip4routing-tcp-tput-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]{2n-icx-xxv710-100b-nat44ed-ip4routing-tcp-tput-avf-pdr-tsa}
-            \label{fig:2n-icx-xxv710-100b-nat44ed-ip4routing-tcp-tput-avf-pdr-tsa}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-tcp-tput.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-tcp-tput.rst
index 27a114e9d7..0152d22f3f 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-tcp-tput.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-tcp-tput.rst
@@ -8,5 +8,6 @@ ED TCP TPUT
 
 .. toctree::
 
-    nat44-ed-tcp-tput-2n-icx
-    nat44-ed-tcp-tput-2n-clx
+    nat44-ed-tcp-tput-2n-icx-xxv710
+    nat44-ed-tcp-tput-2n-icx-e810cq
+    nat44-ed-tcp-tput-2n-clx-xxv710
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-udp-cps-2n-clx-xxv710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-udp-cps-2n-clx-xxv710.rst
new file mode 100644
index 0000000000..d478318ef0
--- /dev/null
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-udp-cps-2n-clx-xxv710.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-clx-xxv710
+~~~~~~~~~~~~~
+
+64b-nat44ed-ip4routing-udp-stf-cps-avf
+--------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="03p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-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]{2n-clx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-ndr-tsa}
+            \label{fig:2n-clx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-ndr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="03n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-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]{2n-clx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-pdr-tsa}
+            \label{fig:2n-clx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-pdr-tsa}
+    \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-udp-cps-2n-clx.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-udp-cps-2n-clx.rst
deleted file mode 100644
index d478318ef0..0000000000
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-udp-cps-2n-clx.rst
+++ /dev/null
@@ -1,71 +0,0 @@
-
-.. 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-clx-xxv710
-~~~~~~~~~~~~~
-
-64b-nat44ed-ip4routing-udp-stf-cps-avf
---------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="03p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-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]{2n-clx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-ndr-tsa}
-            \label{fig:2n-clx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="03n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-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]{2n-clx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-pdr-tsa}
-            \label{fig:2n-clx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-pdr-tsa}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-udp-cps-2n-icx-e810cq.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-udp-cps-2n-icx-e810cq.rst
new file mode 100644
index 0000000000..d4a1e9629e
--- /dev/null
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-udp-cps-2n-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>
+
+2n-icx-e810cq
+~~~~~~~~~~~~~
+
+64b-nat44ed-ip4routing-udp-stf-cps-avf
+--------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="03p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-nat44ed-ip4routing-udp-stf-cps-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]{2n-icx-e810cq-64b-nat44ed-ip4routing-udp-stf-cps-avf-ndr-tsa}
+            \label{fig:2n-icx-e810cq-64b-nat44ed-ip4routing-udp-stf-cps-avf-ndr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="03n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-nat44ed-ip4routing-udp-stf-cps-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]{2n-icx-e810cq-64b-nat44ed-ip4routing-udp-stf-cps-avf-pdr-tsa}
+            \label{fig:2n-icx-e810cq-64b-nat44ed-ip4routing-udp-stf-cps-avf-pdr-tsa}
+    \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-udp-cps-2n-icx-xxv710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-udp-cps-2n-icx-xxv710.rst
new file mode 100644
index 0000000000..eeb57562fb
--- /dev/null
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-udp-cps-2n-icx-xxv710.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-icx-xxv710
+~~~~~~~~~~~~~
+
+64b-nat44ed-ip4routing-udp-stf-cps-avf
+--------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="03p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-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]{2n-icx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-ndr-tsa}
+            \label{fig:2n-icx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-ndr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="03n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-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]{2n-icx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-pdr-tsa}
+            \label{fig:2n-icx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-pdr-tsa}
+    \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-udp-cps-2n-icx.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-udp-cps-2n-icx.rst
deleted file mode 100644
index eeb57562fb..0000000000
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-udp-cps-2n-icx.rst
+++ /dev/null
@@ -1,71 +0,0 @@
-
-.. 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-icx-xxv710
-~~~~~~~~~~~~~
-
-64b-nat44ed-ip4routing-udp-stf-cps-avf
---------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="03p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-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]{2n-icx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-ndr-tsa}
-            \label{fig:2n-icx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="03n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-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]{2n-icx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-pdr-tsa}
-            \label{fig:2n-icx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-pdr-tsa}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-udp-cps.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-udp-cps.rst
index 0995fbf4bb..311701d09d 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-udp-cps.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-udp-cps.rst
@@ -8,5 +8,6 @@ ED UDP CPS
 
 .. toctree::
 
-    nat44-ed-udp-cps-2n-icx
-    nat44-ed-udp-cps-2n-clx
+    nat44-ed-udp-cps-2n-icx-xxv710
+    nat44-ed-udp-cps-2n-icx-e810cq
+    nat44-ed-udp-cps-2n-clx-xxv710
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-udp-tput-2n-clx-xxv710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-udp-tput-2n-clx-xxv710.rst
new file mode 100644
index 0000000000..d5be06f455
--- /dev/null
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-udp-tput-2n-clx-xxv710.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-clx-xxv710
+~~~~~~~~~~~~~
+
+100b-nat44ed-ip4routing-udp-tput-avf
+------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="103p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-100b-nat44ed-ip4routing-udp-tput-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]{2n-clx-xxv710-100b-nat44ed-ip4routing-udp-tput-avf-ndr-tsa}
+            \label{fig:2n-clx-xxv710-100b-nat44ed-ip4routing-udp-tput-avf-ndr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="103n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-100b-nat44ed-ip4routing-udp-tput-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]{2n-clx-xxv710-100b-nat44ed-ip4routing-udp-tput-avf-pdr-tsa}
+            \label{fig:2n-clx-xxv710-100b-nat44ed-ip4routing-udp-tput-avf-pdr-tsa}
+    \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-udp-tput-2n-clx.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-udp-tput-2n-clx.rst
deleted file mode 100644
index d5be06f455..0000000000
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-udp-tput-2n-clx.rst
+++ /dev/null
@@ -1,71 +0,0 @@
-
-.. 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-clx-xxv710
-~~~~~~~~~~~~~
-
-100b-nat44ed-ip4routing-udp-tput-avf
-------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="103p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-100b-nat44ed-ip4routing-udp-tput-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]{2n-clx-xxv710-100b-nat44ed-ip4routing-udp-tput-avf-ndr-tsa}
-            \label{fig:2n-clx-xxv710-100b-nat44ed-ip4routing-udp-tput-avf-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="103n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-100b-nat44ed-ip4routing-udp-tput-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]{2n-clx-xxv710-100b-nat44ed-ip4routing-udp-tput-avf-pdr-tsa}
-            \label{fig:2n-clx-xxv710-100b-nat44ed-ip4routing-udp-tput-avf-pdr-tsa}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-udp-tput-2n-icx-e810cq.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-udp-tput-2n-icx-e810cq.rst
new file mode 100644
index 0000000000..aab5c25b3c
--- /dev/null
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-udp-tput-2n-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>
+
+2n-icx-e810cq
+~~~~~~~~~~~~~
+
+100b-nat44ed-ip4routing-udp-tput-avf
+------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="103p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-100b-nat44ed-ip4routing-udp-tput-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]{2n-icx-e810cq-100b-nat44ed-ip4routing-udp-tput-avf-ndr-tsa}
+            \label{fig:2n-icx-e810cq-100b-nat44ed-ip4routing-udp-tput-avf-ndr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="103n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-100b-nat44ed-ip4routing-udp-tput-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]{2n-icx-e810cq-100b-nat44ed-ip4routing-udp-tput-avf-pdr-tsa}
+            \label{fig:2n-icx-e810cq-100b-nat44ed-ip4routing-udp-tput-avf-pdr-tsa}
+    \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-udp-tput-2n-icx-xxv710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-udp-tput-2n-icx-xxv710.rst
new file mode 100644
index 0000000000..ea9d022f4b
--- /dev/null
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-udp-tput-2n-icx-xxv710.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-icx-xxv710
+~~~~~~~~~~~~~
+
+100b-nat44ed-ip4routing-udp-tput-avf
+------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="103p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-100b-nat44ed-ip4routing-udp-tput-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]{2n-icx-xxv710-100b-nat44ed-ip4routing-udp-tput-avf-ndr-tsa}
+            \label{fig:2n-icx-xxv710-100b-nat44ed-ip4routing-udp-tput-avf-ndr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="103n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-100b-nat44ed-ip4routing-udp-tput-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]{2n-icx-xxv710-100b-nat44ed-ip4routing-udp-tput-avf-pdr-tsa}
+            \label{fig:2n-icx-xxv710-100b-nat44ed-ip4routing-udp-tput-avf-pdr-tsa}
+    \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-udp-tput-2n-icx.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-udp-tput-2n-icx.rst
deleted file mode 100644
index ea9d022f4b..0000000000
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-udp-tput-2n-icx.rst
+++ /dev/null
@@ -1,71 +0,0 @@
-
-.. 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-icx-xxv710
-~~~~~~~~~~~~~
-
-100b-nat44ed-ip4routing-udp-tput-avf
-------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="103p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-100b-nat44ed-ip4routing-udp-tput-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]{2n-icx-xxv710-100b-nat44ed-ip4routing-udp-tput-avf-ndr-tsa}
-            \label{fig:2n-icx-xxv710-100b-nat44ed-ip4routing-udp-tput-avf-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="103n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-100b-nat44ed-ip4routing-udp-tput-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]{2n-icx-xxv710-100b-nat44ed-ip4routing-udp-tput-avf-pdr-tsa}
-            \label{fig:2n-icx-xxv710-100b-nat44ed-ip4routing-udp-tput-avf-pdr-tsa}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-udp-tput.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-udp-tput.rst
index 383558b8be..012d437fb7 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-udp-tput.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-udp-tput.rst
@@ -8,5 +8,6 @@ ED UDP TPUT
 
 .. toctree::
 
-    nat44-ed-udp-tput-2n-icx
-    nat44-ed-udp-tput-2n-clx
+    nat44-ed-udp-tput-2n-icx-xxv710
+    nat44-ed-udp-tput-2n-icx-e810cq
+    nat44-ed-udp-tput-2n-clx-xxv710
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-unidir-2n-clx-xxv710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-unidir-2n-clx-xxv710.rst
new file mode 100644
index 0000000000..8d33548eff
--- /dev/null
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-unidir-2n-clx-xxv710.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-clx-xxv710
+~~~~~~~~~~~~~
+
+64b-nat44ed-ip4routing-stl-unidir-avf
+-------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="02p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-nat44ed-ip4routing-stl-unidir-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]{2n-clx-xxv710-64b-nat44ed-ip4routing-stl-unidir-avf-ndr-tsa}
+            \label{fig:2n-clx-xxv710-64b-nat44ed-ip4routing-stl-unidir-avf-ndr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="02n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-nat44ed-ip4routing-stl-unidir-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]{2n-clx-xxv710-64b-nat44ed-ip4routing-stl-unidir-avf-pdr-tsa}
+            \label{fig:2n-clx-xxv710-64b-nat44ed-ip4routing-stl-unidir-avf-pdr-tsa}
+    \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-unidir-2n-clx.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-unidir-2n-clx.rst
deleted file mode 100644
index 8d33548eff..0000000000
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-unidir-2n-clx.rst
+++ /dev/null
@@ -1,71 +0,0 @@
-
-.. 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-clx-xxv710
-~~~~~~~~~~~~~
-
-64b-nat44ed-ip4routing-stl-unidir-avf
--------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="02p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-nat44ed-ip4routing-stl-unidir-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]{2n-clx-xxv710-64b-nat44ed-ip4routing-stl-unidir-avf-ndr-tsa}
-            \label{fig:2n-clx-xxv710-64b-nat44ed-ip4routing-stl-unidir-avf-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="02n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-nat44ed-ip4routing-stl-unidir-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]{2n-clx-xxv710-64b-nat44ed-ip4routing-stl-unidir-avf-pdr-tsa}
-            \label{fig:2n-clx-xxv710-64b-nat44ed-ip4routing-stl-unidir-avf-pdr-tsa}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-unidir-2n-icx-e810cq.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-unidir-2n-icx-e810cq.rst
new file mode 100644
index 0000000000..bda8dd049a
--- /dev/null
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-unidir-2n-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>
+
+2n-icx-e810cq
+~~~~~~~~~~~~~
+
+64b-nat44ed-ip4routing-stl-unidir-avf
+-------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="02p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-nat44ed-ip4routing-stl-unidir-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]{2n-icx-e810cq-64b-nat44ed-ip4routing-stl-unidir-avf-ndr-tsa}
+            \label{fig:2n-icx-e810cq-64b-nat44ed-ip4routing-stl-unidir-avf-ndr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="02n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-nat44ed-ip4routing-stl-unidir-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]{2n-icx-e810cq-64b-nat44ed-ip4routing-stl-unidir-avf-pdr-tsa}
+            \label{fig:2n-icx-e810cq-64b-nat44ed-ip4routing-stl-unidir-avf-pdr-tsa}
+    \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-unidir-2n-icx-xxv710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-unidir-2n-icx-xxv710.rst
new file mode 100644
index 0000000000..7bb1d47e41
--- /dev/null
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-unidir-2n-icx-xxv710.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-icx-xxv710
+~~~~~~~~~~~~~
+
+64b-nat44ed-ip4routing-stl-unidir-avf
+-------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="02p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-64b-nat44ed-ip4routing-stl-unidir-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]{2n-icx-xxv710-64b-nat44ed-ip4routing-stl-unidir-avf-ndr-tsa}
+            \label{fig:2n-icx-xxv710-64b-nat44ed-ip4routing-stl-unidir-avf-ndr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="02n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-64b-nat44ed-ip4routing-stl-unidir-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]{2n-icx-xxv710-64b-nat44ed-ip4routing-stl-unidir-avf-pdr-tsa}
+            \label{fig:2n-icx-xxv710-64b-nat44ed-ip4routing-stl-unidir-avf-pdr-tsa}
+    \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-unidir-2n-icx.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-unidir-2n-icx.rst
deleted file mode 100644
index 7bb1d47e41..0000000000
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-unidir-2n-icx.rst
+++ /dev/null
@@ -1,71 +0,0 @@
-
-.. 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-icx-xxv710
-~~~~~~~~~~~~~
-
-64b-nat44ed-ip4routing-stl-unidir-avf
--------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="02p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-64b-nat44ed-ip4routing-stl-unidir-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]{2n-icx-xxv710-64b-nat44ed-ip4routing-stl-unidir-avf-ndr-tsa}
-            \label{fig:2n-icx-xxv710-64b-nat44ed-ip4routing-stl-unidir-avf-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="02n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-xxv710-64b-nat44ed-ip4routing-stl-unidir-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]{2n-icx-xxv710-64b-nat44ed-ip4routing-stl-unidir-avf-pdr-tsa}
-            \label{fig:2n-icx-xxv710-64b-nat44ed-ip4routing-stl-unidir-avf-pdr-tsa}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-unidir.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-unidir.rst
index 6fc9d4f4a2..1c798900ff 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-unidir.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-ed-unidir.rst
@@ -8,5 +8,6 @@ ED UniDir
 
 .. toctree::
 
-    nat44-ed-unidir-2n-icx
-    nat44-ed-unidir-2n-clx
+    nat44-ed-unidir-2n-icx-xxv710
+    nat44-ed-unidir-2n-icx-e810cq
+    nat44-ed-unidir-2n-clx-xxv710
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-2n-icx-e810cq.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-2n-icx-e810cq.rst
new file mode 100644
index 0000000000..24077fcf23
--- /dev/null
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-2n-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>
+
+2n-icx-e810cq
+~~~~~~~~~~~~~
+
+64b-vhost-base
+--------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="101" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-vhost-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]{2n-icx-e810cq-64b-vhost-base-ndr-tsa}
+            \label{fig:2n-icx-e810cq-64b-vhost-base-ndr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="102" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-icx-e810cq-64b-vhost-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]{2n-icx-e810cq-64b-vhost-base-pdr-tsa}
+            \label{fig:2n-icx-e810cq-64b-vhost-base-pdr-tsa}
+    \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost.rst
index f7efe8a142..2eb67efe89 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost.rst
@@ -20,6 +20,7 @@ CSIT source code for the test cases used for plots can be found in
 .. toctree::
 
     vm_vhost-2n-icx-xxv710
+    vm_vhost-2n-icx-e810cq
     vm_vhost-2n-clx-xxv710
     vm_vhost-2n-clx-cx556a
     vm_vhost-2n-clx-e810cq
-- 
cgit 1.2.3-korg