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

Fix syntax error. Enable skipped test.

This commit is contained in:
Matt Guthaus 2018-12-04 17:08:22 -08:00
parent 126d4a8d10
commit e750d446dc
2 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
compiler/router/router.py
View File

@ -303,24 +303,19 @@ class router(router_tech):
# If the adjacent grids are a subset of the secondary grids (i.e. not necessary) # If the adjacent grids are a subset of the secondary grids (i.e. not necessary)
# remove them from each # remove them from each
removed_flag = False
if adj in bigger.secondary_grids: if adj in bigger.secondary_grids:
debug.info(2,"Removing {} from bigger secondary {}".format(adj, bigger)) debug.info(2,"Removing {} from bigger secondary {}".format(adj, bigger))
bigger.grids.remove(adj) bigger.grids.remove(adj)
bigger.secondary_grids.remove(adj) bigger.secondary_grids.remove(adj)
self.blocked_grids.add(adj) self.blocked_grids.add(adj)
removed_flag=True elif adj in smaller.secondary_grids:
if adj in smaller.secondary_grids:
debug.info(2,"Removing {} from smaller secondary {}".format(adj, smaller)) debug.info(2,"Removing {} from smaller secondary {}".format(adj, smaller))
smaller.gris.remove(adj) smaller.grids.remove(adj)
secondary.secondary_grids.remove(adj) smaller.secondary_grids.remove(adj)
self.blocked_grids.add(adj) self.blocked_grids.add(adj)
removed_flag=True else:
# If we couldn't remove from a secondary grid, we must remove from the primary
# If we couldn't remove from a secondary grid, we must remove from the primary # grid of at least one pin
# grid of at least one pin
if not removed_flag:
if adj in bigger.grids: if adj in bigger.grids:
debug.info(2,"Removing {} from bigger primary {}".format(adj, bigger)) debug.info(2,"Removing {} from bigger primary {}".format(adj, bigger))
bigger.grids.remove(adj) bigger.grids.remove(adj)

2
compiler/tests/20_psram_1bank_2mux_test.py
View File

@ -11,7 +11,7 @@ import globals
from globals import OPTS from globals import OPTS
import debug import debug
@unittest.skip("SKIPPING 20_psram_1bank_2mux_test, wide metal supply routing error") #@unittest.skip("SKIPPING 20_psram_1bank_2mux_test, wide metal supply routing error")
class psram_1bank_2mux_test(openram_test): class psram_1bank_2mux_test(openram_test):
def runTest(self): def runTest(self):