report 18.07: draft v0.9 editorial nit-picking.

Change-Id: I7fb9dff8f5ebce0ac03ef99c74b14b02638042ac
Signed-off-by: Maciek Konstantynowicz <mkonstan@cisco.com>

2 files changed, 31 insertions, 62 deletions

diff --git a/docs/report/dpdk_performance_tests/comparisons/3n-skx_vs_3n-hsw_testbeds.rst b/docs/report/dpdk_performance_tests/comparisons/3n-skx_vs_3n-hsw_testbeds.rst
index c148b0619c..cbaa749e0e 100644
--- a/docs/report/dpdk_performance_tests/comparisons/3n-skx_vs_3n-hsw_testbeds.rst
+++ b/docs/report/dpdk_performance_tests/comparisons/3n-skx_vs_3n-hsw_testbeds.rst
@@ -6,15 +6,6 @@ throughput (NDR, PDR and MRR) is calculated for the same tests executed
 on 3-Node Skylake (3n-skx) and 3-Node Haswell (3n-hsw) physical testbed
 types, in 1-core, 2-core and 4-core configurations.
 
-NDR Comparison
-~~~~~~~~~~~~~~
-
-NDR throughput comparison between testbeds is available in CSV and
-pretty ASCII formats:
-
-  - `CSV NDR comparison <../_static/dpdk/performance-compare-testbeds-3n-hsw-3n-skx-ndr.csv>`_,
-  - `ASCII NDR comparison <../_static/dpdk/performance-compare-testbeds-3n-hsw-3n-skx-ndr.txt>`_.
-
 .. note::
 
     Test results have been generated by
@@ -24,38 +15,26 @@ pretty ASCII formats:
     files csit-dpdk-perf-|srelease|-\*.zip
     `archived here <../_static/archive/>`_.
 
-PDR Comparison
+NDR Comparison
 ~~~~~~~~~~~~~~
 
-PDR throughput comparison between testbeds is available in CSV and
-pretty ASCII formats:
+Comparison tables in ASCII and CSV formats:
 
-  - `CSV PDR comparison <../_static/dpdk/performance-compare-testbeds-3n-hsw-3n-skx-pdr.csv>`_,
-  - `ASCII PDR comparison <../_static/dpdk/performance-compare-testbeds-3n-hsw-3n-skx-pdr.txt>`_.
+  - `ASCII NDR comparison <../_static/dpdk/performance-compare-testbeds-3n-hsw-3n-skx-ndr.txt>`_
+  - `CSV NDR comparison <../_static/dpdk/performance-compare-testbeds-3n-hsw-3n-skx-ndr.csv>`_
 
-.. note::
+PDR Comparison
+~~~~~~~~~~~~~~
 
-    Test results have been generated by
-    `FD.io test executor dpdk performance job 3n-hsw`_ and
-    `FD.io test executor dpdk performance job 3n-skx`_
-    with RF result
-    files csit-dpdk-perf-|srelease|-\*.zip
-    `archived here <../_static/archive/>`_.
+Comparison tables in ASCII and CSV formats:
+
+  - `ASCII PDR comparison <../_static/dpdk/performance-compare-testbeds-3n-hsw-3n-skx-pdr.txt>`_
+  - `CSV PDR comparison <../_static/dpdk/performance-compare-testbeds-3n-hsw-3n-skx-pdr.csv>`_
 
 MRR Comparison
 ~~~~~~~~~~~~~~
 
-MRR throughput comparison between testbeds is available in CSV and
-pretty ASCII formats:
-
-  - `CSV MRR comparison <../_static/dpdk/performance-compare-testbeds-3n-hsw-3n-skx-mrr.csv>`_,
-  - `ASCII MRR comparison <../_static/dpdk/performance-compare-testbeds-3n-hsw-3n-skx-mrr.txt>`_.
+Comparison tables in ASCII and CSV formats:
 
