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

030-iob: add LVDS_25 and TMDS_33 

Signed-off-by: Alessandro Comodi <acomodi@antmicro.com>
This commit is contained in:
Alessandro Comodi 2021-02-12 15:40:49 +01:00
parent 953f8745ba
commit abac14b5a0
4 changed files with 117 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fuzzers/030-iob/Makefile
View File

@ -24,7 +24,7 @@ build/segbits_xiob33.db: build/segbits_xiob33.rdb process_rdb.py bits.dbf
${XRAY_MASKMERGE} build/mask_xiob33.db $$(find -name segdata_liob33.txt) $$(find -name segdata_riob33.txt) ${XRAY_MASKMERGE} build/mask_xiob33.db $$(find -name segdata_liob33.txt) $$(find -name segdata_riob33.txt)
build/segbits_hclk_ioi3.rdb: $(SPECIMENS_OK) build/segbits_hclk_ioi3.rdb: $(SPECIMENS_OK)
${XRAY_SEGMATCH} -c 4 -o build/segbits_hclk_ioi3.rdb $$(find -name segdata_hclk_ioi3.txt) ${XRAY_SEGMATCH} -c 10 -o build/segbits_hclk_ioi3.rdb $$(find -name segdata_hclk_ioi3.txt)
build/segbits_hclk_ioi3.db: build/segbits_hclk_ioi3.rdb build/segbits_hclk_ioi3.db: build/segbits_hclk_ioi3.rdb
${XRAY_DBFIXUP} --db-root build --zero-db hclk_bits.dbf --seg-fn-in build/segbits_hclk_ioi3.rdb --seg-fn-out $@ ${XRAY_DBFIXUP} --db-root build --zero-db hclk_bits.dbf --seg-fn-in build/segbits_hclk_ioi3.rdb --seg-fn-out $@

44
fuzzers/030-iob/generate.py
View File

