From f4893507884c3019d69f7dec5b707c57902fdaa6 Mon Sep 17 00:00:00 2001 From: Alessandro Comodi Date: Thu, 14 Feb 2019 11:40:32 +0100 Subject: [PATCH 1/2] tile.py: changed get_instance_sites function Signed-off-by: Alessandro Comodi --- prjxray/tile.py | 4 +++- utils/quick_test.py | 9 --------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/prjxray/tile.py b/prjxray/tile.py index 94c4fc4a..c4fc9be4 100644 --- a/prjxray/tile.py +++ b/prjxray/tile.py @@ -128,11 +128,13 @@ 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 diff --git a/utils/quick_test.py b/utils/quick_test.py index 80f0ff5e..6575d129 100755 --- a/utils/quick_test.py +++ b/utils/quick_test.py @@ -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()) From 22031a79a67b6aed84ecf1c0f0b6ea6e368e5017 Mon Sep 17 00:00:00 2001 From: Alessandro Comodi Date: Thu, 14 Feb 2019 12:07:48 +0100 Subject: [PATCH 2/2] Run make format. Signed-off-by: Alessandro Comodi --- prjxray/tile.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/prjxray/tile.py b/prjxray/tile.py index c4fc9be4..d6f1ae6d 100644 --- a/prjxray/tile.py +++ b/prjxray/tile.py @@ -133,7 +133,8 @@ class Tile(object): 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()) + origin_x, origin_y = lib.find_origin_coordinate( + site_name, grid_info.sites.keys()) x = site.x + origin_x y = site.y + origin_y