grt: Implement timing-driven net sorting for incremental CUGR

BUILD.bazel

@@ -7,6 +7,7 @@ load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("@rules_pkg//pkg:tar.bzl", "pkg_tar")
 load("@rules_python//python:defs.bzl", "py_library")
 load("@rules_shell//shell:sh_binary.bzl", "sh_binary")
+load("@rules_shell//shell:sh_test.bzl", "sh_test")
 load("//bazel:notification.bzl", "notification_rule")
 load("//bazel:python_wrap_cc.bzl", "PYTHON_EXTENSION_LINKOPTS", "PYTHON_STABLE_API_DEFINE", "python_wrap_cc")
 load("//bazel:tcl_encode_or.bzl", "tcl_encode")
@@ -430,3 +431,40 @@ pkg_tar(
     include_runfiles = True,
     package_file_name = "openroad.tar",
 )
+
+sh_test(
+    name = "fmt_bzl_test",
+    size = "small",
+    srcs = ["//bazel:bzl_fmt_test.sh"],
+    args = ["$(rootpath @buildifier_prebuilt//:buildifier)"],
+    data = [
+        "BUILD.bazel",
+        "MODULE.bazel",
+        "@buildifier_prebuilt//:buildifier",
+    ] + glob(
+        ["**/*.bzl"],
+        allow_empty = True,
+    ),
+)
+
+sh_test(
+    name = "lint_bzl_test",
+    size = "small",
+    srcs = ["//bazel:bzl_lint_test.sh"],
+    args = ["$(rootpath @buildifier_prebuilt//:buildifier)"],
+    data = [
+        "BUILD.bazel",
+        "MODULE.bazel",
+        "@buildifier_prebuilt//:buildifier",
+    ] + glob(
+        ["**/*.bzl"],
+        allow_empty = True,
+    ),
+)
+
+sh_binary(
+    name = "tidy_bzl",
+    srcs = ["//bazel:bzl_tidy.sh"],
+    args = ["$(rootpath @buildifier_prebuilt//:buildifier)"],
+    data = ["@buildifier_prebuilt//:buildifier"],
+)

MODULE.bazel

@@ -219,3 +219,5 @@ single_version_override(
     patches = ["//bazel:boost_context_disable_parse_headers.patch"],
     version = BOOST_VERSION,
 )
+
+bazel_dep(name = "buildifier_prebuilt", version = "8.2.1", dev_dependency = True)

bazel/BUILD.bazel

@@ -0,0 +1,5 @@
+exports_files([
+    "bzl_fmt_test.sh",
+    "bzl_lint_test.sh",
+    "bzl_tidy.sh",
+])

bazel/bzl_fmt_test.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+set -e
+# Capture absolute path BEFORE changing directories
+BUILDIFIER_BIN=$(realpath "$1")
+
+if [ -n "$BUILD_WORKSPACE_DIRECTORY" ]; then
+  cd "$BUILD_WORKSPACE_DIRECTORY"
+fi
+
+"$BUILDIFIER_BIN" -r -mode=check -lint=off .

bazel/bzl_lint_test.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+set -e
+BUILDIFIER_BIN=$(realpath "$1")
+
+if [ -n "$BUILD_WORKSPACE_DIRECTORY" ]; then
+  cd "$BUILD_WORKSPACE_DIRECTORY"
+fi
+
+"$BUILDIFIER_BIN" -r -mode=check -lint=warn .

bazel/bzl_tidy.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+set -e
+BUILDIFIER_BIN=$(realpath "$1")
+
+if [ -z "$BUILD_WORKSPACE_DIRECTORY" ]; then
+  echo "Error: This script must be run via 'bazelisk run'"
+  exit 1
+fi
+
+cd "$BUILD_WORKSPACE_DIRECTORY"
+"$BUILDIFIER_BIN" -r -mode=fix -lint=fix .
+echo "Buildifier tidy complete!"

bazel/fix_lint.sh

@@ -0,0 +1 @@
+bazelisk run //:tidy_bzl

src/grt/src/cugr/include/CUGR.h

@@ -60,7 +60,7 @@ struct Constants
 
   double pin_patch_threshold = 20.0;
   int pin_patch_padding = 1;
-  double wire_patch_threshold = 2.0;
+  double weight_wire_patch = 2.0;
   double wire_patch_inflation_rate = 1.2;
 
   bool write_heatmap = false;
@@ -94,6 +94,7 @@ class CUGR
   }
   void addDirtyNet(odb::dbNet* net);
   void updateNet(odb::dbNet* net);
+  void removeRouteUsage(odb::dbNet* net);  // <--- ADDED THIS DECLARATION
   void startIncremental();
   void endIncremental();
 
@@ -136,4 +137,4 @@ class CUGR
   bool incremental_mode_ = false;
 };
 
-}  // namespace grt
+}  // namespace grt

src/grt/src/cugr/src/CUGR.cpp

@@ -656,6 +656,22 @@ void CUGR::updateNet(odb::dbNet* db_net)
   updated_nets_.insert(db_net);
 }
 
+void CUGR::removeRouteUsage(odb::dbNet* db_net)
+{
+  auto it = db_net_map_.find(db_net);
+  if (it != db_net_map_.end()) {
+    GRNet* gr_net = it->second;
+    if (gr_net->getRoutingTree()) {
+      grid_graph_->removeTreeUsage(gr_net->getRoutingTree());
+    }
+  } else {
+    logger_->warn(GRT,
+                  601,
+                  "Net {} not found in CUGR for rip-up.",
+                  db_net->getConstName());
+  }
+}
+
 void CUGR::startIncremental()
 {
   incremental_mode_ = true;
@@ -664,11 +680,26 @@ void CUGR::startIncremental()
 
 void CUGR::rerouteNets(std::vector<int>& net_indices)
 {
+  // Combined loop for rip-up and slack querying for performance optimization
   for (const int idx : net_indices) {
-    if (gr_nets_[idx]->getRoutingTree()) {
-      grid_graph_->removeTreeUsage(gr_nets_[idx]->getRoutingTree());
+    GRNet* gr_net = gr_nets_[idx].get();
+    if (gr_net->getRoutingTree()) {
+      grid_graph_->removeTreeUsage(gr_net->getRoutingTree());
     }
+
+    if (sta_ != nullptr) {
+      odb::dbNet* db_net = gr_net->getDbNet();
+      float slack = getNetSlack(db_net);
+      gr_net->setSlack(slack);
+    }
+  }
+
+  // 3. Sort: Most negative slack (critical) nets go FIRST
+  if (sta_ != nullptr) {
+    sortNetIndices(net_indices);
   }
+
+  // 4. Run the routing stages in prioritized order
   patternRoute(net_indices);
   patternRouteWithDetours(net_indices);
   mazeRoute(net_indices);