Report: Comparisons

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

12 files changed, 101 insertions, 31 deletions

diff --git a/docs/report/dpdk_performance_tests/comparisons/2n-clx_vs_2n-icx_testbeds.rst b/docs/report/dpdk_performance_tests/comparisons/2n-clx_vs_2n-icx_testbeds.rst
index 84deaa2787..87f916440b 100644
--- a/docs/report/dpdk_performance_tests/comparisons/2n-clx_vs_2n-icx_testbeds.rst
+++ b/docs/report/dpdk_performance_tests/comparisons/2n-clx_vs_2n-icx_testbeds.rst
@@ -1,8 +1,8 @@
-2n-Clx vs 2n-Icx Testbeds
+2n-Icx vs 2n-Clx Testbeds
 -------------------------
 
 Relative comparison of |dpdk-release| Testpmd and L3fwd packet
-throughput (NDR, PDR and MRR) is calculated for the same tests executed
+throughput (NDR, PDR) is calculated for the same tests executed
 on 2-Node Cascadelake (2n-clx) and 2-Node Ice Lake (2n-icx) physical testbed
 types, in 1-core, 2-core and 4-core configurations.
 
diff --git a/docs/report/dpdk_performance_tests/comparisons/2n-icx_vs_2n-skx_testbeds.rst b/docs/report/dpdk_performance_tests/comparisons/2n-icx_vs_2n-skx_testbeds.rst
new file mode 100644
index 0000000000..ec123450a4
--- /dev/null
+++ b/docs/report/dpdk_performance_tests/comparisons/2n-icx_vs_2n-skx_testbeds.rst
@@ -0,0 +1,31 @@
+2n-Icx vs 2n-Skx Testbeds
+-------------------------
+
+Relative comparison of |dpdk-release| Testpmd and L3fwd packet
+throughput (NDR, PDR) is calculated for the same tests executed
+on 2-Node Cascadelake (2n-skx) and 2-Node Ice Lake (2n-icx) physical testbed
+types, in 1-core, 2-core and 4-core configurations.
+
+.. note::
+
+    Test results are stored in
+    `build logs from FD.io dpdk performance job 2n-skx`_ and
+    `build logs from FD.io dpdk performance job 2n-icx`_
+    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-2n-skx-2n-icx-ndr.txt>`_
+  - `CSV NDR comparison <../../_static/dpdk/performance-compare-testbeds-2n-skx-2n-icx-ndr.csv>`_
+
+PDR Comparison
+~~~~~~~~~~~~~~
+
+Comparison tables in ASCII and CSV formats:
+
+  - `ASCII PDR comparison <../../_static/dpdk/performance-compare-testbeds-2n-skx-2n-icx-pdr.txt>`_
+  - `CSV PDR comparison <../../_static/dpdk/performance-compare-testbeds-2n-skx-2n-icx-pdr.csv>`_
diff --git a/docs/report/dpdk_performance_tests/comparisons/2n-skx_vs_2n-clx_testbeds.rst b/docs/report/dpdk_performance_tests/comparisons/2n-skx_vs_2n-clx_testbeds.rst
index 35bb5247e5..6a3d22b8a0 100644
--- a/docs/report/dpdk_performance_tests/comparisons/2n-skx_vs_2n-clx_testbeds.rst
+++ b/docs/report/dpdk_performance_tests/comparisons/2n-skx_vs_2n-clx_testbeds.rst
@@ -1,8 +1,8 @@
-2n-Skx vs 2n-Clx Testbeds
+2n-Clx vs 2n-Skx Testbeds
 -------------------------
 
 Relative comparison of |dpdk-release| Testpmd and L3fwd packet
-throughput (NDR, PDR and MRR) is calculated for the same tests executed
+throughput (NDR, PDR) is calculated for the same tests executed
 on 2-Node Skylake (2n-skx) and 2-Node Cascade Lake (2n-clx) physical testbed
 types, in 1-core, 2-core and 4-core configurations.
 
@@ -29,12 +29,3 @@ Comparison tables in ASCII and CSV formats:
 
   - `ASCII PDR comparison <../../_static/dpdk/performance-compare-testbeds-2n-skx-2n-clx-pdr.txt>`_
   - `CSV PDR comparison <../../_static/dpdk/performance-compare-testbeds-2n-skx-2n-clx-pdr.csv>`_
-
-..
-    MRR Comparison
-    ~~~~~~~~~~~~~~
-
-    Comparison tables in ASCII and CSV formats:
-
-      - `ASCII MRR comparison <../../_static/dpdk/performance-compare-testbeds-2n-skx-2n-clx-mrr.txt>`_
-      - `CSV MRR comparison <../../_static/dpdk/performance-compare-testbeds-2n-skx-2n-clx-mrr.csv>`_
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 5b57ba7d42..19550be79f 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
@@ -5,7 +5,7 @@
 -------------------------
 
 Relative comparison of |dpdk-release| Testpmd and L3fwd packet
-throughput (NDR, PDR and MRR) is calculated for the same tests executed
+throughput (NDR, PDR) is calculated for the same tests executed
 on 3-Node Skylake (3n-skx) and 2-Node Skylake (2n-skx) physical testbed
 types, in 1-core, 2-core and 4-core configurations.
 
@@ -33,12 +33,3 @@ Comparison tables in ASCII and CSV formats:
 
   - `ASCII PDR comparison <../../_static/dpdk/performance-compare-topologies-3n-skx-2n-skx-pdr.txt>`_
   - `CSV PDR comparison <../../_static/dpdk/performance-compare-topologies-3n-skx-2n-skx-pdr.csv>`_
-
-..
-    MRR Comparison
-    ~~~~~~~~~~~~~~
-
-    Comparison tables in ASCII and CSV formats:
-
-      - `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-icx_testbeds.rst b/docs/report/dpdk_performance_tests/comparisons/3n-skx_vs_3n-icx_testbeds.rst
index bb01b2f3ff..6560afb860 100644
--- a/docs/report/dpdk_performance_tests/comparisons/3n-skx_vs_3n-icx_testbeds.rst
+++ b/docs/report/dpdk_performance_tests/comparisons/3n-skx_vs_3n-icx_testbeds.rst
@@ -1,8 +1,8 @@
-3n-Skx vs 3n-Icx Testbeds
+3n-Icx vs 3n-Skx Testbeds
 -------------------------
 
 Relative comparison of |dpdk-release| Testpmd and L3fwd packet
