Merge remote-tracking branch 'origin/master' into rdl-control

Author: gadfort

MODULE.bazel

@@ -146,7 +146,7 @@ bazel_dep(name = "bazel-orfs")
 # To bump version, run: bazelisk run @bazel-orfs//:bump
 git_override(
     module_name = "bazel-orfs",
-    commit = "287262398210ecc368e8cee1fbefddb02ac2e2f3",
+    commit = "e96d7d2a4405a99fc689b4f2f676d3bda7b9430b",
     remote = "https://github.com/The-OpenROAD-Project/bazel-orfs.git",
 )
 
@@ -155,10 +155,10 @@ orfs = use_extension("@bazel-orfs//:extension.bzl", "orfs_repositories")
 # To bump version, run: bazelisk run @bazel-orfs//:bump
 orfs.default(
     # Official image https://hub.docker.com/r/openroad/orfs/tags
-    image = "docker.io/openroad/orfs:v3.0-4350-g4e47ad013",
+    image = "docker.io/openroad/orfs:v3.0-4362-gaec1d8d35",
     # Use OpenROAD of this repo instead of from the docker image
     openroad = "//:openroad",
-    sha256 = "2e09979b7ab7f8e797b50ad8baec1e26d66205ea5bd6ec1b4ddfc7b4e924eb2b",
+    sha256 = "5f94f0481d1339493918208060be116da101405251bce22691ac4b2d662d276e",
 )
 use_repo(orfs, "com_github_nixos_patchelf_download")
 use_repo(orfs, "docker_orfs")

MODULE.bazel.lock

@@ -320,9 +320,14 @@ proc cpu_count { } {
   return [ord::cpu_count]
 }
 
