Report: re-group RND tests

Change-Id: If45709086b850b6cccc44645ab195fd77296e5e3
Signed-off-by: Tibor Frank <tifrank@cisco.com>
(cherry picked from commit 1c32c469514179f2a77ad2049c5e6ebf1c30bea8)

18 files changed, 9 insertions, 1287 deletions

diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-clx-cx556a.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-clx-cx556a.rst
index e619625806..ef9e67ef73 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-clx-cx556a.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-clx-cx556a.rst
@@ -31,8 +31,8 @@
 2n-clx-cx556a
 ~~~~~~~~~~~~~
 
-64b-2t1c-ip4routing-base-rdma-core
-----------------------------------
+64b-2t1c-ip4routing-base-scale-rdma-core
+----------------------------------------
 
 .. raw:: html
 
@@ -74,49 +74,6 @@
 
     \clearpage
 
-64b-2t1c-ip4routing-scale-rdma-core
------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-cx556a-64b-2t1c-rdma-ethip4-ip4scale-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-cx556a-64b-2t1c-rdma-ethip4-ip4scale-ndr}
-            \label{fig:2n-clx-cx556a-64b-2t1c-rdma-ethip4-ip4scale-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="05" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-cx556a-64b-2t1c-rdma-ethip4-ip4scale-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-cx556a-64b-2t1c-rdma-ethip4-ip4scale-pdr}
-            \label{fig:2n-clx-cx556a-64b-2t1c-rdma-ethip4-ip4scale-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
 64b-2t1c-ip4routing-features
 ----------------------------
 
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-clx-xxv710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-clx-xxv710.rst
index 122180f29c..e5a5a98874 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-clx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-clx-xxv710.rst
@@ -74,49 +74,6 @@
 
     \clearpage
 
-64b-2t1c-ip4routing-scale-avf-rnd
----------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="101" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-ip4routing-scale-avf-rnd-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-ip4routing-scale-avf-rnd-ndr}
-            \label{fig:2n-clx-xxv710-64b-2t1c-ip4routing-scale-avf-rnd-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-clx-xxv710-64b-2t1c-ip4routing-scale-avf-rnd-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-ip4routing-scale-avf-rnd-pdr}
-            \label{fig:2n-clx-xxv710-64b-2t1c-ip4routing-scale-avf-rnd-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
 64b-2t1c-ip4routing-base-scale-dpdk
 -----------------------------------
 
@@ -160,49 +117,6 @@
 
     \clearpage
 
-64b-2t1c-ip4routing-scale-dpdk-rnd
-----------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="111" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-ip4routing-scale-dpdk-rnd-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-ip4routing-scale-dpdk-rnd-ndr}
-            \label{fig:2n-clx-xxv710-64b-2t1c-ip4routing-scale-dpdk-rnd-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="112" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-ip4routing-scale-dpdk-rnd-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-ip4routing-scale-dpdk-rnd-pdr}
-            \label{fig:2n-clx-xxv710-64b-2t1c-ip4routing-scale-dpdk-rnd-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
 64b-2t1c-features-ip4routing-base-avf
 -------------------------------------
 
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-skx-xxv710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-skx-xxv710.rst
index 8ed23f1774..ad511d446a 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-skx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-skx-xxv710.rst
@@ -74,46 +74,6 @@
 
     \clearpage
 
-.. raw:: html
-
-    <center>
-    <iframe id="101" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-ip4routing-scale-avf-rnd-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-skx-xxv710-64b-2t1c-ip4routing-scale-avf-rnd-ndr}
-            \label{fig:2n-skx-xxv710-64b-2t1c-ip4routing-scale-avf-rnd}
-    \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-skx-xxv710-64b-2t1c-ip4routing-scale-avf-rnd-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-skx-xxv710-64b-2t1c-ip4routing-scale-avf-rnd-pdr}
-            \label{fig:2n-skx-xxv710-64b-2t1c-ip4routing-scale-avf-rnd-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
 64b-2t1c-ip4routing-base-scale-dpdk
 -----------------------------------
 
@@ -157,46 +117,6 @@
 
     \clearpage
 
-.. raw:: html
-
-    <center>
-    <iframe id="111" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-ip4routing-scale-dpdk-rnd-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-skx-xxv710-64b-2t1c-ip4routing-scale-dpdk-rnd-ndr}
-            \label{fig:2n-skx-xxv710-64b-2t1c-ip4routing-scale-dpdk-rnd-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="112" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-ip4routing-scale-dpdk-rnd-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-skx-xxv710-64b-2t1c-ip4routing-scale-dpdk-rnd-pdr}
-            \label{fig:2n-skx-xxv710-64b-2t1c-ip4routing-scale-dpdk-rnd-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
 64b-2t1c-features-ip4routing-base-avf
 -------------------------------------
 
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-zn2-cx556a.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-zn2-cx556a.rst
index 0b3156f67d..8224a887ab 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-zn2-cx556a.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-zn2-cx556a.rst
@@ -31,8 +31,8 @@
 2n-zn2-cx556a
 ~~~~~~~~~~~~~
 
-64b-2t1c-ip4routing-base-rdma-core
-----------------------------------
+64b-2t1c-ip4routing-base-scale-rdma-core
+----------------------------------------
 
 .. raw:: html
 
@@ -74,49 +74,6 @@
 
     \clearpage
 
-64b-2t1c-ip4routing-scale-rdma-core
------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-zn2-cx556a-64b-2t1c-rdma-ethip4-ip4scale-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-zn2-cx556a-64b-2t1c-rdma-ethip4-ip4scale-ndr}
-            \label{fig:2n-zn2-cx556a-64b-2t1c-rdma-ethip4-ip4scale-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="05" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-zn2-cx556a-64b-2t1c-rdma-ethip4-ip4scale-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-zn2-cx556a-64b-2t1c-rdma-ethip4-ip4scale-pdr}
-            \label{fig:2n-zn2-cx556a-64b-2t1c-rdma-ethip4-ip4scale-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
 64b-2t1c-ip4routing-features
 ----------------------------
 
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-zn2-xxv710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-zn2-xxv710.rst
index 49b6974ddc..c3e33540a7 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-zn2-xxv710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-zn2-xxv710.rst
@@ -74,49 +74,6 @@
 
     \clearpage
 
-64b-2t1c-ip4routing-scale-avf-rnd
----------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="101" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-zn2-xxv710-64b-2t1c-ip4routing-scale-avf-rnd-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-zn2-xxv710-64b-2t1c-ip4routing-scale-avf-rnd-ndr}
-            \label{fig:2n-zn2-xxv710-64b-2t1c-ip4routing-scale-avf-rnd-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-zn2-xxv710-64b-2t1c-ip4routing-scale-avf-rnd-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-zn2-xxv710-64b-2t1c-ip4routing-scale-avf-rnd-pdr}
-            \label{fig:2n-zn2-xxv710-64b-2t1c-ip4routing-scale-avf-rnd-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
 64b-2t1c-ip4routing-base-scale-dpdk
 -----------------------------------
 
@@ -160,49 +117,6 @@
 
     \clearpage
 
-64b-2t1c-ip4routing-scale-dpdk-rnd
-----------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="111" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-zn2-xxv710-64b-2t1c-ip4routing-scale-dpdk-rnd-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-zn2-xxv710-64b-2t1c-ip4routing-scale-dpdk-rnd-ndr}
-            \label{fig:2n-zn2-xxv710-64b-2t1c-ip4routing-scale-dpdk-rnd-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="112" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-zn2-xxv710-64b-2t1c-ip4routing-scale-dpdk-rnd-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-zn2-xxv710-64b-2t1c-ip4routing-scale-dpdk-rnd-pdr}
-            \label{fig:2n-zn2-xxv710-64b-2t1c-ip4routing-scale-dpdk-rnd-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
 64b-2t1c-features-ip4routing-base-avf
 -------------------------------------
 
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-clx-cx556a.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-clx-cx556a.rst
index 0958e01563..cb8a970023 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-clx-cx556a.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-clx-cx556a.rst
@@ -69,46 +69,3 @@
             \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-cx556a-78b-2t1c-rdma-ip6routing-base-scale-pdr}
             \label{fig:2n-clx-cx556a-78b-2t1c-rdma-ip6routing-base-scale-pdr}
     \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-78b-2t1c-ip6routing-rnd-base-scale-rdma-core
