Merge remote-tracking branch 'origin/master' into HEAD

compiler/example_config_scn3me_subm.py

@@ -0,0 +1,23 @@
+word_size = 1
+num_words = 16
+num_banks = 1
+
+tech_name = "scn3me_subm"
+
+decoder = "hierarchical_decoder"
+ms_flop = "ms_flop"
+ms_flop_array = "ms_flop_array"
+control_logic = "control_logic"
+bitcell_array = "bitcell_array"
+sense_amp = "sense_amp"
+sense_amp_array = "sense_amp_array"
+precharge_array = "precharge_array"
+column_mux_array = "single_level_column_mux_array"
+write_driver = "write_driver"
+write_driver_array = "write_driver_array"
+tri_gate = "tri_gate"
+tri_gate_array = "tri_gate_array"
+wordline_driver = "wordline_driver"
+replica_bitcell = "replica_bitcell"
+bitcell = "bitcell"
+delay_chain = "logic_effort_dc"

compiler/globals.py

@@ -62,6 +62,12 @@ def parse_args():
 
     (options, args) = parser.parse_args(values=OPTS)
 
+    # If we don't specify a tech, assume freepdk45.
+    # This may be overridden when we read a config file though...
+    if OPTS.tech_name == "":
+        OPTS.tech_name = "freepdk45"
+    
+
     return (options, args)
 
 
@@ -244,9 +250,10 @@ def import_tech():
 
     debug.info(2,"Importing technology: " + OPTS.tech_name)
 
-    if OPTS.tech_name == "":
-        OPTS.tech_name = OPTS.config.tech_name
-
+    # Set the tech to the config file we read in instead of the command line value.
+    OPTS.tech_name = OPTS.config.tech_name
+    
+    
         # environment variable should point to the technology dir
     try:
         OPENRAM_TECH = os.path.abspath(os.environ.get("OPENRAM_TECH"))