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

fuzzer: 007: bel: handle multiple bit inputs 

Signed-off-by: Karol Gugala <kgugala@antmicro.com>
This commit is contained in:
Karol Gugala 2019-05-16 19:14:35 +02:00
parent e1440a56b4
commit 683b7562e5
1 changed files with 44 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
fuzzers/007-timing/bel/tim2json.py
View File

@ -79,9 +79,7 @@ def remove_pin_from_model(pin, model):
return "_".join(tmp) return "_".join(tmp)
else: else:
# pin name is multi word, search for a string # pin name is multi word, search for a string
return "_".join( return "_".join(list(filter(None, model.replace(pin, '').split('_'))))
list(filter(None,
speed_model.replace(pin, '').split('_'))))
def read_raw_timings(fin, properties, pins, site_pins): def read_raw_timings(fin, properties, pins, site_pins):
@ -159,19 +157,18 @@ def read_raw_timings(fin, properties, pins, site_pins):
pim, pin = pin_in_model( pim, pin = pin_in_model(
pin.lower(), speed_model_clean, 'in') pin.lower(), speed_model_clean, 'in')
if pim: if pim:
if pins[slice][site_name][delay_btype_orig][
orig_pin]['direction'] == 'IN':
bel_input = pin
if pins[slice][site_name][delay_btype_orig][
orig_pin]['direction'] == 'OUT':
bel_output = pin
if pins[slice][site_name][delay_btype_orig][ if pins[slice][site_name][delay_btype_orig][
orig_pin]['is_clock']: orig_pin]['is_clock']:
bel_clock = pin bel_clock = pin
elif pins[slice][site_name][delay_btype_orig][
orig_pin]['direction'] == 'IN':
bel_input = pin
elif pins[slice][site_name][delay_btype_orig][
orig_pin]['direction'] == 'OUT':
bel_output = pin
speed_model_clean = remove_pin_from_model( speed_model_clean = remove_pin_from_model(
pin.lower(), speed_model_clean) pin.lower(), speed_model_clean)
# Some speed models describe delays from/to site pins instead of BEL pins
if bel_clock is None: if bel_clock is None:
for pin in site_pins[slice][site_name.lower()]: for pin in site_pins[slice][site_name.lower()]:
orig_pin = pin orig_pin = pin
@ -185,6 +182,7 @@ def read_raw_timings(fin, properties, pins, site_pins):
speed_model_clean = remove_pin_from_model( speed_model_clean = remove_pin_from_model(
pin.lower(), speed_model_clean) pin.lower(), speed_model_clean)
# Some speed models describe delays from/to site pins instead of BEL pins
if bel_input is None: if bel_input is None:
# search site inputs # search site inputs
for pin in site_pins[slice][site_name.lower()]: for pin in site_pins[slice][site_name.lower()]:
@ -224,10 +222,44 @@ def read_raw_timings(fin, properties, pins, site_pins):
# if we couldn't find input, check if the clock is the # if we couldn't find input, check if the clock is the
# only input # only input
if bel_input is None and (bel_clock is not None): if bel_input is None and (bel_clock is not None):
if site_pins[slice][site_name.lower( if bel_clock_orig_pin in site_pins[slice][site_name.lower()] and \
site_pins[slice][site_name.lower(
)][bel_clock_orig_pin]['direction'] == 'IN': )][bel_clock_orig_pin]['direction'] == 'IN':
bel_input = bel_clock bel_input = bel_clock
# if we still don't have the input check if the input
# is wider than 1 bit and timing defined for the whole
# port
import re
if bel_input is None:
for pin in pins[slice][site_name][
delay_btype_orig]:
number = re.search(r'\d+$', pin)
if number is not None:
orig_pin = pin[:-(
len(str(number.group())))]
pim, pin = pin_in_model(
orig_pin.lower(), speed_model_clean)
if not pim:
# some inputs pins are named with unsignificant zeros
# remove ti and try again
orig_pin = orig_pin + str(
int(number.group()))
pim, pin = pin_in_model(
orig_pin.lower(),
speed_model_clean)
if pim:
bel_input = pin
speed_model_clean = remove_pin_from_model(
orig_pin.lower(),
speed_model_clean)
# if we still don't have input, give up
if bel_input is None:
delay_loc += 6
continue
# restore speed model name # restore speed model name
speed_model = delay_btype + speed_model_clean speed_model = delay_btype + speed_model_clean
@ -255,6 +287,7 @@ def read_raw_timings(fin, properties, pins, site_pins):
speed_model_orig]['type'] = btype.upper() speed_model_orig]['type'] = btype.upper()
timings[slice][bel_location][delay_btype][ timings[slice][bel_location][delay_btype][
speed_model_orig]['input'] = bel_input.upper() speed_model_orig]['input'] = bel_input.upper()
if bel_output is not None: if bel_output is not None:
timings[slice][bel_location][delay_btype][ timings[slice][bel_location][delay_btype][
speed_model_orig]['output'] = bel_output.upper( speed_model_orig]['output'] = bel_output.upper(