CSIT-1196: Add hsw/skx and 2n/3n to the report structure

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

11 files changed, 3125 insertions, 408 deletions

diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif.rst
index 4fb8791dff..90c370e74d 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif.rst
@@ -1,5 +1,5 @@
-Container memif Connections
-===========================
+LXC/DRC Container Memif
+=======================
 
 Following sections include Throughput Speedup Analysis for VPP multi-
 core multi-thread configurations with no Hyper-Threading, specifically
@@ -9,58 +9,355 @@ Performance is reported for VPP
 running in multiple configurations of VPP worker thread(s), a.k.a. VPP
 data plane thread(s), and their physical CPU core(s) placement.
 
-NDR Throughput
---------------
+CSIT source code for the test cases used for plots can be found in
+`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/container_memif?h=rls1807>`_.
 
-VPP NDR 64B packet throughput speedup ratio is presented in the graphs
-below for 10ge2p1x520 network interface card.
+3n-hsw-x520
+~~~~~~~~~~~
 
-NIC 10ge2p1x520
-~~~~~~~~~~~~~~~
+64b-base_and_scale
+------------------
 
 .. raw:: html
 
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/10ge2p1x520-64B-container-memif-tsa-ndrdisc.html"></iframe>
+    <center><b>
+
+:index:`Speedup: memif-3n-hsw-x520-64b-base_and_scale-ndr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-hsw-x520-64b-base_and_scale-ndr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
 
 .. raw:: latex
 
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{10ge2p1x520-64B-container-memif-tsa-ndrdisc}
-            \label{fig:10ge2p1x520-64B-container-memif-tsa-ndrdisc}
+            \includegraphics[clip, trim=0cm 8cm 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}
     \end{figure}
 
-*Figure 1. Throughput Speedup Analysis - Multi-Core Speedup Ratio - Normalized
-NDR Throughput for Phy-to-Phy L2 Ethernet Switching (base).*
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: memif-3n-hsw-x520-64b-base_and_scale-pdr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-hsw-x520-64b-base_and_scale-pdr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 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}
+    \end{figure}
+
+3n-hsw-x710
+~~~~~~~~~~~
+
+64b-base_and_scale
+------------------
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: memif-3n-hsw-x710-64b-base_and_scale-ndr`
 
-CSIT source code for the test cases used for above plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/container_memif?h=rls1804>`_.
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-hsw-x710-64b-base_and_scale-ndr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 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}
+    \end{figure}
 
-PDR Throughput
---------------
+.. raw:: html
 
-VPP PDR 64B packet throughput speedup ratio is presented in the graphs
-below for 10ge2p1x520 network interface card.
+    <center><b>
 
-NIC 10ge2p1x520
-~~~~~~~~~~~~~~~
+:index:`Speedup: memif-3n-hsw-x710-64b-base_and_scale-pdr`
 
 .. raw:: html
 
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/10ge2p1x520-64B-container-memif-tsa-pdrdisc.html"></iframe>
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-hsw-x710-64b-base_and_scale-pdr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
 
 .. raw:: latex
 
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{10ge2p1x520-64B-container-memif-tsa-pdrdisc}
-            \label{fig:10ge2p1x520-64B-container-memif-tsa-pdrdisc}
+            \includegraphics[clip, trim=0cm 8cm 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}
     \end{figure}
 
-*Figure 2. Throughput Speedup Analysis - Multi-Core Speedup Ratio - Normalized
-PDR Throughput for Phy-to-Phy L2 Ethernet Switching (base).*
+3n-hsw-xl710
+~~~~~~~~~~~~
+
+64b-base_and_scale
+------------------
 
-CSIT source code for the test cases used for above plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/container_memif?h=rls1804>`_.
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: memif-3n-hsw-xl710-64b-base_and_scale-ndr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-hsw-xl710-64b-base_and_scale-ndr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 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}
+    \end{figure}
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: memif-3n-hsw-xl710-64b-base_and_scale-pdr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-hsw-xl710-64b-base_and_scale-pdr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 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}
+    \end{figure}
+
+3n-skx-x710
+~~~~~~~~~~~
+
+64b-base_and_scale
+------------------
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: memif-3n-skx-xl710-64b-base_and_scale-ndr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-skx-xl710-64b-base_and_scale-ndr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{memif-3n-skx-xl710-64b-base_and_scale-ndr-tsa}
+            \label{fig:memif-3n-skx-xl710-64b-base_and_scale-ndr-tsa}
+    \end{figure}
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: memif-3n-skx-xl710-64b-base_and_scale-pdr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-skx-xl710-64b-base_and_scale-pdr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{memif-3n-skx-xl710-64b-base_and_scale-pdr-tsa}
+            \label{fig:memif-3n-skx-xl710-64b-base_and_scale-pdr-tsa}
+    \end{figure}
+
+3n-skx-xxv710
+~~~~~~~~~~~~~
+
+64b-base_and_scale
+------------------
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: memif-3n-skx-xxv710-64b-base_and_scale-ndr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-skx-xxv710-64b-base_and_scale-ndr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{memif-3n-skx-xxv710-64b-base_and_scale-ndr-tsa}
+            \label{fig:memif-3n-skx-xxv710-64b-base_and_scale-ndr-tsa}
+    \end{figure}
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: memif-3n-skx-xxv710-64b-base_and_scale-pdr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-skx-xxv710-64b-base_and_scale-pdr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{memif-3n-skx-xxv710-64b-base_and_scale-pdr-tsa}
+            \label{fig:memif-3n-skx-xxv710-64b-base_and_scale-pdr-tsa}
+    \end{figure}
+
+2n-skx-x710
+~~~~~~~~~~~
+
+64b-base_and_scale
+------------------
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: memif-2n-skx-x710-64b-base_and_scale-ndr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/memif-2n-skx-x710-64b-base_and_scale-ndr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 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}
+    \end{figure}
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: memif-2n-skx-x710-64b-base_and_scale-pdr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/memif-2n-skx-x710-64b-base_and_scale-pdr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 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}
+    \end{figure}
+
+2n-skx-xxv710
+~~~~~~~~~~~~~
+
+64b-base_and_scale
+------------------
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: memif-2n-skx-xxv710-64b-base_and_scale-ndr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/memif-2n-skx-xxv710-64b-base_and_scale-ndr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 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}
+    \end{figure}
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: memif-2n-skx-xxv710-64b-base_and_scale-pdr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/memif-2n-skx-xxv710-64b-base_and_scale-pdr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 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}
+    \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_orchestrated.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_orchestrated.rst
index 4e8ff4cd25..d3fedbef57 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_orchestrated.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_orchestrated.rst
@@ -1,5 +1,5 @@
-Container Orchestrated Topologies
-=================================
+K8s Container Memif
+===================
 
 Following sections include Throughput Speedup Analysis for VPP multi-
 core multi-thread configurations with no Hyper-Threading, specifically
@@ -9,102 +9,355 @@ Performance is reported for VPP
 running in multiple configurations of VPP worker thread(s), a.k.a. VPP
 data plane thread(s), and their physical CPU core(s) placement.
 
-NDR Throughput
---------------
+CSIT source code for the test cases used for plots can be found in
+`CSIT git repository <https://git.fd.io/csit/tree/tests/kubernetes/perf/container_memif?h=rls1807>`_.
 
-VPP NDR 64B packet throughput speedup ratio is presented in the graphs
-below for 10ge2p1x520 and 10ge2p1x710 network interface cards.
+3n-hsw-x520
+~~~~~~~~~~~
 
-NIC 10ge2p1x520
-~~~~~~~~~~~~~~~
+64b-base_and_scale
+------------------
 
 .. raw:: html
 
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/10ge2p1x520-64B-container-orchestrated-tsa-ndrdisc.html"></iframe>
+    <center><b>
+
+:index:`Speedup: k8s-memif-3n-hsw-x520-64b-base_and_scale-ndr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/k8s-memif-3n-hsw-x520-64b-base_and_scale-ndr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{k8s-memif-3n-hsw-x520-64b-base_and_scale-ndr-tsa}
+            \label{fig:k8s-memif-3n-hsw-x520-64b-base_and_scale-ndr-tsa}
+    \end{figure}
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: k8s-memif-3n-hsw-x520-64b-base_and_scale-pdr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/k8s-memif-3n-hsw-x520-64b-base_and_scale-pdr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{k8s-memif-3n-hsw-x520-64b-base_and_scale-pdr-tsa}
+            \label{fig:k8s-memif-3n-hsw-x520-64b-base_and_scale-pdr-tsa}
+    \end{figure}
+
+3n-hsw-x710
+~~~~~~~~~~~
+
+64b-base_and_scale
+------------------
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: k8s-memif-3n-hsw-x710-64b-base_and_scale-ndr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/k8s-memif-3n-hsw-x710-64b-base_and_scale-ndr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{k8s-memif-3n-hsw-x710-64b-base_and_scale-ndr-tsa}
+            \label{fig:k8s-memif-3n-hsw-x710-64b-base_and_scale-ndr-tsa}
+    \end{figure}
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: k8s-memif-3n-hsw-x710-64b-base_and_scale-pdr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/k8s-memif-3n-hsw-x710-64b-base_and_scale-pdr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
 
 .. raw:: latex
 
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{10ge2p1x520-64B-container-orchestrated-tsa-ndrdisc}
-            \label{fig:10ge2p1x520-64B-container-orchestrated-tsa-ndrdisc}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{k8s-memif-3n-hsw-x710-64b-base_and_scale-pdr-tsa}
+            \label{fig:k8s-memif-3n-hsw-x710-64b-base_and_scale-pdr-tsa}
     \end{figure}
 
-*Figure 1. VPP 1thread 1core - NDR Throughput for Phy-to-Phy L2 Ethernet
-Switching (base).*
+3n-hsw-xl710
+~~~~~~~~~~~~
+
+64b-base_and_scale
+------------------
 
-CSIT source code for the test cases used for above plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/kubernetes/perf/container_memif?h=rls1804>`_.
+.. raw:: html
+
+    <center><b>
 
-NIC 10ge2p1x710
-~~~~~~~~~~~~~~~
+:index:`Speedup: k8s-memif-3n-hsw-xl710-64b-base_and_scale-ndr`
 
 .. raw:: html
 
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/10ge2p1x710-64B-container-orchestrated-tsa-ndrdisc.html"></iframe>
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/k8s-memif-3n-hsw-xl710-64b-base_and_scale-ndr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
 
 .. raw:: latex
 
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{10ge2p1x710-64B-container-orchestrated-tsa-ndrdisc}
-            \label{fig:10ge2p1x710-64B-container-orchestrated-tsa-ndrdisc}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{k8s-memif-3n-hsw-xl710-64b-base_and_scale-ndr-tsa}
+            \label{fig:k8s-memif-3n-hsw-xl710-64b-base_and_scale-ndr-tsa}
     \end{figure}
 
