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

Merge pull request #282 from mcmasterg/segmaker_checks 

Segmaker checks
This commit is contained in:
John McMaster 2018-12-04 21:13:27 -08:00 committed by GitHub
parent 6b8bfabf86 6ef57ba16c
commit 31621dc30e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
prjxray/segmaker.py
View File

@ -226,8 +226,6 @@ class Segmaker:
segment["tags"][tag] = value
def add_site_tags():
segment = getseg(segname)
site_prefix = site.split('_')[0]
def name_slice():
@ -273,7 +271,8 @@ class Segmaker:
# XXX: does this come from name?
tag = tag.replace(".SLICEM.", ".")
tag = tag.replace(".SLICEL.", ".")
segments[segname]["tags"][tag] = value
segment = getseg(segname)
segment["tags"][tag] = value
sites_used.add(site)
tile_type = tiledata["type"]
@ -288,6 +287,9 @@ class Segmaker:
# ignore dummy tiles (ex: VBRK)
if len(tiledata['bits']) == 0:
if self.verbose:
for site in tiledata["sites"]:
assert site not in self.site_tags, "Site %s does not have bitstream info" % site
continue
elif len(tiledata['bits']) == 1:
bitj = list(tiledata['bits'].values())[0]
@ -312,10 +314,11 @@ class Segmaker:
continue
add_site_tags()
n_site_tags = recurse_sum(self.site_tags)
n_tile_tags = recurse_sum(self.tile_tags)
ntags = n_site_tags + n_tile_tags
if self.verbose:
n_site_tags = recurse_sum(self.site_tags)
n_tile_tags = recurse_sum(self.tile_tags)
ntags = n_site_tags + n_tile_tags
assert ntags, "No tags"
print("Used %u / %u tags" % (len(tags_used), ntags))
print("Tag sites: %u" % (n_site_tags, ))
if n_site_tags:
@ -323,7 +326,7 @@ class Segmaker:
print("Tag tiles: %u" % (n_tile_tags, ))
print("Used %u sites" % len(sites_used))
print("Grid DB had %u tile types" % len(tile_types_found))
assert ntags and ntags == len(tags_used)
assert ntags == len(tags_used), "Unused tags"
def write(self, suffix=None, roi=False, allow_empty=False):
assert self.segments_by_type, 'No data to write'