---------------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="01a" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-cx556a-78b-2t1c-rdma-ip6routing-rnd-base-scale-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-cx556a-78b-2t1c-rdma-ip6routing-rnd-base-scale-ndr}
-            \label{fig:2n-clx-cx556a-78b-2t1c-rdma-ip6routing-rnd-base-scale-ndr}
-    \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-clx-cx556a-78b-2t1c-rdma-ip6routing-rnd-base-scale-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-cx556a-78b-2t1c-rdma-ip6routing-rnd-base-scale-pdr}
-            \label{fig:2n-clx-cx556a-78b-2t1c-rdma-ip6routing-rnd-base-scale-pdr}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-clx-xxv710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-clx-xxv710.rst
index c5276b20cf..378dd96104 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-clx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-clx-xxv710.rst
@@ -75,49 +75,6 @@
 
     \clearpage
 
-78b-2t1c-ip6routing-rnd-base-scale-avf
---------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="101r" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-78b-2t1c-ip6routing-rnd-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-clx-xxv710-78b-2t1c-ip6routing-rnd-base-scale-avf-ndr}
-            \label{fig:2n-clx-xxv710-78b-2t1c-ip6routing-rnd-base-scale-avf-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="102r" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-78b-2t1c-ip6routing-rnd-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-clx-xxv710-78b-2t1c-ip6routing-rnd-base-scale-avf-pdr}
-            \label{fig:2n-clx-xxv710-78b-2t1c-ip6routing-rnd-base-scale-avf-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
 78b-2t1c-ip6routing-base-scale-dpdk
 -----------------------------------
 
@@ -156,46 +113,3 @@
             \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-78b-2t1c-ip6routing-base-scale-dpdk-pdr}
             \label{fig:2n-clx-xxv710-78b-2t1c-ip6routing-base-scale-dpdk-pdr}
     \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-78b-2t1c-ip6routing-rnd-base-scale-dpdk
