Merge remote-tracking branch 'origin/master' into pad-imp

gadfort · gadfort · commit 79eb94e15569 · 2025-11-06T20:49:05.000-05:00
diff --git a/BUILD.bazel b/BUILD.bazel
@@ -104,7 +104,7 @@ OPENROAD_LIBRARY_DEPS = [
     "//src/upf:ui",
     "//src/utl",
     "//src/utl:ui",
-    "@edu_berkeley_abc//:abc-lib",
+    "//third-party/abc:abc-lib",
     ":ord",
 ] + select(
     {
diff --git a/WORKSPACE b/WORKSPACE
@@ -25,7 +25,6 @@ http_archive(
 # This essentially reads as a TODO list of what needs to be upstreamed to BCR
 load("@rules_hdl//dependency_support/com_github_quantamhd_lemon:com_github_quantamhd_lemon.bzl", "com_github_quantamhd_lemon")
 load("@rules_hdl//dependency_support/com_github_westes_flex:com_github_westes_flex.bzl", "com_github_westes_flex")
-load("@rules_hdl//dependency_support/edu_berkeley_abc:edu_berkeley_abc.bzl", "edu_berkeley_abc")
 load("@rules_hdl//dependency_support/net_invisible_island_ncurses:net_invisible_island_ncurses.bzl", "net_invisible_island_ncurses")
 load("@rules_hdl//dependency_support/net_zlib:net_zlib.bzl", "net_zlib")
 load("@rules_hdl//dependency_support/org_gnu_bison:org_gnu_bison.bzl", "org_gnu_bison")
@@ -37,8 +36,6 @@ load("@rules_hdl//dependency_support/tk_tcl:tk_tcl.bzl", "tk_tcl")
 # Direct dependencies needed in Openroad
 com_github_quantamhd_lemon()
 
-edu_berkeley_abc()
-
 tk_tcl()
 
 # Swig exists in BCR, but in a newer version where we need to test how to make
diff --git a/src/cgt/BUILD b/src/cgt/BUILD
@@ -40,8 +40,8 @@ cc_library(
         "//src/odb",
         "//src/sta:opensta_lib",
         "//src/utl",
+        "//third-party/abc:abc-lib",
         "@boost.stacktrace",
-        "@edu_berkeley_abc//:abc-lib",
         "@tk_tcl//:tcl",
     ],
 )
diff --git a/src/cut/BUILD b/src/cut/BUILD
@@ -37,13 +37,13 @@ cc_library(
         "//src/rsz",
         "//src/sta:opensta_lib",
         "//src/utl",
+        "//third-party/abc:abc-lib",
         "@boost.bind",
         "@boost.config",
         "@boost.fusion",
         "@boost.lambda",
         "@boost.optional",
         "@boost.phoenix",
         "@boost.spirit",
-        "@edu_berkeley_abc//:abc-lib",
     ],
 )
diff --git a/src/cut/test/BUILD b/src/cut/test/BUILD
@@ -37,7 +37,7 @@ cc_test(
         "//src/sta:opensta_lib",
         "//src/tst",
         "//src/utl",
-        "@edu_berkeley_abc//:abc-lib",
+        "//third-party/abc:abc-lib",
         "@googletest//:gtest",
         "@googletest//:gtest_main",
     ],
diff --git a/src/ifp/include/ifp/InitFloorplan.hh b/src/ifp/include/ifp/InitFloorplan.hh
@@ -126,6 +126,7 @@ class InitFloorplan
                             int y_offset,
                             int y_pitch,
                             int first_last_pitch);
+  void resetTracks() const;
 
   odb::dbSite* findSite(const char* site_name);
 
diff --git a/src/ifp/src/InitFloorplan.cc b/src/ifp/src/InitFloorplan.cc
@@ -186,6 +186,8 @@ void InitFloorplan::makeDie(const odb::Rect& die)
                 snapToMfgGrid(die.xMax()),
                 snapToMfgGrid(die.yMax()));
   block_->setDieArea(die_area);
