Report: Add Data, Fix bugs in pdf version

Change-Id: Ie880ee58313603104b2de9681305fc460939e96a
Signed-off-by: Tibor Frank <tifrank@cisco.com>
(cherry picked from commit 04c1160d1d3dbc6d666db198ab92960f48a18b29)

10 files changed, 41 insertions, 137 deletions

diff --git a/docs/report/vpp_performance_tests/hoststack_testing/iperf3/index.rst b/docs/report/vpp_performance_tests/hoststack_testing/iperf3/index.rst
index f3ac7bb1fc..34a4962a60 100644
--- a/docs/report/vpp_performance_tests/hoststack_testing/iperf3/index.rst
+++ b/docs/report/vpp_performance_tests/hoststack_testing/iperf3/index.rst
@@ -49,7 +49,7 @@ TCP/IP with iperf3
 
     \begin{figure}[H]
         \centering
-            \graphicspath{{../../_build/_static/vpp/}}
+            \graphicspath{{../_build/_static/vpp/}}
             \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-1460b-1t1c-eth-ip4tcp-ldpreload-iperf3-bps}
             \label{fig:3n-hsw-xl710-1460b-1t1c-eth-ip4tcp-ldpreload-iperf3-bps}
     \end{figure}
@@ -69,7 +69,7 @@ TCP/IP with iperf3
 
     \begin{figure}[H]
         \centering
-            \graphicspath{{../../_build/_static/vpp/}}
+            \graphicspath{{../_build/_static/vpp/}}
             \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-1460b-1t1c-eth-ip4tcp-nsim-ldpreload-iperf3-bps}
             \label{fig:3n-hsw-xl710-1460b-1t1c-eth-ip4tcp-nsim-ldpreload-iperf3-bps}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/hoststack_testing/quic/index.rst b/docs/report/vpp_performance_tests/hoststack_testing/quic/index.rst
index 8f0103eef8..ba4c703d38 100644
--- a/docs/report/vpp_performance_tests/hoststack_testing/quic/index.rst
+++ b/docs/report/vpp_performance_tests/hoststack_testing/quic/index.rst
@@ -49,7 +49,7 @@ QUIC/UDP/IP with vpp_echo
 
     \begin{figure}[H]
         \centering
-            \graphicspath{{../../_build/_static/vpp/}}
+            \graphicspath{{../_build/_static/vpp/}}
             \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-1280b-1t1c-eth-ip4udpquic-vppecho-bps}
             \label{fig:3n-hsw-xl710-1280b-1t1c-eth-ip4udpquic-vppecho-bps}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency/ip4-2n-clx-xxv710.rst b/docs/report/vpp_performance_tests/packet_latency/ip4-2n-clx-xxv710.rst
index ac3e5a8efe..fcd99f7764 100644
--- a/docs/report/vpp_performance_tests/packet_latency/ip4-2n-clx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/packet_latency/ip4-2n-clx-xxv710.rst
@@ -280,7 +280,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-ip4base-nat44" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-ip4base-nat44.html"></iframe>
+    <iframe id="hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-ip4base-nat44" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44det-h1-p1-s1.html"></iframe>
     <p><br></p>
     </center>
 
@@ -289,8 +289,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-ip4base-nat44}
-            \label{fig:hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-ip4base-nat44}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44det-h1-p1-s1}
+            \label{fig:hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44det-h1-p1-s1}
     \end{figure}
 
 .. raw:: latex
@@ -300,7 +300,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-ip4scale1000-udpsrcscale15-nat44" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-ip4scale1000-udpsrcscale15-nat44.html"></iframe>
+    <iframe id="hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-ip4scale1000-udpsrcscale15-nat44" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44det-h1024-p63-s64512.html"></iframe>
     <p><br></p>
     </center>
 
@@ -309,8 +309,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-ip4scale1000-udpsrcscale15-nat44}
-            \label{fig:hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-ip4scale1000-udpsrcscale15-nat44}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44det-h1024-p63-s64512}
+            \label{fig:hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44det-h1024-p63-s64512}
     \end{figure}
 
 .. raw:: latex
@@ -487,7 +487,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-ethip4udp-ip4base-nat44" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-ethip4udp-ip4base-nat44.html"></iframe>
+    <iframe id="hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-ethip4udp-ip4base-nat44" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-ethip4udp-nat44det-h1-p1-s1.html"></iframe>
     <p><br></p>
     </center>
 