-*Figure 2. VPP 1thread 1core - NDR Throughput for Phy-to-Phy L2 Ethernet
-Switching (base).*
+.. raw:: html
 
-CSIT source code for the test cases used for above plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/kubernetes/perf/container_memif?h=rls1804>`_.
+    <center><b>
 
-PDR Throughput
---------------
+:index:`Speedup: k8s-memif-3n-hsw-xl710-64b-base_and_scale-pdr`
+
+.. raw:: html
 
-VPP PDR 64B packet throughput speedup ratio is presented in the graphs
-below for 10ge2p1x520 and 10ge2p1x710 network interface cards.
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/k8s-memif-3n-hsw-xl710-64b-base_and_scale-pdr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
 
-NIC 10ge2p1x520
-~~~~~~~~~~~~~~~
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{k8s-memif-3n-hsw-xl710-64b-base_and_scale-pdr-tsa}
+            \label{fig:k8s-memif-3n-hsw-xl710-64b-base_and_scale-pdr-tsa}
+    \end{figure}
+
+3n-skx-x710
+~~~~~~~~~~~
+
+64b-base_and_scale
+------------------
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: k8s-memif-3n-skx-xl710-64b-base_and_scale-ndr`
 
 .. raw:: html
 
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/10ge2p1x520-64B-container-orchestrated-tsa-pdrdisc.html"></iframe>
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/k8s-memif-3n-skx-xl710-64b-base_and_scale-ndr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
 
 .. raw:: latex
 
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{10ge2p1x520-64B-container-orchestrated-tsa-pdrdisc}
-            \label{fig:10ge2p1x520-64B-container-orchestrated-tsa-pdrdisc}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{k8s-memif-3n-skx-xl710-64b-base_and_scale-ndr-tsa}
+            \label{fig:k8s-memif-3n-skx-xl710-64b-base_and_scale-ndr-tsa}
     \end{figure}
 
-*Figure 3. VPP 1thread 1core - NDR Throughput for Phy-to-Phy L2 Ethernet
-Switching (base).*
+.. raw:: html
 
-CSIT source code for the test cases used for above plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/kubernetes/perf/container_memif?h=rls1804>`_.
+    <center><b>
 
-NIC 10ge2p1x710
-~~~~~~~~~~~~~~~
+:index:`Speedup: k8s-memif-3n-skx-xl710-64b-base_and_scale-pdr`
 
 .. raw:: html
 
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/10ge2p1x710-64B-container-orchestrated-tsa-pdrdisc.html"></iframe>
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/k8s-memif-3n-skx-xl710-64b-base_and_scale-pdr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
 
 .. raw:: latex
 
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{10ge2p1x710-64B-container-orchestrated-tsa-pdrdisc}
-            \label{fig:10ge2p1x710-64B-container-orchestrated-tsa-pdrdisc}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{k8s-memif-3n-skx-xl710-64b-base_and_scale-pdr-tsa}
+            \label{fig:k8s-memif-3n-skx-xl710-64b-base_and_scale-pdr-tsa}
     \end{figure}
 
-*Figure 4. VPP 1thread 1core - NDR Throughput for Phy-to-Phy L2 Ethernet
-Switching (base).*
+3n-skx-xxv710
+~~~~~~~~~~~~~
 
-CSIT source code for the test cases used for above plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/kubernetes/perf/container_memif?h=rls1804>`_.
+64b-base_and_scale
+------------------
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: k8s-memif-3n-skx-xxv710-64b-base_and_scale-ndr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/k8s-memif-3n-skx-xxv710-64b-base_and_scale-ndr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{k8s-memif-3n-skx-xxv710-64b-base_and_scale-ndr-tsa}
+            \label{fig:k8s-memif-3n-skx-xxv710-64b-base_and_scale-ndr-tsa}
+    \end{figure}
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: k8s-memif-3n-skx-xxv710-64b-base_and_scale-pdr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/k8s-memif-3n-skx-xxv710-64b-base_and_scale-pdr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{k8s-memif-3n-skx-xxv710-64b-base_and_scale-pdr-tsa}
+            \label{fig:k8s-memif-3n-skx-xxv710-64b-base_and_scale-pdr-tsa}
+    \end{figure}
+
+2n-skx-x710
+~~~~~~~~~~~
+
+64b-base_and_scale
+------------------
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: k8s-memif-2n-skx-x710-64b-base_and_scale-ndr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/k8s-memif-2n-skx-x710-64b-base_and_scale-ndr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{k8s-memif-2n-skx-x710-64b-base_and_scale-ndr-tsa}
+            \label{fig:k8s-memif-2n-skx-x710-64b-base_and_scale-ndr-tsa}
+    \end{figure}
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: k8s-memif-2n-skx-x710-64b-base_and_scale-pdr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/k8s-memif-2n-skx-x710-64b-base_and_scale-pdr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{k8s-memif-2n-skx-x710-64b-base_and_scale-pdr-tsa}
+            \label{fig:k8s-memif-2n-skx-x710-64b-base_and_scale-pdr-tsa}
+    \end{figure}
+
+2n-skx-xxv710
+~~~~~~~~~~~~~
+
+64b-base_and_scale
+------------------
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: k8s-memif-2n-skx-xxv710-64b-base_and_scale-ndr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/k8s-memif-2n-skx-xxv710-64b-base_and_scale-ndr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{k8s-memif-2n-skx-xxv710-64b-base_and_scale-ndr-tsa}
+            \label{fig:k8s-memif-2n-skx-xxv710-64b-base_and_scale-ndr-tsa}
+    \end{figure}
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: k8s-memif-2n-skx-xxv710-64b-base_and_scale-pdr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/k8s-memif-2n-skx-xxv710-64b-base_and_scale-pdr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{k8s-memif-2n-skx-xxv710-64b-base_and_scale-pdr-tsa}
+            \label{fig:k8s-memif-2n-skx-xxv710-64b-base_and_scale-pdr-tsa}
+    \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/index.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/index.rst
index dca77c5b7b..edaf9ff9cc 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/index.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/index.rst
@@ -1,7 +1,7 @@
 .. _throughput_speedup_multi_core:
 
-Throughput Speedup Multi-Core
-=============================
+Speedup Multi-Core
+==================
 
 Throughput Speedup Multi-Core graphs are generated based on results from
 multiple executions of the same CSIT performance tests across the three
@@ -16,6 +16,7 @@ threaded VPP configurations relative to 1-core configurations.
     files csit-vpp-perf-\*.zip `archived here <../../_static/archive/>`_.
 
 .. toctree::
+    :maxdepth: 1
 
     l2
     ip4
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4.rst
index 0b2b7ef791..1545c9a614 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4.rst
@@ -1,5 +1,5 @@
-IPv4 Routed-Forwarding
-======================
+IPv4 Routing
+============
 
 Following sections include Throughput Speedup Analysis for VPP multi-
 core multi-thread configurations with no Hyper-Threading, specifically
@@ -9,81 +9,684 @@ used for the graphs comes from Phy-to-Phy 64B performance tests with VPP
 IPv4 Routed-Forwarding, including NDR throughput (zero packet loss) and
 PDR throughput (<0.5% packet loss).
 
-NDR Throughput
---------------
+CSIT source code for the test cases used for plots can be found in
+`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/ip4?h=rls1807>`_.
 
-VPP NDR 64B packet throughput speedup ratio is presented in the graphs
-below for 10ge2p1x520 and 40ge2p1xl710 network interface cards.
+3n-hsw-x520
+~~~~~~~~~~~
 
-NIC 10ge2p1x520
-~~~~~~~~~~~~~~~
+64b-base_and_scale
+------------------
 
 .. raw:: html
 
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/10ge2p1x520-64B-ip4-tsa-ndrdisc.html"></iframe>
+    <center><b>
+
+:index:`Speedup: ip4-3n-hsw-x520-64b-base_and_scale-ndr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-base_and_scale-ndr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-base_and_scale-ndr-tsa}
+            \label{fig:ip4-3n-hsw-x520-64b-base_and_scale-ndr-tsa}
+    \end{figure}
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: ip4-3n-hsw-x520-64b-base_and_scale-pdr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-base_and_scale-pdr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-base_and_scale-pdr-tsa}
+            \label{fig:ip4-3n-hsw-x520-64b-base_and_scale-pdr-tsa}
+    \end{figure}
+
+64b-features
+------------
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: ip4-3n-hsw-x520-64b-features-ndr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-features-ndr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-features-ndr-tsa}
+            \label{fig:ip4-3n-hsw-x520-64b-features-ndr-tsa}
+    \end{figure}
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: ip4-3n-hsw-x520-64b-features-pdr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-features-pdr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-features-pdr-tsa}
+            \label{fig:ip4-3n-hsw-x520-64b-features-pdr-tsa}
+    \end{figure}
+
+3n-hsw-x710
+~~~~~~~~~~~
+
+64b-base_and_scale
+------------------
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: ip4-3n-hsw-x710-64b-base_and_scale-ndr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x710-64b-base_and_scale-ndr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x710-64b-base_and_scale-ndr-tsa}
+            \label{fig:ip4-3n-hsw-x710-64b-base_and_scale-ndr-tsa}
+    \end{figure}
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: ip4-3n-hsw-x710-64b-base_and_scale-pdr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x710-64b-base_and_scale-pdr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x710-64b-base_and_scale-pdr-tsa}
+            \label{fig:ip4-3n-hsw-x710-64b-base_and_scale-pdr-tsa}
+    \end{figure}
+
+64b-features
+------------
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: ip4-3n-hsw-x710-64b-features-ndr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x710-64b-features-ndr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x710-64b-features-ndr-tsa}
+            \label{fig:ip4-3n-hsw-x710-64b-features-ndr-tsa}
+    \end{figure}
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: ip4-3n-hsw-x710-64b-features-pdr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x710-64b-features-pdr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
 
 .. raw:: latex
 
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{10ge2p1x520-64B-ip4-tsa-ndrdisc}
-            \label{fig:10ge2p1x520-64B-ip4-tsa-ndrdisc}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x710-64b-features-pdr-tsa}
+            \label{fig:ip4-3n-hsw-x710-64b-features-pdr-tsa}
     \end{figure}
 
-*Figure 1. Throughput Speedup Analysis - Multi-Core Speedup Ratio - Normalized
-NDR Throughput for Phy-to-Phy IPv4 Routed-Forwarding.*
+3n-hsw-xl710
+~~~~~~~~~~~~
+
+64b-base_and_scale
+------------------
+
+.. raw:: html
 
-CSIT source code for the test cases used for above plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/ip4?h=rls1804>`_.
+    <center><b>
 
