Improve output format. Rename option to be more sensible.

compiler/tests/21_hspice_delay_test.py

@@ -21,7 +21,7 @@ class timing_sram_test(unittest.TestCase):
         globals.init_openram("config_20_{0}".format(OPTS.tech_name))
         # we will manually run lvs/drc
         OPTS.check_lvsdrc = False
-        OPTS.spice_version="hspice"
+        OPTS.spice_name="hspice"
         OPTS.analytical_delay = False
         # This is a hack to reload the characterizer __init__ with the spice version
         import characterizer

compiler/tests/21_hspice_setuphold_test.py

@@ -22,7 +22,7 @@ class timing_setup_test(unittest.TestCase):
 
         # we will manually run lvs/drc
         OPTS.check_lvsdrc = False
-        OPTS.spice_version="hspice"
+        OPTS.spice_name="hspice"
         OPTS.analytical_delay = False
         import characterizer
         reload(characterizer)

compiler/tests/21_ngspice_delay_test.py

@@ -19,7 +19,7 @@ class timing_sram_test(unittest.TestCase):
         globals.init_openram("config_20_{0}".format(OPTS.tech_name))
         # we will manually run lvs/drc
         OPTS.check_lvsdrc = False
-        OPTS.spice_version="ngspice"
+        OPTS.spice_name="ngspice"
         OPTS.analytical_delay = False
         # This is a hack to reload the characterizer __init__ with the spice version
         import characterizer
@@ -82,7 +82,7 @@ class timing_sram_test(unittest.TestCase):
 
         # reset these options
         OPTS.check_lvsdrc = True
-        OPTS.spice_version="hspice"
+        OPTS.spice_name="hspice"
         OPTS.analytical_delay = True
         reload(characterizer)
 

compiler/tests/21_ngspice_setuphold_test.py

@@ -22,7 +22,7 @@ class timing_setup_test(unittest.TestCase):
 
         # we will manually run lvs/drc
         OPTS.check_lvsdrc = False
-        OPTS.spice_version="ngspice"
+        OPTS.spice_name="ngspice"
         OPTS.analytical_delay = False
         # This is a hack to reload the characterizer __init__ with the spice version
         import characterizer
@@ -61,7 +61,7 @@ class timing_setup_test(unittest.TestCase):
 
         # reset these options
         OPTS.check_lvsdrc = True
-        OPTS.spice_version="hspice"
+        OPTS.spice_name="hspice"
         OPTS.analytical_delay = True
         reload(characterizer)
 

compiler/tests/22_pex_func_test_with_pinv.py

@@ -64,7 +64,7 @@ class sram_func_test(unittest.TestCase):
 
         import os
 
-        if OPTS.spice_version == "hspice":
+        if OPTS.spice_name == "hspice":
             cmd = "hspice -mt 2 -i {0} > {1} ".format(
                 simulator_file, result_file)
         else:
@@ -145,7 +145,7 @@ class sram_func_test(unittest.TestCase):
             9.5 * tech.spice["clock_period"], 10 * tech.spice["clock_period"]))
         sim_file.write("\n")
 
-        if OPTS.spice_version == "hspice":
+        if OPTS.spice_name in ["hspice","xa"]:
             sim_file.write(".probe v(x*.*)\n")
             sim_file.write(".tran 0.1ns {0}ns\n".format(
                 10 * tech.spice["clock_period"]))

compiler/tests/22_sram_func_test.py

@@ -22,7 +22,7 @@ class sram_func_test(unittest.TestCase):
 
         # we will manually run lvs/drc
         OPTS.check_lvsdrc = False
-        OPTS.spice_version="hspice"
+        OPTS.spice_name="hspice"
         OPTS.analytical_delay = False
         import characterizer
         reload(characterizer)

compiler/tests/23_lib_sram_prune_test.py

@@ -18,7 +18,7 @@ class lib_test(unittest.TestCase):
         globals.init_openram("config_20_{0}".format(OPTS.tech_name))
         # we will manually run lvs/drc
         OPTS.check_lvsdrc = False
-        OPTS.spice_version="hspice"
+        OPTS.spice_name="hspice"
         OPTS.analytical_delay = False
         import characterizer
         reload(characterizer)