X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fgenerator_tables.py;h=f4c57f76d4af7cca3a98f681146fa9c640576292;hb=3eb09745cc7a936dc91a68a4a723867c2311f3a1;hp=606cb815d899724141ff61c05c59f1c0d59fdcf2;hpb=92d09115493a50599ed5bea9126be28229b4211f;p=csit.git diff --git a/resources/tools/presentation/generator_tables.py b/resources/tools/presentation/generator_tables.py index 606cb815d8..f4c57f76d4 100644 --- a/resources/tools/presentation/generator_tables.py +++ b/resources/tools/presentation/generator_tables.py @@ -411,18 +411,45 @@ def table_performance_comparison(table, input_data): item.append(round(stdev(data_t) / 1000000, 2)) else: item.extend(["Not tested", "Not tested"]) - if item[-4] != "Not tested" and item[-2] != "Not tested" and item[-4] != 0: - item.append(int(relative_change(float(item[-4]), float(item[-2])))) + if item[-2] == "Not tested": + pass elif item[-4] == "Not tested": item.append("New in CSIT-1908") elif topo == "2n-skx" and "dot1q" in tbl_dict[tst_name]["name"]: item.append("See footnote [1]") footnote = True + elif item[-4] != 0: + item.append(int(relative_change(float(item[-4]), float(item[-2])))) if (len(item) == len(header)) and (item[-3] != "Not tested"): tbl_lst.append(item) - # Sort the table according to the relative change - tbl_lst.sort(key=lambda rel: rel[-1], reverse=True) + # Sort the table: + # 1. New in CSIT-XXXX + # 2. See footnote + # 3. Delta + tbl_new = list() + tbl_see = list() + tbl_delta = list() + for item in tbl_lst: + if isinstance(item[-1], str): + if "New in CSIT" in item[-1]: + tbl_new.append(item) + elif "See footnote" in item[-1]: + tbl_see.append(item) + else: + tbl_delta.append(item) + + # Sort the tables: + tbl_new.sort(key=lambda rel: rel[0], reverse=False) + tbl_see.sort(key=lambda rel: rel[0], reverse=False) + tbl_see.sort(key=lambda rel: rel[-1], reverse=False) + tbl_delta.sort(key=lambda rel: rel[-1], reverse=True) + + # Put the tables together: + tbl_lst = list() + tbl_lst.extend(tbl_new) + tbl_lst.extend(tbl_see) + tbl_lst.extend(tbl_delta) # Generate csv tables: csv_file = "{0}.csv".format(table["output-file"]) @@ -437,13 +464,13 @@ def table_performance_comparison(table, input_data): if footnote: with open(txt_file_name, 'a') as txt_file: txt_file.writelines([ - "Footnotes:", + "\nFootnotes:\n", "[1] CSIT-1908 changed test methodology of dot1q tests in " - "2n-skx testbeds, dot1q encapsulation is now used on both " - "links of SUT.", + "2-node testbeds, dot1q encapsulation is now used on both " + "links of SUT.\n", " Previously dot1q was used only on a single link with the " - "other link carrying untagged Ethernet frames. This change " - "results", + "other link carrying untagged Ethernet frames. This changes " + "results\n", " in slightly lower throughput in CSIT-1908 for these " "tests. See release notes." ]) @@ -679,18 +706,45 @@ def table_performance_comparison_nic(table, input_data): item.append(round(stdev(data_t) / 1000000, 2)) else: item.extend(["Not tested", "Not tested"]) - if item[-4] != "Not tested" and item[-2] != "Not tested" and item[-4] != 0: - item.append(int(relative_change(float(item[-4]), float(item[-2])))) + if item[-2] == "Not tested": + pass elif item[-4] == "Not tested": item.append("New in CSIT-1908") elif topo == "2n-skx" and "dot1q" in tbl_dict[tst_name]["name"]: item.append("See footnote [1]") footnote = True + elif item[-4] != 0: + item.append(int(relative_change(float(item[-4]), float(item[-2])))) if (len(item) == len(header)) and (item[-3] != "Not tested"): tbl_lst.append(item) - # Sort the table according to the relative change - tbl_lst.sort(key=lambda rel: rel[-1], reverse=True) + # Sort the table: + # 1. New in CSIT-XXXX + # 2. See footnote + # 3. Delta + tbl_new = list() + tbl_see = list() + tbl_delta = list() + for item in tbl_lst: + if isinstance(item[-1], str): + if "New in CSIT" in item[-1]: + tbl_new.append(item) + elif "See footnote" in item[-1]: + tbl_see.append(item) + else: + tbl_delta.append(item) + + # Sort the tables: + tbl_new.sort(key=lambda rel: rel[0], reverse=False) + tbl_see.sort(key=lambda rel: rel[0], reverse=False) + tbl_see.sort(key=lambda rel: rel[-1], reverse=False) + tbl_delta.sort(key=lambda rel: rel[-1], reverse=True) + + # Put the tables together: + tbl_lst = list() + tbl_lst.extend(tbl_new) + tbl_lst.extend(tbl_see) + tbl_lst.extend(tbl_delta) # Generate csv tables: csv_file = "{0}.csv".format(table["output-file"]) @@ -705,13 +759,13 @@ def table_performance_comparison_nic(table, input_data): if footnote: with open(txt_file_name, 'a') as txt_file: txt_file.writelines([ - "Footnotes:", + "\nFootnotes:\n", "[1] CSIT-1908 changed test methodology of dot1q tests in " - "2n-skx testbeds, dot1q encapsulation is now used on both " - "links of SUT.", + "2-node testbeds, dot1q encapsulation is now used on both " + "links of SUT.\n", " Previously dot1q was used only on a single link with the " - "other link carrying untagged Ethernet frames. This change " - "results", + "other link carrying untagged Ethernet frames. This changes " + "results\n", " in slightly lower throughput in CSIT-1908 for these " "tests. See release notes." ]) @@ -740,9 +794,9 @@ def table_nics_comparison(table, input_data): header = ["Test case", ] if table["include-tests"] == "MRR": - hdr_param = "Receive Rate" + hdr_param = "Rec Rate" else: - hdr_param = "Throughput" + hdr_param = "Thput" header.extend( ["{0} {1} [Mpps]".format(table["reference"]["title"], hdr_param), @@ -849,9 +903,9 @@ def table_soak_vs_ndr(table, input_data): try: header = [ "Test case", - "{0} Throughput [Mpps]".format(table["reference"]["title"]), + "{0} Thput [Mpps]".format(table["reference"]["title"]), "{0} Stdev [Mpps]".format(table["reference"]["title"]), - "{0} Throughput [Mpps]".format(table["compare"]["title"]), + "{0} Thput [Mpps]".format(table["compare"]["title"]), "{0} Stdev [Mpps]".format(table["compare"]["title"]), "Delta [%]", "Stdev of delta [%]"] header_str = ",".join(header) + "\n"