From a83fadf2a6b2a7627d01b147fc637d29eb99e3d2 Mon Sep 17 00:00:00 2001 From: Keith Rothman <537074+litghost@users.noreply.github.com> Date: Sun, 27 Jan 2019 08:20:08 -0800 Subject: [PATCH] run make format. Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com> --- fuzzers/005-tilegrid/dsp_int/top.py | 2 +- fuzzers/005-tilegrid/generate_full.py | 22 +++++++++------------- fuzzers/005-tilegrid/util.py | 1 + 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/fuzzers/005-tilegrid/dsp_int/top.py b/fuzzers/005-tilegrid/dsp_int/top.py index ce2eae3d..5d8f852c 100644 --- a/fuzzers/005-tilegrid/dsp_int/top.py +++ b/fuzzers/005-tilegrid/dsp_int/top.py @@ -158,7 +158,7 @@ module top(); int2=int_tiles[2], int3=int_tiles[3], int4=int_tiles[4], - )) + )) print("endmodule") write_params(params) diff --git a/fuzzers/005-tilegrid/generate_full.py b/fuzzers/005-tilegrid/generate_full.py index ab6543c0..6f64c092 100644 --- a/fuzzers/005-tilegrid/generate_full.py +++ b/fuzzers/005-tilegrid/generate_full.py @@ -373,7 +373,6 @@ def add_hclk_bits(database, tiles_by_grid): assert database[tile_above]['type'] == expected_tile_type, ( tile_name, tile_above) - if not database[tile_below]['bits']: continue if not database[tile_above]['bits']: @@ -388,14 +387,16 @@ def add_hclk_bits(database, tiles_by_grid): offset_below = bits_below['offset'] offset_above = bits_above['offset'] - assert offset_above - offset_below == (int_words + hclk_words), (tile_name, offset_below, offset_above, int_words + hclk_words) + assert offset_above - offset_below == (int_words + hclk_words), ( + tile_name, offset_below, offset_above, int_words + hclk_words) localutil.add_tile_bits( - tile_name, database[tile_name], - baseaddr=int(bits_below['baseaddr'], 0), - offset=offset_below+int_words, - frames=hclk_frames, words=hclk_words) - + tile_name, + database[tile_name], + baseaddr=int(bits_below['baseaddr'], 0), + offset=offset_below + int_words, + frames=hclk_frames, + words=hclk_words) def run(json_in_fn, json_out_fn, int_tdb=None, verbose=False): @@ -405,7 +406,6 @@ def run(json_in_fn, json_out_fn, int_tdb=None, verbose=False): add_hclk_bits(database, tiles_by_grid) - # Save xjson.pprint(open(json_out_fn, "w"), database) @@ -429,11 +429,7 @@ def main(): help=".tdb diffs to fill the interconnects without any adjacent CLB") args = parser.parse_args() - run( - args.json_in, - args.json_out, - args.int_tdb, - verbose=args.verbose) + run(args.json_in, args.json_out, args.int_tdb, verbose=args.verbose) if __name__ == "__main__": diff --git a/fuzzers/005-tilegrid/util.py b/fuzzers/005-tilegrid/util.py index c3d73406..e66f1414 100644 --- a/fuzzers/005-tilegrid/util.py +++ b/fuzzers/005-tilegrid/util.py @@ -157,6 +157,7 @@ def add_tile_bits( height = words block["height"] = height + def get_int_params(): int_frames = 28 int_words = 2