----------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="01r" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-78b-2t1c-ip6routing-rnd-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-clx-xxv710-78b-2t1c-ip6routing-rnd-base-scale-dpdk-ndr}
-            \label{fig:2n-clx-xxv710-78b-2t1c-ip6routing-rnd-base-scale-dpdk-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="02r" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-78b-2t1c-ip6routing-rnd-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-clx-xxv710-78b-2t1c-ip6routing-rnd-base-scale-dpdk-pdr}
-            \label{fig:2n-clx-xxv710-78b-2t1c-ip6routing-rnd-base-scale-dpdk-pdr}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-skx-xxv710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-skx-xxv710.rst
index ef7aefd609..a5b0d3daa9 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-skx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-skx-xxv710.rst
@@ -74,49 +74,6 @@
 
     \clearpage
 
-78b-2t1c-ip6routing-rnd-base-scale-avf
---------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="01r" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-78b-2t1c-ip6routing-rnd-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-skx-xxv710-78b-2t1c-ip6routing-rnd-base-scale-avf-ndr}
-            \label{fig:2n-skx-xxv710-78b-2t1c-ip6routing-rnd-base-scale-avf-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="02r" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-78b-2t1c-ip6routing-rnd-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-skx-xxv710-78b-2t1c-ip6routing-rnd-base-scale-avf-pdr}
-            \label{fig:2n-skx-xxv710-78b-2t1c-ip6routing-rnd-base-scale-avf-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
 78b-2t1c-ip6routing-base-scale-dpdk
 -----------------------------------
 
@@ -155,46 +112,3 @@
             \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-78b-2t1c-ip6routing-base-scale-dpdk-pdr}
             \label{fig:2n-skx-xxv710-78b-2t1c-ip6routing-base-scale-dpdk-pdr}
     \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-78b-2t1c-ip6routing-rnd-base-scale-dpdk
