From 6691d2dcc83a5d822caee76ff5200bdb9b4260a4 Mon Sep 17 00:00:00 2001 From: Alessandro Comodi Date: Wed, 9 Jan 2019 16:31:28 +0100 Subject: [PATCH] ps7/top.py: updated top generator The top.py generates a param.csv file related to a specific tile. The segdata_tilegrid.tdb related to ps7 now contains two different addresses bound to a specific tile. Signed-off-by: Alessandro Comodi --- fuzzers/005-tilegrid/ps7/top.py | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/fuzzers/005-tilegrid/ps7/top.py b/fuzzers/005-tilegrid/ps7/top.py index f5fc6069..fb45bef5 100644 --- a/fuzzers/005-tilegrid/ps7/top.py +++ b/fuzzers/005-tilegrid/ps7/top.py @@ -5,15 +5,10 @@ from prjxray import util from prjxray import verilog -def gen_sites(): - for tile_name, site_name, _site_type in util.get_roi().gen_sites(['PS7']): - yield tile_name, site_name - - def write_params(params): - pinstr = 'tile,val,site\n' - for tile, (site, val) in sorted(params.items()): - pinstr += '%s,%s,%s\n' % (tile, val, site) + pinstr = 'tile,val\n' + for tile, (val) in sorted(params.items()): + pinstr += '%s,%s\n' % (tile, val) open('params.csv', 'w').write(pinstr) @@ -45,20 +40,15 @@ module top(input clk, stb, di, output do); params = {} # FIXME: can't LOC? # only one for now, worry about later - sites = list(gen_sites()) - assert len(sites) == 1 - for (tile_name, site_name), isone in zip(sites, - util.gen_fuzz_states(len(sites))): - # 0 is invalid - # shift one bit, keeping LSB constant - config_param = {0: "", 1: ""}[isone] - params[tile_name] = (site_name, config_param) + assert os.getenv('XRAY_PART') == "xc7z010clg400-1" + for isone in util.gen_fuzz_states(1): + params['INT_L_X0Y50'] = isone print( ''' (* KEEP, DONT_TOUCH *) - PS7 #(/*.LOC("%(loc)s")*/) dut_%(dut)s( + PS7 dut_%(dut)s( .DMA0DATYPE (), .DMA0DAVALID (), .DMA0DRREADY (), @@ -354,7 +344,7 @@ module top(input clk, stb, di, output do); .PSCLK (), .PSPORB (), .PSSRSTB (), - .DDRARB (%(isone)s), + .DDRARB (%(dout)u), .DMA0ACLK (), .DMA0DAREADY (), .DMA0DRLAST (), @@ -681,9 +671,8 @@ module top(input clk, stb, di, output do); .SAXIHP3WVALID () ); ''' % { - 'loc': 'site_name', 'dut': 'site_name', - 'isone': isone + 'dout': isone }) print("endmodule")