From 8eb6caa248f6b6e2331724d9f4969afba06cc6dd Mon Sep 17 00:00:00 2001 From: Jesse Cirimelli-Low Date: Tue, 14 Dec 2021 22:15:27 -0800 Subject: [PATCH 1/3] 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 From ddb76c4affd3b5325579e06df20397a33f1750cf Mon Sep 17 00:00:00 2001 From: Jesse Cirimelli-Low Date: Wed, 15 Dec 2021 01:28:30 -0800 Subject: [PATCH 2/3] fix dummy array opc --- technology/sky130/modules/sky130_dummy_array.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/technology/sky130/modules/sky130_dummy_array.py b/technology/sky130/modules/sky130_dummy_array.py index 063d5a79..e1cb3dfd 100644 --- a/technology/sky130/modules/sky130_dummy_array.py +++ b/technology/sky130/modules/sky130_dummy_array.py @@ -54,6 +54,8 @@ class sky130_dummy_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) self.cell = factory.create(module_type=OPTS.bitcell, version="opt1") def create_instances(self): @@ -79,9 +81,14 @@ class sky130_dummy_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 col % 2: + row_layout.append(self.strap4) + self.add_inst(name="row_{}_col_{}_wlstrap".format(row, col), + mod=self.strap4) + else: + row_layout.append(self.strap4) + self.add_inst(name="row_{}_col_{}_wlstrap".format(row, col), + mod=self.strap4) alternate_strap = 0 else: if col % 2: From 4e5744df507998fe9b81eae07472cd55dcbbbab1 Mon Sep 17 00:00:00 2001 From: Jesse Cirimelli-Low Date: Wed, 15 Dec 2021 01:36:56 -0800 Subject: [PATCH 3/3] remove add_mod() --- technology/sky130/modules/sky130_bitcell_array.py | 6 ------ technology/sky130/modules/sky130_col_cap_array.py | 6 ------ technology/sky130/modules/sky130_dummy_array.py | 6 ------ technology/sky130/modules/sky130_replica_column.py | 9 --------- technology/sky130/modules/sky130_row_cap_array.py | 8 -------- 5 files changed, 35 deletions(-) diff --git a/technology/sky130/modules/sky130_bitcell_array.py b/technology/sky130/modules/sky130_bitcell_array.py index c71b6aa1..648f22d6 100644 --- a/technology/sky130/modules/sky130_bitcell_array.py +++ b/technology/sky130/modules/sky130_bitcell_array.py @@ -38,17 +38,11 @@ class sky130_bitcell_array(bitcell_array, sky130_bitcell_base_array): """ Add the modules used in this design """ # Bitcell for port names only self.cell = factory.create(module_type=OPTS.bitcell, version="opt1") - self.add_mod(self.cell) self.cell2 = factory.create(module_type=OPTS.bitcell, version="opt1a") - self.add_mod(self.cell2) self.strap = factory.create(module_type="internal", version="wlstrap") - 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.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 """ diff --git a/technology/sky130/modules/sky130_col_cap_array.py b/technology/sky130/modules/sky130_col_cap_array.py index b1e9e35b..26d97ee2 100644 --- a/technology/sky130/modules/sky130_col_cap_array.py +++ b/technology/sky130/modules/sky130_col_cap_array.py @@ -49,18 +49,12 @@ class sky130_col_cap_array(sky130_bitcell_base_array): """ Add the modules used in this design """ if self.location == "top": self.colend1 = factory.create(module_type="col_cap", version="colend") - self.add_mod(self.colend1) self.colend2 = factory.create(module_type="col_cap", version="colend_p_cent") - self.add_mod(self.colend2) self.colend3 = factory.create(module_type="col_cap", version="colend_cent") - self.add_mod(self.colend3) elif self.location == "bottom": self.colend1 = factory.create(module_type="col_cap", version="colenda") - self.add_mod(self.colend1) self.colend2 = factory.create(module_type="col_cap", version="colenda_p_cent") - self.add_mod(self.colend2) self.colend3 = factory.create(module_type="col_cap", version="colenda_cent") - self.add_mod(self.colend3) self.cell = factory.create(module_type=OPTS.bitcell, version="opt1") diff --git a/technology/sky130/modules/sky130_dummy_array.py b/technology/sky130/modules/sky130_dummy_array.py index e1cb3dfd..c53b0fc3 100644 --- a/technology/sky130/modules/sky130_dummy_array.py +++ b/technology/sky130/modules/sky130_dummy_array.py @@ -45,17 +45,11 @@ class sky130_dummy_array(sky130_bitcell_base_array): def add_modules(self): """ Add the modules used in this design """ self.dummy_cell = factory.create(module_type=OPTS.dummy_bitcell, version="opt1") - self.add_mod(self.dummy_cell) self.dummy_cell2 = factory.create(module_type=OPTS.dummy_bitcell, version="opt1a") - self.add_mod(self.dummy_cell2) self.strap = factory.create(module_type="internal", version="wlstrap") - 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.strap4 = factory.create(module_type="internal", version="wlstrapa_p") - self.add_mod(self.strap4) self.cell = factory.create(module_type=OPTS.bitcell, version="opt1") def create_instances(self): diff --git a/technology/sky130/modules/sky130_replica_column.py b/technology/sky130/modules/sky130_replica_column.py index 7169ae6a..f5dddf5d 100644 --- a/technology/sky130/modules/sky130_replica_column.py +++ b/technology/sky130/modules/sky130_replica_column.py @@ -92,30 +92,21 @@ class sky130_replica_column(sky130_bitcell_base_array): def add_modules(self): self.replica_cell = factory.create(module_type="replica_bitcell_1port", version="opt1") - self.add_mod(self.replica_cell) self.cell = self.replica_cell self.replica_cell2 = factory.create(module_type="replica_bitcell_1port", version="opt1a") - self.add_mod(self.replica_cell2) self.dummy_cell = factory.create(module_type="dummy_bitcell_1port", version="opt1") self.dummy_cell2 = factory.create(module_type="dummy_bitcell_1port", version="opt1") self.strap1 = factory.create(module_type="internal", version="wlstrap") - 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 - self.add_mod(self.colend) self.colenda = factory.create(module_type="col_cap", version="colenda") - self.add_mod(self.colenda) self.colend_p_cent = factory.create(module_type="col_cap", version="colend_p_cent") - self.add_mod(self.colend_p_cent) self.colenda_p_cent = factory.create(module_type="col_cap", version="colenda_p_cent") - self.add_mod(self.colenda_p_cent) def create_instances(self): self.cell_inst = {} diff --git a/technology/sky130/modules/sky130_row_cap_array.py b/technology/sky130/modules/sky130_row_cap_array.py index a82f5558..e5721da2 100644 --- a/technology/sky130/modules/sky130_row_cap_array.py +++ b/technology/sky130/modules/sky130_row_cap_array.py @@ -51,24 +51,16 @@ class sky130_row_cap_array(sky130_bitcell_base_array): """ Add the modules used in this design """ if self.column_offset == 0: self.top_corner = factory.create(module_type="corner", location="ul") - self.add_mod(self.top_corner) self.bottom_corner =factory.create(module_type="corner", location="ll") - self.add_mod(self.bottom_corner) self.rowend1 = factory.create(module_type="row_cap", version="rowend_replica") - self.add_mod(self.rowend1) self.rowend2 = factory.create(module_type="row_cap", version="rowenda_replica") - self.add_mod(self.rowend2) else: self.top_corner = factory.create(module_type="corner", location="ur") - self.add_mod(self.top_corner) self.bottom_corner = factory.create(module_type="corner", location="lr") - self.add_mod(self.bottom_corner) self.rowend1 = factory.create(module_type="row_cap", version="rowend") - self.add_mod(self.rowend1) self.rowend2 = factory.create(module_type="row_cap", version="rowenda") - self.add_mod(self.rowend2) self.cell = factory.create(module_type=OPTS.bitcell, version="opt1")