Remove dff_inv since we can just use dff_buf

compiler/modules/dff_inv_array.py

@@ -1,186 +0,0 @@
-import debug
-import design
-from tech import drc
-from math import log
-from vector import vector
-from globals import OPTS
-import dff_inv
-
-class dff_inv_array(design.design):
-    """
-    This is a simple row (or multiple rows) of flops.
-    Unlike the data flops, these are never spaced out.
-    """
-    unique_id = 1
-    
-    def __init__(self, rows, columns, inv_size=2, name=""):
-        self.rows = rows
-        self.columns = columns
-
-        if name=="":
-            name = "dff_inv_array_{0}x{1}_{2}".format(rows, columns, dff_inv_array.unique_id)
-            dff_inv_array.unique_id += 1
-        design.design.__init__(self, name)
-        debug.info(1, "Creating {}".format(self.name))
-        self.inv_size = inv_size
-        
-        self.create_netlist()
-        if not OPTS.netlist_only:
-            self.create_layout()
-
-    def create_netlist(self):
-        self.add_pins()
-        self.add_modules()
-        self.create_dff_array()
-        
-    def create_layout(self):
-        self.width = self.columns * self.dff.width
-        self.height = self.rows * self.dff.height
-
-        self.place_dff_array()
-        self.add_layout_pins()
-        self.DRC_LVS()
-
-    def add_modules(self):
-        self.dff = dff_inv.dff_inv(self.inv_size)
-        self.add_mod(self.dff)
-
-    def add_pins(self):
-        for row in range(self.rows):  
-            for col in range(self.columns):
-                self.add_pin(self.get_din_name(row,col))
-        for row in range(self.rows):  
-            for col in range(self.columns):
-                self.add_pin(self.get_dout_name(row,col))
-                self.add_pin(self.get_dout_bar_name(row,col))
-        self.add_pin("clk")
-        self.add_pin("vdd")
-        self.add_pin("gnd")
-
-    def create_dff_array(self):
-        self.dff_insts={}
-        for row in range(self.rows):  
-            for col in range(self.columns):
-                name = "dff_r{0}_c{1}".format(row,col)
-                self.dff_insts[row,col]=self.add_inst(name=name,
-                                                      mod=self.dff)
-                self.connect_inst([self.get_din_name(row,col),
-                                   self.get_dout_name(row,col),
-                                   self.get_dout_bar_name(row,col),  
-                                   "clk",
-                                   "vdd",
-                                   "gnd"])
-
-    def place_dff_array(self):
-        for row in range(self.rows):  
-            for col in range(self.columns):
-                name = "dff_r{0}_c{1}".format(row,col)
-                if (row % 2 == 0):
-                    base = vector(col*self.dff.width,row*self.dff.height)
-                    mirror = "R0"
-                else:
-                    base = vector(col*self.dff.width,(row+1)*self.dff.height)
-                    mirror = "MX"
-                self.dff_insts[row,col].place(offset=base, 
-                                              mirror=mirror)
-                
-    def get_din_name(self, row, col):
-        if self.columns == 1:
-            din_name = "din_{0}".format(row)
-        elif self.rows == 1:
-            din_name = "din_{0}".format(col)
-        else:
-            din_name = "din_{0}_{1}".format(row,col)
-
-        return din_name
-    
-    def get_dout_name(self, row, col):
-        if self.columns == 1:
-            dout_name = "dout_{0}".format(row)
-        elif self.rows == 1:
-            dout_name = "dout_{0}".format(col)
-        else:
-            dout_name = "dout_{0}_{1}".format(row,col)
-
-        return dout_name
-    
-    def get_dout_bar_name(self, row, col):
-        if self.columns == 1:
-            dout_bar_name = "dout_bar_{0}".format(row)
-        elif self.rows == 1:
-            dout_bar_name = "dout_bar_{0}".format(col)
-        else:
-            dout_bar_name = "dout_bar_{0}_{1}".format(row,col)
-
-        return dout_bar_name
-    
-    def add_layout_pins(self):
-        for row in range(self.rows):
-            for col in range(self.columns):                        
-                # Adds power pin on left of row
-                vdd_pin=self.dff_insts[row,col].get_pin("vdd")
-                self.add_power_pin("vdd", vdd_pin.lc())
-
-                # Adds gnd pin on left of row
-                gnd_pin=self.dff_insts[row,col].get_pin("gnd")
-                self.add_power_pin("gnd", gnd_pin.lc())
-            
-
-        for row in range(self.rows):            
-            for col in range(self.columns):            
-                din_pin = self.dff_insts[row,col].get_pin("D")
-                debug.check(din_pin.layer=="metal2","DFF D pin not on metal2")
-                self.add_layout_pin(text=self.get_din_name(row,col),
-                                    layer=din_pin.layer,
-                                    offset=din_pin.ll(),
-                                    width=din_pin.width(),
-                                    height=din_pin.height())
-
-                dout_pin = self.dff_insts[row,col].get_pin("Q")
-                debug.check(dout_pin.layer=="metal2","DFF Q pin not on metal2")
-                self.add_layout_pin(text=self.get_dout_name(row,col),
-                                    layer=dout_pin.layer,
-                                    offset=dout_pin.ll(),
-                                    width=dout_pin.width(),
-                                    height=dout_pin.height())
-
-                dout_bar_pin = self.dff_insts[row,col].get_pin("Qb")
-                debug.check(dout_bar_pin.layer=="metal2","DFF Qb pin not on metal2")
-                self.add_layout_pin(text=self.get_dout_bar_name(row,col),
-                                    layer=dout_bar_pin.layer,
-                                    offset=dout_bar_pin.ll(),
-                                    width=dout_bar_pin.width(),
-                                    height=dout_bar_pin.height())
-
-                
-        # Create vertical spines to a single horizontal rail
-        clk_pin = self.dff_insts[0,0].get_pin("clk")
-        clk_ypos = 2*self.m3_pitch+self.m3_width
-        debug.check(clk_pin.layer=="metal2","DFF clk pin not on metal2")
-        if self.columns==1:
-            self.add_layout_pin(text="clk",
-                                layer="metal2",
-                                offset=clk_pin.ll().scale(1,0),
-                                width=self.m2_width,
-                                height=self.height)
-        else:
-            self.add_layout_pin_segment_center(text="clk",
-                                            layer="metal3",
-                                            start=vector(0,clk_ypos),
-                                            end=vector(self.width,clk_ypos))
-            for col in range(self.columns):
-                clk_pin = self.dff_insts[0,col].get_pin("clk")
-                # Make a vertical strip for each column
-                self.add_rect(layer="metal2",
-                              offset=clk_pin.ll().scale(1,0),
-                              width=self.m2_width,
-                              height=self.height)
-                # Drop a via to the M3 pin
-                self.add_via_center(layers=("metal2","via2","metal3"),
-                                    offset=vector(clk_pin.cx(),clk_ypos))
-                
-                
-        
-
-    def analytical_delay(self, slew, load=0.0):
-        return self.dff.analytical_delay(slew=slew, load=load)

compiler/tests/11_dff_inv_array_test.py

@@ -1,39 +0,0 @@
-#!/usr/bin/env python3
-"""
-Run a regression test on a dff_array.
-"""
-
-import unittest
-from testutils import header,openram_test
-import sys,os
-sys.path.append(os.path.join(sys.path[0],".."))
-import globals
-from globals import OPTS
-import debug
-
-class dff_inv_array_test(openram_test):
-
-    def runTest(self):
-        globals.init_openram("config_20_{0}".format(OPTS.tech_name))
-        import dff_inv_array
-
-        debug.info(2, "Testing dff_inv_array for 3x3")
-        a = dff_inv_array.dff_inv_array(rows=3, columns=3)
-        self.local_check(a)
-
-        debug.info(2, "Testing dff_inv_array for 1x3")
-        a = dff_inv_array.dff_inv_array(rows=1, columns=3)
-        self.local_check(a)
-
-        debug.info(2, "Testing dff_inv_array for 3x1")
-        a = dff_inv_array.dff_inv_array(rows=3, columns=1)
-        self.local_check(a)
-
-        globals.end_openram()
-
-# run the test from the command line
-if __name__ == "__main__":
-    (OPTS, args) = globals.parse_args()
-    del sys.argv[1:]
-    header(__file__, OPTS.tech_name)
-    unittest.main()

compiler/tests/11_dff_inv_test.py

@@ -1,31 +0,0 @@
-#!/usr/bin/env python3
-"""
-Run a regression test on a dff_inv.
-"""
-
-import unittest
-from testutils import header,openram_test
-import sys,os
-sys.path.append(os.path.join(sys.path[0],".."))
-import globals
-from globals import OPTS
-import debug
-
-class dff_inv_test(openram_test):
-
-    def runTest(self):
-        globals.init_openram("config_20_{0}".format(OPTS.tech_name))
-        import dff_inv
-
-        debug.info(2, "Testing dff_inv 4x")
-        a = dff_inv.dff_inv(4)
-        self.local_check(a)
-
-        globals.end_openram()
-
-# run the test from the command line
-if __name__ == "__main__":
-    (OPTS, args) = globals.parse_args()
-    del sys.argv[1:]
-    header(__file__, OPTS.tech_name)
-    unittest.main()