+
+  resetTracks();
 }
 
 void InitFloorplan::makePolygonDie(const odb::Polygon& polygon)
@@ -214,6 +216,8 @@ void InitFloorplan::makePolygonDie(const odb::Polygon& polygon)
 
   // Set the die area using the polygon
   block_->setDieArea(polygon);
+
+  resetTracks();
 }
 
 void InitFloorplan::makePolygonRows(
@@ -977,6 +981,16 @@ void InitFloorplan::makeTracks()
   }
 }
 
+void InitFloorplan::resetTracks() const
+{
+  for (auto layer : block_->getDataBase()->getTech()->getLayers()) {
+    auto grid = block_->findTrackGrid(layer);
+    if (grid) {
+      odb::dbTrackGrid::destroy(grid);
+    }
+  }
+}
+
 void InitFloorplan::makeTracks(odb::dbTechLayer* layer,
                                int x_offset,
                                int x_pitch,
diff --git a/src/ifp/test/BUILD b/src/ifp/test/BUILD
@@ -18,6 +18,7 @@ COMPULSORY_TESTS = [
     "init_floorplan8",
     "init_floorplan9",
     "init_floorplan10",
+    "init_floorplan11",
     "init_floorplan_dbl_row",
     "init_floorplan_even_rows",
     "init_floorplan_flip_sites",
diff --git a/src/ifp/test/CMakeLists.txt b/src/ifp/test/CMakeLists.txt
@@ -13,6 +13,7 @@ or_integration_tests(
     init_floorplan8
     init_floorplan9
     init_floorplan10
+    init_floorplan11
     init_floorplan_dbl_row
     init_floorplan_even_rows
     init_floorplan_flip_sites
diff --git a/src/ifp/test/init_floorplan11.defok b/src/ifp/test/init_floorplan11.defok
diff --git a/src/ifp/test/init_floorplan11.ok b/src/ifp/test/init_floorplan11.ok
@@ -0,0 +1,6 @@
+[INFO ODB-0227] LEF file: Nangate45/Nangate45.lef, created 22 layers, 27 vias, 135 library cells
+[WARNING IFP-0028] Core area lower left (110.000, 110.000) snapped to (110.010, 110.600).
+[INFO IFP-0001] Added 563 rows of 4157 site FreePDK45_38x28_10R_NP_162NW_34O.
+[WARNING IFP-0028] Core area lower left (110.000, 110.000) snapped to (110.010, 110.600).
+[INFO IFP-0001] Added 271 rows of 1999 site FreePDK45_38x28_10R_NP_162NW_34O.
+No differences found.
diff --git a/src/ifp/test/init_floorplan11.tcl b/src/ifp/test/init_floorplan11.tcl
@@ -0,0 +1,20 @@
+# init_floorplan ensure only one set of tracks appear after initialize_floorplan
+source "helpers.tcl"
+read_lef Nangate45/Nangate45.lef
+read_liberty Nangate45/Nangate45_typ.lib
+read_verilog reg1.v
+link_design top
+initialize_floorplan -die_area "0 0 1000 1000" \
+  -core_area "110 110 900 900" \
+  -site FreePDK45_38x28_10R_NP_162NW_34O
+make_tracks
+
+# Repeat with diffent size
+initialize_floorplan -die_area "0 0 500 500" \
+  -core_area "110 110 490 490" \
+  -site FreePDK45_38x28_10R_NP_162NW_34O
+make_tracks
+
+set def_file [make_result_file init_floorplan11.def]
+write_def $def_file
+diff_files init_floorplan11.defok $def_file
diff --git a/src/pdn/test/core_grid_with_single_edge_pins.defok b/src/pdn/test/core_grid_with_single_edge_pins.defok
@@ -76,24 +76,6 @@ ROW ROW_68 FreePDK45_38x28_10R_NP_162NW_34O 0 190400 N DO 527 BY 1 STEP 380 0 ;
 ROW ROW_69 FreePDK45_38x28_10R_NP_162NW_34O 0 193200 FS DO 527 BY 1 STEP 380 0 ;
 ROW ROW_70 FreePDK45_38x28_10R_NP_162NW_34O 0 196000 N DO 527 BY 1 STEP 380 0 ;
 ROW ROW_71 FreePDK45_38x28_10R_NP_162NW_34O 0 198800 FS DO 527 BY 1 STEP 380 0 ;
-TRACKS X 190 DO 527 STEP 380 LAYER metal1 ;
-TRACKS Y 140 DO 720 STEP 280 LAYER metal1 ;
-TRACKS X 190 DO 527 STEP 380 LAYER metal2 ;
-TRACKS Y 140 DO 720 STEP 280 LAYER metal2 ;
-TRACKS X 190 DO 527 STEP 380 LAYER metal3 ;
-TRACKS Y 140 DO 720 STEP 280 LAYER metal3 ;
-TRACKS X 190 DO 358 STEP 560 LAYER metal4 ;
-TRACKS Y 140 DO 360 STEP 560 LAYER metal4 ;
-TRACKS X 190 DO 358 STEP 560 LAYER metal5 ;
-TRACKS Y 140 DO 360 STEP 560 LAYER metal5 ;
-TRACKS X 190 DO 358 STEP 560 LAYER metal6 ;
-TRACKS Y 140 DO 360 STEP 560 LAYER metal6 ;
-TRACKS X 190 DO 126 STEP 1600 LAYER metal7 ;
-TRACKS Y 140 DO 126 STEP 1600 LAYER metal7 ;
-TRACKS X 190 DO 126 STEP 1600 LAYER metal8 ;
-TRACKS Y 140 DO 126 STEP 1600 LAYER metal8 ;
-TRACKS X 190 DO 63 STEP 3200 LAYER metal9 ;
-TRACKS Y 140 DO 63 STEP 3200 LAYER metal9 ;
 VIAS 10 ;
     - via1_2_960_340_1_3_300_300 + VIARULE Via1Array-0 + CUTSIZE 140 140  + LAYERS metal1 via1 metal2  + CUTSPACING 160 160  + ENCLOSURE 70 100 70 70  + ROWCOL 1 3  ;
     - via2_3_960_340_1_3_320_320 + VIARULE Via2Array-0 + CUTSIZE 140 140  + LAYERS metal2 via2 metal3  + CUTSPACING 180 180  + ENCLOSURE 70 70 70 70  + ROWCOL 1 3  ;
diff --git a/src/rmp/BUILD b/src/rmp/BUILD
@@ -44,14 +44,14 @@ cc_library(
         "//src/rsz",
         "//src/sta:opensta_lib",
         "//src/utl",
+        "//third-party/abc:abc-lib",
         "@boost.bind",
         "@boost.config",
         "@boost.fusion",
         "@boost.lambda",
         "@boost.optional",
         "@boost.phoenix",
         "@boost.spirit",
-        "@edu_berkeley_abc//:abc-lib",
     ],
 )
 
diff --git a/src/rmp/test/BUILD b/src/rmp/test/BUILD
@@ -163,7 +163,7 @@ cc_test(
         "//src/sta:opensta_lib",
         "//src/tst",
         "//src/utl",
-        "@edu_berkeley_abc//:abc-lib",
+        "//third-party/abc:abc-lib",
         "@googletest//:gtest",
         "@googletest//:gtest_main",
         "@tk_tcl//:tcl",
diff --git a/third-party/abc b/third-party/abc
@@ -1 +1 @@
-Subproject commit 2bf0bb0ce35cda283d69c8b70c8e668e8511adc1
+Subproject commit a3434d3d7359b121919b7426636c058c795db7f1

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ OPENROAD_LIBRARY_DEPS = [`
`104`	`104`	`"//src/upf:ui",`
`105`	`105`	`"//src/utl",`
`106`	`106`	`"//src/utl:ui",`
`107`		`- "@edu_berkeley_abc//:abc-lib",`
	`107`	`+ "//third-party/abc:abc-lib",`
`108`	`108`	`":ord",`
`109`	`109`	`] + select(`
`110`	`110`	`{`