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

Merge branch 'dev' into multiport_characterization

This commit is contained in:
Hunter Nichols 2018-09-11 16:01:51 -07:00
parent 676b6764c7 a3c2b4384a
commit ac3cc5c79b
2 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
compiler/base/hierarchy_layout.py
View File

@ -712,14 +712,17 @@ class layout(lef.lef):
self.add_wire(layer_stack, [pin.center(), mid, trunk_mid]) self.add_wire(layer_stack, [pin.center(), mid, trunk_mid])
def create_channel_route(self, route_map, top_pins, bottom_pins, offset, def create_channel_route(self, netlist, pins, offset,
layer_stack=("metal1", "via1", "metal2"), pitch=None, layer_stack=("metal1", "via1", "metal2"), pitch=None,
vertical=False): vertical=False):
""" """
This is a simple channel route for one-to-one connections that The net list is a list of the nets. Each net is a list of pin
will jog the top route whenever there is a conflict. It does NOT names to be connected. Pins is a dictionary of the pin names
try to minimize the number of tracks -- instead, it picks an order to avoid the vertical to the pin structures. Offset is the lower-left of where the
conflicts between pins. routing channel will start. This does NOT try to minimize the
number of tracks -- instead, it picks an order to avoid the
vertical conflicts between pins.
""" """
def remove_net_from_graph(pin, g): def remove_net_from_graph(pin, g):
# Remove the pin from the keys # Remove the pin from the keys
@ -758,8 +761,6 @@ class layout(lef.lef):
if not pitch: if not pitch:
pitch = self.m2_pitch pitch = self.m2_pitch
# merge the two dictionaries to easily access all pins
all_pins = {**top_pins, **bottom_pins}
# FIXME: Must extend this to a horizontal conflict graph too if we want to minimize the # FIXME: Must extend this to a horizontal conflict graph too if we want to minimize the
# number of tracks! # number of tracks!
@ -771,13 +772,13 @@ class layout(lef.lef):
# Create names for the nets for the graphs # Create names for the nets for the graphs
nets = {} nets = {}
index = 0 index = 0
#print(route_map) #print(netlist)
for pin_connections in route_map: for pin_list in netlist:
net_name = "n{}".format(index) net_name = "n{}".format(index)
index += 1 index += 1
nets[net_name] = [] nets[net_name] = []
for pin_name in pin_connections: for pin_name in pin_list:
pin = all_pins[pin_name] pin = pins[pin_name]
nets[net_name].append(pin) nets[net_name].append(pin)
# Find the vertical pin conflicts # Find the vertical pin conflicts
@ -835,22 +836,22 @@ class layout(lef.lef):
offset -= vector(0,pitch) offset -= vector(0,pitch)
def create_vertical_channel_route(self, route_map, left_pins, right_pins, offset, def create_vertical_channel_route(self, netlist, pins, offset,
layer_stack=("metal1", "via1", "metal2"), layer_stack=("metal1", "via1", "metal2"),
pitch=None): pitch=None):
""" """
Wrapper to create a vertical channel route Wrapper to create a vertical channel route
""" """
self.create_channel_route(route_map, left_pins, right_pins, offset, self.create_channel_route(netlist, pins, offset, layer_stack,
layer_stack, pitch, vertical=True) pitch, vertical=True)
def create_horizontal_channel_route(self, route_map, top_pins, bottom_pins, offset, def create_horizontal_channel_route(self, netlist, pins, offset,
layer_stack=("metal1", "via1", "metal2"), layer_stack=("metal1", "via1", "metal2"),
pitch=None): pitch=None):
""" """
Wrapper to create a horizontal channel route Wrapper to create a horizontal channel route
""" """
self.create_channel_route(route_map, top_pins, bottom_pins, offset, self.create_channel_route(netlist, pins, offset,
layer_stack, pitch, vertical=False) layer_stack, pitch, vertical=False)
def add_enclosure(self, insts, layer="nwell"): def add_enclosure(self, insts, layer="nwell"):

6
compiler/sram_1bank.py
View File

@ -319,8 +319,10 @@ class sram_1bank(sram_base):
route_map = list(zip(bank_names, dff_names)) route_map = list(zip(bank_names, dff_names))
dff_pins = {key: self.data_dff_inst.get_pin(key) for key in dff_names } dff_pins = {key: self.data_dff_inst.get_pin(key) for key in dff_names }
bank_pins = {key: self.bank_inst.get_pin(key) for key in bank_names } bank_pins = {key: self.bank_inst.get_pin(key) for key in bank_names }
self.create_horizontal_channel_route(route_map, dff_pins, bank_pins, offset) # Combine the dff and bank pins into a single dictionary of pin name to pin.
all_pins = {**dff_pins, **bank_pins}
self.create_horizontal_channel_route(route_map, all_pins, offset)