----------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="101r" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-78b-2t1c-ip6routing-rnd-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-skx-xxv710-78b-2t1c-ip6routing-rnd-base-scale-dpdk-ndr}
-            \label{fig:2n-skx-xxv710-78b-2t1c-ip6routing-rnd-base-scale-dpdk-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="102r" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-78b-2t1c-ip6routing-rnd-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-skx-xxv710-78b-2t1c-ip6routing-rnd-base-scale-dpdk-pdr}
-            \label{fig:2n-skx-xxv710-78b-2t1c-ip6routing-rnd-base-scale-dpdk-pdr}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-zn2-xxv710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-zn2-xxv710.rst
index 8da40e21f5..a85ae6f6a9 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-zn2-xxv710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-zn2-xxv710.rst
@@ -74,49 +74,6 @@
 
     \clearpage
 
-78b-2t1c-ip6routing-rnd-base-scale-avf
---------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="101r" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-zn2-xxv710-78b-2t1c-ip6routing-rnd-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-zn2-xxv710-78b-2t1c-ip6routing-rnd-base-scale-avf-ndr}
-            \label{fig:2n-zn2-xxv710-78b-2t1c-ip6routing-rnd-base-scale-avf-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="102r" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-zn2-xxv710-78b-2t1c-ip6routing-rnd-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-zn2-xxv710-78b-2t1c-ip6routing-rnd-base-scale-avf-pdr}
-            \label{fig:2n-zn2-xxv710-78b-2t1c-ip6routing-rnd-base-scale-avf-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
 78b-2t1c-ip6routing-base-scale-dpdk
 -----------------------------------
 
@@ -155,46 +112,3 @@
             \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-zn2-xxv710-78b-2t1c-ip6routing-base-scale-dpdk-pdr}
             \label{fig:2n-zn2-xxv710-78b-2t1c-ip6routing-base-scale-dpdk-pdr}
     \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-78b-2t1c-ip6routing-rnd-base-scale-dpdk
----------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="01r" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-zn2-xxv710-78b-2t1c-ip6routing-rnd-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-zn2-xxv710-78b-2t1c-ip6routing-rnd-base-scale-dpdk-ndr}
-            \label{fig:2n-zn2-xxv710-78b-2t1c-ip6routing-rnd-base-scale-dpdk-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="02r" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-zn2-xxv710-78b-2t1c-ip6routing-rnd-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-zn2-xxv710-78b-2t1c-ip6routing-rnd-base-scale-dpdk-pdr}
-            \label{fig:2n-zn2-xxv710-78b-2t1c-ip6routing-rnd-base-scale-dpdk-pdr}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-clx-cx556a.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-clx-cx556a.rst
index 589f444d4d..48848dffba 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-clx-cx556a.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-clx-cx556a.rst
@@ -31,8 +31,8 @@
 2n-clx-cx556a
 ~~~~~~~~~~~~~
 
-64b-ip4routing-base-rdma-core
------------------------------
+64b-ip4routing-base-scale-rdma-core
+-----------------------------------
 
 .. raw:: html
 
@@ -74,49 +74,6 @@
 
     \clearpage
 