-.. note::
-
-    Test results have been generated by
-    `FD.io test executor dpdk performance job 3n-hsw`_ and
-    `FD.io test executor dpdk performance job 3n-skx`_
-    with RF result
-    files csit-vpp-perf-|srelease|-\*.zip
-    `archived here <../_static/archive/>`_.
\ No newline at end of file
+  - `ASCII MRR comparison <../_static/dpdk/performance-compare-testbeds-3n-hsw-3n-skx-mrr.txt>`_
+  - `CSV MRR comparison <../_static/dpdk/performance-compare-testbeds-3n-hsw-3n-skx-mrr.csv>`_
diff --git a/docs/report/dpdk_performance_tests/comparisons/current_vs_previous_release.rst b/docs/report/dpdk_performance_tests/comparisons/current_vs_previous_release.rst
index 6a7829ac8a..6ca7ede318 100644
--- a/docs/report/dpdk_performance_tests/comparisons/current_vs_previous_release.rst
+++ b/docs/report/dpdk_performance_tests/comparisons/current_vs_previous_release.rst
@@ -2,27 +2,16 @@ Current vs. Previous Release
 ----------------------------
 
 Relative comparison of DPDK Testpmd and L3fwd packet throughput (NDR,
-PDR and MRR) between |dpdk-release| and DPDK-18.02 (measured for |csit-
-release| and |csit-release-1| respectively) is calculated from results
-of tests running on 3-Node Intel Xeon Haswell testbeds (3n-hsw) in
-1-core, 2-core and 4-core (MRR only) configurations.
+PDR and MRR) between |dpdk-release| and DPDK-18.02 (measured for
+|csit-release| and |csit-release-1| respectively) is calculated from
+results of tests running on 3-Node Intel Xeon Haswell testbeds (3n-hsw)
+in 1-core and 2-core configurations.
 
 Listed mean and standard deviation values are computed based on a series
 of the same tests executed against respective DPDK releases to verify
 test results repeatability, with percentage change calculated for mean
 values.
 
-NDR Comparison
-~~~~~~~~~~~~~~
-
-NDR throughput comparison between releases is available in CSV and pretty
-ASCII formats:
-
-  - `CSV 1t1c NDR changes <../_static/dpdk/performance-changes-1t1c-ndr.csv>`_,
-  - `CSV 2t2c NDR changes <../_static/dpdk/performance-changes-2t2c-ndr.csv>`_,
-  - `ASCII 1t1c NDR changes <../_static/dpdk/performance-changes-1t1c-ndr.txt>`_,
-  - `ASCII 2t2c NDR changes <../_static/dpdk/performance-changes-2t2c-ndr.txt>`_.
-
 .. note::
 
     Test results have been generated by
@@ -31,21 +20,22 @@ ASCII formats:
     files csit-dpdk-perf-|srelease|-\*.zip
     `archived here <../_static/archive/>`_.
 
-PDR Comparison
+NDR Comparison
 ~~~~~~~~~~~~~~
 
-PDR throughput comparison between releases is available in CSV and pretty
-ASCII formats:
+Comparison tables in ASCII and CSV formats:
 
-  - `CSV 1t1c PDR changes <../_static/dpdk/performance-changes-1t1c-pdr.csv>`_,
-  - `CSV 2t2c PDR changes <../_static/dpdk/performance-changes-2t2c-pdr.csv>`_,
-  - `ASCII 1t1c PDR changes <../_static/dpdk/performance-changes-1t1c-pdr.txt>`_,
-  - `ASCII 2t2c PDR changes <../_static/dpdk/performance-changes-2t2c-pdr.txt>`_.
+  - `ASCII 1t1c NDR comparison <../_static/dpdk/performance-changes-1t1c-ndr.txt>`_
+  - `ASCII 2t2c NDR comparison <../_static/dpdk/performance-changes-2t2c-ndr.txt>`_
+  - `CSV 1t1c NDR comparison <../_static/dpdk/performance-changes-1t1c-ndr.csv>`_
+  - `CSV 2t2c NDR comparison <../_static/dpdk/performance-changes-2t2c-ndr.csv>`_
 
-.. note::
+PDR Comparison
+~~~~~~~~~~~~~~
 
-    Test results have been generated by
-    `FD.io test executor dpdk performance job 3n-hsw`_
-    with RF result
-    files csit-dpdk-perf-|srelease|-\*.zip
-    `archived here <../_static/archive/>`_.
+Comparison tables in ASCII and CSV formats:
+
+  - `ASCII 1t1c PDR comparison <../_static/dpdk/performance-changes-1t1c-pdr.txt>`_
+  - `ASCII 2t2c PDR comparison <../_static/dpdk/performance-changes-2t2c-pdr.txt>`_
+  - `CSV 1t1c PDR comparison <../_static/dpdk/performance-changes-1t1c-pdr.csv>`_
+  - `CSV 2t2c PDR comparison <../_static/dpdk/performance-changes-2t2c-pdr.csv>`_