Commit cb06c083 authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch 'main' into ci/add-reference-lines-to-complexity-plots

parents ff8968d0 e51fb5bf

ci/basop-pages/create_report_pages.py

+12 −5
Original line number Diff line number Diff line
@@ -199,11 +199,15 @@ def tr_from_row(row, id_current, id_previous): 
                if float(curr) > float(prev):

                    curr += f" {ARROW_UP}"

                    # increase is bad -> mark in red, execpt for SNR for which it is good -> mark in green

                    td_tmpl_curr = TD_TMPL_REDUCE if c == "MIN_SSNR" else TD_TMPL_INCREASE

                    td_tmpl_curr = (

                        TD_TMPL_REDUCE if c == "MIN_SSNR" else TD_TMPL_INCREASE

                    )

                elif float(curr) < float(prev):

                    curr += f" {ARROW_DOWN}"

                    # reduce is good -> mark in green, execpt for SNR for which it is bad -> mark in red

                    td_tmpl_curr = TD_TMPL_INCREASE if c == "MIN_SSNR" else TD_TMPL_REDUCE

                    td_tmpl_curr = (

                        TD_TMPL_INCREASE if c == "MIN_SSNR" else TD_TMPL_REDUCE

                    )

            except ValueError:

                # if we land here, one of the cells is not a number, this indicates a crash

                # or some error in the scripts, so mark with red as well
@@ -295,6 +299,7 @@ def merge_tables(tbl1, tbl2, suffix1, suffix2, merge_key, other_keys): 
        for key in other_keys:

            new_row[f"{key}-{suffix1}"] = row1[key]



        found_merge_key_in_both_tbls = False

        for row2 in tbl2:

            if row1[merge_key] == row2[merge_key]:

                new_row[merge_key] = row1[merge_key]
@@ -303,14 +308,16 @@ def merge_tables(tbl1, tbl2, suffix1, suffix2, merge_key, other_keys): 
                        new_row[f"{key}-{suffix2}"] = row2[key]

                    else:

                        new_row[f"{key}-{suffix2}"] = ""



                found_merge_key_in_both_tbls = True

                break



        if found_merge_key_in_both_tbls:

            merged.append(new_row)



    return merged







if __name__ == "__main__":

    parser = argparse.ArgumentParser()

    parser.add_argument("html_out")

ci/basop-pages/create_summary_page.py

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ import argparse 


from create_report_pages import SUBPAGE_TMPL_CSS, FORMATS



MEASURES = ["MLD","DIFF","SSNR"]

MEASURES = ["MLD","DIFF","SSNR","ODG"]



SUMMARY_PAGE_TMPL_HTML = """

ci/complexity_measurements/parseNewsletterRam.py

+9 −9
Original line number Diff line number Diff line
@@ -48,17 +48,17 @@ if __name__ == "__main__": 
    shortDate = sys.argv[5]

    fullDate = sys.argv[6]



max_total_enc = ["", 0]

max_total_dec = ["", 0]

max_total_encdec = ["", 0]

max_total_enc = ["None", 0]

max_total_dec = ["None", 0]

max_total_encdec = ["None", 0]



max_stack_enc = ["", 0]

max_stack_dec = ["", 0]

max_stack_encdec = ["", 0]

max_stack_enc = ["None", 0]

max_stack_dec = ["None", 0]

max_stack_encdec = ["None", 0]



max_heap_enc = ["", 0]

max_heap_dec = ["", 0]

max_heap_encdec = ["", 0]

max_heap_enc = ["None", 0]

max_heap_dec = ["None", 0]

max_heap_encdec = ["None", 0]



ram_table = {}

ci/complexity_measurements/parseNewsletterRom.py

+13 −13
Original line number Diff line number Diff line
@@ -49,19 +49,19 @@ if __name__ == "__main__": 
    shortDate = sys.argv[5]

    fullDate = sys.argv[6]



max_prom_enc = ["", 0]

max_prom_dec = ["", 0]

max_prom_com = ["", 0]

max_prom_rend = ["", 0]

max_prom_total = ["", 0]



max_trom_enc = ["", 0]

max_trom_dec = ["", 0]

max_trom_com = ["", 0]

max_trom_rend = ["", 0]

max_trom_total = ["", 0]



max_total_encdec = ["", 0]

max_prom_enc = ["None", 0]

max_prom_dec = ["None", 0]

max_prom_com = ["None", 0]

max_prom_rend = ["None", 0]

max_prom_total = ["None", 0]



max_trom_enc = ["None", 0]

max_trom_dec = ["None", 0]

max_trom_com = ["None", 0]

max_trom_rend = ["None", 0]

max_trom_total = ["None", 0]



max_total_encdec = ["None", 0]



rom_table = {}

ci/complexity_measurements/parseNewsletterWmops.py

+3 −3
Original line number Diff line number Diff line
@@ -47,9 +47,9 @@ if __name__ == "__main__": 
    shortDate = sys.argv[4]

    fullDate = sys.argv[5]



max_enc = ["", 0]

max_dec = ["", 0]

max_total = ["", 0]

max_enc = ["None", 0]

max_dec = ["None", 0]

max_total = ["None", 0]

fixedpointScalingFac = 1.0



with open(newsletterFilename, "r") as csvfile: