Merge remote-tracking branch 'private/master' into gpl_remove_filler_removal_cap

LucasYuki · LucasYuki · commit 6d120008b182 · 2025-10-07T11:32:07.000Z
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -103,7 +103,7 @@ git_override(
     remote = "https://github.com/The-OpenROAD-Project/qt_bazel_prebuilts",
 )
 
-bazel_dep(name = "googletest", version = "1.16.0", dev_dependency = True)
+bazel_dep(name = "googletest", version = "1.17.0", dev_dependency = True)
 
 # Dependencies needed by one of the rules_hdl repos. Once they are on
 # BCR, they should depend on their own version.
diff --git a/etc/DependencyInstaller.sh b/etc/DependencyInstaller.sh
@@ -73,8 +73,8 @@ _installCommonDev() {
     cuddVersion=3.0.0
     lemonVersion=1.3.1
     spdlogVersion=1.15.0
-    gtestVersion=1.13.0
-    gtestChecksum="a1279c6fb5bf7d4a5e0d0b2a4adb39ac"
+    gtestVersion=1.17.0
+    gtestChecksum="3471f5011afc37b6555f6619c14169cf"
     abslVersion=20240722.0
     abslChecksum="740fb8f35ebdf82740c294bde408b9c0"
     bisonVersion=3.8.2
diff --git a/src/mpl/README.md b/src/mpl/README.md
@@ -41,7 +41,6 @@ rtl_macro_placer
     [-boundary_weight boundary_weight]
     [-notch_weight notch_weight]
     [-macro_blockage_weight macro_blockage_weight]
-    [-pin_access_th pin_access_th]
     [-target_util target_util]
     [-target_dead_space target_dead_space]
     [-min_ar min_ar]
@@ -62,7 +61,6 @@ rtl_macro_placer
 | `-signature_net_threshold` | Minimum number of connections between two clusters to be identified as connected. The default value is `50`, and the allowed values are integers `[0, MAX_INT]`. |
 | `-halo_width` | Horizontal/vertical halo around macros (microns). The allowed values are floats, and the default value is `0.0`. |
 | `-fence_lx`, `-fence_ly`, `-fence_ux`, `-fence_uy` | Defines the global fence bounding box coordinates. The default values are the core area coordinates). |
-| `-pin_access_th` | Specifies the pin access threshold value of macros. The default value is `0.0`, and the allowed values are floats [0,1]. |
 | `-target_util` | Specifies the target utilization of `MixedCluster` and has higher priority than target_dead_space. The allowed values are floats, and the default value is `0.25`. |
 | `-target_dead_space` | Specifies the target dead space percentage, which influences the utilization of `StandardCellCluster`. The allowed values are floats, and the default value is `0.05`. |
 | `-min_ar` | Specifies the minimum aspect ratio $a$, or the ratio of its width to height of a `StandardCellCluster` from $[a, \frac{1}{a}]$. The allowed values are floats, and the default value is `0.33`. |
diff --git a/src/mpl/include/mpl/rtl_mp.h b/src/mpl/include/mpl/rtl_mp.h
@@ -66,7 +66,6 @@ class MacroPlacer
              float boundary_weight,
              float notch_weight,
              float macro_blockage_weight,
-             float pin_access_th,
              float target_util,
              float target_dead_space,
              float min_ar,
diff --git a/src/mpl/src/hier_rtlmp.cpp b/src/mpl/src/hier_rtlmp.cpp
@@ -161,12 +161,6 @@ void HierRTLMP::setSignatureNetThreshold(int signature_net_threshold)
   tree_->min_net_count_for_connection = signature_net_threshold;
 }
 
