diff --git a/compiler/magic.py b/compiler/magic.py index 1c8b229c..38894b5a 100644 --- a/compiler/magic.py +++ b/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 diff --git a/compiler/tests/00_code_format_check_test.py b/compiler/tests/00_code_format_check_test.py index 0ec84651..37d6fb8e 100644 --- a/compiler/tests/00_code_format_check_test.py +++ b/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") diff --git a/compiler/tests/01_library_drc_test.py b/compiler/tests/01_library_drc_test.py index e394d84b..5bb17e6d 100644 --- a/compiler/tests/01_library_drc_test.py +++ b/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) diff --git a/compiler/tests/02_library_lvs_test.py b/compiler/tests/02_library_lvs_test.py index 734784e0..4f87897e 100644 --- a/compiler/tests/02_library_lvs_test.py +++ b/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) diff --git a/compiler/tests/03_contact_test.py b/compiler/tests/03_contact_test.py index 30d98291..d9a1791c 100644 --- a/compiler/tests/03_contact_test.py +++ b/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) diff --git a/compiler/tests/03_path_test.py b/compiler/tests/03_path_test.py index a3a7afe8..604ebeff 100644 --- a/compiler/tests/03_path_test.py +++ b/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) diff --git a/compiler/tests/03_ptx_1finger_nmos_test.py b/compiler/tests/03_ptx_1finger_nmos_test.py index edea14c7..7f8e16f6 100644 --- a/compiler/tests/03_ptx_1finger_nmos_test.py +++ b/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) diff --git a/compiler/tests/03_ptx_1finger_pmos_test.py b/compiler/tests/03_ptx_1finger_pmos_test.py index 8e469730..9351b7ca 100644 --- a/compiler/tests/03_ptx_1finger_pmos_test.py +++ b/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) diff --git a/compiler/tests/03_ptx_3finger_nmos_test.py b/compiler/tests/03_ptx_3finger_nmos_test.py index 915e0196..b0721908 100644 --- a/compiler/tests/03_ptx_3finger_nmos_test.py +++ b/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) diff --git a/compiler/tests/03_ptx_3finger_pmos_test.py b/compiler/tests/03_ptx_3finger_pmos_test.py index c5c56c6e..da606907 100644 --- a/compiler/tests/03_ptx_3finger_pmos_test.py +++ b/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) diff --git a/compiler/tests/03_wire_test.py b/compiler/tests/03_wire_test.py index 9c662388..0f71b47e 100644 --- a/compiler/tests/03_wire_test.py +++ b/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) diff --git a/compiler/tests/04_nand_2_test.py b/compiler/tests/04_nand_2_test.py index 36c5944a..84f13656 100644 --- a/compiler/tests/04_nand_2_test.py +++ b/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) diff --git a/compiler/tests/04_nand_3_test.py b/compiler/tests/04_nand_3_test.py index 83e7c4a2..4ef18ca2 100644 --- a/compiler/tests/04_nand_3_test.py +++ b/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) diff --git a/compiler/tests/04_nor_2_test.py b/compiler/tests/04_nor_2_test.py index e5018ebe..7d9dbb2c 100644 --- a/compiler/tests/04_nor_2_test.py +++ b/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) diff --git a/compiler/tests/04_pinv_test.py b/compiler/tests/04_pinv_test.py index cc63c6f7..256a6551 100644 --- a/compiler/tests/04_pinv_test.py +++ b/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) diff --git a/compiler/tests/04_precharge_test.py b/compiler/tests/04_precharge_test.py index c4df886a..556aeeb6 100644 --- a/compiler/tests/04_precharge_test.py +++ b/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) diff --git a/compiler/tests/04_wordline_driver_test.py b/compiler/tests/04_wordline_driver_test.py index e14814dc..a772a1ae 100644 --- a/compiler/tests/04_wordline_driver_test.py +++ b/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) diff --git a/compiler/tests/05_bitcell_array_test.py b/compiler/tests/05_bitcell_array_test.py index 13269939..379a6e59 100644 --- a/compiler/tests/05_bitcell_array_test.py +++ b/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) diff --git a/compiler/tests/06_hierarchical_decoder_test.py b/compiler/tests/06_hierarchical_decoder_test.py index 55b85e97..6a8f860f 100644 --- a/compiler/tests/06_hierarchical_decoder_test.py +++ b/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) diff --git a/compiler/tests/06_hierarchical_predecode2x4_test.py b/compiler/tests/06_hierarchical_predecode2x4_test.py index 8ba872e4..7095da26 100644 --- a/compiler/tests/06_hierarchical_predecode2x4_test.py +++ b/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) diff --git a/compiler/tests/06_hierarchical_predecode3x8_test.py b/compiler/tests/06_hierarchical_predecode3x8_test.py index a765468e..6fb9a5df 100644 --- a/compiler/tests/06_hierarchical_predecode3x8_test.py +++ b/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) diff --git a/compiler/tests/07_single_level_column_mux_array_test.py b/compiler/tests/07_single_level_column_mux_array_test.py index 1d6a0fe6..fd92951c 100644 --- a/compiler/tests/07_single_level_column_mux_array_test.py +++ b/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) diff --git a/compiler/tests/08_precharge_array_test.py b/compiler/tests/08_precharge_array_test.py index 1b617536..1f3d3e2d 100644 --- a/compiler/tests/08_precharge_array_test.py +++ b/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) diff --git a/compiler/tests/09_sense_amp_array_test.py b/compiler/tests/09_sense_amp_array_test.py index b237368c..9947c950 100644 --- a/compiler/tests/09_sense_amp_array_test.py +++ b/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) diff --git a/compiler/tests/10_write_driver_array_test.py b/compiler/tests/10_write_driver_array_test.py index 81febb34..752ff5da 100644 --- a/compiler/tests/10_write_driver_array_test.py +++ b/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) diff --git a/compiler/tests/11_ms_flop_array_test.py b/compiler/tests/11_ms_flop_array_test.py index 430d98f4..70ffff53 100644 --- a/compiler/tests/11_ms_flop_array_test.py +++ b/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) diff --git a/compiler/tests/12_tri_gate_array_test.py b/compiler/tests/12_tri_gate_array_test.py index 3e4afce4..eb42ab8e 100644 --- a/compiler/tests/12_tri_gate_array_test.py +++ b/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) diff --git a/compiler/tests/13_replica_bitline_test.py b/compiler/tests/13_replica_bitline_test.py index 31efc6c3..66ca8bc2 100644 --- a/compiler/tests/13_replica_bitline_test.py +++ b/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) diff --git a/compiler/tests/14_delay_chain_test.py b/compiler/tests/14_delay_chain_test.py index 6439dc7a..e71d4d61 100644 --- a/compiler/tests/14_delay_chain_test.py +++ b/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) diff --git a/compiler/tests/16_control_logic_test.py b/compiler/tests/16_control_logic_test.py index 85385c89..4a4b9850 100644 --- a/compiler/tests/16_control_logic_test.py +++ b/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) diff --git a/compiler/tests/19_multi_bank_test.py b/compiler/tests/19_multi_bank_test.py index 1ea7ff1d..a15d9be6 100644 --- a/compiler/tests/19_multi_bank_test.py +++ b/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) diff --git a/compiler/tests/19_single_bank_test.py b/compiler/tests/19_single_bank_test.py index 268721af..90b60952 100644 --- a/compiler/tests/19_single_bank_test.py +++ b/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) diff --git a/compiler/tests/20_sram_1bank_test.py b/compiler/tests/20_sram_1bank_test.py index 7c870017..5330b859 100644 --- a/compiler/tests/20_sram_1bank_test.py +++ b/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) diff --git a/compiler/tests/20_sram_2bank_test.py b/compiler/tests/20_sram_2bank_test.py index 58d978b6..93596593 100644 --- a/compiler/tests/20_sram_2bank_test.py +++ b/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) diff --git a/compiler/tests/20_sram_4bank_test.py b/compiler/tests/20_sram_4bank_test.py index 05c9df35..a6d9e657 100644 --- a/compiler/tests/20_sram_4bank_test.py +++ b/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) diff --git a/compiler/tests/21_hspice_delay_test.py b/compiler/tests/21_hspice_delay_test.py index eeca9bc6..545a2250 100644 --- a/compiler/tests/21_hspice_delay_test.py +++ b/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() diff --git a/compiler/tests/21_hspice_setuphold_test.py b/compiler/tests/21_hspice_setuphold_test.py index a48408b8..9a6518e1 100644 --- a/compiler/tests/21_hspice_setuphold_test.py +++ b/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() diff --git a/compiler/tests/21_ngspice_delay_test.py b/compiler/tests/21_ngspice_delay_test.py index 1e4a4869..3459acf0 100644 --- a/compiler/tests/21_ngspice_delay_test.py +++ b/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() diff --git a/compiler/tests/21_ngspice_setuphold_test.py b/compiler/tests/21_ngspice_setuphold_test.py index 2def0342..77fc9b40 100644 --- a/compiler/tests/21_ngspice_setuphold_test.py +++ b/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() diff --git a/compiler/tests/22_pex_func_test_with_pinv.py b/compiler/tests/22_pex_func_test_with_pinv.py index f6ff3408..917af2ba 100644 --- a/compiler/tests/22_pex_func_test_with_pinv.py +++ b/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 diff --git a/compiler/tests/22_sram_func_test.py b/compiler/tests/22_sram_func_test.py index 3a7ff5a3..f56e8fa0 100644 --- a/compiler/tests/22_sram_func_test.py +++ b/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() diff --git a/compiler/tests/23_lib_sram_model_test.py b/compiler/tests/23_lib_sram_model_test.py index 7d0faf01..9cd5be3b 100644 --- a/compiler/tests/23_lib_sram_model_test.py +++ b/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() diff --git a/compiler/tests/23_lib_sram_prune_test.py b/compiler/tests/23_lib_sram_prune_test.py index ab7d9cf1..d289daba 100644 --- a/compiler/tests/23_lib_sram_prune_test.py +++ b/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() diff --git a/compiler/tests/23_lib_sram_test.py b/compiler/tests/23_lib_sram_test.py index 15bcc1ba..d4d49335 100644 --- a/compiler/tests/23_lib_sram_test.py +++ b/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() diff --git a/compiler/tests/24_lef_sram_test.py b/compiler/tests/24_lef_sram_test.py index 5c08d72e..9fb169f9 100644 --- a/compiler/tests/24_lef_sram_test.py +++ b/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() diff --git a/compiler/tests/25_verilog_sram_test.py b/compiler/tests/25_verilog_sram_test.py index cf042089..418b6b79 100644 --- a/compiler/tests/25_verilog_sram_test.py +++ b/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() diff --git a/compiler/verify.py b/compiler/verify.py index fb44e22b..becc1478 100644 --- a/compiler/verify.py +++ b/compiler/verify.py @@ -9,7 +9,6 @@ If not, OpenRAM will continue as if nothing happened! """ import debug -import tech from globals import OPTS