-NIC 40ge2p1xl710
-~~~~~~~~~~~~~~~~
+:index:`Speedup: ip4-3n-hsw-xl710-64b-base_and_scale-ndr`
 
 .. raw:: html
 
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/40ge2p1xl710-64B-ip4-tsa-ndrdisc.html"></iframe>
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-xl710-64b-base_and_scale-ndr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
 
 .. raw:: latex
 
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{40ge2p1xl710-64B-ip4-tsa-ndrdisc}
-            \label{fig:40ge2p1xl710-64B-ip4-tsa-ndrdisc}
+            \includegraphics[clip, trim=0cm 8cm 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}
     \end{figure}
 
-*Figure 2. Throughput Speedup Analysis - Multi-Core Speedup Ratio - Normalized
-NDR Throughput for Phy-to-Phy IPv4 Routed-Forwarding.*
+.. raw:: html
+
+    <center><b>
 
-CSIT source code for the test cases used for above plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/ip4?h=rls1804>`_.
+:index:`Speedup: ip4-3n-hsw-xl710-64b-base_and_scale-pdr`
 
-PDR Throughput
---------------
+.. raw:: html
 
-VPP PDR 64B packet throughput speedup ratio is presented in the graphs
-below for 10ge2p1x520 and 40ge2p1xl710 network interface cards. PDR
-measured for 0.5% packet loss ratio.
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-xl710-64b-base_and_scale-pdr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
 
-NIC 10ge2p1x520
-~~~~~~~~~~~~~~~
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 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}
+    \end{figure}
+
+64b-features
+------------
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: ip4-3n-hsw-xl710-64b-features-ndr`
 
 .. raw:: html
 
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/10ge2p1x520-64B-ip4-tsa-pdrdisc.html"></iframe>
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-xl710-64b-features-ndr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
 
 .. raw:: latex
 
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{10ge2p1x520-64B-ip4-tsa-pdrdisc}
-            \label{fig:10ge2p1x520-64B-ip4-tsa-pdrdisc}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-xl710-64b-features-ndr-tsa}
+            \label{fig:ip4-3n-hsw-xl710-64b-features-ndr-tsa}
     \end{figure}
 
-*Figure 3. Throughput Speedup Analysis - Multi-Core Speedup Ratio - Normalized
-PDR Throughput for Phy-to-Phy IPv4 Routed-Forwarding.*
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: ip4-3n-hsw-xl710-64b-features-pdr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-xl710-64b-features-pdr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-xl710-64b-features-pdr-tsa}
+            \label{fig:ip4-3n-hsw-xl710-64b-features-pdr-tsa}
+    \end{figure}
+
+3n-skx-x710
+~~~~~~~~~~~
+
+64b-base_and_scale
+------------------
+
+.. raw:: html
 
-CSIT source code for the test cases used for above plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/ip4?h=rls1804>`_.
+    <center><b>
+
+:index:`Speedup: ip4-3n-skx-xl710-64b-base_and_scale-ndr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-skx-xl710-64b-base_and_scale-ndr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-skx-xl710-64b-base_and_scale-ndr-tsa}
+            \label{fig:ip4-3n-skx-xl710-64b-base_and_scale-ndr-tsa}
+    \end{figure}
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: ip4-3n-skx-xl710-64b-base_and_scale-pdr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-skx-xl710-64b-base_and_scale-pdr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-skx-xl710-64b-base_and_scale-pdr-tsa}
+            \label{fig:ip4-3n-skx-xl710-64b-base_and_scale-pdr-tsa}
+    \end{figure}
+
+64b-features
+------------
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: ip4-3n-skx-xl710-64b-features-ndr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-skx-xl710-64b-features-ndr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-skx-xl710-64b-features-ndr-tsa}
+            \label{fig:ip4-3n-skx-xl710-64b-features-ndr-tsa}
+    \end{figure}
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: ip4-3n-skx-xl710-64b-features-pdr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-skx-xl710-64b-features-pdr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-skx-xl710-64b-features-pdr-tsa}
+            \label{fig:ip4-3n-skx-xl710-64b-features-pdr-tsa}
+    \end{figure}
+
+3n-skx-xxv710
+~~~~~~~~~~~~~
+
+64b-base_and_scale
+------------------
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: ip4-3n-skx-xxv710-64b-base_and_scale-ndr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-skx-xxv710-64b-base_and_scale-ndr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-skx-xxv710-64b-base_and_scale-ndr-tsa}
+            \label{fig:ip4-3n-skx-xxv710-64b-base_and_scale-ndr-tsa}
+    \end{figure}
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: ip4-3n-skx-xxv710-64b-base_and_scale-pdr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-skx-xxv710-64b-base_and_scale-pdr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-skx-xxv710-64b-base_and_scale-pdr-tsa}
+            \label{fig:ip4-3n-skx-xxv710-64b-base_and_scale-pdr-tsa}
+    \end{figure}
+
+64b-features
+------------
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: ip4-3n-skx-xxv710-64b-features-ndr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-skx-xxv710-64b-features-ndr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-skx-xxv710-64b-features-ndr-tsa}
+            \label{fig:ip4-3n-skx-xxv710-64b-features-ndr-tsa}
+    \end{figure}
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: ip4-3n-skx-xxv710-64b-features-pdr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-skx-xxv710-64b-features-pdr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-skx-xxv710-64b-features-pdr-tsa}
+            \label{fig:ip4-3n-skx-xxv710-64b-features-pdr-tsa}
+    \end{figure}
+
+2n-skx-x710
+~~~~~~~~~~~
+
+64b-base_and_scale
+------------------
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: ip4-2n-skx-x710-64b-base_and_scale-ndr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-2n-skx-x710-64b-base_and_scale-ndr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-2n-skx-x710-64b-base_and_scale-ndr-tsa}
+            \label{fig:ip4-2n-skx-x710-64b-base_and_scale-ndr-tsa}
+    \end{figure}
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: ip4-2n-skx-x710-64b-base_and_scale-pdr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-2n-skx-x710-64b-base_and_scale-pdr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-2n-skx-x710-64b-base_and_scale-pdr-tsa}
+            \label{fig:ip4-2n-skx-x710-64b-base_and_scale-pdr-tsa}
+    \end{figure}
+
+64b-features
+------------
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: ip4-2n-skx-x710-64b-features-ndr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-2n-skx-x710-64b-features-ndr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-2n-skx-x710-64b-features-ndr-tsa}
+            \label{fig:ip4-2n-skx-x710-64b-features-ndr-tsa}
+    \end{figure}
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: ip4-2n-skx-x710-64b-features-pdr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-2n-skx-x710-64b-features-pdr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-2n-skx-x710-64b-features-pdr-tsa}
+            \label{fig:ip4-2n-skx-x710-64b-features-pdr-tsa}
+    \end{figure}
+
+2n-skx-xxv710
+~~~~~~~~~~~~~
+
+64b-base_and_scale
+------------------
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: ip4-2n-skx-xxv710-64b-base_and_scale-ndr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-2n-skx-xxv710-64b-base_and_scale-ndr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-2n-skx-xxv710-64b-base_and_scale-ndr-tsa}
+            \label{fig:ip4-2n-skx-xxv710-64b-base_and_scale-ndr-tsa}
+    \end{figure}
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: ip4-2n-skx-xxv710-64b-base_and_scale-pdr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-2n-skx-xxv710-64b-base_and_scale-pdr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-2n-skx-xxv710-64b-base_and_scale-pdr-tsa}
+            \label{fig:ip4-2n-skx-xxv710-64b-base_and_scale-pdr-tsa}
+    \end{figure}
+
+64b-features
+------------
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: ip4-2n-skx-xxv710-64b-features-ndr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-2n-skx-xxv710-64b-features-ndr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-2n-skx-xxv710-64b-features-ndr-tsa}
+            \label{fig:ip4-2n-skx-xxv710-64b-features-ndr-tsa}
+    \end{figure}
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: ip4-2n-skx-xxv710-64b-features-pdr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-2n-skx-xxv710-64b-features-pdr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-2n-skx-xxv710-64b-features-pdr-tsa}
+            \label{fig:ip4-2n-skx-xxv710-64b-features-pdr-tsa}
+    \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4_tunnels.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4_tunnels.rst
index 001584b856..998cd43157 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4_tunnels.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4_tunnels.rst
@@ -1,5 +1,5 @@
-IPv4 Overlay Tunnels
-====================
+IPv4 Tunnels
+============
 
 Following sections include Throughput Speedup Analysis for VPP multi-
 core multi-thread configurations with no Hyper-Threading, specifically
@@ -9,58 +9,355 @@ Performance is reported for VPP
 running in multiple configurations of VPP worker thread(s), a.k.a. VPP
 data plane thread(s), and their physical CPU core(s) placement.
 
-NDR Throughput
---------------
+CSIT source code for the test cases used for plots can be found in
+`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/ip4_tunnels?h=rls1807>`_.
 
-VPP NDR 64B packet throughput speedup ratio is presented in the graphs
-below for 10ge2p1x520 network interface card.
+3n-hsw-x520
+~~~~~~~~~~~
 
-NIC 10ge2p1x520
-~~~~~~~~~~~~~~~
+64b-base_and_scale
+------------------
 
 .. raw:: html
 
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/10ge2p1x520-64B-ethip4-tsa-ndrdisc.html"></iframe>
+    <center><b>
+
+:index:`Speedup: ip4tun-3n-hsw-x520-64b-base_and_scale-ndr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-3n-hsw-x520-64b-base_and_scale-ndr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
 
 .. raw:: latex
 
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{10ge2p1x520-64B-ethip4-tsa-ndrdisc}
-            \label{fig:10ge2p1x520-64B-ethip4-tsa-ndrdisc}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4tun-3n-hsw-x520-64b-base_and_scale-ndr-tsa}
+            \label{fig:ip4tun-3n-hsw-x520-64b-base_and_scale-ndr-tsa}
     \end{figure}
 
-*Figure 1. Throughput Speedup Analysis - Multi-Core Speedup Ratio - Normalized
-NDR Throughput for Phy-to-Phy IPv4 Overlay Tunnels.*
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: ip4tun-3n-hsw-x520-64b-base_and_scale-pdr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-3n-hsw-x520-64b-base_and_scale-pdr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4tun-3n-hsw-x520-64b-base_and_scale-pdr-tsa}
+            \label{fig:ip4tun-3n-hsw-x520-64b-base_and_scale-pdr-tsa}
+    \end{figure}
+
+3n-hsw-x710
+~~~~~~~~~~~
+
+64b-base_and_scale
+------------------
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: ip4tun-3n-hsw-x710-64b-base_and_scale-ndr`
 
