From cc619084c7ffa7b2a1774b966ca7e6e346351ba6 Mon Sep 17 00:00:00 2001 From: Matt Guthaus Date: Fri, 9 Nov 2018 09:34:34 -0800 Subject: [PATCH] Clean up psingle_bank_test --- compiler/tests/19_psingle_bank_test.py | 14 ++++++++++---- compiler/tests/19_single_bank_test.py | 1 - 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/compiler/tests/19_psingle_bank_test.py b/compiler/tests/19_psingle_bank_test.py index dee59175..6496c16f 100755 --- a/compiler/tests/19_psingle_bank_test.py +++ b/compiler/tests/19_psingle_bank_test.py @@ -29,27 +29,33 @@ class psingle_bank_test(openram_test): OPTS.num_r_ports = 0 c = sram_config(word_size=4, num_words=16) + c.words_per_row=1 debug.info(1, "No column mux") - a = bank(c, name="bank1_1rw_0w_0r_single") + name = "bank1_{0}rw_{1}w_{2}r_single".format(OPTS.num_rw_ports, OPTS.num_w_ports, OPTS.num_r_ports) + a = bank(c, name=name) self.local_check(a) c.num_words=32 c.words_per_row=2 debug.info(1, "Two way column mux") - a = bank(c, name="bank1_1rw_0w_0r_single") + name = "bank2_{0}rw_{1}w_{2}r_single".format(OPTS.num_rw_ports, OPTS.num_w_ports, OPTS.num_r_ports) + a = bank(c, name=name) self.local_check(a) c.num_words=64 c.words_per_row=4 debug.info(1, "Four way column mux") - a = bank(c, name="bank1_1rw_0w_0r_single") + name = "bank3_{0}rw_{1}w_{2}r_single".format(OPTS.num_rw_ports, OPTS.num_w_ports, OPTS.num_r_ports) + a = bank(c, name=name) self.local_check(a) + c.word_size=2 c.num_words=128 c.words_per_row=8 debug.info(1, "Four way column mux") - a = bank(c, name="bank1_1rw_0w_0r_single") + name = "bank4_{0}rw_{1}w_{2}r_single".format(OPTS.num_rw_ports, OPTS.num_w_ports, OPTS.num_r_ports) + a = bank(c, name=name) self.local_check(a) diff --git a/compiler/tests/19_single_bank_test.py b/compiler/tests/19_single_bank_test.py index da411d1f..e7179d96 100755 --- a/compiler/tests/19_single_bank_test.py +++ b/compiler/tests/19_single_bank_test.py @@ -38,7 +38,6 @@ class single_bank_test(openram_test): a = bank(c, name="bank3_single") self.local_check(a) - # Eight way has a short circuit of one column mux select to gnd rail c.word_size=2 c.num_words=128 c.words_per_row=8