CSIT-1440: Re-organize graphs in report

- fixes

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

11 files changed, 250 insertions, 127 deletions

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 043e095eeb..411c8a5583 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
---------
+64b-base_and_features
+---------------------
 
 .. 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-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_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-x710-64b-base-ndr-tsa}
-            \label{fig:memif-2n-skx-x710-64b-base-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{memif-2n-skx-x710-64b-base_and_features-ndr-tsa}
+            \label{fig:memif-2n-skx-x710-64b-base_and_features-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-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_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-x710-64b-base-pdr-tsa}
-            \label{fig:memif-2n-skx-x710-64b-base-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{memif-2n-skx-x710-64b-base_and_features-pdr-tsa}
+            \label{fig:memif-2n-skx-x710-64b-base_and_features-pdr-tsa}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-3n-hsw-xl710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-3n-hsw-xl710.rst
index d60c9a0d17..7bc2ecd8db 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-3n-hsw-xl710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-3n-hsw-xl710.rst
@@ -31,13 +31,13 @@
 3n-hsw-xl710
 ~~~~~~~~~~~~
 
-64b-base_and_scale
-------------------
+64b-base
+--------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-xl710-64b-base_and_scale-ndr-tsa.html"></iframe>
+    <iframe id="ifrm21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-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]{ip4-3n-hsw-xl710-64b-base_and_scale-ndr-tsa}
-            \label{fig:ip4-3n-hsw-xl710-64b-base_and_scale-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-xl710-64b-base-ndr-tsa}
+            \label{fig:ip4-3n-hsw-xl710-64b-base-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -57,7 +57,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="ifrm22" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-xl710-64b-base_and_scale-pdr-tsa.html"></iframe>
+    <iframe id="ifrm22" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-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]{ip4-3n-hsw-xl710-64b-base_and_scale-pdr-tsa}
-            \label{fig:ip4-3n-hsw-xl710-64b-base_and_scale-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-xl710-64b-base-pdr-tsa}
+            \label{fig:ip4-3n-hsw-xl710-64b-base-pdr-tsa}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-3n-hsw-x520.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-3n-hsw-x520.rst
index 619d398f58..331a6ac886 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-3n-hsw-x520.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-3n-hsw-x520.rst
@@ -31,13 +31,13 @@
 3n-hsw-x520
 ~~~~~~~~~~~
 
-78b-base_and_scale
-------------------
+78b-base
+--------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-x520-78b-base_and_scale-ndr-tsa.html"></iframe>
+    <iframe id="ifrm01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-x520-78b-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]{ip6-3n-hsw-x520-78b-base_and_scale-ndr-tsa}
-            \label{fig:ip6-3n-hsw-x520-78b-base_and_scale-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-hsw-x520-78b-base-ndr-tsa}
+            \label{fig:ip6-3n-hsw-x520-78b-base-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/ip6-3n-hsw-x520-78b-base_and_scale-pdr-tsa.html"></iframe>
+    <iframe id="ifrm02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-x520-78b-base-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -66,49 +66,10 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-hsw-x520-78b-base_and_scale-pdr-tsa}
-            \label{fig:ip6-3n-hsw-x520-78b-base_and_scale-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-hsw-x520-78b-base-pdr-tsa}
+            \label{fig:ip6-3n-hsw-x520-78b-base-pdr-tsa}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
-
-78b-base_and_features
----------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-x520-78b-base_and_features-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]{ip6-3n-hsw-x520-78b-base_and_features-ndr-tsa}
-            \label{fig:ip6-3n-hsw-x520-78b-base_and_features-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/ip6-3n-hsw-x520-78b-base_and_features-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]{ip6-3n-hsw-x520-78b-base_and_features-pdr-tsa}
-            \label{fig:ip6-3n-hsw-x520-78b-base_and_features-pdr-tsa}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-3n-hsw-xl710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-3n-hsw-xl710.rst
index c3ecbf558c..592ea51104 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-3n-hsw-xl710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-3n-hsw-xl710.rst
@@ -31,13 +31,13 @@
 3n-hsw-xl710
 ~~~~~~~~~~~~
 
-78b-base_and_scale
-------------------
+78b-base
+--------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm09" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-xl710-78b-base_and_scale-ndr-tsa.html"></iframe>
+    <iframe id="ifrm09" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-xl710-78b-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]{ip6-3n-hsw-xl710-78b-base_and_scale-ndr-tsa}
-            \label{fig:ip6-3n-hsw-xl710-78b-base_and_scale-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-hsw-xl710-78b-base-ndr-tsa}
+            \label{fig:ip6-3n-hsw-xl710-78b-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/ip6-3n-hsw-xl710-78b-base_and_scale-pdr-tsa.html"></iframe>
+    <iframe id="ifrm10" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-xl710-78b-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]{ip6-3n-hsw-xl710-78b-base_and_scale-pdr-tsa}
-            \label{fig:ip6-3n-hsw-xl710-78b-base_and_scale-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-hsw-xl710-78b-base-pdr-tsa}
+            \label{fig:ip6-3n-hsw-xl710-78b-base-pdr-tsa}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6_tunnels-3n-hsw-x520.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6_tunnels-3n-hsw-x520.rst
index 4cfb13a3d8..4b5823e187 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6_tunnels-3n-hsw-x520.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6_tunnels-3n-hsw-x520.rst
@@ -31,13 +31,13 @@
 3n-hsw-x520
 ~~~~~~~~~~~
 
-78b-base_and_scale
-------------------
+78b-base
+--------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6tun-3n-hsw-x520-78b-base_and_scale-ndr-tsa.html"></iframe>
+    <iframe id="ifrm01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6tun-3n-hsw-x520-78b-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]{ip6tun-3n-hsw-x520-78b-base_and_scale-ndr-tsa}
-            \label{fig:ip6tun-3n-hsw-x520-78b-base_and_scale-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip6tun-3n-hsw-x520-78b-base-ndr-tsa}
+            \label{fig:ip6tun-3n-hsw-x520-78b-base-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/ip6tun-3n-hsw-x520-78b-base_and_scale-pdr-tsa.html"></iframe>
+    <iframe id="ifrm02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6tun-3n-hsw-x520-78b-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]{ip6tun-3n-hsw-x520-78b-base_and_scale-pdr-tsa}
-            \label{fig:ip6tun-3n-hsw-x520-78b-base_and_scale-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip6tun-3n-hsw-x520-78b-base-pdr-tsa}
+            \label{fig:ip6tun-3n-hsw-x520-78b-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 a839669f0c..4998aebf60 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
@@ -31,13 +31,13 @@
 2n-skx-x710
 ~~~~~~~~~~~
 
-64b-base-l2sw
--------------
+64b-base_and_features-l2sw
+--------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm33" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-2n-skx-x710-64b-base-ndr-tsa.html"></iframe>
+    <iframe id="ifrm33" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-2n-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]{vhost-l2sw-2n-skx-x710-64b-base-ndr-tsa}
-            \label{fig:vhost-l2sw-2n-skx-x710-64b-base-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-2n-skx-x710-64b-base_and_features-ndr-tsa}
+            \label{fig:vhost-l2sw-2n-skx-x710-64b-base_and_features-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -57,7 +57,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="ifrm34" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-2n-skx-x710-64b-base-pdr-tsa.html"></iframe>
+    <iframe id="ifrm34" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-2n-skx-x710-64b-base_and_features-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -66,8 +66,8 @@
     \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-pdr-tsa}
-            \label{fig:vhost-l2sw-2n-skx-x710-64b-base-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-2n-skx-x710-64b-base_and_features-pdr-tsa}
+            \label{fig:vhost-l2sw-2n-skx-x710-64b-base_and_features-pdr-tsa}
     \end{figure}
 
 .. raw:: latex
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-2n-skx-xxv710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-2n-skx-xxv710.rst
new file mode 100644
index 0000000000..3a30932282
--- /dev/null
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-2n-skx-xxv710.rst
@@ -0,0 +1,161 @@
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <script type="text/javascript">
+
+        function getDocHeight(doc) {
+            doc = doc || document;
+            var body = doc.body, html = doc.documentElement;
+            var height = Math.max( body.scrollHeight, body.offsetHeight,
+                html.clientHeight, html.scrollHeight, html.offsetHeight );
+            return height;
+        }
+
+        function setIframeHeight(id) {
+            var ifrm = document.getElementById(id);
+            var doc = ifrm.contentDocument? ifrm.contentDocument:
+                ifrm.contentWindow.document;
+            ifrm.style.visibility = 'hidden';
+            ifrm.style.height = "10px"; // reset to minimal height ...
+            // IE opt. for bing/msn needs a bit added or scrollbar appears
+            ifrm.style.height = getDocHeight( doc ) + 4 + "px";
+            ifrm.style.visibility = 'visible';
+        }
+
+    </script>
+
+2n-skx-xxv710
+~~~~~~~~~~~~~
+
+64b-base_and_features-l2sw
+--------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="ifrm33" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-2n-skx-xxv710-64b-base_and_features-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-xxv710-64b-base_and_features-ndr-tsa}
+            \label{fig:vhost-l2sw-2n-skx-xxv710-64b-base_and_features-ndr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="ifrm34" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-2n-skx-xxv710-64b-base_and_features-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-xxv710-64b-base_and_features-pdr-tsa}
+            \label{fig:vhost-l2sw-2n-skx-xxv710-64b-base_and_features-pdr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+64b-base-vm-l2sw
+----------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="ifrm37" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-2n-skx-xxv710-64b-base-vm-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-xxv710-64b-base-vm-ndr-tsa}
+            \label{fig:vhost-l2sw-2n-skx-xxv710-64b-base-vm-ndr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="ifrm38" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-2n-skx-xxv710-64b-base-vm-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-xxv710-64b-base-vm-pdr-tsa}
+            \label{fig:vhost-l2sw-2n-skx-xxv710-64b-base-vm-pdr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+64b-base_and_scale-ip4
+----------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="ifrm39" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-ip4-2n-skx-xxv710-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-ip4-2n-skx-xxv710-64b-base_and_scale-ndr-tsa}
+            \label{fig:vhost-ip4-2n-skx-xxv710-64b-base_and_scale-ndr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="ifrm40" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-ip4-2n-skx-xxv710-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-ip4-2n-skx-xxv710-64b-base_and_scale-pdr-tsa}
+            \label{fig:vhost-ip4-2n-skx-xxv710-64b-base_and_scale-pdr-tsa}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
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 61e2d2f78d..eb2656fe19 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
@@ -31,13 +31,13 @@
 3n-hsw-x520
 ~~~~~~~~~~~
 
-64b-base-l2sw
--------------
+64b-base_and_features-l2sw
+--------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-x520-64b-base-ndr-tsa.html"></iframe>
+    <iframe id="ifrm01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-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]{vhost-l2sw-3n-hsw-x520-64b-base-ndr-tsa}
-            \label{fig:vhost-l2sw-3n-hsw-x520-64b-base-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-hsw-x520-64b-base_and_features-ndr-tsa}
+            \label{fig:vhost-l2sw-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/vhost-l2sw-3n-hsw-x520-64b-base-pdr-tsa.html"></iframe>
+    <iframe id="ifrm02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-x520-64b-base_and_features-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -66,8 +66,8 @@
     \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-pdr-tsa}
-            \label{fig:vhost-l2sw-3n-hsw-x520-64b-base-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-hsw-x520-64b-base_and_features-pdr-tsa}
+            \label{fig:vhost-l2sw-3n-hsw-x520-64b-base_and_features-pdr-tsa}
     \end{figure}
 
 .. raw:: latex
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 476de66b23..016237f4aa 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
@@ -31,13 +31,13 @@
 3n-hsw-x710
 ~~~~~~~~~~~
 
-64b-base-l2sw
--------------
+64b-base_and_features-l2sw
+--------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm09" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-x710-64b-base-ndr-tsa.html"></iframe>
+    <iframe id="ifrm09" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-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]{vhost-l2sw-3n-hsw-x710-64b-base-ndr-tsa}
-            \label{fig:vhost-l2sw-3n-hsw-x710-64b-base-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-hsw-x710-64b-base_and_features-ndr-tsa}
+            \label{fig:vhost-l2sw-3n-hsw-x710-64b-base_and_features-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/vhost-l2sw-3n-hsw-x710-64b-base-pdr-tsa.html"></iframe>
+    <iframe id="ifrm10" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-x710-64b-base_and_features-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -66,21 +66,21 @@
     \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-pdr-tsa}
