From 468de963f678874d9265aefbe7c6af6cbae1de3b Mon Sep 17 00:00:00 2001 From: Jesse Cirimelli-Low Date: Wed, 22 Dec 2021 15:51:49 -0800 Subject: [PATCH] remove add_mod in sky130 --- technology/sky130/modules/sky130_bitcell_array.py | 5 ----- technology/sky130/modules/sky130_col_cap_array.py | 6 ------ technology/sky130/modules/sky130_dummy_array.py | 4 ---- technology/sky130/modules/sky130_replica_column.py | 8 -------- technology/sky130/modules/sky130_row_cap_array.py | 8 -------- 5 files changed, 31 deletions(-) diff --git a/technology/sky130/modules/sky130_bitcell_array.py b/technology/sky130/modules/sky130_bitcell_array.py index bd3a9457..32fd5e4b 100644 --- a/technology/sky130/modules/sky130_bitcell_array.py +++ b/technology/sky130/modules/sky130_bitcell_array.py @@ -38,15 +38,10 @@ 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) 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 56f53d8b..66116417 100644 --- a/technology/sky130/modules/sky130_dummy_array.py +++ b/technology/sky130/modules/sky130_dummy_array.py @@ -45,13 +45,9 @@ 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.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 db37d26f..482b22e2 100644 --- a/technology/sky130/modules/sky130_replica_column.py +++ b/technology/sky130/modules/sky130_replica_column.py @@ -92,28 +92,20 @@ 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.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")