Merge remote-tracking branch 'private/dev' into dev

compiler/base/hierarchy_design.py

@@ -85,8 +85,9 @@ class hierarchy_design(hierarchy_spice.spice, hierarchy_layout.layout):
                             "LVS failed for {0} with {1} errors(s)".format(self.name,
                                                                            num_lvs_errors))
 
-            os.remove(tempspice)
-            os.remove(tempgds)
+            if OPTS.purge_temp:
+                os.remove(tempspice)
+                os.remove(tempgds)
             
             return (num_drc_errors, num_lvs_errors)
         else:
@@ -111,7 +112,8 @@ class hierarchy_design(hierarchy_spice.spice, hierarchy_layout.layout):
                         "DRC failed for {0} with {1} error(s)".format(self.name,
                                                                       num_errors))
 
-            os.remove(tempgds)
+            if OPTS.purge_temp:
+                os.remove(tempgds)
 
             return num_errors
         else:
@@ -137,8 +139,9 @@ class hierarchy_design(hierarchy_spice.spice, hierarchy_layout.layout):
             debug.check(num_errors == 0,
                         "LVS failed for {0} with {1} error(s)".format(self.name,
                                                                       num_errors))
-            os.remove(tempspice)
-            os.remove(tempgds)
+            if OPTS.purge_temp:
+                os.remove(tempspice)
+                os.remove(tempgds)
 
             return num_errors
         else:

compiler/openram.py

@@ -57,7 +57,7 @@ c = sram_config(word_size=OPTS.word_size,
                 num_spare_rows=OPTS.num_spare_rows)
 debug.print_raw("Words per row: {}".format(c.words_per_row))
 
-output_extensions = ["sp", "v", "lib", "py", "html", "log"]
+output_extensions = ["lvs", "sp", "v", "lib", "py", "html", "log"]
 # Only output lef/gds if back-end
 if not OPTS.netlist_only:
     output_extensions.extend(["lef", "gds"])

compiler/sram/sram.py

@@ -88,6 +88,13 @@ class sram():
         self.sp_write(spname)
         print_time("Spice writing", datetime.datetime.now(), start_time)
 
+        # Save the LVS file
+        start_time = datetime.datetime.now()
+        spname = OPTS.output_path + self.s.name + ".lvs"
+        debug.print_raw("LVS: Writing to {0}".format(spname))
+        self.lvs_write(spname)
+        print_time("LVS writing", datetime.datetime.now(), start_time)
+        
         # Save the extracted spice file
         if OPTS.use_pex:
             import verify

compiler/verify/magic.py

@@ -38,7 +38,7 @@ def filter_gds(cell_name, input_gds, output_gds):
     global OPTS
 
     # Copy .magicrc file into temp dir
-    magic_file = OPTS.openram_tech + "mag_lib/.magicrc"
+    magic_file = OPTS.openram_tech + "tech/.magicrc"
     if os.path.exists(magic_file):
         shutil.copy(magic_file, OPTS.openram_temp)
     else:
@@ -135,7 +135,7 @@ def write_netgen_script(cell_name):
     global OPTS
 
     setup_file = "setup.tcl"
-    full_setup_file = OPTS.openram_tech + "mag_lib/" + setup_file
+    full_setup_file = OPTS.openram_tech + "tech/" + setup_file
     if os.path.exists(full_setup_file):
         # Copy setup.tcl file into temp dir
         shutil.copy(full_setup_file, OPTS.openram_temp)
@@ -166,7 +166,7 @@ def run_drc(cell_name, gds_name, extract=True, final_verification=False):
         shutil.copy(gds_name, OPTS.openram_temp)
 
     # Copy .magicrc file into temp dir
-    magic_file = OPTS.openram_tech + "mag_lib/.magicrc"
+    magic_file = OPTS.openram_tech + "tech/.magicrc"
     if os.path.exists(magic_file):
         shutil.copy(magic_file, OPTS.openram_temp)
     else: