Report: Add Trex comparisons

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

7 files changed, 169 insertions, 2 deletions

diff --git a/docs/report/index.html.template b/docs/report/index.html.template
index 4aeb9109f2..af803266d2 100644
--- a/docs/report/index.html.template
+++ b/docs/report/index.html.template
@@ -50,6 +50,7 @@ CSIT-2302
     trex_performance_tests/overview
     trex_performance_tests/csit_release_notes
     trex_performance_tests/packet_throughput_graphs/index
+    trex_performance_tests/comparisons/index
     trex_performance_tests/throughput_trending
     trex_performance_tests/test_environment
 
diff --git a/docs/report/trex_performance_tests/comparisons/current_vs_previous_release.rst b/docs/report/trex_performance_tests/comparisons/current_vs_previous_release.rst
new file mode 100644
index 0000000000..a55918ff94
--- /dev/null
+++ b/docs/report/trex_performance_tests/comparisons/current_vs_previous_release.rst
@@ -0,0 +1,53 @@
+Current vs Previous Release
+---------------------------
+
+Listed mean and standard deviation values are computed based on a series
+of the same tests executed against respective VPP releases to verify
+test results repeatability, with percentage change calculated for mean
+values. Note that the standard deviation is quite high for a small
+number of packet throughput tests, what indicates poor test results
+repeatability and makes the relative change of mean throughput value not
+fully representative for these tests. The root causes behind poor
+results repeatability vary between the test cases.
+
+1n-aws-nitro50g
+~~~~~~~~~~~~~~~
+
+NDR Comparison
+``````````````
+
+Comparison tables in HTML, ASCII and CSV formats:
+
+  - `HTML NDR comparison <performance-changes-1n-aws-ndr.html>`_
+  - `ASCII NDR comparison <../../_static/trex/performance-changes-1n-aws-ndr.txt>`_
+  - `CSV NDR comparison <../../_static/trex/performance-changes-1n-aws-ndr-csv.csv>`_
+
+PDR Comparison
+``````````````
+
+Comparison tables in HTML, ASCII and CSV formats:
+
+  - `HTML PDR comparison <performance-changes-1n-aws-pdr.html>`_
+  - `ASCII PDR comparison <../../_static/trex/performance-changes-1n-aws-pdr.txt>`_
+  - `CSV PDR comparison <../../_static/trex/performance-changes-1n-aws-pdr-csv.csv>`_
+
+2n-icx-e810cq
+~~~~~~~~~~~~~
+
+NDR Comparison
+``````````````
+
+Comparison tables in HTML, ASCII and CSV formats:
+
+  - `HTML NDR comparison <performance-changes-2n-icx-ndr.html>`_
+  - `ASCII NDR comparison <../../_static/trex/performance-changes-2n-icx-ndr.txt>`_
+  - `CSV NDR comparison <../../_static/trex/performance-changes-2n-icx-ndr-csv.csv>`_
+
+PDR Comparison
+``````````````
+
+Comparison tables in HTML, ASCII and CSV formats:
+
+  - `HTML PDR comparison <performance-changes-2n-icx-pdr.html>`_
+  - `ASCII PDR comparison <../../_static/trex/performance-changes-2n-icx-pdr.txt>`_
+  - `CSV PDR comparison <../../_static/trex/performance-changes-2n-icx-pdr-csv.csv>`_
diff --git a/docs/report/trex_performance_tests/comparisons/index.rst b/docs/report/trex_performance_tests/comparisons/index.rst
new file mode 100644
index 0000000000..28672f8fb1
--- /dev/null
+++ b/docs/report/trex_performance_tests/comparisons/index.rst
@@ -0,0 +1,11 @@
+
+.. raw:: latex
+
+    \clearpage
+
+Comparisons
+===========
+
+.. toctree::
+
+    current_vs_previous_release
diff --git a/docs/report/trex_performance_tests/index.rst b/docs/report/trex_performance_tests/index.rst
index 48e3aeada5..024d31c2a0 100644
--- a/docs/report/trex_performance_tests/index.rst
+++ b/docs/report/trex_performance_tests/index.rst
@@ -6,6 +6,7 @@ TRex Performance
     overview
     csit_release_notes
     packet_throughput_graphs/index
+    comparisons/index
     throughput_trending
     test_environment
 
diff --git a/resources/tools/presentation/input_data_parser.py b/resources/tools/presentation/input_data_parser.py
index 01dbfa7d56..11cbae7259 100644
--- a/resources/tools/presentation/input_data_parser.py
+++ b/resources/tools/presentation/input_data_parser.py
@@ -92,7 +92,7 @@ class ExecutionChecker(ResultVisitor):
         r'Connection [c|r]ps rate: (\d*).*\n'
         r'Total data transferred: (\d*).*\n'
         r'Completed requests: (\d*).*\n'
-        r'Failed requests:\s*(\d*.\d*)/gm'
+        r'Failed requests:\s*(\d*.\d*)'
     )
 
     # Needed for CPS and PPS tests
