Merge remote-tracking branch 'origin/dev' into supply_routing

compiler/characterizer/functional.py

@@ -20,6 +20,10 @@ class functional(simulation):
 
     def __init__(self, sram, spfile, corner):
         simulation.__init__(self, sram, spfile, corner)
+        
+        # Seed the characterizer with a constant seed for unit tests
+        if OPTS.is_unit_test:
+            random.seed(12345)
 
         self.set_corner(corner)
         self.set_spice_constants()

compiler/characterizer/simulation.py

@@ -3,7 +3,6 @@ from design import design
 import debug
 import math
 import tech
-import random
 from .stimuli import *
 from .trim_spice import *
 from .charutils import *

compiler/tests/22_psram_1bank_4mux_func_test.py

@@ -11,7 +11,7 @@ import globals
 from globals import OPTS
 import debug
 
-#@unittest.skip("SKIPPING 22_psram_1bank_4mux_func_test")
+@unittest.skip("SKIPPING 22_psram_1bank_4mux_func_test")
 class psram_1bank_4mux_func_test(openram_test):
 
     def runTest(self):

compiler/tests/22_sram_1bank_nomux_func_test.py

@@ -39,7 +39,7 @@ class sram_1bank_nomux_func_test(openram_test):
         s.sp_write(tempspice)
         
         corner = (OPTS.process_corners[0], OPTS.supply_voltages[0], OPTS.temperatures[0])
-        
+
         f = functional(s.s, tempspice, corner)
         f.num_cycles = 10
         (fail, error) = f.run()