Merge pull request #655 from antmicro/site-naming-fix

tile.py: changed get_instance_sites function
This commit is contained in:
litghost 2019-02-14 08:14:56 -08:00 committed by GitHub
commit 2a8d6e6bb9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 10 deletions

View File

@ -128,11 +128,14 @@ class Tile(object):
get_instance_sites converts site info from generic to specific
based on a tile location.
"""
origin_x, origin_y = lib.find_origin_coordinate(grid_info.sites.keys())
site_names = set()
for site in self.sites:
site_name = '{}_X{}Y{}'.format(site.prefix, site.x, site.y)
origin_x, origin_y = lib.find_origin_coordinate(
site_name, grid_info.sites.keys())
x = site.x + origin_x
y = site.y + origin_y

View File

@ -40,15 +40,6 @@ def quick_test(db_root):
tile = db.get_tile_type(gridinfo.tile_type)
# FIXME: The way sites are named in Tile.get_instance_sites is broken
# for thes tile types, skip them until the underlying data is fixed.
BROKEN_TILE_TYPES = [
'BRAM_L', 'BRAM_R', 'HCLK_IOI3', 'CMT_TOP_L_UPPER_B',
'CMT_TOP_R_UPPER_B'
]
if gridinfo.tile_type in BROKEN_TILE_TYPES:
continue
instance_sites = list(tile.get_instance_sites(gridinfo))
assert len(instance_sites) == len(tile.get_sites())