@ -46,7 +46,9 @@ def drives_for_iostandard(iostandard):
STEPDOWN_IOSTANDARDS = [ STEPDOWN_IOSTANDARDS = [
'LVCMOS12', 'LVCMOS15', 'LVCMOS18', 'SSTL135', 'SSTL15' 'LVCMOS12', 'LVCMOS15', 'LVCMOS18', 'SSTL135', 'SSTL15'
] ]
IBUF_LOW_PWR_SUPPORTED = ['SSTL135', 'SSTL15'] IBUF_LOW_PWR_SUPPORTED = ['SSTL135', 'SSTL15', 'LVDS_25', 'TMDS_33']
ONLY_DIFF_IOSTANDARDS = ['LVDS_25', 'TMDS_33']
def main(): def main():
@ -95,8 +97,9 @@ def main():
for d in design['tiles']: for d in design['tiles']:
site = d['site'] site = d['site']
tile = d['tile']
if d['tile'] in pudc_tiles: if tile in pudc_tiles:
continue continue
if site in diff_pairs: if site in diff_pairs:
@ -119,6 +122,8 @@ def main():
'UNTUNED_SPLIT_60' 'UNTUNED_SPLIT_60'
], 'NONE', d['IN_TERM']) ], 'NONE', d['IN_TERM'])
only_diff_io = iostandard in ONLY_DIFF_IOSTANDARDS
if d['type'] is None: if d['type'] is None:
segmk.add_site_tag(site, 'INOUT', 0) segmk.add_site_tag(site, 'INOUT', 0)
segmk.add_site_tag(site, '{}.IN_USE'.format(iostandard), 0) segmk.add_site_tag(site, '{}.IN_USE'.format(iostandard), 0)
@ -148,6 +153,12 @@ def main():
segmk.add_site_tag(site, '{}.OUT'.format(iostandard), 0) segmk.add_site_tag(site, '{}.OUT'.format(iostandard), 0)
segmk.add_site_tag(site, '{}.IN_ONLY'.format(iostandard), 1) segmk.add_site_tag(site, '{}.IN_ONLY'.format(iostandard), 1)
segmk.add_tile_tag(d['tile'], 'IN_DIFF', 1) segmk.add_tile_tag(d['tile'], 'IN_DIFF', 1)
if iostandard in IBUF_LOW_PWR_SUPPORTED:
segmk.add_tile_tag(
tile, 'DIFF.IBUF_LOW_PWR', d['IBUF_LOW_PWR'])
segmk.add_tile_tag(
tile, 'DIFF.ZIBUF_LOW_PWR', 1 ^ d['IBUF_LOW_PWR'])
elif d['type'] == 'OBUF': elif d['type'] == 'OBUF':
segmk.add_site_tag(site, 'INOUT', 0) segmk.add_site_tag(site, 'INOUT', 0)
segmk.add_site_tag(site, '{}.IN_USE'.format(iostandard), 1) segmk.add_site_tag(site, '{}.IN_USE'.format(iostandard), 1)
@ -159,15 +170,18 @@ def main():
segmk.add_site_tag(site, '{}.IN_USE'.format(iostandard), 1) segmk.add_site_tag(site, '{}.IN_USE'.format(iostandard), 1)
segmk.add_site_tag(site, '{}.IN'.format(iostandard), 0) segmk.add_site_tag(site, '{}.IN'.format(iostandard), 0)
segmk.add_site_tag(site, '{}.OUT'.format(iostandard), 1) segmk.add_site_tag(site, '{}.OUT'.format(iostandard), 1)
segmk.add_tile_tag(d['tile'], 'OUT_DIFF', 1) segmk.add_tile_tag(
d['tile'], 'OUT_DIFF', 1 and not only_diff_io)
segmk.add_tile_tag(d['tile'], 'OUT_TDIFF', 0) segmk.add_tile_tag(d['tile'], 'OUT_TDIFF', 0)
elif d['type'] == 'OBUFTDS': elif d['type'] == 'OBUFTDS':
segmk.add_site_tag(site, 'INOUT', 0) segmk.add_site_tag(site, 'INOUT', 0)
segmk.add_site_tag(site, '{}.IN_USE'.format(iostandard), 1) segmk.add_site_tag(site, '{}.IN_USE'.format(iostandard), 1)
segmk.add_site_tag(site, '{}.IN'.format(iostandard), 0) segmk.add_site_tag(site, '{}.IN'.format(iostandard), 0)
segmk.add_site_tag(site, '{}.OUT'.format(iostandard), 1) segmk.add_site_tag(site, '{}.OUT'.format(iostandard), 1)
segmk.add_tile_tag(d['tile'], 'OUT_DIFF', 1) segmk.add_tile_tag(
segmk.add_tile_tag(d['tile'], 'OUT_TDIFF', 1) d['tile'], 'OUT_DIFF', 1 and not only_diff_io)
segmk.add_tile_tag(
d['tile'], 'OUT_TDIFF', 1 and not only_diff_io)
elif d['type'] == 'IOBUF_INTERMDISABLE': elif d['type'] == 'IOBUF_INTERMDISABLE':
segmk.add_site_tag(site, 'INOUT', 1) segmk.add_site_tag(site, 'INOUT', 1)
segmk.add_site_tag(site, '{}.IN_USE'.format(iostandard), 1) segmk.add_site_tag(site, '{}.IN_USE'.format(iostandard), 1)
@ -197,15 +211,18 @@ def main():
drive_opts.add(mk_drive_opt("SSTL135", None)) drive_opts.add(mk_drive_opt("SSTL135", None))
drive_opts.add(mk_drive_opt("SSTL15", None)) drive_opts.add(mk_drive_opt("SSTL15", None))
drive_opts.add(mk_drive_opt("LVDS_25", None))
drive_opts.add(mk_drive_opt("TMDS_33", None))
segmaker.add_site_group_zero( segmaker.add_site_group_zero(
segmk, site, '', drive_opts, mk_drive_opt('LVCMOS25', '12'), segmk, site, '', drive_opts, mk_drive_opt('LVCMOS25', '12'),
mk_drive_opt(iostandard, d['DRIVE'])) mk_drive_opt(iostandard, d['DRIVE']))
for opt in ["SLOW", "FAST"]: if d['SLEW']:
segmk.add_site_tag( for opt in ["SLOW", "FAST"]:
site, iostandard + ".SLEW." + opt, opt == verilog.unquote( segmk.add_site_tag(
d['SLEW'])) site, iostandard + ".SLEW." + opt,
opt == verilog.unquote(d['SLEW']))
if 'ibufdisable_wire' in d: if 'ibufdisable_wire' in d:
segmk.add_site_tag( segmk.add_site_tag(
@ -278,6 +295,15 @@ def main():
segmk.add_tile_tag( segmk.add_tile_tag(
hclk_cmt_tile, 'STEPDOWN', iostandard in STEPDOWN_IOSTANDARDS) hclk_cmt_tile, 'STEPDOWN', iostandard in STEPDOWN_IOSTANDARDS)
for only_diff_io in ONLY_DIFF_IOSTANDARDS:
segmk.add_tile_tag(
hclk_cmt_tile, '{}_IN_USE'.format(only_diff_io),
iostandard == only_diff_io)
segmk.add_tile_tag(
hclk_cmt_tile, 'ONLY_DIFF_IN_USE',
iostandard in ONLY_DIFF_IOSTANDARDS)
# For IOBANK's with no active VREF, clear all VREF options. # For IOBANK's with no active VREF, clear all VREF options.
for cmt, (_, hclk_cmt_tile) in cmt_to_idelay.items(): for cmt, (_, hclk_cmt_tile) in cmt_to_idelay.items():
if cmt in cmt_vref_active: if cmt in cmt_vref_active:

88
fuzzers/030-iob/process_rdb.py
View File

@ -30,7 +30,7 @@ def get_site(l):
def parse_bits(l): def parse_bits(l):
parts = l.strip().split(' ') parts = l.strip().split(' ')
if parts[1] in ['<0', '<const0>']: if parts[1] in ['<0', '<const0>', '<const1>']:
return frozenset() return frozenset()
else: else:
return frozenset(parts[1:]) return frozenset(parts[1:])
@ -64,23 +64,7 @@ def filter_bits(site, bits):
return frozenset(inner()) return frozenset(inner())
def main(): def process_features_sets(iostandard_lines, only_diff=False):
parser = argparse.ArgumentParser(
description="Convert IOB rdb into good rdb."
"")
parser.add_argument('input_rdb')
args = parser.parse_args()
iostandard_lines = []
with open(args.input_rdb) as f:
for l in f:
if ('.SSTL' in l or '.LVCMOS' in l
or '.LVTTL' in l) and 'IOB_' in l:
iostandard_lines.append(l)
else:
print(l.strip())
sites = {} sites = {}
for l in iostandard_lines: for l in iostandard_lines:
@ -102,8 +86,8 @@ def main():
if group in ['DRIVE', 'SLEW']: if group in ['DRIVE', 'SLEW']:
enum = feature_parts[4] enum = feature_parts[4]
sites[site][group][(iostandard, enum)] = bits sites[site][group][(iostandard, enum)] = bits
elif group in ['IN', 'IN_DIFF', 'IN_ONLY', 'IN_USE', 'OUT', elif group in ['IN', 'IN_DIFF', 'IN_ONLY', 'IN_USE', 'OUT', 'STEPDOWN',
'STEPDOWN']: 'ZIBUF_LOW_PWR']:
sites[site][group][(iostandard, None)] = bits sites[site][group][(iostandard, None)] = bits
else: else:
assert False, group assert False, group
@ -129,26 +113,29 @@ def main():
slew_in_drives = {} slew_in_drives = {}
for site in sites: for site in sites:
common_bits[(site, 'DRIVE')] -= common_bits[(site, 'SLEW')]
common_bits[(site, 'DRIVE')] -= common_bits[(site, 'STEPDOWN')]
common_bits[(site, 'IN_ONLY')] |= common_bits[(site, 'DRIVE')]
common_bits[(site, 'IN_ONLY')] -= common_bits[(site, 'STEPDOWN')]
common_bits[(site, 'IN')] |= common_bits[(site, 'IN_DIFF')] common_bits[(site, 'IN')] |= common_bits[(site, 'IN_DIFF')]
common_bits[(site, 'IN_DIFF')] |= common_bits[(site, 'IN')] common_bits[(site, 'IN_DIFF')] |= common_bits[(site, 'IN')]
for iostandard, enum in sites[site]['DRIVE']: # Only DIFF IOSTANDARDS such as LVDS or TMDS do not have DRIVE,
slew_in_drive = common_bits[ # STEPDOWN or SLEW features
(site, 'SLEW')] & sites[site]['DRIVE'][(iostandard, enum)] if not only_diff:
if slew_in_drive: common_bits[(site, 'DRIVE')] -= common_bits[(site, 'SLEW')]
if (site, iostandard) not in slew_in_drives: common_bits[(site, 'DRIVE')] -= common_bits[(site, 'STEPDOWN')]
slew_in_drives[(site, iostandard)] = set() common_bits[(site, 'IN_ONLY')] |= common_bits[(site, 'DRIVE')]
common_bits[(site, 'IN_ONLY')] -= common_bits[(site, 'STEPDOWN')]
slew_in_drives[(site, iostandard)] |= slew_in_drive for iostandard, enum in sites[site]['DRIVE']:
sites[site]['DRIVE'][(iostandard, enum)] -= slew_in_drive slew_in_drive = common_bits[
(site, 'SLEW')] & sites[site]['DRIVE'][(iostandard, enum)]
if slew_in_drive:
if (site, iostandard) not in slew_in_drives:
slew_in_drives[(site, iostandard)] = set()
sites[site]['DRIVE'][(iostandard, slew_in_drives[(site, iostandard)] |= slew_in_drive
enum)] -= common_bits[(site, 'STEPDOWN')] sites[site]['DRIVE'][(iostandard, enum)] -= slew_in_drive
sites[site]['DRIVE'][(iostandard,
enum)] -= common_bits[(site, 'STEPDOWN')]
for site, iostandard in slew_in_drives: for site, iostandard in slew_in_drives:
for _, enum in sites[site]['SLEW']: for _, enum in sites[site]['SLEW']:
@ -165,9 +152,10 @@ def main():
sites[site]['IN_DIFF'][(iostandard, enum)] |= \ sites[site]['IN_DIFF'][(iostandard, enum)] |= \
sites[site]['IN'][(iostandard, enum)] sites[site]['IN'][(iostandard, enum)]
for site in sites: if not only_diff:
del sites[site]['OUT'] for site in sites:
del sites[site]['IN_USE'] del sites[site]['OUT']
del sites[site]['IN_USE']
allow_zero = ['SLEW'] allow_zero = ['SLEW']
@ -219,5 +207,29 @@ def main():
'{} {}'.format(feature, ' '.join(sorted(bits | neg_bits)))) '{} {}'.format(feature, ' '.join(sorted(bits | neg_bits))))
def main():
parser = argparse.ArgumentParser(
description="Convert IOB rdb into good rdb."
"")
parser.add_argument('input_rdb')
args = parser.parse_args()
iostandard_lines = []
iostandard_lines_only_diff = []
with open(args.input_rdb) as f:
for l in f:
if ('.SSTL' in l or '.LVCMOS' in l
or '.LVTTL' in l) and 'IOB_' in l:
iostandard_lines.append(l)
elif ('.TMDS' in l or 'LVDS' in l):
iostandard_lines_only_diff.append(l)
else:
print(l.strip())
process_features_sets(iostandard_lines)
process_features_sets(iostandard_lines_only_diff, True)
if __name__ == "__main__": if __name__ == "__main__":
main() main()

