CSIT-1440: Re-organize graphs in report

- latency
- multi-core

Change-Id: I8a0f51d51eb451f3c57c15579b4e775e0bffddab
Signed-off-by: Tibor Frank <tifrank@cisco.com>
(cherry picked from commit 53f44d52b513fae893e7774d77e3cff160ed9abe)

26 files changed, 148 insertions, 550 deletions

diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/container_memif-2n-skx-x710.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/container_memif-2n-skx-x710.rst
index 1871f5d01a..5a4c9648a8 100644
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/container_memif-2n-skx-x710.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/container_memif-2n-skx-x710.rst
@@ -31,13 +31,13 @@
 2n-skx-x710
 ~~~~~~~~~~~
 
-64b-2t1c-base_and_scale
------------------------
+64b-2t1c-base
+-------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm09" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat.html"></iframe>
+    <iframe id="ifrm09" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-2n-skx-x710-64b-2t1c-base-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,21 +46,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{memif-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat}
-            \label{fig:memif-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{memif-2n-skx-x710-64b-2t1c-base-ndr-lat}
+            \label{fig:memif-2n-skx-x710-64b-2t1c-base-ndr-lat}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-4t2c-base_and_scale
------------------------
+64b-4t2c-base
+-------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm10" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat.html"></iframe>
+    <iframe id="ifrm10" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-2n-skx-x710-64b-4t2c-base-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -69,6 +69,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{memif-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat}
-            \label{fig:memif-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{memif-2n-skx-x710-64b-4t2c-base-ndr-lat}
+            \label{fig:memif-2n-skx-x710-64b-4t2c-base-ndr-lat}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/container_memif-2n-skx-xxv710.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/container_memif-2n-skx-xxv710.rst
index 66a57354ec..657f9509f2 100644
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/container_memif-2n-skx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/container_memif-2n-skx-xxv710.rst
@@ -31,13 +31,13 @@
 2n-skx-xxv710
 ~~~~~~~~~~~~~
 
-64b-2t1c-base_and_scale
------------------------
+64b-2t1c-base_and_features
+--------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat.html"></iframe>
+    <iframe id="ifrm11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-2n-skx-xxv710-64b-2t1c-base_and_features-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,21 +46,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{memif-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat}
-            \label{fig:memif-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{memif-2n-skx-xxv710-64b-2t1c-base_and_features-ndr-lat}
+            \label{fig:memif-2n-skx-xxv710-64b-2t1c-base_and_features-ndr-lat}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-4t2c-base_and_scale
------------------------
+64b-4t2c-base_and_features
+--------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat.html"></iframe>
+    <iframe id="ifrm12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-2n-skx-xxv710-64b-4t2c-base_and_features-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -69,6 +69,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{memif-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat}
-            \label{fig:memif-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{memif-2n-skx-xxv710-64b-4t2c-base_and_features-ndr-lat}
+            \label{fig:memif-2n-skx-xxv710-64b-4t2c-base_and_features-ndr-lat}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/container_memif-3n-hsw-x520.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/container_memif-3n-hsw-x520.rst
index 05e7364325..a7687bde27 100644
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/container_memif-3n-hsw-x520.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/container_memif-3n-hsw-x520.rst
@@ -31,13 +31,13 @@
 3n-hsw-x520
 ~~~~~~~~~~~
 
-64b-1t1c-base_and_scale
------------------------
+64b-1t1c-base_and_features
+--------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat.html"></iframe>
+    <iframe id="ifrm01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-hsw-x520-64b-1t1c-base_and_features-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,21 +46,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{memif-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat}
-            \label{fig:memif-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{memif-3n-hsw-x520-64b-1t1c-base_and_features-ndr-lat}
+            \label{fig:memif-3n-hsw-x520-64b-1t1c-base_and_features-ndr-lat}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-2t2c-base_and_scale
------------------------
+64b-2t2c-base_and_features
+--------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat.html"></iframe>
+    <iframe id="ifrm02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-hsw-x520-64b-2t2c-base_and_features-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -69,6 +69,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{memif-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat}
-            \label{fig:memif-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{memif-3n-hsw-x520-64b-2t2c-base_and_features-ndr-lat}
+            \label{fig:memif-3n-hsw-x520-64b-2t2c-base_and_features-ndr-lat}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/container_memif-3n-hsw-x710.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/container_memif-3n-hsw-x710.rst
index 4eadab2e98..d24b7fb40e 100644
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/container_memif-3n-hsw-x710.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/container_memif-3n-hsw-x710.rst
@@ -31,13 +31,13 @@
 3n-hsw-x710
 ~~~~~~~~~~~
 
-64b-1t1c-base_and_scale
------------------------
+64b-1t1c-base_and_features
+--------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat.html"></iframe>
+    <iframe id="ifrm03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-hsw-x710-64b-1t1c-base_and_features-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,21 +46,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{memif-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat}
-            \label{fig:memif-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{memif-3n-hsw-x710-64b-1t1c-base_and_features-ndr-lat}
+            \label{fig:memif-3n-hsw-x710-64b-1t1c-base_and_features-ndr-lat}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-2t2c-base_and_scale
------------------------
+64b-2t2c-base_and_features
+--------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat.html"></iframe>
+    <iframe id="ifrm04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-hsw-x710-64b-2t2c-base_and_features-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -69,6 +69,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{memif-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat}
-            \label{fig:memif-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{memif-3n-hsw-x710-64b-2t2c-base_and_features-ndr-lat}
+            \label{fig:memif-3n-hsw-x710-64b-2t2c-base_and_features-ndr-lat}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/container_memif-3n-hsw-xl710.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/container_memif-3n-hsw-xl710.rst
index 17d7ebb0ab..bc6c75f64b 100644
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/container_memif-3n-hsw-xl710.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/container_memif-3n-hsw-xl710.rst
@@ -31,13 +31,13 @@
 3n-hsw-xl710
 ~~~~~~~~~~~~
 
-64b-1t1c-base_and_scale
------------------------
+64b-1t1c-base_and_features
+--------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm05" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat.html"></iframe>
+    <iframe id="ifrm05" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-hsw-xl710-64b-1t1c-base_and_features-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,21 +46,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{memif-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat}
-            \label{fig:memif-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{memif-3n-hsw-xl710-64b-1t1c-base_and_features-ndr-lat}
+            \label{fig:memif-3n-hsw-xl710-64b-1t1c-base_and_features-ndr-lat}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-2t2c-base_and_scale
------------------------
+64b-2t2c-base_and_features
+--------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm06" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat.html"></iframe>
+    <iframe id="ifrm06" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-hsw-xl710-64b-2t2c-base_and_features-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -69,6 +69,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{memif-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat}
-            \label{fig:memif-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{memif-3n-hsw-xl710-64b-2t2c-base_and_features-ndr-lat}
+            \label{fig:memif-3n-hsw-xl710-64b-2t2c-base_and_features-ndr-lat}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/container_memif-3n-skx-x710.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/container_memif-3n-skx-x710.rst
index ede4da3bd2..cce807148a 100644
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/container_memif-3n-skx-x710.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/container_memif-3n-skx-x710.rst
@@ -31,13 +31,13 @@
 3n-skx-x710
 ~~~~~~~~~~~
 
-64b-2t1c-base_and_scale
------------------------
+64b-2t1c-base_and_features
+--------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm07" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat.html"></iframe>
+    <iframe id="ifrm07" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-skx-x710-64b-2t1c-base_and_features-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,21 +46,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{memif-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat}
-            \label{fig:memif-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{memif-3n-skx-x710-64b-2t1c-base_and_features-ndr-lat}
+            \label{fig:memif-3n-skx-x710-64b-2t1c-base_and_features-ndr-lat}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-4t2c-base_and_scale
------------------------
+64b-4t2c-base_and_features
+--------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm08" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat.html"></iframe>
+    <iframe id="ifrm08" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-skx-x710-64b-4t2c-base_and_features-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -69,6 +69,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{memif-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat}
-            \label{fig:memif-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{memif-3n-skx-x710-64b-4t2c-base_and_features-ndr-lat}
+            \label{fig:memif-3n-skx-x710-64b-4t2c-base_and_features-ndr-lat}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/l2-3n-hsw-xl710.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/l2-3n-hsw-xl710.rst
index 766b9758a2..0e89d5aebf 100644
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/l2-3n-hsw-xl710.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/l2-3n-hsw-xl710.rst
@@ -31,13 +31,13 @@
 3n-hsw-xl710
 ~~~~~~~~~~~~
 
-64b-1t1c-base_and_scale
------------------------
+64b-1t1c-base
+-------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm09" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat.html"></iframe>
+    <iframe id="ifrm09" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-xl710-64b-1t1c-base-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,21 +46,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat}
-            \label{fig:l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-xl710-64b-1t1c-base-ndr-lat}
+            \label{fig:l2sw-3n-hsw-xl710-64b-1t1c-base-ndr-lat}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-2t2c-base_and_scale
------------------------
+64b-2t2c-base
+-------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm10" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat.html"></iframe>
+    <iframe id="ifrm10" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-xl710-64b-2t2c-base-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -69,6 +69,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat}
-            \label{fig:l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-xl710-64b-2t2c-base-ndr-lat}
+            \label{fig:l2sw-3n-hsw-xl710-64b-2t2c-base-ndr-lat}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/l2-3n-skx-xxv710.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/l2-3n-skx-xxv710.rst
index 59606e350f..ea1780c99b 100644
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/l2-3n-skx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/l2-3n-skx-xxv710.rst
@@ -31,13 +31,13 @@
 3n-skx-xxv710
 ~~~~~~~~~~~~~
 
-64b-2t1c-base_and_scale
------------------------
+64b-2t1c-base
+-------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm15" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat.html"></iframe>
+    <iframe id="ifrm15" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-skx-xxv710-64b-2t1c-base-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,21 +46,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat}
-            \label{fig:l2sw-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-skx-xxv710-64b-2t1c-base-ndr-lat}
+            \label{fig:l2sw-3n-skx-xxv710-64b-2t1c-base-ndr-lat}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-4t2c-base_and_scale
------------------------
+64b-4t2c-base
+-------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm16" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat.html"></iframe>
+    <iframe id="ifrm16" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-skx-xxv710-64b-4t2c-base-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -69,6 +69,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat}
-            \label{fig:l2sw-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-skx-xxv710-64b-4t2c-base-ndr-lat}
+            \label{fig:l2sw-3n-skx-xxv710-64b-4t2c-base-ndr-lat}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/vm_vhost-2n-skx-x710.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/vm_vhost-2n-skx-x710.rst
index 9677e624e1..0b8158ea19 100644
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/vm_vhost-2n-skx-x710.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/vm_vhost-2n-skx-x710.rst
@@ -77,52 +77,6 @@
 
     \clearpage
 
-64b-2t1c-base_and_scale-l2sw
-----------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm35" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat}
-            \label{fig:vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-4t2c-base_and_scale-l2sw
-----------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm36" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat}
-            \label{fig:vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
 64b-2t1c-base-vm-l2sw
 ---------------------
 
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/vm_vhost-2n-skx-xxv710.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/vm_vhost-2n-skx-xxv710.rst
index 43d2890227..7531dd5180 100644
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/vm_vhost-2n-skx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/vm_vhost-2n-skx-xxv710.rst
@@ -77,52 +77,6 @@
 
     \clearpage
 
-64b-2t1c-base_and_scale-l2sw
-----------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm43" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat}
-            \label{fig:vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-4t2c-base_and_scale-l2sw
-----------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm44" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat}
-            \label{fig:vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
 64b-2t1c-base-vm-l2sw
 ---------------------
 
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/vm_vhost-3n-hsw-x520.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/vm_vhost-3n-hsw-x520.rst
index 2a6575a9d9..774cdae21e 100644
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/vm_vhost-3n-hsw-x520.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/vm_vhost-3n-hsw-x520.rst
@@ -77,52 +77,6 @@
 
     \clearpage
 
-64b-1t1c-base_and_scale-l2sw
-----------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat}
-            \label{fig:vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t2c-base_and_scale-l2sw
-----------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat}
-            \label{fig:vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
 64b-1t1c-base-vm-l2sw
 ---------------------
 
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/vm_vhost-3n-hsw-x710.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/vm_vhost-3n-hsw-x710.rst
index 567c20904c..383290784d 100644
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/vm_vhost-3n-hsw-x710.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/vm_vhost-3n-hsw-x710.rst
@@ -77,52 +77,6 @@
 
     \clearpage
 
-64b-1t1c-base_and_scale-l2sw
-----------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat}
-            \label{fig:vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t2c-base_and_scale-l2sw
-----------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat}
-            \label{fig:vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
 64b-1t1c-base-vm-l2sw
 ---------------------
 
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/vm_vhost-3n-skx-x710.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/vm_vhost-3n-skx-x710.rst
index b8a3c4c557..3669505b3f 100644
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/vm_vhost-3n-skx-x710.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/vm_vhost-3n-skx-x710.rst
@@ -77,52 +77,6 @@
 
     \clearpage
 
-64b-2t1c-base_and_scale-l2sw
-----------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm27" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat}
-            \label{fig:vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-4t2c-base_and_scale-l2sw
-----------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm28" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat}
-            \label{fig:vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
 64b-2t1c-base-vm-l2sw
 ---------------------
 
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-3n-skx-xxv710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-3n-skx-xxv710.rst
index aed9aa0d9b..38849da955 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-3n-skx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-3n-skx-xxv710.rst
@@ -31,8 +31,8 @@
 3n-skx-xxv710
 ~~~~~~~~~~~~~
 
-64b-2t1c-base_and_scale
------------------------
+64b-2t1c-base
+-------------
 
 .. raw:: html
 
@@ -74,8 +74,8 @@
 
     \clearpage
 
-64b-4t2c-base_and_scale
------------------------
+64b-4t2c-base
+-------------
 
 .. raw:: html
 
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif-2n-skx-x710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif-2n-skx-x710.rst
index b208c82542..043e095eeb 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif-2n-skx-x710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif-2n-skx-x710.rst
@@ -31,13 +31,13 @@
 2n-skx-x710
 ~~~~~~~~~~~
 
-64b-base_and_scale
-------------------
+64b-base
+--------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm09" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-2n-skx-x710-64b-base_and_scale-ndr-tsa.html"></iframe>
+    <iframe id="ifrm09" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-2n-skx-x710-64b-base-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,8 +46,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{memif-2n-skx-x710-64b-base_and_scale-ndr-tsa}
-            \label{fig:memif-2n-skx-x710-64b-base_and_scale-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{memif-2n-skx-x710-64b-base-ndr-tsa}
+            \label{fig:memif-2n-skx-x710-64b-base-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -57,7 +57,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="ifrm10" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-2n-skx-x710-64b-base_and_scale-pdr-tsa.html"></iframe>
+    <iframe id="ifrm10" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-2n-skx-x710-64b-base-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -66,6 +66,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{memif-2n-skx-x710-64b-base_and_scale-pdr-tsa}
-            \label{fig:memif-2n-skx-x710-64b-base_and_scale-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{memif-2n-skx-x710-64b-base-pdr-tsa}
+            \label{fig:memif-2n-skx-x710-64b-base-pdr-tsa}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif-2n-skx-xxv710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif-2n-skx-xxv710.rst
index 7d8deadde9..3a3a80d042 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif-2n-skx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif-2n-skx-xxv710.rst
@@ -31,13 +31,13 @@
 2n-skx-xxv710
 ~~~~~~~~~~~~~
 
-64b-base_and_scale
-------------------
+64b-base_and_features
+---------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-2n-skx-xxv710-64b-base_and_scale-ndr-tsa.html"></iframe>
+    <iframe id="ifrm11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-2n-skx-xxv710-64b-base_and_features-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,8 +46,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{memif-2n-skx-xxv710-64b-base_and_scale-ndr-tsa}
-            \label{fig:memif-2n-skx-xxv710-64b-base_and_scale-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{memif-2n-skx-xxv710-64b-base_and_features-ndr-tsa}
+            \label{fig:memif-2n-skx-xxv710-64b-base_and_features-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -57,7 +57,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="ifrm12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-2n-skx-xxv710-64b-base_and_scale-pdr-tsa.html"></iframe>
+    <iframe id="ifrm12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-2n-skx-xxv710-64b-base_and_features-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -66,6 +66,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{memif-2n-skx-xxv710-64b-base_and_scale-pdr-tsa}
-            \label{fig:memif-2n-skx-xxv710-64b-base_and_scale-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{memif-2n-skx-xxv710-64b-base_and_features-pdr-tsa}
+            \label{fig:memif-2n-skx-xxv710-64b-base_and_features-pdr-tsa}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif-3n-hsw-x520.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif-3n-hsw-x520.rst
index 2b951f3ae8..5299650bf8 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif-3n-hsw-x520.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif-3n-hsw-x520.rst
@@ -31,13 +31,13 @@
 3n-hsw-x520
 ~~~~~~~~~~~
 
-64b-base_and_scale
-------------------
+64b-base_and_features
+---------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-hsw-x520-64b-base_and_scale-ndr-tsa.html"></iframe>
+    <iframe id="ifrm01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-hsw-x520-64b-base_and_features-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,8 +46,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{memif-3n-hsw-x520-64b-base_and_scale-ndr-tsa}
-            \label{fig:memif-3n-hsw-x520-64b-base_and_scale-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{memif-3n-hsw-x520-64b-base_and_features-ndr-tsa}
+            \label{fig:memif-3n-hsw-x520-64b-base_and_features-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -57,7 +57,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="ifrm02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-hsw-x520-64b-base_and_scale-pdr-tsa.html"></iframe>
+    <iframe id="ifrm02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-hsw-x520-64b-base_and_features-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -66,6 +66,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{memif-3n-hsw-x520-64b-base_and_scale-pdr-tsa}
-            \label{fig:memif-3n-hsw-x520-64b-base_and_scale-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{memif-3n-hsw-x520-64b-base_and_features-pdr-tsa}
+            \label{fig:memif-3n-hsw-x520-64b-base_and_features-pdr-tsa}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif-3n-hsw-x710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif-3n-hsw-x710.rst
index 1fc762ead0..0d33410208 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif-3n-hsw-x710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif-3n-hsw-x710.rst
@@ -31,13 +31,13 @@
 3n-hsw-x710
 ~~~~~~~~~~~
 
-64b-base_and_scale
-------------------
+64b-base_and_features
+---------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-hsw-x710-64b-base_and_scale-ndr-tsa.html"></iframe>
+    <iframe id="ifrm03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-hsw-x710-64b-base_and_features-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,8 +46,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{memif-3n-hsw-x710-64b-base_and_scale-ndr-tsa}
-            \label{fig:memif-3n-hsw-x710-64b-base_and_scale-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{memif-3n-hsw-x710-64b-base_and_features-ndr-tsa}
+            \label{fig:memif-3n-hsw-x710-64b-base_and_features-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -57,7 +57,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="ifrm04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-hsw-x710-64b-base_and_scale-pdr-tsa.html"></iframe>
+    <iframe id="ifrm04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-hsw-x710-64b-base_and_features-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -66,6 +66,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{memif-3n-hsw-x710-64b-base_and_scale-pdr-tsa}
-            \label{fig:memif-3n-hsw-x710-64b-base_and_scale-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{memif-3n-hsw-x710-64b-base_and_features-pdr-tsa}
+            \label{fig:memif-3n-hsw-x710-64b-base_and_features-pdr-tsa}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif-3n-hsw-xl710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif-3n-hsw-xl710.rst
index d2b105c4f6..44d73e4de0 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif-3n-hsw-xl710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif-3n-hsw-xl710.rst
@@ -31,13 +31,13 @@
 3n-hsw-xl710
 ~~~~~~~~~~~~
 
-64b-base_and_scale
-------------------
+64b-base_and_features
+---------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm05" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-hsw-xl710-64b-base_and_scale-ndr-tsa.html"></iframe>
+    <iframe id="ifrm05" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-hsw-xl710-64b-base_and_features-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,8 +46,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{memif-3n-hsw-xl710-64b-base_and_scale-ndr-tsa}
-            \label{fig:memif-3n-hsw-xl710-64b-base_and_scale-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{memif-3n-hsw-xl710-64b-base_and_features-ndr-tsa}
+            \label{fig:memif-3n-hsw-xl710-64b-base_and_features-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -57,7 +57,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="ifrm06" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-hsw-xl710-64b-base_and_scale-pdr-tsa.html"></iframe>
+    <iframe id="ifrm06" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-hsw-xl710-64b-base_and_features-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -66,6 +66,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{memif-3n-hsw-xl710-64b-base_and_scale-pdr-tsa}
-            \label{fig:memif-3n-hsw-xl710-64b-base_and_scale-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{memif-3n-hsw-xl710-64b-base_and_features-pdr-tsa}
+            \label{fig:memif-3n-hsw-xl710-64b-base_and_features-pdr-tsa}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif-3n-skx-x710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif-3n-skx-x710.rst
index 8599d53ca4..2bf2da736f 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif-3n-skx-x710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif-3n-skx-x710.rst
@@ -31,13 +31,13 @@
 3n-skx-x710
 ~~~~~~~~~~~
 
-64b-base_and_scale
-------------------
+64b-base_and_features
+---------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm07" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-skx-x710-64b-base_and_scale-ndr-tsa.html"></iframe>
+    <iframe id="ifrm07" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-skx-x710-64b-base_and_features-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,8 +46,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{memif-3n-skx-x710-64b-base_and_scale-ndr-tsa}
-            \label{fig:memif-3n-skx-x710-64b-base_and_scale-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{memif-3n-skx-x710-64b-base_and_features-ndr-tsa}
+            \label{fig:memif-3n-skx-x710-64b-base_and_features-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -57,7 +57,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="ifrm08" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-skx-x710-64b-base_and_scale-pdr-tsa.html"></iframe>
+    <iframe id="ifrm08" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-skx-x710-64b-base_and_features-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -66,6 +66,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{memif-3n-skx-x710-64b-base_and_scale-pdr-tsa}
-            \label{fig:memif-3n-skx-x710-64b-base_and_scale-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{memif-3n-skx-x710-64b-base_and_features-pdr-tsa}
+            \label{fig:memif-3n-skx-x710-64b-base_and_features-pdr-tsa}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-3n-hsw-xl710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-3n-hsw-xl710.rst
index 6d5940386f..6e9b5a67ae 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-3n-hsw-xl710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-3n-hsw-xl710.rst
@@ -31,13 +31,13 @@
 3n-hsw-xl710
 ~~~~~~~~~~~~
 
-64b-base_and_scale
-------------------
+64b-base
+--------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm09" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-xl710-64b-base_and_scale-ndr-tsa.html"></iframe>
+    <iframe id="ifrm09" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-xl710-64b-base-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,8 +46,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-xl710-64b-base_and_scale-ndr-tsa}
-            \label{fig:l2sw-3n-hsw-xl710-64b-base_and_scale-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-xl710-64b-base-ndr-tsa}
+            \label{fig:l2sw-3n-hsw-xl710-64b-base-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -57,7 +57,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="ifrm10" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-xl710-64b-base_and_scale-pdr-tsa.html"></iframe>
+    <iframe id="ifrm10" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-xl710-64b-base-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -66,6 +66,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-xl710-64b-base_and_scale-pdr-tsa}
-            \label{fig:l2sw-3n-hsw-xl710-64b-base_and_scale-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-xl710-64b-base-pdr-tsa}
+            \label{fig:l2sw-3n-hsw-xl710-64b-base-pdr-tsa}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-3n-skx-xxv710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-3n-skx-xxv710.rst
index cd2f77f927..4bc5fa4142 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-3n-skx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-3n-skx-xxv710.rst
@@ -31,13 +31,13 @@
 3n-skx-xxv710
 ~~~~~~~~~~~~~
 
-64b-base_and_scale
-------------------
+64b-base
+--------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm15" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-skx-xxv710-64b-base_and_scale-ndr-tsa.html"></iframe>
+    <iframe id="ifrm15" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-skx-xxv710-64b-base-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,8 +46,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-skx-xxv710-64b-base_and_scale-ndr-tsa}
-            \label{fig:l2sw-3n-skx-xxv710-64b-base_and_scale-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-skx-xxv710-64b-base-ndr-tsa}
+            \label{fig:l2sw-3n-skx-xxv710-64b-base-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -57,7 +57,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="ifrm16" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-skx-xxv710-64b-base_and_scale-pdr-tsa.html"></iframe>
+    <iframe id="ifrm16" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-skx-xxv710-64b-base-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -66,6 +66,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-skx-xxv710-64b-base_and_scale-pdr-tsa}
-            \label{fig:l2sw-3n-skx-xxv710-64b-base_and_scale-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-skx-xxv710-64b-base-pdr-tsa}
+            \label{fig:l2sw-3n-skx-xxv710-64b-base-pdr-tsa}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-2n-skx-x710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-2n-skx-x710.rst
index 847cba96a6..a839669f0c 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-2n-skx-x710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-2n-skx-x710.rst
@@ -74,49 +74,6 @@
 
     \clearpage
 
-64b-base_and_scale-l2sw
------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm35" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-2n-skx-x710-64b-base_and_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]{vhost-l2sw-2n-skx-x710-64b-base_and_scale-ndr-tsa}
-            \label{fig:vhost-l2sw-2n-skx-x710-64b-base_and_scale-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm36" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-2n-skx-x710-64b-base_and_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]{vhost-l2sw-2n-skx-x710-64b-base_and_scale-pdr-tsa}
-            \label{fig:vhost-l2sw-2n-skx-x710-64b-base_and_scale-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
 64b-base-vm-l2sw
 ----------------
 
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-3n-hsw-x520.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-3n-hsw-x520.rst
index 99c64e55dc..61e2d2f78d 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-3n-hsw-x520.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-3n-hsw-x520.rst
@@ -74,49 +74,6 @@
 
     \clearpage
 
-64b-base_and_scale-l2sw
------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-x520-64b-base_and_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]{vhost-l2sw-3n-hsw-x520-64b-base_and_scale-ndr-tsa}
-            \label{fig:vhost-l2sw-3n-hsw-x520-64b-base_and_scale-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-x520-64b-base_and_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]{vhost-l2sw-3n-hsw-x520-64b-base_and_scale-pdr-tsa}
-            \label{fig:vhost-l2sw-3n-hsw-x520-64b-base_and_scale-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
 64b-base-vm-l2sw
 ----------------
 
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-3n-hsw-x710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-3n-hsw-x710.rst
index 1b17f90960..476de66b23 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-3n-hsw-x710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-3n-hsw-x710.rst
@@ -74,49 +74,6 @@
 
     \clearpage
 
-64b-base_and_scale-l2sw
------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-x710-64b-base_and_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]{vhost-l2sw-3n-hsw-x710-64b-base_and_scale-ndr-tsa}
-            \label{fig:vhost-l2sw-3n-hsw-x710-64b-base_and_scale-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-x710-64b-base_and_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]{vhost-l2sw-3n-hsw-x710-64b-base_and_scale-pdr-tsa}
-            \label{fig:vhost-l2sw-3n-hsw-x710-64b-base_and_scale-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
 64b-base-vm-l2sw
 ----------------
 
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-3n-skx-x710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-3n-skx-x710.rst
index d1cfafdf12..6e894a23ef 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-3n-skx-x710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-3n-skx-x710.rst
@@ -74,49 +74,6 @@
 
     \clearpage
 
-64b-base_and_scale-l2sw
------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm27" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-skx-x710-64b-base_and_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]{vhost-l2sw-3n-skx-x710-64b-base_and_scale-ndr-tsa}
-            \label{fig:vhost-l2sw-3n-skx-x710-64b-base_and_scale-ndr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm28" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-skx-x710-64b-base_and_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]{vhost-l2sw-3n-skx-x710-64b-base_and_scale-pdr-tsa}
-            \label{fig:vhost-l2sw-3n-skx-x710-64b-base_and_scale-pdr-tsa}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
 64b-base-vm-l2sw
 ----------------