From 8d9b79dfd806bea4a73dc5fb1a8ecff138d0ff43 Mon Sep 17 00:00:00 2001
From: Matt Guthaus <mrg@ucsc.edu>
Date: Fri, 16 Feb 2018 15:25:27 -0800
Subject: [PATCH] Add dff_buf for buffered flop arrays.

---
 compiler/modules/dff.py                |   2 +-
 compiler/modules/dff_buf.py            | 146 +++++++
 compiler/tests/11_dff_buf_test.py      |  36 ++
 technology/freepdk45/gds_lib/dff.gds   | Bin 22528 -> 22528 bytes
 technology/freepdk45/sp_lib/dff.sp     |  18 +-
 technology/scn3me_subm/gds_lib/dff.gds | Bin 18414 -> 16622 bytes
 technology/scn3me_subm/mag_lib/dff.mag | 538 ++++++++++++-------------
 technology/scn3me_subm/sp_lib/dff.sp   |  14 +-
 8 files changed, 458 insertions(+), 296 deletions(-)
 create mode 100644 compiler/modules/dff_buf.py
 create mode 100644 compiler/tests/11_dff_buf_test.py

diff --git a/compiler/modules/dff.py b/compiler/modules/dff.py
index 2db12281..62e424cb 100644
--- a/compiler/modules/dff.py
+++ b/compiler/modules/dff.py
@@ -10,7 +10,7 @@ class dff(design.design):
     Memory address flip-flop
     """
 
-    pin_names = ["d", "q", "clk", "vdd", "gnd"]
+    pin_names = ["D", "Q", "clk", "vdd", "gnd"]
     (width,height) = utils.get_libcell_size("dff", GDS["unit"], layer["boundary"])
     pin_map = utils.get_libcell_pins(pin_names, "dff", GDS["unit"], layer["boundary"])
     
diff --git a/compiler/modules/dff_buf.py b/compiler/modules/dff_buf.py
new file mode 100644
index 00000000..bcd03f16
--- /dev/null
+++ b/compiler/modules/dff_buf.py
@@ -0,0 +1,146 @@
+import debug
+import design
+from tech import drc
+from math import log
+from vector import vector
+from globals import OPTS
+from pinv import pinv
+
+class dff_buf(design.design):
+    """
+    This is a simple buffered DFF. The output is buffered
+    with two inverters, of variable size, to provide q
+    and qbar. This is to enable driving large fanout loads.
+    """
+
+    def __init__(self, inv1_size, inv2_size, name=""):
+
+        if name=="":
+            name = "dff_buf_{0}_{1}".format(inv1_size, inv2_size)
+        design.design.__init__(self, name)
+        debug.info(1, "Creating {}".format(self.name))
+
+        c = reload(__import__(OPTS.dff))
+        self.mod_dff = getattr(c, OPTS.dff)
+        self.dff = self.mod_dff("dff")
+        self.add_mod(self.dff)
+
+        self.inv1 = pinv(size=inv1_size,height=self.dff.height)
+        self.add_mod(self.inv1)
+
+        self.inv2 = pinv(size=inv2_size,height=self.dff.height)
+        self.add_mod(self.inv2)
+
+        self.width = self.dff.width + self.inv1.width + self.inv2.width
+        self.height = self.dff.height
+
+        self.create_layout()
+
+    def create_layout(self):
+        self.add_pins()
+        self.add_insts()
+        self.add_wires()
+        self.add_layout_pins()
+        self.DRC_LVS()
+        
+    def add_pins(self):
+        self.add_pin("D")
+        self.add_pin("Q")
+        self.add_pin("Qb")
+        self.add_pin("clk")
+        self.add_pin("vdd")
+        self.add_pin("gnd")
+
+    def add_insts(self):
+        # Add the DFF
+        self.dff_inst=self.add_inst(name="dff_buf_dff",
+                                    mod=self.dff,
+                                    offset=vector(0,0))
+        self.connect_inst(["D", "qint", "clk", "vdd", "gnd"])
+
+        # Add INV1 to the right
+        self.inv1_inst=self.add_inst(name="dff_buf_inv1",
+                                     mod=self.inv1,
+                                     offset=vector(self.dff_inst.rx(),0))
+        self.connect_inst(["qint", "Qb",  "vdd", "gnd"])
+        
+        # Add INV2 to the right
+        self.inv2_inst=self.add_inst(name="dff_buf_inv2",
+                                     mod=self.inv2,
+                                     offset=vector(self.inv1_inst.rx(),0))
+        self.connect_inst(["Qb", "Q",  "vdd", "gnd"])
+        
+    def add_wires(self):
+        # Route dff q to inv1 a
+        q_pin = self.dff_inst.get_pin("Q")
+        a1_pin = self.inv1_inst.get_pin("A")
+        mid_point = vector(a1_pin.cx(), q_pin.cy())
+        self.add_wire(("metal3","via2","metal2"),
+                      [q_pin.center(), mid_point, a1_pin.center()])
+        self.add_via_center(("metal2","via2","metal3"),
+                            q_pin.center())
+        self.add_via_center(("metal1","via1","metal2"),
+                            a1_pin.center())
+
+        # Route inv1 z to inv2 a
+        z1_pin = self.inv1_inst.get_pin("Z")
+        a2_pin = self.inv2_inst.get_pin("A")
+        mid_point = vector(z1_pin.cx(), a2_pin.cy())        
+        self.add_wire(("metal1","via1","metal2"),
+                      [z1_pin.center(), mid_point, a2_pin.center()])
+        
+    def add_layout_pins(self):
+
+        # Continous vdd rail along with label.
+        vdd_pin=self.dff_inst.get_pin("vdd")
+        self.add_layout_pin(text="vdd",
+                            layer="metal1",
+                            offset=vdd_pin.ll(),
+                            width=self.width,
+                            height=vdd_pin.height())
+
+        # Continous gnd rail along with label.
+        gnd_pin=self.dff_inst.get_pin("gnd")
+        self.add_layout_pin(text="gnd",
+                            layer="metal1",
+                            offset=gnd_pin.ll(),
+                            width=self.width,
+                            height=vdd_pin.height())
+            
+        clk_pin = self.dff_inst.get_pin("clk")
+        self.add_layout_pin(text="clk",
+                            layer=clk_pin.layer,
+                            offset=clk_pin.ll(),
+                            width=clk_pin.width(),
+                            height=clk_pin.height())
+
+        din_pin = self.dff_inst.get_pin("D")
+        self.add_layout_pin(text="D",
+                            layer=din_pin.layer,
+                            offset=din_pin.ll(),
+                            width=din_pin.width(),
+                            height=din_pin.height())
+
+        dout_pin = self.inv2_inst.get_pin("Z")
+        self.add_layout_pin(text="Q",
+                            layer=dout_pin.layer,
+                            offset=dout_pin.ll(),
+                            width=dout_pin.width(),
+                            height=dout_pin.height())
+
+        dout_pin = self.inv1_inst.get_pin("Z")
+        self.add_layout_pin(text="Qb",
+                            layer=dout_pin.layer,
+                            offset=dout_pin.ll(),
+                            width=dout_pin.width(),
+                            height=dout_pin.height())
+        
+        
+
+    def analytical_delay(self, slew, load=0.0):
+        """ Calculate the analytical delay of DFF-> INV -> INV """
+        dff_delay=self.dff.analytical_delay(slew=slew, load=self.inv1.input_load())
+        inv1_delay = self.inv1.analytical_delay(slew=dff_delay.slew, load=self.inv2.input_load()) 
+        inv2_delay = self.inv2.analytical_delay(slew=inv1_delay.slew, load=load)
+        return dff_delay + inv1_delay + inv2_delay
+            
diff --git a/compiler/tests/11_dff_buf_test.py b/compiler/tests/11_dff_buf_test.py
new file mode 100644
index 00000000..3827647e
--- /dev/null
+++ b/compiler/tests/11_dff_buf_test.py
@@ -0,0 +1,36 @@
+#!/usr/bin/env python2.7
+"""
+Run a regresion test on a dff_buf.
+"""
+
+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_buf_test(openram_test):
+
+    def runTest(self):
+        globals.init_openram("config_20_{0}".format(OPTS.tech_name))
+        global verify
+        import verify
+        OPTS.check_lvsdrc = False
+
+        import dff_buf
+
+        debug.info(2, "Testing dff_buf 4x 8x")
+        a = dff_buf.dff_buf(4, 8)
+        self.local_check(a)
+
+        OPTS.check_lvsdrc = True
+        globals.end_openram()
+
+# instantiate a copdsay of the class to actually run the test
+if __name__ == "__main__":
+    (OPTS, args) = globals.parse_args()
+    del sys.argv[1:]
+    header(__file__, OPTS.tech_name)
+    unittest.main()
diff --git a/technology/freepdk45/gds_lib/dff.gds b/technology/freepdk45/gds_lib/dff.gds
index 572020266bfa851afb05d797d738e6316c4e751e..db7d3af31b9b86b49b4bf1bb369048f353431d67 100644
GIT binary patch
delta 109
zcmZqJz}T>Xae}NPAA=Nw00R#bTS{tLVrfnZ1A_=NtDVA;*-IY>f3sAI5x?NO<_Cie
zD-#0;10w?yP%R6C6@w6%1=c$;?f|39#D&tEtr#ycG6rtuWxnUSd9}|@&dpCe4lr*{
I37f+R0OxBR<p2Nx

delta 109
zcmZqJz}T>Xae}NP7lR6eC<6}@TS{tLVrfnZ1A_=NtDVA;*-IY>f3sAI5x?NOmWe@z
zm5G6afsuiUL4bjU!HPi$%mVA37<Yg%W#U5V%~p(;7#RyU^D^Ia-Ml(zC-def9tSu#
Jr-aR61OT>>9ZUcK

diff --git a/technology/freepdk45/sp_lib/dff.sp b/technology/freepdk45/sp_lib/dff.sp
index 8cc62891..51d99ad1 100644
--- a/technology/freepdk45/sp_lib/dff.sp
+++ b/technology/freepdk45/sp_lib/dff.sp
@@ -3,11 +3,11 @@
 * Program "Calibre xRC"
 * Version "v2007.2_34.24"
 * 
-.subckt dff d q clk vdd gnd
+.subckt dff D Q clk vdd gnd
 * 
-MM21 q a_66_6# gnd gnd NMOS_VTG L=5e-08 W=5e-07
+MM21 Q a_66_6# gnd gnd NMOS_VTG L=5e-08 W=5e-07
 MM19 a_76_6# a_2_6# a_66_6# gnd NMOS_VTG L=5e-08 W=2.5e-07
-MM20 gnd q a_76_6# gnd NMOS_VTG L=5e-08 W=2.5e-07
+MM20 gnd Q a_76_6# gnd NMOS_VTG L=5e-08 W=2.5e-07
 MM18 a_66_6# clk a_61_6# gnd NMOS_VTG L=5e-08 W=2.5e-07
 MM17 a_61_6# a_34_4# gnd gnd NMOS_VTG L=5e-08 W=2.5e-07
 MM10 gnd clk a_2_6# gnd NMOS_VTG L=5e-08 W=5e-07
@@ -15,9 +15,9 @@ MM16 a_34_4# a_22_6# gnd gnd NMOS_VTG L=5e-08 W=2.5e-07
 MM15 gnd a_34_4# a_31_6# gnd NMOS_VTG L=5e-08 W=2.5e-07
 MM14 a_31_6# clk a_22_6# gnd NMOS_VTG L=5e-08 W=2.5e-07
 MM13 a_22_6# a_2_6# a_17_6# gnd NMOS_VTG L=5e-08 W=2.5e-07
-MM12 a_17_6# d gnd gnd NMOS_VTG L=5e-08 W=2.5e-07
-MM11 q a_66_6# vdd vdd PMOS_VTG L=5e-08 W=1e-06
-MM9 vdd q a_76_84# vdd PMOS_VTG L=5e-08 W=2.5e-07
+MM12 a_17_6# D gnd gnd NMOS_VTG L=5e-08 W=2.5e-07
+MM11 Q a_66_6# vdd vdd PMOS_VTG L=5e-08 W=1e-06
+MM9 vdd Q a_76_84# vdd PMOS_VTG L=5e-08 W=2.5e-07
 MM8 a_76_84# clk a_66_6# vdd PMOS_VTG L=5e-08 W=2.5e-07
 MM7 a_66_6# a_2_6# a_61_74# vdd PMOS_VTG L=5e-08 W=5e-07
 MM6 a_61_74# a_34_4# vdd vdd PMOS_VTG L=5e-08 W=5e-07
@@ -26,16 +26,16 @@ MM5 a_34_4# a_22_6# vdd vdd PMOS_VTG L=5e-08 W=5e-07
 MM4 vdd a_34_4# a_31_74# vdd PMOS_VTG L=5e-08 W=5e-07
 MM3 a_31_74# a_2_6# a_22_6# vdd PMOS_VTG L=5e-08 W=5e-07
 MM2 a_22_6# clk a_17_74# vdd PMOS_VTG L=5e-08 W=5e-07
-MM1 a_17_74# d vdd vdd PMOS_VTG L=5e-08 W=5e-07
+MM1 a_17_74# D vdd vdd PMOS_VTG L=5e-08 W=5e-07
 * c_9 a_66_6# 0 0.271997f
 * c_20 clk 0 0.350944f
-* c_27 q 0 0.202617f
+* c_27 Q 0 0.202617f
 * c_32 a_76_84# 0 0.0210573f
 * c_38 a_76_6# 0 0.0204911f
 * c_45 a_34_4# 0 0.172306f
 * c_55 a_2_6# 0 0.283119f
 * c_59 a_22_6# 0 0.157312f
-* c_64 d 0 0.0816386f
+* c_64 D 0 0.0816386f
 * c_73 gnd 0 0.254131f
 * c_81 vdd 0 0.23624f
 *
diff --git a/technology/scn3me_subm/gds_lib/dff.gds b/technology/scn3me_subm/gds_lib/dff.gds
index 679792f4c0996808545cbe0dcc2d0a0070d5ac80..b96235c7500aba5314ed95369b44d5000c60b5ff 100644
GIT binary patch
literal 16622
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
EFOc~i?EnA(

literal 18414
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
Jy{mYt{U7d$(#HS*

diff --git a/technology/scn3me_subm/mag_lib/dff.mag b/technology/scn3me_subm/mag_lib/dff.mag
index a0f5e0b0..19825153 100644
--- a/technology/scn3me_subm/mag_lib/dff.mag
+++ b/technology/scn3me_subm/mag_lib/dff.mag
@@ -1,299 +1,279 @@
 magic
 tech scmos
-timestamp 1518655545
+timestamp 1518823399
 << nwell >>
-rect -8 48 104 105
+rect 0 48 109 103
 << pwell >>
-rect -8 -5 104 48
+rect 0 -3 109 48
 << ntransistor >>
-rect 7 6 9 26
-rect 15 6 17 16
-rect 20 6 22 16
-rect 29 6 31 16
-rect 34 6 36 16
-rect 43 6 45 16
-rect 59 6 61 16
-rect 64 6 66 16
-rect 74 6 76 16
-rect 79 6 81 16
-rect 87 6 89 26
+rect 11 6 13 26
+rect 19 6 21 16
+rect 24 6 26 16
+rect 33 6 35 16
+rect 38 6 40 16
+rect 47 6 49 16
+rect 63 6 65 16
+rect 68 6 70 16
+rect 78 6 80 16
+rect 83 6 85 16
+rect 91 6 93 26
 << ptransistor >>
-rect 7 54 9 94
-rect 15 74 17 94
-rect 21 74 23 94
-rect 29 74 31 94
-rect 35 74 37 94
-rect 43 74 45 94
-rect 59 74 61 94
-rect 64 74 66 94
-rect 74 84 76 94
-rect 79 84 81 94
-rect 87 54 89 94
+rect 11 54 13 94
+rect 19 74 21 94
+rect 25 74 27 94
+rect 33 74 35 94
+rect 39 74 41 94
+rect 47 74 49 94
+rect 63 74 65 94
+rect 68 74 70 94
+rect 78 84 80 94
+rect 83 84 85 94
+rect 91 54 93 94
 << ndiffusion >>
-rect 2 25 7 26
-rect 6 6 7 25
-rect 9 25 14 26
-rect 9 6 10 25
-rect 82 25 87 26
-rect 14 6 15 16
-rect 17 6 20 16
-rect 22 15 29 16
-rect 22 6 24 15
-rect 28 6 29 15
-rect 31 6 34 16
-rect 36 15 43 16
-rect 36 6 37 15
-rect 41 6 43 15
-rect 45 15 50 16
-rect 45 6 46 15
-rect 54 15 59 16
-rect 58 6 59 15
-rect 61 6 64 16
-rect 66 15 74 16
-rect 66 6 68 15
-rect 72 6 74 15
-rect 76 6 79 16
-rect 81 6 82 16
-rect 86 6 87 25
-rect 89 25 94 26
-rect 89 6 90 25
+rect 6 25 11 26
+rect 10 6 11 25
+rect 13 25 18 26
+rect 13 6 14 25
+rect 86 25 91 26
+rect 18 6 19 16
+rect 21 6 24 16
+rect 26 15 33 16
+rect 26 6 28 15
+rect 32 6 33 15
+rect 35 6 38 16
+rect 40 15 47 16
+rect 40 6 41 15
+rect 45 6 47 15
+rect 49 15 54 16
+rect 49 6 50 15
+rect 58 15 63 16
+rect 62 6 63 15
+rect 65 6 68 16
+rect 70 15 78 16
+rect 70 6 72 15
+rect 76 6 78 15
+rect 80 6 83 16
+rect 85 6 86 16
+rect 90 6 91 25
+rect 93 25 98 26
+rect 93 6 94 25
 << pdiffusion >>
-rect 2 93 7 94
-rect 6 54 7 93
-rect 9 55 10 94
-rect 14 74 15 94
-rect 17 74 21 94
-rect 23 93 29 94
-rect 23 74 24 93
-rect 28 74 29 93
-rect 31 74 35 94
-rect 37 93 43 94
-rect 37 74 38 93
-rect 42 74 43 93
-rect 45 93 50 94
-rect 45 74 46 93
-rect 54 93 59 94
-rect 58 74 59 93
-rect 61 74 64 94
-rect 66 93 74 94
-rect 66 74 68 93
-rect 72 84 74 93
-rect 76 84 79 94
-rect 81 93 87 94
-rect 81 84 82 93
-rect 72 74 73 84
-rect 9 54 14 55
-rect 86 54 87 93
-rect 89 93 94 94
-rect 89 54 90 93
+rect 6 93 11 94
+rect 10 54 11 93
+rect 13 55 14 94
+rect 18 74 19 94
+rect 21 74 25 94
+rect 27 93 33 94
+rect 27 74 28 93
+rect 32 74 33 93
+rect 35 74 39 94
+rect 41 93 47 94
+rect 41 74 42 93
+rect 46 74 47 93
+rect 49 93 54 94
+rect 49 74 50 93
+rect 58 93 63 94
+rect 62 74 63 93
+rect 65 74 68 94
+rect 70 93 78 94
+rect 70 74 72 93
+rect 76 84 78 93
+rect 80 84 83 94
+rect 85 93 91 94
+rect 85 84 86 93
+rect 76 74 77 84
+rect 13 54 18 55
+rect 90 54 91 93
+rect 93 93 98 94
+rect 93 54 94 93
 << ndcontact >>
-rect 2 6 6 25
-rect 10 6 14 25
-rect 24 6 28 15
-rect 37 6 41 15
-rect 46 6 50 15
-rect 54 6 58 15
-rect 68 6 72 15
-rect 82 6 86 25
-rect 90 6 94 25
+rect 6 6 10 25
+rect 14 6 18 25
+rect 28 6 32 15
+rect 41 6 45 15
+rect 50 6 54 15
+rect 58 6 62 15
+rect 72 6 76 15
+rect 86 6 90 25
+rect 94 6 98 25
 << pdcontact >>
-rect 2 54 6 93
-rect 10 55 14 94
-rect 24 74 28 93
-rect 38 74 42 93
-rect 46 74 50 93
-rect 54 74 58 93
-rect 68 74 72 93
-rect 82 54 86 93
-rect 90 54 94 93
+rect 6 54 10 93
+rect 14 55 18 94
+rect 28 74 32 93
+rect 42 74 46 93
+rect 50 74 54 93
+rect 58 74 62 93
+rect 72 74 76 93
+rect 86 54 90 93
+rect 94 54 98 93
 << psubstratepcontact >>
-rect -2 -2 2 2
-rect 14 -2 18 2
-rect 30 -2 34 2
-rect 46 -2 50 2
-rect 62 -2 66 2
-rect 78 -2 82 2
+rect 102 6 106 10
 << nsubstratencontact >>
-rect -2 98 2 102
-rect 14 98 18 102
-rect 30 98 34 102
-rect 46 98 50 102
-rect 62 98 66 102
-rect 78 98 82 102
+rect 102 89 106 93
 << polysilicon >>
-rect 7 94 9 96
-rect 15 94 17 96
-rect 21 94 23 96
-rect 29 94 31 96
-rect 35 94 37 96
-rect 43 94 45 96
-rect 59 94 61 96
-rect 64 94 66 96
-rect 74 94 76 96
-rect 79 94 81 96
-rect 87 94 89 96
-rect 7 37 9 54
-rect 15 46 17 74
-rect 7 26 9 33
-rect 15 16 17 42
-rect 21 38 23 74
-rect 29 54 31 74
-rect 29 29 31 50
-rect 20 27 31 29
-rect 35 71 37 74
-rect 20 16 22 27
-rect 35 23 37 67
-rect 43 61 45 74
-rect 59 73 61 74
-rect 50 71 61 73
-rect 30 19 31 23
-rect 29 16 31 19
+rect 11 94 13 96
+rect 19 94 21 96
+rect 25 94 27 96
+rect 33 94 35 96
+rect 39 94 41 96
+rect 47 94 49 96
+rect 63 94 65 96
+rect 68 94 70 96
+rect 78 94 80 96
+rect 83 94 85 96
+rect 91 94 93 96
+rect 11 37 13 54
+rect 19 46 21 74
+rect 11 26 13 33
+rect 19 16 21 42
+rect 25 38 27 74
+rect 33 54 35 74
+rect 33 29 35 50
+rect 24 27 35 29
+rect 39 71 41 74
+rect 24 16 26 27
+rect 39 23 41 67
+rect 47 61 49 74
+rect 63 73 65 74
+rect 54 71 65 73
 rect 34 19 35 23
-rect 34 16 36 19
-rect 43 16 45 57
-rect 49 19 51 67
-rect 64 63 66 74
-rect 74 67 76 84
-rect 72 65 76 67
-rect 59 61 66 63
-rect 57 24 59 33
-rect 64 31 66 61
-rect 79 53 81 84
-rect 75 51 81 53
-rect 74 31 76 47
-rect 87 45 89 54
-rect 85 41 89 45
-rect 64 29 71 31
-rect 57 22 66 24
-rect 49 17 61 19
-rect 59 16 61 17
-rect 64 16 66 22
-rect 69 19 71 29
-rect 74 27 75 31
-rect 69 17 76 19
-rect 74 16 76 17
-rect 79 16 81 31
-rect 87 26 89 41
-rect 7 4 9 6
-rect 15 4 17 6
-rect 20 4 22 6
-rect 29 4 31 6
-rect 34 4 36 6
-rect 43 4 45 6
-rect 59 4 61 6
-rect 64 4 66 6
-rect 74 4 76 6
-rect 79 4 81 6
-rect 87 4 89 6
+rect 33 16 35 19
+rect 38 19 39 23
+rect 38 16 40 19
+rect 47 16 49 57
+rect 53 19 55 67
+rect 68 63 70 74
+rect 78 67 80 84
+rect 76 65 80 67
+rect 63 61 70 63
+rect 61 24 63 33
+rect 68 31 70 61
+rect 83 53 85 84
+rect 79 51 85 53
+rect 78 31 80 47
+rect 91 45 93 54
+rect 89 41 93 45
+rect 68 29 75 31
+rect 61 22 70 24
+rect 53 17 65 19
+rect 63 16 65 17
+rect 68 16 70 22
+rect 73 19 75 29
+rect 78 27 79 31
+rect 73 17 80 19
+rect 78 16 80 17
+rect 83 16 85 31
+rect 91 26 93 41
+rect 11 4 13 6
+rect 19 4 21 6
+rect 24 4 26 6
+rect 33 4 35 6
+rect 38 4 40 6
+rect 47 4 49 6
+rect 63 4 65 6
+rect 68 4 70 6
+rect 78 4 80 6
+rect 83 4 85 6
+rect 91 4 93 6
 << polycontact >>
-rect 13 42 17 46
-rect 6 33 10 37
-rect 27 50 31 54
-rect 21 34 25 38
-rect 35 67 39 71
-rect 41 57 45 61
-rect 26 19 30 23
-rect 35 19 39 23
-rect 49 67 53 71
-rect 55 59 59 63
-rect 70 61 74 65
-rect 55 33 59 37
-rect 73 47 77 51
-rect 81 41 85 45
-rect 75 27 79 31
-<< metal1 >>
-rect -2 102 98 103
-rect 2 98 14 102
-rect 18 98 30 102
-rect 34 98 46 102
-rect 50 98 62 102
-rect 66 98 78 102
-rect 82 98 98 102
-rect -2 97 98 98
-rect 10 94 14 97
-rect 2 93 6 94
-rect 24 93 28 94
-rect 18 74 24 77
-rect 38 93 42 97
-rect 46 93 50 94
-rect 54 93 58 97
-rect 67 93 73 94
-rect 67 74 68 93
-rect 72 74 73 93
-rect 82 93 86 97
-rect 46 71 49 74
-rect 39 68 49 71
-rect 22 57 41 60
-rect 48 60 55 63
-rect 48 54 51 60
-rect 67 56 70 65
-rect 6 50 27 52
-rect 31 51 51 54
-rect 58 53 70 56
-rect 90 93 94 94
-rect 2 49 30 50
-rect 17 43 34 46
-rect 14 34 21 37
-rect 58 37 61 53
-rect 90 51 94 54
-rect 77 48 90 51
-rect 70 41 81 44
-rect 25 34 55 37
-rect 2 25 6 26
-rect 10 25 14 26
-rect 27 23 30 34
-rect 59 34 61 37
-rect 90 31 94 47
-rect 79 28 94 31
-rect 90 25 94 28
-rect 39 19 49 22
-rect 46 16 49 19
-rect 18 15 28 16
-rect 18 13 24 15
-rect 37 15 42 16
-rect 41 6 42 15
-rect 46 15 50 16
-rect 54 15 58 16
-rect 66 15 73 16
-rect 66 13 68 15
-rect 67 6 68 13
-rect 72 6 73 15
-rect 10 3 14 6
-rect 37 3 42 6
-rect 54 3 58 6
-rect 82 3 86 6
-rect -2 2 98 3
-rect 2 -2 14 2
-rect 18 -2 30 2
-rect 34 -2 46 2
-rect 50 -2 62 2
-rect 66 -2 78 2
-rect 82 -2 98 2
-rect -2 -3 98 -2
-<< m2contact >>
-rect 18 70 22 74
-rect 66 70 70 74
-rect 18 57 22 61
-rect 2 50 6 54
-rect 34 43 38 47
+rect 17 42 21 46
 rect 10 33 14 37
-rect 90 47 94 51
-rect 66 40 70 44
-rect 2 26 6 30
-rect 18 16 22 20
-rect 66 16 70 20
+rect 31 50 35 54
+rect 25 34 29 38
+rect 39 67 43 71
+rect 45 57 49 61
+rect 30 19 34 23
+rect 39 19 43 23
+rect 53 67 57 71
+rect 59 59 63 63
+rect 74 61 78 65
+rect 59 33 63 37
+rect 77 47 81 51
+rect 85 41 89 45
+rect 79 27 83 31
+<< metal1 >>
+rect 0 97 109 103
+rect 14 94 18 97
+rect 6 93 10 94
+rect 28 93 32 94
+rect 22 74 28 77
+rect 42 93 46 97
+rect 50 93 54 94
+rect 58 93 62 97
+rect 71 93 77 94
+rect 71 74 72 93
+rect 76 74 77 93
+rect 86 93 90 97
+rect 50 71 53 74
+rect 43 68 53 71
+rect 26 57 45 60
+rect 52 60 59 63
+rect 52 54 55 60
+rect 71 56 74 65
+rect 10 50 31 52
+rect 35 51 55 54
+rect 62 53 74 56
+rect 94 93 98 94
+rect 102 93 106 97
+rect 6 49 34 50
+rect 21 43 38 46
+rect 18 34 25 37
+rect 62 37 65 53
+rect 94 51 98 54
+rect 81 48 94 51
+rect 74 41 85 44
+rect 29 34 59 37
+rect 6 25 10 26
+rect 14 25 18 26
+rect 31 23 34 34
+rect 63 34 65 37
+rect 94 31 98 47
+rect 83 28 98 31
+rect 94 25 98 28
+rect 43 19 53 22
+rect 50 16 53 19
+rect 22 15 32 16
+rect 22 13 28 15
+rect 41 15 46 16
+rect 45 6 46 15
+rect 50 15 54 16
+rect 58 15 62 16
+rect 70 15 77 16
+rect 70 13 72 15
+rect 71 6 72 13
+rect 76 6 77 15
+rect 14 3 18 6
+rect 41 3 46 6
+rect 58 3 62 6
+rect 86 3 90 6
+rect 102 3 106 6
+rect 0 -3 109 3
+<< m2contact >>
+rect 22 70 26 74
+rect 70 70 74 74
+rect 22 57 26 61
+rect 6 50 10 54
+rect 38 43 42 47
+rect 14 33 18 37
+rect 94 47 98 51
+rect 70 40 74 44
+rect 6 26 10 30
+rect 22 16 26 20
+rect 70 16 74 20
 << metal2 >>
-rect 18 61 22 70
-rect 2 30 6 50
-rect 18 20 22 57
-rect 66 44 70 70
-rect 66 20 70 40
+rect 22 61 26 70
+rect 6 30 10 50
+rect 22 20 26 57
+rect 70 44 74 70
+rect 70 20 74 40
 << m3p >>
-rect -2 0 98 100
+rect 0 0 109 100
 << labels >>
-rlabel metal1 23 100 23 100 5 vdd
-rlabel metal1 38 -1 38 -1 1 gnd
-rlabel m2contact 11 34 11 34 1 clk
-rlabel m2contact 36 45 36 45 1 d
-rlabel m2contact 91 49 91 49 1 q
+rlabel m2contact 15 34 15 34 4 clk
+rlabel m2contact 40 45 40 45 4 D
+rlabel m2contact 96 49 96 49 4 Q
+rlabel metal1 32 98 32 98 4 vdd
+rlabel metal1 44 1 44 1 4 gnd
+<< properties >>
+string path 0.000 0.000 900.000 0.000 900.000 900.000 0.000 900.000 0.000 0.000 
 << end >>
diff --git a/technology/scn3me_subm/sp_lib/dff.sp b/technology/scn3me_subm/sp_lib/dff.sp
index 6d57e652..61515ab6 100644
--- a/technology/scn3me_subm/sp_lib/dff.sp
+++ b/technology/scn3me_subm/sp_lib/dff.sp
@@ -1,8 +1,8 @@
 * Positive edge-triggered FF
-.subckt dff d q clk vdd gnd
+.subckt dff D Q clk vdd gnd
 M0 vdd clk a_2_6# vdd p w=12u l=0.6u
 + ad=0p pd=0u as=0p ps=0u 
-M1 a_17_74# d vdd vdd p w=6u l=0.6u
+M1 a_17_74# D vdd vdd p w=6u l=0.6u
 + ad=0p pd=0u as=0p ps=0u 
 M2 a_22_6# clk a_17_74# vdd p w=6u l=0.6u
 + ad=0p pd=0u as=0p ps=0u 
@@ -18,13 +18,13 @@ M7 a_66_6# a_2_6# a_61_74# vdd p w=6u l=0.6u
 + ad=0p pd=0u as=0p ps=0u 
 M8 a_76_84# clk a_66_6# vdd p w=3u l=0.6u
 + ad=0p pd=0u as=0p ps=0u 
-M9 vdd q a_76_84# vdd p w=3u l=0.6u
+M9 vdd Q a_76_84# vdd p w=3u l=0.6u
 + ad=0p pd=0u as=0p ps=0u 
 M10 gnd clk a_2_6# gnd n w=6u l=0.6u
 + ad=0p pd=0u as=0p ps=0u 
-M11 q a_66_6# vdd vdd p w=12u l=0.6u
+M11 Q a_66_6# vdd vdd p w=12u l=0.6u
 + ad=0p pd=0u as=0p ps=0u 
-M12 a_17_6# d gnd gnd n w=3u l=0.6u
+M12 a_17_6# D gnd gnd n w=3u l=0.6u
 + ad=0p pd=0u as=0p ps=0u 
 M13 a_22_6# a_2_6# a_17_6# gnd n w=3u l=0.6u
 + ad=0p pd=0u as=0p ps=0u 
@@ -40,8 +40,8 @@ M18 a_66_6# clk a_61_6# gnd n w=3u l=0.6u
 + ad=0p pd=0u as=0p ps=0u 
 M19 a_76_6# a_2_6# a_66_6# gnd n w=3u l=0.6u
 + ad=0p pd=0u as=0p ps=0u 
-M20 gnd q a_76_6# gnd n w=3u l=0.6u
+M20 gnd Q a_76_6# gnd n w=3u l=0.6u
 + ad=0p pd=0u as=0p ps=0u 
-M21 q a_66_6# gnd gnd n w=6u l=0.6u
+M21 Q a_66_6# gnd gnd n w=6u l=0.6u
 + ad=0p pd=0u as=0p ps=0u 
 .ends dff