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

Move feature grouping before zero bits add and ambiguous solution removal. 

Signed-off-by: Maciej Kurc <mkurc@antmicro.com>
This commit is contained in:
Maciej Kurc 2020-02-18 11:17:58 +01:00
parent e8a52f927d
commit d0c7925763
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
utils/dbfixup.py
View File

@ -484,14 +484,23 @@ def update_seg_fns(
continue
lines = read_segbits(fn_in)
changes = 0
changes, lines = add_zero_bits(
# Find common bits for tag groups
bit_groups = find_common_bits_for_tag_groups(lines, tag_groups)
# Group tags
new_changes, lines = group_tags(lines, tag_groups, bit_groups)
changes += new_changes
new_changes, lines = add_zero_bits(
fn_in,
lines,
zero_db,
clb_int=clb_int,
strict=strict,
verbose=verbose)
changes += new_changes
new_changes, lines = remove_ambiguous_solutions(
fn_in,
@ -501,13 +510,6 @@ def update_seg_fns(
)
changes += new_changes
# Find common bits for tag groups
bit_groups = find_common_bits_for_tag_groups(lines, tag_groups)
# Group tags
new_changes, lines = group_tags(lines, tag_groups, bit_groups)
changes += new_changes
with open(fn_out, "w") as f:
for line in sorted(lines):
print(line, file=f)
@ -610,8 +612,6 @@ def find_common_bits_for_tag_groups(lines, tag_groups):
ones = set([b[1] for b in bits if b[0]])
bit_group |= ones
print(tag_group)
print(bit_group)
bit_groups.append(bit_group)
return bit_groups