X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fgenerator_tables.py;h=fe0eaaa22e3d62c1cfe4fb2a2199aa372ef55e1b;hp=449b2357a8aa7e5165030d228b5bc79e7685b5a6;hb=7902281ee08456a4d90bb5829ba42da2c71a6379;hpb=1da19da813655f643bc3c6e4d03bed987f076f07 diff --git a/resources/tools/presentation/generator_tables.py b/resources/tools/presentation/generator_tables.py index 449b2357a8..fe0eaaa22e 100644 --- a/resources/tools/presentation/generator_tables.py +++ b/resources/tools/presentation/generator_tables.py @@ -477,6 +477,13 @@ def _tpc_insert_data(target, src, include_tests): target[u"data"].append(src[u"throughput"][u"PDR"][u"LOWER"]) elif include_tests == u"NDR": target[u"data"].append(src[u"throughput"][u"NDR"][u"LOWER"]) + elif u"latency" in include_tests: + keys = include_tests.split(u"-") + if len(keys) == 4: + lat = src[keys[0]][keys[1]][keys[2]][keys[3]] + target[u"data"].append( + float(u"nan") if lat == -1 else lat * 1e6 + ) except (KeyError, TypeError): pass @@ -1623,7 +1630,14 @@ def table_comparison(table, input_data): tag = col.get(u"tag", None) 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=col[u"data-set"], continue_on_error=True ) @@ -1661,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 ) @@ -1695,7 +1716,8 @@ def table_comparison(table, input_data): include_tests=table[u"include-tests"] ) - if table[u"include-tests"] in (u"NDR", u"PDR"): + if table[u"include-tests"] in (u"NDR", u"PDR") or \ + u"latency" in table[u"include-tests"]: for tst_name, tst_data in col_data[u"data"].items(): if tst_data[u"data"]: tst_data[u"mean"] = mean(tst_data[u"data"]) @@ -1780,11 +1802,14 @@ def table_comparison(table, input_data): cmp_itm[u"mean"] is not None and \ ref_itm[u"stdev"] is not None and \ cmp_itm[u"stdev"] is not None: - delta, d_stdev = relative_change_stdev( - ref_itm[u"mean"], cmp_itm[u"mean"], - ref_itm[u"stdev"], cmp_itm[u"stdev"] - ) - if delta is None: + try: + delta, d_stdev = relative_change_stdev( + ref_itm[u"mean"], cmp_itm[u"mean"], + ref_itm[u"stdev"], cmp_itm[u"stdev"] + ) + except ZeroDivisionError: + break + if delta in (None, float(u"nan"), u"nan", u"NaN"): break new_row.append({ u"mean": delta * 1e6,