-CSIT source code for the test cases used for above plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/ip4_tunnels?h=rls1804>`_.
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-3n-hsw-x710-64b-base_and_scale-ndr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4tun-3n-hsw-x710-64b-base_and_scale-ndr-tsa}
+            \label{fig:ip4tun-3n-hsw-x710-64b-base_and_scale-ndr-tsa}
+    \end{figure}
 
-PDR Throughput
---------------
+.. raw:: html
 
-VPP PDR 64B packet throughput speedup ratio is presented in the graphs
-below for 10ge2p1x520 network interface card.
+    <center><b>
 
-NIC 10ge2p1x520
-~~~~~~~~~~~~~~~
+:index:`Speedup: ip4tun-3n-hsw-x710-64b-base_and_scale-pdr`
 
 .. raw:: html
 
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/10ge2p1x520-64B-ethip4-tsa-pdrdisc.html"></iframe>
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-3n-hsw-x710-64b-base_and_scale-pdr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
 
 .. raw:: latex
 
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{10ge2p1x520-64B-ethip4-tsa-pdrdisc}
-            \label{fig:10ge2p1x520-64B-ethip4-tsa-pdrdisc}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4tun-3n-hsw-x710-64b-base_and_scale-pdr-tsa}
+            \label{fig:ip4tun-3n-hsw-x710-64b-base_and_scale-pdr-tsa}
     \end{figure}
 
-*Figure 2. Throughput Speedup Analysis - Multi-Core Speedup Ratio - Normalized
-PDR Throughput for Phy-to-Phy IPv4 Overlay Tunnels.*
+3n-hsw-xl710
+~~~~~~~~~~~~
+
+64b-base_and_scale
+------------------
 
-CSIT source code for the test cases used for above plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/ip4_tunnels?h=rls1804>`_.
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: ip4tun-3n-hsw-xl710-64b-base_and_scale-ndr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-3n-hsw-xl710-64b-base_and_scale-ndr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4tun-3n-hsw-xl710-64b-base_and_scale-ndr-tsa}
+            \label{fig:ip4tun-3n-hsw-xl710-64b-base_and_scale-ndr-tsa}
+    \end{figure}
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: ip4tun-3n-hsw-xl710-64b-base_and_scale-pdr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-3n-hsw-xl710-64b-base_and_scale-pdr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4tun-3n-hsw-xl710-64b-base_and_scale-pdr-tsa}
+            \label{fig:ip4tun-3n-hsw-xl710-64b-base_and_scale-pdr-tsa}
+    \end{figure}
+
+3n-skx-x710
+~~~~~~~~~~~
+
+64b-base_and_scale
+------------------
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: ip4tun-3n-skx-xl710-64b-base_and_scale-ndr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-3n-skx-xl710-64b-base_and_scale-ndr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4tun-3n-skx-xl710-64b-base_and_scale-ndr-tsa}
+            \label{fig:ip4tun-3n-skx-xl710-64b-base_and_scale-ndr-tsa}
+    \end{figure}
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: ip4tun-3n-skx-xl710-64b-base_and_scale-pdr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-3n-skx-xl710-64b-base_and_scale-pdr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4tun-3n-skx-xl710-64b-base_and_scale-pdr-tsa}
+            \label{fig:ip4tun-3n-skx-xl710-64b-base_and_scale-pdr-tsa}
+    \end{figure}
+
+3n-skx-xxv710
+~~~~~~~~~~~~~
+
+64b-base_and_scale
+------------------
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: ip4tun-3n-skx-xxv710-64b-base_and_scale-ndr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-3n-skx-xxv710-64b-base_and_scale-ndr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4tun-3n-skx-xxv710-64b-base_and_scale-ndr-tsa}
+            \label{fig:ip4tun-3n-skx-xxv710-64b-base_and_scale-ndr-tsa}
+    \end{figure}
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: ip4tun-3n-skx-xxv710-64b-base_and_scale-pdr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-3n-skx-xxv710-64b-base_and_scale-pdr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4tun-3n-skx-xxv710-64b-base_and_scale-pdr-tsa}
+            \label{fig:ip4tun-3n-skx-xxv710-64b-base_and_scale-pdr-tsa}
+    \end{figure}
+
+2n-skx-x710
+~~~~~~~~~~~
+
+64b-base_and_scale
+------------------
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: ip4tun-2n-skx-x710-64b-base_and_scale-ndr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-2n-skx-x710-64b-base_and_scale-ndr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4tun-2n-skx-x710-64b-base_and_scale-ndr-tsa}
+            \label{fig:ip4tun-2n-skx-x710-64b-base_and_scale-ndr-tsa}
+    \end{figure}
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: ip4tun-2n-skx-x710-64b-base_and_scale-pdr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-2n-skx-x710-64b-base_and_scale-pdr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4tun-2n-skx-x710-64b-base_and_scale-pdr-tsa}
+            \label{fig:ip4tun-2n-skx-x710-64b-base_and_scale-pdr-tsa}
+    \end{figure}
+
+2n-skx-xxv710
+~~~~~~~~~~~~~
+
+64b-base_and_scale
+------------------
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: ip4tun-2n-skx-xxv710-64b-base_and_scale-ndr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-2n-skx-xxv710-64b-base_and_scale-ndr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4tun-2n-skx-xxv710-64b-base_and_scale-ndr-tsa}
+            \label{fig:ip4tun-2n-skx-xxv710-64b-base_and_scale-ndr-tsa}
+    \end{figure}
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: ip4tun-2n-skx-xxv710-64b-base_and_scale-pdr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-2n-skx-xxv710-64b-base_and_scale-pdr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4tun-2n-skx-xxv710-64b-base_and_scale-pdr-tsa}
+            \label{fig:ip4tun-2n-skx-xxv710-64b-base_and_scale-pdr-tsa}
+    \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6.rst
index e8c70d0c18..9638a44caa 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6.rst
@@ -1,5 +1,5 @@
-IPv6 Routed-Forwarding
-======================
+IPv6 Routing
+============
 
 Following sections include Throughput Speedup Analysis for VPP multi-
 core multi-thread configurations with no Hyper-Threading, specifically
@@ -9,82 +9,684 @@ used for the graphs comes from Phy-to-Phy 78B performance tests with VPP
 IPv6 Routed-Forwarding, including NDR throughput (zero packet loss) and
 PDR throughput (<0.5% packet loss).
 
-NDR Throughput
---------------
+CSIT source code for the test cases used for plots can be found in
+`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/ip6?h=rls1807>`_.
 
-VPP NDR 78B packet throughput speedup ratio is presented in the graphs
-below for 10ge2p1x520 and 40ge2p1xl710 network interface cards.
+3n-hsw-x520
+~~~~~~~~~~~
 
+78b-base_and_scale
+------------------
 
-NIC 10ge2p1x520
-~~~~~~~~~~~~~~~
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: ip6-3n-hsw-x520-78b-base_and_scale-ndr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-x520-78b-base_and_scale-ndr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 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}
+    \end{figure}
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: ip6-3n-hsw-x520-78b-base_and_scale-pdr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-x520-78b-base_and_scale-pdr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 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}
+    \end{figure}
+
+78b-features
+------------
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: ip6-3n-hsw-x520-78b-1t1c-features-ndr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-x520-78b-features-ndr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-hsw-x520-78b-features-ndr-tsa}
+            \label{fig:ip6-3n-hsw-x520-78b-features-ndr-tsa}
+    \end{figure}
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: ip6-3n-hsw-x520-78b-1t1c-features-pdr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-x520-78b-features-pdr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-hsw-x520-78b-features-pdr-tsa}
+            \label{fig:ip6-3n-hsw-x520-78b-features-pdr-tsa}
+    \end{figure}
+
+3n-hsw-x710
+~~~~~~~~~~~
+
+78b-base_and_scale
+------------------
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: ip6-3n-hsw-x710-78b-base_and_scale-ndr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-x710-78b-base_and_scale-ndr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-hsw-x710-78b-base_and_scale-ndr-tsa}
+            \label{fig:ip6-3n-hsw-x710-78b-base_and_scale-ndr-tsa}
+    \end{figure}
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: ip6-3n-hsw-x710-78b-base_and_scale-pdr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-x710-78b-base_and_scale-pdr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-hsw-x710-78b-base_and_scale-pdr-tsa}
+            \label{fig:ip6-3n-hsw-x710-78b-base_and_scale-pdr-tsa}
+    \end{figure}
+
+78b-features
+------------
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: ip6-3n-hsw-x710-78b-1t1c-features-ndr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-x710-78b-features-ndr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-hsw-x710-78b-features-ndr-tsa}
+            \label{fig:ip6-3n-hsw-x710-78b-features-ndr-tsa}
+    \end{figure}
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: ip6-3n-hsw-x710-78b-1t1c-features-pdr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-x710-78b-features-pdr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-hsw-x710-78b-features-pdr-tsa}
+            \label{fig:ip6-3n-hsw-x710-78b-features-pdr-tsa}
+    \end{figure}
+
+3n-hsw-xl710
+~~~~~~~~~~~~
+
+78b-base_and_scale
+------------------
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: ip6-3n-hsw-xl710-78b-base_and_scale-ndr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-xl710-78b-base_and_scale-ndr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 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}
+    \end{figure}
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: ip6-3n-hsw-xl710-78b-base_and_scale-pdr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-xl710-78b-base_and_scale-pdr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 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}
+    \end{figure}
+
+78b-features
+------------
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: ip6-3n-hsw-xl710-78b-1t1c-features-ndr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-xl710-78b-features-ndr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-hsw-xl710-78b-features-ndr-tsa}
+            \label{fig:ip6-3n-hsw-xl710-78b-features-ndr-tsa}
+    \end{figure}
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: ip6-3n-hsw-xl710-78b-1t1c-features-pdr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-xl710-78b-features-pdr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-hsw-xl710-78b-features-pdr-tsa}
+            \label{fig:ip6-3n-hsw-xl710-78b-features-pdr-tsa}
+    \end{figure}
+
+3n-skx-x710
+~~~~~~~~~~~
+
+78b-base_and_scale
+------------------
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: ip6-3n-skx-xl710-78b-base_and_scale-ndr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-skx-xl710-78b-base_and_scale-ndr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-skx-xl710-78b-base_and_scale-ndr-tsa}
+            \label{fig:ip6-3n-skx-xl710-78b-base_and_scale-ndr-tsa}
+    \end{figure}
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: ip6-3n-skx-xl710-78b-base_and_scale-pdr`
 
 .. raw:: html
 
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/10ge2p1x520-78B-ip6-tsa-ndrdisc.html"></iframe>
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-skx-xl710-78b-base_and_scale-pdr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
 
 .. raw:: latex
 
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{10ge2p1x520-78B-ip6-tsa-ndrdisc}
-            \label{fig:10ge2p1x520-78B-ip6-tsa-ndrdisc}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-skx-xl710-78b-base_and_scale-pdr-tsa}
+            \label{fig:ip6-3n-skx-xl710-78b-base_and_scale-pdr-tsa}
     \end{figure}
 
-*Figure 1. Throughput Speedup Analysis - Multi-Core Speedup Ratio - Normalized
-NDR Throughput for Phy-to-Phy IPv6 Routed-Forwarding.*
+78b-features
+------------
 
-CSIT source code for the test cases used for above plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/ip6?h=rls1804>`_.
+.. raw:: html
+
+    <center><b>
 
