From 0a67083bea6b5e740c89fcc6c9143e0f035eadd1 Mon Sep 17 00:00:00 2001 From: Tibor Frank Date: Mon, 2 Sep 2019 15:52:06 +0200 Subject: [PATCH] PAL: list all sel tests in table_performance_comparison_nic Change-Id: I21bb76aab4a1e627a13057f896ea7bfc34c03463 Signed-off-by: Tibor Frank --- resources/tools/presentation/generator_tables.py | 19 +++++++-- resources/tools/presentation/specification.yaml | 50 +----------------------- 2 files changed, 18 insertions(+), 51 deletions(-) diff --git a/resources/tools/presentation/generator_tables.py b/resources/tools/presentation/generator_tables.py index 79193d96c7..e873cbffbb 100644 --- a/resources/tools/presentation/generator_tables.py +++ b/resources/tools/presentation/generator_tables.py @@ -528,6 +528,18 @@ def table_performance_comparison_nic(table, input_data): tst_name_mod = re.sub(REGEX_NIC, "", tst_name_mod) if "across topologies" in table["title"].lower(): tst_name_mod = tst_name_mod.replace("2n1l-", "") + if tbl_dict.get(tst_name_mod, None) is None: + name = "{0}".format("-".join(tst_data["name"]. + split("-")[:-1])) + if "across testbeds" in table["title"].lower() or \ + "across topologies" in table["title"].lower(): + name = name.\ + replace("1t1c", "1c").replace("2t1c", "1c").\ + replace("2t2c", "2c").replace("4t2c", "2c").\ + replace("4t4c", "4c").replace("8t4c", "4c") + tbl_dict[tst_name_mod] = {"name": name, + "ref-data": list(), + "cmp-data": list()} try: # TODO: Re-work when NDRPDRDISC tests are not used if table["include-tests"] == "MRR": @@ -549,10 +561,9 @@ def table_performance_comparison_nic(table, input_data): tst_data["throughput"]["NDR"]["LOWER"]) else: continue - except KeyError: + except (KeyError, TypeError): pass - except TypeError: - tbl_dict.pop(tst_name_mod, None) + if history: for item in history: for job, builds in item["data"].items(): @@ -634,6 +645,8 @@ def table_performance_comparison_nic(table, input_data): item.extend([None, None]) if item[-4] is not None and item[-2] is not None and item[-4] != 0: item.append(int(relative_change(float(item[-4]), float(item[-2])))) + else: + item.append(None) if len(item) == len(header): tbl_lst.append(item) diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml index d9de46d894..569d1fad09 100644 --- a/resources/tools/presentation/specification.yaml +++ b/resources/tools/presentation/specification.yaml @@ -175,7 +175,6 @@ # 3n-skx plot-vpp-throughput-lat-tsa-3n-skx: - # TODO: Add data csit-vpp-perf-verify-1908-3n-skx: - 14 # NDRPDR sel - 16 # NDRPDR sel @@ -267,7 +266,6 @@ # NIC Comparisons vpp-nic-comparison-3n-skx: - # TODO: Add data csit-vpp-perf-verify-1908-3n-skx: - 14 # NDRPDR sel - 16 # NDRPDR sel @@ -344,7 +342,6 @@ - 66 # NDRPDR full vpp-perf-results-3n-tsh: - # TODO: Add FULL data csit-vpp-perf-verify-1908-3n-tsh: - 13 # NDRPDR sel @@ -358,7 +355,7 @@ vpp-mrr-results-2n-skx: csit-vpp-perf-verify-1908-2n-skx: - - 71 # NFV MRR + - 69 # MRR sel vpp-func-results-ubuntu: csit-vpp-functional-1908-ubuntu1604-virl: @@ -384,27 +381,7 @@ csit-dpdk-perf-verify-1908-2n-skx: - 12 # NDRPDR sel - # HoneyComb Functional - hc-func-results: - csit-hc2vpp-verify-func-1904-ubuntu1604: - - 4 - # TODO: Add data - # csit-hc2vpp-verify-func-1908-ubuntu1604: - -# # NSH SFC Functional -# nsh-func-results: -# # Not used -# csit-nsh_sfc-verify-func-1810-ubuntu1604-virl: -# - 1 - - # DMM Functional - dmm-func-results: - csit-dmm-functional-1904-ubuntu1604-virl: - - 1 - # TODO: Add data - # csit-dmm-functional-1908-ubuntu1604-virl: - - ########################################################################### +########################################################################### # Tables (more than one data set) # Performance changes @@ -510,7 +487,6 @@ - 23 # NDRPDR sel - 25 # NDRPDR sel vpp-performance-changes-3n-skx-cmp: - # TODO: Add data csit-vpp-perf-verify-1908-3n-skx: - 14 # NDRPDR sel - 16 # NDRPDR sel @@ -785,7 +761,6 @@ - 20 # NDRPDR sel - 21 # NDRPDR sel vpp-compare-testbeds-cmp: - # TODO: Add data csit-vpp-perf-verify-1908-3n-skx: - 14 # NDRPDR sel - 16 # NDRPDR sel @@ -812,7 +787,6 @@ - "vpp-compare-testbeds-mrr-cmp" dpdk-compare-testbeds-ref: - # TODO: Add data csit-dpdk-perf-verify-1908-3n-hsw: - 2 # NDRPDR sel - 3 # NDRPDR sel @@ -1619,8 +1593,6 @@ - 11 # NDRPDR sel - 12 # NDRPDR sel - # TODO: Replace - csit-vpp-functional-1908-ubuntu1604-virl: - 64 csit-vpp-functional-1908-centos7-virl: @@ -4385,24 +4357,6 @@ - "parent" data-start-level: 3 -# Honeycomb Functional Results -- type: "file" - title: "Honeycomb Functional Results" - algorithm: "file_test_results" - output-file-ext: ".rst" - output-file: "{DIR[DTR,FUNC,HC]}/honeycomb_functional_results" - file-header: "\n.. |br| raw:: html\n\n
\n\n\n.. |prein| raw:: html\n\n 
\n\n\n.. |preout| raw:: html\n\n
\n\n" - dir-tables: "{DIR[DTR,FUNC,HC]}" - data: - "hc-func-results" - filter: "all" - parameters: - - "name" - - "doc" - - "level" - - "parent" - data-start-level: 3 - ################################################################################ ### P L O T S ### ################################################################################ -- 2.16.6