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

Fix print errors in code format unit test.

This commit is contained in:
mrg 2022-07-26 12:20:15 -07:00
parent 69d5731d67
commit 5db470155e
7 changed files with 50 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/base/design.py
View File

@ -78,7 +78,7 @@ class design(hierarchy_design):
for pin_name in self.pins: for pin_name in self.pins:
pins = self.get_pins(pin_name) pins = self.get_pins(pin_name)
for pin in pins: for pin in pins:
print(pin_name, pin) debug.info(0, "{0} {1}".format(pin_name, pin))
def setup_multiport_constants(self): def setup_multiport_constants(self):
""" """

72
compiler/base/hierarchy_layout.py
View File

@ -141,30 +141,28 @@ class layout():
layout.active_space) layout.active_space)
# These are for debugging previous manual rules # These are for debugging previous manual rules
if False: level=99
print("poly_width", layout.poly_width) debug.info(level, "poly_width".format(layout.poly_width))
print("poly_space", layout.poly_space) debug.info(level, "poly_space".format(layout.poly_space))
print("m1_width", layout.m1_width) debug.info(level, "m1_width".format(layout.m1_width))
print("m1_space", layout.m1_space) debug.info(level, "m1_space".format(layout.m1_space))
print("m2_width", layout.m2_width) debug.info(level, "m2_width".format(layout.m2_width))
print("m2_space", layout.m2_space) debug.info(level, "m2_space".format(layout.m2_space))
print("m3_width", layout.m3_width) debug.info(level, "m3_width".format(layout.m3_width))
print("m3_space", layout.m3_space) debug.info(level, "m3_space".format(layout.m3_space))
print("m4_width", layout.m4_width) debug.info(level, "m4_width".format(layout.m4_width))
print("m4_space", layout.m4_space) debug.info(level, "m4_space".format(layout.m4_space))
print("active_width", layout.active_width) debug.info(level, "active_width".format(layout.active_width))
print("active_space", layout.active_space) debug.info(level, "active_space".format(layout.active_space))
print("contact_width", layout.contact_width) debug.info(level, "contact_width".format(layout.contact_width))
print("poly_to_active", layout.poly_to_active) debug.info(level, "poly_to_active".format(layout.poly_to_active))
print("poly_extend_active", layout.poly_extend_active) debug.info(level, "poly_extend_active".format(layout.poly_extend_active))
print("poly_to_contact", layout.poly_to_contact) debug.info(level, "poly_to_contact".format(layout.poly_to_contact))
print("active_contact_to_gate", layout.active_contact_to_gate) debug.info(level, "active_contact_to_gate".format(layout.active_contact_to_gate))
print("poly_contact_to_gate", layout.poly_contact_to_gate) debug.info(level, "poly_contact_to_gate".format(layout.poly_contact_to_gate))
print("well_enclose_active", layout.well_enclose_active) debug.info(level, "well_enclose_active".format(layout.well_enclose_active))
print("implant_enclose_active", layout.implant_enclose_active) debug.info(level, "implant_enclose_active".format(layout.implant_enclose_active))
print("implant_space", layout.implant_space) debug.info(level, "implant_space".format(layout.implant_space))
import sys
sys.exit(1)
@classmethod @classmethod
def setup_layer_constants(layout): def setup_layer_constants(layout):
@ -202,21 +200,19 @@ class layout():
"{}_nonpref_pitch".format(layer_id), "{}_nonpref_pitch".format(layer_id),
layout.compute_pitch(layer_id, False)) layout.compute_pitch(layer_id, False))
if False: level=99
for name in tech_layer_indices: for name in tech_layer_indices:
if name == "active": if name == "active":
continue continue
try: try:
print("{0} width {1} space {2}".format(name, debug.info(level, "{0} width {1} space {2}".format(name,
getattr(layout, "{}_width".format(name)), getattr(layout, "{}_width".format(name)),
getattr(layout, "{}_space".format(name)))) getattr(layout, "{}_space".format(name))))
print("pitch {0} nonpref {1}".format(getattr(layout, "{}_pitch".format(name)), debug.info(level, "pitch {0} nonpref {1}".format(getattr(layout, "{}_pitch".format(name)),
getattr(layout, "{}_nonpref_pitch".format(name)))) getattr(layout, "{}_nonpref_pitch".format(name))))
except AttributeError: except AttributeError:
pass pass
import sys
sys.exit(1)
@staticmethod @staticmethod
def compute_pitch(layer, preferred=True): def compute_pitch(layer, preferred=True):

4
compiler/debug.py
View File

@ -97,6 +97,10 @@ log.create_file = True
def info(lev, str): def info(lev, str):
from globals import OPTS from globals import OPTS
# 99 is a special never print level
if lev == 99:
return
if (OPTS.verbose_level >= lev): if (OPTS.verbose_level >= lev):
frm = inspect.stack()[1] frm = inspect.stack()[1]
mod = inspect.getmodule(frm[0]) mod = inspect.getmodule(frm[0])

2
compiler/router/router.py
View File

@ -805,7 +805,7 @@ class router(router_tech):
try: try:
x = track[0]*self.track_width - 0.5*self.track_width x = track[0]*self.track_width - 0.5*self.track_width
except TypeError: except TypeError:
print(track[0], type(track[0]), self.track_width, type(self.track_width)) debug.warning("{} {} {} {}".format(track[0], type(track[0]), self.track_width, type(self.track_width)))
y = track[1]*self.track_width - 0.5*self.track_width y = track[1]*self.track_width - 0.5*self.track_width
# offset lowest corner object to to (-track halo,-track halo) # offset lowest corner object to to (-track halo,-track halo)
ll = snap_to_grid(vector(x, y)) ll = snap_to_grid(vector(x, y))

5
compiler/router/supply_tree_router.py
View File

@ -145,13 +145,14 @@ class supply_tree_router(router):
connections.append((x, y)) connections.append((x, y))
# Route MST components # Route MST components
level=99
for index, (src, dest) in enumerate(connections): for index, (src, dest) in enumerate(connections):
if not (index % 25): if not (index % 25):
debug.info(1, "{0} supply segments routed, {1} remaining.".format(index, len(connections) - index)) debug.info(1, "{0} supply segments routed, {1} remaining.".format(index, len(connections) - index))
self.route_signal(pin_name, src, dest) self.route_signal(pin_name, src, dest)
if False and pin_name == "gnd": if False and pin_name == "gnd":
print("\nSRC {}: ".format(src) + str(self.pin_groups[pin_name][src].grids) + str(self.pin_groups[pin_name][src].blockages)) debug.info(level, "\nSRC {}: ".format(src) + str(self.pin_groups[pin_name][src].grids) + str(self.pin_groups[pin_name][src].blockages))
print("DST {}: ".format(dest) + str(self.pin_groups[pin_name][dest].grids) + str(self.pin_groups[pin_name][dest].blockages)) debug.info(level, ("DST {}: ".format(dest) + str(self.pin_groups[pin_name][dest].grids) + str(self.pin_groups[pin_name][dest].blockages)))
self.write_debug_gds("post_{0}_{1}.gds".format(src, dest), False) self.write_debug_gds("post_{0}_{1}.gds".format(src, dest), False)
#self.write_debug_gds("final_tree_router_{}.gds".format(pin_name), False) #self.write_debug_gds("final_tree_router_{}.gds".format(pin_name), False)

5
compiler/tests/00_code_format_check_test.py
View File

@ -125,6 +125,11 @@ def check_file_format_whitespace(file_name):
def check_print_output(file_name): def check_print_output(file_name):
"""Check if any files (except debug.py) call the _print_ function. We should """Check if any files (except debug.py) call the _print_ function. We should
use the debug output with verbosity instead!""" use the debug output with verbosity instead!"""
skip_files = ["printGDS.py", "uniquifyGDS.py", "processGDS.py", "model_data_util.py"]
base_file_name = os.path.basename(file_name)
if base_file_name in skip_files:
return(0)
file = open(file_name, "r+b") file = open(file_name, "r+b")
line = file.read().decode('utf-8') line = file.read().decode('utf-8')
# skip comments with a hash # skip comments with a hash

4
compiler/tests/21_model_delay_test.py
View File

@ -92,8 +92,8 @@ class model_delay_test(openram_test):
else: else:
self.assertTrue(False) # other techs fail self.assertTrue(False) # other techs fail
print('spice_delays', spice_delays) debug.info(3, 'spice_delays {}'.fomrat(spice_delays))
print('model_delays', model_delays) debug.info(3, 'model_delays {}'.format(model_delays))
# Check if no too many or too few results # Check if no too many or too few results
self.assertTrue(len(spice_delays.keys())==len(model_delays.keys())) self.assertTrue(len(spice_delays.keys())==len(model_delays.keys()))