From 2fc7ba3b3b5dad5a211310d529c5a375dea8b946 Mon Sep 17 00:00:00 2001 From: Tibor Frank Date: Tue, 7 Aug 2018 17:38:53 +0200 Subject: CSIT-1226: Fix bugs in pdf version Change-Id: Ibdcc1d79db4079af49167c5696ba1c4edb3a40bb Signed-off-by: Tibor Frank --- .../vpp_performance_tests/documentation/index.rst | 5 ++ .../http_server_performance/index.rst | 13 ++++ .../packet_latency_graphs/index.rst | 5 ++ .../packet_throughput_graphs/index.rst | 5 ++ .../packet_throughput_graphs/ip4.rst | 2 + .../vpp_performance_tests/test_environment.rst | 5 ++ .../container_memif.rst | 16 ++-- .../throughput_speedup_multi_core/index.rst | 4 + .../throughput_speedup_multi_core/ip4.rst | 87 ++++----------------- .../throughput_speedup_multi_core/ip4_tunnels.rst | 58 -------------- .../throughput_speedup_multi_core/ip6.rst | 55 ------------- .../throughput_speedup_multi_core/l2.rst | 91 ++++------------------ 12 files changed, 79 insertions(+), 267 deletions(-) (limited to 'docs/report/vpp_performance_tests') diff --git a/docs/report/vpp_performance_tests/documentation/index.rst b/docs/report/vpp_performance_tests/documentation/index.rst index 200ac409f3..5975fb9300 100644 --- a/docs/report/vpp_performance_tests/documentation/index.rst +++ b/docs/report/vpp_performance_tests/documentation/index.rst @@ -1,3 +1,8 @@ + +.. raw:: latex + + \clearpage + Documentation ============= diff --git a/docs/report/vpp_performance_tests/http_server_performance/index.rst b/docs/report/vpp_performance_tests/http_server_performance/index.rst index 32f75949dd..6a268628e3 100644 --- a/docs/report/vpp_performance_tests/http_server_performance/index.rst +++ b/docs/report/vpp_performance_tests/http_server_performance/index.rst @@ -1,3 +1,8 @@ + +.. raw:: latex + + \clearpage + HTTP/TCP Performance ==================== @@ -26,6 +31,10 @@ have the same value, only a horizontal line is plotted. CSIT source code for the test cases used for plots can be found in `CSIT git repository `_. +.. raw:: latex + + \clearpage + Connections per second ---------------------- @@ -42,6 +51,10 @@ Connections per second \label{fig:http-server-performance-cps} \end{figure} +.. raw:: latex + + \clearpage + Requests per second ------------------- diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/index.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/index.rst index 878df78ea8..5825df326c 100644 --- a/docs/report/vpp_performance_tests/packet_latency_graphs/index.rst +++ b/docs/report/vpp_performance_tests/packet_latency_graphs/index.rst @@ -1,3 +1,8 @@ + +.. raw:: latex + + \clearpage + Packet Latency ============== diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/index.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/index.rst index 5c11206175..8d6ff86504 100644 --- a/docs/report/vpp_performance_tests/packet_throughput_graphs/index.rst +++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/index.rst @@ -1,3 +1,8 @@ + +.. raw:: latex + + \clearpage + Packet Throughput ================= diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4.rst index e3ca78b5d0..ac1ee5e128 100644 --- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4.rst +++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4.rst @@ -34,6 +34,8 @@ CSIT source code for the test cases used for plots can be found in



+.. raw:: latex + \begin{figure}[H] \centering \graphicspath{{../_build/_static/vpp/}} diff --git a/docs/report/vpp_performance_tests/test_environment.rst b/docs/report/vpp_performance_tests/test_environment.rst index 466b30d17e..11308e8706 100644 --- a/docs/report/vpp_performance_tests/test_environment.rst +++ b/docs/report/vpp_performance_tests/test_environment.rst @@ -1,3 +1,8 @@ + +.. raw:: latex + + \clearpage + .. include:: ../introduction/test_environment_intro.rst .. include:: ../introduction/test_environment_sut_conf_1.rst 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 5daf70092d..89dfd970bb 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 @@ -201,12 +201,12 @@ CSIT source code for the test cases used for plots can be found in
-:index:`Speedup: memif-3n-skx-xl710-64b-base_and_scale-ndr` +:index:`Speedup: memif-3n-skx-x710-64b-base_and_scale-ndr` .. raw:: html - +



