Report: Configure report

+ 2101 --> 2106
+ remove 3n-hsw
+ unify data sets
+ configure data sets
- implement changes from job-specs

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

4 files changed, 31 insertions, 110 deletions

diff --git a/docs/report/dpdk_performance_tests/comparisons/3n-skx_vs_2n-skx_testbeds.rst b/docs/report/dpdk_performance_tests/comparisons/3n-skx_vs_2n-skx_testbeds.rst
index 2eb1e7b961..7625dc67f1 100644
--- a/docs/report/dpdk_performance_tests/comparisons/3n-skx_vs_2n-skx_testbeds.rst
+++ b/docs/report/dpdk_performance_tests/comparisons/3n-skx_vs_2n-skx_testbeds.rst
@@ -40,5 +40,5 @@ Comparison tables in ASCII and CSV formats:
 
     Comparison tables in ASCII and CSV formats:
 
-      - `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>`_
+      - `ASCII MRR comparison <../../_static/dpdk/performance-compare-testbeds-3n-skx-2n-skx-mrr.txt>`_
+      - `CSV MRR comparison <../../_static/dpdk/performance-compare-testbeds-3n-skx-2n-skx-mrr.csv>`_
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
deleted file mode 100644
index 8b581f91d2..0000000000
--- a/docs/report/dpdk_performance_tests/comparisons/3n-skx_vs_3n-hsw_testbeds.rst
+++ /dev/null
@@ -1,41 +0,0 @@
-3n-Skx vs 3n-Hsw Testbeds
--------------------------
-
-Relative comparison of |dpdk-release| Testpmd and L3fwd packet
-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.
-
-.. 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-dpdk-perf-|srelease|-\*.zip
-    `archived here <../../_static/archive/>`_.
-
-NDR Comparison
-~~~~~~~~~~~~~~
-
-Comparison tables in ASCII and CSV formats:
-
-  - `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>`_
-
-PDR Comparison
-~~~~~~~~~~~~~~
-
-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
-    ~~~~~~~~~~~~~~
-
-    Comparison tables in ASCII and CSV formats:
-
-      - `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 bf59bb2bea..5cc925afd8 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
@@ -7,7 +7,7 @@ Current vs Previous Release
 Relative comparison of DPDK Testpmd and L3fwd packet throughput (NDR,
 PDR and MRR) between |dpdk-release| and |dpdk-release-1| (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)
+results of tests running on 3n-skx, 2n-skx, 2n-clx, 2n-zn2 testbeds
 in 1-core and 2-core configurations.
 
 Listed mean and standard deviation values are computed based on a series
@@ -18,7 +18,6 @@ values.
 .. note::
 
     Test results have been generated by
-    `FD.io test executor dpdk performance job 3n-hsw`_,
     `FD.io test executor dpdk performance job 3n-skx`_,
     `FD.io test executor dpdk performance job 2n-skx`_,
     `FD.io test executor dpdk performance job 2n-clx`_,
@@ -28,29 +27,6 @@ values.
     files csit-dpdk-perf-|srelease|-\*.zip
     `archived here <../../_static/archive/>`_.
 
-3n-hsw
-~~~~~~
-
-NDR Comparison
-``````````````
-
-Comparison tables in ASCII and CSV formats:
-
-  - `ASCII 1t1c NDR comparison <../../_static/dpdk/performance-changes-3n-hsw-1t1c-ndr.txt>`_
-  - `ASCII 2t2c NDR comparison <../../_static/dpdk/performance-changes-3n-hsw-2t2c-ndr.txt>`_
-  - `CSV 1t1c NDR comparison <../../_static/dpdk/performance-changes-3n-hsw-1t1c-ndr.csv>`_
-  - `CSV 2t2c NDR comparison <../../_static/dpdk/performance-changes-3n-hsw-2t2c-ndr.csv>`_
-
-PDR Comparison
-``````````````
-
-Comparison tables in ASCII and CSV formats:
-
-  - `ASCII 1t1c PDR comparison <../../_static/dpdk/performance-changes-3n-hsw-1t1c-pdr.txt>`_
-  - `ASCII 2t2c PDR comparison <../../_static/dpdk/performance-changes-3n-hsw-2t2c-pdr.txt>`_
-  - `CSV 1t1c PDR comparison <../../_static/dpdk/performance-changes-3n-hsw-1t1c-pdr.csv>`_
-  - `CSV 2t2c PDR comparison <../../_static/dpdk/performance-changes-3n-hsw-2t2c-pdr.csv>`_
-
 3n-skx
 ~~~~~~
 
@@ -60,9 +36,9 @@ NDR Comparison
 Comparison tables in ASCII and CSV formats:
 
   - `ASCII 2t1c NDR comparison <../../_static/dpdk/performance-changes-3n-skx-2t1c-ndr.txt>`_
-  - `ASCII 4t1c NDR comparison <../../_static/dpdk/performance-changes-3n-skx-4t2c-ndr.txt>`_
+  - `ASCII 4t2c NDR comparison <../../_static/dpdk/performance-changes-3n-skx-4t2c-ndr.txt>`_
   - `CSV 2t1c NDR comparison <../../_static/dpdk/performance-changes-3n-skx-2t1c-ndr.csv>`_
-  - `CSV 4t1c NDR comparison <../../_static/dpdk/performance-changes-3n-skx-4t2c-ndr.csv>`_
+  - `CSV 4t2c NDR comparison <../../_static/dpdk/performance-changes-3n-skx-4t2c-ndr.csv>`_
 
 PDR Comparison
 ``````````````
@@ -70,9 +46,9 @@ PDR Comparison
 Comparison tables in ASCII and CSV formats:
 
   - `ASCII 2t1c PDR comparison <../../_static/dpdk/performance-changes-3n-skx-2t1c-pdr.txt>`_
-  - `ASCII 4t1c PDR comparison <../../_static/dpdk/performance-changes-3n-skx-4t2c-pdr.txt>`_
+  - `ASCII 4t2c PDR comparison <../../_static/dpdk/performance-changes-3n-skx-4t2c-pdr.txt>`_
   - `CSV 2t1c PDR comparison <../../_static/dpdk/performance-changes-3n-skx-2t1c-pdr.csv>`_
-  - `CSV 4t1c PDR comparison <../../_static/dpdk/performance-changes-3n-skx-4t2c-pdr.csv>`_
+  - `CSV 4t2c PDR comparison <../../_static/dpdk/performance-changes-3n-skx-4t2c-pdr.csv>`_
 
 2n-skx
 ~~~~~~
@@ -83,9 +59,9 @@ NDR Comparison
 Comparison tables in ASCII and CSV formats:
 
   - `ASCII 2t1c NDR comparison <../../_static/dpdk/performance-changes-2n-skx-2t1c-ndr.txt>`_
-  - `ASCII 4t1c NDR comparison <../../_static/dpdk/performance-changes-2n-skx-4t2c-ndr.txt>`_
+  - `ASCII 4t2c NDR comparison <../../_static/dpdk/performance-changes-2n-skx-4t2c-ndr.txt>`_
   - `CSV 2t1c NDR comparison <../../_static/dpdk/performance-changes-2n-skx-2t1c-ndr.csv>`_
-  - `CSV 4t1c NDR comparison <../../_static/dpdk/performance-changes-2n-skx-4t2c-ndr.csv>`_
+  - `CSV 4t2c NDR comparison <../../_static/dpdk/performance-changes-2n-skx-4t2c-ndr.csv>`_
 
 PDR Comparison
 ``````````````
@@ -93,9 +69,9 @@ PDR Comparison
 Comparison tables in ASCII and CSV formats:
 
   - `ASCII 2t1c PDR comparison <../../_static/dpdk/performance-changes-2n-skx-2t1c-pdr.txt>`_
-  - `ASCII 4t1c PDR comparison <../../_static/dpdk/performance-changes-2n-skx-4t2c-pdr.txt>`_
+  - `ASCII 4t2c PDR comparison <../../_static/dpdk/performance-changes-2n-skx-4t2c-pdr.txt>`_
   - `CSV 2t1c PDR comparison <../../_static/dpdk/performance-changes-2n-skx-2t1c-pdr.csv>`_
-  - `CSV 4t1c PDR comparison <../../_static/dpdk/performance-changes-2n-skx-4t2c-pdr.csv>`_
+  - `CSV 4t2c PDR comparison <../../_static/dpdk/performance-changes-2n-skx-4t2c-pdr.csv>`_
 
 2n-clx
 ~~~~~~
@@ -106,9 +82,9 @@ NDR Comparison
 Comparison tables in ASCII and CSV formats:
 
   - `ASCII 2t1c NDR comparison <../../_static/dpdk/performance-changes-2n-clx-2t1c-ndr.txt>`_
-  - `ASCII 4t1c NDR comparison <../../_static/dpdk/performance-changes-2n-clx-4t2c-ndr.txt>`_
+  - `ASCII 4t2c NDR comparison <../../_static/dpdk/performance-changes-2n-clx-4t2c-ndr.txt>`_
   - `CSV 2t1c NDR comparison <../../_static/dpdk/performance-changes-2n-clx-2t1c-ndr.csv>`_
-  - `CSV 4t1c NDR comparison <../../_static/dpdk/performance-changes-2n-clx-4t2c-ndr.csv>`_
+  - `CSV 4t2c NDR comparison <../../_static/dpdk/performance-changes-2n-clx-4t2c-ndr.csv>`_
 
 PDR Comparison
 ``````````````
@@ -116,9 +92,9 @@ PDR Comparison
 Comparison tables in ASCII and CSV formats:
 
   - `ASCII 2t1c PDR comparison <../../_static/dpdk/performance-changes-2n-clx-2t1c-pdr.txt>`_
-  - `ASCII 4t1c PDR comparison <../../_static/dpdk/performance-changes-2n-clx-4t2c-pdr.txt>`_
+  - `ASCII 4t2c PDR comparison <../../_static/dpdk/performance-changes-2n-clx-4t2c-pdr.txt>`_
   - `CSV 2t1c PDR comparison <../../_static/dpdk/performance-changes-2n-clx-2t1c-pdr.csv>`_
-  - `CSV 4t1c PDR comparison <../../_static/dpdk/performance-changes-2n-clx-4t2c-pdr.csv>`_
+  - `CSV 4t2c PDR comparison <../../_static/dpdk/performance-changes-2n-clx-4t2c-pdr.csv>`_
 
 2n-zn2
 ~~~~~~
@@ -129,9 +105,9 @@ NDR Comparison
 Comparison tables in ASCII and CSV formats:
 
   - `ASCII 2t1c NDR comparison <../../_static/dpdk/performance-changes-2n-zn2-2t1c-ndr.txt>`_
-  - `ASCII 4t1c NDR comparison <../../_static/dpdk/performance-changes-2n-zn2-4t2c-ndr.txt>`_
+  - `ASCII 4t2c NDR comparison <../../_static/dpdk/performance-changes-2n-zn2-4t2c-ndr.txt>`_
   - `CSV 2t1c NDR comparison <../../_static/dpdk/performance-changes-2n-zn2-2t1c-ndr.csv>`_
-  - `CSV 4t1c NDR comparison <../../_static/dpdk/performance-changes-2n-zn2-4t2c-ndr.csv>`_
+  - `CSV 4t2c NDR comparison <../../_static/dpdk/performance-changes-2n-zn2-4t2c-ndr.csv>`_
 
 PDR Comparison
 ``````````````
@@ -139,9 +115,9 @@ PDR Comparison
 Comparison tables in ASCII and CSV formats:
 
   - `ASCII 2t1c PDR comparison <../../_static/dpdk/performance-changes-2n-zn2-2t1c-pdr.txt>`_
-  - `ASCII 4t1c PDR comparison <../../_static/dpdk/performance-changes-2n-zn2-4t2c-pdr.txt>`_
+  - `ASCII 4t2c PDR comparison <../../_static/dpdk/performance-changes-2n-zn2-4t2c-pdr.txt>`_
   - `CSV 2t1c PDR comparison <../../_static/dpdk/performance-changes-2n-zn2-2t1c-pdr.csv>`_
-  - `CSV 4t1c PDR comparison <../../_static/dpdk/performance-changes-2n-zn2-4t2c-pdr.csv>`_
+  - `CSV 4t2c PDR comparison <../../_static/dpdk/performance-changes-2n-zn2-4t2c-pdr.csv>`_
 
 ..
     2n-dnv
@@ -153,9 +129,9 @@ Comparison tables in ASCII and CSV formats:
     Comparison tables in ASCII and CSV formats:
 
       - `ASCII 1t1c NDR comparison <../../_static/dpdk/performance-changes-2n-dnv-1t1c-ndr.txt>`_
-      - `ASCII 4t1c NDR comparison <../../_static/dpdk/performance-changes-2n-dnv-2t2c-ndr.txt>`_
+      - `ASCII 2t2c NDR comparison <../../_static/dpdk/performance-changes-2n-dnv-2t2c-ndr.txt>`_
       - `CSV 1t1c NDR comparison <../../_static/dpdk/performance-changes-2n-dnv-1t1c-ndr.csv>`_
-      - `CSV 4t1c NDR comparison <../../_static/dpdk/performance-changes-2n-dnv-2t2c-ndr.csv>`_
+      - `CSV 2t2c NDR comparison <../../_static/dpdk/performance-changes-2n-dnv-2t2c-ndr.csv>`_
 
     PDR Comparison
     ``````````````
@@ -163,9 +139,9 @@ Comparison tables in ASCII and CSV formats:
     Comparison tables in ASCII and CSV formats:
 
       - `ASCII 1t1c PDR comparison <../../_static/dpdk/performance-changes-2n-dnv-1t1c-pdr.txt>`_
-      - `ASCII 4t1c PDR comparison <../../_static/dpdk/performance-changes-2n-dnv-2t2c-pdr.txt>`_
+      - `ASCII 2t2c PDR comparison <../../_static/dpdk/performance-changes-2n-dnv-2t2c-pdr.txt>`_
       - `CSV 1t1c PDR comparison <../../_static/dpdk/performance-changes-2n-dnv-1t1c-pdr.csv>`_
-      - `CSV 4t1c PDR comparison <../../_static/dpdk/performance-changes-2n-dnv-2t2c-pdr.csv>`_
+      - `CSV 2t2c PDR comparison <../../_static/dpdk/performance-changes-2n-dnv-2t2c-pdr.csv>`_
 
     3n-dnv
     ~~~~~~
@@ -176,9 +152,9 @@ Comparison tables in ASCII and CSV formats:
     Comparison tables in ASCII and CSV formats:
 
       - `ASCII 1t1c NDR comparison <../../_static/dpdk/performance-changes-3n-dnv-1t1c-ndr.txt>`_
-      - `ASCII 4t1c NDR comparison <../../_static/dpdk/performance-changes-3n-dnv-2t2c-ndr.txt>`_
+      - `ASCII 2t2c NDR comparison <../../_static/dpdk/performance-changes-3n-dnv-2t2c-ndr.txt>`_
       - `CSV 1t1c NDR comparison <../../_static/dpdk/performance-changes-3n-dnv-1t1c-ndr.csv>`_
-      - `CSV 4t1c NDR comparison <../../_static/dpdk/performance-changes-3n-dnv-2t2c-ndr.csv>`_
+      - `CSV 2t2c NDR comparison <../../_static/dpdk/performance-changes-3n-dnv-2t2c-ndr.csv>`_
 
     PDR Comparison
     ``````````````
@@ -186,9 +162,9 @@ Comparison tables in ASCII and CSV formats:
     Comparison tables in ASCII and CSV formats:
 
       - `ASCII 1t1c PDR comparison <../../_static/dpdk/performance-changes-3n-dnv-1t1c-pdr.txt>`_
-      - `ASCII 4t1c PDR comparison <../../_static/dpdk/performance-changes-3n-dnv-2t2c-pdr.txt>`_
+      - `ASCII 2t2c PDR comparison <../../_static/dpdk/performance-changes-3n-dnv-2t2c-pdr.txt>`_
       - `CSV 1t1c PDR comparison <../../_static/dpdk/performance-changes-3n-dnv-1t1c-pdr.csv>`_
-      - `CSV 4t1c PDR comparison <../../_static/dpdk/performance-changes-3n-dnv-2t2c-pdr.csv>`_
+      - `CSV 2t2c PDR comparison <../../_static/dpdk/performance-changes-3n-dnv-2t2c-pdr.csv>`_
 
 ..
     3n-tsh
@@ -200,9 +176,9 @@ Comparison tables in ASCII and CSV formats:
     Comparison tables in ASCII and CSV formats:
 
       - `ASCII 1t1c NDR comparison <../../_static/dpdk/performance-changes-3n-tsh-1t1c-ndr.txt>`_
-      - `ASCII 4t1c NDR comparison <../../_static/dpdk/performance-changes-3n-tsh-2t2c-ndr.txt>`_
+      - `ASCII 2t2c NDR comparison <../../_static/dpdk/performance-changes-3n-tsh-2t2c-ndr.txt>`_
       - `CSV 1t1c NDR comparison <../../_static/dpdk/performance-changes-3n-tsh-1t1c-ndr.csv>`_
-      - `CSV 4t1c NDR comparison <../../_static/dpdk/performance-changes-3n-tsh-2t2c-ndr.csv>`_
+      - `CSV 2t2c NDR comparison <../../_static/dpdk/performance-changes-3n-tsh-2t2c-ndr.csv>`_
 
     PDR Comparison
     ``````````````
@@ -210,6 +186,6 @@ Comparison tables in ASCII and CSV formats:
     Comparison tables in ASCII and CSV formats:
 
       - `ASCII 1t1c PDR comparison <../../_static/dpdk/performance-changes-3n-tsh-1t1c-pdr.txt>`_
-      - `ASCII 4t1c PDR comparison <../../_static/dpdk/performance-changes-3n-tsh-2t2c-pdr.txt>`_
+      - `ASCII 2t2c PDR comparison <../../_static/dpdk/performance-changes-3n-tsh-2t2c-pdr.txt>`_
       - `CSV 1t1c PDR comparison <../../_static/dpdk/performance-changes-3n-tsh-1t1c-pdr.csv>`_
-      - `CSV 4t1c PDR comparison <../../_static/dpdk/performance-changes-3n-tsh-2t2c-pdr.csv>`_
+      - `CSV 2t2c PDR comparison <../../_static/dpdk/performance-changes-3n-tsh-2t2c-pdr.csv>`_
diff --git a/docs/report/dpdk_performance_tests/comparisons/index.rst b/docs/report/dpdk_performance_tests/comparisons/index.rst
index 3e0d3f932b..89a98e86b3 100644
--- a/docs/report/dpdk_performance_tests/comparisons/index.rst
+++ b/docs/report/dpdk_performance_tests/comparisons/index.rst
@@ -6,22 +6,8 @@
 Comparisons
 ===========
 
-..
-    // Alternative Note for 1st Bullet when bad microcode Skx, Clx results are published
-    note::
-    L3fwd throughput drop in the current release in comparison to previous
-    releases **on Intel Xeon 2n-skx, 3n-skx and 2n-clx testbeds**: L3fwd
-    performance test data shows lower performance and behaviour
-    inconsistency of these systems following the recent upgrade of
-    processor microcode packages (skx ucode 0x2000064, clx ucode
-    0x500002c) as part of updating Ubuntu 18.04 LTS kernel version.
-    Tested VPP and DPDK applications (L3fwd) are affected. Skx and Clx
-    test data will be corrected in subsequent maintenance report
-    version(s) once the issue is resolved. See :ref:`vpp_known_issues`.
-
 .. toctree::
 
     current_vs_previous_release
     2n-skx_vs_2n-clx_testbeds
-    3n-skx_vs_3n-hsw_testbeds
     3n-skx_vs_2n-skx_testbeds