-            \label{fig:vhost-l2sw-3n-hsw-x710-64b-base-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-hsw-x710-64b-base_and_features-pdr-tsa}
+            \label{fig:vhost-l2sw-3n-hsw-x710-64b-base_and_features-pdr-tsa}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-base-vm-l2sw
-----------------
+64b-base_and_features-vm-l2sw
+-----------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm13" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-x710-64b-base-vm-ndr-tsa.html"></iframe>
+    <iframe id="ifrm13" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-x710-64b-base_and_features-vm-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -89,8 +89,8 @@
     \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-vm-ndr-tsa}
-            \label{fig:vhost-l2sw-3n-hsw-x710-64b-base-vm-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-hsw-x710-64b-base_and_features-vm-ndr-tsa}
+            \label{fig:vhost-l2sw-3n-hsw-x710-64b-base_and_features-vm-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -100,7 +100,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="ifrm14" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-x710-64b-base-vm-pdr-tsa.html"></iframe>
+    <iframe id="ifrm14" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-x710-64b-base_and_features-vm-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -109,8 +109,8 @@
     \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-vm-pdr-tsa}
-            \label{fig:vhost-l2sw-3n-hsw-x710-64b-base-vm-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-hsw-x710-64b-base_and_features-vm-pdr-tsa}
+            \label{fig:vhost-l2sw-3n-hsw-x710-64b-base_and_features-vm-pdr-tsa}
     \end{figure}
 
 .. raw:: latex
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 6e894a23ef..62501043d7 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
@@ -31,13 +31,13 @@
 3n-skx-x710
 ~~~~~~~~~~~
 
