moved DRC and LVS error reports to datasheet.info from datasheet.py

compiler/characterizer/lib.py

@@ -533,6 +533,17 @@ class lib:
                         git_id
                         ))
 
+        # information of checks
+        from hierarchy_design import total_drc_errors
+        from hierarchy_design import total_lvs_errors
+        DRC = 'skipped'
+        LVS = 'skipped'
+        if OPTS.check_lvsdrc:
+            DRC = str(total_drc_errors)
+            LVS = str(total_lvs_errors)
+
+        datasheet.write("{0},{1},".format(DRC, LVS))
+
         for port in self.all_ports:
             #DIN timings
             if port in self.write_ports:
@@ -627,8 +638,11 @@ class lib:
                         min(list(map(round_time,self.times["hold_times_HL"]))),
                         max(list(map(round_time,self.times["hold_times_HL"])))
 
-                        )) 
-                                                                                            
+                        ))
+
+
+
+
         datasheet.write("END\n")
         datasheet.close()
                 

compiler/datasheet/datasheet.py

@@ -4,8 +4,6 @@ from characterization_corners import *
 from deliverables import *
 from timing_and_current_data import *
 from in_out import *
-from hierarchy_design import total_drc_errors
-from hierarchy_design import total_lvs_errors
 import os
 import csv
 import base64
@@ -33,15 +31,6 @@ class datasheet():
             #css styling is kept in a seperate file
             self.html += datasheet_css.read()
 
-        if OPTS.check_lvsdrc:
-            
-            DRC = str(total_drc_errors) + ' errors'
-            LVS = str(total_lvs_errors) + ' errors'
-            PEX = 'n/a'
-        else:
-            DRC = 'skipped'
-            LVS = 'skipped'
-            PEX = 'skipped'
         
         with open(OPTS.openram_temp + "/datasheet.info") as info:           
             self.html += '<!--'
@@ -65,8 +54,8 @@ class datasheet():
 
 
         self.html +='<p style="font-size: 18px;font-family: Trebuchet MS, Arial, Helvetica, sans-serif;">'+ self.name + '.html' + '</p>'
-        self.html +='<p style="font-size: 18px;font-family: Trebuchet MS, Arial, Helvetica, sans-serif;">'+ 'DRC: ' + str(DRC) + '</p>'
-        self.html +='<p style="font-size: 18px;font-family: Trebuchet MS, Arial, Helvetica, sans-serif;">'+ 'LVS: ' + str(LVS) + '</p>'
+        self.html +='<p style="font-size: 18px;font-family: Trebuchet MS, Arial, Helvetica, sans-serif;">'+ 'DRC: ' + str(self.DRC) + '</p>'
+        self.html +='<p style="font-size: 18px;font-family: Trebuchet MS, Arial, Helvetica, sans-serif;">'+ 'LVS: ' + str(self.LVS) + '</p>'
         self.html += '<p style="font-size: 18px;font-family: Trebuchet MS, Arial, Helvetica, sans-serif;">'+ 'Git commit id: ' + str(self.git_id) + '</p>'
 
         self.html +='<p style="font-size: 26px;font-family: Trebuchet MS, Arial, Helvetica, sans-serif;">Ports and Configuration (DEBUG)</p>'

compiler/datasheet/datasheet_gen.py

@@ -102,6 +102,11 @@ def parse_characterizer_csv(sram,f,pages):
             ORIGIN_ID = row[col]
             col += 1
 
+            DRC = row[col]
+            col += 1
+
+            LVS = row[col]
+            col += 1
     
             for sheet in pages:
 
@@ -336,6 +341,9 @@ def parse_characterizer_csv(sram,f,pages):
                                         col += 2
 
                             col += 1
+
+
+
                         else:
                             break
 
@@ -351,6 +359,9 @@ def parse_characterizer_csv(sram,f,pages):
                 pages.append(new_sheet)
 
                 new_sheet.git_id = ORIGIN_ID 
+                new_sheet.DRC = DRC
+                new_sheet.LVS = LVS
+
 
                 new_sheet.corners.append(characterization_corners_item(PROC,process_name(PROC),VOLT,TEMP,LIB_NAME.replace(OUT_DIR,'').replace(NAME,'')))
 
@@ -470,7 +481,8 @@ def parse_characterizer_csv(sram,f,pages):
                 new_sheet.io.append(in_out_item('NUM_R_PORTS',NUM_R_PORTS))
                 new_sheet.io.append(in_out_item('NUM_W_PORTS',NUM_W_PORTS))
                 new_sheet.io.append(in_out_item('Area',sram.width * sram.height))
-                
+
+
 
 
 

compiler/datasheet/server_scripts/deliverable.py

@@ -1,7 +1,19 @@
-class deliverable:
-    def __init__(self, name, file_type, path, size):
-        self.name = name
-        self.file_type = file_type
-        self.path = path
-        self.size = size
+from flask_table import *
 
+class deliverables(Table):
+    """
+    Set up delivarables table columns and title information
+    """
+    typ = Col('Type')
+    description = Col('Description')
+    link = Col('Link')
+
+
+class deliverables_item(object):
+    """
+    Define deliverables table row elemenent information
+    """
+    def __init__(self, typ, description,link):
+        self.typ = typ
+        self.description = description
+        self.link = link

compiler/datasheet/server_scripts/filelist.py

@@ -14,6 +14,3 @@ class filelist:
                 out_file.write('{}/{}\n'.format(root,file))
                 #print('{}/{}'.format(root,file))
 
-
-
-