-64b-ip4routing-scale
--------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-cx556a-64b-rdma-ethip4-ip4scale-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-cx556a-64b-rdma-ethip4-ip4scale-ndr-tsa}
-            \label{fig:2n-clx-cx556a-64b-rdma-ethip4-ip4scale-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="05" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-cx556a-64b-rdma-ethip4-ip4scale-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-cx556a-64b-rdma-ethip4-ip4scale-pdr-tsa}
-            \label{fig:2n-clx-cx556a-64b-rdma-ethip4-ip4scale-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
 64b-ip4routing-features
 ----------------------------
 
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-clx-xxv710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-clx-xxv710.rst
index 69a09151e3..d8cb48add5 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-clx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-clx-xxv710.rst
@@ -74,49 +74,6 @@
 
     \clearpage
 
-64b-ip4routing-scale-avf-rnd
-----------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="101" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-ip4routing-scale-avf-rnd-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-ip4routing-scale-avf-rnd-ndr-tsa}
-            \label{fig:2n-clx-xxv710-64b-ip4routing-scale-avf-rnd-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-clx-xxv710-64b-ip4routing-scale-avf-rnd-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-ip4routing-scale-avf-rnd-pdr-tsa}
-            \label{fig:2n-clx-xxv710-64b-ip4routing-scale-avf-rnd-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
 64b-ip4routing-base-scale-dpdk
 ------------------------------
 
@@ -160,49 +117,6 @@
 
     \clearpage
 
-64b-ip4routing-scale-dpdk-rnd
------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="111" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-ip4routing-scale-dpdk-rnd-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-ip4routing-scale-dpdk-rnd-ndr-tsa}
-            \label{fig:2n-clx-xxv710-64b-ip4routing-scale-dpdk-rnd-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="112" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-ip4routing-scale-dpdk-rnd-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-ip4routing-scale-dpdk-rnd-pdr-tsa}
-            \label{fig:2n-clx-xxv710-64b-ip4routing-scale-dpdk-rnd-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
 64b-features-ip4routing-base-avf
 --------------------------------
 
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-skx-xxv710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-skx-xxv710.rst
index 194bed2a91..7d2ba32e7a 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-skx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-skx-xxv710.rst
@@ -74,46 +74,6 @@
 
     \clearpage
 
-.. raw:: html
-
-    <center>
-    <iframe id="101" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-ip4routing-scale-avf-rnd-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-skx-xxv710-64b-ip4routing-scale-avf-rnd-ndr-tsa}
-            \label{fig:2n-skx-xxv710-64b-ip4routing-scale-avf-rnd-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-skx-xxv710-64b-ip4routing-scale-avf-rnd-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-skx-xxv710-64b-ip4routing-scale-avf-rnd-pdr-tsa}
-            \label{fig:2n-skx-xxv710-64b-ip4routing-scale-avf-rnd-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
 64b-ip4routing-base-scale-dpdk
 ------------------------------
 
@@ -157,46 +117,6 @@
 
     \clearpage
 
-.. raw:: html
-
-    <center>
-    <iframe id="111" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-ip4routing-scale-dpdk-rnd-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-skx-xxv710-64b-ip4routing-scale-dpdk-rnd-ndr-tsa}
-            \label{fig:2n-skx-xxv710-64b-ip4routing-scale-dpdk-rnd-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="112" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-ip4routing-scale-dpdk-rnd-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-skx-xxv710-64b-ip4routing-scale-dpdk-rnd-pdr-tsa}
-            \label{fig:2n-skx-xxv710-64b-ip4routing-scale-dpdk-rnd-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
 64b-features-ip4routing-base-avf
 --------------------------------
 
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-zn2-cx556a.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-zn2-cx556a.rst
index 64c4bbfdee..596658f7ec 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-zn2-cx556a.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-zn2-cx556a.rst
@@ -31,8 +31,8 @@
 2n-zn2-cx556a
 ~~~~~~~~~~~~~
 
-64b-ip4routing-base-rdma-core
------------------------------
+64b-ip4routing-base-scale-rdma-core
+-----------------------------------
 
 .. raw:: html
 
@@ -74,51 +74,8 @@
 
     \clearpage
 
-64b-ip4routing-scale
--------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-zn2-cx556a-64b-rdma-ethip4-ip4scale-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-zn2-cx556a-64b-rdma-ethip4-ip4scale-ndr-tsa}
-            \label{fig:2n-zn2-cx556a-64b-rdma-ethip4-ip4scale-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="05" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-zn2-cx556a-64b-rdma-ethip4-ip4scale-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-zn2-cx556a-64b-rdma-ethip4-ip4scale-pdr-tsa}
-            \label{fig:2n-zn2-cx556a-64b-rdma-ethip4-ip4scale-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
 64b-ip4routing-features
-----------------------------
+-----------------------
 
 .. raw:: html
 
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-zn2-xxv710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-zn2-xxv710.rst
index 08e345d826..c5b67f8505 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-zn2-xxv710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-zn2-xxv710.rst
@@ -74,49 +74,6 @@
 
     \clearpage
 
-64b-ip4routing-scale-avf-rnd
-----------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="101" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-zn2-xxv710-64b-ip4routing-scale-avf-rnd-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-zn2-xxv710-64b-ip4routing-scale-avf-rnd-ndr-tsa}
-            \label{fig:2n-zn2-xxv710-64b-ip4routing-scale-avf-rnd-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-zn2-xxv710-64b-ip4routing-scale-avf-rnd-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-zn2-xxv710-64b-ip4routing-scale-avf-rnd-pdr-tsa}
-            \label{fig:2n-zn2-xxv710-64b-ip4routing-scale-avf-rnd-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
 64b-ip4routing-base-scale-dpdk
 ------------------------------
 
@@ -160,49 +117,6 @@
 
     \clearpage
 
-64b-ip4routing-scale-dpdk-rnd
------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="111" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-zn2-xxv710-64b-ip4routing-scale-dpdk-rnd-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-zn2-xxv710-64b-ip4routing-scale-dpdk-rnd-ndr-tsa}
-            \label{fig:2n-zn2-xxv710-64b-ip4routing-scale-dpdk-rnd-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="112" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-zn2-xxv710-64b-ip4routing-scale-dpdk-rnd-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-zn2-xxv710-64b-ip4routing-scale-dpdk-rnd-pdr-tsa}
-            \label{fig:2n-zn2-xxv710-64b-ip4routing-scale-dpdk-rnd-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
 64b-features-ip4routing-base-avf
 --------------------------------
 
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-clx-cx556a.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-clx-cx556a.rst
index 19db7bc055..36acb9cb05 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-clx-cx556a.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-clx-cx556a.rst
@@ -69,46 +69,3 @@
             \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-cx556a-78b-rdma-ip6routing-base-scale-pdr-tsa}
             \label{fig:2n-clx-cx556a-78b-rdma-ip6routing-base-scale-pdr-tsa}
     \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-78b-ip6routing-rnd-base-scale-rdma-core
----------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="01a" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-cx556a-78b-rdma-ip6routing-rnd-base-scale-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-cx556a-78b-rdma-ip6routing-rnd-base-scale-ndr-tsa}
-            \label{fig:2n-clx-cx556a-78b-rdma-ip6routing-rnd-base-scale-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-clx-cx556a-78b-rdma-ip6routing-rnd-base-scale-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-cx556a-78b-rdma-ip6routing-rnd-base-scale-pdr-tsa}
-            \label{fig:2n-clx-cx556a-78b-rdma-ip6routing-rnd-base-scale-pdr-tsa}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-clx-xxv710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-clx-xxv710.rst
index bf81600d8a..99d611d2f0 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-clx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-clx-xxv710.rst
@@ -74,49 +74,6 @@
 
     \clearpage
 
-78b-ip6routing-rnd-base-scale-avf
----------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="101r" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-78b-ip6routing-rnd-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-clx-xxv710-78b-ip6routing-rnd-base-scale-avf-ndr-tsa}
-            \label{fig:2n-clx-xxv710-78b-ip6routing-rnd-base-scale-avf-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="102r" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-78b-ip6routing-rnd-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-clx-xxv710-78b-ip6routing-rnd-base-scale-avf-pdr-tsa}
-            \label{fig:2n-clx-xxv710-78b-ip6routing-rnd-base-scale-avf-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
 78b-ip6routing-base-scale-dpdk
 ------------------------------
 
@@ -155,46 +112,3 @@
             \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-78b-ip6routing-base-scale-dpdk-pdr-tsa}
             \label{fig:2n-clx-xxv710-78b-ip6routing-base-scale-dpdk-pdr-tsa}
     \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-78b-ip6routing-rnd-base-scale-dpdk