-64b-base-l2sw
--------------
+64b-base_and_features-l2sw
+--------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm25" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-skx-x710-64b-base-ndr-tsa.html"></iframe>
+    <iframe id="ifrm25" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-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]{vhost-l2sw-3n-skx-x710-64b-base-ndr-tsa}
-            \label{fig:vhost-l2sw-3n-skx-x710-64b-base-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-skx-x710-64b-base_and_features-ndr-tsa}
+            \label{fig:vhost-l2sw-3n-skx-x710-64b-base_and_features-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -57,7 +57,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="ifrm26" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-skx-x710-64b-base-pdr-tsa.html"></iframe>
+    <iframe id="ifrm26" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-skx-x710-64b-base_and_features-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -66,21 +66,21 @@
     \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-pdr-tsa}
-            \label{fig:vhost-l2sw-3n-skx-x710-64b-base-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-skx-x710-64b-base_and_features-pdr-tsa}
+            \label{fig:vhost-l2sw-3n-skx-x710-64b-base_and_features-pdr-tsa}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-base-vm-l2sw
-----------------
+64b-base_and_features-vm-l2sw
+-----------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm29" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-skx-x710-64b-base-vm-ndr-tsa.html"></iframe>
+    <iframe id="ifrm29" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-skx-x710-64b-base_and_features-vm-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -89,8 +89,8 @@
     \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-vm-ndr-tsa}
-            \label{fig:vhost-l2sw-3n-skx-x710-64b-base-vm-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-skx-x710-64b-base_and_features-vm-ndr-tsa}
+            \label{fig:vhost-l2sw-3n-skx-x710-64b-base_and_features-vm-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -100,7 +100,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="ifrm30" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-skx-x710-64b-base-vm-pdr-tsa.html"></iframe>
+    <iframe id="ifrm30" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-skx-x710-64b-base_and_features-vm-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -109,8 +109,8 @@
     \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-vm-pdr-tsa}
-            \label{fig:vhost-l2sw-3n-skx-x710-64b-base-vm-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-skx-x710-64b-base_and_features-vm-pdr-tsa}
+            \label{fig:vhost-l2sw-3n-skx-x710-64b-base_and_features-vm-pdr-tsa}
     \end{figure}
 
 .. raw:: latex
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost.rst
index fd2625d6c1..80fac83126 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost.rst
@@ -23,3 +23,4 @@ CSIT source code for the test cases used for plots can be found in
     vm_vhost-3n-hsw-x710
     vm_vhost-3n-skx-x710
     vm_vhost-2n-skx-x710
+    vm_vhost-2n-skx-xxv710