luke
/
prjxray
mirror of https://github.com/openXC7/prjxray.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Simplify 042 routing fuzzing to be more robust. 

Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com>
This commit is contained in:
Keith Rothman 2019-02-18 09:53:28 -08:00
parent 9e4c6f1bb5
commit d925198650
3 changed files with 87 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fuzzers/042-clk-bufg-config/Makefile
View File

@ -1,4 +1,4 @@
N ?= 50
N ?= 40
include ../fuzzer.mk

35
fuzzers/042-clk-bufg-config/generate.py
View File

@ -29,29 +29,22 @@ def main():
segmk.add_site_tag(
row['site'], '{}.{}'.format(base_name, param), row[param])
if row['connect0'] and row['connect1']:
for param in ('PRESELECT_I0', ):
segmk.add_site_tag(
row['site'], '{}.Z{}'.format(base_name, param),
1 ^ row[param])
for param in ('PRESELECT_I0', ):
segmk.add_site_tag(
row['site'], '{}.Z{}'.format(base_name, param),
1 ^ row[param])
for param in ('PRESELECT_I1', ):
segmk.add_site_tag(
row['site'], '{}.{}'.format(base_name, param), row[param])
for param in ('PRESELECT_I1', ):
segmk.add_site_tag(
row['site'], '{}.{}'.format(base_name, param), row[param])
if row['connect0']:
for param, tag in (('IS_CE0_INVERTED', 'ZINV_CE0'),
('IS_S0_INVERTED', 'ZINV_S0')):
segmk.add_site_tag(
row['site'], '{}.{}'.format(base_name, tag),
1 ^ row[param])
if row['connect1']:
for param, tag in (('IS_CE1_INVERTED', 'ZINV_CE1'),
('IS_S1_INVERTED', 'ZINV_S1')):
segmk.add_site_tag(
row['site'], '{}.{}'.format(base_name, tag),
1 ^ row[param])
for param, tag in (('IS_CE0_INVERTED', 'ZINV_CE0'),
('IS_S0_INVERTED', 'ZINV_S0'),
('IS_CE1_INVERTED', 'ZINV_CE1'),
('IS_S1_INVERTED', 'ZINV_S1')):
segmk.add_site_tag(
row['site'], '{}.{}'.format(base_name, tag),
1 ^ row[param])
segmk.compile()
segmk.write()

113
fuzzers/042-clk-bufg-config/top.py
View File

@ -28,6 +28,50 @@ def gen_sites():
if sites:
yield tile_name, min(xs), min(ys), sorted(sites)
class StateGen(object):
def __init__(self, sites, states_per_site):
self.sites = sites
self.states_per_site = states_per_site
self.curr_site_idx = 0
self.curr_state = None
self.states = None
self.curr_site = None
def __iter__(self):
assert self.curr_state is None
assert self.states is None
assert self.curr_state is None
self.curr_site_idx = 0
self.curr_state = None
self.states = util.gen_fuzz_states(len(self.sites)*self.states_per_site)
self.curr_site = iter(self.sites)
return self
def __next__(self):
next_site = next(self.curr_site)
self.curr_site_idx += 1
if self.curr_state is not None:
while self.curr_state < self.states_per_site:
self.next_state()
assert self.curr_state == self.states_per_site, self.curr_state
self.curr_state = 0
return next_site
def next_state(self):
self.curr_state += 1
try:
state = next(self.states)
except StopIteration:
assert False, "Insufficent states, at state {} for site {}".format(self.curr_state, self.curr_site_idx)
return state
def main():
print('''
@ -35,57 +79,35 @@ module top();
''')
params_list = []
for tile_name, x_min, y_min, sites in gen_sites():
state_gen = StateGen(list(gen_sites()), states_per_site=12*16)
for tile_name, x_min, y_min, sites in state_gen:
for site, x, y in sites:
params = {}
params['tile'] = tile_name
params['site'] = site
params['x'] = x - x_min
params['y'] = y - y_min
params['IN_USE'] = random.random() > .1
params['IN_USE'] = state_gen.next_state()
if params['IN_USE']:
params['INIT_OUT'] = random.randint(0, 1)
params['IS_CE0_INVERTED'] = random.randint(0, 1)
params['IS_CE1_INVERTED'] = random.randint(0, 1)
params['IS_S0_INVERTED'] = random.randint(0, 1)
params['IS_S1_INVERTED'] = random.randint(0, 1)
params['IS_IGNORE0_INVERTED'] = random.randint(0, 1)
params['IS_IGNORE1_INVERTED'] = random.randint(0, 1)
params['PRESELECT_I0'] = 0
params['PRESELECT_I1'] = 0
params['INIT_OUT'] = state_gen.next_state()
params['IS_CE0_INVERTED'] = state_gen.next_state()
params['IS_CE1_INVERTED'] = state_gen.next_state()
params['IS_S0_INVERTED'] = state_gen.next_state()
params['IS_S1_INVERTED'] = state_gen.next_state()
params['IS_IGNORE0_INVERTED'] = state_gen.next_state()
params['IS_IGNORE1_INVERTED'] = state_gen.next_state()
params['connect0'] = random.randint(0, 1)
if params['connect0']:
params['connect1'] = random.randint(0, 1)
params['PRESELECT_I0'] = state_gen.next_state()
if not params['PRESELECT_I0']:
params['PRESELECT_I1'] = state_gen.next_state()
else:
params['connect1'] = 1
params['PRESELECT_I1'] = 0
if params['connect0'] and params['connect1']:
params['PRESELECT_I0'] = random.randint(0, 1)
if not params['PRESELECT_I0']:
params['PRESELECT_I1'] = random.randint(0, 1)
else:
params['PRESELECT_I1'] = 0
params['connections'] = """
.CE0(ce0_{site}),
.S0(s0_{site}),
.CE1(ce1_{site}),
.S1(s1_{site})
""".format(site=site)
elif params['connect0']:
params['connections'] = """
.CE0(ce0_{site}),
.S0(s0_{site})
""".format(site=site)
elif params['connect1']:
params['connections'] = """
.CE1(ce1_{site}),
.S1(s1_{site})
""".format(site=site)
params['force_0_high'] = state_gen.next_state()
params['force_1_high'] = state_gen.next_state()
if params['force_0_high']:
params['force_1_high'] = 0
print(
'''
@ -110,6 +132,7 @@ module top();
LUT6 l3_{site} (
.O(s1_{site})
);
(* KEEP, DONT_TOUCH, LOC = "{site}" *)
BUFGCTRL #(
.INIT_OUT({INIT_OUT}),
@ -122,12 +145,20 @@ module top();
.IS_IGNORE0_INVERTED({IS_IGNORE0_INVERTED}),
.IS_IGNORE1_INVERTED({IS_IGNORE1_INVERTED})
) buf_{site} (
{connections}
.CE0(ce0_{site} | {force_0_high}),
.S0(s0_{site} | {force_0_high}),
.CE1(ce1_{site} | {force_1_high}),
.S1(s1_{site} | {force_1_high})
);
'''.format(**params))
params_list.append(params)
print("""
(* KEEP, DONT_TOUCH *)
LUT6 dummy (
);""")
print("endmodule")
with open('params.json', 'w') as f: