From 7902281ee08456a4d90bb5829ba42da2c71a6379 Mon Sep 17 00:00:00 2001 From: Tibor Frank Date: Tue, 3 Aug 2021 07:40:23 +0200 Subject: [PATCH] Report: Configure 2106.31, fix latency Change-Id: I6f9e3cc3b79be84acb6b5619016a9aa7d4296e02 Signed-off-by: Tibor Frank --- docs/report/introduction/report_history.rst | 12 +- .../comparisons/current_vs_previous_release.rst | 126 ++++++++++----------- resources/tools/presentation/generator_tables.py | 11 +- resources/tools/presentation/run_report.sh | 2 +- .../specifications/report/environment.yaml | 6 +- .../tools/presentation/sphinx_conf/report/conf.py | 2 +- 6 files changed, 88 insertions(+), 71 deletions(-) diff --git a/docs/report/introduction/report_history.rst b/docs/report/introduction/report_history.rst index a0a8f04a18..a8280e95d1 100644 --- a/docs/report/introduction/report_history.rst +++ b/docs/report/introduction/report_history.rst @@ -7,7 +7,7 @@ below. +----------------+------------------------------------------------------------+ | .[ww] Revision | Changes | +================+============================================================+ -| .30 | 1. Added data: | +| .31 | 1. Added data: | | | | | | - VPP coverage data: | | | | @@ -26,6 +26,16 @@ below. | | - 2n-clx | | | - 2n-zn2 | | | | +| | 3. Added iterative runs for Latency | +| | | +| | - 2n-skx | +| | - 2n-clx | +| | - 2n-zn2 | +| | - 2n-tsh | +| | - 2n-tx2 | +| | - 3n-skx | +| | | +| | 4. Added comparison tables for Latency | | | | +----------------+------------------------------------------------------------+ | .28 | Initial revision | 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 de81212246..dbfc391d2a 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 @@ -84,15 +84,15 @@ Latency Comparison Comparison tables in HTML, ASCII and CSV formats: - - `HTML 2t1c PDR50, direction1, average value comparison `_ - - `HTML 2t1c PDR90, direction1, average value comparison `_ - - `HTML 2t1c PDR90, direction1, max value comparison `_ - - `ASCII 2t1c PDR50, direction1, average value comparison <../../_static/vpp/performance-changes-2n-skx-xxv710-2t1c-pdr50-d1-avg.txt>`_ - - `ASCII 2t1c PDR90, direction1, average value comparison <../../_static/vpp/performance-changes-2n-skx-xxv710-2t1c-pdr90-d1-avg.txt>`_ - - `ASCII 2t1c PDR90, direction1, max value comparison <../../_static/vpp/performance-changes-2n-skx-xxv710-2t1c-pdr90-d1-max.txt>`_ - - `CSV 2t1c PDR50, direction1, average value comparison <../../_static/vpp/performance-changes-2n-skx-xxv710-2t1c-pdr50-d1-avg-csv.csv>`_ - - `CSV 2t1c PDR90, direction1, average value comparison <../../_static/vpp/performance-changes-2n-skx-xxv710-2t1c-pdr90-d1-avg-csv.csv>`_ - - `CSV 2t1c PDR90, direction1, max value comparison <../../_static/vpp/performance-changes-2n-skx-xxv710-2t1c-pdr90-d1-max-csv.csv>`_ + - `HTML 2t1c PDR50, direction1, average value comparison `_ + - `HTML 2t1c PDR90, direction1, average value comparison `_ + - `HTML 2t1c PDR90, direction1, max value comparison `_ + - `ASCII 2t1c PDR50, direction1, average value comparison <../../_static/vpp/latency-changes-2n-skx-xxv710-2t1c-pdr50-d1-avg.txt>`_ + - `ASCII 2t1c PDR90, direction1, average value comparison <../../_static/vpp/latency-changes-2n-skx-xxv710-2t1c-pdr90-d1-avg.txt>`_ + - `ASCII 2t1c PDR90, direction1, max value comparison <../../_static/vpp/latency-changes-2n-skx-xxv710-2t1c-pdr90-d1-max.txt>`_ + - `CSV 2t1c PDR50, direction1, average value comparison <../../_static/vpp/latency-changes-2n-skx-xxv710-2t1c-pdr50-d1-avg-csv.csv>`_ + - `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 ~~~~~~ @@ -141,15 +141,15 @@ Latency Comparison Comparison tables in HTML, ASCII and CSV formats: - - `HTML 2t1c PDR50, direction1, average value comparison `_ - - `HTML 2t1c PDR90, direction1, average value comparison `_ - - `HTML 2t1c PDR90, direction1, max value comparison `_ - - `ASCII 2t1c PDR50, direction1, average value comparison <../../_static/vpp/performance-changes-3n-skx-xxv710-2t1c-pdr50-d1-avg.txt>`_ - - `ASCII 2t1c PDR90, direction1, average value comparison <../../_static/vpp/performance-changes-3n-skx-xxv710-2t1c-pdr90-d1-avg.txt>`_ - - `ASCII 2t1c PDR90, direction1, max value comparison <../../_static/vpp/performance-changes-3n-skx-xxv710-2t1c-pdr90-d1-max.txt>`_ - - `CSV 2t1c PDR50, direction1, average value comparison <../../_static/vpp/performance-changes-3n-skx-xxv710-2t1c-pdr50-d1-avg-csv.csv>`_ - - `CSV 2t1c PDR90, direction1, average value comparison <../../_static/vpp/performance-changes-3n-skx-xxv710-2t1c-pdr90-d1-avg-csv.csv>`_ - - `CSV 2t1c PDR90, direction1, max value comparison <../../_static/vpp/performance-changes-3n-skx-xxv710-2t1c-pdr90-d1-max-csv.csv>`_ + - `HTML 2t1c PDR50, direction1, average value comparison `_ + - `HTML 2t1c PDR90, direction1, average value comparison `_ + - `HTML 2t1c PDR90, direction1, max value comparison `_ + - `ASCII 2t1c PDR50, direction1, average value comparison <../../_static/vpp/latency-changes-3n-skx-xxv710-2t1c-pdr50-d1-avg.txt>`_ + - `ASCII 2t1c PDR90, direction1, average value comparison <../../_static/vpp/latency-changes-3n-skx-xxv710-2t1c-pdr90-d1-avg.txt>`_ + - `ASCII 2t1c PDR90, direction1, max value comparison <../../_static/vpp/latency-changes-3n-skx-xxv710-2t1c-pdr90-d1-max.txt>`_ + - `CSV 2t1c PDR50, direction1, average value comparison <../../_static/vpp/latency-changes-3n-skx-xxv710-2t1c-pdr50-d1-avg-csv.csv>`_ + - `CSV 2t1c PDR90, direction1, average value comparison <../../_static/vpp/latency-changes-3n-skx-xxv710-2t1c-pdr90-d1-avg-csv.csv>`_ + - `CSV 2t1c PDR90, direction1, max value comparison <../../_static/vpp/latency-changes-3n-skx-xxv710-2t1c-pdr90-d1-max-csv.csv>`_ 2n-clx-xxv710 ~~~~~~~~~~~~~ @@ -198,15 +198,15 @@ Latency Comparison Comparison tables in HTML, ASCII and CSV formats: - - `HTML 2t1c PDR50, direction1, average value comparison `_ - - `HTML 2t1c PDR90, direction1, average value comparison `_ - - `HTML 2t1c PDR90, direction1, max value comparison `_ - - `ASCII 2t1c PDR50, direction1, average value comparison <../../_static/vpp/performance-changes-2n-clx-xxv710-2t1c-pdr50-d1-avg.txt>`_ - - `ASCII 2t1c PDR90, direction1, average value comparison <../../_static/vpp/performance-changes-2n-clx-xxv710-2t1c-pdr90-d1-avg.txt>`_ - - `ASCII 2t1c PDR90, direction1, max value comparison <../../_static/vpp/performance-changes-2n-clx-xxv710-2t1c-pdr90-d1-max.txt>`_ - - `CSV 2t1c PDR50, direction1, average value comparison <../../_static/vpp/performance-changes-2n-clx-xxv710-2t1c-pdr50-d1-avg-csv.csv>`_ - - `CSV 2t1c PDR90, direction1, average value comparison <../../_static/vpp/performance-changes-2n-clx-xxv710-2t1c-pdr90-d1-avg-csv.csv>`_ - - `CSV 2t1c PDR90, direction1, max value comparison <../../_static/vpp/performance-changes-2n-clx-xxv710-2t1c-pdr90-d1-max-csv.csv>`_ + - `HTML 2t1c PDR50, direction1, average value comparison `_ + - `HTML 2t1c PDR90, direction1, average value comparison `_ + - `HTML 2t1c PDR90, direction1, max value comparison `_ + - `ASCII 2t1c PDR50, direction1, average value comparison <../../_static/vpp/latency-changes-2n-clx-xxv710-2t1c-pdr50-d1-avg.txt>`_ + - `ASCII 2t1c PDR90, direction1, average value comparison <../../_static/vpp/latency-changes-2n-clx-xxv710-2t1c-pdr90-d1-avg.txt>`_ + - `ASCII 2t1c PDR90, direction1, max value comparison <../../_static/vpp/latency-changes-2n-clx-xxv710-2t1c-pdr90-d1-max.txt>`_ + - `CSV 2t1c PDR50, direction1, average value comparison <../../_static/vpp/latency-changes-2n-clx-xxv710-2t1c-pdr50-d1-avg-csv.csv>`_ + - `CSV 2t1c PDR90, direction1, average value comparison <../../_static/vpp/latency-changes-2n-clx-xxv710-2t1c-pdr90-d1-avg-csv.csv>`_ + - `CSV 2t1c PDR90, direction1, max value comparison <../../_static/vpp/latency-changes-2n-clx-xxv710-2t1c-pdr90-d1-max-csv.csv>`_ 2n-clx-cx556a ~~~~~~~~~~~~~ @@ -255,15 +255,15 @@ Latency Comparison Comparison tables in HTML, ASCII and CSV formats: - - `HTML 2t1c PDR50, direction1, average value comparison `_ - - `HTML 2t1c PDR90, direction1, average value comparison `_ - - `HTML 2t1c PDR90, direction1, max value comparison `_ - - `ASCII 2t1c PDR50, direction1, average value comparison <../../_static/vpp/performance-changes-2n-clx-cx556a-2t1c-pdr50-d1-avg.txt>`_ - - `ASCII 2t1c PDR90, direction1, average value comparison <../../_static/vpp/performance-changes-2n-clx-cx556a-2t1c-pdr90-d1-avg.txt>`_ - - `ASCII 2t1c PDR90, direction1, max value comparison <../../_static/vpp/performance-changes-2n-clx-cx556a-2t1c-pdr90-d1-max.txt>`_ - - `CSV 2t1c PDR50, direction1, average value comparison <../../_static/vpp/performance-changes-2n-clx-cx556a-2t1c-pdr50-d1-avg-csv.csv>`_ - - `CSV 2t1c PDR90, direction1, average value comparison <../../_static/vpp/performance-changes-2n-clx-cx556a-2t1c-pdr90-d1-avg-csv.csv>`_ - - `CSV 2t1c PDR90, direction1, max value comparison <../../_static/vpp/performance-changes-2n-clx-cx556a-2t1c-pdr90-d1-max-csv.csv>`_ + - `HTML 2t1c PDR50, direction1, average value comparison `_ + - `HTML 2t1c PDR90, direction1, average value comparison `_ + - `HTML 2t1c PDR90, direction1, max value comparison `_ + - `ASCII 2t1c PDR50, direction1, average value comparison <../../_static/vpp/latency-changes-2n-clx-cx556a-2t1c-pdr50-d1-avg.txt>`_ + - `ASCII 2t1c PDR90, direction1, average value comparison <../../_static/vpp/latency-changes-2n-clx-cx556a-2t1c-pdr90-d1-avg.txt>`_ + - `ASCII 2t1c PDR90, direction1, max value comparison <../../_static/vpp/latency-changes-2n-clx-cx556a-2t1c-pdr90-d1-max.txt>`_ + - `CSV 2t1c PDR50, direction1, average value comparison <../../_static/vpp/latency-changes-2n-clx-cx556a-2t1c-pdr50-d1-avg-csv.csv>`_ + - `CSV 2t1c PDR90, direction1, average value comparison <../../_static/vpp/latency-changes-2n-clx-cx556a-2t1c-pdr90-d1-avg-csv.csv>`_ + - `CSV 2t1c PDR90, direction1, max value comparison <../../_static/vpp/latency-changes-2n-clx-cx556a-2t1c-pdr90-d1-max-csv.csv>`_ 2n-zn2-xxv710 ~~~~~~~~~~~~~ @@ -312,15 +312,15 @@ Latency Comparison Comparison tables in HTML, ASCII and CSV formats: - - `HTML 2t1c PDR50, direction1, average value comparison `_ - - `HTML 2t1c PDR90, direction1, average value comparison `_ - - `HTML 2t1c PDR90, direction1, max value comparison `_ - - `ASCII 2t1c PDR50, direction1, average value comparison <../../_static/vpp/performance-changes-2n-zn2-xxv710-2t1c-pdr50-d1-avg.txt>`_ - - `ASCII 2t1c PDR90, direction1, average value comparison <../../_static/vpp/performance-changes-2n-zn2-xxv710-2t1c-pdr90-d1-avg.txt>`_ - - `ASCII 2t1c PDR90, direction1, max value comparison <../../_static/vpp/performance-changes-2n-zn2-xxv710-2t1c-pdr90-d1-max.txt>`_ - - `CSV 2t1c PDR50, direction1, average value comparison <../../_static/vpp/performance-changes-2n-zn2-xxv710-2t1c-pdr50-d1-avg-csv.csv>`_ - - `CSV 2t1c PDR90, direction1, average value comparison <../../_static/vpp/performance-changes-2n-zn2-xxv710-2t1c-pdr90-d1-avg-csv.csv>`_ - - `CSV 2t1c PDR90, direction1, max value comparison <../../_static/vpp/performance-changes-2n-zn2-xxv710-2t1c-pdr90-d1-max-csv.csv>`_ + - `HTML 2t1c PDR50, direction1, average value comparison `_ + - `HTML 2t1c PDR90, direction1, average value comparison `_ + - `HTML 2t1c PDR90, direction1, max value comparison `_ + - `ASCII 2t1c PDR50, direction1, average value comparison <../../_static/vpp/latency-changes-2n-zn2-xxv710-2t1c-pdr50-d1-avg.txt>`_ + - `ASCII 2t1c PDR90, direction1, average value comparison <../../_static/vpp/latency-changes-2n-zn2-xxv710-2t1c-pdr90-d1-avg.txt>`_ + - `ASCII 2t1c PDR90, direction1, max value comparison <../../_static/vpp/latency-changes-2n-zn2-xxv710-2t1c-pdr90-d1-max.txt>`_ + - `CSV 2t1c PDR50, direction1, average value comparison <../../_static/vpp/latency-changes-2n-zn2-xxv710-2t1c-pdr50-d1-avg-csv.csv>`_ + - `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 ~~~~~~ @@ -453,15 +453,15 @@ Latency Comparison Comparison tables in HTML, ASCII and CSV formats: - - `HTML 1t1c PDR50, direction1, average value comparison `_ - - `HTML 1t1c PDR90, direction1, average value comparison `_ - - `HTML 1t1c PDR90, direction1, max value comparison `_ - - `ASCII 1t1c PDR50, direction1, average value comparison <../../_static/vpp/performance-changes-2n-tsh-x520-1t1c-pdr50-d1-avg.txt>`_ - - `ASCII 1t1c PDR90, direction1, average value comparison <../../_static/vpp/performance-changes-2n-tsh-x520-1t1c-pdr90-d1-avg.txt>`_ - - `ASCII 1t1c PDR90, direction1, max value comparison <../../_static/vpp/performance-changes-2n-tsh-x520-1t1c-pdr90-d1-max.txt>`_ - - `CSV 1t1c PDR50, direction1, average value comparison <../../_static/vpp/performance-changes-2n-tsh-x520-1t1c-pdr50-d1-avg-csv.csv>`_ - - `CSV 1t1c PDR90, direction1, average value comparison <../../_static/vpp/performance-changes-2n-tsh-x520-1t1c-pdr90-d1-avg-csv.csv>`_ - - `CSV 1t1c PDR90, direction1, max value comparison <../../_static/vpp/performance-changes-2n-tsh-x520-1t1c-pdr90-d1-max-csv.csv>`_ + - `HTML 1t1c PDR50, direction1, average value comparison `_ + - `HTML 1t1c PDR90, direction1, average value comparison `_ + - `HTML 1t1c PDR90, direction1, max value comparison `_ + - `ASCII 1t1c PDR50, direction1, average value comparison <../../_static/vpp/latency-changes-2n-tsh-x520-1t1c-pdr50-d1-avg.txt>`_ + - `ASCII 1t1c PDR90, direction1, average value comparison <../../_static/vpp/latency-changes-2n-tsh-x520-1t1c-pdr90-d1-avg.txt>`_ + - `ASCII 1t1c PDR90, direction1, max value comparison <../../_static/vpp/latency-changes-2n-tsh-x520-1t1c-pdr90-d1-max.txt>`_ + - `CSV 1t1c PDR50, direction1, average value comparison <../../_static/vpp/latency-changes-2n-tsh-x520-1t1c-pdr50-d1-avg-csv.csv>`_ + - `CSV 1t1c PDR90, direction1, average value comparison <../../_static/vpp/latency-changes-2n-tsh-x520-1t1c-pdr90-d1-avg-csv.csv>`_ + - `CSV 1t1c PDR90, direction1, max value comparison <../../_static/vpp/latency-changes-2n-tsh-x520-1t1c-pdr90-d1-max-csv.csv>`_ 2n-tx2 ~~~~~~ @@ -510,12 +510,12 @@ Latency Comparison Comparison tables in HTML, ASCII and CSV formats: - - `HTML 1t1c PDR50, direction1, average value comparison `_ - - `HTML 1t1c PDR90, direction1, average value comparison `_ - - `HTML 1t1c PDR90, direction1, max value comparison `_ - - `ASCII 1t1c PDR50, direction1, average value comparison <../../_static/vpp/performance-changes-2n-tx2-xl710-1t1c-pdr50-d1-avg.txt>`_ - - `ASCII 1t1c PDR90, direction1, average value comparison <../../_static/vpp/performance-changes-2n-tx2-xl710-1t1c-pdr90-d1-avg.txt>`_ - - `ASCII 1t1c PDR90, direction1, max value comparison <../../_static/vpp/performance-changes-2n-tx2-xl710-1t1c-pdr90-d1-max.txt>`_ - - `CSV 1t1c PDR50, direction1, average value comparison <../../_static/vpp/performance-changes-2n-tx2-xl710-1t1c-pdr50-d1-avg-csv.csv>`_ - - `CSV 1t1c PDR90, direction1, average value comparison <../../_static/vpp/performance-changes-2n-tx2-xl710-1t1c-pdr90-d1-avg-csv.csv>`_ - - `CSV 1t1c PDR90, direction1, max value comparison <../../_static/vpp/performance-changes-2n-tx2-xl710-1t1c-pdr90-d1-max-csv.csv>`_ + - `HTML 1t1c PDR50, direction1, average value comparison `_ + - `HTML 1t1c PDR90, direction1, average value comparison `_ + - `HTML 1t1c PDR90, direction1, max value comparison `_ + - `ASCII 1t1c PDR50, direction1, average value comparison <../../_static/vpp/latency-changes-2n-tx2-xl710-1t1c-pdr50-d1-avg.txt>`_ + - `ASCII 1t1c PDR90, direction1, average value comparison <../../_static/vpp/latency-changes-2n-tx2-xl710-1t1c-pdr90-d1-avg.txt>`_ + - `ASCII 1t1c PDR90, direction1, max value comparison <../../_static/vpp/latency-changes-2n-tx2-xl710-1t1c-pdr90-d1-max.txt>`_ + - `CSV 1t1c PDR50, direction1, average value comparison <../../_static/vpp/latency-changes-2n-tx2-xl710-1t1c-pdr50-d1-avg-csv.csv>`_ + - `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>`_ diff --git a/resources/tools/presentation/generator_tables.py b/resources/tools/presentation/generator_tables.py index fa5a963600..fe0eaaa22e 100644 --- a/resources/tools/presentation/generator_tables.py +++ b/resources/tools/presentation/generator_tables.py @@ -1675,7 +1675,14 @@ def table_comparison(table, input_data): if replacement: rpl_data = input_data.filter_data( table, - params=[u"throughput", u"result", u"name", u"parent", u"tags"], + params=[ + u"throughput", + u"result", + u"latency", + u"name", + u"parent", + u"tags" + ], data=replacement, continue_on_error=True ) @@ -1802,7 +1809,7 @@ def table_comparison(table, input_data): ) except ZeroDivisionError: break - if delta is None: + if delta in (None, float(u"nan"), u"nan", u"NaN"): break new_row.append({ u"mean": delta * 1e6, diff --git a/resources/tools/presentation/run_report.sh b/resources/tools/presentation/run_report.sh index 81188e73ff..7c0776d7bd 100755 --- a/resources/tools/presentation/run_report.sh +++ b/resources/tools/presentation/run_report.sh @@ -32,7 +32,7 @@ export PYTHONPATH=`pwd`:`pwd`/../../../ python pal.py \ --specification specifications/report \ --release ${RELEASE} \ - --week "30" \ + --week "31" \ --logging INFO \ --force diff --git a/resources/tools/presentation/specifications/report/environment.yaml b/resources/tools/presentation/specifications/report/environment.yaml index a1f4f18d33..c08ec2c41d 100644 --- a/resources/tools/presentation/specifications/report/environment.yaml +++ b/resources/tools/presentation/specifications/report/environment.yaml @@ -199,7 +199,7 @@ file-format: ".gz" enabled: False - archive-inputs: True + archive-inputs: False mapping-file: "" @@ -270,5 +270,5 @@ format: html: - full - pdf: - - minimal +# pdf: +# - minimal diff --git a/resources/tools/presentation/sphinx_conf/report/conf.py b/resources/tools/presentation/sphinx_conf/report/conf.py index 3d0988a8e6..4ad4d94855 100644 --- a/resources/tools/presentation/sphinx_conf/report/conf.py +++ b/resources/tools/presentation/sphinx_conf/report/conf.py @@ -46,7 +46,7 @@ source_suffix = [u'.rst', u'.md'] master_doc = u'index' # General information about the project. -report_week = u'30' +report_week = u'31' project = u'FD.io CSIT-2106.{week}'.format(week=report_week) copyright = u'2021, FD.io' author = u'FD.io CSIT' -- 2.16.6