@@ -215,8 +215,8 @@ CSIT source code for the test cases used for plots can be found in \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} + \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{memif-3n-skx-x710-64b-base_and_scale-ndr-tsa} + \label{fig:memif-3n-skx-x710-64b-base_and_scale-ndr-tsa} \end{figure} .. raw:: html @@ -227,12 +227,12 @@ CSIT source code for the test cases used for plots can be found in \clearpage -:index:`Speedup: memif-3n-skx-xl710-64b-base_and_scale-pdr` +:index:`Speedup: memif-3n-skx-x710-64b-base_and_scale-pdr` .. raw:: html - +



@@ -241,6 +241,6 @@ CSIT source code for the test cases used for plots can be found in \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} + \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{memif-3n-skx-x710-64b-base_and_scale-pdr-tsa} + \label{fig:memif-3n-skx-x710-64b-base_and_scale-pdr-tsa} \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 2042eb6c33..b3f95ec6c3 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,5 +1,9 @@ .. _throughput_speedup_multi_core: +.. raw:: latex + + \clearpage + Speedup Multi-Core ================== 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 7be9969592..45790459b4 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 @@ -301,61 +301,6 @@ CSIT source code for the test cases used for plots can be found in \clearpage -64b-features ------------- - -.. raw:: html - -
- -:index:`Speedup: ip4-3n-hsw-xl710-64b-features-ndr` - -.. raw:: html - - - -



-
- -.. 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-ndr-tsa} - \label{fig:ip4-3n-hsw-xl710-64b-features-ndr-tsa} - \end{figure} - -.. raw:: html - -
- -.. raw:: latex - - \clearpage - -:index:`Speedup: ip4-3n-hsw-xl710-64b-features-pdr` - -.. raw:: html - - - -



-
- -.. 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} - -.. raw:: latex - - \clearpage - 3n-skx-x710 ~~~~~~~~~~~ @@ -366,12 +311,12 @@ CSIT source code for the test cases used for plots can be found in
-:index:`Speedup: ip4-3n-skx-xl710-64b-base_and_scale-ndr` +:index:`Speedup: ip4-3n-skx-x710-64b-base_and_scale-ndr` .. raw:: html - +



@@ -380,8 +325,8 @@ CSIT source code for the test cases used for plots can be found in \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} + \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-skx-x710-64b-base_and_scale-ndr-tsa} + \label{fig:ip4-3n-skx-x710-64b-base_and_scale-ndr-tsa} \end{figure} .. raw:: html @@ -392,12 +337,12 @@ CSIT source code for the test cases used for plots can be found in \clearpage -:index:`Speedup: ip4-3n-skx-xl710-64b-base_and_scale-pdr` +:index:`Speedup: ip4-3n-skx-x710-64b-base_and_scale-pdr` .. raw:: html - +



@@ -406,8 +351,8 @@ CSIT source code for the test cases used for plots can be found in \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} + \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-skx-x710-64b-base_and_scale-pdr-tsa} + \label{fig:ip4-3n-skx-x710-64b-base_and_scale-pdr-tsa} \end{figure} .. raw:: latex @@ -421,12 +366,12 @@ CSIT source code for the test cases used for plots can be found in
-:index:`Speedup: ip4-3n-skx-xl710-64b-features-ndr` +:index:`Speedup: ip4-3n-skx-x710-64b-features-ndr` .. raw:: html - +



@@ -435,8 +380,8 @@ CSIT source code for the test cases used for plots can be found in \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} + \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-skx-x710-64b-features-ndr-tsa} + \label{fig:ip4-3n-skx-x710-64b-features-ndr-tsa} \end{figure} .. raw:: html @@ -447,12 +392,12 @@ CSIT source code for the test cases used for plots can be found in \clearpage -:index:`Speedup: ip4-3n-skx-xl710-64b-features-pdr` +:index:`Speedup: ip4-3n-skx-x710-64b-features-pdr` .. raw:: html - +



@@ -461,8 +406,8 @@ CSIT source code for the test cases used for plots can be found in \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} + \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-skx-x710-64b-features-pdr-tsa} + \label{fig:ip4-3n-skx-x710-64b-features-pdr-tsa} \end{figure} .. raw:: latex 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 588697d889..fd8dd93a5c 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 @@ -133,64 +133,6 @@ CSIT source code for the test cases used for plots can be found in \clearpage -3n-hsw-xl710 -~~~~~~~~~~~~ - -64b-base_and_scale ------------------- - -.. raw:: html - -
- -:index:`Speedup: ip4tun-3n-hsw-xl710-64b-base_and_scale-ndr` - -.. raw:: html - - - -



