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

Merge pull request #349 from mcmasterg/zero_enum 

dbfixup: fix zero enums
This commit is contained in:
John McMaster 2018-12-17 18:20:46 -08:00 committed by GitHub
parent c4f49106b7 7acefbb2bb
commit d33157bbdb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
utils/dbfixup.py
View File

@ -122,11 +122,6 @@ def add_zero_bits(fn_in, fn_out, zero_db, clb_int=False, verbose=False):
line = line.strip()
if line == llast:
continue
# FIXME: quick workaround
# was in mergedb.sh
# if re.match(r'.*<m.*>.*', line):
if re.match(r'.*<.*>.*', line):
continue
tag, bits, mode = util.parse_db_line(line)
assert mode not in (
@ -138,7 +133,9 @@ def add_zero_bits(fn_in, fn_out, zero_db, clb_int=False, verbose=False):
else:
if mode:
assert mode == "<0 candidates>", line
bits = set(bits)
bits = set()
else:
bits = set(bits)
"""
This appears to be a large range of one hot interconnect bits
They are immediately before the first CLB real bits
@ -150,6 +147,10 @@ def add_zero_bits(fn_in, fn_out, zero_db, clb_int=False, verbose=False):
new_line = " ".join([tag] + sorted(bits))
if re.match(r'.*<.*>.*', new_line):
print("Original line: %s" % line)
assert 0, "Failed to remove line mode: %s" % (new_line)
if new_line != line:
changes += 1
new_lines.add(new_line)