-void HierRTLMP::setPinAccessThreshold(float pin_access_th)
-{
-  pin_access_th_ = pin_access_th;
-  pin_access_th_orig_ = pin_access_th;
-}
-
 void HierRTLMP::setTargetUtil(float target_util)
 {
   target_util_ = target_util;
diff --git a/src/mpl/src/hier_rtlmp.h b/src/mpl/src/hier_rtlmp.h
@@ -101,7 +101,6 @@ class HierRTLMP
   void setBoundaryWeight(float boundary_weight);
   void setNotchWeight(float notch_weight);
   void setMacroBlockageWeight(float macro_blockage_weight);
-  void setPinAccessThreshold(float pin_access_th);
   void setTargetUtil(float target_util);
   void setTargetDeadSpace(float target_dead_space);
   void setMinAR(float min_ar);
@@ -273,8 +272,6 @@ class HierRTLMP
   float min_ar_ = 0.3;  // the aspect ratio range for StdCellCluster (min_ar_, 1
                         // / min_ar_)
 
-  float pin_access_th_ = 0.1;  // each pin access is modeled as a SoftMacro
-  float pin_access_th_orig_ = 0.1;
   float notch_v_th_ = 10.0;
   float notch_h_th_ = 10.0;
 
diff --git a/src/mpl/src/mpl.i b/src/mpl/src/mpl.i
@@ -49,7 +49,6 @@ bool rtl_macro_placer_cmd(const int max_num_macro,
                           const float boundary_weight,
                           const float notch_weight,
                           const float macro_blockage_weight,
-                          const float pin_access_th,
                           const float target_util,
                           const float target_dead_space,
                           const float min_ar,
@@ -81,7 +80,6 @@ bool rtl_macro_placer_cmd(const int max_num_macro,
                              boundary_weight,
                              notch_weight,
                              macro_blockage_weight,
-                             pin_access_th,
                              target_util,
                              target_dead_space,
                              min_ar,
diff --git a/src/mpl/src/mpl.tcl b/src/mpl/src/mpl.tcl
@@ -24,7 +24,6 @@ sta::define_cmd_args "rtl_macro_placer" { -max_num_macro  max_num_macro \
                                           -boundary_weight boundary_weight \
                                           -notch_weight notch_weight \
                                           -macro_blockage_weight macro_blockage_weight \
-                                          -pin_access_th pin_access_th \
                                           -target_util   target_util \
                                           -target_dead_space target_dead_space \
                                           -min_ar  min_ar \
@@ -38,8 +37,8 @@ proc rtl_macro_placer { args } {
          -signature_net_threshold -halo_width -halo_height \
          -fence_lx   -fence_ly  -fence_ux   -fence_uy  \
          -area_weight  -outline_weight -wirelength_weight -guidance_weight -fence_weight \
-         -boundary_weight -notch_weight -macro_blockage_weight  \
-         -pin_access_th -target_util \
+         -boundary_weight -notch_weight \
+         -macro_blockage_weight -target_util \
          -target_dead_space -min_ar \
          -report_directory \
          -write_macro_placement } \
@@ -79,7 +78,6 @@ proc rtl_macro_placer { args } {
   set boundary_weight 50.0
   set notch_weight 10.0
   set macro_blockage_weight 10.0
-  set pin_access_th 0.00
   set target_util 0.25
   set target_dead_space 0.05
   set min_ar 0.33
@@ -162,9 +160,6 @@ proc rtl_macro_placer { args } {
   if { [info exists keys(-macro_blockage_weight)] } {
     set macro_blockage_weight $keys(-macro_blockage_weight)
   }
-  if { [info exists keys(-pin_access_th)] } {
-    set pin_access_th $keys(-pin_access_th)
-  }
   if { [info exists keys(-target_util)] } {
     set target_util $keys(-target_util)
   }
@@ -200,7 +195,6 @@ proc rtl_macro_placer { args } {
       $area_weight $outline_weight $wirelength_weight \
       $guidance_weight $fence_weight $boundary_weight \
       $notch_weight $macro_blockage_weight \
-      $pin_access_th \
       $target_util \
       $target_dead_space \
       $min_ar \
diff --git a/src/mpl/src/rtl_mp.cpp b/src/mpl/src/rtl_mp.cpp
@@ -56,7 +56,6 @@ bool MacroPlacer::place(const int num_threads,
                         const float boundary_weight,
                         const float notch_weight,
                         const float macro_blockage_weight,
-                        const float pin_access_th,
                         const float target_util,
                         const float target_dead_space,
                         const float min_ar,
@@ -80,7 +79,6 @@ bool MacroPlacer::place(const int num_threads,
   hier_rtlmp_->setBoundaryWeight(boundary_weight);
   hier_rtlmp_->setNotchWeight(notch_weight);
   hier_rtlmp_->setMacroBlockageWeight(macro_blockage_weight);
-  hier_rtlmp_->setPinAccessThreshold(pin_access_th);
   hier_rtlmp_->setTargetUtil(target_util);
   hier_rtlmp_->setTargetDeadSpace(target_dead_space);
   hier_rtlmp_->setMinAR(min_ar);
diff --git a/src/odb/README.md b/src/odb/README.md
@@ -445,6 +445,14 @@ You can find examples on using the API from Tcl under `test/tcl/` directory.
 The full set of the Tcl commands exposed can be found under
 `./build/src/swig/tcl/opendb_wrapper.cpp`. Search for `SWIG_prefix`.
 
+### All pin placed
+
+This command checks if the IO pins of the design have a placement status of `PLACED`, `LOCKED`, `FIRM`, or `COVER`. Return `1` if true, and `0` if false.
+
+```tcl
+all_pins_placed
+```
+
 ## Regression tests
 
 There are a set of regression tests in `./test`. For more information, refer to this [section](../../README.md#regression-tests). 
diff --git a/src/odb/src/db/dbWireShapeItr.cpp b/src/odb/src/db/dbWireShapeItr.cpp
@@ -143,7 +143,7 @@ bool dbWireShapeItr::next(dbShape& shape)
         goto nextOpCode;
       }
       auto dw = _dw;
-      if (_layer->getDirection() == dbTechLayerDir::VERTICAL) {
+      if (!_has_width && _layer->getDirection() == dbTechLayerDir::VERTICAL) {
         dw = _layer->getWrongWayWidth() / 2;
       }
 
@@ -182,7 +182,7 @@ bool dbWireShapeItr::next(dbShape& shape)
       }
       auto dw = _dw;
 
-      if (_layer->getDirection() == dbTechLayerDir::HORIZONTAL) {
+      if (!_has_width && _layer->getDirection() == dbTechLayerDir::HORIZONTAL) {
         dw = _layer->getWrongWayWidth() / 2;
       }
       shape.setSegment(_prev_x,
diff --git a/src/odb/src/swig/tcl/odb.tcl b/src/odb/src/swig/tcl/odb.tcl
@@ -1056,6 +1056,24 @@ proc define_pin_shape_pattern { args } {
   odb::set_bterm_top_layer_grid $block $layer $x_step $y_step region $width $height $keepout
 }
 
+sta::define_cmd_args "all_pins_placed" {}
+
+proc all_pins_placed { args } {
+  sta::parse_key_args "all_pins_placed" args \
+    keys {} flags {}
+
+  set block [odb::get_block]
+
+  foreach bterm [$block getBTerms] {
+    set placement_status [$bterm getFirstPinPlacementStatus]
+    if { [lsearch -exact {PLACED LOCKED FIRM COVER} $placement_status] == -1 } {
+      return 0
+    }
+  }
+
+  return 1
+}
+
 namespace eval odb {
 proc add_direction_constraint { dir edge begin end } {
   set block [get_block]
diff --git a/src/odb/test/BUILD b/src/odb/test/BUILD
@@ -142,6 +142,8 @@ py_test(
 # From CMakeLists.txt or_integration_tests(TESTS
 COMPULSORY_TESTS = [
     "abstract_origin",
+    "all_pins_placed1",
+    "all_pins_placed2",
     "bterm_hier_create",
     "check_routing_tracks",
     "create_blockage",
@@ -326,6 +328,12 @@ filegroup(
                 test_name + ".*",
             ],
         ) + {
+            "all_pins_placed1": [
+                "floorplan_initialize3.def",
+            ],
+            "all_pins_placed2": [
+                "design_is_routed1.def",
+            ],
             "dump_netlists": [
                 "dump_netlists_cdl.ok",
             ],
diff --git a/src/odb/test/CMakeLists.txt b/src/odb/test/CMakeLists.txt
@@ -2,6 +2,8 @@ or_integration_tests(
   "odb"
   TESTS
     abstract_origin
+    all_pins_placed1
+    all_pins_placed2
     bterm_hier_create
     check_routing_tracks
     create_blockage
diff --git a/src/odb/test/all_pins_placed1.ok b/src/odb/test/all_pins_placed1.ok
@@ -0,0 +1,6 @@
+[INFO ODB-0227] LEF file: Nangate45/Nangate45.lef, created 22 layers, 27 vias, 135 library cells
+[INFO ODB-0128] Design: top
+[INFO ODB-0130]     Created 6 pins.
+[INFO ODB-0131]     Created 5 components and 27 component-terminals.
+[INFO ODB-0133]     Created 10 nets and 14 connections.
+Some pins are not placed
diff --git a/src/odb/test/all_pins_placed1.tcl b/src/odb/test/all_pins_placed1.tcl
@@ -0,0 +1,10 @@
+# test if all pins are placed
+source "helpers.tcl"
+read_lef Nangate45/Nangate45.lef
+read_def floorplan_initialize3.def
+
+if { [all_pins_placed] } {
+  puts "All pins are placed"
+} else {
+  puts "Some pins are not placed"
+}
diff --git a/src/odb/test/all_pins_placed2.ok b/src/odb/test/all_pins_placed2.ok
@@ -0,0 +1,5 @@
+[INFO ODB-0227] LEF file: Nangate45/Nangate45.lef, created 22 layers, 27 vias, 135 library cells
+[INFO ODB-0128] Design: gcd
+[INFO ODB-0131]     Created 200 components and 1117 component-terminals.
+[INFO ODB-0133]     Created 4 nets and 11 connections.
+All pins are placed
diff --git a/src/odb/test/all_pins_placed2.tcl b/src/odb/test/all_pins_placed2.tcl
@@ -0,0 +1,10 @@
+# test if all pins are placed
+source "helpers.tcl"
+read_lef Nangate45/Nangate45.lef
+read_def design_is_routed1.def
+
+if { [all_pins_placed] } {
+  puts "All pins are placed"
+} else {
+  puts "Some pins are not placed"
+}
diff --git a/src/odb/test/cpp/BUILD b/src/odb/test/cpp/BUILD
@@ -217,4 +217,22 @@ cc_test(
     ],
 )
 
+cc_test(
+    name = "Test3DBloxParser",
+    srcs = [
+        "Test3DBloxParser.cpp",
+        "nangate45_test_fixture.h",
+    ],
+    data = [
+        "//src/odb/test:regression_resources",
+    ],
+    deps = [
+        "//src/odb",
+        "//src/tst",
+        "//src/utl",
+        "@googletest//:gtest",
+        "@googletest//:gtest_main",
+    ],
+)
+
 # TODO: more to come.
diff --git a/src/odb/test/cpp/Test3DBloxParser.cpp b/src/odb/test/cpp/Test3DBloxParser.cpp
diff --git a/src/odb/test/cpp/TestDbWire.cc b/src/odb/test/cpp/TestDbWire.cc
diff --git a/src/rmp/include/rmp/Restructure.h b/src/rmp/include/rmp/Restructure.h
diff --git a/src/rmp/src/annealing_strategy.h b/src/rmp/src/annealing_strategy.h
diff --git a/src/rmp/src/rmp.i b/src/rmp/src/rmp.i

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ git_override(`
`103`	`103`	`remote = "https://github.com/The-OpenROAD-Project/qt_bazel_prebuilts",`
`104`	`104`	`)`
`105`	`105`
`106`		`-bazel_dep(name = "googletest", version = "1.16.0", dev_dependency = True)`
	`106`	`+bazel_dep(name = "googletest", version = "1.17.0", dev_dependency = True)`
`107`	`107`
`108`	`108`	`# Dependencies needed by one of the rules_hdl repos. Once they are on`
`109`	`109`	`# BCR, they should depend on their own version.`
Original file line number	Diff line number	Diff line change
`@@ -161,12 +161,6 @@ void HierRTLMP::setSignatureNetThreshold(int signature_net_threshold)`
`161`	`161`	`tree_->min_net_count_for_connection = signature_net_threshold;`
`162`	`162`	`}`
`163`	`163`
`164`		`-void HierRTLMP::setPinAccessThreshold(float pin_access_th)`
`165`		`-{`
`166`		`- pin_access_th_ = pin_access_th;`
`167`		`- pin_access_th_orig_ = pin_access_th;`
`168`		`-}`
`169`		`-`
`170`	`164`	`void HierRTLMP::setTargetUtil(float target_util)`
`171`	`165`	`{`
`172`	`166`	`target_util_ = target_util;`