@@ -496,6 +496,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-ethip4udp-ip4base-nat44}
-            \label{fig:hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-ethip4udp-ip4base-nat44}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-ethip4udp-nat44det-h1-p1-s1}
+            \label{fig:hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-ethip4udp-nat44det-h1-p1-s1}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency/ip4-2n-skx-xxv710.rst b/docs/report/vpp_performance_tests/packet_latency/ip4-2n-skx-xxv710.rst
index e404c6d1b4..26843f407d 100644
--- a/docs/report/vpp_performance_tests/packet_latency/ip4-2n-skx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/packet_latency/ip4-2n-skx-xxv710.rst
@@ -240,7 +240,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-ip4base-nat44" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-ip4base-nat44.html"></iframe>
+    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-ip4base-nat44" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44det-h1-p1-s1.html"></iframe>
     <p><br></p>
     </center>
 
@@ -249,8 +249,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-ip4base-nat44}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-ip4base-nat44}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44det-h1-p1-s1}
+            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44det-h1-p1-s1}
     \end{figure}
 
 .. raw:: latex
@@ -300,7 +300,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-ip4scale1000-udpsrcscale15-nat44" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-ip4scale1000-udpsrcscale15-nat44.html"></iframe>
+    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-ip4scale1000-udpsrcscale15-nat44" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44det-h1024-p63-s64512.html"></iframe>
     <p><br></p>
     </center>
 
@@ -309,8 +309,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-ip4scale1000-udpsrcscale15-nat44}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-ip4scale1000-udpsrcscale15-nat44}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44det-h1024-p63-s64512}
+            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44det-h1024-p63-s64512}
     \end{figure}
 
 .. raw:: latex
@@ -487,7 +487,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-ethip4udp-ip4base-nat44" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-ethip4udp-ip4base-nat44.html"></iframe>
+    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-ethip4udp-ip4base-nat44" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-ethip4udp-nat44det-h1-p1-s1.html"></iframe>
     <p><br></p>
     </center>
 
@@ -496,6 +496,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-ethip4udp-ip4base-nat44}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-ethip4udp-ip4base-nat44}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-ethip4udp-nat44det-h1-p1-s1}
+            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-ethip4udp-nat44det-h1-p1-s1}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency/ip4-3n-tsh-x520.rst b/docs/report/vpp_performance_tests/packet_latency/ip4-3n-tsh-x520.rst
index aa0fdef530..a1987f3dc9 100644
--- a/docs/report/vpp_performance_tests/packet_latency/ip4-3n-tsh-x520.rst
+++ b/docs/report/vpp_performance_tests/packet_latency/ip4-3n-tsh-x520.rst
@@ -28,19 +28,6 @@
 
     </script>
 
-..
-    10ge2p1x520-64b-1t1c-dot1q-ip4base
-    10ge2p1x520-64b-1t1c-ethip4-ip4scale20k
-    10ge2p1x520-64b-1t1c-ethip4-ip4scale200k
-    10ge2p1x520-64b-1t1c-ethip4-ip4scale2m
-
-    10ge2p1x520-64b-1t1c-ethip4udp-ip4base-iacl50sf-10kflows
-    10ge2p1x520-64b-1t1c-ethip4udp-ip4base-iacl50sl-10kflows
-    10ge2p1x520-64b-1t1c-ethip4udp-ip4base-oacl50sf-10kflows
-    10ge2p1x520-64b-1t1c-ethip4udp-ip4base-oacl50sl-10kflows
-    10ge2p1x520-64b-1t1c-ethip4udp-ip4base-nat44
-    10ge2p1x520-64b-1t1c-ethip4udp-ip4scale1000-udpsrcscale15-nat44
-
 3n-tsh-x520
 ~~~~~~~~~~~
 
@@ -205,43 +192,3 @@
             \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-3n-tsh-10ge2p1x520-64b-1t1c-ethip4udp-ip4base-oacl50sl-10kflows}
             \label{fig:hdrh-lat-percentile-3n-tsh-10ge2p1x520-64b-1t1c-ethip4udp-ip4base-oacl50sl-10kflows}
     \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-3n-tsh-10ge2p1x520-64b-1t1c-ethip4udp-ip4base-nat44.html" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-3n-tsh-10ge2p1x520-64b-1t1c-ethip4udp-ip4base-nat44.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-3n-tsh-10ge2p1x520-64b-1t1c-ethip4udp-ip4base-nat44}
-            \label{fig:hdrh-lat-percentile-3n-tsh-10ge2p1x520-64b-1t1c-ethip4udp-ip4base-nat44}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-3n-tsh-10ge2p1x520-64b-1t1c-ethip4udp-ip4scale1000-udpsrcscale15-nat44.html" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-3n-tsh-10ge2p1x520-64b-1t1c-ethip4udp-ip4scale1000-udpsrcscale15-nat44.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-3n-tsh-10ge2p1x520-64b-1t1c-ethip4udp-ip4scale1000-udpsrcscale15-nat44}
-            \label{fig:hdrh-lat-percentile-3n-tsh-10ge2p1x520-64b-1t1c-ethip4udp-ip4scale1000-udpsrcscale15-nat44}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-3n-hsw-xl710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-3n-hsw-xl710.rst
index 0f62273540..64caed25fb 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-3n-hsw-xl710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-3n-hsw-xl710.rst
@@ -28,17 +28,6 @@
 
     </script>
 
