diff --git a/compiler/tests/15_global_bitcell_array_1rw_1r_test.py b/compiler/tests/15_global_bitcell_array_norbl_1rw_1r_test.py similarity index 78% rename from compiler/tests/15_global_bitcell_array_1rw_1r_test.py rename to compiler/tests/15_global_bitcell_array_norbl_1rw_1r_test.py index 2e4ec339..0c887e16 100755 --- a/compiler/tests/15_global_bitcell_array_1rw_1r_test.py +++ b/compiler/tests/15_global_bitcell_array_norbl_1rw_1r_test.py @@ -1,9 +1,7 @@ #!/usr/bin/env python3 # See LICENSE for licensing information. # -# Copyright (c) 2016-2023 Regents of the University of California and The Board -# of Regents for the Oklahoma Agricultural and Mechanical College -# (acting for and on behalf of Oklahoma State University) +# Copyright (c) 2016-2023 Regents of the University of California, Santa Cruz # All rights reserved. # import sys, os @@ -16,8 +14,7 @@ from openram.sram_factory import factory from openram import OPTS -# @unittest.skip("SKIPPING 05_global_bitcell_array_test") -class global_bitcell_array_test(openram_test): +class global_bitcell_array_norbl_1rw_1r_test(openram_test): def runTest(self): config_file = "{}/tests/configs/config".format(os.getenv("OPENRAM_HOME")) @@ -28,8 +25,8 @@ class global_bitcell_array_test(openram_test): OPTS.num_w_ports = 0 openram.setup_bitcell() - debug.info(2, "Testing 2 x 4x4 global bitcell array for cell_1rw_1r") - a = factory.create(module_type="global_bitcell_array", cols=[4, 4], rows=4) + debug.info(2, "Testing 2 x 4x4 global bitcell array for 1rw1r cell without replica columns") + a = factory.create(module_type="global_bitcell_array", cols=[4, 4, 4], rows=4, rbl=[0, 0], left_rbl=[], right_rbl=[]) self.local_check(a) openram.end_openram() diff --git a/compiler/tests/15_global_bitcell_array_1rw_test.py b/compiler/tests/15_global_bitcell_array_norbl_1rw_test.py similarity index 78% rename from compiler/tests/15_global_bitcell_array_1rw_test.py rename to compiler/tests/15_global_bitcell_array_norbl_1rw_test.py index 5335e164..e1dbffc4 100755 --- a/compiler/tests/15_global_bitcell_array_1rw_test.py +++ b/compiler/tests/15_global_bitcell_array_norbl_1rw_test.py @@ -1,9 +1,7 @@ #!/usr/bin/env python3 # See LICENSE for licensing information. # -# Copyright (c) 2016-2023 Regents of the University of California and The Board -# of Regents for the Oklahoma Agricultural and Mechanical College -# (acting for and on behalf of Oklahoma State University) +# Copyright (c) 2016-2023 Regents of the University of California, Santa Cruz # All rights reserved. # import sys, os @@ -11,13 +9,12 @@ import unittest from testutils import * import openram -from openram.sram_factory import factory from openram import debug +from openram.sram_factory import factory from openram import OPTS -# @unittest.skip("SKIPPING 05_global_bitcell_array_test") -class global_bitcell_array_1rw_test(openram_test): +class global_bitcell_array_norbl_1rw_test(openram_test): def runTest(self): config_file = "{}/tests/configs/config".format(os.getenv("OPENRAM_HOME")) @@ -28,8 +25,8 @@ class global_bitcell_array_1rw_test(openram_test): OPTS.num_w_ports = 0 openram.setup_bitcell() - debug.info(2, "Testing 2 x 4x4 global bitcell array for 6t_cell") - a = factory.create(module_type="global_bitcell_array", cols=[4, 4], rows=4) + debug.info(2, "Testing 2 x 4x4 global bitcell array for 1rw cell without replica column") + a = factory.create(module_type="global_bitcell_array", cols=[4, 4], rows=4, rbl=[0, 0], left_rbl=[]) self.local_check(a) openram.end_openram() diff --git a/compiler/tests/15_global_bitcell_array_rbl_1rw_1r_test.py b/compiler/tests/15_global_bitcell_array_rbl_1rw_1r_test.py new file mode 100755 index 00000000..c5ef0b92 --- /dev/null +++ b/compiler/tests/15_global_bitcell_array_rbl_1rw_1r_test.py @@ -0,0 +1,40 @@ +#!/usr/bin/env python3 +# See LICENSE for licensing information. +# +# Copyright (c) 2016-2023 Regents of the University of California, Santa Cruz +# All rights reserved. +# +import sys, os +import unittest +from testutils import * + +import openram +from openram import debug +from openram.sram_factory import factory +from openram import OPTS + + +class global_bitcell_array_rbl_1rw_1r_test(openram_test): + + def runTest(self): + config_file = "{}/tests/configs/config".format(os.getenv("OPENRAM_HOME")) + openram.init_openram(config_file, is_unit_test=True) + + OPTS.num_rw_ports = 1 + OPTS.num_r_ports = 1 + OPTS.num_w_ports = 0 + openram.setup_bitcell() + + debug.info(2, "Testing 2 x 4x4 global bitcell array for 1rw1r cell with replica columns") + a = factory.create(module_type="global_bitcell_array", cols=[4, 4, 4], rows=4, rbl=[1, 1], left_rbl=[0], right_rbl=[1]) + self.local_check(a) + + openram.end_openram() + + +# run the test from the command line +if __name__ == "__main__": + (OPTS, args) = openram.parse_args() + del sys.argv[1:] + header(__file__, OPTS.tech_name) + unittest.main(testRunner=debugTestRunner()) diff --git a/compiler/tests/15_global_bitcell_array_rbl_1rw_test.py b/compiler/tests/15_global_bitcell_array_rbl_1rw_test.py new file mode 100755 index 00000000..b86c2c84 --- /dev/null +++ b/compiler/tests/15_global_bitcell_array_rbl_1rw_test.py @@ -0,0 +1,40 @@ +#!/usr/bin/env python3 +# See LICENSE for licensing information. +# +# Copyright (c) 2016-2023 Regents of the University of California, Santa Cruz +# All rights reserved. +# +import sys, os +import unittest +from testutils import * + +import openram +from openram import debug +from openram.sram_factory import factory +from openram import OPTS + + +class global_bitcell_array_rbl_1rw_test(openram_test): + + def runTest(self): + config_file = "{}/tests/configs/config".format(os.getenv("OPENRAM_HOME")) + openram.init_openram(config_file, is_unit_test=True) + + OPTS.num_rw_ports = 1 + OPTS.num_r_ports = 0 + OPTS.num_w_ports = 0 + openram.setup_bitcell() + + debug.info(2, "Testing 2 x 4x4 global bitcell array for 1rw cell with left replica column") + a = factory.create(module_type="global_bitcell_array", cols=[4, 4], rows=4, rbl=[1, 0], left_rbl=[0]) + self.local_check(a) + + openram.end_openram() + + +# run the test from the command line +if __name__ == "__main__": + (OPTS, args) = openram.parse_args() + del sys.argv[1:] + header(__file__, OPTS.tech_name) + unittest.main(testRunner=debugTestRunner())