-sta::define_cmd_args "global_connect" {}
-proc global_connect { } {
-  [ord::get_db_block] globalConnect
+sta::define_cmd_args "global_connect" { [-force] [-verbose] }
+proc global_connect { args } {
+  sta::parse_key_args "global_connect" args \
+    keys {} \
+    flags {-force -verbose}
+
+  sta::check_argc_eq0 "add_global_connection" $args
+  [ord::get_db_block] globalConnect [info exists flags(-force)] [info exists flags(-verbose)]
 }
 
 sta::define_cmd_args "clear_global_connect" {}

src/OpenRoad.tcl

@@ -263,9 +263,16 @@ add_global_connection -net VSS -pin_pattern {^VSSE$}
 The `global_connect` command is used to connect power and ground pins on design instances to the appropriate supplies.
 
 ```
-global_connect
+global_connect [-force] [-verbose]
 ```
 
+##### Options
+
+| Switch Name | Description |
+| ----- | ----- |
+| `-force` | If specified, global connections will overwrite existing connections |
+| `-verbose` | If specified, report the number of connections made and skipped. |
+
 #### Clear global connection rules
 
 The `clear_global_connect` command is used remove all defined global connection rules.

src/README.md

@@ -580,7 +580,7 @@ bool NesterovPlace::isDiverged(float& diverge_snapshot_WlCoefX,
   }
 
   if (!npVars_.disableRevertIfDiverge && num_region_diverged_ == 0
-      && !is_routability_need_) {
+      && (!npVars_.routability_driven_mode || !is_routability_need_)) {
     if (is_min_hpwl_) {
       diverge_snapshot_WlCoefX = wireLengthCoefX_;
       diverge_snapshot_WlCoefY = wireLengthCoefY_;

src/gpl/src/nesterovPlace.cpp

@@ -17,5 +17,6 @@
   <file alias="cancel.png">google_icons/round_cancel_black_36dp.png</file>
   <file alias="expand_more.png">google_icons/round_unfold_more_black_36dp.png</file>
   <file alias="expand_less.png">google_icons/round_unfold_less_black_36dp.png</file>
+  <file alias="resume.png">google_icons/resume.png</file>
 </qresource>
 </RCC>

src/gui/resources/google_icons/resume.png

@@ -50,6 +50,7 @@ GlobalConnectDialog::GlobalConnectDialog(odb::dbBlock* block, QWidget* parent)
       add_(new QPushButton(this)),
       clear_(new QPushButton(this)),
       run_(new QPushButton(this)),
+      run_force_(new QPushButton(this)),
       rules_({}),
       inst_pattern_(new QLineEdit(this)),
       pin_pattern_(new QLineEdit(this)),
@@ -64,6 +65,7 @@ GlobalConnectDialog::GlobalConnectDialog(odb::dbBlock* block, QWidget* parent)
   QHBoxLayout* button_layout = new QHBoxLayout;
   button_layout->addWidget(clear_);
   button_layout->addWidget(run_);
+  button_layout->addWidget(run_force_);
   layout->addLayout(button_layout);
   layout->addWidget(connections_);
 
@@ -75,18 +77,27 @@ GlobalConnectDialog::GlobalConnectDialog(odb::dbBlock* block, QWidget* parent)
   add_->setDefault(false);
   add_->setEnabled(false);
 
-  run_->setIcon(QIcon(":/play.png"));
+  run_->setIcon(QIcon(":/resume.png"));
   run_->setToolTip(tr("Run"));
   run_->setAutoDefault(false);
   run_->setDefault(false);
 
+  run_force_->setIcon(QIcon(":/play.png"));
+  run_force_->setToolTip(tr("Run with forced connections"));
+  run_force_->setAutoDefault(false);
+  run_force_->setDefault(false);
+
   clear_->setIcon(QIcon(":/delete.png"));
   clear_->setToolTip(tr("Clear"));
   clear_->setAutoDefault(false);
   clear_->setDefault(false);
 
   connect(add_, &QPushButton::pressed, this, &GlobalConnectDialog::makeRule);
   connect(run_, &QPushButton::pressed, this, &GlobalConnectDialog::runRules);
+  connect(run_force_,
+          &QPushButton::pressed,
+          this,
+          &GlobalConnectDialog::runRulesWithForce);
   connect(
       clear_, &QPushButton::pressed, this, &GlobalConnectDialog::clearRules);
 
@@ -157,7 +168,12 @@ GlobalConnectDialog::GlobalConnectDialog(odb::dbBlock* block, QWidget* parent)
 
 void GlobalConnectDialog::runRules()
 {
-  runRule(nullptr);
+  runRule(nullptr, false);
+}
+
+void GlobalConnectDialog::runRulesWithForce()
+{
+  runRule(nullptr, true);
 }
 
 void GlobalConnectDialog::clearRules()
@@ -242,7 +258,8 @@ void GlobalConnectDialog::addRule(odb::dbGlobalConnect* gc)
   widgets.run->setToolTip(tr("Run"));
   widgets.run->setAutoDefault(false);
   widgets.run->setDefault(false);
-  connect(widgets.run, &QPushButton::pressed, [this, gc]() { runRule(gc); });
+  connect(
+      widgets.run, &QPushButton::pressed, [this, gc]() { runRule(gc, false); });
   layout_->addWidget(
       widgets.run, row_idx, toValue(GlobalConnectField::kRun), Qt::AlignCenter);
 
@@ -311,15 +328,15 @@ void GlobalConnectDialog::announceConnections(int connections)
       QString::fromStdString(fmt::format("Connected {} pin(s)", connections)));
 }
 
-void GlobalConnectDialog::runRule(odb::dbGlobalConnect* gc)
+void GlobalConnectDialog::runRule(odb::dbGlobalConnect* gc, bool force)
 {
   QApplication::setOverrideCursor(Qt::WaitCursor);
   QApplication::processEvents();
   int connections = 0;
   if (gc == nullptr) {
-    connections = block_->globalConnect();
+    connections = block_->globalConnect(force, true);
   } else {
-    connections = block_->globalConnect(gc);
+    connections = block_->globalConnect(gc, force, true);
   }
   QApplication::restoreOverrideCursor();
   emit connectionsMade(connections);

src/gui/resources/resource.qrc

@@ -28,6 +28,7 @@ class GlobalConnectDialog : public QDialog
 
  private slots:
   void runRules();
+  void runRulesWithForce();
   void clearRules();
   void deleteRule(odb::dbGlobalConnect* gconnect);
   void makeRule();
@@ -42,6 +43,7 @@ class GlobalConnectDialog : public QDialog
   QPushButton* add_;
   QPushButton* clear_;
   QPushButton* run_;
+  QPushButton* run_force_;
 
   struct GlobalConnectWidgets
   {
@@ -63,7 +65,7 @@ class GlobalConnectDialog : public QDialog
   QLabel* connections_;
 
   void addRule(odb::dbGlobalConnect* gc);
-  void runRule(odb::dbGlobalConnect* gc);
+  void runRule(odb::dbGlobalConnect* gc, bool force);
 };
 
 }  // namespace gui

src/gui/src/globalConnectDialog.cpp

@@ -747,8 +747,8 @@ class dbBlock : public dbObject
   /// and helper functions for global connections
   /// on this block.
   ///
-  int globalConnect();
-  int globalConnect(dbGlobalConnect* gc);
+  int globalConnect(bool force, bool verbose);
+  int globalConnect(dbGlobalConnect* gc, bool force, bool verbose);
   int addGlobalConnect(dbRegion* region,
                        const char* instPattern,
                        const char* pinPattern,
@@ -7864,7 +7864,7 @@ class dbGlobalConnect : public dbObject
   // User Code Begin dbGlobalConnect
   std::vector<dbInst*> getInsts() const;
 
-  int connect(dbInst* inst);
+  int connect(dbInst* inst, bool force);
 
   static dbGlobalConnect* create(dbNet* net,
                                  dbRegion* region,