-throughput (NDR, PDR and MRR) is calculated for the same tests executed
+throughput (NDR, PDR) is calculated for the same tests executed
 on 3-Node Skylake (3n-skx) and 3-Node Ice Lake (3n-icx) physical testbed
 types, in 1-core, 2-core and 4-core configurations.
 
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 ed488da1e7..42bb2351d3 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
@@ -53,7 +53,7 @@ Comparison tables in ASCII and CSV formats:
   - `CSV 2t1c PDR comparison <../../_static/dpdk/performance-changes-3n-icx-2t1c-pdr.csv>`_
   - `CSV 4t2c PDR comparison <../../_static/dpdk/performance-changes-3n-icx-4t2c-pdr.csv>`_
 
-2n-skx-xxv710
+2n-icx-xxv710
 ~~~~~~~~~~~~~
 
 NDR Comparison
diff --git a/docs/report/dpdk_performance_tests/comparisons/index.rst b/docs/report/dpdk_performance_tests/comparisons/index.rst
index 5f19dcadbe..d80364c627 100644
--- a/docs/report/dpdk_performance_tests/comparisons/index.rst
+++ b/docs/report/dpdk_performance_tests/comparisons/index.rst
@@ -10,6 +10,7 @@ Comparisons
 
     current_vs_previous_release
     2n-clx_vs_2n-icx_testbeds
+    2n-icx_vs_2n-skx_testbeds
     3n-skx_vs_3n-icx_testbeds
     2n-skx_vs_2n-clx_testbeds
     3n-skx_vs_2n-skx_testbeds
