From bb7773ca7fe9db9ba7c67a82d57b9b0ce452327b Mon Sep 17 00:00:00 2001 From: Jennifer Eve Sowash Date: Tue, 20 Nov 2018 14:39:11 -0800 Subject: [PATCH] Editted pbuf.py to pass regression. --- compiler/pgates/pbuf.py | 14 +++----------- compiler/tests/04_pbuf_test.py | 4 ++-- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/compiler/pgates/pbuf.py b/compiler/pgates/pbuf.py index 28a15868..0d30a89b 100644 --- a/compiler/pgates/pbuf.py +++ b/compiler/pgates/pbuf.py @@ -32,10 +32,10 @@ class pbuf(design.design): # Shield the cap, but have at least a stage effort of 4 input_size = max(1,int(driver_size/stage_effort)) self.inv1 = pinv(size=input_size, height=height) # 1 - self.add_mod(self.inv) + self.add_mod(self.inv1) self.inv2 = pinv(size=driver_size, height=height) # 2 - self.add_mod(self.inv1) + self.add_mod(self.inv2) self.width = self.inv1.width + self.inv2.width self.height = self.inv1.height @@ -89,14 +89,6 @@ class pbuf(design.design): offset=vdd_pin.ll().scale(0,1), width=self.width, height=vdd_pin.height()) - - # Continous vdd rail along with label. - gnd_pin=self.inv4_inst.get_pin("gnd") - self.add_layout_pin(text="gnd", - layer="metal1", - offset=gnd_pin.ll().scale(0,1), - width=self.width, - height=gnd_pin.height()) # Continous gnd rail along with label. gnd_pin=self.inv1_inst.get_pin("gnd") @@ -128,4 +120,4 @@ class pbuf(design.design): inv2_delay = self.inv2.analytical_delay(slew=inv1_delay.slew, load=load) return inv1_delay + inv2_delay - \ No newline at end of file + diff --git a/compiler/tests/04_pbuf_test.py b/compiler/tests/04_pbuf_test.py index 8549f262..f784c671 100644 --- a/compiler/tests/04_pbuf_test.py +++ b/compiler/tests/04_pbuf_test.py @@ -11,14 +11,14 @@ import globals from globals import OPTS import debug -class pinvbuf_test(openram_test): +class pbuf_test(openram_test): def runTest(self): globals.init_openram("config_20_{0}".format(OPTS.tech_name)) global verify import verify - import pinv + import pbuf debug.info(2, "Testing inverter/buffer 4x 8x") a = pbuf.pbuf(8)