diff --git a/.update-contributing.py b/.update-contributing.py index 56aee766..48bf9dfa 100755 --- a/.update-contributing.py +++ b/.update-contributing.py @@ -18,7 +18,8 @@ for line in open('README.md'): found = True # Footer -contrib.append("""\ +contrib.append( + """\ diff --git a/experiments/clbpips/generate.py b/experiments/clbpips/generate.py index faf1408a..c07273ff 100644 --- a/experiments/clbpips/generate.py +++ b/experiments/clbpips/generate.py @@ -19,4 +19,3 @@ with open("design.txt", "r") as f: segmk.compile() segmk.write() - diff --git a/experiments/example/segdata.py b/experiments/example/segdata.py index 3e880e04..6c8e33ef 100644 --- a/experiments/example/segdata.py +++ b/experiments/example/segdata.py @@ -11,7 +11,8 @@ luts = dict() carry = dict() print("Loading grid.") -with open("../../../gridinfo/grid-%s-db.json" % os.getenv("XRAY_PART"), "r") as f: +with open("../../../gridinfo/grid-%s-db.json" % os.getenv("XRAY_PART"), + "r") as f: grid = json.load(f) print("Loading bits.") @@ -52,11 +53,13 @@ with open("carrydata.txt", "r") as f: line = line.split() assert line[0] not in carry carry[line[0]] = dict() - for i, n in enumerate("CYINIT:ZRO:ONE:AX:CIN DI0:AX:O5 DI1:AX:O5 DI2:AX:O5 DI3:AX:O5".split()): + for i, n in enumerate( + "CYINIT:ZRO:ONE:AX:CIN DI0:AX:O5 DI1:AX:O5 DI2:AX:O5 DI3:AX:O5". + split()): n = n.split(":") for k in n[1:]: - carry[line[0]]["CARRY_%s_MUX_%s" % (n[0], k)] = line[1+i].upper() == k - + carry[line[0]]["CARRY_%s_MUX_%s" % + (n[0], k)] = line[1 + i].upper() == k ################################################# # Group per Segment @@ -74,10 +77,12 @@ for tilename, tiledata in grid["tiles"].items(): if not found_data: continue - segname = "%s_%02x" % (tiledata["cfgcol"]["BASE_FRAMEID"][2:], min(tiledata["cfgcol"]["WORDS"])) + segname = "%s_%02x" % ( + tiledata["cfgcol"]["BASE_FRAMEID"][2:], + min(tiledata["cfgcol"]["WORDS"])) if not segname in segments: - segments[segname] = { "bits": list(), "tags": dict() } + segments[segname] = {"bits": list(), "tags": dict()} for site in tiledata["sites"]: if site not in luts and site not in carry: @@ -95,15 +100,18 @@ for tilename, tiledata in grid["tiles"].items(): tile_type = tiledata["props"]["TYPE"] # LUT init bits are in the same position for all CLBL[LM]_[LR] tiles - if re.match("^CLBL[LM]_[LR]", tile_type) and "LUT.INIT" in name: + if re.match("^CLBL[LM]_[LR]", + tile_type) and "LUT.INIT" in name: tile_type = "CLBLX_X" - segments[segname]["tags"]["%s.%s.%s" % (tile_type, sitekey, name)] = value + segments[segname]["tags"]["%s.%s.%s" % + (tile_type, sitekey, name)] = value if site in carry: for name, value in carry[site].items(): tile_type = tiledata["props"]["TYPE"] - segments[segname]["tags"]["%s.%s.%s" % (tile_type, sitekey, name)] = value + segments[segname]["tags"]["%s.%s.%s" % + (tile_type, sitekey, name)] = value base_frame = int(tiledata["cfgcol"]["BASE_FRAMEID"][2:], 16) for wordidx in tiledata["cfgcol"]["WORDS"]: @@ -112,11 +120,14 @@ for tilename, tiledata in grid["tiles"].items(): if wordidx not in bits[base_frame]: continue for bit_frame, bit_wordidx, bit_bitidx in bits[base_frame][wordidx]: - segments[segname]["bits"].append("%02x_%02x_%02x" % (bit_frame - base_frame, bit_wordidx - min(tiledata["cfgcol"]["WORDS"]), bit_bitidx)) + segments[segname]["bits"].append( + "%02x_%02x_%02x" % ( + bit_frame - base_frame, + bit_wordidx - min(tiledata["cfgcol"]["WORDS"]), + bit_bitidx)) segments[segname]["bits"].sort() - ################################################# # Print @@ -129,4 +140,3 @@ with open("segdata.txt", "w") as f: print("bit %s" % bitname, file=f) for tagname, tagval in sorted(segdata["tags"].items()): print("tag %s %d" % (tagname, tagval), file=f) - diff --git a/experiments/gndvcc/generate.py b/experiments/gndvcc/generate.py index 3b043639..f358974d 100644 --- a/experiments/gndvcc/generate.py +++ b/experiments/gndvcc/generate.py @@ -22,11 +22,7 @@ with open("design.txt", "r") as f: pdir = int(pdir) if tile not in tiledata: - tiledata[tile] = { - "pips": set(), - "srcs": set(), - "dsts": set() - } + tiledata[tile] = {"pips": set(), "srcs": set(), "dsts": set()} if pip in pipdata: assert pipdata[pip] == (src, dst) @@ -60,4 +56,3 @@ for tile, pips_srcs_dsts in tiledata.items(): segmk.compile() segmk.write() - diff --git a/experiments/gndvcc/maketodo.py b/experiments/gndvcc/maketodo.py index efff433d..07be79f6 100644 --- a/experiments/gndvcc/maketodo.py +++ b/experiments/gndvcc/maketodo.py @@ -2,6 +2,7 @@ import os, re + def maketodo(pipfile, dbfile): todos = set() with open(pipfile, "r") as f: @@ -16,6 +17,10 @@ def maketodo(pipfile, dbfile): if line.endswith(".GND_WIRE") or line.endswith(".VCC_WIRE"): print(line) -maketodo("pips_int_l.txt", "%s/%s/segbits_int_l.db" % (os.getenv("XRAY_DATABASE_DIR"), os.getenv("XRAY_DATABASE"))) -maketodo("pips_int_r.txt", "%s/%s/segbits_int_r.db" % (os.getenv("XRAY_DATABASE_DIR"), os.getenv("XRAY_DATABASE"))) +maketodo( + "pips_int_l.txt", "%s/%s/segbits_int_l.db" % + (os.getenv("XRAY_DATABASE_DIR"), os.getenv("XRAY_DATABASE"))) +maketodo( + "pips_int_r.txt", "%s/%s/segbits_int_r.db" % + (os.getenv("XRAY_DATABASE_DIR"), os.getenv("XRAY_DATABASE"))) diff --git a/experiments/pipsroute/generate.py b/experiments/pipsroute/generate.py index 7772da8f..bd91f039 100644 --- a/experiments/pipsroute/generate.py +++ b/experiments/pipsroute/generate.py @@ -8,6 +8,7 @@ from segmaker import segmaker pipdata = dict() ignpip = set() + def handle_design(prefix, second_pass): segmk = segmaker(prefix + ".bits") @@ -25,11 +26,7 @@ def handle_design(prefix, second_pass): pdir = int(pdir) if tile not in tiledata: - tiledata[tile] = { - "pips": set(), - "srcs": set(), - "dsts": set() - } + tiledata[tile] = {"pips": set(), "srcs": set(), "dsts": set()} if pip in pipdata: assert pipdata[pip] == (src, dst) @@ -73,6 +70,7 @@ def handle_design(prefix, second_pass): segmk.compile() segmk.write(prefix[7:]) + for arg in sys.argv[1:]: prefix = arg[0:-4] handle_design(prefix, False) @@ -80,4 +78,3 @@ for arg in sys.argv[1:]: for arg in sys.argv[1:]: prefix = arg[0:-4] handle_design(prefix, True) - diff --git a/experiments/pipsroute/maketodo.py b/experiments/pipsroute/maketodo.py index 0229313f..dea2ff24 100644 --- a/experiments/pipsroute/maketodo.py +++ b/experiments/pipsroute/maketodo.py @@ -2,6 +2,7 @@ import os, re + def maketodo(pipfile, dbfile): todos = set() with open(pipfile, "r") as f: @@ -21,6 +22,10 @@ def maketodo(pipfile, dbfile): continue print(line) -maketodo("pips_int_l.txt", "%s/%s/segbits_int_l.db" % (os.getenv("XRAY_DATABASE_DIR"), os.getenv("XRAY_DATABASE"))) -maketodo("pips_int_r.txt", "%s/%s/segbits_int_r.db" % (os.getenv("XRAY_DATABASE_DIR"), os.getenv("XRAY_DATABASE"))) +maketodo( + "pips_int_l.txt", "%s/%s/segbits_int_l.db" % + (os.getenv("XRAY_DATABASE_DIR"), os.getenv("XRAY_DATABASE"))) +maketodo( + "pips_int_r.txt", "%s/%s/segbits_int_r.db" % + (os.getenv("XRAY_DATABASE_DIR"), os.getenv("XRAY_DATABASE"))) diff --git a/fuzzers/005-tilegrid/generate.py b/fuzzers/005-tilegrid/generate.py index 1c4fe149..954459f6 100644 --- a/fuzzers/005-tilegrid/generate.py +++ b/fuzzers/005-tilegrid/generate.py @@ -2,7 +2,6 @@ import os, sys, json, re - ####################################### # Read @@ -18,10 +17,9 @@ for arg in sys.argv[1:]: with open(arg) as f: line = f.read().strip() site = arg[7:-6] - frame = int(line[5:5+8], 16) + frame = int(line[5:5 + 8], 16) site_baseaddr[site] = "0x%08x" % (frame & ~0x7f) - ####################################### # Create initial database @@ -45,7 +43,7 @@ for record in tiles: if len(record) > 4: for i in range(4, len(record), 2): - site_type, site_name = record[i:i+2] + site_type, site_name = record[i:i + 2] if site_name in site_baseaddr: framebaseaddr = site_baseaddr[site_name] database["tiles"][tile_name]["sites"][site_name] = site_type @@ -53,7 +51,6 @@ for record in tiles: if framebaseaddr is not None: tile_baseaddr[tile_name] = [framebaseaddr, 0] - ####################################### # Add Segments @@ -64,21 +61,24 @@ for tile_name, tile_data in database["tiles"].items(): if tile_type in ["CLBLL_L", "CLBLL_R", "CLBLM_L", "CLBLM_R"]: if tile_type in ["CLBLL_L", "CLBLM_L"]: - int_tile_name = tiles_by_grid[(grid_x+1, grid_y)] + int_tile_name = tiles_by_grid[(grid_x + 1, grid_y)] else: - int_tile_name = tiles_by_grid[(grid_x-1, grid_y)] + int_tile_name = tiles_by_grid[(grid_x - 1, grid_y)] segment_name = "SEG_" + tile_name segtype = tile_type.lower() database["segments"][segment_name] = dict() - database["segments"][segment_name]["tiles"] = [tile_name, int_tile_name] + database["segments"][segment_name]["tiles"] = [ + tile_name, int_tile_name + ] database["segments"][segment_name]["type"] = segtype database["segments"][segment_name]["frames"] = 36 database["segments"][segment_name]["words"] = 2 if tile_name in tile_baseaddr: - database["segments"][segment_name]["baseaddr"] = tile_baseaddr[tile_name] + database["segments"][segment_name]["baseaddr"] = tile_baseaddr[ + tile_name] database["tiles"][tile_name]["segment"] = segment_name database["tiles"][int_tile_name]["segment"] = segment_name @@ -97,11 +97,11 @@ for tile_name, tile_data in database["tiles"].items(): if tile_type in ["BRAM_L", "DSP_L", "BRAM_R", "DSP_R"]: for k in range(5): if tile_type in ["BRAM_L", "DSP_L"]: - interface_tile_name = tiles_by_grid[(grid_x+1, grid_y-k)] - int_tile_name = tiles_by_grid[(grid_x+2, grid_y-k)] + interface_tile_name = tiles_by_grid[(grid_x + 1, grid_y - k)] + int_tile_name = tiles_by_grid[(grid_x + 2, grid_y - k)] else: - interface_tile_name = tiles_by_grid[(grid_x-1, grid_y-k)] - int_tile_name = tiles_by_grid[(grid_x-2, grid_y-k)] + interface_tile_name = tiles_by_grid[(grid_x - 1, grid_y - k)] + int_tile_name = tiles_by_grid[(grid_x - 2, grid_y - k)] segment_name = "SEG_" + tile_name.replace("_", "%d_" % k, 1) segtype = tile_type.lower().replace("_", "%d_" % k, 1) @@ -112,23 +112,31 @@ for tile_name, tile_data in database["tiles"].items(): database["segments"][segment_name]["words"] = 2 if k == 0: - database["segments"][segment_name]["tiles"] = [tile_name, interface_tile_name, int_tile_name] + database["segments"][segment_name]["tiles"] = [ + tile_name, interface_tile_name, int_tile_name + ] database["tiles"][tile_name]["segment"] = segment_name - database["tiles"][interface_tile_name]["segment"] = segment_name + database["tiles"][interface_tile_name][ + "segment"] = segment_name database["tiles"][int_tile_name]["segment"] = segment_name else: - database["segments"][segment_name]["tiles"] = [interface_tile_name, int_tile_name] - database["tiles"][interface_tile_name]["segment"] = segment_name + database["segments"][segment_name]["tiles"] = [ + interface_tile_name, int_tile_name + ] + database["tiles"][interface_tile_name][ + "segment"] = segment_name database["tiles"][int_tile_name]["segment"] = segment_name - ####################################### # Populate segment base addresses: L/R along INT column for segment_name in database["segments"].keys(): if "baseaddr" in database["segments"][segment_name]: framebase, wordbase = database["segments"][segment_name]["baseaddr"] - inttile = [tile for tile in database["segments"][segment_name]["tiles"] if database["tiles"][tile]["type"] in ["INT_L", "INT_R"]][0] + inttile = [ + tile for tile in database["segments"][segment_name]["tiles"] + if database["tiles"][tile]["type"] in ["INT_L", "INT_R"] + ][0] grid_x = database["tiles"][inttile]["grid_x"] grid_y = database["tiles"][inttile]["grid_y"] @@ -156,11 +164,12 @@ for segment_name in database["segments"].keys(): seg = database["tiles"][tile]["segment"] if "baseaddr" in database["segments"][seg]: - assert database["segments"][seg]["baseaddr"] == [framebase, wordbase] + assert database["segments"][seg]["baseaddr"] == [ + framebase, wordbase + ] else: database["segments"][seg]["baseaddr"] = [framebase, wordbase] - ####################################### # Populate segment base addresses: Up along INT/HCLK columns @@ -172,7 +181,10 @@ for segment_name in database["segments"].keys(): for segment_name in start_segments: framebase, wordbase = database["segments"][segment_name]["baseaddr"] - inttile = [tile for tile in database["segments"][segment_name]["tiles"] if database["tiles"][tile]["type"] in ["INT_L", "INT_R"]][0] + inttile = [ + tile for tile in database["segments"][segment_name]["tiles"] + if database["tiles"][tile]["type"] in ["INT_L", "INT_R"] + ][0] grid_x = database["tiles"][inttile]["grid_x"] grid_y = database["tiles"][inttile]["grid_y"] @@ -187,9 +199,7 @@ for segment_name in start_segments: segname = database["tiles"][tiles_by_grid[(grid_x, grid_y)]]["segment"] database["segments"][segname]["baseaddr"] = [framebase, wordbase] - ####################################### # Write print(json.dumps(database, sort_keys=True, indent="\t")) - diff --git a/fuzzers/010-lutinit/generate.py b/fuzzers/010-lutinit/generate.py index 8fcdc73b..b023af44 100644 --- a/fuzzers/010-lutinit/generate.py +++ b/fuzzers/010-lutinit/generate.py @@ -22,4 +22,3 @@ with open("design_%s.txt" % sys.argv[1], "r") as f: segmk.compile() segmk.write(sys.argv[1]) - diff --git a/fuzzers/011-ffconfig/generate.py b/fuzzers/011-ffconfig/generate.py index 6329e7d6..3510e0f9 100644 --- a/fuzzers/011-ffconfig/generate.py +++ b/fuzzers/011-ffconfig/generate.py @@ -1,5 +1,4 @@ #!/usr/bin/env python3 - ''' FDCE Primitive: D Flip-Flop with Clock Enable and Asynchronous Clear FDPE Primitive: D Flip-Flop with Clock Enable and Asynchronous Preset @@ -18,6 +17,7 @@ from segmaker import segmaker segmk = segmaker("design.bits") + def ones(l): #return l + [x + '_1' for x in l] #return sorted(l + [x + '_1' for x in l]) @@ -27,6 +27,7 @@ def ones(l): ret.append(x + '_1') return ret + def loadtop(): ''' i,prim,loc,bel @@ -39,17 +40,20 @@ def loadtop(): f.readline() ret = {} for l in f: - i,prim,loc,bel,init = l.split(",") + i, prim, loc, bel, init = l.split(",") i = int(i) init = int(init) - ret[loc] = (i,prim,loc,bel,init) + ret[loc] = (i, prim, loc, bel, init) return ret + top = loadtop() + def vs2i(s): return {"1'b0": 0, "1'b1": 1}[s] + print("Loading tags from design.txt") with open("design.txt", "r") as f: for line in f: @@ -98,23 +102,21 @@ with open("design.txt", "r") as f: # Synchronous vs asynchronous FF # Unlike most bits, shared between all CLB FFs - segmk.addtag(site, "FFSYNC", - cel_prim in ('FDSE', 'FDRE')) + segmk.addtag(site, "FFSYNC", cel_prim in ('FDSE', 'FDRE')) # Latch bit # Only applies to LUT6 (non-5) FF's if not is5: segmk.addtag(site, "LATCH", isl(cel_prim)) - ''' On name: The primitives you listed have a control input to set the FF value to zero (clear/reset), the other three primitives have a control input that sets the FF value to one. Z => inversion ''' - segmk.addtag(site, "%s.ZRST" % ff_name, + segmk.addtag( + site, "%s.ZRST" % ff_name, cel_prim in ('FDRE', 'FDCE', 'LDCE')) segmk.compile() segmk.write() - diff --git a/fuzzers/011-ffconfig/prims.py b/fuzzers/011-ffconfig/prims.py index 127c07e8..11f40c22 100644 --- a/fuzzers/011-ffconfig/prims.py +++ b/fuzzers/011-ffconfig/prims.py @@ -7,8 +7,10 @@ def ones(l): ret.append(x + '_1') return ret + # The complete primitive sets -ffprims_fall = ones([ +ffprims_fall = ones( + [ 'FD', 'FDC', 'FDCE', @@ -19,46 +21,48 @@ ffprims_fall = ones([ 'FDRE', 'FDS', 'FDSE', - ]) + ]) ffprims_lall = ones([ - 'LDC', - 'LDCE', - 'LDE', - 'LDPE', - 'LDP', - ]) + 'LDC', + 'LDCE', + 'LDE', + 'LDPE', + 'LDP', +]) # Base primitives ffprims_f = [ - 'FDRE', - 'FDSE', - 'FDCE', - 'FDPE', - ] + 'FDRE', + 'FDSE', + 'FDCE', + 'FDPE', +] ffprims_l = [ - 'LDCE', - 'LDPE', - ] + 'LDCE', + 'LDPE', +] ffprims = ffprims_f + ffprims_l + def isff(prim): return prim.startswith("FD") + def isl(prim): return prim.startswith("LD") + ff_bels_5 = [ - 'A5FF', - 'B5FF', - 'C5FF', - 'D5FF', - ] + 'A5FF', + 'B5FF', + 'C5FF', + 'D5FF', +] ff_bels_ffl = [ - 'AFF', - 'BFF', - 'CFF', - 'DFF', - ] + 'AFF', + 'BFF', + 'CFF', + 'DFF', +] ff_bels = ff_bels_ffl + ff_bels_5 #ff_bels = ff_bels_ffl - diff --git a/fuzzers/011-ffconfig/top.py b/fuzzers/011-ffconfig/top.py index f3a5a06e..5cd402fd 100644 --- a/fuzzers/011-ffconfig/top.py +++ b/fuzzers/011-ffconfig/top.py @@ -5,14 +5,18 @@ import re from prims import * + def slice_xy(): '''Return (X1, X2), (Y1, Y2) from XRAY_ROI, exclusive end (for xrange)''' # SLICE_X12Y100:SLICE_X27Y149 # Note XRAY_ROI_GRID_* is something else - m = re.match(r'SLICE_X([0-9]*)Y([0-9]*):SLICE_X([0-9]*)Y([0-9]*)', os.getenv('XRAY_ROI')) + m = re.match( + r'SLICE_X([0-9]*)Y([0-9]*):SLICE_X([0-9]*)Y([0-9]*)', + os.getenv('XRAY_ROI')) ms = [int(m.group(i + 1)) for i in range(4)] return ((ms[0], ms[2] + 1), (ms[1], ms[3] + 1)) + CLBN = 600 SLICEX, SLICEY = slice_xy() # 800 @@ -25,15 +29,18 @@ print('//Requested CLBs: %s' % str(CLBN)) f = open("top.txt", "w") f.write("i,prim,loc,bel,init\n") + def gen_slices(): for slicey in range(*SLICEY): for slicex in range(*SLICEX): yield "SLICE_X%dY%d" % (slicex, slicey) + DIN_N = CLBN * 4 DOUT_N = CLBN * 1 -print(''' +print( + ''' module top(input clk, stb, di, output do); localparam integer DIN_N = %d; localparam integer DOUT_N = %d; @@ -64,7 +71,9 @@ endmodule ''' % (DIN_N, DOUT_N)) slices = gen_slices() -print('module roi(input clk, input [%d:0] din, output [%d:0] dout);' % (DIN_N - 1, DOUT_N - 1)) +print( + 'module roi(input clk, input [%d:0] din, output [%d:0] dout);' % + (DIN_N - 1, DOUT_N - 1)) for i in range(CLBN): ffprim = random.choice(ones(ffprims)) # clb_FD clb_FD (.clk(clk), .din(din[ 0 +: 4]), .dout(dout[ 0])); @@ -78,16 +87,21 @@ for i in range(CLBN): init = random.choice((0, 1)) #bel = "AFF" print(' clb_%s' % ffprim) - print(' #(.LOC("%s"), .BEL("%s"), .INIT(%d))' % (loc, bel, init)) - print(' clb_%d (.clk(clk), .din(din[ %d +: 4]), .dout(dout[ %d]));' % (i, 4 * i, 1 * i)) + print( + ' #(.LOC("%s"), .BEL("%s"), .INIT(%d))' % (loc, bel, init)) + print( + ' clb_%d (.clk(clk), .din(din[ %d +: 4]), .dout(dout[ %d]));' + % (i, 4 * i, 1 * i)) f.write("%d,%s,%s,%s,%d\n" % (i, ffprim, loc, bel, init)) -print('''endmodule +print( + '''endmodule // --------------------------------------------------------------------- ''') -print(''' +print( + ''' module clb_FD (input clk, input [3:0] din, output dout); parameter LOC="SLICE_X16Y100"; parameter BEL="AFF"; @@ -488,4 +502,3 @@ module clb_LDPE_1 (input clk, input [3:0] din, output dout); endmodule ''') - diff --git a/fuzzers/012-clbn5ffmux/generate.py b/fuzzers/012-clbn5ffmux/generate.py index a07efb0c..6c44af1c 100644 --- a/fuzzers/012-clbn5ffmux/generate.py +++ b/fuzzers/012-clbn5ffmux/generate.py @@ -17,7 +17,7 @@ clb_N5FFMUX,SLICE_X14Y100,3,1 f = open('params.csv', 'r') f.readline() for l in f: - module,loc,n,def_a = l.split(',') + module, loc, n, def_a = l.split(',') def_a = int(def_a) n = int(n) #which = chr(ord('A') + n) @@ -30,4 +30,3 @@ for l in f: segmk.addtag(loc, "%c5FF.MUX.B" % which, 1 ^ def_a ^ inv) segmk.compile() segmk.write() - diff --git a/fuzzers/012-clbn5ffmux/top.py b/fuzzers/012-clbn5ffmux/top.py index a712fda5..657df90a 100644 --- a/fuzzers/012-clbn5ffmux/top.py +++ b/fuzzers/012-clbn5ffmux/top.py @@ -3,14 +3,18 @@ random.seed(0) import os import re + def slice_xy(): '''Return (X1, X2), (Y1, Y2) from XRAY_ROI, exclusive end (for xrange)''' # SLICE_X12Y100:SLICE_X27Y149 # Note XRAY_ROI_GRID_* is something else - m = re.match(r'SLICE_X([0-9]*)Y([0-9]*):SLICE_X([0-9]*)Y([0-9]*)', os.getenv('XRAY_ROI')) + m = re.match( + r'SLICE_X([0-9]*)Y([0-9]*):SLICE_X([0-9]*)Y([0-9]*)', + os.getenv('XRAY_ROI')) ms = [int(m.group(i + 1)) for i in range(4)] return ((ms[0], ms[2] + 1), (ms[1], ms[3] + 1)) + CLBN = 40 SLICEX, SLICEY = slice_xy() # 800 @@ -20,15 +24,18 @@ print('//SLICEY: %s' % str(SLICEY)) print('//SLICEN: %s' % str(SLICEN)) print('//Requested CLBs: %s' % str(CLBN)) + def gen_slices(): for slicey in range(*SLICEY): for slicex in range(*SLICEX): yield "SLICE_X%dY%d" % (slicex, slicey) + DIN_N = CLBN * 8 DOUT_N = CLBN * 8 -print(''' +print( + ''' module top(input clk, stb, di, output do); localparam integer DIN_N = %d; localparam integer DOUT_N = %d; @@ -61,7 +68,9 @@ endmodule f = open('params.csv', 'w') f.write('module,loc,n,def_a\n') slices = gen_slices() -print('module roi(input clk, input [%d:0] din, output [%d:0] dout);' % (DIN_N - 1, DOUT_N - 1)) +print( + 'module roi(input clk, input [%d:0] din, output [%d:0] dout);' % + (DIN_N - 1, DOUT_N - 1)) for i in range(CLBN): bel = '' @@ -72,17 +81,21 @@ for i in range(CLBN): print(' %s' % module) print(' #(.LOC("%s"), .N(%d), .DEF_A(%d))' % (loc, n, def_a)) - print(' clb_%d (.clk(clk), .din(din[ %d +: 8]), .dout(dout[ %d +: 8]));' % (i, 8 * i, 8 * i)) + print( + ' clb_%d (.clk(clk), .din(din[ %d +: 8]), .dout(dout[ %d +: 8]));' + % (i, 8 * i, 8 * i)) f.write('%s,%s,%s,%s\n' % (module, loc, n, def_a)) f.close() -print('''endmodule +print( + '''endmodule // --------------------------------------------------------------------- ''') -print(''' +print( + ''' module clb_N5FFMUX (input clk, input [7:0] din, output [7:0] dout); parameter LOC="SLICE_X22Y100"; parameter N=-1; @@ -203,4 +216,3 @@ module clb_N5FFMUX (input clk, input [7:0] din, output [7:0] dout); .D(ffds[0])); endmodule ''') - diff --git a/fuzzers/013-clbncy0/generate.py b/fuzzers/013-clbncy0/generate.py index 64ddd636..b3703363 100644 --- a/fuzzers/013-clbncy0/generate.py +++ b/fuzzers/013-clbncy0/generate.py @@ -17,7 +17,7 @@ clb_NCY0_O5,SLICE_X17Y100,A6LUT,2 f = open('params.csv', 'r') f.readline() for l in f: - module,loc,bel,n = l.split(',') + module, loc, bel, n = l.split(',') n = int(n) # A, B, etc which = bel[0] @@ -26,4 +26,3 @@ for l in f: segmk.addtag(loc, "CARRY4.%cCY0" % which, module == 'clb_NCY0_O5') segmk.compile() segmk.write() - diff --git a/fuzzers/013-clbncy0/top.py b/fuzzers/013-clbncy0/top.py index 254e9461..174385c3 100644 --- a/fuzzers/013-clbncy0/top.py +++ b/fuzzers/013-clbncy0/top.py @@ -3,14 +3,18 @@ random.seed(0) import os import re + def slice_xy(): '''Return (X1, X2), (Y1, Y2) from XRAY_ROI, exclusive end (for xrange)''' # SLICE_X12Y100:SLICE_X27Y149 # Note XRAY_ROI_GRID_* is something else - m = re.match(r'SLICE_X([0-9]*)Y([0-9]*):SLICE_X([0-9]*)Y([0-9]*)', os.getenv('XRAY_ROI')) + m = re.match( + r'SLICE_X([0-9]*)Y([0-9]*):SLICE_X([0-9]*)Y([0-9]*)', + os.getenv('XRAY_ROI')) ms = [int(m.group(i + 1)) for i in range(4)] return ((ms[0], ms[2] + 1), (ms[1], ms[3] + 1)) + CLBN = 400 SLICEX, SLICEY = slice_xy() # 800 @@ -20,17 +24,20 @@ print('//SLICEY: %s' % str(SLICEY)) print('//SLICEN: %s' % str(SLICEN)) print('//Requested CLBs: %s' % str(CLBN)) + def gen_slices(): for slicey in range(*SLICEY): for slicex in range(*SLICEX): yield "SLICE_X%dY%d" % (slicex, slicey) + DIN_N = CLBN * 8 DOUT_N = CLBN * 8 lut_bels = ['A6LUT', 'B6LUT', 'C6LUT', 'D6LUT'] -print(''' +print( + ''' module top(input clk, stb, di, output do); localparam integer DIN_N = %d; localparam integer DOUT_N = %d; @@ -63,7 +70,9 @@ endmodule f = open('params.csv', 'w') f.write('module,loc,bel,n\n') slices = gen_slices() -print('module roi(input clk, input [%d:0] din, output [%d:0] dout);' % (DIN_N - 1, DOUT_N - 1)) +print( + 'module roi(input clk, input [%d:0] din, output [%d:0] dout);' % + (DIN_N - 1, DOUT_N - 1)) for i in range(CLBN): bel = '' @@ -77,17 +86,21 @@ for i in range(CLBN): print(' %s' % module) print(' #(.LOC("%s"), .BEL("%s"), .N(%d))' % (loc, bel, n)) - print(' clb_%d (.clk(clk), .din(din[ %d +: 8]), .dout(dout[ %d +: 8]));' % (i, 8 * i, 8 * i)) + print( + ' clb_%d (.clk(clk), .din(din[ %d +: 8]), .dout(dout[ %d +: 8]));' + % (i, 8 * i, 8 * i)) f.write('%s,%s,%s,%s\n' % (module, loc, bel, n)) f.close() -print('''endmodule +print( + '''endmodule // --------------------------------------------------------------------- ''') -print(''' +print( + ''' module clb_NCY0_MX (input clk, input [7:0] din, output [7:0] dout); parameter LOC="SLICE_X16Y129_FIXME"; parameter BEL="A6LUT_FIXME"; @@ -156,4 +169,3 @@ module clb_NCY0_O5 (input clk, input [7:0] din, output [7:0] dout); CARRY4 carry4(.O(o), .CO(), .DI(di), .S(s), .CYINIT(1'b0), .CI()); endmodule ''') - diff --git a/fuzzers/014-ffsrcemux/generate.py b/fuzzers/014-ffsrcemux/generate.py index ce577863..befda57c 100644 --- a/fuzzers/014-ffsrcemux/generate.py +++ b/fuzzers/014-ffsrcemux/generate.py @@ -17,7 +17,7 @@ clb_FDRE,SLICE_X14Y100,1,1 f = open('params.csv', 'r') f.readline() for l in f: - name,site,ce,r = l.split(',') + name, site, ce, r = l.split(',') ce = int(ce) r = int(r) @@ -30,4 +30,3 @@ for l in f: segmk.addtag(site, "SRUSEDMUX", r) segmk.compile() segmk.write() - diff --git a/fuzzers/014-ffsrcemux/top.py b/fuzzers/014-ffsrcemux/top.py index d87dc6ce..115c02cc 100644 --- a/fuzzers/014-ffsrcemux/top.py +++ b/fuzzers/014-ffsrcemux/top.py @@ -3,14 +3,18 @@ random.seed(0) import os import re + def slice_xy(): '''Return (X1, X2), (Y1, Y2) from XRAY_ROI, exclusive end (for xrange)''' # SLICE_X12Y100:SLICE_X27Y149 # Note XRAY_ROI_GRID_* is something else - m = re.match(r'SLICE_X([0-9]*)Y([0-9]*):SLICE_X([0-9]*)Y([0-9]*)', os.getenv('XRAY_ROI')) + m = re.match( + r'SLICE_X([0-9]*)Y([0-9]*):SLICE_X([0-9]*)Y([0-9]*)', + os.getenv('XRAY_ROI')) ms = [int(m.group(i + 1)) for i in range(4)] return ((ms[0], ms[2] + 1), (ms[1], ms[3] + 1)) + CLBN = 600 SLICEX, SLICEY = slice_xy() # 800 @@ -20,28 +24,29 @@ print('//SLICEY: %s' % str(SLICEY)) print('//SLICEN: %s' % str(SLICEN)) print('//Requested CLBs: %s' % str(CLBN)) + def gen_slices(): for slicey in range(*SLICEY): for slicex in range(*SLICEX): yield "SLICE_X%dY%d" % (slicex, slicey) + DIN_N = CLBN * 4 DOUT_N = CLBN * 1 -ffprims = ( - 'FDRE', -) +ffprims = ('FDRE', ) ff_bels = ( - 'AFF', - 'A5FF', - 'BFF', - 'B5FF', - 'CFF', - 'C5FF', - 'DFF', - 'D5FF', - ) + 'AFF', + 'A5FF', + 'BFF', + 'B5FF', + 'CFF', + 'C5FF', + 'DFF', + 'D5FF', +) -print(''' +print( + ''' module top(input clk, stb, di, output do); localparam integer DIN_N = %d; localparam integer DOUT_N = %d; @@ -74,7 +79,9 @@ endmodule f = open('params.csv', 'w') f.write('name,loc,ce,r\n') slices = gen_slices() -print('module roi(input clk, input [%d:0] din, output [%d:0] dout);' % (DIN_N - 1, DOUT_N - 1)) +print( + 'module roi(input clk, input [%d:0] din, output [%d:0] dout);' % + (DIN_N - 1, DOUT_N - 1)) for i in range(CLBN): ffprim = random.choice(ffprims) force_ce = random.randint(0, 1) @@ -86,17 +93,23 @@ for i in range(CLBN): bel = "AFF" name = 'clb_%s' % ffprim print(' %s' % name) - print(' #(.LOC("%s"), .BEL("%s"), .FORCE_CE1(%d), .nFORCE_R0(%d))' % (loc, bel, force_ce, force_r)) - print(' clb_%d (.clk(clk), .din(din[ %d +: 4]), .dout(dout[ %d]));' % (i, 4 * i, 1 * i)) + print( + ' #(.LOC("%s"), .BEL("%s"), .FORCE_CE1(%d), .nFORCE_R0(%d))' + % (loc, bel, force_ce, force_r)) + print( + ' clb_%d (.clk(clk), .din(din[ %d +: 4]), .dout(dout[ %d]));' + % (i, 4 * i, 1 * i)) f.write('%s,%s,%s,%s\n' % (name, loc, force_ce, force_r)) f.close() -print('''endmodule +print( + '''endmodule // --------------------------------------------------------------------- ''') -print(''' +print( + ''' module clb_FDRE (input clk, input [3:0] din, output dout); parameter LOC="SLICE_X16Y114"; parameter BEL="AFF"; @@ -112,4 +125,3 @@ module clb_FDRE (input clk, input [3:0] din, output dout); ); endmodule ''') - diff --git a/fuzzers/015-clbnffmux/generate.py b/fuzzers/015-clbnffmux/generate.py index 68eafb94..38fd2a80 100644 --- a/fuzzers/015-clbnffmux/generate.py +++ b/fuzzers/015-clbnffmux/generate.py @@ -18,12 +18,11 @@ clb_NFFMUX_O6,SLICE_X14Y100,3 f = open('params.csv', 'r') f.readline() for l in f: - module,loc,n = l.split(',') + module, loc, n = l.split(',') n = int(n) which = chr(ord('A') + n) # clb_NFFMUX_AX => AX src = module.replace('clb_NFFMUX_', '') - ''' AFFMUX 30_00 30_01 30_02 30_03 @@ -69,11 +68,12 @@ for loc, muxes in cache.items(): tag = "%sFF.DMUX.%s" % (which, src) segmk.addtag(loc, tag, 0) + # we know that all bits for those MUXes are in frames 30 and 31, so filter all other bits def bitfilter(frame_idx, bit_idx): assert os.getenv("XRAY_DATABASE") == "artix7" return frame_idx in [30, 31] + segmk.compile(bitfilter=bitfilter) segmk.write() - diff --git a/fuzzers/015-clbnffmux/top.py b/fuzzers/015-clbnffmux/top.py index abd0ef97..1c0b1343 100644 --- a/fuzzers/015-clbnffmux/top.py +++ b/fuzzers/015-clbnffmux/top.py @@ -3,14 +3,18 @@ random.seed(0) import os import re + def slice_xy(): '''Return (X1, X2), (Y1, Y2) from XRAY_ROI, exclusive end (for xrange)''' # SLICE_X12Y100:SLICE_X27Y149 # Note XRAY_ROI_GRID_* is something else - m = re.match(r'SLICE_X([0-9]*)Y([0-9]*):SLICE_X([0-9]*)Y([0-9]*)', os.getenv('XRAY_ROI')) + m = re.match( + r'SLICE_X([0-9]*)Y([0-9]*):SLICE_X([0-9]*)Y([0-9]*)', + os.getenv('XRAY_ROI')) ms = [int(m.group(i + 1)) for i in range(4)] return ((ms[0], ms[2] + 1), (ms[1], ms[3] + 1)) + CLBN = 400 SLICEX, SLICEY = slice_xy() # 800 @@ -20,15 +24,18 @@ print('//SLICEY: %s' % str(SLICEY)) print('//SLICEN: %s' % str(SLICEN)) print('//Requested CLBs: %s' % str(CLBN)) + def gen_slices(): for slicey in range(*SLICEY): for slicex in range(*SLICEX): yield "SLICE_X%dY%d" % (slicex, slicey) + DIN_N = CLBN * 8 DOUT_N = CLBN * 8 -print(''' +print( + ''' module top(input clk, stb, di, output do); localparam integer DIN_N = %d; localparam integer DOUT_N = %d; @@ -61,9 +68,13 @@ endmodule f = open('params.csv', 'w') f.write('module,loc,n\n') slices = gen_slices() -print('module roi(input clk, input [%d:0] din, output [%d:0] dout);' % (DIN_N - 1, DOUT_N - 1)) +print( + 'module roi(input clk, input [%d:0] din, output [%d:0] dout);' % + (DIN_N - 1, DOUT_N - 1)) for i in range(CLBN): - modules = ['clb_NFFMUX_' + x for x in ['AX', 'CY', 'F78', 'O5', 'O6', 'XOR']] + modules = [ + 'clb_NFFMUX_' + x for x in ['AX', 'CY', 'F78', 'O5', 'O6', 'XOR'] + ] module = random.choice(modules) if module == 'clb_NFFMUX_F78': @@ -75,17 +86,21 @@ for i in range(CLBN): print(' %s' % module) print(' #(.LOC("%s"), .N(%d))' % (loc, n)) - print(' clb_%d (.clk(clk), .din(din[ %d +: 8]), .dout(dout[ %d +: 8]));' % (i, 8 * i, 8 * i)) + print( + ' clb_%d (.clk(clk), .din(din[ %d +: 8]), .dout(dout[ %d +: 8]));' + % (i, 8 * i, 8 * i)) f.write('%s,%s,%s\n' % (module, loc, n)) f.close() -print('''endmodule +print( + '''endmodule // --------------------------------------------------------------------- ''') -print(''' +print( + ''' module myLUT8 (input clk, input [7:0] din, output lut8o, output lut7bo, output lut7ao, //caro: XOR additional result (main output) @@ -330,4 +345,3 @@ module clb_NFFMUX_XOR (input clk, input [7:0] din, output [7:0] dout); .ff_d(caro)); endmodule ''') - diff --git a/fuzzers/016-clbnoutmux/generate.py b/fuzzers/016-clbnoutmux/generate.py index ea078cb4..7c8dda15 100644 --- a/fuzzers/016-clbnoutmux/generate.py +++ b/fuzzers/016-clbnoutmux/generate.py @@ -18,12 +18,11 @@ clb_NFFMUX_O6,SLICE_X14Y100,3 f = open('params.csv', 'r') f.readline() for l in f: - module,loc,n = l.split(',') + module, loc, n = l.split(',') n = int(n) which = chr(ord('A') + n) # clb_NFFMUX_AX => AX src = module.replace('clb_NOUTMUX_', '') - ''' BOUTMUX 30_20 30_21 30_22 30_23 @@ -69,6 +68,7 @@ for loc, muxes in cache.items(): tag = "%sMUX.%s" % (which, src) segmk.addtag(loc, tag, 0) + def bitfilter(frame_idx, bit_idx): assert os.getenv("XRAY_DATABASE") == "artix7" @@ -76,15 +76,20 @@ def bitfilter(frame_idx, bit_idx): # in this fuzzer we get some aliasing with those bits, so we have to manually exclude # them. (Maybe FIXME: read the bit locations from the database files) if (frame_idx, bit_idx) in [ - (30, 55), (31, 55), # D5MA - (31, 44), (31, 45), # C5MA - (30, 19), (31, 19), # B5MA - (30, 9), (31, 8), # A5MA - ]: return False + (30, 55), + (31, 55), # D5MA + (31, 44), + (31, 45), # C5MA + (30, 19), + (31, 19), # B5MA + (30, 9), + (31, 8), # A5MA + ]: + return False # we know that all bits for those MUXes are in frames 30 and 31, so filter all other bits return frame_idx in [30, 31] + segmk.compile(bitfilter=bitfilter) segmk.write() - diff --git a/fuzzers/016-clbnoutmux/top.py b/fuzzers/016-clbnoutmux/top.py index 11c3043c..f0079d66 100644 --- a/fuzzers/016-clbnoutmux/top.py +++ b/fuzzers/016-clbnoutmux/top.py @@ -3,14 +3,18 @@ random.seed(0) import os import re + def slice_xy(): '''Return (X1, X2), (Y1, Y2) from XRAY_ROI, exclusive end (for xrange)''' # SLICE_X12Y100:SLICE_X27Y149 # Note XRAY_ROI_GRID_* is something else - m = re.match(r'SLICE_X([0-9]*)Y([0-9]*):SLICE_X([0-9]*)Y([0-9]*)', os.getenv('XRAY_ROI')) + m = re.match( + r'SLICE_X([0-9]*)Y([0-9]*):SLICE_X([0-9]*)Y([0-9]*)', + os.getenv('XRAY_ROI')) ms = [int(m.group(i + 1)) for i in range(4)] return ((ms[0], ms[2] + 1), (ms[1], ms[3] + 1)) + CLBN = 400 SLICEX, SLICEY = slice_xy() # 800 @@ -20,15 +24,18 @@ print('//SLICEY: %s' % str(SLICEY)) print('//SLICEN: %s' % str(SLICEN)) print('//Requested CLBs: %s' % str(CLBN)) + def gen_slices(): for slicey in range(*SLICEY): for slicex in range(*SLICEX): yield "SLICE_X%dY%d" % (slicex, slicey) + DIN_N = CLBN * 8 DOUT_N = CLBN * 8 -print(''' +print( + ''' module top(input clk, stb, di, output do); localparam integer DIN_N = %d; localparam integer DOUT_N = %d; @@ -61,7 +68,9 @@ endmodule f = open('params.csv', 'w') f.write('module,loc,n\n') slices = gen_slices() -print('module roi(input clk, input [%d:0] din, output [%d:0] dout);' % (DIN_N - 1, DOUT_N - 1)) +print( + 'module roi(input clk, input [%d:0] din, output [%d:0] dout);' % + (DIN_N - 1, DOUT_N - 1)) for i in range(CLBN): # Don't have an O6 example modules = ['clb_NOUTMUX_' + x for x in ['CY', 'F78', 'O5', 'XOR', 'B5Q']] @@ -76,17 +85,21 @@ for i in range(CLBN): print(' %s' % module) print(' #(.LOC("%s"), .N(%d))' % (loc, n)) - print(' clb_%d (.clk(clk), .din(din[ %d +: 8]), .dout(dout[ %d +: 8]));' % (i, 8 * i, 8 * i)) + print( + ' clb_%d (.clk(clk), .din(din[ %d +: 8]), .dout(dout[ %d +: 8]));' + % (i, 8 * i, 8 * i)) f.write('%s,%s,%s\n' % (module, loc, n)) f.close() -print('''endmodule +print( + '''endmodule // --------------------------------------------------------------------- ''') -print(''' +print( + ''' module myLUT8 (input clk, input [7:0] din, output lut8o, output lut7bo, output lut7ao, //caro: XOR additional result (main output) @@ -305,4 +318,3 @@ module clb_NOUTMUX_B5Q (input clk, input [7:0] din, output [7:0] dout); .ff_q(dout[0])); endmodule ''') - diff --git a/fuzzers/017-clbprecyinit/generate.py b/fuzzers/017-clbprecyinit/generate.py index d39d743f..5da0f0b9 100644 --- a/fuzzers/017-clbprecyinit/generate.py +++ b/fuzzers/017-clbprecyinit/generate.py @@ -11,10 +11,9 @@ print("Loading tags") f = open('params.csv', 'r') f.readline() for l in f: - module,loc,loc2 = l.split(',') + module, loc, loc2 = l.split(',') # clb_PRECYINIT_AX => AX src = module.replace('clb_PRECYINIT_', '') - ''' PRECYINIT 00_12 30_14 30_13 @@ -29,4 +28,3 @@ for l in f: segmk.compile() segmk.write() - diff --git a/fuzzers/017-clbprecyinit/top.py b/fuzzers/017-clbprecyinit/top.py index 0b7abeb8..908b65a0 100644 --- a/fuzzers/017-clbprecyinit/top.py +++ b/fuzzers/017-clbprecyinit/top.py @@ -3,14 +3,18 @@ random.seed(0) import os import re + def slice_xy(): '''Return (X1, X2), (Y1, Y2) from XRAY_ROI, exclusive end (for xrange)''' # SLICE_X12Y100:SLICE_X27Y149 # Note XRAY_ROI_GRID_* is something else - m = re.match(r'SLICE_X([0-9]*)Y([0-9]*):SLICE_X([0-9]*)Y([0-9]*)', os.getenv('XRAY_ROI')) + m = re.match( + r'SLICE_X([0-9]*)Y([0-9]*):SLICE_X([0-9]*)Y([0-9]*)', + os.getenv('XRAY_ROI')) ms = [int(m.group(i + 1)) for i in range(4)] return ((ms[0], ms[2] + 1), (ms[1], ms[3] + 1)) + CLBN = 400 SLICEX, SLICEY = slice_xy() # 800 @@ -20,6 +24,7 @@ print('//SLICEY: %s' % str(SLICEY)) print('//SLICEN: %s' % str(SLICEN)) print('//Requested CLBs: %s' % str(CLBN)) + # Rearranged to sweep Y so that carry logic is easy to allocate # XXX: careful...if odd number of Y in ROI will break carry def gen_slices(): @@ -28,10 +33,12 @@ def gen_slices(): # caller may reject position if needs more room yield ("SLICE_X%dY%d" % (slicex, slicey), (slicex, slicey)) + DIN_N = CLBN * 8 DOUT_N = CLBN * 8 -print(''' +print( + ''' module top(input clk, stb, di, output do); localparam integer DIN_N = %d; localparam integer DOUT_N = %d; @@ -64,7 +71,9 @@ endmodule f = open('params.csv', 'w') f.write('module,loc,loc2\n') slices = gen_slices() -print('module roi(input clk, input [%d:0] din, output [%d:0] dout);' % (DIN_N - 1, DOUT_N - 1)) +print( + 'module roi(input clk, input [%d:0] din, output [%d:0] dout);' % + (DIN_N - 1, DOUT_N - 1)) for i in range(CLBN): # Don't have an O6 example modules = ['clb_PRECYINIT_' + x for x in ['0', '1', 'AX', 'CIN']] @@ -88,17 +97,21 @@ for i in range(CLBN): print(' %s' % module) print(' #(%s)' % (params)) - print(' clb_%d (.clk(clk), .din(din[ %d +: 8]), .dout(dout[ %d +: 8]));' % (i, 8 * i, 8 * i)) + print( + ' clb_%d (.clk(clk), .din(din[ %d +: 8]), .dout(dout[ %d +: 8]));' + % (i, 8 * i, 8 * i)) f.write('%s,%s\n' % (module, paramsc)) f.close() -print('''endmodule +print( + '''endmodule // --------------------------------------------------------------------- ''') -print(''' +print( + ''' module clb_PRECYINIT_0 (input clk, input [7:0] din, output [7:0] dout); parameter LOC="SLICE_FIXME"; @@ -134,4 +147,3 @@ module clb_PRECYINIT_CIN (input clk, input [7:0] din, output [7:0] dout); CARRY4 carry4_ci(.O(), .CO(co), .DI(din[3:0]), .S(din[7:4]), .CYINIT(1'b0), .CI()); endmodule ''') - diff --git a/fuzzers/018-clbram/generate.py b/fuzzers/018-clbram/generate.py index c3c6d118..88b99c81 100644 --- a/fuzzers/018-clbram/generate.py +++ b/fuzzers/018-clbram/generate.py @@ -12,12 +12,12 @@ segmk = segmaker("design.bits") multi_bels_by = [ 'SRL16E', 'SRLC32E', - ] +] # Not BELable multi_bels_bn = [ 'RAM32X1S', 'RAM64X1S', - ] +] # Those requiring special resources # Just make one per module @@ -25,7 +25,7 @@ greedy_modules = [ 'my_RAM128X1D', 'my_RAM128X1S', 'my_RAM256X1S', - ] +] print("Loading tags") ''' @@ -38,9 +38,11 @@ f = open('params.csv', 'r') f.readline() for l in f: l = l.strip() - module,loc,p0,p1,p2,p3 = l.split(',') + module, loc, p0, p1, p2, p3 = l.split(',') - segmk.addtag(loc, "WA7USED", module in ('my_RAM128X1D', 'my_RAM128X1S', 'my_RAM256X1S')) + segmk.addtag( + loc, "WA7USED", + module in ('my_RAM128X1D', 'my_RAM128X1S', 'my_RAM256X1S')) segmk.addtag(loc, "WA8USED", module == 'my_RAM256X1S') # (a, b, c, d) @@ -53,7 +55,7 @@ for l in f: if module == 'my_ram_N': # Each one of: SRL16E, SRLC32E, LUT6 - bels = [p0,p1,p2,p3] + bels = [p0, p1, p2, p3] # Clock Enable (CE) clock gate only enabled if we have clocked elements # A pure LUT6 does not, but everything else should @@ -82,15 +84,16 @@ for l in f: (1, 0, 0, 1), (1, 1, 0, 1), (1, 1, 1, 1), - ] + ] # Uses CD first pack2 = [ (0, 0, 1, 1), (1, 1, 1, 1), - ] + ] # Always use all 4 sites - if module in ('my_RAM32M', 'my_RAM64M', 'my_RAM128X1D', 'my_RAM256X1S'): + if module in ('my_RAM32M', 'my_RAM64M', 'my_RAM128X1D', + 'my_RAM256X1S'): ram = [1, 1, 1, 1] # Only can occupy CD I guess elif module == 'my_RAM32X1D': @@ -102,13 +105,13 @@ for l in f: elif module in ('my_RAM32X1S_N', 'my_RAM64X1S_N'): ram = pack4[n - 1] else: - assert(0) + assert (0) # All entries here requiare D - assert(ram[3]) + assert (ram[3]) if module == 'my_RAM32X1D': - # Occupies CD + # Occupies CD size[2] = 1 size[3] = 1 elif module == 'my_RAM32M': @@ -116,7 +119,7 @@ for l in f: elif module == 'my_RAM32X1S_N': size = pack4[n - 1] else: - assert(not module.startswith('my_RAM32')) + assert (not module.startswith('my_RAM32')) # Now commit bits after marking 1's for beli, bel in enumerate('ABCD'): @@ -125,12 +128,13 @@ for l in f: # FIXME module == segmk.addtag(loc, "%sLUT.SMALL" % bel, size[beli]) + def bitfilter(frame_idx, bit_idx): # Hack to remove aliased PIP bits on CE # We should either mix up routing more or exclude previous DB entries assert os.getenv("XRAY_DATABASE") == "artix7" return (frame_idx, bit_idx) not in [(0, 27), (1, 25), (1, 26), (1, 29)] + segmk.compile(bitfilter=bitfilter) segmk.write() - diff --git a/fuzzers/018-clbram/top.py b/fuzzers/018-clbram/top.py index f1864364..b2cac6c7 100644 --- a/fuzzers/018-clbram/top.py +++ b/fuzzers/018-clbram/top.py @@ -20,14 +20,18 @@ random.seed(0) import os import re + def slice_xy(): '''Return (X1, X2), (Y1, Y2) from XRAY_ROI, exclusive end (for xrange)''' # SLICE_X12Y100:SLICE_X27Y149 # Note XRAY_ROI_GRID_* is something else - m = re.match(r'SLICE_X([0-9]*)Y([0-9]*):SLICE_X([0-9]*)Y([0-9]*)', os.getenv('XRAY_ROI')) + m = re.match( + r'SLICE_X([0-9]*)Y([0-9]*):SLICE_X([0-9]*)Y([0-9]*)', + os.getenv('XRAY_ROI')) ms = [int(m.group(i + 1)) for i in range(4)] return ((ms[0], ms[2] + 1), (ms[1], ms[3] + 1)) + CLBN = 50 SLICEX, SLICEY = slice_xy() # 800 @@ -37,6 +41,7 @@ print('//SLICEY: %s' % str(SLICEY)) print('//SLICEN: %s' % str(SLICEN)) print('//Requested CLBs: %s' % str(CLBN)) + # Rearranged to sweep Y so that carry logic is easy to allocate # XXX: careful...if odd number of Y in ROI will break carry def gen_slicems(): @@ -50,7 +55,7 @@ def gen_slicems(): x = 6, 8, 10, 12, 14 ''' # TODO: generate this from DB - assert((12, 28) == SLICEX) + assert ((12, 28) == SLICEX) for slicex in (12, 14): for slicey in range(*SLICEY): # caller may reject position if needs more room @@ -61,7 +66,8 @@ def gen_slicems(): DIN_N = CLBN * 8 DOUT_N = CLBN * 8 -print(''' +print( + ''' module top(input clk, stb, di, output do); localparam integer DIN_N = %d; localparam integer DOUT_N = %d; @@ -94,7 +100,9 @@ endmodule f = open('params.csv', 'w') f.write('module,loc,bela,belb,belc,beld\n') slices = gen_slicems() -print('module roi(input clk, input [%d:0] din, output [%d:0] dout);' % (DIN_N - 1, DOUT_N - 1)) +print( + 'module roi(input clk, input [%d:0] din, output [%d:0] dout);' % + (DIN_N - 1, DOUT_N - 1)) randluts = 0 for clbi in range(CLBN): loc = next(slices) @@ -113,7 +121,7 @@ for clbi in range(CLBN): 'SRL16E', 'SRLC32E', 'LUT6', - ] + ] bels = [] for beli in range(4): @@ -135,16 +143,16 @@ for clbi in range(CLBN): else: modules = [ # (module, N max, FF opt) - ('my_RAM32X1S_N', 4, 0), - ('my_RAM32X1D', None, 0), - ('my_RAM32M', None, 0), - ('my_RAM64X1S_N', 4, 0), - ('my_RAM64X1D_N', 2, 0), - ('my_RAM64M', None, 0), - ('my_RAM128X1S_N', 2, 1), - ('my_RAM128X1D', None, 1), - ('my_RAM256X1S', None, 1), - ] + ('my_RAM32X1S_N', 4, 0), + ('my_RAM32X1D', None, 0), + ('my_RAM32M', None, 0), + ('my_RAM64X1S_N', 4, 0), + ('my_RAM64X1D_N', 2, 0), + ('my_RAM64M', None, 0), + ('my_RAM128X1S_N', 2, 1), + ('my_RAM128X1D', None, 1), + ('my_RAM256X1S', None, 1), + ] module, nmax, ff_param = random.choice(modules) @@ -165,17 +173,21 @@ for clbi in range(CLBN): print(' %s' % module) print(' #(.LOC("%s")%s)' % (loc, params)) - print(' clb_%d (.clk(clk), .din(din[ %d +: 8]), .dout(dout[ %d +: 8]));' % (clbi, 8 * clbi, 8 * clbi)) + print( + ' clb_%d (.clk(clk), .din(din[ %d +: 8]), .dout(dout[ %d +: 8]));' + % (clbi, 8 * clbi, 8 * clbi)) f.write('%s,%s%s\n' % (module, loc, cparams)) f.close() -print('''endmodule +print( + '''endmodule // --------------------------------------------------------------------- ''') -print(''' +print( + ''' //*************************************************************** //Basic @@ -510,4 +522,3 @@ module my_ram_N (input clk, input [7:0] din, output [7:0] dout); endmodule ''') - diff --git a/fuzzers/019-ndi1mux/generate.py b/fuzzers/019-ndi1mux/generate.py index c0cf1a7f..84738272 100644 --- a/fuzzers/019-ndi1mux/generate.py +++ b/fuzzers/019-ndi1mux/generate.py @@ -23,7 +23,7 @@ f = open('params.csv', 'r') f.readline() for l in f: l = l.strip() - module,loc,c31,b31,a31 = l.split(',') + module, loc, c31, b31, a31 = l.split(',') c31 = int(c31) b31 = int(b31) a31 = int(a31) @@ -33,4 +33,3 @@ for l in f: segmk.compile() segmk.write() - diff --git a/fuzzers/019-ndi1mux/top.py b/fuzzers/019-ndi1mux/top.py index d50c4067..714d38de 100644 --- a/fuzzers/019-ndi1mux/top.py +++ b/fuzzers/019-ndi1mux/top.py @@ -3,14 +3,18 @@ random.seed(0) import os import re + def slice_xy(): '''Return (X1, X2), (Y1, Y2) from XRAY_ROI, exclusive end (for xrange)''' # SLICE_X12Y100:SLICE_X27Y149 # Note XRAY_ROI_GRID_* is something else - m = re.match(r'SLICE_X([0-9]*)Y([0-9]*):SLICE_X([0-9]*)Y([0-9]*)', os.getenv('XRAY_ROI')) + m = re.match( + r'SLICE_X([0-9]*)Y([0-9]*):SLICE_X([0-9]*)Y([0-9]*)', + os.getenv('XRAY_ROI')) ms = [int(m.group(i + 1)) for i in range(4)] return ((ms[0], ms[2] + 1), (ms[1], ms[3] + 1)) + CLBN = 50 SLICEX, SLICEY = slice_xy() # 800 @@ -20,6 +24,7 @@ print('//SLICEY: %s' % str(SLICEY)) print('//SLICEN: %s' % str(SLICEN)) print('//Requested CLBs: %s' % str(CLBN)) + # Rearranged to sweep Y so that carry logic is easy to allocate # XXX: careful...if odd number of Y in ROI will break carry def gen_slicems(): @@ -33,7 +38,7 @@ def gen_slicems(): x = 6, 8, 10, 12, 14 ''' # TODO: generate this from DB - assert((12, 28) == SLICEX) + assert ((12, 28) == SLICEX) for slicex in (12, 14): for slicey in range(*SLICEY): # caller may reject position if needs more room @@ -44,7 +49,8 @@ def gen_slicems(): DIN_N = CLBN * 8 DOUT_N = CLBN * 8 -print(''' +print( + ''' module top(input clk, stb, di, output do); localparam integer DIN_N = %d; localparam integer DOUT_N = %d; @@ -77,7 +83,9 @@ endmodule f = open('params.csv', 'w') f.write('module,loc,c31,b31,a31\n') slices = gen_slicems() -print('module roi(input clk, input [%d:0] din, output [%d:0] dout);' % (DIN_N - 1, DOUT_N - 1)) +print( + 'module roi(input clk, input [%d:0] din, output [%d:0] dout);' % + (DIN_N - 1, DOUT_N - 1)) multis = 0 for clbi in range(CLBN): loc = next(slices) @@ -87,18 +95,24 @@ for clbi in range(CLBN): a31 = random.randint(0, 1) print(' %s' % module) - print(' #(.LOC("%s"), .C31(%d), .B31(%d), .A31(%d))' % (loc, c31, b31, a31)) - print(' clb_%d (.clk(clk), .din(din[ %d +: 8]), .dout(dout[ %d +: 8]));' % (clbi, 8 * clbi, 8 * clbi)) + print( + ' #(.LOC("%s"), .C31(%d), .B31(%d), .A31(%d))' % + (loc, c31, b31, a31)) + print( + ' clb_%d (.clk(clk), .din(din[ %d +: 8]), .dout(dout[ %d +: 8]));' + % (clbi, 8 * clbi, 8 * clbi)) f.write('%s,%s,%d,%d,%d\n' % (module, loc, c31, b31, a31)) f.close() -print('''endmodule +print( + '''endmodule // --------------------------------------------------------------------- ''') -print(''' +print( + ''' module my_NDI1MUX_NI_NMC31 (input clk, input [7:0] din, output [7:0] dout); parameter LOC = "SLICE_X6Y100"; parameter C31 = 0; @@ -159,4 +173,3 @@ module my_NDI1MUX_NI_NMC31 (input clk, input [7:0] din, output [7:0] dout); .D(lutd[0])); endmodule ''') - diff --git a/fuzzers/050-intpips/generate.py b/fuzzers/050-intpips/generate.py index bd2e215c..4e6f261f 100644 --- a/fuzzers/050-intpips/generate.py +++ b/fuzzers/050-intpips/generate.py @@ -22,11 +22,7 @@ with open("design.txt", "r") as f: pdir = int(pdir) if tile not in tiledata: - tiledata[tile] = { - "pips": set(), - "srcs": set(), - "dsts": set() - } + tiledata[tile] = {"pips": set(), "srcs": set(), "dsts": set()} if pip in pipdata: assert pipdata[pip] == (src, dst) @@ -63,4 +59,3 @@ for tile, pips_srcs_dsts in tiledata.items(): segmk.compile() segmk.write() - diff --git a/fuzzers/051-imuxlout/generate.py b/fuzzers/051-imuxlout/generate.py index 876d02c1..36b63abc 100644 --- a/fuzzers/051-imuxlout/generate.py +++ b/fuzzers/051-imuxlout/generate.py @@ -22,11 +22,7 @@ with open("design.txt", "r") as f: pdir = int(pdir) if tile not in tiledata: - tiledata[tile] = { - "pips": set(), - "srcs": set(), - "dsts": set() - } + tiledata[tile] = {"pips": set(), "srcs": set(), "dsts": set()} if pip in pipdata: assert pipdata[pip] == (src, dst) @@ -61,12 +57,13 @@ for tile, pips_srcs_dsts in tiledata.items(): elif src_dst[1] not in dsts: segmk.addtag(tile, "%s.%s" % (dst, src), 0) + def bitfilter(frame_idx, bit_idx): assert os.getenv("XRAY_DATABASE") in ["artix7", "kintex7"] if frame_idx in [30, 31]: return False return True + segmk.compile(bitfilter=bitfilter) segmk.write() - diff --git a/fuzzers/051-imuxlout/maketodo.py b/fuzzers/051-imuxlout/maketodo.py index a05ae903..65ded28f 100644 --- a/fuzzers/051-imuxlout/maketodo.py +++ b/fuzzers/051-imuxlout/maketodo.py @@ -2,6 +2,7 @@ import os, re + def maketodo(pipfile, dbfile): todos = set() with open(pipfile, "r") as f: @@ -13,9 +14,14 @@ def maketodo(pipfile, dbfile): line = line.split() todos.remove(line[0]) for line in todos: - if re.match(r"^INT_[LR].IMUX(_L)?[0-9]+\.LOGIC_OUTS(_L)?[0-9]+$", line): + if re.match(r"^INT_[LR].IMUX(_L)?[0-9]+\.LOGIC_OUTS(_L)?[0-9]+$", + line): print(line) -maketodo("pips_int_l.txt", "%s/%s/segbits_int_l.db" % (os.getenv("XRAY_DATABASE_DIR"), os.getenv("XRAY_DATABASE"))) -maketodo("pips_int_r.txt", "%s/%s/segbits_int_r.db" % (os.getenv("XRAY_DATABASE_DIR"), os.getenv("XRAY_DATABASE"))) +maketodo( + "pips_int_l.txt", "%s/%s/segbits_int_l.db" % + (os.getenv("XRAY_DATABASE_DIR"), os.getenv("XRAY_DATABASE"))) +maketodo( + "pips_int_r.txt", "%s/%s/segbits_int_r.db" % + (os.getenv("XRAY_DATABASE_DIR"), os.getenv("XRAY_DATABASE"))) diff --git a/fuzzers/052-clkin/generate.py b/fuzzers/052-clkin/generate.py index 53f43ad6..45088648 100644 --- a/fuzzers/052-clkin/generate.py +++ b/fuzzers/052-clkin/generate.py @@ -22,11 +22,7 @@ with open("design.txt", "r") as f: pdir = int(pdir) if tile not in tiledata: - tiledata[tile] = { - "pips": set(), - "srcs": set(), - "dsts": set() - } + tiledata[tile] = {"pips": set(), "srcs": set(), "dsts": set()} if pip in pipdata: assert pipdata[pip] == (src, dst) @@ -58,6 +54,7 @@ for tile, pips_srcs_dsts in tiledata.items(): elif src_dst[1] not in dsts: segmk.addtag(tile, "%s.%s" % (dst, src), 0) + def bitfilter(frame_idx, bit_idx): assert os.getenv("XRAY_DATABASE") in ["artix7", "kintex7"] if frame_idx == 0 and bit_idx == 48: @@ -66,6 +63,6 @@ def bitfilter(frame_idx, bit_idx): return False return frame_idx in [0, 1] + segmk.compile(bitfilter=bitfilter) segmk.write() - diff --git a/fuzzers/052-clkin/maketodo.py b/fuzzers/052-clkin/maketodo.py index b64bb484..3c5dc523 100644 --- a/fuzzers/052-clkin/maketodo.py +++ b/fuzzers/052-clkin/maketodo.py @@ -2,6 +2,7 @@ import os, re + def maketodo(pipfile, dbfile): todos = set() with open(pipfile, "r") as f: @@ -16,6 +17,10 @@ def maketodo(pipfile, dbfile): if re.match(r"^INT_[LR].CLK", line): print(line) -maketodo("pips_int_l.txt", "%s/%s/segbits_int_l.db" % (os.getenv("XRAY_DATABASE_DIR"), os.getenv("XRAY_DATABASE"))) -maketodo("pips_int_r.txt", "%s/%s/segbits_int_r.db" % (os.getenv("XRAY_DATABASE_DIR"), os.getenv("XRAY_DATABASE"))) +maketodo( + "pips_int_l.txt", "%s/%s/segbits_int_l.db" % + (os.getenv("XRAY_DATABASE_DIR"), os.getenv("XRAY_DATABASE"))) +maketodo( + "pips_int_r.txt", "%s/%s/segbits_int_r.db" % + (os.getenv("XRAY_DATABASE_DIR"), os.getenv("XRAY_DATABASE"))) diff --git a/fuzzers/053-ctrlin/generate.py b/fuzzers/053-ctrlin/generate.py index cb934dcb..b428fc6c 100644 --- a/fuzzers/053-ctrlin/generate.py +++ b/fuzzers/053-ctrlin/generate.py @@ -22,11 +22,7 @@ with open("design.txt", "r") as f: pdir = int(pdir) if tile not in tiledata: - tiledata[tile] = { - "pips": set(), - "srcs": set(), - "dsts": set() - } + tiledata[tile] = {"pips": set(), "srcs": set(), "dsts": set()} if pip in pipdata: assert pipdata[pip] == (src, dst) @@ -58,12 +54,13 @@ for tile, pips_srcs_dsts in tiledata.items(): elif src_dst[1] not in dsts: segmk.addtag(tile, "%s.%s" % (dst, src), 0) + def bitfilter(frame_idx, bit_idx): assert os.getenv("XRAY_DATABASE") in ["artix7", "kintex7"] if (frame_idx, bit_idx) in [(0, 48), (1, 31), (0, 32), (1, 35)]: return False return frame_idx in [0, 1] + segmk.compile(bitfilter=bitfilter) segmk.write() - diff --git a/fuzzers/053-ctrlin/maketodo.py b/fuzzers/053-ctrlin/maketodo.py index 29c66f6f..26311e34 100644 --- a/fuzzers/053-ctrlin/maketodo.py +++ b/fuzzers/053-ctrlin/maketodo.py @@ -2,6 +2,7 @@ import os, re + def maketodo(pipfile, dbfile): todos = set() with open(pipfile, "r") as f: @@ -16,6 +17,10 @@ def maketodo(pipfile, dbfile): if re.match(r"^INT_[LR].CTRL", line): print(line) -maketodo("pips_int_l.txt", "%s/%s/segbits_int_l.db" % (os.getenv("XRAY_DATABASE_DIR"), os.getenv("XRAY_DATABASE"))) -maketodo("pips_int_r.txt", "%s/%s/segbits_int_r.db" % (os.getenv("XRAY_DATABASE_DIR"), os.getenv("XRAY_DATABASE"))) +maketodo( + "pips_int_l.txt", "%s/%s/segbits_int_l.db" % + (os.getenv("XRAY_DATABASE_DIR"), os.getenv("XRAY_DATABASE"))) +maketodo( + "pips_int_r.txt", "%s/%s/segbits_int_r.db" % + (os.getenv("XRAY_DATABASE_DIR"), os.getenv("XRAY_DATABASE"))) diff --git a/fuzzers/054-gfan/generate.py b/fuzzers/054-gfan/generate.py index ff4c97ef..943102d4 100644 --- a/fuzzers/054-gfan/generate.py +++ b/fuzzers/054-gfan/generate.py @@ -22,11 +22,7 @@ with open("design.txt", "r") as f: pdir = int(pdir) if tile not in tiledata: - tiledata[tile] = { - "pips": set(), - "srcs": set(), - "dsts": set() - } + tiledata[tile] = {"pips": set(), "srcs": set(), "dsts": set()} if pip in pipdata: assert pipdata[pip] == (src, dst) @@ -60,4 +56,3 @@ for tile, pips_srcs_dsts in tiledata.items(): segmk.compile() segmk.write() - diff --git a/fuzzers/054-gfan/maketodo.py b/fuzzers/054-gfan/maketodo.py index e6c42c8c..b39d48bf 100644 --- a/fuzzers/054-gfan/maketodo.py +++ b/fuzzers/054-gfan/maketodo.py @@ -2,6 +2,7 @@ import os, re + def maketodo(pipfile, dbfile): todos = set() with open(pipfile, "r") as f: @@ -13,9 +14,14 @@ def maketodo(pipfile, dbfile): line = line.split() todos.remove(line[0]) for line in todos: - if re.match(r"^INT_[LR].GFAN", line) and not line.endswith(".GND_WIRE"): + if re.match(r"^INT_[LR].GFAN", + line) and not line.endswith(".GND_WIRE"): print(line) -maketodo("pips_int_l.txt", "%s/%s/segbits_int_l.db" % (os.getenv("XRAY_DATABASE_DIR"), os.getenv("XRAY_DATABASE"))) -maketodo("pips_int_r.txt", "%s/%s/segbits_int_r.db" % (os.getenv("XRAY_DATABASE_DIR"), os.getenv("XRAY_DATABASE"))) +maketodo( + "pips_int_l.txt", "%s/%s/segbits_int_l.db" % + (os.getenv("XRAY_DATABASE_DIR"), os.getenv("XRAY_DATABASE"))) +maketodo( + "pips_int_r.txt", "%s/%s/segbits_int_r.db" % + (os.getenv("XRAY_DATABASE_DIR"), os.getenv("XRAY_DATABASE"))) diff --git a/fuzzers/055-gnd/generate.py b/fuzzers/055-gnd/generate.py index 3b043639..f358974d 100644 --- a/fuzzers/055-gnd/generate.py +++ b/fuzzers/055-gnd/generate.py @@ -22,11 +22,7 @@ with open("design.txt", "r") as f: pdir = int(pdir) if tile not in tiledata: - tiledata[tile] = { - "pips": set(), - "srcs": set(), - "dsts": set() - } + tiledata[tile] = {"pips": set(), "srcs": set(), "dsts": set()} if pip in pipdata: assert pipdata[pip] == (src, dst) @@ -60,4 +56,3 @@ for tile, pips_srcs_dsts in tiledata.items(): segmk.compile() segmk.write() - diff --git a/fuzzers/056-rempips/generate.py b/fuzzers/056-rempips/generate.py index 092c0978..5304ec88 100644 --- a/fuzzers/056-rempips/generate.py +++ b/fuzzers/056-rempips/generate.py @@ -29,11 +29,7 @@ with open("design.txt", "r") as f: pdir = int(pdir) if tile not in tiledata: - tiledata[tile] = { - "pips": set(), - "srcs": set(), - "dsts": set() - } + tiledata[tile] = {"pips": set(), "srcs": set(), "dsts": set()} if pip in pipdata: assert pipdata[pip] == (src, dst) @@ -70,4 +66,3 @@ for tile, pips_srcs_dsts in tiledata.items(): segmk.compile() segmk.write() - diff --git a/fuzzers/056-rempips/maketodo.py b/fuzzers/056-rempips/maketodo.py index 77bebd97..de136587 100644 --- a/fuzzers/056-rempips/maketodo.py +++ b/fuzzers/056-rempips/maketodo.py @@ -2,6 +2,7 @@ import os, re + def maketodo(pipfile, dbfile): todos = set() with open(pipfile, "r") as f: @@ -16,6 +17,10 @@ def maketodo(pipfile, dbfile): if not line.endswith(".VCC_WIRE"): print(line) -maketodo("pips_int_l.txt", "%s/%s/segbits_int_l.db" % (os.getenv("XRAY_DATABASE_DIR"), os.getenv("XRAY_DATABASE"))) -maketodo("pips_int_r.txt", "%s/%s/segbits_int_r.db" % (os.getenv("XRAY_DATABASE_DIR"), os.getenv("XRAY_DATABASE"))) +maketodo( + "pips_int_l.txt", "%s/%s/segbits_int_l.db" % + (os.getenv("XRAY_DATABASE_DIR"), os.getenv("XRAY_DATABASE"))) +maketodo( + "pips_int_r.txt", "%s/%s/segbits_int_r.db" % + (os.getenv("XRAY_DATABASE_DIR"), os.getenv("XRAY_DATABASE"))) diff --git a/fuzzers/057-bipips/generate.py b/fuzzers/057-bipips/generate.py index 8c2810fa..e27b57a1 100644 --- a/fuzzers/057-bipips/generate.py +++ b/fuzzers/057-bipips/generate.py @@ -40,10 +40,11 @@ for tile, pips_nodes in tiledata.items(): elif dst not in nodes and src not in nodes: segmk.addtag(tile, "%s.%s" % (dst, src), 0) + def bitfilter(frame_idx, bit_idx): assert os.getenv("XRAY_DATABASE") in ["artix7", "kintex7"] return frame_idx in [0, 1] + segmk.compile(bitfilter=bitfilter) segmk.write() - diff --git a/fuzzers/057-bipips/maketodo.py b/fuzzers/057-bipips/maketodo.py index 04bcf701..89d11e3c 100644 --- a/fuzzers/057-bipips/maketodo.py +++ b/fuzzers/057-bipips/maketodo.py @@ -2,6 +2,7 @@ import os, re + def maketodo(pipfile, dbfile): todos = set() with open(pipfile, "r") as f: @@ -16,6 +17,10 @@ def maketodo(pipfile, dbfile): for line in todos: print(line) -maketodo("bipips_int_l.txt", "%s/%s/segbits_int_l.db" % (os.getenv("XRAY_DATABASE_DIR"), os.getenv("XRAY_DATABASE"))) -maketodo("bipips_int_r.txt", "%s/%s/segbits_int_r.db" % (os.getenv("XRAY_DATABASE_DIR"), os.getenv("XRAY_DATABASE"))) +maketodo( + "bipips_int_l.txt", "%s/%s/segbits_int_l.db" % + (os.getenv("XRAY_DATABASE_DIR"), os.getenv("XRAY_DATABASE"))) +maketodo( + "bipips_int_r.txt", "%s/%s/segbits_int_r.db" % + (os.getenv("XRAY_DATABASE_DIR"), os.getenv("XRAY_DATABASE"))) diff --git a/fuzzers/058-hclkpips/generate.py b/fuzzers/058-hclkpips/generate.py index a3d8fead..c51d1a52 100644 --- a/fuzzers/058-hclkpips/generate.py +++ b/fuzzers/058-hclkpips/generate.py @@ -50,4 +50,3 @@ for arg in sys.argv[1:]: segmk.compile() segmk.write(arg) - diff --git a/fuzzers/070-tileconn/generate.py b/fuzzers/070-tileconn/generate.py index 6c64dc2b..1c947461 100644 --- a/fuzzers/070-tileconn/generate.py +++ b/fuzzers/070-tileconn/generate.py @@ -7,7 +7,8 @@ grid2tile = dict() database = dict() print("Loading %s grid." % os.getenv("XRAY_DATABASE")) -with open("%s/%s/tilegrid.json" % (os.getenv("XRAY_DATABASE_DIR"), os.getenv("XRAY_DATABASE")), "r") as f: +with open("%s/%s/tilegrid.json" % (os.getenv("XRAY_DATABASE_DIR"), + os.getenv("XRAY_DATABASE")), "r") as f: grid = json.load(f) for tile, tiledata in grid["tiles"].items(): @@ -24,6 +25,7 @@ with open("nodewires.txt") as f: tilenodes[wire_tile] = dict() tilenodes[wire_tile][node] = wire_name + def filter_pair(type1, type2, wire1, wire2, delta_x, delta_y): if type1 in ["HCLK_L", "HCLK_R"]: is_vertical_wire = False @@ -46,13 +48,15 @@ def filter_pair(type1, type2, wire1, wire2, delta_x, delta_y): if type1 in ["INT_L", "INT_R"]: # the wires with underscore after BEG/END all connect vertically - if (("BEG_" in wire1) or ("END_" in wire1)) and delta_y == 0: return True + if (("BEG_" in wire1) or ("END_" in wire1)) and delta_y == 0: + return True if type1 in ["BRKH_INT", "BRKH_B_TERM_INT", "T_TERM_INT"]: if delta_y == 0: return True return False + def handle_pair(tile1, tile2): if tile1 not in tilenodes: return if tile2 not in tilenodes: return @@ -66,7 +70,9 @@ def handle_pair(tile1, tile2): if grid1_xy > grid2_xy: return handle_pair(tile2, tile1) - key = (tile1data["type"], tile2data["type"], grid2_xy[0] - grid1_xy[0], grid2_xy[1] - grid1_xy[1]) + key = ( + tile1data["type"], tile2data["type"], grid2_xy[0] - grid1_xy[0], + grid2_xy[1] - grid1_xy[1]) wire_pairs = set() @@ -84,9 +90,10 @@ def handle_pair(tile1, tile2): else: database[key] &= wire_pairs + for tile, tiledata in grid["tiles"].items(): - grid_right_xy = (tiledata["grid_x"]+1, tiledata["grid_y"]) - grid_below_xy = (tiledata["grid_x"], tiledata["grid_y"]+1) + grid_right_xy = (tiledata["grid_x"] + 1, tiledata["grid_y"]) + grid_below_xy = (tiledata["grid_x"], tiledata["grid_y"] + 1) if grid_right_xy in grid2tile: handle_pair(tile, grid2tile[grid_right_xy]) @@ -108,4 +115,3 @@ for key in sorted(database.keys()): print("Writing tileconn.json.") with open("tileconn.json", "w") as f: print(json.dumps(json_db, sort_keys=True, indent="\t"), file=f) - diff --git a/gridinfo/gridinfo-txt2json.py b/gridinfo/gridinfo-txt2json.py index 195486d2..670b19a5 100644 --- a/gridinfo/gridinfo-txt2json.py +++ b/gridinfo/gridinfo-txt2json.py @@ -13,17 +13,20 @@ db_site_prop = dict() db_site_tile = dict() db_site_bit = dict() + def add_tile(tile): if tile not in db_tiles: db_tiles.add(tile) db_tile_prop[tile] = dict() db_tile_sites[tile] = list() + def add_site(site): if site not in db_sites: db_sites.add(site) db_site_prop[site] = dict() + with open("%s.txt" % sys.argv[1]) as f: for line in f: line = line.split() @@ -89,34 +92,38 @@ for site, bit in db_site_bit.items(): for i in range(50): m = re.match("(.*)Y([0-9]+)", site) - this_site = "%sY%d" % (m.group(1), int(m.group(2))+i) + this_site = "%sY%d" % (m.group(1), int(m.group(2)) + i) tile = db_site_tile[this_site] - word = bit_word + 2*i + word = bit_word + 2 * i if word >= 50: word += 1 entry = dict() - entry["BASE_FRAMEID"] = "0x%08x" % ((bit_type << 23) | (bit_half << 22) | (bit_row << 17) | (bit_col << 7)) + entry["BASE_FRAMEID"] = "0x%08x" % ( + (bit_type << 23) | (bit_half << 22) | (bit_row << 17) | + (bit_col << 7)) entry["FRAME_TYPE"] = bit_type entry["FRAME_HALF"] = bit_half entry["FRAME_ROW"] = bit_row entry["FRAME_COLUMN"] = bit_col - entry["WORDS"] = [word, word+1] + entry["WORDS"] = [word, word + 1] database["tiles"][tile]["cfgcol"] = entry - if database["tiles"][tile]["props"]["TILE_TYPE"] in ("CLBLL_L", "CLBLM_L"): + if database["tiles"][tile]["props"]["TILE_TYPE"] in ("CLBLL_L", + "CLBLM_L"): col = int(db_tile_prop[tile]["COLUMN"]) row = int(db_tile_prop[tile]["ROW"]) - right_tile = loc_to_tile[(col+1, row)] + right_tile = loc_to_tile[(col + 1, row)] database["tiles"][right_tile]["cfgcol"] = entry - if database["tiles"][tile]["props"]["TILE_TYPE"] in ("CLBLL_R", "CLBLM_R"): + if database["tiles"][tile]["props"]["TILE_TYPE"] in ("CLBLL_R", + "CLBLM_R"): col = int(db_tile_prop[tile]["COLUMN"]) row = int(db_tile_prop[tile]["ROW"]) - left_tile = loc_to_tile[(col-1, row)] + left_tile = loc_to_tile[(col - 1, row)] database["tiles"][left_tile]["cfgcol"] = entry @@ -133,4 +140,3 @@ print("Number of tiles with assigned column: %d" % tile_cfgcol_count) with open("%s.json" % sys.argv[1], "w") as f: print(json.dumps(database, sort_keys=True, indent="\t"), file=f) - diff --git a/htmlgen/htmlgen.py b/htmlgen/htmlgen.py index d5cc558b..3b933fd1 100755 --- a/htmlgen/htmlgen.py +++ b/htmlgen/htmlgen.py @@ -8,10 +8,12 @@ import argparse parser = argparse.ArgumentParser( description="Generate a pretty HTML version of the documentation.") parser.add_argument( - '--output', default=os.path.join(os.path.curdir, 'html'), + '--output', + default=os.path.join(os.path.curdir, 'html'), help='Put the generated files in this directory (default current dir).') parser.add_argument( - '--settings', default=None, + '--settings', + default=None, help='Read the settings from file (default to environment).') args = parser.parse_args() @@ -20,7 +22,8 @@ if args.settings: settings_filename = args.settings settings = { - 'XRAY_DATABASE_DIR': os.path.abspath( + 'XRAY_DATABASE_DIR': + os.path.abspath( os.path.join(os.path.dirname(settings_filename), '..')), } with open(settings_filename) as f: @@ -34,16 +37,22 @@ if args.settings: def get_setting(name): return settings[name] else: + def get_setting(name): return os.getenv(name) -db_dir = os.path.join(get_setting("XRAY_DATABASE_DIR"), get_setting("XRAY_DATABASE")) + +db_dir = os.path.join( + get_setting("XRAY_DATABASE_DIR"), get_setting("XRAY_DATABASE")) + + def db_open(fn): filename = os.path.join(db_dir, fn) if not os.path.exists(filename): return StringIO("") return open(os.path.join(db_dir, fn)) + def out_open(fn): out_dir = os.path.join(args.output, get_setting("XRAY_DATABASE")) os.makedirs(out_dir, exist_ok=True) @@ -51,6 +60,7 @@ def out_open(fn): print("Writing %s" % fp) return open(fp, "w") + clb_bitgroups_db = [ # copy&paste from zero_db in dbfixup.py "00_21 00_22 00_26 01_28|00_25 01_20 01_21 01_24", @@ -83,10 +93,12 @@ hclk_bitgroups_db = [ # groupings for SNWE bits in frames 2..7 for i in range(0, 64, 4): - clb_bitgroups_db.append("02_%02d 03_%02d 05_%02d 06_%02d 07_%02d|05_%02d 03_%02d 04_%02d 04_%02d" % - (i+1, i, i, i, i+1, i+3, i+1, i+1, i+2)) - clb_bitgroups_db.append("02_%02d 04_%02d 05_%02d 05_%02d 06_%02d|02_%02d 03_%02d 04_%02d 07_%02d" % - (i+2, i, i+1, i+2, i+2, i+3, i+2, i+3, i+3)) + clb_bitgroups_db.append( + "02_%02d 03_%02d 05_%02d 06_%02d 07_%02d|05_%02d 03_%02d 04_%02d 04_%02d" + % (i + 1, i, i, i, i + 1, i + 3, i + 1, i + 1, i + 2)) + clb_bitgroups_db.append( + "02_%02d 04_%02d 05_%02d 05_%02d 06_%02d|02_%02d 03_%02d 04_%02d 07_%02d" + % (i + 2, i, i + 1, i + 2, i + 2, i + 3, i + 2, i + 3, i + 3)) clb_left_bits = set() clb_right_bits = set() @@ -108,6 +120,7 @@ for entry in hclk_bitgroups_db: for bit in b.split(): hclk_right_bits.add(bit) + class UnionFind: def __init__(self): self.parents = dict() @@ -142,7 +155,6 @@ routebits = dict() routezbits = dict() maskbits = dict() - print("Loading tilegrid.") with db_open("tilegrid.json") as f: data = f.read() @@ -152,8 +164,8 @@ with db_open("tilegrid.json") as f: "tiles": { "NULL": { "grid_x": 0, - "grid_y":0, - "type":"NULL", + "grid_y": 0, + "type": "NULL", } } } @@ -209,7 +221,8 @@ for segname, segdata in grid["segments"].items(): print(" loading %s segbits." % int_tile_type) with db_open("segbits_%s.db" % int_tile_type) as f: for line in f: - if segtype in ["hclk_l", "hclk_r"] and ".ENABLE_BUFFER." in line: + if segtype in ["hclk_l", "hclk_r" + ] and ".ENABLE_BUFFER." in line: add_single_bit(line) else: add_pip_bits(line) @@ -220,7 +233,6 @@ for segname, segdata in grid["segments"].items(): _, bit = line.split() maskbits[segtype].add(bit) - ################################################# # Create Tilegrid Page @@ -228,10 +240,19 @@ grid_range = None grid_map = dict() with out_open("index.html") as f: - print("X-Ray %s Database" % get_setting("XRAY_DATABASE").upper(), file=f) - print("