diff --git a/docs/report/vpp_performance_tests/comparisons/2n-clx_vs_2n-icx_testbeds.rst b/docs/report/vpp_performance_tests/comparisons/2n-clx_vs_2n-icx_testbeds.rst
index 95a074da73..81f63e963c 100644
--- a/docs/report/vpp_performance_tests/comparisons/2n-clx_vs_2n-icx_testbeds.rst
+++ b/docs/report/vpp_performance_tests/comparisons/2n-clx_vs_2n-icx_testbeds.rst
@@ -1,4 +1,4 @@
-2n-Clx vs 2n-Icx Testbeds
+2n-Icx vs 2n-Clx Testbeds
 -------------------------
 
 Relative comparison of |vpp-release| packet throughput (NDR, PDR and
diff --git a/docs/report/vpp_performance_tests/comparisons/2n-icx_vs_2n-skx_testbeds.rst b/docs/report/vpp_performance_tests/comparisons/2n-icx_vs_2n-skx_testbeds.rst
new file mode 100644
index 0000000000..d1cc872954
--- /dev/null
+++ b/docs/report/vpp_performance_tests/comparisons/2n-icx_vs_2n-skx_testbeds.rst
@@ -0,0 +1,55 @@
+2n-Icx vs 2n-Skx Testbeds
+-------------------------
+
+Relative comparison of |vpp-release| packet throughput (NDR, PDR and
+MRR) is calculated for the same tests executed on 2-Node Cascadelake (2n-
+skx) and 2-Node Icelake (2n-icx) physical testbed types, in 1-core,
+2-core and 4-core configurations.
+
+.. note::
+
+    Test results are stored in
+    `build logs from FD.io vpp performance job 2n-icx`_ and
+    `build logs from FD.io vpp performance job 2n-skx`_
+    with RF result
+    files csit-vpp-perf-|srelease|-\*.zip
+    `archived here <../../_static/archive/>`_.
+
+NDR Comparison
+~~~~~~~~~~~~~~
+
+Comparison tables in HTML, ASCII and CSV formats:
+
+  - `HTML 1c NDR comparison <performance-compare-testbeds-2n-skx-2n-icx-1c-ndr.html>`_
+  - `HTML 2c NDR comparison <performance-compare-testbeds-2n-skx-2n-icx-2c-ndr.html>`_
+  - `ASCII 1c NDR comparison <../../_static/vpp/performance-compare-testbeds-2n-skx-2n-icx-1c-ndr.txt>`_
+  - `ASCII 2c NDR comparison <../../_static/vpp/performance-compare-testbeds-2n-skx-2n-icx-2c-ndr.txt>`_
+  - `CSV 1c NDR comparison <../../_static/vpp/performance-compare-testbeds-2n-skx-2n-icx-1c-ndr-csv.csv>`_
+  - `CSV 2c NDR comparison <../../_static/vpp/performance-compare-testbeds-2n-skx-2n-icx-2c-ndr-csv.csv>`_
+
+PDR Comparison
+~~~~~~~~~~~~~~
+
+Comparison tables in HTML, ASCII and CSV formats:
+
+  - `HTML 1c PDR comparison <performance-compare-testbeds-2n-skx-2n-icx-1c-pdr.html>`_
+  - `HTML 2c PDR comparison <performance-compare-testbeds-2n-skx-2n-icx-2c-pdr.html>`_
+  - `ASCII 1c PDR comparison <../../_static/vpp/performance-compare-testbeds-2n-skx-2n-icx-1c-pdr.txt>`_
+  - `ASCII 2c PDR comparison <../../_static/vpp/performance-compare-testbeds-2n-skx-2n-icx-2c-pdr.txt>`_
+  - `CSV 1c PDR comparison <../../_static/vpp/performance-compare-testbeds-2n-skx-2n-icx-1c-pdr-csv.csv>`_
+  - `CSV 2c PDR comparison <../../_static/vpp/performance-compare-testbeds-2n-skx-2n-icx-2c-pdr-csv.csv>`_
+
+MRR Comparison
+~~~~~~~~~~~~~~
+
+Comparison tables in HTML, ASCII and CSV formats:
+
+  - `HTML 1c MRR comparison <performance-compare-testbeds-2n-skx-2n-icx-1c-mrr.html>`_
+  - `HTML 2c MRR comparison <performance-compare-testbeds-2n-skx-2n-icx-2c-mrr.html>`_
+  - `HTML 4c MRR comparison <performance-compare-testbeds-2n-skx-2n-icx-4c-mrr.html>`_
+  - `ASCII 1c MRR comparison <../../_static/vpp/performance-compare-testbeds-2n-skx-2n-icx-1c-mrr.txt>`_
+  - `ASCII 2c MRR comparison <../../_static/vpp/performance-compare-testbeds-2n-skx-2n-icx-2c-mrr.txt>`_
+  - `ASCII 4c MRR comparison <../../_static/vpp/performance-compare-testbeds-2n-skx-2n-icx-4c-mrr.txt>`_
+  - `CSV 1c MRR comparison <../../_static/vpp/performance-compare-testbeds-2n-skx-2n-icx-1c-mrr-csv.csv>`_
+  - `CSV 2c MRR comparison <../../_static/vpp/performance-compare-testbeds-2n-skx-2n-icx-2c-mrr-csv.csv>`_
+  - `CSV 4c MRR comparison <../../_static/vpp/performance-compare-testbeds-2n-skx-2n-icx-4c-mrr-csv.csv>`_
diff --git a/docs/report/vpp_performance_tests/comparisons/2n-skx_vs_2n-clx_testbeds.rst b/docs/report/vpp_performance_tests/comparisons/2n-skx_vs_2n-clx_testbeds.rst
index 6809594096..89145ff823 100644
--- a/docs/report/vpp_performance_tests/comparisons/2n-skx_vs_2n-clx_testbeds.rst
+++ b/docs/report/vpp_performance_tests/comparisons/2n-skx_vs_2n-clx_testbeds.rst
@@ -1,4 +1,4 @@
-2n-Skx vs 2n-Clx Testbeds
+2n-Clx vs 2n-Skx Testbeds
 -------------------------
 
 Relative comparison of |vpp-release| packet throughput (NDR, PDR and
diff --git a/docs/report/vpp_performance_tests/comparisons/3n-skx_vs_3n-icx_testbeds.rst b/docs/report/vpp_performance_tests/comparisons/3n-skx_vs_3n-icx_testbeds.rst
index ec216ed6e6..593924ea19 100644
--- a/docs/report/vpp_performance_tests/comparisons/3n-skx_vs_3n-icx_testbeds.rst
+++ b/docs/report/vpp_performance_tests/comparisons/3n-skx_vs_3n-icx_testbeds.rst
@@ -1,7 +1,7 @@
 
 .. _vpp_compare_topologies_3n-skx_vs_3n-icx:
 
-3n-Skx vs 3n-Icx Testbeds
+3n-Icx vs 3n-Skx Testbeds
 -------------------------
 
 Relative comparison of |vpp-release| packet throughput (NDR, PDR and
diff --git a/docs/report/vpp_performance_tests/comparisons/index.rst b/docs/report/vpp_performance_tests/comparisons/index.rst
index 13e543a034..3b84884e40 100644
--- a/docs/report/vpp_performance_tests/comparisons/index.rst
+++ b/docs/report/vpp_performance_tests/comparisons/index.rst
@@ -11,9 +11,10 @@ Comparisons
 .. toctree::
 
     current_vs_previous_release
-    2n-skx_vs_2n-clx_testbeds
     2n-clx_vs_2n-icx_testbeds
-    3n-skx_vs_2n-skx_testbeds
+    2n-icx_vs_2n-skx_testbeds
+    2n-skx_vs_2n-clx_testbeds
     3n-skx_vs_3n-icx_testbeds
+    3n-skx_vs_2n-skx_testbeds
     nic_comparison
     soak_vs_ndr