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

Remove bug for combining pin with multiple other pins in a single iteration

This commit is contained in:
Matt Guthaus 2018-10-29 11:07:02 -07:00
parent bbffec863b
commit b7655eab10
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
compiler/router/router.py
View File

@ -169,21 +169,25 @@ class router(router_tech):
remove_indices = set() remove_indices = set()
for index1,pg1 in enumerate(self.pin_groups[pin_name]): for index1,pg1 in enumerate(self.pin_groups[pin_name]):
# Cannot combine more than once
if index1 in remove_indices:
continue
for index2,pg2 in enumerate(self.pin_groups[pin_name]): for index2,pg2 in enumerate(self.pin_groups[pin_name]):
# Cannot combine with yourself
if index1==index2: if index1==index2:
continue continue
# Cannot combine more than once
if index2 in remove_indices:
continue
if pg1.adjacent(pg2): if pg1.adjacent(pg2):
combined = pin_group(pin_name, [], self) combined = pin_group(pin_name, [], self)
combined.pins = [pg1.pins, pg2.pins] combined.pins = [*pg1.pins, *pg2.pins]
combined.grids = pg1.grids | pg2.grids combined.grids = pg1.grids | pg2.grids
blocked_grids = combined.grids & self.blocked_grids debug.info(2,"Combining {0}:\n {1}\n {2}".format(pin_name, pg1.pins, pg2.pins))
# Only add this if we can debug.info(2," --> {0}\n {1}\n".format(combined.pins,combined.grids))
if len(blocked_grids)==0: remove_indices.update([index1,index2])
debug.info(2,"Combing {0}:\n {1}\n {2}".format(pin_name, pg1.pins, pg2.pins)) pin_groups.append(combined)
remove_indices.update([index1,index2])
pin_groups.append(combined)
# Remove them in decreasing order to not invalidate the indices # Remove them in decreasing order to not invalidate the indices
for i in sorted(remove_indices, reverse=True): for i in sorted(remove_indices, reverse=True):