X-Ray %s Database

" % get_setting("XRAY_DATABASE").upper(), file=f) + print( + "X-Ray %s Database" % + get_setting("XRAY_DATABASE").upper(), + file=f) + print( + "

X-Ray %s Database

" % get_setting("XRAY_DATABASE").upper(), + file=f) - print("

Part: %s
ROI: %s
ROI Frames: %s

" % (get_setting("XRAY_PART"), get_setting("XRAY_ROI"), get_setting("XRAY_ROI_FRAMES")), file=f) + print( + "

Part: %s
ROI: %s
ROI Frames: %s

" % ( + get_setting("XRAY_PART"), get_setting("XRAY_ROI"), + get_setting("XRAY_ROI_FRAMES")), + file=f) for tilename, tiledata in grid["tiles"].items(): grid_x = tiledata["grid_x"] @@ -248,25 +269,29 @@ with out_open("index.html") as f: print("", file=f) - for grid_y in range(grid_range[1], grid_range[3]+1): + for grid_y in range(grid_range[1], grid_range[3] + 1): print("", file=f) - for grid_x in range(grid_range[0], grid_range[2]+1): + for grid_x in range(grid_range[0], grid_range[2] + 1): tilename = grid_map[(grid_x, grid_y)] tiledata = grid["tiles"][tilename] segdata = None bgcolor = "#aaaaaa" - if tiledata["type"] in ["INT_L", "INT_R"]: bgcolor="#aaaaff" - if tiledata["type"] in ["CLBLL_L", "CLBLL_R"]: bgcolor="#ffffaa" - if tiledata["type"] in ["CLBLM_L", "CLBLM_R"]: bgcolor="#ffaaaa" - if tiledata["type"] in ["HCLK_L", "HCLK_R"]: bgcolor="#aaffaa" + if tiledata["type"] in ["INT_L", "INT_R"]: bgcolor = "#aaaaff" + if tiledata["type"] in ["CLBLL_L", "CLBLL_R"]: bgcolor = "#ffffaa" + if tiledata["type"] in ["CLBLM_L", "CLBLM_R"]: bgcolor = "#ffaaaa" + if tiledata["type"] in ["HCLK_L", "HCLK_R"]: bgcolor = "#aaffaa" - if tiledata["type"] in ["BRAM_INT_INTERFACE_L", "BRAM_L"]: bgcolor="#aaffff" - if tiledata["type"] in ["BRAM_INT_INTERFACE_R", "BRAM_R"]: bgcolor="#aaffff" + if tiledata["type"] in ["BRAM_INT_INTERFACE_L", "BRAM_L"]: + bgcolor = "#aaffff" + if tiledata["type"] in ["BRAM_INT_INTERFACE_R", "BRAM_R"]: + bgcolor = "#aaffff" - if tiledata["type"] in ["INT_INTERFACE_L", "DSP_L"]: bgcolor="#ffaaff" - if tiledata["type"] in ["INT_INTERFACE_R", "DSP_R"]: bgcolor="#ffaaff" + if tiledata["type"] in ["INT_INTERFACE_L", "DSP_L"]: + bgcolor = "#ffaaff" + if tiledata["type"] in ["INT_INTERFACE_R", "DSP_R"]: + bgcolor = "#ffaaff" title = [tilename] @@ -282,41 +307,64 @@ with out_open("index.html") as f: if "segment" in tiledata: if "baseaddr" in segdata: - title.append("Baseaddr: %s %d" % tuple(segdata["baseaddr"])) + title.append( + "Baseaddr: %s %d" % tuple(segdata["baseaddr"])) else: - print("Warning: no baseaddr in segment %s (via tile %s)." % (tiledata["segment"], tilename)) + print( + "Warning: no baseaddr in segment %s (via tile %s)." % + (tiledata["segment"], tilename)) tilename = tilename.replace("INT_INTERFACE_", "INTF_") tilename = tilename.replace("_X", "
X") tilename = tilename.replace("B_TERM", "B
TERM") - print("" % - (segtype, tilename.replace("_X", "
X")), file=f) + print( + "%s" + % (segtype, tilename.replace("_X", "
X")), + file=f) else: - print("%s" % tilename.replace("_X", "
X").replace("B_TERM", "B
TERM"), file=f) + print( + "%s" % tilename.replace( + "_X", "
X").replace("B_TERM", "B
TERM"), + file=f) print("", file=f) print("
" % (bgcolor, "\n".join(title)), file=f) + print( + "" + % (bgcolor, "\n".join(title)), + file=f) if "segment" in tiledata: segtype = segdata["type"].lower() - print("%s
", file=f) print("", file=f) - ################################################# # Create Segment Pages for segtype in sorted(segbits.keys()): with out_open("seg_%s.html" % segtype) as f: - print("X-Ray %s Database: %s" % (get_setting("XRAY_DATABASE").upper(), segtype.upper()), file=f) + print( + "X-Ray %s Database: %s" % + (get_setting("XRAY_DATABASE").upper(), segtype.upper()), + file=f) if segtype in ["hclk_l", "hclk_r"]: - print("

