Merge branch 'datasheet_gen' into dev

This commit is contained in:
Jesse Cirimelli-Low 2019-02-15 21:47:24 -08:00
commit 723ec9925f
3 changed files with 7 additions and 6 deletions

View File

@ -559,6 +559,7 @@ class lib:
LVS = str(total_lvs_errors) LVS = str(total_lvs_errors)
datasheet.write("{0},{1},".format(DRC, LVS)) datasheet.write("{0},{1},".format(DRC, LVS))
# write area
datasheet.write(str(self.sram.width * self.sram.height)+',') datasheet.write(str(self.sram.width * self.sram.height)+',')
# write timing information for all ports # write timing information for all ports
for port in self.all_ports: for port in self.all_ports:

View File

@ -112,10 +112,10 @@ def parse_characterizer_csv(f, pages):
LVS = row[col] LVS = row[col]
col += 1 col += 1
AREA = row[col] ANALYTICAL_MODEL = row[col]
col += 1 col += 1
ANALYTICAL_MODEL = row[col] AREA = row[col]
col += 1 col += 1
for sheet in pages: for sheet in pages:

View File

@ -16,7 +16,7 @@ def check(check, str):
index) = inspect.getouterframes(inspect.currentframe())[1] index) = inspect.getouterframes(inspect.currentframe())[1]
sys.stderr.write("ERROR: file {0}: line {1}: {2}\n".format( sys.stderr.write("ERROR: file {0}: line {1}: {2}\n".format(
os.path.basename(filename), line_number, str)) os.path.basename(filename), line_number, str))
logger.log("ERROR: file {0}: line {1}: {2}\n".format( log("ERROR: file {0}: line {1}: {2}\n".format(
os.path.basename(filename), line_number, str)) os.path.basename(filename), line_number, str))
assert 0 assert 0
@ -27,7 +27,7 @@ def error(str, return_value=0):
index) = inspect.getouterframes(inspect.currentframe())[1] index) = inspect.getouterframes(inspect.currentframe())[1]
sys.stderr.write("ERROR: file {0}: line {1}: {2}\n".format( sys.stderr.write("ERROR: file {0}: line {1}: {2}\n".format(
os.path.basename(filename), line_number, str)) os.path.basename(filename), line_number, str))
logger.log("ERROR: file {0}: line {1}: {2}\n".format( log("ERROR: file {0}: line {1}: {2}\n".format(
os.path.basename(filename), line_number, str)) os.path.basename(filename), line_number, str))
assert return_value == 0 assert return_value == 0
@ -38,7 +38,7 @@ def warning(str):
index) = inspect.getouterframes(inspect.currentframe())[1] index) = inspect.getouterframes(inspect.currentframe())[1]
sys.stderr.write("WARNING: file {0}: line {1}: {2}\n".format( sys.stderr.write("WARNING: file {0}: line {1}: {2}\n".format(
os.path.basename(filename), line_number, str)) os.path.basename(filename), line_number, str))
logger.log("WARNING: file {0}: line {1}: {2}\n".format( log("WARNING: file {0}: line {1}: {2}\n".format(
os.path.basename(filename), line_number, str)) os.path.basename(filename), line_number, str))