Report: Add nics to titles for comparisons

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

2 files changed, 28 insertions, 75 deletions

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 08bc5b6e04..5209cce29a 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
@@ -28,8 +28,8 @@ values.
     files csit-dpdk-perf-|srelease|-\*.zip
     `archived here <../../_static/archive/>`_.
 
-3n-skx
-~~~~~~
+3n-skx-xxv710
+~~~~~~~~~~~~~
 
 NDR Comparison
 ``````````````
@@ -51,8 +51,8 @@ Comparison tables in ASCII and CSV formats:
   - `CSV 2t1c PDR comparison <../../_static/dpdk/performance-changes-3n-skx-2t1c-pdr.csv>`_
   - `CSV 4t2c PDR comparison <../../_static/dpdk/performance-changes-3n-skx-4t2c-pdr.csv>`_
 
-2n-skx
-~~~~~~
+2n-skx-xxv710
+~~~~~~~~~~~~~
 
 NDR Comparison
 ``````````````
@@ -74,8 +74,8 @@ Comparison tables in ASCII and CSV formats:
   - `CSV 2t1c PDR comparison <../../_static/dpdk/performance-changes-2n-skx-2t1c-pdr.csv>`_
   - `CSV 4t2c PDR comparison <../../_static/dpdk/performance-changes-2n-skx-4t2c-pdr.csv>`_
 
-2n-clx
-~~~~~~
+2n-clx-xxv710
+~~~~~~~~~~~~~
 
 NDR Comparison
 ``````````````
@@ -97,8 +97,8 @@ Comparison tables in ASCII and CSV formats:
   - `CSV 2t1c PDR comparison <../../_static/dpdk/performance-changes-2n-clx-2t1c-pdr.csv>`_
   - `CSV 4t2c PDR comparison <../../_static/dpdk/performance-changes-2n-clx-4t2c-pdr.csv>`_
 
-2n-zn2
-~~~~~~
+2n-zn2-xxv710
+~~~~~~~~~~~~~
 
 NDR Comparison
 ``````````````
@@ -120,8 +120,8 @@ Comparison tables in ASCII and CSV formats:
   - `CSV 2t1c PDR comparison <../../_static/dpdk/performance-changes-2n-zn2-2t1c-pdr.csv>`_
   - `CSV 4t2c PDR comparison <../../_static/dpdk/performance-changes-2n-zn2-4t2c-pdr.csv>`_
 
-3n-tsh
-~~~~~~
+3n-tsh-x520
+~~~~~~~~~~~
 
 NDR Comparison
 ``````````````
@@ -143,8 +143,8 @@ Comparison tables in ASCII and CSV formats:
   - `CSV 1t1c PDR comparison <../../_static/dpdk/performance-changes-3n-tsh-1t1c-pdr.csv>`_
   - `CSV 2t2c PDR comparison <../../_static/dpdk/performance-changes-3n-tsh-2t2c-pdr.csv>`_
 
-2n-tx2
-~~~~~~
+2n-tx2-xl710
+~~~~~~~~~~~~
 
 NDR Comparison
 ``````````````
@@ -165,50 +165,3 @@ Comparison tables in ASCII and CSV formats:
   - `ASCII 2t2c PDR comparison <../../_static/dpdk/performance-changes-2n-tx2-2t2c-pdr.txt>`_
   - `CSV 1t1c PDR comparison <../../_static/dpdk/performance-changes-2n-tx2-1t1c-pdr.csv>`_
   - `CSV 2t2c PDR comparison <../../_static/dpdk/performance-changes-2n-tx2-2t2c-pdr.csv>`_
-
-..
-    2n-dnv
-    ~~~~~~
-
-    NDR Comparison
-    ``````````````
-
-    Comparison tables in ASCII and CSV formats:
-
-      - `ASCII 1t1c NDR comparison <../../_static/dpdk/performance-changes-2n-dnv-1t1c-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 2t2c NDR comparison <../../_static/dpdk/performance-changes-2n-dnv-2t2c-ndr.csv>`_
-
-    PDR Comparison
-    ``````````````
-
-    Comparison tables in ASCII and CSV formats:
-
-      - `ASCII 1t1c PDR comparison <../../_static/dpdk/performance-changes-2n-dnv-1t1c-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 2t2c PDR comparison <../../_static/dpdk/performance-changes-2n-dnv-2t2c-pdr.csv>`_
-
-    3n-dnv
-    ~~~~~~
-
-    NDR Comparison
-    ``````````````
-
-    Comparison tables in ASCII and CSV formats:
-
-      - `ASCII 1t1c NDR comparison <../../_static/dpdk/performance-changes-3n-dnv-1t1c-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 2t2c NDR comparison <../../_static/dpdk/performance-changes-3n-dnv-2t2c-ndr.csv>`_
-
-    PDR Comparison
-    ``````````````
-
-    Comparison tables in ASCII and CSV formats:
-
-      - `ASCII 1t1c PDR comparison <../../_static/dpdk/performance-changes-3n-dnv-1t1c-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 2t2c PDR comparison <../../_static/dpdk/performance-changes-3n-dnv-2t2c-pdr.csv>`_
diff --git a/docs/report/vpp_performance_tests/comparisons/current_vs_previous_release.rst b/docs/report/vpp_performance_tests/comparisons/current_vs_previous_release.rst
index 63a342e046..8c2b91963a 100644
--- a/docs/report/vpp_performance_tests/comparisons/current_vs_previous_release.rst
+++ b/docs/report/vpp_performance_tests/comparisons/current_vs_previous_release.rst
@@ -39,8 +39,8 @@ results repeatability vary between the test cases.
     with RF result files csit-vpp-perf-|srelease|-\*.zip
     `archived here <../../_static/archive/>`_.
 
