Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Iob supertag, mergedb improvement, groupmask util #458

Merged
merged 6 commits into from
Jan 8, 2019
Merged

Iob supertag, mergedb improvement, groupmask util #458

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
065bd65
Fix htmlgen #173
tmichalak Jan 8, 2019
075a939
add_site_group_zero() allow unused zero_val for empty tile
JohnDMcMaster Jan 8, 2019
f3fade6
iob-stag: IOB supertag
JohnDMcMaster Jan 7, 2019
1f43190
groupmask utility
JohnDMcMaster Jan 8, 2019
6d9d168
iob-stag: groups.grp file
JohnDMcMaster Jan 8, 2019
d0d6778
mergedb: proper merge script
JohnDMcMaster Jan 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
add_site_group_zero() allow unused zero_val for empty tile 
Signed-off-by: John McMaster <[email protected]>
  • Loading branch information
@JohnDMcMaster
JohnDMcMaster committed Jan 8, 2019
commit 075a939ffc421d9f33cc88b01b540aa7d8036fed
13 changes: 7 additions & 6 deletions prjxray/segmaker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ def add_site_group_zero(segmk, site, prefix, vals, zero_val, val):
vals: all possible tag enum vals
zero_val: tag value known to have no bits set
'''
assert zero_val in vals, "Got %s, need %s" % (zero_val, vals)
assert val in vals, "Got %s, need %s" % (val, vals)
# assert zero_val in vals, "Got %s, need %s" % (zero_val, vals)
assert val in vals or val == zero_val, "Got %s, need %s" % (val, vals)

if val == zero_val:
# Zero symbol occured, none of the others did
Expand All @@ -64,10 +64,11 @@ def add_site_group_zero(segmk, site, prefix, vals, zero_val, val):
else:
# Only add the occured symbol
tag = prefix + val
segmk.add_site_tag(site, tag, 1)
# And zero so that it has something to solve against
tag = prefix + zero_val
segmk.add_site_tag(site, tag, 0)
segmk.add_site_tag(site, tag, True)
if zero_val in vals:
# And zero so that it has something to solve against
tag = prefix + zero_val
segmk.add_site_tag(site, tag, False)


class Segmaker:
Expand Down