-
- -.. 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 - -
- -.. raw:: latex - - \clearpage - -:index:`Speedup: ip4tun-3n-hsw-xl710-64b-base_and_scale-pdr` - -.. raw:: html - - - -



-
- -.. 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} - -.. raw:: latex - - \clearpage - 3n-skx-x710 ~~~~~~~~~~~ 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 991e7ab798..e25b098b8c 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 @@ -191,61 +191,6 @@ CSIT source code for the test cases used for plots can be found in \clearpage -78b-features ------------- - -.. raw:: html - -
- -:index:`Speedup: ip6-3n-hsw-xl710-78b-1t1c-features-ndr` - -.. raw:: html - - - -



-
- -.. 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 - -
- -.. raw:: latex - - \clearpage - -:index:`Speedup: ip6-3n-hsw-xl710-78b-1t1c-features-pdr` - -.. raw:: html - - - -



-
- -.. 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} - -.. raw:: latex - - \clearpage - 3n-skx-x710 ~~~~~~~~~~~ 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 2367db5ff4..0d630c3e76 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 @@ -301,61 +301,6 @@ CSIT source code for the test cases used for above plots can be found in \clearpage -64b-features ------------- - -.. raw:: html - -
- -:index:`Speedup: l2sw-3n-hsw-xl710-64b-features-ndr` - -.. raw:: html - - - -



-
- -.. 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 - -
- -.. raw:: latex - - \clearpage - -:index:`Speedup: l2sw-3n-hsw-xl710-64b-features-pdr` - -.. raw:: html - - - -



-
- -.. 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} - -.. raw:: latex - - \clearpage - 3n-skx-x710 ~~~~~~~~~~~ @@ -366,12 +311,12 @@ CSIT source code for the test cases used for above plots can be found in
-:index:`Speedup: l2sw-3n-skx-xl710-64b-base_and_scale-ndr` +:index:`Speedup: l2sw-3n-skx-x710-64b-base_and_scale-ndr` .. raw:: html - +



@@ -380,8 +325,8 @@ CSIT source code for the test cases used for above plots can be found in \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} + \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-skx-x710-64b-base_and_scale-ndr-tsa} + \label{fig:l2sw-3n-skx-x710-64b-base_and_scale-ndr-tsa} \end{figure} .. raw:: html @@ -392,12 +337,12 @@ CSIT source code for the test cases used for above plots can be found in \clearpage -:index:`Speedup: l2sw-3n-skx-xl710-64b-base_and_scale-pdr` +:index:`Speedup: l2sw-3n-skx-x710-64b-base_and_scale-pdr` .. raw:: html - +



@@ -406,8 +351,8 @@ CSIT source code for the test cases used for above plots can be found in \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} + \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-skx-x710-64b-base_and_scale-pdr-tsa} + \label{fig:l2sw-3n-skx-x710-64b-base_and_scale-pdr-tsa} \end{figure} .. raw:: latex @@ -421,12 +366,12 @@ CSIT source code for the test cases used for above plots can be found in
-:index:`Speedup: l2sw-3n-skx-xl710-64b-features-ndr` +:index:`Speedup: l2sw-3n-skx-x710-64b-features-ndr` .. raw:: html - +



@@ -435,8 +380,8 @@ CSIT source code for the test cases used for above plots can be found in \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} + \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-skx-x710-64b-features-ndr-tsa} + \label{fig:l2sw-3n-skx-x710-64b-features-ndr-tsa} \end{figure} .. raw:: html @@ -447,12 +392,12 @@ CSIT source code for the test cases used for above plots can be found in \clearpage -:index:`Speedup: l2sw-3n-skx-xl710-64b-features-pdr` +:index:`Speedup: l2sw-3n-skx-x710-64b-features-pdr` .. raw:: html - +



@@ -461,8 +406,8 @@ CSIT source code for the test cases used for above plots can be found in \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} + \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-skx-x710-64b-features-pdr-tsa} + \label{fig:l2sw-3n-skx-x710-64b-features-pdr-tsa} \end{figure} .. raw:: latex @@ -595,10 +540,6 @@ CSIT source code for the test cases used for above plots can be found in
-.. raw:: latex - - \clearpage - :index:`Speedup: l2sw-2n-skx-xxv710-64b-base_and_scale-ndr` .. raw:: html -- cgit 1.2.3-korg