-NIC 40ge2p1xl710
-~~~~~~~~~~~~~~~~
+:index:`Speedup: ip6-3n-skx-xl710-78b-1t1c-features-ndr`
 
 .. raw:: html
 
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/40ge2p1xl710-78B-ip6-tsa-ndrdisc.html"></iframe>
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-skx-xl710-78b-features-ndr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
 
 .. raw:: latex
 
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{40ge2p1xl710-78B-ip6-tsa-ndrdisc}
-            \label{fig:40ge2p1xl710-78B-ip6-tsa-ndrdisc}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-skx-xl710-78b-features-ndr-tsa}
+            \label{fig:ip6-3n-skx-xl710-78b-features-ndr-tsa}
     \end{figure}
 
-*Figure 2. Throughput Speedup Analysis - Multi-Core Speedup Ratio - Normalized
-NDR Throughput for Phy-to-Phy IPv6 Routed-Forwarding.*
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: ip6-3n-skx-xl710-78b-1t1c-features-pdr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-skx-xl710-78b-features-pdr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
 
-CSIT source code for the test cases used for above plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/ip6?h=rls1804>`_.
+.. raw:: latex
 
-PDR Throughput
---------------
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-skx-xl710-78b-features-pdr-tsa}
+            \label{fig:ip6-3n-skx-xl710-78b-features-pdr-tsa}
+    \end{figure}
 
-VPP PDR 78B packet throughput speedup ratio is presented in the graphs
-below for 10ge2p1x520 and 40ge2p1xl710 network interface cards. PDR
-measured for 0.5% packet loss ratio.
+3n-skx-xxv710
+~~~~~~~~~~~~~
 
-NIC 10ge2p1x520
-~~~~~~~~~~~~~~~
+78b-base_and_scale
+------------------
 
 .. raw:: html
 
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/10ge2p1x520-78B-ip6-tsa-pdrdisc.html"></iframe>
+    <center><b>
+
+:index:`Speedup: ip6-3n-skx-xxv710-78b-base_and_scale-ndr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-skx-xxv710-78b-base_and_scale-ndr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
 
 .. raw:: latex
 
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{10ge2p1x520-78B-ip6-tsa-pdrdisc}
-            \label{fig:10ge2p1x520-78B-ip6-tsa-pdrdisc}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-skx-xxv710-78b-base_and_scale-ndr-tsa}
+            \label{fig:ip6-3n-skx-xxv710-78b-base_and_scale-ndr-tsa}
     \end{figure}
 
-*Figure 3. Throughput Speedup Analysis - Multi-Core Speedup Ratio - Normalized
-PDR Throughput for Phy-to-Phy IPv6 Routed-Forwarding.*
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: ip6-3n-skx-xxv710-78b-base_and_scale-pdr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-skx-xxv710-78b-base_and_scale-pdr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-skx-xxv710-78b-base_and_scale-pdr-tsa}
+            \label{fig:ip6-3n-skx-xxv710-78b-base_and_scale-pdr-tsa}
+    \end{figure}
+
+78b-features
+------------
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: ip6-3n-skx-xxv710-78b-1t1c-features-ndr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-skx-xxv710-78b-features-ndr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-skx-xxv710-78b-features-ndr-tsa}
+            \label{fig:ip6-3n-skx-xxv710-78b-features-ndr-tsa}
+    \end{figure}
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: ip6-3n-skx-xxv710-78b-1t1c-features-pdr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-skx-xxv710-78b-features-pdr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-skx-xxv710-78b-features-pdr-tsa}
+            \label{fig:ip6-3n-skx-xxv710-78b-features-pdr-tsa}
+    \end{figure}
+
+2n-skx-x710
+~~~~~~~~~~~
+
+78b-base_and_scale
+------------------
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: ip6-2n-skx-x710-78b-base_and_scale-ndr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-2n-skx-x710-78b-base_and_scale-ndr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-2n-skx-x710-78b-base_and_scale-ndr-tsa}
+            \label{fig:ip6-2n-skx-x710-78b-base_and_scale-ndr-tsa}
+    \end{figure}
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: ip6-2n-skx-x710-78b-base_and_scale-pdr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-2n-skx-x710-78b-base_and_scale-pdr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
 
-CSIT source code for the test cases used for above plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/ip6?h=rls1804>`_.
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-2n-skx-x710-78b-base_and_scale-pdr-tsa}
+            \label{fig:ip6-2n-skx-x710-78b-base_and_scale-pdr-tsa}
+    \end{figure}
+
+78b-features
+------------
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: ip6-2n-skx-x710-78b-1t1c-features-ndr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-2n-skx-x710-78b-features-ndr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-2n-skx-x710-78b-features-ndr-tsa}
+            \label{fig:ip6-2n-skx-x710-78b-features-ndr-tsa}
+    \end{figure}
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: ip6-2n-skx-x710-78b-1t1c-features-pdr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-2n-skx-x710-78b-features-pdr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-2n-skx-x710-78b-features-pdr-tsa}
+            \label{fig:ip6-2n-skx-x710-78b-features-pdr-tsa}
+    \end{figure}
+
+2n-skx-xxv710
+~~~~~~~~~~~~~
+
+78b-base_and_scale
+------------------
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: ip6-2n-skx-xxv710-78b-base_and_scale-ndr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-2n-skx-xxv710-78b-base_and_scale-ndr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-2n-skx-xxv710-78b-base_and_scale-ndr-tsa}
+            \label{fig:ip6-2n-skx-xxv710-78b-base_and_scale-ndr-tsa}
+    \end{figure}
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: ip6-2n-skx-xxv710-78b-base_and_scale-pdr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-2n-skx-xxv710-78b-base_and_scale-pdr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-2n-skx-xxv710-78b-base_and_scale-pdr-tsa}
+            \label{fig:ip6-2n-skx-xxv710-78b-base_and_scale-pdr-tsa}
+    \end{figure}
+
+78b-features
+------------
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: ip6-2n-skx-xxv710-78b-1t1c-features-ndr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-2n-skx-xxv710-78b-features-ndr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-2n-skx-xxv710-78b-features-ndr-tsa}
+            \label{fig:ip6-2n-skx-xxv710-78b-features-ndr-tsa}
+    \end{figure}
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: ip6-2n-skx-xxv710-78b-1t1c-features-pdr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-2n-skx-xxv710-78b-features-pdr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-2n-skx-xxv710-78b-features-pdr-tsa}
+            \label{fig:ip6-2n-skx-xxv710-78b-features-pdr-tsa}
+    \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6_tunnels.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6_tunnels.rst
index 3965242e8c..4f2fdacd07 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6_tunnels.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6_tunnels.rst
@@ -1,5 +1,5 @@
-IPv6 Overlay Tunnels
-====================
+IPv6 Tunnels
+============
 
 Following sections include Throughput Speedup Analysis for VPP multi-
 core multi-thread configurations with no Hyper-Threading, specifically
@@ -9,58 +9,55 @@ Performance is reported for VPP
 running in multiple configurations of VPP worker thread(s), a.k.a. VPP
 data plane thread(s), and their physical CPU core(s) placement.
 
-NDR Throughput
---------------
+CSIT source code for the test cases used for plots can be found in
+`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/ip6_tunnels?h=rls1807>`_.
 
-VPP NDR 64B packet throughput speedup ratio is presented in the graphs
-below for 10ge2p1x520 network interface card.
+3n-hsw-x520
+~~~~~~~~~~~
 
-NIC 10ge2p1x520
-~~~~~~~~~~~~~~~
+78b-base_and_scale
+------------------
 
 .. raw:: html
 
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/10ge2p1x520-78B-ethip6-tsa-ndrdisc.html"></iframe>
+    <center><b>
+
+:index:`Speedup: ip6tun-3n-hsw-x520-78b-base_and_scale-ndr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6tun-3n-hsw-x520-78b-base_and_scale-ndr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
 
 .. raw:: latex
 
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{10ge2p1x520-78B-ethip6-tsa-ndrdisc}
-            \label{fig:10ge2p1x520-78B-ethip6-tsa-ndrdisc}
+            \includegraphics[clip, trim=0cm 8cm 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}
     \end{figure}
 
-*Figure 1. Throughput Speedup Analysis - Multi-Core Speedup Ratio - Normalized
-NDR Throughput for Phy-to-Phy IPv6 Overlay Tunnels.*
-
-CSIT source code for the test cases used for above plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/ip6_tunnels?h=rls1804>`_.
-
-PDR Throughput
---------------
+.. raw:: html
 
-VPP PDR 64B packet throughput speedup ratio is presented in the graphs
-below for 10ge2p1x520 network interface card.
+    <center><b>
 
-NIC 10ge2p1x520
-~~~~~~~~~~~~~~~
+:index:`Speedup: ip6tun-3n-hsw-x520-78b-base_and_scale-pdr`
 
 .. raw:: html
 
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/10ge2p1x520-78B-ethip6-tsa-pdrdisc.html"></iframe>
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6tun-3n-hsw-x520-78b-base_and_scale-pdr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
 
 .. raw:: latex
 
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{10ge2p1x520-78B-ethip6-tsa-pdrdisc}
-            \label{fig:10ge2p1x520-78B-ethip6-tsa-pdrdisc}
+            \includegraphics[clip, trim=0cm 8cm 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}
     \end{figure}
-
-*Figure 2. Throughput Speedup Analysis - Multi-Core Speedup Ratio - Normalized
-PDR Throughput for Phy-to-Phy IPv6 Overlay Tunnels.*
-
-CSIT source code for the test cases used for above plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/ip6_tunnels?h=rls1804>`_.
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ipsec.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ipsec.rst
index a5a4d7d1bc..82124a3db2 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ipsec.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ipsec.rst
@@ -1,5 +1,5 @@
-IPSec Crypto HW: IP4 Routed-Forwarding
-======================================
+IPSec IPv4 Routing
+==================
 
 Following sections include Throughput Speedup Analysis for VPP multi-
 core multi-thread configurations with no Hyper-Threading, specifically
