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

Merge branch 'master' of github.com:mguthaus/OpenRAM

This commit is contained in:
Matt Guthaus 2017-06-06 11:06:35 -07:00
parent 4e97e385e1 d67a7149ab
commit 8b5e92e582
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
compiler/router/grid.py
View File

@ -70,7 +70,6 @@ class grid:
for x in range(int(ll[0]),int(ur[0])+1): for x in range(int(ll[0]),int(ur[0])+1):
for y in range(int(ll[1]),int(ur[1])+1): for y in range(int(ll[1]),int(ur[1])+1):
n = vector3d(x,y,z) n = vector3d(x,y,z)
self.add_map(n)
self.set_blocked(n) self.set_blocked(n)
def add_blockage(self,block_list): def add_blockage(self,block_list):
@ -81,14 +80,12 @@ class grid:
def add_source(self,track_list): def add_source(self,track_list):
debug.info(3,"Adding source list={0}".format(str(track_list))) debug.info(3,"Adding source list={0}".format(str(track_list)))
for n in track_list: for n in track_list:
self.add_map(n)
if not self.map[n].blocked: if not self.map[n].blocked:
self.set_source(n) self.set_source(n)
def add_target(self,track_list): def add_target(self,track_list):
debug.info(3,"Adding target list={0}".format(str(track_list))) debug.info(3,"Adding target list={0}".format(str(track_list)))
for n in track_list: for n in track_list:
self.add_map(n)
if not self.map[n].blocked: if not self.map[n].blocked:
self.set_target(n) self.set_target(n)

12
compiler/router/router.py
View File

@ -206,12 +206,12 @@ class router:
offset=shape[0], offset=shape[0],
width=shape[1].x-shape[0].x, width=shape[1].x-shape[0].x,
height=shape[1].y-shape[0].y) height=shape[1].y-shape[0].y)
# These rae the on grid pins # These are the on grid pins
rect = self.convert_track_to_pin(g) #rect = self.convert_track_to_pin(g)
self.cell.add_rect(layer="boundary", #self.cell.add_rect(layer="boundary",
offset=rect[0], # offset=rect[0],
width=rect[1].x-rect[0].x, # width=rect[1].x-rect[0].x,
height=rect[1].y-rect[0].y) # height=rect[1].y-rect[0].y)
t=self.rg.map[g].get_type() t=self.rg.map[g].get_type()