From aa05687774ae684c31942922a42256f1738a96a6 Mon Sep 17 00:00:00 2001 From: Tibor Frank Date: Mon, 23 Mar 2020 14:05:58 +0100 Subject: [PATCH] Report: Add data Change-Id: I72cf83bfae9f07691157d2baee436e4021cd87dc Signed-off-by: Tibor Frank (cherry picked from commit d3467a74642fc11c81533414d552a757094a8a3c) --- resources/tools/presentation/generator_tables.py | 40 +++++++++++--- resources/tools/presentation/specification.yaml | 66 ++++++++++++++++++++++++ 2 files changed, 98 insertions(+), 8 deletions(-) diff --git a/resources/tools/presentation/generator_tables.py b/resources/tools/presentation/generator_tables.py index bdd6e22cf7..5cd3553074 100644 --- a/resources/tools/presentation/generator_tables.py +++ b/resources/tools/presentation/generator_tables.py @@ -822,8 +822,14 @@ def table_perf_comparison(table, input_data): delta, d_stdev = relative_change_stdev( data_r_mean, data_c_mean, data_r_stdev, data_c_stdev ) - item.append(round(delta)) - item.append(round(d_stdev)) + try: + item.append(round(delta)) + except ValueError: + item.append(delta) + try: + item.append(round(d_stdev)) + except ValueError: + item.append(d_stdev) if (len(item) == len(header)) and (item[-4] != u"Not tested"): tbl_lst.append(item) @@ -1115,8 +1121,14 @@ def table_perf_comparison_nic(table, input_data): delta, d_stdev = relative_change_stdev( data_r_mean, data_c_mean, data_r_stdev, data_c_stdev ) - item.append(round(delta)) - item.append(round(d_stdev)) + try: + item.append(round(delta)) + except ValueError: + item.append(delta) + try: + item.append(round(d_stdev)) + except ValueError: + item.append(d_stdev) if (len(item) == len(header)) and (item[-4] != u"Not tested"): tbl_lst.append(item) @@ -1253,8 +1265,14 @@ def table_nics_comparison(table, input_data): delta, d_stdev = relative_change_stdev( data_r_mean, data_c_mean, data_r_stdev, data_c_stdev ) - item.append(round(delta)) - item.append(round(d_stdev)) + try: + item.append(round(delta)) + except ValueError: + item.append(delta) + try: + item.append(round(d_stdev)) + except ValueError: + item.append(d_stdev) tbl_lst.append(item) # Sort the table according to the relative change @@ -1387,8 +1405,14 @@ def table_soak_vs_ndr(table, input_data): if data_r_mean and data_c_mean: delta, d_stdev = relative_change_stdev( data_r_mean, data_c_mean, data_r_stdev, data_c_stdev) - item.append(round(delta)) - item.append(round(d_stdev)) + try: + item.append(round(delta)) + except ValueError: + item.append(delta) + try: + item.append(round(d_stdev)) + except ValueError: + item.append(d_stdev) tbl_lst.append(item) # Sort the table according to the relative change diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml index c4a9bdde8a..d264293ed6 100644 --- a/resources/tools/presentation/specification.yaml +++ b/resources/tools/presentation/specification.yaml @@ -276,6 +276,17 @@ - 47 # NDRPDR sel - 48 # NDRPDR sel - 49 # NDRPDR sel +<<<<<<< HEAD (9ac896 Report: Remove decimals from delta and stdev in tables) +======= + - 51 # NDRPDR sel + - 52 # NDRPDR sel + - 54 # NDRPDR sel addition + - 55 # NDRPDR sel addition + - 56 # NDRPDR sel addition + - 57 # NDRPDR sel addition + - 58 # NDRPDR sel addition + - 61 # NDRPDR sel addition +>>>>>>> CHANGE (d3467a Report: Add data) plot-vpp-hdrh-lat-3n-skx: csit-vpp-perf-verify-2001-3n-skx: @@ -604,6 +615,17 @@ - 47 # NDRPDR sel - 48 # NDRPDR sel - 49 # NDRPDR sel +<<<<<<< HEAD (9ac896 Report: Remove decimals from delta and stdev in tables) +======= + - 51 # NDRPDR sel + - 52 # NDRPDR sel + - 54 # NDRPDR sel addition + - 55 # NDRPDR sel addition + - 56 # NDRPDR sel addition + - 57 # NDRPDR sel addition + - 58 # NDRPDR sel addition + - 61 # NDRPDR sel addition +>>>>>>> CHANGE (d3467a Report: Add data) vpp-nic-comparison-2n-skx: csit-vpp-perf-verify-2001-2n-skx: @@ -876,6 +898,17 @@ - 47 # NDRPDR sel - 48 # NDRPDR sel - 49 # NDRPDR sel +<<<<<<< HEAD (9ac896 Report: Remove decimals from delta and stdev in tables) +======= + - 51 # NDRPDR sel + - 52 # NDRPDR sel + - 54 # NDRPDR sel addition + - 55 # NDRPDR sel addition + - 56 # NDRPDR sel addition + - 57 # NDRPDR sel addition + - 58 # NDRPDR sel addition + - 61 # NDRPDR sel addition +>>>>>>> CHANGE (d3467a Report: Add data) vpp-performance-changes-3n-skx: - "vpp-performance-changes-3n-skx-h1" - "vpp-performance-changes-3n-skx-ref" @@ -1374,6 +1407,17 @@ - 47 # NDRPDR sel - 48 # NDRPDR sel - 49 # NDRPDR sel +<<<<<<< HEAD (9ac896 Report: Remove decimals from delta and stdev in tables) +======= + - 51 # NDRPDR sel + - 52 # NDRPDR sel + - 54 # NDRPDR sel addition + - 55 # NDRPDR sel addition + - 56 # NDRPDR sel addition + - 57 # NDRPDR sel addition + - 58 # NDRPDR sel addition + - 61 # NDRPDR sel addition +>>>>>>> CHANGE (d3467a Report: Add data) vpp-compare-testbeds: - "vpp-compare-testbeds-ref" - "vpp-compare-testbeds-cmp" @@ -1582,6 +1626,17 @@ - 47 # NDRPDR sel - 48 # NDRPDR sel - 49 # NDRPDR sel +<<<<<<< HEAD (9ac896 Report: Remove decimals from delta and stdev in tables) +======= + - 51 # NDRPDR sel + - 52 # NDRPDR sel + - 54 # NDRPDR sel addition + - 55 # NDRPDR sel addition + - 56 # NDRPDR sel addition + - 57 # NDRPDR sel addition + - 58 # NDRPDR sel addition + - 61 # NDRPDR sel addition +>>>>>>> CHANGE (d3467a Report: Add data) vpp-compare-topologies-cmp: # TODO: Add the data csit-vpp-perf-verify-2001-2n-skx: @@ -2453,6 +2508,17 @@ - 47 # NDRPDR sel - 48 # NDRPDR sel - 49 # NDRPDR sel +<<<<<<< HEAD (9ac896 Report: Remove decimals from delta and stdev in tables) +======= + - 51 # NDRPDR sel + - 52 # NDRPDR sel + - 54 # NDRPDR sel addition + - 55 # NDRPDR sel addition + - 56 # NDRPDR sel addition + - 57 # NDRPDR sel addition + - 58 # NDRPDR sel addition + - 61 # NDRPDR sel addition +>>>>>>> CHANGE (d3467a Report: Add data) - 50 # MRR sel csit-vpp-perf-verify-1904-2n-skx: -- 2.16.6