Change unit tests to use verify instead of calibre. Debugging gds read comments in magic.py.

compiler/magic.py

@@ -1,12 +1,21 @@
 """
 This is a DRC/LVS/PEX interface file for magic + netgen. 
 
+This assumes you have the SCMOS magic rules installed. Get these from:
+ftp://ftp.mosis.edu/pub/sondeen/magic/new/beta/current.tar.gz
+and install them in:
+cd /opt/local/lib/magic/sys
+tar zxvf current.tar.gz
+ln -s 2001a current
+
 1. magic can perform drc with the following:
 #!/bin/sh
 magic -dnull -noconsole << EOF
 tech load SCN3ME_SUBM.30
-** import gds file
-load $1.mag -force
+gds rescale false
+gds polygon subcell true
+gds warning default
+gds read $1
 drc count
 drc why
 quit -noprompt
@@ -18,8 +27,10 @@ rm -f $1.ext
 rm -f $1.spice
 magic -dnull -noconsole << EOF
 tech load SCN3ME_SUBM.30
-** import gds file
-load $1.mag -force
+gds rescale false
+gds polygon subcell true
+gds warning default
+gds read $1
 extract
 ext2spice scale off
 ext2spice

compiler/tests/00_code_format_check_test.py

@@ -6,7 +6,7 @@ import sys,os
 sys.path.append(os.path.join(sys.path[0],".."))
 import globals
 import debug
-import calibre
+import verify
 import re
 
 #@unittest.skip("SKIPPING 00_format check test")

compiler/tests/01_library_drc_test.py

@@ -7,7 +7,7 @@ import sys,os
 sys.path.append(os.path.join(sys.path[0],".."))
 import globals
 import debug
-import calibre
+import verify
 import re
 
 OPTS = globals.OPTS
@@ -29,7 +29,7 @@ class library_drc_test(unittest.TestCase):
             if not os.path.isfile(gds_name):
                 drc_errors += 1
                 debug.error("Missing GDS file: {}".format(gds_name))
-            drc_errors += calibre.run_drc(name, gds_name)
+            drc_errors += verify.run_drc(name, gds_name)
 
         # fails if there are any DRC errors on any cells
         self.assertEqual(drc_errors, 0)

compiler/tests/02_library_lvs_test.py

@@ -7,7 +7,7 @@ import sys,os
 sys.path.append(os.path.join(sys.path[0],".."))
 import globals
 import debug
-import calibre
+import verify
 import re
 
 OPTS = globals.OPTS
@@ -33,7 +33,7 @@ class library_lvs_test(unittest.TestCase):
             if not os.path.isfile(sp_name):
                 lvs_errors += 1
                 debug.error("Missing SPICE file {}".format(gds_name))
-            lvs_errors += calibre.run_lvs(f, gds_name, sp_name)
+            lvs_errors += verify.run_lvs(f, gds_name, sp_name)
 
         # fail if the error count is not zero
         self.assertEqual(lvs_errors, 0)

compiler/tests/03_contact_test.py

@@ -7,7 +7,7 @@ import sys,os
 sys.path.append(os.path.join(sys.path[0],".."))
 import globals
 import debug
-import calibre
+import verify
 
 OPTS = globals.OPTS
 
@@ -52,7 +52,7 @@ class contact_test(unittest.TestCase):
     def local_check(self, c):
         tempgds = OPTS.openram_temp + "temp.gds"
         c.gds_write(tempgds)
-        self.assertFalse(calibre.run_drc(c.name, tempgds))
+        self.assertFalse(verify.run_drc(c.name, tempgds))
         os.remove(tempgds)
 
 

compiler/tests/03_path_test.py

@@ -7,7 +7,7 @@ import sys,os
 sys.path.append(os.path.join(sys.path[0],".."))
 import globals
 import debug
-import calibre
+import verify
 
 OPTS = globals.OPTS
 
@@ -94,7 +94,7 @@ class path_test(unittest.TestCase):
     def local_check(self, w):
         tempgds = OPTS.openram_temp + "temp.gds"
         w.gds_write(tempgds)
-        self.assertFalse(calibre.run_drc(w.name, tempgds))
+        self.assertFalse(verify.run_drc(w.name, tempgds))
         os.remove(tempgds)
 
 

compiler/tests/03_ptx_1finger_nmos_test.py

@@ -7,7 +7,7 @@ import sys,os
 sys.path.append(os.path.join(sys.path[0],".."))
 import globals
 import debug
-import calibre
+import verify
 
 OPTS = globals.OPTS
 
@@ -144,7 +144,7 @@ class ptx_test(unittest.TestCase):
         fet.sp_write(tempspice)
         fet.gds_write(tempgds)
 
-        self.assertFalse(calibre.run_drc(fet.name, tempgds))
+        self.assertFalse(verify.run_drc(fet.name, tempgds))
 
         os.remove(tempspice)
         os.remove(tempgds)

compiler/tests/03_ptx_1finger_pmos_test.py

@@ -7,7 +7,7 @@ import sys,os
 sys.path.append(os.path.join(sys.path[0],".."))
 import globals
 import debug
-import calibre
+import verify
 
 OPTS = globals.OPTS
 
@@ -144,7 +144,7 @@ class ptx_test(unittest.TestCase):
         fet.sp_write(tempspice)
         fet.gds_write(tempgds)
 
-        self.assertFalse(calibre.run_drc(fet.name, tempgds))
+        self.assertFalse(verify.run_drc(fet.name, tempgds))
 
         os.remove(tempspice)
         os.remove(tempgds)

compiler/tests/03_ptx_3finger_nmos_test.py

@@ -7,7 +7,7 @@ import sys,os
 sys.path.append(os.path.join(sys.path[0],".."))
 import globals
 import debug
-import calibre
+import verify
 
 OPTS = globals.OPTS
 
@@ -145,7 +145,7 @@ class ptx_test(unittest.TestCase):
         fet.sp_write(tempspice)
         fet.gds_write(tempgds)
 
-        self.assertFalse(calibre.run_drc(fet.name, tempgds))
+        self.assertFalse(verify.run_drc(fet.name, tempgds))
 
         os.remove(tempspice)
         os.remove(tempgds)

compiler/tests/03_ptx_3finger_pmos_test.py

@@ -7,7 +7,7 @@ import sys,os
 sys.path.append(os.path.join(sys.path[0],".."))
 import globals
 import debug
-import calibre
+import verify
 
 OPTS = globals.OPTS
 
@@ -145,7 +145,7 @@ class ptx_test(unittest.TestCase):
         fet.sp_write(tempspice)
         fet.gds_write(tempgds)
 
-        self.assertFalse(calibre.run_drc(fet.name, tempgds))
+        self.assertFalse(verify.run_drc(fet.name, tempgds))
 
         os.remove(tempspice)
         os.remove(tempgds)

compiler/tests/03_wire_test.py

@@ -7,7 +7,7 @@ import sys,os
 sys.path.append(os.path.join(sys.path[0],".."))
 import globals
 import debug
-import calibre
+import verify
 
 OPTS = globals.OPTS
 
@@ -132,7 +132,7 @@ class wire_test(unittest.TestCase):
     def local_check(self, w):
         tempgds = OPTS.openram_temp + "temp.gds"
         w.gds_write(tempgds)
-        self.assertFalse(calibre.run_drc(w.name, tempgds))
+        self.assertFalse(verify.run_drc(w.name, tempgds))
         os.remove(tempgds)
 
 

compiler/tests/04_nand_2_test.py

@@ -11,7 +11,7 @@ import sys,os
 sys.path.append(os.path.join(sys.path[0],".."))
 import globals
 import debug
-import calibre
+import verify
 import sys
 
 OPTS = globals.OPTS
@@ -44,8 +44,8 @@ class nand_2_test(unittest.TestCase):
         tx.sp_write(tempspice)
         tx.gds_write(tempgds)
 
-        self.assertFalse(calibre.run_drc(tx.name, tempgds))
-        self.assertFalse(calibre.run_lvs(tx.name, tempgds, tempspice))
+        self.assertFalse(verify.run_drc(tx.name, tempgds))
+        self.assertFalse(verify.run_lvs(tx.name, tempgds, tempspice))
 
         os.remove(tempspice)
         os.remove(tempgds)

compiler/tests/04_nand_3_test.py

@@ -11,7 +11,7 @@ import sys,os
 sys.path.append(os.path.join(sys.path[0],".."))
 import globals
 import debug
-import calibre
+import verify
 
 OPTS = globals.OPTS
 
@@ -40,8 +40,8 @@ class nand_3_test(unittest.TestCase):
         tx.sp_write(tempspice)
         tx.gds_write(tempgds)
 
-        self.assertFalse(calibre.run_drc(tx.name, tempgds))
-        self.assertFalse(calibre.run_lvs(tx.name, tempgds, tempspice))
+        self.assertFalse(verify.run_drc(tx.name, tempgds))
+        self.assertFalse(verify.run_lvs(tx.name, tempgds, tempspice))
 
         os.remove(tempspice)
         os.remove(tempgds)

compiler/tests/04_nor_2_test.py

@@ -10,7 +10,7 @@ import sys,os
 sys.path.append(os.path.join(sys.path[0],".."))
 import globals
 import debug
-import calibre
+import verify
 import sys
 
 OPTS = globals.OPTS
@@ -42,8 +42,8 @@ class nor_2_test(unittest.TestCase):
         tx.sp_write(tempspice)
         tx.gds_write(tempgds)
 
-        self.assertFalse(calibre.run_drc(tx.name, tempgds))
-        self.assertFalse(calibre.run_lvs(tx.name, tempgds, tempspice))
+        self.assertFalse(verify.run_drc(tx.name, tempgds))
+        self.assertFalse(verify.run_lvs(tx.name, tempgds, tempspice))
         
         os.remove(tempspice)
         os.remove(tempgds)

compiler/tests/04_pinv_test.py

@@ -9,7 +9,7 @@ import sys,os
 sys.path.append(os.path.join(sys.path[0],".."))
 import globals
 import debug
-import calibre
+import verify
 
 OPTS = globals.OPTS
 
@@ -47,8 +47,8 @@ class pinv_test(unittest.TestCase):
         tx.sp_write(tempspice)
         tx.gds_write(tempgds)
 
-        self.assertFalse(calibre.run_drc(tx.name, tempgds))
-        self.assertFalse(calibre.run_lvs(tx.name, tempgds, tempspice))
+        self.assertFalse(verify.run_drc(tx.name, tempgds))
+        self.assertFalse(verify.run_lvs(tx.name, tempgds, tempspice))
 
         os.remove(tempspice)
         os.remove(tempgds)

compiler/tests/04_precharge_test.py

@@ -9,7 +9,7 @@ import sys,os
 sys.path.append(os.path.join(sys.path[0],".."))
 import globals
 import debug
-import calibre
+import verify
 import sys
 
 OPTS = globals.OPTS
@@ -38,8 +38,8 @@ class precharge_test(unittest.TestCase):
         tx.sp_write(tempspice)
         tx.gds_write(tempgds)
 
-        self.assertFalse(calibre.run_drc(tx.name, tempgds))
-        self.assertFalse(calibre.run_lvs(tx.name, tempgds, tempspice))
+        self.assertFalse(verify.run_drc(tx.name, tempgds))
+        self.assertFalse(verify.run_lvs(tx.name, tempgds, tempspice))
 
         os.remove(tempspice)
         os.remove(tempgds)

compiler/tests/04_wordline_driver_test.py

@@ -9,7 +9,7 @@ import sys,os
 sys.path.append(os.path.join(sys.path[0],".."))
 import globals
 import debug
-import calibre
+import verify
 import sys
 
 OPTS = globals.OPTS
@@ -41,8 +41,8 @@ class wordline_driver_test(unittest.TestCase):
         tx.sp_write(tempspice)
         tx.gds_write(tempgds)
 
-        self.assertFalse(calibre.run_drc(tx.name, tempgds))
-        self.assertFalse(calibre.run_lvs(tx.name, tempgds, tempspice))
+        self.assertFalse(verify.run_drc(tx.name, tempgds))
+        self.assertFalse(verify.run_lvs(tx.name, tempgds, tempspice))
 
         os.remove(tempspice)
         os.remove(tempgds)

compiler/tests/05_bitcell_array_test.py

@@ -9,7 +9,7 @@ import sys,os
 sys.path.append(os.path.join(sys.path[0],".."))
 import globals
 import debug
-import calibre
+import verify
 
 OPTS = globals.OPTS
 
@@ -40,8 +40,8 @@ class array_test(unittest.TestCase):
         a.sp_write(tempspice)
         a.gds_write(tempgds)
 
-        self.assertFalse(calibre.run_drc(a.name, tempgds))
-        self.assertFalse(calibre.run_lvs(a.name, tempgds, tempspice))
+        self.assertFalse(verify.run_drc(a.name, tempgds))
+        self.assertFalse(verify.run_lvs(a.name, tempgds, tempspice))
 
         os.remove(tempspice)
         os.remove(tempgds)

compiler/tests/06_hierarchical_decoder_test.py

@@ -9,7 +9,7 @@ import sys,os
 sys.path.append(os.path.join(sys.path[0],".."))
 import globals
 import debug
-import calibre
+import verify
 
 OPTS = globals.OPTS
 
@@ -55,8 +55,8 @@ class hierarchical_decoder_test(unittest.TestCase):
         a.sp_write(tempspice)
         a.gds_write(tempgds)
 
-        self.assertFalse(calibre.run_drc(a.name, tempgds))
-        self.assertFalse(calibre.run_lvs(a.name, tempgds, tempspice))
+        self.assertFalse(verify.run_drc(a.name, tempgds))
+        self.assertFalse(verify.run_lvs(a.name, tempgds, tempspice))
 
         os.remove(tempspice)
         os.remove(tempgds)

compiler/tests/06_hierarchical_predecode2x4_test.py

@@ -9,7 +9,7 @@ import sys,os
 sys.path.append(os.path.join(sys.path[0],".."))
 import globals
 import debug
-import calibre
+import verify
 
 OPTS = globals.OPTS
 
@@ -38,8 +38,8 @@ class hierarchical_predecode2x4_test(unittest.TestCase):
         a.sp_write(tempspice)
         a.gds_write(tempgds)
 
-        self.assertFalse(calibre.run_drc(a.name, tempgds))
-        self.assertFalse(calibre.run_lvs(a.name, tempgds, tempspice))
+        self.assertFalse(verify.run_drc(a.name, tempgds))
+        self.assertFalse(verify.run_lvs(a.name, tempgds, tempspice))
 
         os.remove(tempspice)
         os.remove(tempgds)

compiler/tests/06_hierarchical_predecode3x8_test.py

@@ -9,7 +9,7 @@ import sys,os
 sys.path.append(os.path.join(sys.path[0],".."))
 import globals
 import debug
-import calibre
+import verify
 
 OPTS = globals.OPTS
 
@@ -38,8 +38,8 @@ class hierarchical_predecode3x8_test(unittest.TestCase):
         a.sp_write(tempspice)
         a.gds_write(tempgds)
 
-        self.assertFalse(calibre.run_drc(a.name, tempgds))
-        self.assertFalse(calibre.run_lvs(a.name, tempgds, tempspice))
+        self.assertFalse(verify.run_drc(a.name, tempgds))
+        self.assertFalse(verify.run_lvs(a.name, tempgds, tempspice))
 
         os.remove(tempspice)
         os.remove(tempgds)

compiler/tests/07_single_level_column_mux_array_test.py

@@ -9,7 +9,7 @@ import sys,os
 sys.path.append(os.path.join(sys.path[0],".."))
 import globals
 import debug
-import calibre
+import verify
 
 OPTS = globals.get_opts()
 
@@ -45,8 +45,8 @@ class single_level_column_mux_test(unittest.TestCase):
         a.sp_write(tempspice)
         a.gds_write(tempgds)
 
-        self.assertFalse(calibre.run_drc(a.name, tempgds))
-        self.assertFalse(calibre.run_lvs(a.name, tempgds, tempspice))
+        self.assertFalse(verify.run_drc(a.name, tempgds))
+        self.assertFalse(verify.run_lvs(a.name, tempgds, tempspice))
 
         os.remove(tempspice)
         os.remove(tempgds)

compiler/tests/08_precharge_array_test.py

@@ -9,7 +9,7 @@ import sys,os
 sys.path.append(os.path.join(sys.path[0],".."))
 import globals
 import debug
-import calibre
+import verify
 
 OPTS = globals.get_opts()
 
@@ -39,8 +39,8 @@ class precharge_test(unittest.TestCase):
         pc.sp_write(tempspice)
         pc.gds_write(tempgds)
 
-        self.assertFalse(calibre.run_drc(pc.name, tempgds))
-        self.assertFalse(calibre.run_lvs(pc.name, tempgds, tempspice))
+        self.assertFalse(verify.run_drc(pc.name, tempgds))
+        self.assertFalse(verify.run_lvs(pc.name, tempgds, tempspice))
 
         os.remove(tempspice)
         os.remove(tempgds)

compiler/tests/09_sense_amp_array_test.py

@@ -9,7 +9,7 @@ import sys,os
 sys.path.append(os.path.join(sys.path[0],".."))
 import globals
 import debug
-import calibre
+import verify
 
 OPTS = globals.get_opts()
 
@@ -43,8 +43,8 @@ class sense_amp_test(unittest.TestCase):
         a.sp_write(tempspice)
         a.gds_write(tempgds)
 
-        self.assertFalse(calibre.run_drc(a.name, tempgds))
-        self.assertFalse(calibre.run_lvs(a.name, tempgds, tempspice))
+        self.assertFalse(verify.run_drc(a.name, tempgds))
+        self.assertFalse(verify.run_lvs(a.name, tempgds, tempspice))
 
         os.remove(tempspice)
         os.remove(tempgds)

compiler/tests/10_write_driver_array_test.py

@@ -9,7 +9,7 @@ import sys,os
 sys.path.append(os.path.join(sys.path[0],".."))
 import globals
 import debug
-import calibre
+import verify
 
 OPTS = globals.get_opts()
 
@@ -42,8 +42,8 @@ class write_driver_test(unittest.TestCase):
         a.sp_write(tempspice)
         a.gds_write(tempgds)
 
-        self.assertFalse(calibre.run_drc(a.name, tempgds))
-        self.assertFalse(calibre.run_lvs(a.name, tempgds, tempspice))
+        self.assertFalse(verify.run_drc(a.name, tempgds))
+        self.assertFalse(verify.run_lvs(a.name, tempgds, tempspice))
 
         os.remove(tempspice)
         os.remove(tempgds)

compiler/tests/11_ms_flop_array_test.py

@@ -9,7 +9,7 @@ import sys,os
 sys.path.append(os.path.join(sys.path[0],".."))
 import globals
 import debug
-import calibre
+import verify
 import importlib
 
 OPTS = globals.get_opts()
@@ -43,8 +43,8 @@ class dff_array_test(unittest.TestCase):
         a.sp_write(tempspice)
         a.gds_write(tempgds)
 
-        self.assertFalse(calibre.run_drc(a.name, tempgds))
-        self.assertFalse(calibre.run_lvs(a.name, tempgds, tempspice))
+        self.assertFalse(verify.run_drc(a.name, tempgds))
+        self.assertFalse(verify.run_lvs(a.name, tempgds, tempspice))
 
         os.remove(tempspice)
         os.remove(tempgds)

compiler/tests/12_tri_gate_array_test.py

@@ -9,7 +9,7 @@ import sys,os
 sys.path.append(os.path.join(sys.path[0],".."))
 import globals
 import debug
-import calibre
+import verify
 
 OPTS = globals.get_opts()
 
@@ -41,8 +41,8 @@ class tri_gate_array_test(unittest.TestCase):
         a.sp_write(tempspice)
         a.gds_write(tempgds)
 
-        self.assertFalse(calibre.run_drc(a.name, tempgds))
-        self.assertFalse(calibre.run_lvs(a.name, tempgds, tempspice))
+        self.assertFalse(verify.run_drc(a.name, tempgds))
+        self.assertFalse(verify.run_lvs(a.name, tempgds, tempspice))
 
         os.remove(tempspice)
         os.remove(tempgds)

compiler/tests/13_replica_bitline_test.py

@@ -9,7 +9,7 @@ import sys,os
 sys.path.append(os.path.join(sys.path[0],".."))
 import globals
 import debug
-import calibre
+import verify
 import importlib
 
 OPTS = globals.get_opts()
@@ -40,8 +40,8 @@ class replica_bitline_test(unittest.TestCase):
         a.sp_write(tempspice)
         a.gds_write(tempgds)
 
-        self.assertFalse(calibre.run_drc(a.name, tempgds))
-        self.assertFalse(calibre.run_lvs(a.name, tempgds, tempspice))
+        self.assertFalse(verify.run_drc(a.name, tempgds))
+        self.assertFalse(verify.run_lvs(a.name, tempgds, tempspice))
 
         os.remove(tempspice)
         os.remove(tempgds)

compiler/tests/14_delay_chain_test.py

@@ -9,7 +9,7 @@ import sys,os
 sys.path.append(os.path.join(sys.path[0],".."))
 import globals
 import debug
-import calibre
+import verify
 
 OPTS = globals.get_opts()
 
@@ -39,8 +39,8 @@ class delay_chain_test(unittest.TestCase):
         a.sp_write(tempspice)
         a.gds_write(tempgds)
 
-        self.assertFalse(calibre.run_drc(a.name, tempgds))
-        self.assertFalse(calibre.run_lvs(a.name, tempgds, tempspice))
+        self.assertFalse(verify.run_drc(a.name, tempgds))
+        self.assertFalse(verify.run_lvs(a.name, tempgds, tempspice))
 
         os.remove(tempspice)
         os.remove(tempgds)

compiler/tests/16_control_logic_test.py

@@ -9,7 +9,7 @@ import sys,os
 sys.path.append(os.path.join(sys.path[0],".."))
 import globals
 import debug
-import calibre
+import verify
 
 OPTS = globals.get_opts()
 
@@ -38,8 +38,8 @@ class control_logic_test(unittest.TestCase):
         a.sp_write(tempspice)
         a.gds_write(tempgds)
 
-        self.assertFalse(calibre.run_drc(a.name, tempgds))
-        self.assertFalse(calibre.run_lvs(a.name, tempgds, tempspice))
+        self.assertFalse(verify.run_drc(a.name, tempgds))
+        self.assertFalse(verify.run_lvs(a.name, tempgds, tempspice))
 
         os.remove(tempspice)
         os.remove(tempgds)

compiler/tests/19_multi_bank_test.py

@@ -9,7 +9,7 @@ import sys,os
 sys.path.append(os.path.join(sys.path[0],".."))
 import globals
 import debug
-import calibre
+import verify
 
 OPTS = globals.get_opts()
 
@@ -51,8 +51,8 @@ class multi_bank_test(unittest.TestCase):
         a.sp_write(tempspice)
         a.gds_write(tempgds)
 
-        self.assertFalse(calibre.run_drc(a.name, tempgds))
-        self.assertFalse(calibre.run_lvs(a.name, tempgds, tempspice))
+        self.assertFalse(verify.run_drc(a.name, tempgds))
+        self.assertFalse(verify.run_lvs(a.name, tempgds, tempspice))
 
         os.remove(tempspice)
         os.remove(tempgds)

compiler/tests/19_single_bank_test.py

@@ -9,7 +9,7 @@ import sys,os
 sys.path.append(os.path.join(sys.path[0],".."))
 import globals
 import debug
-import calibre
+import verify
 
 OPTS = globals.get_opts()
 
@@ -52,8 +52,8 @@ class single_bank_test(unittest.TestCase):
         a.sp_write(tempspice)
         a.gds_write(tempgds)
 
-        self.assertFalse(calibre.run_drc(a.name, tempgds))
-        self.assertFalse(calibre.run_lvs(a.name, tempgds, tempspice))
+        self.assertFalse(verify.run_drc(a.name, tempgds))
+        self.assertFalse(verify.run_lvs(a.name, tempgds, tempspice))
 
         os.remove(tempspice)
         os.remove(tempgds)

compiler/tests/20_sram_1bank_test.py

@@ -9,7 +9,7 @@ import sys,os
 sys.path.append(os.path.join(sys.path[0],".."))
 import globals
 import debug
-import calibre
+import verify
 
 OPTS = globals.get_opts()
 
@@ -51,9 +51,9 @@ class sram_1bank_test(unittest.TestCase):
         a.sp_write(tempspice)
         a.gds_write(tempgds)
 
-        self.assertFalse(calibre.run_drc(a.name, tempgds))
-        self.assertFalse(calibre.run_lvs(a.name, tempgds, tempspice))
-        #self.assertFalse(calibre.run_pex(a.name, tempgds, tempspice, output=OPTS.openram_temp+"temp_pex.sp"))
+        self.assertFalse(verify.run_drc(a.name, tempgds))
+        self.assertFalse(verify.run_lvs(a.name, tempgds, tempspice))
+        #self.assertFalse(verify.run_pex(a.name, tempgds, tempspice, output=OPTS.openram_temp+"temp_pex.sp"))
 
         os.remove(tempspice)
         os.remove(tempgds)

compiler/tests/20_sram_2bank_test.py

@@ -9,7 +9,7 @@ import sys,os
 sys.path.append(os.path.join(sys.path[0],".."))
 import globals
 import debug
-import calibre
+import verify
 
 OPTS = globals.get_opts()
 
@@ -51,9 +51,9 @@ class sram_2bank_test(unittest.TestCase):
         a.sp_write(tempspice)
         a.gds_write(tempgds)
 
-        self.assertFalse(calibre.run_drc(a.name, tempgds))
-        self.assertFalse(calibre.run_lvs(a.name, tempgds, tempspice))
-        #self.assertFalse(calibre.run_pex(a.name, tempgds, tempspice, output=OPTS.openram_temp+"temp_pex.sp"))
+        self.assertFalse(verify.run_drc(a.name, tempgds))
+        self.assertFalse(verify.run_lvs(a.name, tempgds, tempspice))
+        #self.assertFalse(verify.run_pex(a.name, tempgds, tempspice, output=OPTS.openram_temp+"temp_pex.sp"))
 
         os.remove(tempspice)
         os.remove(tempgds)

compiler/tests/20_sram_4bank_test.py

@@ -9,7 +9,7 @@ import sys,os
 sys.path.append(os.path.join(sys.path[0],".."))
 import globals
 import debug
-import calibre
+import verify
 
 OPTS = globals.get_opts()
 
@@ -51,9 +51,9 @@ class sram_4bank_test(unittest.TestCase):
         a.sp_write(tempspice)
         a.gds_write(tempgds)
 
-        self.assertFalse(calibre.run_drc(a.name, tempgds))
-        self.assertFalse(calibre.run_lvs(a.name, tempgds, tempspice))
-        #self.assertFalse(calibre.run_pex(a.name, tempgds, tempspice, output=OPTS.openram_temp+"temp_pex.sp"))
+        self.assertFalse(verify.run_drc(a.name, tempgds))
+        self.assertFalse(verify.run_lvs(a.name, tempgds, tempspice))
+        #self.assertFalse(verify.run_pex(a.name, tempgds, tempspice, output=OPTS.openram_temp+"temp_pex.sp"))
 
         os.remove(tempspice)
         os.remove(tempgds)

compiler/tests/21_hspice_delay_test.py

@@ -9,7 +9,7 @@ import sys,os
 sys.path.append(os.path.join(sys.path[0],".."))
 import globals
 import debug
-import calibre
+import verify
 
 OPTS = globals.get_opts()
 

compiler/tests/21_hspice_setuphold_test.py

@@ -9,7 +9,7 @@ import sys,os
 sys.path.append(os.path.join(sys.path[0],".."))
 import globals
 import debug
-import calibre
+import verify
 
 OPTS = globals.get_opts()
 

compiler/tests/21_ngspice_delay_test.py

@@ -9,7 +9,7 @@ import sys,os
 sys.path.append(os.path.join(sys.path[0],".."))
 import globals
 import debug
-import calibre
+import verify
 
 OPTS = globals.get_opts()
 

compiler/tests/21_ngspice_setuphold_test.py

@@ -9,7 +9,7 @@ import sys,os
 sys.path.append(os.path.join(sys.path[0],".."))
 import globals
 import debug
-import calibre
+import verify
 
 OPTS = globals.get_opts()
 

compiler/tests/22_pex_func_test_with_pinv.py

@@ -9,7 +9,7 @@ import sys,os
 sys.path.append(os.path.join(sys.path[0],".."))
 import globals
 import debug
-import calibre
+import verify
 
 OPTS = globals.get_opts()
 
@@ -47,9 +47,9 @@ class sram_func_test(unittest.TestCase):
         s.sp_write(tempspice)
         s.gds_write(tempgds)
 
-        self.assertFalse(calibre.run_drc(s.name, tempgds))
-        self.assertFalse(calibre.run_lvs(s.name, tempgds, tempspice))
-        self.assertFalse(calibre.run_pex(s.name, tempgds,
+        self.assertFalse(verify.run_drc(s.name, tempgds))
+        self.assertFalse(verify.run_lvs(s.name, tempgds, tempspice))
+        self.assertFalse(verify.run_pex(s.name, tempgds,
                                          tempspice, output=OPTS.openram_temp + "temp_pex.sp"))
 
         import sp_file

compiler/tests/22_sram_func_test.py

@@ -9,7 +9,7 @@ import sys,os
 sys.path.append(os.path.join(sys.path[0],".."))
 import globals
 import debug
-import calibre
+import verify
 
 OPTS = globals.get_opts()
 

compiler/tests/23_lib_sram_model_test.py

@@ -9,7 +9,7 @@ import sys,os
 sys.path.append(os.path.join(sys.path[0],".."))
 import globals
 import debug
-import calibre
+import verify
 
 OPTS = globals.get_opts()
 

compiler/tests/23_lib_sram_prune_test.py

@@ -9,7 +9,7 @@ import sys,os
 sys.path.append(os.path.join(sys.path[0],".."))
 import globals
 import debug
-import calibre
+import verify
 
 OPTS = globals.get_opts()
 

compiler/tests/23_lib_sram_test.py

@@ -9,7 +9,7 @@ import sys,os
 sys.path.append(os.path.join(sys.path[0],".."))
 import globals
 import debug
-import calibre
+import verify
 
 OPTS = globals.get_opts()
 

compiler/tests/24_lef_sram_test.py

@@ -9,7 +9,7 @@ import sys,os
 sys.path.append(os.path.join(sys.path[0],".."))
 import globals
 import debug
-import calibre
+import verify
 
 OPTS = globals.get_opts()
 

compiler/tests/25_verilog_sram_test.py

@@ -9,7 +9,7 @@ import sys,os
 sys.path.append(os.path.join(sys.path[0],".."))
 import globals
 import debug
-import calibre
+import verify
 
 OPTS = globals.get_opts()
 

compiler/verify.py

@@ -9,7 +9,6 @@ If not, OpenRAM will continue as if nothing happened!
 """
 
 import debug
-import tech
 from globals import OPTS