Add num_threads to options. PEP8 cleanup.

compiler/characterizer/stimuli.py

@@ -271,7 +271,6 @@ class stimuli():
         # end the stimulus file
         self.sf.write(".end\n\n")
 
-
     def write_include(self, circuit):
         """Writes include statements, inputs are lists of model files"""
 
@@ -291,7 +290,6 @@ class stimuli():
             else:
                 debug.error("Could not find spice model: {0}\nSet SPICE_MODEL_DIR to over-ride path.\n".format(item))
 
-
     def write_supply(self):
         """ Writes supply voltage statements """
         gnd_node_name = "0"
@@ -314,13 +312,15 @@ class stimuli():
             xa_cfg.write("set_sim_level -level 7\n")
             xa_cfg.write("set_powernet_level 7 -node vdd\n")
             xa_cfg.close()
-            cmd = "{0} {1} -c {2}xa.cfg -o {2}xa -mt 2".format(OPTS.spice_exe,
+            cmd = "{0} {1} -c {2}xa.cfg -o {2}xa -mt {3}".format(OPTS.spice_exe,
                                                                  temp_stim,
-                                                               OPTS.openram_temp)
+                                                                 OPTS.openram_temp,
+                                                                 OPTS.num_threads)
             valid_retcode=0
         elif OPTS.spice_name == "hspice":
             # TODO: Should make multithreading parameter a configuration option
-            cmd = "{0} -mt 2 -i {1} -o {2}timing".format(OPTS.spice_exe,
+            cmd = "{0} -mt {1} -i {2} -o {3}timing".format(OPTS.spice_exe,
+                                                           OPTS.num_threads,
                                                            temp_stim,
                                                            OPTS.openram_temp)
             valid_retcode=0
@@ -328,13 +328,16 @@ class stimuli():
             # ngspice 27+ supports threading with "set num_threads=4" in the stimulus file or a .spiceinit
             # Measurements can't be made with a raw file set in ngspice
             # -r {2}timing.raw
+            ng_cfg = open("{}.spinit".format(OPTS.openram_temp), "w")
+            ng_cfg.write("set num_threads={}\n".format(OPTS.num_threads))
+            ng_cfg.close()
+
             cmd = "{0} -b -o {2}timing.lis {1}".format(OPTS.spice_exe,
                                                        temp_stim,
                                                        OPTS.openram_temp)
             # for some reason, ngspice-25 returns 1 when it only has acceptable warnings
             valid_retcode=1
 
-        
         spice_stdout = open("{0}spice_stdout.log".format(OPTS.openram_temp), 'w')
         spice_stderr = open("{0}spice_stderr.log".format(OPTS.openram_temp), 'w')
         

compiler/options.py

@@ -119,6 +119,9 @@ class options(optparse.Values):
     # For sky130, we need magic for filtering.
     magic_exe = None
 
+    # Number of threads to use
+    num_threads = 4
+
     # Should we print out the banner at startup
     print_banner = True