-..
-    ## 3n-hsw-xl710
-    ### 78b-?t?c-ip6routing-base-scale-dpdk
-    10ge2p1xl710-dot1q-ip6base-ndrpdr
-    10ge2p1xl710-ethip6-ip6base-ndrpdr
-    10ge2p1xl710-ethip6-ip6scale2m-ndrpdr
-
-    Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Dot1Q-Ip6Base-Ndrpdr.78B-1t1c-dot1q-ip6base-ndrpdr
-    Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Ethip6-Ip6Base-Ndrpdr.78B-1t1c-ethip6-ip6base-ndrpdr
-    Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Ethip6-Ip6Scale2M-Ndrpdr.78B-1t1c-ethip6-ip6scale2m-ndrpdr
-
 3n-hsw-xl710
 ~~~~~~~~~~~~
 
@@ -57,8 +46,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-hsw-xl710-78b-1t1c-base-ndr}
-            \label{fig:ip6-3n-hsw-xl710-78b-1t1c-base-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-78b-1t1c-ip6routing-base-scale-dpdk-ndr}
+            \label{fig:3n-hsw-xl710-78b-1t1c-ip6routing-base-scale-dpdk-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -77,6 +66,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-hsw-xl710-78b-1t1c-base-pdr}
-            \label{fig:ip6-3n-hsw-xl710-78b-1t1c-base-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-78b-1t1c-ip6routing-base-scale-dpdk-pdr}
+            \label{fig:3n-hsw-xl710-78b-1t1c-ip6routing-base-scale-dpdk-pdr}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-3n-hsw-xl710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-3n-hsw-xl710.rst
index 3963b06c1a..c185cb116d 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-3n-hsw-xl710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-3n-hsw-xl710.rst
@@ -28,23 +28,6 @@
 
     </script>
 
-..
-    ## 3n-hsw-xl710
-    ### 64b-?t?c-l2switching-base-scale-dpdk
-    10ge2p1xl710-eth-l2patch-ndrpdr
-    10ge2p1xl710-dot1q-l2xcbase-ndrpdr
-    10ge2p1xl710-eth-l2xcbase-ndrpdr
-    10ge2p1xl710-dot1q-l2bdbasemaclrn-ndrpdr
-    10ge2p1xl710-eth-l2bdbasemaclrn-ndrpdr
-    10ge2p1xl710-eth-l2bdscale1mmaclrn-ndrpdr
-
-    Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Patch-Ndrpdr.64B-1t1c-eth-l2patch-ndrpdr
-    Tests.Vpp.Perf.L2.40Ge2P1Xl710-Dot1Q-L2Xcbase-Ndrpdr.64B-1t1c-dot1q-l2xcbase-ndrpdr
-    Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Xcbase-Ndrpdr.64B-1t1c-eth-l2xcbase-ndrpdr
-    Tests.Vpp.Perf.L2.40Ge2P1Xl710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-1t1c-dot1q-l2bdbasemaclrn-ndrpdr
-    Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-ndrpdr
-    Tests.Vpp.Perf.L2.40Ge2P1Xl710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-1t1c-eth-l2bdscale1mmaclrn-ndrpdr
-
 3n-hsw-xl710
 ~~~~~~~~~~~~
 
@@ -63,8 +46,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{/3n-hsw-xl710-64b-1t1c-l2switching-base-avf-ndr}
-            \label{fig:/3n-hsw-xl710-64b-1t1c-l2switching-base-avf-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-64b-1t1c-l2switching-base-avf-ndr}
+            \label{fig:3n-hsw-xl710-64b-1t1c-l2switching-base-avf-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -83,6 +66,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{/3n-hsw-xl710-64b-1t1c-l2switching-base-avf-pdr}
-            \label{fig:/3n-hsw-xl710-64b-1t1c-l2switching-base-avf-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-64b-1t1c-l2switching-base-avf-pdr}
+            \label{fig:3n-hsw-xl710-64b-1t1c-l2switching-base-avf-pdr}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-3n-hsw-xl710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-3n-hsw-xl710.rst
index b05a6ac0e6..15f1dea246 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-3n-hsw-xl710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-3n-hsw-xl710.rst
@@ -28,13 +28,6 @@
 
     </script>
 
-..
-    ## 3n-hsw-xl710
-    ### 78b-ip6routing-base-scale-dpdk
-    10ge2p1xl710-dot1q-ip6base-ndrpdr
-    10ge2p1xl710-ethip6-ip6base-ndrpdr
-    10ge2p1xl710-ethip6-ip6scale2m-ndrpdr
-
 3n-hsw-xl710
 ~~~~~~~~~~~~
 
@@ -53,8 +46,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-hsw-xl710-78b-base-ndr-tsa}
-            \label{fig:ip6-3n-hsw-xl710-78b-base-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-78b-ip6routing-base-scale-dpdk-ndr-tsa}
+            \label{fig:3n-hsw-xl710-78b-ip6routing-base-scale-dpdk-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -73,6 +66,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-hsw-xl710-78b-base-pdr-tsa}
-            \label{fig:ip6-3n-hsw-xl710-78b-base-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-78b-ip6routing-base-scale-dpdk-pdr-tsa}
+            \label{fig:3n-hsw-xl710-78b-ip6routing-base-scale-dpdk-pdr-tsa}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-3n-hsw-xl710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-3n-hsw-xl710.rst
index 5dc6a12cd0..1da9438c1d 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-3n-hsw-xl710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-3n-hsw-xl710.rst
@@ -28,16 +28,6 @@
 
     </script>
 