-----------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="01r" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-78b-ip6routing-rnd-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-clx-xxv710-78b-ip6routing-rnd-base-scale-dpdk-ndr-tsa}
-            \label{fig:2n-clx-xxv710-78b-ip6routing-rnd-base-scale-dpdk-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="02r" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-78b-ip6routing-rnd-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-clx-xxv710-78b-ip6routing-rnd-base-scale-dpdk-pdr-tsa}
-            \label{fig:2n-clx-xxv710-78b-ip6routing-rnd-base-scale-dpdk-pdr-tsa}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-skx-xxv710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-skx-xxv710.rst
index 4f08a5bfc5..bf28eefebf 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-skx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-skx-xxv710.rst
@@ -74,49 +74,6 @@
 
     \clearpage
 
-78b-ip6routing-rnd-base-scale-avf
----------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="01r" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-78b-ip6routing-rnd-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-skx-xxv710-78b-ip6routing-rnd-base-scale-avf-ndr-tsa}
-            \label{fig:2n-skx-xxv710-78b-ip6routing-rnd-base-scale-avf-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="02r" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-78b-ip6routing-rnd-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-skx-xxv710-78b-ip6routing-rnd-base-scale-avf-pdr-tsa}
-            \label{fig:2n-skx-xxv710-78b-ip6routing-rnd-base-scale-avf-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
 78b-ip6routing-base-scale-dpdk
 ------------------------------
 
@@ -155,46 +112,3 @@
             \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-78b-ip6routing-base-scale-dpdk-pdr-tsa}
             \label{fig:2n-skx-xxv710-78b-ip6routing-base-scale-dpdk-pdr-tsa}
     \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-78b-ip6routing-rnd-base-scale-dpdk
-----------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="101r" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-78b-ip6routing-rnd-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-skx-xxv710-78b-ip6routing-rnd-base-scale-dpdk-ndr-tsa}
-            \label{fig:2n-skx-xxv710-78b-ip6routing-rnd-base-scale-dpdk-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="102r" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-78b-ip6routing-rnd-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-skx-xxv710-78b-ip6routing-rnd-base-scale-dpdk-pdr-tsa}
-            \label{fig:2n-skx-xxv710-78b-ip6routing-rnd-base-scale-dpdk-pdr-tsa}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-zn2-xxv710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-zn2-xxv710.rst
index 4ea7a6d2f7..479d757917 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-zn2-xxv710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-zn2-xxv710.rst
@@ -74,49 +74,6 @@
 
     \clearpage
 
-78b-ip6routing-rnd-base-scale-avf
----------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="101r" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-zn2-xxv710-78b-ip6routing-rnd-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-zn2-xxv710-78b-ip6routing-rnd-base-scale-avf-ndr-tsa}
-            \label{fig:2n-zn2-xxv710-78b-ip6routing-rnd-base-scale-avf-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="102r" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-zn2-xxv710-78b-ip6routing-rnd-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-zn2-xxv710-78b-ip6routing-rnd-base-scale-avf-pdr-tsa}
-            \label{fig:2n-zn2-xxv710-78b-ip6routing-rnd-base-scale-avf-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
 78b-ip6routing-base-scale-dpdk
 ------------------------------
 
@@ -155,46 +112,3 @@
             \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-zn2-xxv710-78b-ip6routing-base-scale-dpdk-pdr-tsa}
             \label{fig:2n-zn2-xxv710-78b-ip6routing-base-scale-dpdk-pdr-tsa}
     \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-78b-ip6routing-rnd-base-scale-dpdk
-----------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="01r" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-zn2-xxv710-78b-ip6routing-rnd-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-zn2-xxv710-78b-ip6routing-rnd-base-scale-dpdk-ndr-tsa}
-            \label{fig:2n-zn2-xxv710-78b-ip6routing-rnd-base-scale-dpdk-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="02r" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-zn2-xxv710-78b-ip6routing-rnd-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-zn2-xxv710-78b-ip6routing-rnd-base-scale-dpdk-pdr-tsa}
-            \label{fig:2n-zn2-xxv710-78b-ip6routing-rnd-base-scale-dpdk-pdr-tsa}
-    \end{figure}