-2n-skx
-~~~~~~
+2n-skx-xxv710
+~~~~~~~~~~~~~
 
 NDR Comparison
 ``````````````
@@ -96,8 +96,8 @@ Comparison tables in HTML, ASCII and CSV formats:
   - `CSV 2t1c PDR90, direction1, average value comparison <../../_static/vpp/latency-changes-2n-skx-xxv710-2t1c-pdr90-d1-avg-csv.csv>`_
   - `CSV 2t1c PDR90, direction1, max value comparison <../../_static/vpp/latency-changes-2n-skx-xxv710-2t1c-pdr90-d1-max-csv.csv>`_
 
-3n-skx
-~~~~~~
+3n-skx-xxv710
+~~~~~~~~~~~~~
 
 NDR Comparison
 ``````````````
@@ -324,8 +324,8 @@ Comparison tables in HTML, ASCII and CSV formats:
   - `CSV 2t1c PDR90, direction1, average value comparison <../../_static/vpp/latency-changes-2n-zn2-xxv710-2t1c-pdr90-d1-avg-csv.csv>`_
   - `CSV 2t1c PDR90, direction1, max value comparison <../../_static/vpp/latency-changes-2n-zn2-xxv710-2t1c-pdr90-d1-max-csv.csv>`_
 
-2n-dnv
-~~~~~~
+2n-dnv-x553
+~~~~~~~~~~~
 
 NDR Comparison
 ``````````````
@@ -366,8 +366,8 @@ Comparison tables in HTML, ASCII and CSV formats:
   - `CSV 2t2c MRR comparison <../../_static/vpp/performance-changes-2n-dnv-2t2c-mrr-csv.csv>`_
   - `CSV 4t4c MRR comparison <../../_static/vpp/performance-changes-2n-dnv-4t4c-mrr-csv.csv>`_
 
-3n-dnv
-~~~~~~
+3n-dnv-x553
+~~~~~~~~~~~
 
 NDR Comparison
 ``````````````
@@ -408,8 +408,8 @@ Comparison tables in HTML, ASCII and CSV formats:
   - `CSV 2t2c MRR comparison <../../_static/vpp/performance-changes-3n-dnv-2t2c-mrr-csv.csv>`_
   - `CSV 4t4c MRR comparison <../../_static/vpp/performance-changes-3n-dnv-4t4c-mrr-csv.csv>`_
 
-3n-tsh
-~~~~~~
+3n-tsh-x520
+~~~~~~~~~~~
 
 NDR Comparison
 ``````````````
@@ -465,8 +465,8 @@ Comparison tables in HTML, ASCII and CSV formats:
   - `CSV 1t1c PDR90, direction1, average value comparison <../../_static/vpp/latency-changes-3n-tsh-x520-1t1c-pdr90-d1-avg-csv.csv>`_
   - `CSV 1t1c PDR90, direction1, max value comparison <../../_static/vpp/latency-changes-3n-tsh-x520-1t1c-pdr90-d1-max-csv.csv>`_
 
-2n-tx2
-~~~~~~
+2n-tx2-xl710
+~~~~~~~~~~~~
 
 NDR Comparison
 ``````````````
@@ -522,8 +522,8 @@ Comparison tables in HTML, ASCII and CSV formats:
   - `CSV 1t1c PDR90, direction1, average value comparison <../../_static/vpp/latency-changes-2n-tx2-xl710-1t1c-pdr90-d1-avg-csv.csv>`_
   - `CSV 1t1c PDR90, direction1, max value comparison <../../_static/vpp/latency-changes-2n-tx2-xl710-1t1c-pdr90-d1-max-csv.csv>`_
 
-2n-aws
-~~~~~~
+2n-aws-nitro50g
+~~~~~~~~~~~~~~~
 
 NDR Comparison
 ``````````````
@@ -564,8 +564,8 @@ Comparison tables in HTML, ASCII and CSV formats:
   - `CSV 4t2c MRR comparison <../../_static/vpp/performance-changes-2n-aws-4t2c-mrr-csv.csv>`_
   - `CSV 8t4c MRR comparison <../../_static/vpp/performance-changes-2n-aws-8t4c-mrr-csv.csv>`_
 
-3n-aws
-~~~~~~
+3n-aws-nitro50g
+~~~~~~~~~~~~~~~
 
 NDR Comparison
 ``````````````