Merge pull request #8077 from jeffng-or/tap-corner-fallback

Use -corner for inner corner cell if -edge_corner not specified

Author: maliberty

src/tap/src/tapcell.tcl

@@ -314,13 +314,13 @@ proc place_endcaps { args } {
     [tap::parse_endcap_key keys -right_bottom_corner -corner -corner]]
 
   set left_top_edge [tap::find_master \
-    [tap::parse_endcap_key keys -left_top_edge -edge_corner -edge_corner]]
+    [tap::parse_endcap_key keys -left_top_edge -edge_corner -corner]]
   set right_top_edge [tap::find_master \
-    [tap::parse_endcap_key keys -right_top_edge -edge_corner -edge_corner]]
+    [tap::parse_endcap_key keys -right_top_edge -edge_corner -corner]]
   set left_bottom_edge [tap::find_master \
-    [tap::parse_endcap_key keys -left_bottom_edge -edge_corner -edge_corner]]
+    [tap::parse_endcap_key keys -left_bottom_edge -edge_corner -corner]]
   set right_bottom_edge [tap::find_master \
-    [tap::parse_endcap_key keys -right_bottom_edge -edge_corner -edge_corner]]
+    [tap::parse_endcap_key keys -right_bottom_edge -edge_corner -corner]]
 
   set left_edge [tap::find_master \
     [tap::parse_endcap_key keys -left_edge -endcap_vertical -endcap]]

src/tap/test/BUILD

@@ -10,6 +10,7 @@ COMPULSORY_TESTS = [
     "boundary_macros",
     "boundary_macros_auto_select",
     "boundary_macros_separate",
+    "boundary_macros_separate2",
     "boundary_macros_tapcell",
     "cut_rows",
     "cut_rows_min_width",

src/tap/test/CMakeLists.txt

@@ -7,6 +7,7 @@ or_integration_tests(
     boundary_macros
     boundary_macros_auto_select
     boundary_macros_separate
+    boundary_macros_separate2
     boundary_macros_tapcell
     cut_rows
     cut_rows_min_width

src/tap/test/boundary_macros_separate2.defok

@@ -0,0 +1 @@
+boundary_macros_separate.defok

src/tap/test/boundary_macros_separate2.ok

@@ -0,0 +1,11 @@
+[INFO ODB-0227] LEF file: Nangate45/Nangate45_tech.lef, created 22 layers, 27 vias
+[INFO ODB-0227] LEF file: Nangate45/Nangate45_stdcell.lef, created 135 library cells
+[INFO ODB-0227] LEF file: Nangate45/fakeram45_64x7.lef, created 1 library cells
+[INFO ODB-0128] Design: gcd
+[INFO ODB-0130]     Created 54 pins.
+[INFO ODB-0131]     Created 5 components and 160 component-terminals.
+[INFO ODB-0303] The initial 57 rows (24054 sites) were cut with 5 shapes for a total of 13 rows (577 sites).
+[INFO TAP-0003] Inserted 8 endcap corners.
+[INFO TAP-0004] Inserted 196 endcaps.
+[INFO TAP-0005] Inserted 5 tapcells.
+No differences found.

src/tap/test/boundary_macros_separate2.tcl

@@ -0,0 +1,24 @@
+# Same as boundary_macros_separate.tcl, except we don't pass -edge_corner
+# to place_endcaps to test that it uses the -corner master as the inner corner
+
+source "helpers.tcl"
+read_lef Nangate45/Nangate45_tech.lef
+read_lef Nangate45/Nangate45_stdcell.lef
+read_lef Nangate45/fakeram45_64x7.lef
+read_def boundary_macros.def
+
+set def_file [make_result_file boundary_macros_separate.def]
+
+cut_rows -endcap_master TAPCELL_X1
+
+place_endcaps \
+  -corner TAPCELL_X1 \
+  -endcap TAPCELL_X1
+
+place_tapcells -master TAPCELL_X1 -distance "5"
+
+check_placement -verbose
+
+write_def $def_file
+
+diff_file boundary_macros_separate2.defok $def_file