53
fuzzers/030-iob/top.py
View File

@ -65,6 +65,8 @@ def run():
'LVTTL', 'LVTTL',
'SSTL135', 'SSTL135',
'SSTL15', 'SSTL15',
'LVDS_25',
'TMDS_33',
] ]
diff_map = { diff_map = {
@ -72,6 +74,11 @@ def run():
"SSTL15": ["DIFF_SSTL15"], "SSTL15": ["DIFF_SSTL15"],
} }
only_diff_map = {
"LVDS_25": ["LVDS_25"],
"TMDS_33": ["TMDS_33"],
}
IN_TERM_ALLOWED = [ IN_TERM_ALLOWED = [
'SSTL15', 'SSTL15',
'SSTL15_R', 'SSTL15_R',
@ -85,17 +92,6 @@ def run():
'HSTL_II_18', 'HSTL_II_18',
] ]
iostandard = random.choice(iostandards)
if iostandard in ['LVTTL', 'LVCMOS18']:
drives = [4, 8, 12, 16, 24]
elif iostandard in ['LVCMOS12']:
drives = [4, 8, 12]
elif iostandard in ['SSTL135', 'SSTL15']:
drives = None
else:
drives = [4, 8, 12, 16]
slews = ['FAST', 'SLOW'] slews = ['FAST', 'SLOW']
pulls = ["NONE", "KEEPER", "PULLDOWN", "PULLUP"] pulls = ["NONE", "KEEPER", "PULLDOWN", "PULLUP"]
@ -151,7 +147,7 @@ def run():
drives = [4, 8, 12, 16, 24] drives = [4, 8, 12, 16, 24]
elif iostandard in ['LVCMOS12']: elif iostandard in ['LVCMOS12']:
drives = [4, 8, 12] drives = [4, 8, 12]
elif iostandard in ['SSTL135', 'SSTL15', 'LVDS', 'LVDS_25']: elif iostandard in ['SSTL135', 'SSTL15', 'LVDS_25', 'TMDS_33']:
drives = None drives = None
else: else:
drives = [4, 8, 12, 16] drives = [4, 8, 12, 16]
@ -160,6 +156,9 @@ def run():
if iostandard in diff_map: if iostandard in diff_map:
site_bels[site_type] = random.choice( site_bels[site_type] = random.choice(
tile_types + ['IBUFDS', 'OBUFDS', 'OBUFTDS']) tile_types + ['IBUFDS', 'OBUFDS', 'OBUFTDS'])
elif iostandard in only_diff_map:
site_bels[site_type] = random.choice(
['IBUFDS', 'OBUFDS', 'OBUFTDS', None, None])
else: else:
site_bels[site_type] = random.choice(tile_types) site_bels[site_type] = random.choice(tile_types)
is_m_diff = site_bels[site_type] is not None and site_bels[ is_m_diff = site_bels[site_type] is not None and site_bels[
@ -167,7 +166,7 @@ def run():
else: else:
site_bels[site_type] = random.choice(tile_types) site_bels[site_type] = random.choice(tile_types)
if is_m_diff: if is_m_diff or iostandard in only_diff_map:
site_bels['IOB33S'] = None site_bels['IOB33S'] = None
for site_type, site in sites.items(): for site_type, site in sites.items():
@ -177,7 +176,10 @@ def run():
p['type'] = site_bels[site_type] p['type'] = site_bels[site_type]
if p['type'] is not None and p['type'].endswith('DS'): if p['type'] is not None and p['type'].endswith('DS'):
iostandard_site = random.choice(diff_map[iostandard]) if iostandard in diff_map:
iostandard_site = random.choice(diff_map[iostandard])
elif iostandard in only_diff_map:
iostandard_site = random.choice(only_diff_map[iostandard])
p['pair_site'] = sites['IOB33S'] p['pair_site'] = sites['IOB33S']
else: else:
iostandard_site = iostandard iostandard_site = iostandard
@ -285,6 +287,13 @@ def run():
else: else:
p['DRIVE_STR'] = '' p['DRIVE_STR'] = ''
if 'SLEW' in p:
p['SLEW_STR'] = ''
if iostandard in only_diff_map:
p['SLEW'] = None
elif p['DRIVE'] is not None:
p['SLEW_STR'] = '.SLEW({}),'.format(p['SLEW'])
if p['type'] is not None: if p['type'] is not None:
tile_params.append( tile_params.append(
( (
@ -380,9 +389,9 @@ module top(input wire [`N_DI-1:0] di, output wire [`N_DO-1:0] do, inout wire [`N
''' '''
(* KEEP, DONT_TOUCH *) (* KEEP, DONT_TOUCH *)
OBUF #( OBUF #(
.IOSTANDARD({IOSTANDARD}),
{DRIVE_STR} {DRIVE_STR}
.SLEW({SLEW}) {SLEW_STR}
.IOSTANDARD({IOSTANDARD})
) obuf_{site} ( ) obuf_{site} (
.O({pad_wire}), .O({pad_wire}),
.I({iwire}) .I({iwire})
@ -393,9 +402,9 @@ module top(input wire [`N_DI-1:0] di, output wire [`N_DO-1:0] do, inout wire [`N
''' '''
(* KEEP, DONT_TOUCH *) (* KEEP, DONT_TOUCH *)
OBUFDS #( OBUFDS #(
.IOSTANDARD({IOSTANDARD}),
{DRIVE_STR} {DRIVE_STR}
.SLEW({SLEW}) {SLEW_STR}
.IOSTANDARD({IOSTANDARD})
) obufds_{site} ( ) obufds_{site} (
.O({pad_wire}), .O({pad_wire}),
.OB({bpad_wire}), .OB({bpad_wire}),
@ -407,9 +416,9 @@ module top(input wire [`N_DI-1:0] di, output wire [`N_DO-1:0] do, inout wire [`N
''' '''
(* KEEP, DONT_TOUCH *) (* KEEP, DONT_TOUCH *)
OBUFTDS #( OBUFTDS #(
.IOSTANDARD({IOSTANDARD}),
{DRIVE_STR} {DRIVE_STR}
.SLEW({SLEW}) {SLEW_STR}
.IOSTANDARD({IOSTANDARD})
) obufds_{site} ( ) obufds_{site} (
.O({pad_wire}), .O({pad_wire}),
.OB({bpad_wire}), .OB({bpad_wire}),
@ -422,9 +431,9 @@ module top(input wire [`N_DI-1:0] di, output wire [`N_DO-1:0] do, inout wire [`N
''' '''
(* KEEP, DONT_TOUCH *) (* KEEP, DONT_TOUCH *)
IOBUF_INTERMDISABLE #( IOBUF_INTERMDISABLE #(
.IOSTANDARD({IOSTANDARD}),
{DRIVE_STR} {DRIVE_STR}
.SLEW({SLEW}) {SLEW_STR}
.IOSTANDARD({IOSTANDARD})
) ibuf_{site} ( ) ibuf_{site} (
.IO({pad_wire}), .IO({pad_wire}),
.I({iwire}), .I({iwire}),