@@ -11,61 +11,55 @@ Performance is reported for VPP running in multiple configurations of
 VPP worker thread(s), a.k.a. VPP data plane thread(s), and their
 physical CPU core(s) placement.
 
-NDR Throughput
---------------
+CSIT source code for the test cases used for plots can be found in
+`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/crypto?h=rls1807>`_.
 
-VPP NDR 64B packet throughput speedup ratio is presented in the graphs
-below for 40ge2p1xl710 network interface card.
+3n-hsw-xl710
+~~~~~~~~~~~~
 
-NIC 40ge2p1xl710
-~~~~~~~~~~~~~~~~
+64b-base_and_scale
+------------------
 
 .. raw:: html
 
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/40ge2p1xl710-64B-ipsechw-tsa-ndrdisc.html"></iframe>
+    <center><b>
+
+:index:`Speedup: ipsec-3n-hsw-xl710-64b-base_and_scale-ndr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-3n-hsw-xl710-64b-base_and_scale-ndr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
 
 .. raw:: latex
 
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{40ge2p1xl710-64B-ipsechw-tsa-ndrdisc}
-            \label{fig:40ge2p1xl710-64B-ipsechw-tsa-ndrdisc}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ipsec-3n-hsw-xl710-64b-base_and_scale-ndr-tsa}
+            \label{fig:ipsec-3n-hsw-xl710-64b-base_and_scale-ndr-tsa}
     \end{figure}
 
-*Figure 1. Throughput Speedup Analysis - Multi-Core Speedup Ratio - Normalized
-NDR Throughput for Phy-to-Phy IPSEC HW.*
-
-CSIT source code for the test cases used for above plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/crypto?h=rls1804>`_.
-
-PDR Throughput
---------------
-
-VPP PDR 64B packet throughput speedup ratio is presented in the graphs
-below for 40ge2p1xl710 network interface card.
+.. raw:: html
 
-NIC 40ge2p1xl710
-~~~~~~~~~~~~~~~~
+    <center><b>
 
-VPP PDR 64B packet throughput in 1t1c setup (1thread, 1core) is presented
-in the graph below. PDR measured for 0.5% packet loss ratio.
+:index:`Speedup: ipsec-3n-hsw-xl710-64b-base_and_scale-pdr`
 
 .. raw:: html
 
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/40ge2p1xl710-64B-ipsechw-tsa-pdrdisc.html"></iframe>
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-3n-hsw-xl710-64b-base_and_scale-pdr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
 
 .. raw:: latex
 
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{40ge2p1xl710-64B-ipsechw-tsa-pdrdisc}
-            \label{fig:40ge2p1xl710-64B-ipsechw-tsa-pdrdisc}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ipsec-3n-hsw-xl710-64b-base_and_scale-pdr-tsa}
+            \label{fig:ipsec-3n-hsw-xl710-64b-base_and_scale-pdr-tsa}
     \end{figure}
-
-*Figure 2. Throughput Speedup Analysis - Multi-Core Speedup Ratio - Normalized
-PDR Throughput for Phy-to-Phy IPSEC HW.*
-
-CSIT source code for the test cases used for above plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/crypto?h=rls1804>`_.
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2.rst
index 5db8eba307..0a1371cb2a 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2.rst
@@ -9,81 +9,684 @@ used for the graphs comes from Phy-to-Phy 64B performance tests with VPP
 L2 Ethernet switching, including NDR throughput (zero packet loss) and
 PDR throughput (<0.5% packet loss).
 
-NDR Throughput
---------------
+CSIT source code for the test cases used for above plots can be found in
+`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/l2?h=rls1807>`_.
+
+3n-hsw-x520
+~~~~~~~~~~~
+
+64b-base_and_scale
+------------------
 
-VPP NDR 64B packet throughput speedup ratio is presented in the graphs
-below for 10ge2p1x520 and 40ge2p1xl710 network interface cards.
+.. raw:: html
+
+    <center><b>
 
-NIC 10ge2p1x520
-~~~~~~~~~~~~~~~
+:index:`Speedup: l2sw-3n-hsw-x520-64b-base_and_scale-ndr`
 
 .. raw:: html
 
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/10ge2p1x520-64B-l2-tsa-ndrdisc.html"></iframe>
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-base_and_scale-ndr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
 
 .. raw:: latex
 
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{10ge2p1x520-64B-l2-tsa-ndrdisc}
-            \label{fig:10ge2p1x520-64B-l2-tsa-ndrdisc}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x520-64b-base_and_scale-ndr-tsa}
+            \label{fig:l2sw-3n-hsw-x520-64b-base_and_scale-ndr-tsa}
     \end{figure}
 
-*Figure 1. Throughput Speedup Analysis - Multi-Core Speedup Ratio - Normalized
-NDR Throughput for Phy-to-Phy L2 Ethernet Switching.*
+.. raw:: html
 
-CSIT source code for the test cases used for above plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/l2?h=rls1804>`_.
+    <center><b>
 
-NIC 40ge2p1xl710
-~~~~~~~~~~~~~~~~
+:index:`Speedup: l2sw-3n-hsw-x520-64b-base_and_scale-pdr`
 
 .. raw:: html
 
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/40ge2p1xl710-64B-l2-tsa-ndrdisc.html"></iframe>
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-base_and_scale-pdr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
 
 .. raw:: latex
 
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{40ge2p1xl710-64B-l2-tsa-ndrdisc}
-            \label{fig:40ge2p1xl710-64B-l2-tsa-ndrdisc}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x520-64b-base_and_scale-pdr-tsa}
+            \label{fig:l2sw-3n-hsw-x520-64b-base_and_scale-pdr-tsa}
     \end{figure}
 
-*Figure 2. Throughput Speedup Analysis - Multi-Core Speedup Ratio - Normalized
-NDR Throughput for Phy-to-Phy L2 Ethernet Switching.*
+64b-features
+------------
 
-CSIT source code for the test cases used for above plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/l2?h=rls1804>`_.
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: l2sw-3n-hsw-x520-64b-features-ndr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-features-ndr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x520-64b-features-ndr-tsa}
+            \label{fig:l2sw-3n-hsw-x520-64b-features-ndr-tsa}
+    \end{figure}
 
-PDR Throughput
---------------
+.. raw:: html
 
-VPP PDR 64B packet throughput speedup ratio is presented in the graphs
-below for 10ge2p1x520 and 40ge2p1xl710 network interface cards. PDR
-measured for 0.5% packet loss ratio.
+    <center><b>
 
-NIC 10ge2p1x520
-~~~~~~~~~~~~~~~
+:index:`Speedup: l2sw-3n-hsw-x520-64b-features-pdr`
 
 .. raw:: html
 
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/10ge2p1x520-64B-l2-tsa-pdrdisc.html"></iframe>
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-features-pdr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
 
 .. raw:: latex
 
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{10ge2p1x520-64B-l2-tsa-pdrdisc}
-            \label{fig:10ge2p1x520-64B-l2-tsa-pdrdisc}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x520-64b-features-pdr-tsa}
+            \label{fig:l2sw-3n-hsw-x520-64b-features-pdr-tsa}
     \end{figure}
 
-*Figure 3. Throughput Speedup Analysis - Multi-Core Speedup Ratio - Normalized
-PDR Throughput for Phy-to-Phy L2 Ethernet Switching.*
+3n-hsw-x710
+~~~~~~~~~~~
 
-CSIT source code for the test cases used for above plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/l2?h=rls1804>`_.
+64b-base_and_scale
+------------------
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: l2sw-3n-hsw-x710-64b-base_and_scale-ndr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x710-64b-base_and_scale-ndr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x710-64b-base_and_scale-ndr-tsa}
+            \label{fig:l2sw-3n-hsw-x710-64b-base_and_scale-ndr-tsa}
+    \end{figure}
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: l2sw-3n-hsw-x710-64b-base_and_scale-pdr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x710-64b-base_and_scale-pdr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x710-64b-base_and_scale-pdr-tsa}
+            \label{fig:l2sw-3n-hsw-x710-64b-base_and_scale-pdr-tsa}
+    \end{figure}
+
+64b-features
+------------
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: l2sw-3n-hsw-x710-64b-features-ndr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x710-64b-features-ndr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x710-64b-features-ndr-tsa}
+            \label{fig:l2sw-3n-hsw-x710-64b-features-ndr-tsa}
+    \end{figure}
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: l2sw-3n-hsw-x710-64b-features-pdr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x710-64b-features-pdr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x710-64b-features-pdr-tsa}
+            \label{fig:l2sw-3n-hsw-x710-64b-features-pdr-tsa}
+    \end{figure}
+
+3n-hsw-xl710
+~~~~~~~~~~~~
+
+64b-base_and_scale
+------------------
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: l2sw-3n-hsw-xl710-64b-base_and_scale-ndr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-xl710-64b-base_and_scale-ndr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 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}
+    \end{figure}
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: l2sw-3n-hsw-xl710-64b-base_and_scale-pdr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-xl710-64b-base_and_scale-pdr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 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}
+    \end{figure}
+
+64b-features
+------------
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: l2sw-3n-hsw-xl710-64b-features-ndr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-xl710-64b-features-ndr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-xl710-64b-features-ndr-tsa}
+            \label{fig:l2sw-3n-hsw-xl710-64b-features-ndr-tsa}
+    \end{figure}
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: l2sw-3n-hsw-xl710-64b-features-pdr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-xl710-64b-features-pdr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-xl710-64b-features-pdr-tsa}
+            \label{fig:l2sw-3n-hsw-xl710-64b-features-pdr-tsa}
+    \end{figure}
+
+3n-skx-x710
+~~~~~~~~~~~
+
+64b-base_and_scale
+------------------
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: l2sw-3n-skx-xl710-64b-base_and_scale-ndr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-skx-xl710-64b-base_and_scale-ndr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-skx-xl710-64b-base_and_scale-ndr-tsa}
+            \label{fig:l2sw-3n-skx-xl710-64b-base_and_scale-ndr-tsa}
+    \end{figure}
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: l2sw-3n-skx-xl710-64b-base_and_scale-pdr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-skx-xl710-64b-base_and_scale-pdr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-skx-xl710-64b-base_and_scale-pdr-tsa}
+            \label{fig:l2sw-3n-skx-xl710-64b-base_and_scale-pdr-tsa}
+    \end{figure}
+
+64b-features
+------------
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: l2sw-3n-skx-xl710-64b-features-ndr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-skx-xl710-64b-features-ndr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-skx-xl710-64b-features-ndr-tsa}
+            \label{fig:l2sw-3n-skx-xl710-64b-features-ndr-tsa}
+    \end{figure}
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: l2sw-3n-skx-xl710-64b-features-pdr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-skx-xl710-64b-features-pdr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-skx-xl710-64b-features-pdr-tsa}
+            \label{fig:l2sw-3n-skx-xl710-64b-features-pdr-tsa}
+    \end{figure}
+
+3n-skx-xxv710
+~~~~~~~~~~~~~
+
+64b-base_and_scale
+------------------
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: l2sw-3n-skx-xxv710-64b-base_and_scale-ndr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-skx-xxv710-64b-base_and_scale-ndr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 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}
+    \end{figure}
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: l2sw-3n-skx-xxv710-64b-base_and_scale-pdr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-skx-xxv710-64b-base_and_scale-pdr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 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}
+    \end{figure}
+
+64b-features
+------------
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: l2sw-3n-skx-xxv710-64b-features-ndr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-skx-xxv710-64b-features-ndr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-skx-xxv710-64b-features-ndr-tsa}
+            \label{fig:l2sw-3n-skx-xxv710-64b-features-ndr-tsa}
+    \end{figure}
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: l2sw-3n-skx-xxv710-64b-features-pdr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-skx-xxv710-64b-features-pdr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-skx-xxv710-64b-features-pdr-tsa}
+            \label{fig:l2sw-3n-skx-xxv710-64b-features-pdr-tsa}
+    \end{figure}
+
+2n-skx-x710
+~~~~~~~~~~~
+
+64b-base_and_scale
+------------------
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: l2sw-2n-skx-x710-64b-base_and_scale-ndr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-2n-skx-x710-64b-base_and_scale-ndr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-2n-skx-x710-64b-base_and_scale-ndr-tsa}
+            \label{fig:l2sw-2n-skx-x710-64b-base_and_scale-ndr-tsa}
+    \end{figure}
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: l2sw-2n-skx-x710-64b-base_and_scale-pdr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-2n-skx-x710-64b-base_and_scale-pdr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-2n-skx-x710-64b-base_and_scale-pdr-tsa}
+            \label{fig:l2sw-2n-skx-x710-64b-base_and_scale-pdr-tsa}
+    \end{figure}
+
+64b-features
+------------
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: l2sw-2n-skx-x710-64b-features-ndr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-2n-skx-x710-64b-features-ndr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-2n-skx-x710-64b-features-ndr-tsa}
+            \label{fig:l2sw-2n-skx-x710-64b-features-ndr-tsa}
+    \end{figure}
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: l2sw-2n-skx-x710-64b-features-pdr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-2n-skx-x710-64b-features-pdr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-2n-skx-x710-64b-features-pdr-tsa}
+            \label{fig:l2sw-2n-skx-x710-64b-features-pdr-tsa}
+    \end{figure}
+
+2n-skx-xxv710
+~~~~~~~~~~~~~
+
+64b-base_and_scale
+------------------
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: l2sw-2n-skx-xxv710-64b-base_and_scale-ndr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-2n-skx-xxv710-64b-base_and_scale-ndr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-2n-skx-xxv710-64b-base_and_scale-ndr-tsa}
+            \label{fig:l2sw-2n-skx-xxv710-64b-base_and_scale-ndr-tsa}
+    \end{figure}
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: l2sw-2n-skx-xxv710-64b-base_and_scale-pdr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-2n-skx-xxv710-64b-base_and_scale-pdr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-2n-skx-xxv710-64b-base_and_scale-pdr-tsa}
+            \label{fig:l2sw-2n-skx-xxv710-64b-base_and_scale-pdr-tsa}
+    \end{figure}
+
+64b-features
+------------
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: l2sw-2n-skx-xxv710-64b-features-ndr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-2n-skx-xxv710-64b-features-ndr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-2n-skx-xxv710-64b-features-ndr-tsa}
+            \label{fig:l2sw-2n-skx-xxv710-64b-features-ndr-tsa}
+    \end{figure}
+
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: l2sw-2n-skx-xxv710-64b-features-pdr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-2n-skx-xxv710-64b-features-pdr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-2n-skx-xxv710-64b-features-pdr-tsa}
+            \label{fig:l2sw-2n-skx-xxv710-64b-features-pdr-tsa}
+    \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/srv6.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/srv6.rst
index 4ece4d538e..eecaaeb1ee 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/srv6.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/srv6.rst
@@ -1,5 +1,5 @@
-SRv6
-====
+SRv6 Routing
+============
 
 Following sections include Throughput Speedup Analysis for VPP multi-
 core multi-thread configurations with no Hyper-Threading, specifically
@@ -9,60 +9,55 @@ used for the graphs comes from Phy-to-Phy 78B performance tests with VPP
 SRv6, including NDR throughput (zero packet loss) and
 PDR throughput (<0.5% packet loss).
 
-NDR Throughput
---------------
+CSIT source code for the test cases used for plots can be found in
+`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/srv6?h=rls1807>`_.
 
-VPP NDR 78B packet throughput speedup ratio is presented in the graphs
-below for 10ge2p1x520 network interface card.
+3n-hsw-x520
+~~~~~~~~~~~
 
+78b-features
+------------
 
-NIC 10ge2p1x520
-~~~~~~~~~~~~~~~
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: srv6-3n-hsw-x520-78b-1t1c-features-ndr`
 
 .. raw:: html
 
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/10ge2p1x520-78B-srv6-tsa-ndrdisc.html"></iframe>
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/srv6-3n-hsw-x520-78b-features-ndr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
 
 .. raw:: latex
 
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{10ge2p1x520-78B-srv6-tsa-ndrdisc}
-            \label{fig:10ge2p1x520-78B-srv6-tsa-ndrdisc}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{srv6-3n-hsw-x520-78b-features-ndr-tsa}
+            \label{fig:srv6-3n-hsw-x520-78b-features-ndr-tsa}
     \end{figure}
 
-*Figure 1. Throughput Speedup Analysis - Multi-Core Speedup Ratio - Normalized
-NDR Throughput for Phy-to-Phy SRv6.*
-
-CSIT source code for the test cases used for above plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/srv6?h=rls1804>`_.
-
-PDR Throughput
---------------
+.. raw:: html
 
-VPP PDR 78B packet throughput speedup ratio is presented in the graphs
-below for 10ge2p1x520 network interface card. PDR
-measured for 0.5% packet loss ratio.
+    <center><b>
 
-NIC 10ge2p1x520
-~~~~~~~~~~~~~~~
+:index:`Speedup: srv6-3n-hsw-x520-78b-1t1c-features-pdr`
 
 .. raw:: html
 
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/10ge2p1x520-78B-srv6-tsa-pdrdisc.html"></iframe>
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/srv6-3n-hsw-x520-78b-features-pdr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
 
 .. raw:: latex
 
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{10ge2p1x520-78B-srv6-tsa-pdrdisc}
-            \label{fig:10ge2p1x520-78B-srv6-tsa-pdrdisc}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{srv6-3n-hsw-x520-78b-features-pdr-tsa}
+            \label{fig:srv6-3n-hsw-x520-78b-features-pdr-tsa}
     \end{figure}
-
-*Figure 3. Throughput Speedup Analysis - Multi-Core Speedup Ratio - Normalized
-PDR Throughput for Phy-to-Phy SRv6.*
-
-CSIT source code for the test cases used for above plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/srv6?h=rls1804>`_.
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 9bd49b42ab..6d1880e799 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
@@ -1,5 +1,6 @@
-VM vhost Connections
-====================
+KVM VM vHost
+============
+
 Following sections include Throughput Speedup Analysis for VPP multi-
 core multi-thread configurations with no Hyper-Threading, specifically
 for tested 2t2c (2threads, 2cores) and 4t4c scenarios. 1t1c throughput
@@ -8,222 +9,296 @@ used for the graphs comes from Phy-to-Phy 64B performance tests with
 VM vhost-user, including NDR throughput (zero packet loss) and
 PDR throughput (<0.5% packet loss).
 
-NDR Throughput
---------------
+CSIT source code for the test cases used for plots can be found in
+`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/vm_vhost?h=rls1807>`_.
 
-VPP NDR 64B packet throughput speedup ratio is presented in the graphs
-below for 10ge2p1x520, 10ge2p1x710 and 40ge2p1xl710 network interface cards.
+3n-hsw-x520
+~~~~~~~~~~~
 
-NIC 10ge2p1x520
-~~~~~~~~~~~~~~~
+64b-base_and_scale-l2sw
+-----------------------
 
 .. raw:: html
 
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/10ge2p1x520-64B-vhost-sel1-tsa-ndrdisc.html"></iframe>
+    <center><b>
+
+:index:`Speedup: vhost-l2sw-3n-hsw-x520-64b-base_and_scale-ndr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-x520-64b-base_and_scale-ndr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
 
 .. raw:: latex
 
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{10ge2p1x520-64B-vhost-sel1-tsa-ndrdisc}
-            \label{fig:10ge2p1x520-64B-vhost-sel1-tsa-ndrdisc}
+            \includegraphics[clip, trim=0cm 8cm 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}
 
-*Figure 1a. Throughput Speedup Analysis - Multi-Core Speedup Ratio - Normalized
-NDR Throughput for Phy-to-Phy VM vhost-user selected TCs.*
+.. raw:: html
+
+    <center><b>
 
-CSIT source code for the test cases used for above plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/vm_vhost?h=rls1804>`_.
+:index:`Speedup: vhost-l2sw-3n-hsw-x520-64b-base_and_scale-pdr`
 
 .. raw:: html
 
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/10ge2p1x520-64B-vhost-sel2-tsa-ndrdisc.html"></iframe>
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-x520-64b-base_and_scale-pdr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
 
 .. raw:: latex
 
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{10ge2p1x520-64B-vhost-sel2-tsa-ndrdisc}
-            \label{fig:10ge2p1x520-64B-vhost-sel2-tsa-ndrdisc}
+            \includegraphics[clip, trim=0cm 8cm 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}
 
-*Figure 1b. Throughput Speedup Analysis - Multi-Core Speedup Ratio - Normalized
-NDR Throughput for Phy-to-Phy VM vhost-user selected TCs.*
+64b-base_and_scale-ip4
+----------------------
 
-CSIT source code for the test cases used for above plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/vm_vhost?h=rls1804>`_.
+.. raw:: html
+
+    <center><b>
 
