Move verify into a module. Make characterizer a module. Move exe searching to modules.

compiler/tests/21_hspice_delay_test.py

@@ -24,8 +24,11 @@ class timing_sram_test(unittest.TestCase):
         OPTS.check_lvsdrc = False
         OPTS.spice_version="hspice"
         OPTS.analytical_delay = False
-        globals.set_spice()
-        
+        # This is a hack to reload the characterizer __init__ with the spice version
+        import characterizer
+        reload(characterizer)
+        from characterizer import delay
+
         import sram
 
         debug.info(1, "Testing timing for sample 1bit, 16words SRAM with 1 bank")
@@ -36,8 +39,6 @@ class timing_sram_test(unittest.TestCase):
 
         OPTS.check_lvsdrc = True
 
-        import delay
-
         tempspice = OPTS.openram_temp + "temp.sp"
         s.sp_write(tempspice)
 

compiler/tests/21_hspice_setuphold_test.py

@@ -23,8 +23,7 @@ class timing_setup_test(unittest.TestCase):
 
         # we will manually run lvs/drc
         OPTS.check_lvsdrc = False
-        OPTS.spice_version="hspice"
-        globals.set_spice()
+        from characterizer import delay
 
         import sram
         import tech

compiler/tests/21_ngspice_delay_test.py

@@ -22,8 +22,11 @@ class timing_sram_test(unittest.TestCase):
         OPTS.check_lvsdrc = False
         OPTS.spice_version="ngspice"
         OPTS.analytical_delay = False
-        globals.set_spice()
-        
+        # This is a hack to reload the characterizer __init__ with the spice version
+        import characterizer
+        reload(characterizer)
+        from characterizer import delay
+
         import sram
 
         debug.info(1, "Testing timing for sample 1bit, 16words SRAM with 1 bank")
@@ -32,8 +35,6 @@ class timing_sram_test(unittest.TestCase):
                       num_banks=OPTS.config.num_banks,
                       name="sram1")
 
-        import delay
-
         tempspice = OPTS.openram_temp + "temp.sp"
         s.sp_write(tempspice)
 
@@ -84,7 +85,7 @@ class timing_sram_test(unittest.TestCase):
         OPTS.check_lvsdrc = True
         OPTS.spice_version="hspice"
         OPTS.analytical_delay = True
-        globals.set_spice()
+        reload(characterizer)
 
         os.remove(tempspice)
 

compiler/tests/21_ngspice_setuphold_test.py

@@ -23,14 +23,15 @@ class timing_setup_test(unittest.TestCase):
         # we will manually run lvs/drc
         OPTS.check_lvsdrc = False
         OPTS.spice_version="ngspice"
-        globals.set_spice()
+        # This is a hack to reload the characterizer __init__ with the spice version
+        import characterizer
+        reload(characterizer)
+        from characterizer import setup_hold
         
         import sram
         import tech
         slews = [tech.spice["rise_time"]*2]
         
-        import setup_hold
-        
         sh = setup_hold.setup_hold()
         data = sh.analyze(slews,slews)
 
@@ -60,7 +61,9 @@ class timing_setup_test(unittest.TestCase):
         # reset these options
         OPTS.check_lvsdrc = True
         OPTS.spice_version="hspice"
-        globals.set_spice()
+
+        reload(characterizer)
+
         globals.end_openram()
 
 # instantiate a copdsay of the class to actually run the test