diff --git a/compiler/characterizer/lib.py b/compiler/characterizer/lib.py index 60452d76..3b4f465b 100644 --- a/compiler/characterizer/lib.py +++ b/compiler/characterizer/lib.py @@ -559,6 +559,7 @@ class lib: LVS = str(total_lvs_errors) datasheet.write("{0},{1},".format(DRC, LVS)) + # write area datasheet.write(str(self.sram.width * self.sram.height)+',') # write timing information for all ports for port in self.all_ports: diff --git a/compiler/datasheet/datasheet_gen.py b/compiler/datasheet/datasheet_gen.py index 44db3f9b..1644df5f 100644 --- a/compiler/datasheet/datasheet_gen.py +++ b/compiler/datasheet/datasheet_gen.py @@ -112,10 +112,10 @@ def parse_characterizer_csv(f, pages): LVS = row[col] col += 1 - AREA = row[col] + ANALYTICAL_MODEL = row[col] col += 1 - ANALYTICAL_MODEL = row[col] + AREA = row[col] col += 1 for sheet in pages: diff --git a/compiler/debug.py b/compiler/debug.py index f25ff4b5..b7819bcc 100644 --- a/compiler/debug.py +++ b/compiler/debug.py @@ -16,7 +16,7 @@ def check(check, str): index) = inspect.getouterframes(inspect.currentframe())[1] sys.stderr.write("ERROR: file {0}: line {1}: {2}\n".format( 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)) assert 0 @@ -27,7 +27,7 @@ def error(str, return_value=0): index) = inspect.getouterframes(inspect.currentframe())[1] sys.stderr.write("ERROR: file {0}: line {1}: {2}\n".format( 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)) assert return_value == 0 @@ -38,7 +38,7 @@ def warning(str): index) = inspect.getouterframes(inspect.currentframe())[1] sys.stderr.write("WARNING: file {0}: line {1}: {2}\n".format( 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)) @@ -48,7 +48,7 @@ def print_raw(str): def log(str): - if globals.OPTS.output_name != '': + if globals.OPTS.output_name != '': if log.create_file: compile_log = open(globals.OPTS.output_path + globals.OPTS.output_name + '.log', "w+")