X-Ray %s Database: %s Segment

" % (get_setting("XRAY_DATABASE").upper(), segtype.upper()), file=f) + print( + "

X-Ray %s Database: %s Segment

" % + (get_setting("XRAY_DATABASE").upper(), segtype.upper()), + file=f) else: - print("

X-Ray %s Database: %s Segment (%s Tile + %s Tile)

" % (get_setting("XRAY_DATABASE").upper(), segtype.upper(), - segtype.upper(), re.sub("clbl[lm]|bram[0-4]|dsp[0-4]", "int", segtype).upper()), file=f) + print( + "

X-Ray %s Database: %s Segment (%s Tile + %s Tile)

" % + ( + get_setting("XRAY_DATABASE").upper(), segtype.upper(), + segtype.upper(), + re.sub("clbl[lm]|bram[0-4]|dsp[0-4]", "int", + segtype).upper()), + file=f) - print(""" + print( + """ - """, file=f) + """, + file=f) print("", file=f) @@ -364,15 +413,23 @@ function oml() { print("", file=f) print("", file=f) for frameidx in range(segframes[segtype]): - print("" % frameidx, file=f) + print( + "" + % frameidx, + file=f) print("", file=f) - for bitidx in range(31 if (segtype in ["hclk_l", "hclk_r"]) else 63, -1, -1): + for bitidx in range(31 if (segtype in ["hclk_l", "hclk_r"]) else 63, + -1, -1): print("", file=f) - print("" % bitidx, file=f) + print( + "" + % bitidx, + file=f) for frameidx in range(segframes[segtype]): bit_pos = "%02d_%02d" % (frameidx, bitidx) - bit_name = segbits_r[segtype][bit_pos] if bit_pos in segbits_r[segtype] else None + bit_name = segbits_r[segtype][bit_pos] if bit_pos in segbits_r[ + segtype] else None label = None title = [bit_pos] @@ -420,7 +477,8 @@ function oml() { else: bgcolor = "#ff0000" - m = re.search(r"\.([ABCD]5?)FF\.([A-Z]+(\.A|\.B)?)$", bit_name) + m = re.search( + r"\.([ABCD]5?)FF\.([A-Z]+(\.A|\.B)?)$", bit_name) if m: bgcolor = "#aaffaa" if m.group(2) == "ZINI": @@ -478,64 +536,70 @@ function oml() { label = "BUF" elif bit_pos in routebits[segtype]: - bgcolor = "#0000ff" - label = "R" - for bn in sorted(routebits[segtype][bit_pos]): - if re.match("^INT_[LR].[SNWE][SNWERL]", bn): - if bn[8] == "1": - bgcolor = "#4466bb" - elif bn[8] == "2": - bgcolor = "#aa88ff" - elif bn[6:9] in "SS6 SE6 NN6 NW6".split(): - bgcolor = "#7755ff" - else: - bgcolor = "#88aaff" - label = bn[6:9] - elif re.match("^INT_[LR].IMUX", bn): - m = re.match("^INT_[LR].IMUX(_L)?(\d+)", bn) - bgcolor = "#88aaff" - label = "IM" + m.group(2) - elif re.match("^INT_[LR].BYP_ALT", bn): - bgcolor = "#7755ff" - label = "BA" + bn[13] - elif re.match("^INT_[LR].FAN_ALT", bn): + bgcolor = "#0000ff" + label = "R" + for bn in sorted(routebits[segtype][bit_pos]): + if re.match("^INT_[LR].[SNWE][SNWERL]", bn): + if bn[8] == "1": bgcolor = "#4466bb" - label = "FA" + bn[13] - elif re.match("^INT_[LR].CLK", bn): - bgcolor = "#4466bb" - label = "CLK" - elif re.match("^INT_[LR].CTRL", bn): - bgcolor = "#7755ff" - label = "CTRL" - elif re.match("^INT_[LR].GFAN", bn): - bgcolor = "#7755ff" - label = "GFAN" - elif re.match("^INT_[LR].LVB", bn): - bgcolor = "#88aaff" - label = "LVB" - elif re.match("^INT_[LR].LV", bn): - bgcolor = "#88aaff" - label = "LV" - elif re.match("^INT_[LR].LH", bn): - bgcolor = "#4466bb" - label = "LH" - elif re.match("^CLBL[LM]_[LR].SLICE[LM]_X[01].[ABCD]FF.DMUX", bn): - bgcolor = "#88aaff" - label = "DMX" - elif re.match("^CLBL[LM]_[LR].SLICE[LM]_X[01].[ABCD]MUX", bn): + elif bn[8] == "2": bgcolor = "#aa88ff" - label = "OMX" - elif re.match("^CLBL[LM]_[LR].SLICE[LM]_X[01].PRECYINIT", bn): - bgcolor = "#88aaff" - label = "CYI" - elif re.match("^HCLK_[LR]", bn) and "_B_BOT" in bn: - bgcolor = "#4466bb" - label = "BOT" - elif re.match("^HCLK_[LR]", bn) and "_B_TOP" in bn: + elif bn[6:9] in "SS6 SE6 NN6 NW6".split(): bgcolor = "#7755ff" - label = "TOP" - piptypes[bit_pos] = label - title.append(bn) + else: + bgcolor = "#88aaff" + label = bn[6:9] + elif re.match("^INT_[LR].IMUX", bn): + m = re.match("^INT_[LR].IMUX(_L)?(\d+)", bn) + bgcolor = "#88aaff" + label = "IM" + m.group(2) + elif re.match("^INT_[LR].BYP_ALT", bn): + bgcolor = "#7755ff" + label = "BA" + bn[13] + elif re.match("^INT_[LR].FAN_ALT", bn): + bgcolor = "#4466bb" + label = "FA" + bn[13] + elif re.match("^INT_[LR].CLK", bn): + bgcolor = "#4466bb" + label = "CLK" + elif re.match("^INT_[LR].CTRL", bn): + bgcolor = "#7755ff" + label = "CTRL" + elif re.match("^INT_[LR].GFAN", bn): + bgcolor = "#7755ff" + label = "GFAN" + elif re.match("^INT_[LR].LVB", bn): + bgcolor = "#88aaff" + label = "LVB" + elif re.match("^INT_[LR].LV", bn): + bgcolor = "#88aaff" + label = "LV" + elif re.match("^INT_[LR].LH", bn): + bgcolor = "#4466bb" + label = "LH" + elif re.match( + "^CLBL[LM]_[LR].SLICE[LM]_X[01].[ABCD]FF.DMUX", + bn): + bgcolor = "#88aaff" + label = "DMX" + elif re.match( + "^CLBL[LM]_[LR].SLICE[LM]_X[01].[ABCD]MUX", + bn): + bgcolor = "#aa88ff" + label = "OMX" + elif re.match( + "^CLBL[LM]_[LR].SLICE[LM]_X[01].PRECYINIT", + bn): + bgcolor = "#88aaff" + label = "CYI" + elif re.match("^HCLK_[LR]", bn) and "_B_BOT" in bn: + bgcolor = "#4466bb" + label = "BOT" + elif re.match("^HCLK_[LR]", bn) and "_B_TOP" in bn: + bgcolor = "#7755ff" + label = "TOP" + piptypes[bit_pos] = label + title.append(bn) if label is None: label = " " @@ -551,8 +615,12 @@ function oml() { else: known_bits += 1 - print("" % - (bit_pos, bit_pos, bgcolor, "\n".join(title), onclick, label), file=f) + print( + "" + % ( + bit_pos, bit_pos, bgcolor, "\n".join(title), onclick, + label), + file=f) print("", file=f) print("
%d%d
%d%d%s%s
", file=f) @@ -561,10 +629,14 @@ function oml() { print("

Segment Configuration Bits

", file=f) if True: - print(" unused: %d, unknown: %d, known: %d, total: %d, percentage: %.2f%% (%.2f%%)" % ( - unused_bits, unknown_bits, known_bits, unused_bits + unknown_bits + known_bits, - 100 * known_bits / (unknown_bits + unused_bits + known_bits), - 100 * (known_bits + unused_bits) / (unknown_bits + unused_bits + known_bits))) + print( + " unused: %d, unknown: %d, known: %d, total: %d, percentage: %.2f%% (%.2f%%)" + % ( + unused_bits, unknown_bits, known_bits, + unused_bits + unknown_bits + known_bits, 100 * known_bits / + (unknown_bits + unused_bits + known_bits), + 100 * (known_bits + unused_bits) / + (unknown_bits + unused_bits + known_bits))) bits_by_prefix = dict() @@ -583,12 +655,17 @@ function oml() { print("

", file=f) print("

%s

" % prefix, file=f) print("", file=f) - print("", file=f) + print( + "", + file=f) trstyle = "" for bit_name, bit_pos in sorted(bits): trstyle = " bgcolor=\"#dddddd\"" if trstyle == "" else "" - print("" % (trstyle, bit_name, bit_pos), file=f) + print( + "" % + (trstyle, bit_name, bit_pos), + file=f) print("
Bit NamePosition
Bit NamePosition
%s%s
%s%s
", file=f) @@ -663,7 +740,10 @@ function oml() { print("" % bit, file=f) print("", file=f) @@ -682,8 +762,10 @@ function oml() { line = " -->%s" % (pip) for bit in grp_bits: c = "-" - if bit in routebits[segtype] and pip in routebits[segtype][bit]: c = "1" - if bit in routezbits[segtype] and pip in routezbits[segtype][bit]: c = "0" + if bit in routebits[segtype] and pip in routebits[segtype][bit]: + c = "1" + if bit in routezbits[segtype] and pip in routezbits[segtype][bit]: + c = "0" line = "%s%s%s" % (c, line, c) lines.append(line) @@ -699,8 +781,13 @@ function oml() { if len(shared_bits[bit]) > 1: if first_note: print("

Note(s):
", file=f) - print("Warning: Groups sharing bit %s: %s." % (bit, ", ".join(sorted(shared_bits[bit])))) - print("Groups sharing bit %s: %s.
" % (bit, ", ".join(sorted(shared_bits[bit]))), file=f) + print( + "Warning: Groups sharing bit %s: %s." % + (bit, ", ".join(sorted(shared_bits[bit])))) + print( + "Groups sharing bit %s: %s.
" % + (bit, ", ".join(sorted(shared_bits[bit]))), + file=f) first_note = False if not first_note: print("

", file=f) @@ -708,13 +795,18 @@ function oml() { for tile_type in segtiles[segtype]: print("

Tile %s Pseudo PIPs

" % tile_type, file=f) print("", file=f) - print("", file=f) + print( + "", + file=f) trstyle = "" with db_open("ppips_%s.db" % tile_type.lower()) as fi: for line in fi: pip_name, pip_type = line.split() trstyle = " bgcolor=\"#dddddd\"" if trstyle == "" else "" - print("" % (trstyle, pip_name, pip_type), file=f) + print( + "" % + (trstyle, pip_name, pip_type), + file=f) print("
PIPType
PIPType
%s%s
%s%s
", file=f) print("", file=f) diff --git a/utils/dbcheck.py b/utils/dbcheck.py index 9f09b95e..fe62bf5c 100644 --- a/utils/dbcheck.py +++ b/utils/dbcheck.py @@ -24,20 +24,24 @@ for arg in sys.argv[1:]: database[key] = bits database_r[bits] = key + def get_subsets(bits): retval = list() retval.append(bits) for i in range(len(bits)): - for s in get_subsets(bits[i+1:]): - retval.append(bits[0:i] + s); + for s in get_subsets(bits[i + 1:]): + retval.append(bits[0:i] + s) return retval + def check_subsets(bits): for sub_bits in sorted(get_subsets(bits)): if sub_bits != bits and sub_bits != (): if sub_bits in database_r: - print("Warning: Entry %s %s is a subset of entry %s %s." % (database_r[sub_bits], sub_bits, database_r[bits], bits)) + print( + "Warning: Entry %s %s is a subset of entry %s %s." % + (database_r[sub_bits], sub_bits, database_r[bits], bits)) + for key, bits in database.items(): check_subsets(bits) - diff --git a/utils/dbfixup.py b/utils/dbfixup.py index 87be71a2..859375cc 100644 --- a/utils/dbfixup.py +++ b/utils/dbfixup.py @@ -31,9 +31,11 @@ zero_db = [ "30_53 31_53 31_56 31_57", ] + def add_zero_bits(tile_type): assert os.getenv("XRAY_DATABASE") in ["artix7", "kintex7"] - dbfile = "%s/%s/segbits_%s.db" % (os.getenv("XRAY_DATABASE_DIR"), os.getenv("XRAY_DATABASE"), tile_type) + dbfile = "%s/%s/segbits_%s.db" % ( + os.getenv("XRAY_DATABASE_DIR"), os.getenv("XRAY_DATABASE"), tile_type) new_lines = set() llast = None @@ -84,9 +86,11 @@ def add_zero_bits(tile_type): for line in sorted(new_lines): print(line, file=f) + def update_mask(mask_db, *src_dbs): bits = set() - mask_db_file = "%s/%s/mask_%s.db" % (os.getenv("XRAY_DATABASE_DIR"), os.getenv("XRAY_DATABASE"), mask_db) + mask_db_file = "%s/%s/mask_%s.db" % ( + os.getenv("XRAY_DATABASE_DIR"), os.getenv("XRAY_DATABASE"), mask_db) if os.path.exists(mask_db_file): with open(mask_db_file, "r") as f: @@ -97,7 +101,8 @@ def update_mask(mask_db, *src_dbs): bits.add(line[1]) for src_db in src_dbs: - seg_db_file = "%s/%s/segbits_%s.db" % (os.getenv("XRAY_DATABASE_DIR"), os.getenv("XRAY_DATABASE"), src_db) + seg_db_file = "%s/%s/segbits_%s.db" % ( + os.getenv("XRAY_DATABASE_DIR"), os.getenv("XRAY_DATABASE"), src_db) if not os.path.exists(seg_db_file): continue @@ -114,6 +119,7 @@ def update_mask(mask_db, *src_dbs): for bit in sorted(bits): print("bit %s" % bit, file=f) + add_zero_bits("int_l") add_zero_bits("int_r") add_zero_bits("clbll_l") @@ -133,4 +139,3 @@ for k in range(5): update_mask("bram%d_r" % k, "bram%d_r" % k, "int_r") update_mask("dsp%d_l" % k, "dsp%d_l" % k, "int_l") update_mask("dsp%d_r" % k, "dsp%d_r" % k, "int_r") - diff --git a/utils/segmaker.py b/utils/segmaker.py index 0354973d..580edf12 100644 --- a/utils/segmaker.py +++ b/utils/segmaker.py @@ -1,9 +1,11 @@ import os, json, re + class segmaker: def __init__(self, bitsfile): print("Loading %s grid." % os.getenv("XRAY_DATABASE")) - with open("../../../database/%s/tilegrid.json" % os.getenv("XRAY_DATABASE"), "r") as f: + with open("../../../database/%s/tilegrid.json" % + os.getenv("XRAY_DATABASE"), "r") as f: self.grid = json.load(f) self.bits = dict() @@ -24,7 +26,8 @@ class segmaker: if bit_wordidx not in self.bits[base_frame]: self.bits[base_frame][bit_wordidx] = set() - self.bits[base_frame][bit_wordidx].add((bit_frame, bit_wordidx, bit_bitidx)) + self.bits[base_frame][bit_wordidx].add( + (bit_frame, bit_wordidx, bit_bitidx)) def addtag(self, site, name, value): if site not in self.tags: @@ -50,30 +53,39 @@ class segmaker: segments = self.segments_by_type[segdata["type"]] tile_type = tiledata["type"] - segname = "%s_%03d" % (segdata["baseaddr"][0][2:], segdata["baseaddr"][1]) + segname = "%s_%03d" % ( + segdata["baseaddr"][0][2:], segdata["baseaddr"][1]) def add_segbits(): if not segname in segments: - segments[segname] = { "bits": set(), "tags": dict() } + segments[segname] = {"bits": set(), "tags": dict()} base_frame = int(segdata["baseaddr"][0][2:], 16) - for wordidx in range(segdata["baseaddr"][1], segdata["baseaddr"][1]+segdata["words"]): + for wordidx in range( + segdata["baseaddr"][1], + segdata["baseaddr"][1] + segdata["words"]): if base_frame not in self.bits: continue if wordidx not in self.bits[base_frame]: continue - for bit_frame, bit_wordidx, bit_bitidx in self.bits[base_frame][wordidx]: + for bit_frame, bit_wordidx, bit_bitidx in self.bits[ + base_frame][wordidx]: bitname_frame = bit_frame - base_frame - bitname_bit = 32*(bit_wordidx - segdata["baseaddr"][1]) + bit_bitidx - if bitfilter is None or bitfilter(bitname_frame, bitname_bit): - bitname = "%02d_%02d" % (bitname_frame, bitname_bit) + bitname_bit = 32 * ( + bit_wordidx - segdata["baseaddr"][1] + ) + bit_bitidx + if bitfilter is None or bitfilter(bitname_frame, + bitname_bit): + bitname = "%02d_%02d" % ( + bitname_frame, bitname_bit) segments[segname]["bits"].add(bitname) if tilename in self.tags: add_segbits() for name, value in self.tags[tilename].items(): - tag = "%s.%s" % (re.sub("(LL|LM)?_[LR]$", "", tile_type), name) + tag = "%s.%s" % ( + re.sub("(LL|LM)?_[LR]$", "", tile_type), name) segments[segname]["tags"][tag] = value for site in tiledata["sites"]: @@ -90,7 +102,8 @@ class segmaker: assert 0 for name, value in self.tags[site].items(): - tag = "%s.%s.%s" % (re.sub("(LL|LM)?_[LR]$", "", tile_type), sitekey, name) + tag = "%s.%s.%s" % ( + re.sub("(LL|LM)?_[LR]$", "", tile_type), sitekey, name) tag = tag.replace(".SLICEM.", ".") tag = tag.replace(".SLICEL.", ".") segments[segname]["tags"][tag] = value @@ -119,5 +132,6 @@ class segmaker: for bitname in sorted(segdata["bits"]): print("bit %s_%s" % (segname, bitname), file=f) for tagname, tagval in sorted(segdata["tags"].items()): - print("tag %s_%s %d" % (segname, tagname, tagval), file=f) - + print( + "tag %s_%s %d" % (segname, tagname, tagval), + file=f) diff --git a/utils/segprint.py b/utils/segprint.py index b0b9e811..e464fa7b 100755 --- a/utils/segprint.py +++ b/utils/segprint.py @@ -7,6 +7,7 @@ flag_b = False flag_d = False flag_D = False + def usage(): print("Usage: %s [options] [segments/tiles]" % sys.argv[0]) print("") @@ -24,6 +25,7 @@ def usage(): print("") sys.exit(0) + try: opts, args = getopt.getopt(sys.argv[1:], "zbdD") except: @@ -44,7 +46,8 @@ for o, a in opts: else: usage() -with open("%s/%s/tilegrid.json" % (os.getenv("XRAY_DATABASE_DIR"), os.getenv("XRAY_DATABASE")), "r") as f: +with open("%s/%s/tilegrid.json" % (os.getenv("XRAY_DATABASE_DIR"), + os.getenv("XRAY_DATABASE")), "r") as f: grid = json.load(f) bitdata = dict() @@ -67,34 +70,41 @@ with open(args[0], "r") as f: segbitsdb = dict() + def get_database(segtype): if segtype in segbitsdb: return segbitsdb[segtype] segbitsdb[segtype] = list() - with open("%s/%s/segbits_%s.db" % (os.getenv("XRAY_DATABASE_DIR"), os.getenv("XRAY_DATABASE"), segtype), "r") as f: + with open("%s/%s/segbits_%s.db" % (os.getenv("XRAY_DATABASE_DIR"), + os.getenv("XRAY_DATABASE"), segtype), + "r") as f: for line in f: line = line.split() segbitsdb[segtype].append(line) - with open("%s/%s/segbits_int_%s.db" % (os.getenv("XRAY_DATABASE_DIR"), os.getenv("XRAY_DATABASE"), segtype[-1]), "r") as f: + with open("%s/%s/segbits_int_%s.db" % + (os.getenv("XRAY_DATABASE_DIR"), os.getenv("XRAY_DATABASE"), + segtype[-1]), "r") as f: for line in f: line = line.split() segbitsdb[segtype].append(line) return segbitsdb[segtype] + def handle_segment(segname): if segname is None: segframes = dict() for segname, segdata in grid["segments"].items(): framebase = int(segdata["baseaddr"][0], 16) for i in range(segdata["frames"]): - if (framebase+i) not in segframes: - segframes[framebase+i] = set() - for j in range(segdata["baseaddr"][1], segdata["baseaddr"][1] + segdata["words"]): - segframes[framebase+i].add(j) + if (framebase + i) not in segframes: + segframes[framebase + i] = set() + for j in range(segdata["baseaddr"][1], + segdata["baseaddr"][1] + segdata["words"]): + segframes[framebase + i].add(j) for frame in sorted(bitdata.keys()): for wordidx in sorted(bitdata[frame].keys()): if frame in segframes and wordidx in segframes[frame]: @@ -151,14 +161,16 @@ def handle_segment(segname): segbits = set() segtags = set() - for frame in range(baseframe, baseframe+numframes): + for frame in range(baseframe, baseframe + numframes): if frame not in bitdata: continue - for wordidx in range(basewordidx, basewordidx+numwords): + for wordidx in range(basewordidx, basewordidx + numwords): if wordidx not in bitdata[frame]: continue for bitidx in bitdata[frame][wordidx]: - segbits.add("%02d_%02d" % (frame - baseframe, 32*(wordidx - basewordidx) + bitidx)) + segbits.add( + "%02d_%02d" % + (frame - baseframe, 32 * (wordidx - basewordidx) + bitidx)) if flag_d or flag_D: for entry in get_database(seginfo["type"]): @@ -185,6 +197,7 @@ def handle_segment(segname): for tag in sorted(segtags): print("tag %s" % tag) + if flag_b: handle_segment(None) @@ -197,4 +210,3 @@ if len(args) == 1: else: for arg in args[1:]: handle_segment(arg) - diff --git a/utils/tileconnloops.py b/utils/tileconnloops.py index 2bfa3685..1bb825a1 100644 --- a/utils/tileconnloops.py +++ b/utils/tileconnloops.py @@ -5,10 +5,12 @@ import os, sys, json -with open("%s/%s/tilegrid.json" % (os.getenv("XRAY_DATABASE_DIR"), os.getenv("XRAY_DATABASE")), "r") as f: +with open("%s/%s/tilegrid.json" % (os.getenv("XRAY_DATABASE_DIR"), + os.getenv("XRAY_DATABASE")), "r") as f: tilegrid = json.load(f)["tiles"] -with open("%s/%s/tileconn.json" % (os.getenv("XRAY_DATABASE_DIR"), os.getenv("XRAY_DATABASE")), "r") as f: +with open("%s/%s/tileconn.json" % (os.getenv("XRAY_DATABASE_DIR"), + os.getenv("XRAY_DATABASE")), "r") as f: tileconn = json.load(f) grid = dict() @@ -19,13 +21,18 @@ for tilename, tiledata in tilegrid.items(): key = (tiledata["grid_x"], tiledata["grid_y"]) grid[key] = tilename + def check_tileconn_entry(tilename, tiledata, entry, idx): if idx == 0: otheridx = 1 - otherxy = (tiledata["grid_x"] + entry["grid_deltas"][0], tiledata["grid_y"] + entry["grid_deltas"][1]) + otherxy = ( + tiledata["grid_x"] + entry["grid_deltas"][0], + tiledata["grid_y"] + entry["grid_deltas"][1]) else: otheridx = 0 - otherxy = (tiledata["grid_x"] - entry["grid_deltas"][0], tiledata["grid_y"] - entry["grid_deltas"][1]) + otherxy = ( + tiledata["grid_x"] - entry["grid_deltas"][0], + tiledata["grid_y"] - entry["grid_deltas"][1]) if otherxy not in grid: return @@ -36,7 +43,9 @@ def check_tileconn_entry(tilename, tiledata, entry, idx): if othertiledata["type"] != entry["tile_types"][otheridx]: return - print(" Found relevant entry (%s %s %d %d): %s" % (entry["tile_types"][0], entry["tile_types"][1], + print( + " Found relevant entry (%s %s %d %d): %s" % ( + entry["tile_types"][0], entry["tile_types"][1], entry["grid_deltas"][0], entry["grid_deltas"][1], othertilename)) for pair in entry["wire_pairs"]: @@ -54,6 +63,7 @@ def check_tileconn_entry(tilename, tiledata, entry, idx): wirepairs[otherwirename] = set() wirepairs[otherwirename].add(wirename) + for tilename, tiledata in tilegrid.items(): print("Connecting wires in tile %s." % tilename) for entry in tileconn: @@ -62,6 +72,7 @@ for tilename, tiledata in tilegrid.items(): if entry["tile_types"][1] == tiledata["type"]: check_tileconn_entry(tilename, tiledata, entry, 1) + def check_wire(wire, source): for next_wire in wirepairs[wire]: if next_wire == source: @@ -73,10 +84,10 @@ def check_wire(wire, source): remwires.remove(next_wire) check_wire(next_wire, wire) + while len(remwires): wire = remwires.pop() print("Checking %s:" % wire) check_wire(wire, None) print("NO LOOP FOUND: OK") - diff --git a/utils/tileconnwire.py b/utils/tileconnwire.py index edddc605..50041b24 100644 --- a/utils/tileconnwire.py +++ b/utils/tileconnwire.py @@ -6,7 +6,8 @@ if len(sys.argv) != 3: print("Usage example: python3 %s HCLK_R HCLK_SW6E3" % sys.argv[0]) sys.exit(1) -with open("%s/%s/tileconn.json" % (os.getenv("XRAY_DATABASE_DIR"), os.getenv("XRAY_DATABASE")), "r") as f: +with open("%s/%s/tileconn.json" % (os.getenv("XRAY_DATABASE_DIR"), + os.getenv("XRAY_DATABASE")), "r") as f: tileconn = json.load(f) outdata = list() @@ -26,9 +27,14 @@ for entry in tileconn: if wire_pair[this_idx] != sys.argv[2]: continue - outdata.append((delta_x, delta_y, entry["tile_types"][other_idx], wire_pair[other_idx])) - max_tiletype_len = max(max_tiletype_len, len(entry["tile_types"][other_idx])) + outdata.append( + ( + delta_x, delta_y, entry["tile_types"][other_idx], + wire_pair[other_idx])) + max_tiletype_len = max( + max_tiletype_len, len(entry["tile_types"][other_idx])) for entry in outdata: - print("%3d %3d %-*s %s" % (entry[0], entry[1], max_tiletype_len, entry[2], entry[3])) - + print( + "%3d %3d %-*s %s" % + (entry[0], entry[1], max_tiletype_len, entry[2], entry[3]))