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

Run make format. 

Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com>
This commit is contained in:
Keith Rothman 2018-10-05 09:43:33 -07:00
parent 9284744028
commit 73dc0211fe
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
prjxray/db.py
View File

@ -78,7 +78,8 @@ class Database(object):
def get_tile_type(self, tile_type): def get_tile_type(self, tile_type):
""" Return Tile object for given tilename. """ """ Return Tile object for given tilename. """
if tile_type not in self.tile_types_obj: if tile_type not in self.tile_types_obj:
self.tile_types_obj[tile_type] = tile.Tile(tile_type, self.tile_types[tile_type]) self.tile_types_obj[tile_type] = tile.Tile(
tile_type, self.tile_types[tile_type])
return self.tile_types_obj[tile_type] return self.tile_types_obj[tile_type]

11
prjxray/tile.py
View File

@ -4,8 +4,8 @@ from prjxray import lib
""" Database files available for a tile """ """ Database files available for a tile """
TileDbs = namedtuple('TileDbs', 'segbits mask tile_type') TileDbs = namedtuple('TileDbs', 'segbits mask tile_type')
Pip = namedtuple('Pip', 'name net_to net_from can_invert is_directional is_pseudo') Pip = namedtuple(
'Pip', 'name net_to net_from can_invert is_directional is_pseudo')
""" Site - Represents an instance of a site within a tile. """ Site - Represents an instance of a site within a tile.
name - Name of site within tile, instance specific. name - Name of site within tile, instance specific.
@ -17,7 +17,6 @@ pins - Instaces of site pins within this site and tile. This is an tuple of
""" """
Site = namedtuple('Site', 'name prefix x y type site_pins') Site = namedtuple('Site', 'name prefix x y type site_pins')
""" SitePin - Tuple representing a site pin within a tile. """ SitePin - Tuple representing a site pin within a tile.
Sites are generic based on type, however sites are instanced Sites are generic based on type, however sites are instanced
@ -64,7 +63,7 @@ class Tile(object):
def yield_pips(pips): def yield_pips(pips):
for name, pip in pips.items(): for name, pip in pips.items():
yield Pip( yield Pip(
name = name, name=name,
net_to=pip['dst_wire'], net_to=pip['dst_wire'],
net_from=pip['src_wire'], net_from=pip['src_wire'],
can_invert=bool(int(pip['can_invert'])), can_invert=bool(int(pip['can_invert'])),
@ -114,7 +113,8 @@ class Tile(object):
for pip in self.pips: for pip in self.pips:
pseudo_filter = (not pip.is_pseudo) or allow_pseudo pseudo_filter = (not pip.is_pseudo) or allow_pseudo
if (wire == pip.net_to or wire == pip.net_from) and pseudo_filter: if (wire == pip.net_to
or wire == pip.net_from) and pseudo_filter:
pips.append(pip.name) pips.append(pip.name)
assert wire not in self.wire_info assert wire not in self.wire_info
@ -160,6 +160,7 @@ class Tile(object):
assert site_names == set(grid_info.sites.keys()) assert site_names == set(grid_info.sites.keys())
def get_other_wire_from_pip(pip, wire): def get_other_wire_from_pip(pip, wire):
if wire == pip.net_to: if wire == pip.net_to:
return pip.net_from return pip.net_from