Merge pull request #8929 from gadfort/tap-covers

tap: ignore cover cells

Author: maliberty

src/tap/src/tapcell.cpp

@@ -130,7 +130,7 @@ int Tapcell::placeTapcells(odb::dbMaster* tapcell_master, const int dist)
 
   std::vector<odb::dbInst*> fixed_insts;
   for (auto* inst : db_->getChip()->getBlock()->getInsts()) {
-    if (inst->isFixed()) {
+    if (inst->isFixed() && !inst->getMaster()->isCover()) {
       fixed_insts.push_back(inst);
     }
   }

src/tap/test/BUILD

@@ -34,6 +34,7 @@ COMPULSORY_TESTS = [
     "jpeg_gf180",
     "multiple_calls",
     "no_endcap",
+    "overlap_cover",
     "region1",
     "symmetry",
 ]
@@ -148,6 +149,7 @@ filegroup(
             ],
             "gcd_sky130_separate": ["gcd_sky130.defok"],
             "multiple_calls": ["gcd_ripup.def"],
+            "overlap_cover": ["sky130hs_data/cover.lef"],
         }.get(
             test_name,
             ["boundary_macros.def"],

src/tap/test/CMakeLists.txt

@@ -29,6 +29,7 @@ or_integration_tests(
     jpeg_gf180
     multiple_calls
     no_endcap
+    overlap_cover
     region1
     symmetry
 )

src/tap/test/overlap_cover.defok

@@ -0,0 +1,10 @@
+[INFO ODB-0227] LEF file: sky130hs/sky130hs.tlef, created 13 layers, 25 vias
+[INFO ODB-0227] LEF file: sky130hs/sky130hs_std_cell.lef, created 390 library cells
+[INFO ODB-0227] LEF file: sky130hs_data/cover.lef, created 1 library cells
+[INFO ODB-0128] Design: gcd
+[INFO ODB-0130]     Created 54 pins.
+[INFO ODB-0131]     Created 366 components and 2656 component-terminals.
+[INFO ODB-0133]     Created 402 nets and 1192 connections.
+[INFO TAP-0004] Inserted 168 endcaps.
+[INFO TAP-0005] Inserted 817 tapcells.
+No differences found.

src/tap/test/overlap_cover.ok

@@ -0,0 +1,16 @@
+source "helpers.tcl"
+read_lef sky130hs/sky130hs.tlef
+read_lef sky130hs/sky130hs_std_cell.lef
+read_lef sky130hs_data/cover.lef
+read_def gcd_sky130hs_floorplan.def
+
+place_inst -cell COVER_MACRO -location {100 100} -name COVER -status FIRM
+
+set def_file [make_result_file overlap_cover.def]
+
+tapcell -distance 14 -tapcell_master "sky130_fd_sc_hs__tap_1" \
+  -endcap_master "sky130_fd_sc_hs__decap_4"
+
+write_def $def_file
+
+diff_file overlap_cover.defok $def_file

src/tap/test/overlap_cover.tcl

@@ -0,0 +1,11 @@
+VERSION 5.8 ;
+BUSBITCHARS "[]" ;
+DIVIDERCHAR "/" ;
+
+MACRO COVER_MACRO
+  CLASS COVER BUMP ;
+  ORIGIN 0.0 0.0 ;
+  SIZE 100.0 BY 100.0 ;
+END COVER_MACRO
+
+END LIBRARY