From f542613d784663be871301d47d2cb04530ab29e5 Mon Sep 17 00:00:00 2001 From: mrg Date: Fri, 5 Jul 2019 10:31:05 -0700 Subject: [PATCH] Correct wordline_driver enable to en, not en_bar. --- compiler/modules/port_address.py | 3 +-- compiler/modules/wordline_driver.py | 8 ++++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/compiler/modules/port_address.py b/compiler/modules/port_address.py index bfa34710..0a624c60 100644 --- a/compiler/modules/port_address.py +++ b/compiler/modules/port_address.py @@ -83,8 +83,7 @@ class port_address(design.design): driver_name = "wl_{}".format(row) self.copy_layout_pin(self.wordline_driver_inst, driver_name) - # FIXME: Is this still inverted!? - self.copy_layout_pin(self.wordline_driver_inst, "en_bar", "wl_en") + self.copy_layout_pin(self.wordline_driver_inst, "en", "wl_en") def route_internal(self): for row in range(self.num_rows): diff --git a/compiler/modules/wordline_driver.py b/compiler/modules/wordline_driver.py index 97af8b2a..b29901c5 100644 --- a/compiler/modules/wordline_driver.py +++ b/compiler/modules/wordline_driver.py @@ -54,7 +54,7 @@ class wordline_driver(design.design): # Outputs from wordline_driver. for i in range(self.rows): self.add_pin("wl_{0}".format(i)) - self.add_pin("en_bar") + self.add_pin("en") self.add_pin("vdd") self.add_pin("gnd") @@ -109,7 +109,7 @@ class wordline_driver(design.design): # add nand 2 self.nand_inst.append(self.add_inst(name=name_nand, mod=self.nand2)) - self.connect_inst(["en_bar", + self.connect_inst(["en", "in_{0}".format(row), "wl_bar_{0}".format(row), "vdd", "gnd"]) @@ -151,7 +151,7 @@ class wordline_driver(design.design): """ Route all of the signals """ # Wordline enable connection - en_pin=self.add_layout_pin(text="en_bar", + en_pin=self.add_layout_pin(text="en", layer="metal2", offset=[self.m1_width + 2*self.m1_space,0], width=self.m2_width, @@ -162,7 +162,7 @@ class wordline_driver(design.design): nand_inst = self.nand_inst[row] inv2_inst = self.inv2_inst[row] - # en_bar connection + # en connection a_pin = nand_inst.get_pin("A") a_pos = a_pin.lc() clk_offset = vector(en_pin.bc().x,a_pos.y)