-..
-    ## 3n-hsw-xl710
-    ### 64b-l2switching-base-scale-dpdk
-    10ge2p1xl710-eth-l2patch-ndrpdr
-    10ge2p1xl710-dot1q-l2xcbase-ndrpdr
-    10ge2p1xl710-eth-l2xcbase-ndrpdr
-    10ge2p1xl710-dot1q-l2bdbasemaclrn-ndrpdr
-    10ge2p1xl710-eth-l2bdbasemaclrn-ndrpdr
-    10ge2p1xl710-eth-l2bdscale1mmaclrn-ndrpdr
-
 3n-hsw-xl710
 ~~~~~~~~~~~~
 
@@ -56,8 +46,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{/3n-hsw-xl710-64b-l2switching-base-avf-ndr-tsa}
-            \label{fig:/3n-hsw-xl710-64b-l2switching-base-avf-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-64b-l2switching-base-avf-ndr-tsa}
+            \label{fig:3n-hsw-xl710-64b-l2switching-base-avf-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -76,6 +66,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{/3n-hsw-xl710-64b-l2switching-base-avf-pdr-tsa}
-            \label{fig:/3n-hsw-xl710-64b-l2switching-base-avf-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-64b-l2switching-base-avf-pdr-tsa}
+            \label{fig:3n-hsw-xl710-64b-l2switching-base-avf-pdr-tsa}
     \end{figure}
diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml
index 5444f3ebad..c9cf4e06d3 100644
--- a/resources/tools/presentation/specification.yaml
+++ b/resources/tools/presentation/specification.yaml
@@ -558,6 +558,7 @@
       # TODO: Add:
       csit-vpp-perf-report-coverage-2009-3n-skx:
         - 9   # rls2009 NDRPDR cov 3n-skx-ip4-03
+        - 16  # rls2009 NDRPDR cov 3n-skx-ip4tun-02
 
     vpp-perf-results-2n-skx:
       csit-vpp-perf-report-coverage-2009-2n-skx:
@@ -590,7 +591,7 @@
         - 9   # rls2009 NDRPDR cov 2n-clx-ip6-01
         - 17  # rls2009 NDRPDR cov 2n-clx-l2-00
 #        - 18  # rls2009 NDRPDR cov 2n-clx-l2-01
-#        - 12  # rls2009 NDRPDR cov 2n-clx-lb-00
+        - 12  # rls2009 NDRPDR cov 2n-clx-lb-00
         - 13  # rls2009 NDRPDR cov 2n-clx-memif-00
         - 14  # rls2009 NDRPDR cov 2n-clx-vhost-00
         - 15  # rls2009 NDRPDR cov 2n-clx-vhost-01
@@ -2268,6 +2269,7 @@
     # TODO: Add:
     csit-vpp-perf-report-coverage-2009-3n-skx:
       - 9   # rls2009 NDRPDR cov 3n-skx-ip4-03
+      - 16  # rls2009 NDRPDR cov 3n-skx-ip4tun-02
 
     csit-vpp-perf-verify-2001-2n-skx:
       - 101  # MRR sel - old
@@ -2443,7 +2445,7 @@
       - 9   # rls2009 NDRPDR cov 2n-clx-ip6-01
       - 17  # rls2009 NDRPDR cov 2n-clx-l2-00
 #      - 18  # rls2009 NDRPDR cov 2n-clx-l2-01
-#      - 12  # rls2009 NDRPDR cov 2n-clx-lb-00
+      - 12  # rls2009 NDRPDR cov 2n-clx-lb-00
       - 13  # rls2009 NDRPDR cov 2n-clx-memif-00
       - 14  # rls2009 NDRPDR cov 2n-clx-vhost-00
       - 15  # rls2009 NDRPDR cov 2n-clx-vhost-01