Removing extra functional test and changing name to a more general form. Spice exe can just be selected from the command line with -s.

compiler/tests/22_ngspice_psram_func_test.py

@@ -1,64 +0,0 @@
-#!/usr/bin/env python3
-"""
-Run a regression test on various srams
-"""
-
-import unittest
-from testutils import header,openram_test
-import sys,os
-sys.path.append(os.path.join(sys.path[0],".."))
-import globals
-from globals import OPTS
-import debug
-
-#@unittest.skip("SKIPPING 22_psram_func_test")
-class psram_func_test(openram_test):
-
-    def runTest(self):
-        globals.init_openram("config_20_{0}".format(OPTS.tech_name))
-        OPTS.spice_name="ngspice"
-        OPTS.analytical_delay = False
-        OPTS.netlist_only = True
-        OPTS.bitcell = "pbitcell"
-        OPTS.replica_bitcell="replica_pbitcell"
-        
-        # This is a hack to reload the characterizer __init__ with the spice version
-        from importlib import reload
-        import characterizer
-        reload(characterizer)
-        from characterizer import functional
-        if not OPTS.spice_exe:
-            debug.error("Could not find {} simulator.".format(OPTS.spice_name),-1)
-
-        from sram import sram
-        from sram_config import sram_config
-        c = sram_config(word_size=4,
-                        num_words=32,
-                        num_banks=1)
-        c.words_per_row=2
-        
-        OPTS.num_rw_ports = 1
-        OPTS.num_w_ports = 1
-        OPTS.num_r_ports = 1
-        
-        debug.info(1, "Functional test for 1bit, 16word SRAM, with 1 bank. Multiport with {}RW {}W {}R.".format(OPTS.num_rw_ports, OPTS.num_w_ports, OPTS.num_r_ports))
-        s = sram(c, name="sram1")
-
-        tempspice = OPTS.openram_temp + "temp.sp"
-        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 = 5
-        (fail,error) = f.run()
-        
-        self.assertTrue(fail,error)
-
-        globals.end_openram()
-        
-# instantiate a copdsay of the class to actually run the test
-if __name__ == "__main__":
-    (OPTS, args) = globals.parse_args()
-    del sys.argv[1:]
-    header(__file__, OPTS.tech_name)
-    unittest.main()

compiler/tests/22_ngspice_sram_func_test.py

@@ -1,56 +0,0 @@
-#!/usr/bin/env python3
-"""
-Run a regression test on various srams
-"""
-
-import unittest
-from testutils import header,openram_test
-import sys,os
-sys.path.append(os.path.join(sys.path[0],".."))
-import globals
-from globals import OPTS
-import debug
-
-#@unittest.skip("SKIPPING 22_sram_func_test")
-class sram_func_test(openram_test):
-
-    def runTest(self):
-        globals.init_openram("config_20_{0}".format(OPTS.tech_name))
-        OPTS.spice_name="ngspice"
-        OPTS.analytical_delay = False
-        
-        # This is a hack to reload the characterizer __init__ with the spice version
-        from importlib import reload
-        import characterizer
-        reload(characterizer)
-        from characterizer import functional
-        if not OPTS.spice_exe:
-            debug.error("Could not find {} simulator.".format(OPTS.spice_name),-1)
-
-        from sram import sram
-        from sram_config import sram_config
-        c = sram_config(word_size=4,
-                        num_words=32,
-                        num_banks=1)
-        c.words_per_row=2
-        debug.info(1, "Functional test for 1bit, 16word SRAM, with 1 bank")
-        s = sram(c, name="sram1")
-
-        tempspice = OPTS.openram_temp + "temp.sp"
-        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()
-
-        self.assertTrue(fail,error)
-
-        globals.end_openram()
-        
-# instantiate a copdsay of the class to actually run the test
-if __name__ == "__main__":
-    (OPTS, args) = globals.parse_args()
-    del sys.argv[1:]
-    header(__file__, OPTS.tech_name)
-    unittest.main()

compiler/tests/22_psram_func_test.py

@@ -16,7 +16,7 @@ class psram_func_test(openram_test):
 
     def runTest(self):
         globals.init_openram("config_20_{0}".format(OPTS.tech_name))
-        OPTS.spice_name="hspice"
+        #OPTS.spice_name="hspice"
         OPTS.analytical_delay = False
         OPTS.netlist_only = True
         OPTS.bitcell = "pbitcell"
@@ -33,7 +33,7 @@ class psram_func_test(openram_test):
         from sram import sram
         from sram_config import sram_config
         c = sram_config(word_size=4,
-                        num_words=32,
+                        num_words=64,
                         num_banks=1)
         c.words_per_row=2
         

compiler/tests/22_sram_func_test.py

@@ -16,7 +16,7 @@ class sram_func_test(openram_test):
 
     def runTest(self):
         globals.init_openram("config_20_{0}".format(OPTS.tech_name))
-        OPTS.spice_name="hspice"
+        #OPTS.spice_name="hspice"
         OPTS.analytical_delay = False
         
         # This is a hack to reload the characterizer __init__ with the spice version
@@ -30,7 +30,7 @@ class sram_func_test(openram_test):
         from sram import sram
         from sram_config import sram_config
         c = sram_config(word_size=4,
-                        num_words=32,
+                        num_words=64,
                         num_banks=1)
         c.words_per_row=2
         debug.info(1, "Functional test for 1bit, 16word SRAM, with 1 bank")