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

README

@@ -91,9 +91,9 @@ Steps to run regression testing:
 1) First, ensure your setup_scripts is correctly setup.
 2) Navigate to the compiler directory: cd $OPENRAM_HOME
 3) Use the command: 
-   python tests/regress.py -t freepdk45
+   python tests/regress.py 
 4) To run a specific test:
-   python tests/{unit test}.py -t freepdk45
+   python tests/{unit test}.py 
 
 The unit tests take the same arguments as openram.py itself. 
 
@@ -101,7 +101,8 @@ To increase the verbosity of the test, add one (or more) -v options:
 python tests/00_code_format_check_test.py -v -t freepdk45
 
 To specify a particular technology use "-t <techname>" such as
-"-t scn3me_subm". 
+"-t scn3me_subm". The default for a unit test is freepdk45 whereas
+the default for openram.py is specified in the configuration file.
 
 A regression daemon script that can be used with cron is included:
 regress_daemon.py

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,8 +250,9 @@ def import_tech():
 
     debug.info(2,"Importing technology: " + OPTS.tech_name)
 
-    if OPTS.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
+    OPTS.tech_name = OPTS.config.tech_name
+    
     
         # environment variable should point to the technology dir
     try: