From 31364e508ee99bd84ae4a8166feb6d1a86e1c584 Mon Sep 17 00:00:00 2001
From: Jesse Cirimelli-Low <jcirimel@ucsc.edu>
Date: Mon, 3 May 2021 13:08:04 -0700
Subject: [PATCH] uncomment test (passing)

---
 compiler/pgates/column_mux.py         |  2 +-
 compiler/tests/19_single_bank_test.py | 42 +++++++++++++--------------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/compiler/pgates/column_mux.py b/compiler/pgates/column_mux.py
index 062ef02e..0dd923ba 100644
--- a/compiler/pgates/column_mux.py
+++ b/compiler/pgates/column_mux.py
@@ -227,7 +227,7 @@ class column_mux(pgate.pgate):
             strap = factory.create(module_type=cell_props.strap_module, version=cell_props.strap_version)
             rbc_width = self.bitcell.width + strap.width
         else:
-            rbc_width = cell.width
+            rbc_width = self.bitcell.width
         # Add it to the right, aligned in between the two tx
         active_pos = vector(rbc_width,
                             self.nmos_upper.by() - 0.5 * self.poly_space)
diff --git a/compiler/tests/19_single_bank_test.py b/compiler/tests/19_single_bank_test.py
index fd90e218..c8db9e2f 100755
--- a/compiler/tests/19_single_bank_test.py
+++ b/compiler/tests/19_single_bank_test.py
@@ -26,20 +26,20 @@ class single_bank_test(openram_test):
         c = sram_config(word_size=4,
                         num_words=16)
 
-        # c.words_per_row=1
-        # factory.reset()
-        # c.recompute_sizes()
-        # debug.info(1, "No column mux")
-        # a = factory.create("bank", sram_config=c)
-        # self.local_check(a)
+        c.words_per_row=1
+        factory.reset()
+        c.recompute_sizes()
+        debug.info(1, "No column mux")
+        a = factory.create("bank", sram_config=c)
+        self.local_check(a)
 
-        # c.num_words=32
-        # c.words_per_row=2
-        # factory.reset()
-        # c.recompute_sizes()
-        # debug.info(1, "Two way column mux")
-        # a = factory.create("bank", sram_config=c)
-        # self.local_check(a)
+        c.num_words=32
+        c.words_per_row=2
+        factory.reset()
+        c.recompute_sizes()
+        debug.info(1, "Two way column mux")
+        a = factory.create("bank", sram_config=c)
+        self.local_check(a)
 
         c.num_words=64
         c.words_per_row=4
@@ -49,14 +49,14 @@ class single_bank_test(openram_test):
         a = factory.create("bank", sram_config=c)
         self.local_check(a)
 
-        #c.word_size=2
-        #c.num_words=128
-        #c.words_per_row=8
-        #factory.reset()
-        #c.recompute_sizes()
-        #debug.info(1, "Eight way column mux")
-        #a = factory.create("bank", sram_config=c)
-        #self.local_check(a)
+        c.word_size=2
+        c.num_words=128
+        c.words_per_row=8
+        factory.reset()
+        c.recompute_sizes()
+        debug.info(1, "Eight way column mux")
+        a = factory.create("bank", sram_config=c)
+        self.local_check(a)
 
         globals.end_openram()