-NIC 10ge2p1x710
-~~~~~~~~~~~~~~~
+:index:`Speedup: vhost-ip4-3n-hsw-x520-64b-base_and_scale-ndr`
 
 .. raw:: html
 
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/10ge2p1x710-64B-vhost-sel2-tsa-ndrdisc.html"></iframe>
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-ip4-3n-hsw-x520-64b-base_and_scale-ndr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
 
 .. raw:: latex
 
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{10ge2p1x710-64B-vhost-sel2-tsa-ndrdisc}
-            \label{fig:10ge2p1x710-64B-vhost-sel2-tsa-ndrdisc}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{vhost-ip4-3n-hsw-x520-64b-base_and_scale-ndr-tsa}
+            \label{fig:vhost-ip4-3n-hsw-x520-64b-base_and_scale-ndr-tsa}
     \end{figure}
 
-*Figure 2. Throughput Speedup Analysis - Multi-Core Speedup Ratio - Normalized
-NDR Throughput for Phy-to-Phy VM vhost-user selected TCs.*
+.. raw:: html
 
-CSIT source code for the test cases used for above plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/vm_vhost?h=rls1804>`_.
+    <center><b>
 
-NIC 40ge2p1xl710
-~~~~~~~~~~~~~~~~
+:index:`Speedup: vhost-ip4-3n-hsw-x520-64b-base_and_scale-pdr`
 
 .. raw:: html
 
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/40ge2p1xl710-64B-vhost-sel1-tsa-ndrdisc.html"></iframe>
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-ip4-3n-hsw-x520-64b-base_and_scale-pdr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
 
 .. raw:: latex
 
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{40ge2p1xl710-64B-vhost-sel1-tsa-ndrdisc}
-            \label{fig:40ge2p1xl710-64B-vhost-sel1-tsa-ndrdisc}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{vhost-ip4-3n-hsw-x520-64b-base_and_scale-pdr-tsa}
+            \label{fig:vhost-ip4-3n-hsw-x520-64b-base_and_scale-pdr-tsa}
     \end{figure}
 
-*Figure 3a. Throughput Speedup Analysis - Multi-Core Speedup Ratio - Normalized
-NDR Throughput for Phy-to-Phy VM vhost-user selected TCs.*
+3n-hsw-x710
+~~~~~~~~~~~
 
-CSIT source code for the test cases used for above plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/vm_vhost?h=rls1804>`_.
+64b-base_and_scale-l2sw
+-----------------------
 
 .. raw:: html
 
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/40ge2p1xl710-64B-vhost-sel2-tsa-ndrdisc.html"></iframe>
+    <center><b>
+
+:index:`Speedup: vhost-l2sw-3n-hsw-x710-64b-base_and_scale-ndr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-x710-64b-base_and_scale-ndr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
 
 .. raw:: latex
 
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{40ge2p1xl710-64B-vhost-sel2-tsa-ndrdisc}
-            \label{fig:40ge2p1xl710-64B-vhost-sel2-tsa-ndrdisc}
+            \includegraphics[clip, trim=0cm 8cm 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}
 
-*Figure 3b. Throughput Speedup Analysis - Multi-Core Speedup Ratio - Normalized
-NDR Throughput for Phy-to-Phy VM vhost-user selected TCs.*
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: vhost-l2sw-3n-hsw-x710-64b-base_and_scale-pdr`
+
+.. raw:: html
 
-CSIT source code for the test cases used for above plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/vm_vhost?h=rls1804>`_.
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-x710-64b-base_and_scale-pdr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
 
-PDR Throughput
---------------
+.. raw:: latex
 
-VPP PDR 64B packet throughput speedup ratio is presented in the graphs
-below for 10ge2p1x520, 10ge2p1x710 and 40ge2p1xl710 network interface cards.
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 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}
 
-NIC 10ge2p1x520
-~~~~~~~~~~~~~~~
+64b-base_and_scale-ip4
+----------------------
 
 .. raw:: html
 
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/10ge2p1x520-64B-vhost-sel1-tsa-pdrdisc.html"></iframe>
+    <center><b>
+
+:index:`Speedup: vhost-ip4-3n-hsw-x710-64b-base_and_scale-ndr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-ip4-3n-hsw-x710-64b-base_and_scale-ndr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
 
 .. raw:: latex
 
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{10ge2p1x520-64B-vhost-sel1-tsa-pdrdisc}
-            \label{fig:10ge2p1x520-64B-vhost-sel1-tsa-pdrdisc}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{vhost-ip4-3n-hsw-x710-64b-base_and_scale-ndr-tsa}
+            \label{fig:vhost-ip4-3n-hsw-x710-64b-base_and_scale-ndr-tsa}
     \end{figure}
 
-*Figure 4a. Throughput Speedup Analysis - Multi-Core Speedup Ratio - Normalized
-PDR Throughput for Phy-to-Phy VM vhost-user selected TCs.*
+.. raw:: html
+
+    <center><b>
 
-CSIT source code for the test cases used for above plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/vm_vhost?h=rls1804>`_.
+:index:`Speedup: vhost-ip4-3n-hsw-x710-64b-base_and_scale-pdr`
 
 .. raw:: html
 
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/10ge2p1x520-64B-vhost-sel2-tsa-pdrdisc.html"></iframe>
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-ip4-3n-hsw-x710-64b-base_and_scale-pdr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
 
 .. raw:: latex
 
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{10ge2p1x520-64B-vhost-sel2-tsa-pdrdisc}
-            \label{fig:10ge2p1x520-64B-vhost-sel2-tsa-pdrdisc}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{vhost-ip4-3n-hsw-x710-64b-base_and_scale-pdr-tsa}
+            \label{fig:vhost-ip4-3n-hsw-x710-64b-base_and_scale-pdr-tsa}
     \end{figure}
 
-*Figure 4b. Throughput Speedup Analysis - Multi-Core Speedup Ratio - Normalized
-PDR Throughput for Phy-to-Phy VM vhost-user selected TCs.*
+3n-hsw-xl710
+~~~~~~~~~~~~
+
+64b-base_and_scale-l2sw
+-----------------------
 
-CSIT source code for the test cases used for above plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/vm_vhost?h=rls1804>`_.
+.. raw:: html
+
+    <center><b>
 
-NIC 10ge2p1x710
-~~~~~~~~~~~~~~~
+:index:`Speedup: vhost-l2sw-3n-hsw-xl710-64b-base_and_scale-ndr`
 
 .. raw:: html
 
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/10ge2p1x710-64B-vhost-sel2-tsa-pdrdisc.html"></iframe>
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-xl710-64b-base_and_scale-ndr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
 
 .. raw:: latex
 
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{10ge2p1x710-64B-vhost-sel2-tsa-pdrdisc}
-            \label{fig:10ge2p1x710-64B-vhost-sel2-tsa-pdrdisc}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-hsw-xl710-64b-base_and_scale-ndr-tsa}
+            \label{fig:vhost-l2sw-3n-hsw-xl710-64b-base_and_scale-ndr-tsa}
     \end{figure}
 
-*Figure 5. Throughput Speedup Analysis - Multi-Core Speedup Ratio - Normalized
-PDR Throughput for Phy-to-Phy VM vhost-user selected TCs.*
+.. raw:: html
 
-CSIT source code for the test cases used for above plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/vm_vhost?h=rls1804>`_.
+    <center><b>
 
-NIC 40ge2p1xl710
-~~~~~~~~~~~~~~~~
+:index:`Speedup: vhost-l2sw-3n-hsw-xl710-64b-base_and_scale-pdr`
 
 .. raw:: html
 
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/40ge2p1xl710-64B-vhost-sel1-tsa-pdrdisc.html"></iframe>
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-xl710-64b-base_and_scale-pdr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
 
 .. raw:: latex
 
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{40ge2p1xl710-64B-vhost-sel1-tsa-pdrdisc}
-            \label{fig:40ge2p1xl710-64B-vhost-sel1-tsa-pdrdisc}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-hsw-xl710-64b-base_and_scale-pdr-tsa}
+            \label{fig:vhost-l2sw-3n-hsw-xl710-64b-base_and_scale-pdr-tsa}
     \end{figure}
 
-*Figure 6a. Throughput Speedup Analysis - Multi-Core Speedup Ratio - Normalized
-PDR Throughput for Phy-to-Phy VM vhost-user selected TCs.*
+64b-base_and_scale-ip4
+---------------------------
+
+.. raw:: html
+
+    <center><b>
 
-CSIT source code for the test cases used for above plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/vm_vhost?h=rls1804>`_.
+:index:`Speedup: vhost-ip4-3n-hsw-xl710-64b-base_and_scale-ndr`
 
 .. raw:: html
 
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/40ge2p1xl710-64B-vhost-sel2-tsa-pdrdisc.html"></iframe>
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-ip4-3n-hsw-xl710-64b-base_and_scale-ndr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
 
 .. raw:: latex
 
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{40ge2p1xl710-64B-vhost-sel2-tsa-pdrdisc}
-            \label{fig:40ge2p1xl710-64B-vhost-sel2-tsa-pdrdisc}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{vhost-ip4-3n-hsw-xl710-64b-base_and_scale-ndr-tsa}
+            \label{fig:vhost-ip4-3n-hsw-xl710-64b-base_and_scale-ndr-tsa}
     \end{figure}
 
-*Figure 6b. Throughput Speedup Analysis - Multi-Core Speedup Ratio - Normalized
-PDR Throughput for Phy-to-Phy VM vhost-user selected TCs.*
+.. raw:: html
+
+    <center><b>
+
+:index:`Speedup: vhost-ip4-3n-hsw-xl710-64b-base_and_scale-pdr`
+
+.. raw:: html
+
+    </b>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-ip4-3n-hsw-xl710-64b-base_and_scale-pdr-tsa.html"></iframe>
+    <p><br><br></p>
+    </center>
 
-CSIT source code for the test cases used for above plots can be found in
-`CSIT git repository <https://git.fd.io/csit/tree/tests/vpp/perf/vm_vhost?h=rls1804>`_.
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{vhost-ip4-3n-hsw-xl710-64b-base_and_scale-pdr-tsa}
+            \label{fig:vhost-ip4-3n-hsw-xl710-64b-base_and_scale-pdr-tsa}
+    \end{figure}