diff --git a/fuzzers/007-timing/bel/fixup_timings_txt.py b/fuzzers/007-timing/bel/fixup_timings_txt.py index f12be26b..b36cfe62 100644 --- a/fuzzers/007-timing/bel/fixup_timings_txt.py +++ b/fuzzers/007-timing/bel/fixup_timings_txt.py @@ -2,6 +2,7 @@ import argparse + def fix_line(line, site, filetype): line = line.split() newline = list() @@ -16,13 +17,13 @@ def fix_line(line, site, filetype): all_entries = 0 loc = 2 for site in range(0, sites_count): - bels_count = int(line[loc + 1]) - loc += 2 - for bel in range(0, bels_count): - entries_count = int(line[loc + 1]) - loc += 2 - all_entries += entries_count - for entry in range(0, entries_count): + bels_count = int(line[loc + 1]) + loc += 2 + for bel in range(0, bels_count): + entries_count = int(line[loc + 1]) + loc += 2 + all_entries += entries_count + for entry in range(0, entries_count): if filetype == 'timings': for delay_word in range(0, 6): entries.append(line[loc]) @@ -44,13 +45,19 @@ def fix_line(line, site, filetype): newline.extend(entries) return " ".join(newline) + "\n" + def main(): parser = argparse.ArgumentParser() parser.add_argument('--txtin', type=str, help='Input text file') parser.add_argument('--txtout', type=str, help='Output text file') - parser.add_argument('--site', type=str, help='Site to which the entries should be squashed') - parser.add_argument('--slice', type=str, help='Slice for which the entries shall be fixed') - parser.add_argument('--type', type=str, choices=['timings', 'pins', 'properties']) + parser.add_argument( + '--site', + type=str, + help='Site to which the entries should be squashed') + parser.add_argument( + '--slice', type=str, help='Slice for which the entries shall be fixed') + parser.add_argument( + '--type', type=str, choices=['timings', 'pins', 'properties']) args = parser.parse_args() lines = list() @@ -65,5 +72,6 @@ def main(): for line in lines: fp.write(line) + if __name__ == "__main__": main() diff --git a/fuzzers/007-timing/bel/tim2json.py b/fuzzers/007-timing/bel/tim2json.py index 073dc497..d6062987 100644 --- a/fuzzers/007-timing/bel/tim2json.py +++ b/fuzzers/007-timing/bel/tim2json.py @@ -281,7 +281,8 @@ def read_raw_timings(fin, properties, pins, site_pins, pin_alias_map): # if we couldn't find input, check if the clock is the # only input. This applies only to combinational paths - if (sequential is None) and (bel_input is None) and (bel_clock is not None): + if (sequential is None) and (bel_input is None) and ( + bel_clock is not None): if bel_clock_orig_pin in site_pins[slice][site_name.lower()] and \ site_pins[slice][site_name.lower( )][bel_clock_orig_pin]['direction'] == 'IN': @@ -334,7 +335,6 @@ def read_raw_timings(fin, properties, pins, site_pins, pin_alias_map): orig_pin.lower(), speed_model_clean) - # if we still don't have input, give up if bel_input is None: delay_loc += 6