From 8eb6caa248f6b6e2331724d9f4969afba06cc6dd Mon Sep 17 00:00:00 2001
From: Jesse Cirimelli-Low <jcirimel@ucsc.edu>
Date: Tue, 14 Dec 2021 22:15:27 -0800
Subject: [PATCH] fix bitcell array opc errors

---
 technology/sky130/modules/sky130_bitcell_array.py  | 13 ++++++++++---
 technology/sky130/modules/sky130_dummy_array.py    | 14 ++++++++++----
 technology/sky130/modules/sky130_internal.py       |  2 ++
 technology/sky130/modules/sky130_replica_column.py |  6 ++++--
 4 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/technology/sky130/modules/sky130_bitcell_array.py b/technology/sky130/modules/sky130_bitcell_array.py
index 5d250f15..c71b6aa1 100644
--- a/technology/sky130/modules/sky130_bitcell_array.py
+++ b/technology/sky130/modules/sky130_bitcell_array.py
@@ -47,6 +47,8 @@ class sky130_bitcell_array(bitcell_array, sky130_bitcell_base_array):
         self.add_mod(self.strap2)
         self.strap3 = factory.create(module_type="internal", version="wlstrapa")
         self.add_mod(self.strap3)
+        self.strap4 = factory.create(module_type="internal", version="wlstrapa_p")
+        self.add_mod(self.strap4)
 
     def create_instances(self):
         """ Create the module instances used in this design """
@@ -71,9 +73,14 @@ class sky130_bitcell_array(bitcell_array, sky130_bitcell_base_array):
                 self.connect_inst(self.get_bitcell_pins(row, col))
                 if col != self.column_size - 1:
                     if alternate_strap:
-                        row_layout.append(self.strap2)
-                        self.add_inst(name="row_{}_col_{}_wlstrap".format(row, col),
-                                      mod=self.strap2)
+                        if row % 2:
+                            row_layout.append(self.strap4)
+                            self.add_inst(name="row_{}_col_{}_wlstrap".format(row, col),
+                                              mod=self.strap4)
+                        else:
+                            row_layout.append(self.strap2)
+                            self.add_inst(name="row_{}_col_{}_wlstrap".format(row, col),
+                                              mod=self.strap2)
                         alternate_strap = 0
                     else:
                         if row % 2:
diff --git a/technology/sky130/modules/sky130_dummy_array.py b/technology/sky130/modules/sky130_dummy_array.py
index 9f854dd8..063d5a79 100644
--- a/technology/sky130/modules/sky130_dummy_array.py
+++ b/technology/sky130/modules/sky130_dummy_array.py
@@ -52,6 +52,8 @@ class sky130_dummy_array(sky130_bitcell_base_array):
         self.add_mod(self.strap)
         self.strap2 = factory.create(module_type="internal", version="wlstrap_p")
         self.add_mod(self.strap2)
+        self.strap3 = factory.create(module_type="internal", version="wlstrapa")
+        self.add_mod(self.strap3)
         self.cell = factory.create(module_type=OPTS.bitcell, version="opt1")
 
     def create_instances(self):
@@ -82,10 +84,14 @@ class sky130_dummy_array(sky130_bitcell_base_array):
                                       mod=self.strap2)
                         alternate_strap = 0
                     else:
-
-                        row_layout.append(self.strap)
-                        self.add_inst(name="row_{}_col_{}_wlstrap".format(row, col),
-                                      mod=self.strap)
+                        if col % 2:
+                                row_layout.append(self.strap)
+                                self.add_inst(name="row_{}_col_{}_wlstrap".format(row, col),
+                                              mod=self.strap)
+                        else:
+                                row_layout.append(self.strap3)
+                                self.add_inst(name="row_{}_col_{}_wlstrap".format(row, col),
+                                              mod=self.strap3)
                         alternate_strap = 1
                     self.connect_inst(self.get_strap_pins(row, col))
             if alternate_bitcell == 0:
diff --git a/technology/sky130/modules/sky130_internal.py b/technology/sky130/modules/sky130_internal.py
index c481195f..b8c0616f 100644
--- a/technology/sky130/modules/sky130_internal.py
+++ b/technology/sky130/modules/sky130_internal.py
@@ -22,6 +22,8 @@ class sky130_internal(design.design):
             self.name = "sky130_fd_bd_sram__sram_sp_wlstrap_p"
         elif version == "wlstrapa":
             self.name = "sky130_fd_bd_sram__sram_sp_wlstrapa"
+        elif version == "wlstrapa_p":
+            self.name = "sky130_fd_bd_sram__sram_sp_wlstrapa_p"
         else:
             debug.error("Invalid version", -1)
         design.design.__init__(self, name=self.name)
diff --git a/technology/sky130/modules/sky130_replica_column.py b/technology/sky130/modules/sky130_replica_column.py
index a900b0fe..7169ae6a 100644
--- a/technology/sky130/modules/sky130_replica_column.py
+++ b/technology/sky130/modules/sky130_replica_column.py
@@ -104,6 +104,8 @@ class sky130_replica_column(sky130_bitcell_base_array):
         self.add_mod(self.strap1)
         self.strap2 = factory.create(module_type="internal", version="wlstrap_p")
         self.add_mod(self.strap2)
+        self.strap3 = factory.create(module_type="internal", version="wlstrapa_p")
+        self.add_mod(self.strap3)
 
         self.colend = factory.create(module_type="col_cap", version="colend")
         self.edge_cell = self.colend
@@ -140,8 +142,8 @@ class sky130_replica_column(sky130_bitcell_base_array):
                     row_layout.append(self.replica_cell2)
                     self.cell_inst[row]=self.add_inst(name=name, mod=self.replica_cell2)
                     self.connect_inst(self.get_bitcell_pins(row, 0))
-                    row_layout.append(self.strap2)
-                    self.add_inst(name=name + "_strap", mod=self.strap2)
+                    row_layout.append(self.strap3)
+                    self.add_inst(name=name + "_strap", mod=self.strap3)
                     self.connect_inst(self.get_strap_pins(row, 0))
                     alternate_bitcell = 0