From 87f539f3a81fdd5f53c5838be7f46bff7fde83c7 Mon Sep 17 00:00:00 2001
From: Matt Guthaus <mrg@ucsc.edu>
Date: Mon, 27 Aug 2018 10:54:21 -0700
Subject: [PATCH] Separate netlist/layout for flop and precharge array.

---
 compiler/modules/ms_flop_array.py   | 33 ++++++++++++--------
 compiler/modules/precharge_array.py | 47 ++++++++++++++++++-----------
 2 files changed, 50 insertions(+), 30 deletions(-)

diff --git a/compiler/modules/ms_flop_array.py b/compiler/modules/ms_flop_array.py
index 72174952..653c0c38 100644
--- a/compiler/modules/ms_flop_array.py
+++ b/compiler/modules/ms_flop_array.py
@@ -30,14 +30,18 @@ class ms_flop_array(design.design):
         self.height = self.ms.height
         self.words_per_row = int(self.columns / self.word_size)
 
+        self.create_netlist()
         self.create_layout()
 
-    def create_layout(self):
+    def create_netlist(self):
         self.add_pins()
         self.create_ms_flop_array()
+
+    def create_layout(self):
+        self.place_ms_flop_array()
         self.add_layout_pins()
         self.DRC_LVS()
-
+        
     def add_pins(self):
         for i in range(self.word_size):
             self.add_pin("din[{0}]".format(i))
@@ -52,25 +56,28 @@ class ms_flop_array(design.design):
         self.ms_inst={}
         for i in range(0,self.columns,self.words_per_row):
             name = "Xdff{0}".format(i)
-            if (i % 2 == 0 or self.words_per_row>1):
-                base = vector(i*self.ms.width,0)
-                mirror = "R0"
-            else:
-                base = vector((i+1)*self.ms.width,0)
-                mirror = "MY"
-
             index = int(i/self.words_per_row)
-                
             self.ms_inst[index]=self.add_inst(name=name,
-                                                             mod=self.ms,
-                                                             offset=base, 
-                                                             mirror=mirror)
+                                              mod=self.ms)
             self.connect_inst(["din[{0}]".format(index),
                                "dout[{0}]".format(index),
                                "dout_bar[{0}]".format(index),
                                "clk",
                                "vdd", "gnd"])
 
+    def place_ms_flop_array(self):
+        for i in range(0,self.columns,self.words_per_row):
+            name = "Xdff{0}".format(i)
+            if (i % 2 == 0 or self.words_per_row>1):
+                base = vector(i*self.ms.width,0)
+                mirror = "R0"
+            else:
+                base = vector((i+1)*self.ms.width,0)
+                mirror = "MY"
+            self.place_inst(name=name,
+                            offset=base, 
+                            mirror=mirror)
+            
     def add_layout_pins(self):
         
         for i in range(self.word_size):
diff --git a/compiler/modules/precharge_array.py b/compiler/modules/precharge_array.py
index 23f8b361..eed25978 100644
--- a/compiler/modules/precharge_array.py
+++ b/compiler/modules/precharge_array.py
@@ -27,9 +27,8 @@ class precharge_array(design.design):
         self.width = self.columns * self.pc_cell.width
         self.height = self.pc_cell.height
 
-        self.add_pins()
+        self.create_netlist()
         self.create_layout()
-        self.DRC_LVS()
 
     def add_pins(self):
         """Adds pins for spice file"""
@@ -39,9 +38,14 @@ class precharge_array(design.design):
         self.add_pin("en")
         self.add_pin("vdd")
 
+    def create_netlist(self):
+        self.add_pins()
+        self.create_insts()
+        
     def create_layout(self):
-        self.add_insts()
+        self.place_insts()
         self.add_layout_pins()
+        self.DRC_LVS()
         
 
     def add_layout_pins(self):
@@ -55,20 +59,8 @@ class precharge_array(design.design):
         for inst in self.local_insts:
             self.copy_layout_pin(inst, "vdd")
             
-        
-
-    def add_insts(self):
-        """Creates a precharge array by horizontally tiling the precharge cell"""
-        self.local_insts = []
-        for i in range(self.columns):
-            name = "pre_column_{0}".format(i)
-            offset = vector(self.pc_cell.width * i, 0)
-            inst = self.add_inst(name=name,
-                                 mod=self.pc_cell,
-                                 offset=offset)
-            self.local_insts.append(inst)
-            
-            self.connect_inst(["bl[{0}]".format(i), "br[{0}]".format(i), "en", "vdd"])
+        for i in range(len(self.local_insts)):
+            inst = self.local_insts[i]
             bl_pin = inst.get_pin("bl")
             self.add_layout_pin(text="bl[{0}]".format(i),
                                 layer="metal2",
@@ -81,4 +73,25 @@ class precharge_array(design.design):
                                 offset=br_pin.ll(),
                                 width=drc["minwidth_metal2"],
                                 height=bl_pin.height())
+        
 
+    def create_insts(self):
+        """Creates a precharge array by horizontally tiling the precharge cell"""
+        self.local_insts = []
+        for i in range(self.columns):
+            name = "pre_column_{0}".format(i)
+            offset = vector(self.pc_cell.width * i, 0)
+            inst = self.add_inst(name=name,
+                                 mod=self.pc_cell,
+                                 offset=offset)
+            self.local_insts.append(inst)
+            self.connect_inst(["bl[{0}]".format(i), "br[{0}]".format(i), "en", "vdd"])
+
+
+    def place_insts(self):
+        """ Places precharge array by horizontally tiling the precharge cell"""
+        for i in range(self.columns):
+            name = "pre_column_{0}".format(i)
+            offset = vector(self.pc_cell.width * i, 0)
+            inst = self.place_inst(name=name,
+                                   offset=offset)