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

Merge branch 'supply_routing' of https://github.com/VLSIDA/PrivateRAM into supply_routing

This commit is contained in:
Matt Guthaus 2018-08-29 15:40:04 -07:00
parent 73289a6090 95a8688506
commit 334aa53cee
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compiler/gdsMill/gdsMill/vlsiLayout.py
View File

@ -308,9 +308,6 @@ class VlsiLayout:
if layerNumber not in self.layerNumbersInUse: if layerNumber not in self.layerNumbersInUse:
self.layerNumbersInUse.append(layerNumber) self.layerNumbersInUse.append(layerNumber)
# if debug: print("DEBUG: vlsilayout: Using %d layers")
#add a reference to the new layout structure in this layout's root #add a reference to the new layout structure in this layout's root
layoutToAddSref = GdsSref() layoutToAddSref = GdsSref()
layoutToAddSref.sName = StructureName layoutToAddSref.sName = StructureName
@ -337,7 +334,6 @@ class VlsiLayout:
layoutToAddSref.transFlags = [1,0,0] layoutToAddSref.transFlags = [1,0,0]
if mirror == "y" or mirror == "MY": #NOTE: "MY" option will override specified rotate angle if mirror == "y" or mirror == "MY": #NOTE: "MY" option will override specified rotate angle
layoutToAddSref.transFlags = [1,1,0] layoutToAddSref.transFlags = [1,1,0]
#layoutToAddSref.transFlags = [1,0,0]
layoutToAddSref.rotateAngle = 180.0 layoutToAddSref.rotateAngle = 180.0
if mirror == "xy" or mirror == "XY": #NOTE: "XY" option will override specified rotate angle if mirror == "xy" or mirror == "XY": #NOTE: "XY" option will override specified rotate angle
layoutToAddSref.transFlags = [0,1,0] layoutToAddSref.transFlags = [0,1,0]

3
compiler/router/router.py
View File

@ -221,14 +221,12 @@ class router:
""" """
shapes = self.layout.getAllShapesInStructureList(layer_num) shapes = self.layout.getAllShapesInStructureList(layer_num)
for boundary in shapes: for boundary in shapes:
ll = vector(boundary[0],boundary[1]) ll = vector(boundary[0],boundary[1])
ur = vector(boundary[2],boundary[3]) ur = vector(boundary[2],boundary[3])
rect = [ll,ur] rect = [ll,ur]
new_pin = pin_layout("blockage{}".format(len(self.blockages)),rect,layer_num) new_pin = pin_layout("blockage{}".format(len(self.blockages)),rect,layer_num)
self.blockages.append(new_pin) self.blockages.append(new_pin)
# for boundary in self.layout.structures[sref].boundaries: # for boundary in self.layout.structures[sref].boundaries:
# coord_trans = self.translate_coordinates(boundary.coordinates, mirr, angle, xyShift) # coord_trans = self.translate_coordinates(boundary.coordinates, mirr, angle, xyShift)
@ -481,6 +479,7 @@ class router:
layer="text", layer="text",
offset=shape[0], offset=shape[0],
zoom=0.05) zoom=0.05)
for blockage in self.blockages: for blockage in self.blockages:
self.cell.add_rect(layer="boundary", self.cell.add_rect(layer="boundary",
offset=blockage.ll(), offset=blockage.ll(),