From c22025839c5b10b022030574a006e667c54931cd Mon Sep 17 00:00:00 2001 From: Jesse Cirimelli-Low Date: Thu, 31 Jan 2019 08:28:51 -0800 Subject: [PATCH] datasheet now indicates if analytical or characterizer is used --- compiler/characterizer/lib.py | 5 +++-- compiler/datasheet/datasheet.py | 6 ++++++ compiler/datasheet/datasheet_gen.py | 5 +++++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/compiler/characterizer/lib.py b/compiler/characterizer/lib.py index a38ecd93..a63c773c 100644 --- a/compiler/characterizer/lib.py +++ b/compiler/characterizer/lib.py @@ -526,7 +526,7 @@ class lib: datasheet = open(OPTS.openram_temp +'/datasheet.info', 'a+') current_time = datetime.date.today() - datasheet.write("{0},{1},{2},{3},{4},{5},{6},{7},{8},{9},{10},{11},{12},{13},{14},{15},".format( + datasheet.write("{0},{1},{2},{3},{4},{5},{6},{7},{8},{9},{10},{11},{12},{13},{14},{15},{16},".format( OPTS.output_name, OPTS.num_words, OPTS.num_banks, @@ -542,7 +542,8 @@ class lib: lib_name, OPTS.word_size, git_id, - current_time + current_time, + OPTS.analytical_delay )) # information of checks diff --git a/compiler/datasheet/datasheet.py b/compiler/datasheet/datasheet.py index d15733d5..71d1f9dd 100644 --- a/compiler/datasheet/datasheet.py +++ b/compiler/datasheet/datasheet.py @@ -59,6 +59,12 @@ class datasheet(): self.html += self.operating_table.to_html() self.html += '

Timing and Current Data

' + model = '' + if self.ANALYTICAL_MODEL: + model = "analytical model: results may not be percise" + else: + model = "spice characterizer" + self.html += '

Using '+model+'

' # self.html += timing_and_current_data(self.timing,table_id='data').__html__() self.html += self.timing_table.to_html() diff --git a/compiler/datasheet/datasheet_gen.py b/compiler/datasheet/datasheet_gen.py index 24bc3953..664f88c5 100644 --- a/compiler/datasheet/datasheet_gen.py +++ b/compiler/datasheet/datasheet_gen.py @@ -115,6 +115,10 @@ def parse_characterizer_csv(f, pages): AREA = row[col] col += 1 + + ANALYTICAL_MODEL = row[col] + col += 1 + for sheet in pages: if sheet.name == NAME: @@ -365,6 +369,7 @@ def parse_characterizer_csv(f, pages): new_sheet.time = DATETIME new_sheet.DRC = DRC new_sheet.LVS = LVS + new_sheet.ANALYTICAL_MODEL = ANALYTICAL_MODEL new_sheet.description = [NAME, NUM_WORDS, NUM_BANKS, NUM_RW_PORTS, NUM_W_PORTS, NUM_R_PORTS, TECH_NAME, MIN_PERIOD, WORD_SIZE, ORIGIN_ID, DATETIME]