diff --git a/resources/tools/presentation/specifications/report/data_sets.yaml b/resources/tools/presentation/specifications/report/data_sets.yaml
index 8841908ad9..f9bf3e4582 100644
--- a/resources/tools/presentation/specifications/report/data_sets.yaml
+++ b/resources/tools/presentation/specifications/report/data_sets.yaml
@@ -563,7 +563,7 @@
       - 5   # 2302 NDRPDR iter env 11
       - 6   # 2302 NDRPDR iter env 11
       - 7   # 2302 NDRPDR iter env 11
-      # - 8   # 2302 NDRPDR iter env 11
+      - 8   # 2302 NDRPDR iter env 11
       - 9   # 2302 NDRPDR iter env 11
       - 10  # 2302 NDRPDR iter env 11
 
diff --git a/resources/tools/presentation/specifications/report/elements.yaml b/resources/tools/presentation/specifications/report/elements.yaml
index 9c0c09b64a..98be1695c0 100644
--- a/resources/tools/presentation/specifications/report/elements.yaml
+++ b/resources/tools/presentation/specifications/report/elements.yaml
@@ -1133,6 +1133,107 @@
     - "parent"
 
 ################################################################################
+# TRex
+
+# TRex Performance Changes 1n-aws pdr
+- type: "table"
+  title: "VPP Performance Changes 1n-aws pdr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,TREX]}/performance-changes-1n-aws-pdr"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'NDRPDR'"
+  columns:
+    # - title: "2206.0-10"
+    #   data-set: "vpp-1n-aws-hist-iter"
+    - title: "2210.0-11"
+      data-set: "vpp-1n-aws-prev-iter"
+    - title: "2302.0-11"
+      data-set: "vpp-1n-aws-curr-iter"
+  comparisons:
+    - title: "2302.0-11 vs 2210.0-11"
+      reference: 1
+      compare: 2
+  legend:
+    - ''
+    - 'Test Case:              Test cases executed for: PDR throughput on 1n-aws with nitro50g.'
+    - 'YYMM.V-E:               [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "10" for CSIT rls2206, "11" for CSIT rls2210 and rls2302).'
+    - 'YYMM.V-E vs YYMM.V-E:   [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - '2302.0-11 vs 2210.0-11: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
+
+# TRex Performance Changes 1n-aws ndr
+- type: "table"
+  title: "VPP Performance Changes 1n-aws ndr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,TREX]}/performance-changes-1n-aws-ndr"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'NDRPDR'"
+  columns:
+    # - title: "2206.0-10"
+    #   data-set: "vpp-1n-aws-hist-iter"
+    - title: "2210.0-11"
+      data-set: "vpp-1n-aws-prev-iter"
+    - title: "2302.0-11"
+      data-set: "vpp-1n-aws-curr-iter"
+  comparisons:
+    - title: "2302.0-11 vs 2210.0-11"
+      reference: 1
+      compare: 2
+  legend:
+    - ''
+    - 'Test Case:              Test cases executed for: NDR throughput on 1n-aws with nitro50g.'
+    - 'YYMM.V-E:               [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "10" for CSIT rls2206, "11" for CSIT rls2210 and rls2302).'
+    - 'YYMM.V-E vs YYMM.V-E:   [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - '2302.0-11 vs 2210.0-11: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
+
+# TRex Performance Changes 2n-icx pdr
+- type: "table"
+  title: "VPP Performance Changes 2n-icx pdr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,TREX]}/performance-changes-2n-icx-pdr"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'NDRPDR'"
+  columns:
+    # - title: "2206.0-10"
+    #   data-set: "vpp-2n-icx-hist-iter"
+    - title: "2210.0-11"
+      data-set: "vpp-2n-icx-prev-iter"
+    - title: "2302.0-11"
+      data-set: "vpp-2n-icx-curr-iter"
+  comparisons:
+    - title: "2302.0-11 vs 2210.0-11"
+      reference: 1
+      compare: 2
+  legend:
+    - ''
+    - 'Test Case:              Test cases executed for: PDR throughput on 2n-icx with e810cq.'
+    - 'YYMM.V-E:               [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "10" for CSIT rls2206, "11" for CSIT rls2210 and rls2302).'
+    - 'YYMM.V-E vs YYMM.V-E:   [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - '2302.0-11 vs 2210.0-11: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
+
+# TRex Performance Changes 2n-icx ndr
+- type: "table"
+  title: "VPP Performance Changes 2n-icx ndr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,TREX]}/performance-changes-2n-icx-ndr"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'NDRPDR'"
+  columns:
+    # - title: "2206.0-10"
+    #   data-set: "vpp-2n-icx-hist-iter"
+    - title: "2210.0-11"
+      data-set: "vpp-2n-icx-prev-iter"
+    - title: "2302.0-11"
+      data-set: "vpp-2n-icx-curr-iter"
+  comparisons:
+    - title: "2302.0-11 vs 2210.0-11"
+      reference: 1
+      compare: 2
+  legend:
+    - ''
+    - 'Test Case:              Test cases executed for: NDR throughput on 2n-icx with e810cq.'
+    - 'YYMM.V-E:               [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "10" for CSIT rls2206, "11" for CSIT rls2210 and rls2302).'
+    - 'YYMM.V-E vs YYMM.V-E:   [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - '2302.0-11 vs 2210.0-11: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
 ################################################################################
 # VPP