Merge remote-tracking branch 'origin' into ant_check_special_nets_issue

Signed-off-by: luis201420 <[email protected]>

Author: luis201420

.bazelrc

@@ -97,4 +97,7 @@ build:openroad-dev --google_default_credentials=true
 build:openroad-dev --disk_cache=/workspace/.cache/bazel-disk-cache
 build:openroad-dev --repository_cache=/workspace/.cache/bazel-repository-cache
 
+# Without this, bazelisk build ... builds the bazel-orfs tests
+build --build_tag_filters=-orfs
+
 try-import %workspace%/user.bazelrc

MODULE.bazel

@@ -152,7 +152,7 @@ bazel_dep(name = "bazel-orfs")
 # To bump version, run: bazelisk run @bazel-orfs//:bump
 git_override(
     module_name = "bazel-orfs",
-    commit = "25aa6f643146394f201eac5ef4df69887c83859f",
+    commit = "f9c37f21de8e1095276e878d1628ac7a2f7908ab",
     remote = "https://github.com/The-OpenROAD-Project/bazel-orfs.git",
 )
 
@@ -161,10 +161,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-3766-g33e29bff",
+    image = "docker.io/openroad/orfs:v3.0-3780-g2f349ade",
     # Use OpenROAD of this repo instead of from the docker image
     openroad = "//:openroad",
-    sha256 = "edaf81aaab215ffa82e21f1b98fadb0d42da35444b39b524452a6ee52db5fea5",
+    sha256 = "637ffa1af0f224e17e3d5cddbe6b45d9b00102016acc9e866226e8c4e830aeab",
 )
 use_repo(orfs, "com_github_nixos_patchelf_download")
 use_repo(orfs, "docker_orfs")

MODULE.bazel.lock

@@ -75,6 +75,8 @@ _installCommonDev() {
     spdlogVersion=1.15.0
     gtestVersion=1.13.0
     gtestChecksum="a1279c6fb5bf7d4a5e0d0b2a4adb39ac"
+    abslVersion=20250814.0
+    abslChecksum="016feacd6a6b3b9a47ab844e61f4f7bd"
     bisonVersion=3.8.2
     bisonChecksum="1e541a097cda9eca675d29dd2832921f"
     flexVersion=2.6.4
@@ -262,6 +264,21 @@ _installCommonDev() {
     fi
     CMAKE_PACKAGE_ROOT_ARGS+=" -D GTest_ROOT=$(realpath $gtestPrefix) "
 
+    # Abseil
+    abslPrefix=${PREFIX:-"/usr/local"}
+    if [[ ! -d ${abslPrefix}/absl/base ]]; then
+        cd "${baseDir}"
+        eval wget https://github.com/abseil/abseil-cpp/releases/download/${abslVersion}/abseil-cpp-${abslVersion}.tar.gz
+        md5sum -c <(echo "${abslChecksum} abseil-cpp-${abslVersion}.tar.gz") || exit 1
+        tar xf abseil-cpp-${abslVersion}.tar.gz
+        cd abseil-cpp-${abslVersion}
+        ${cmakePrefix}/bin/cmake -DCMAKE_INSTALL_PREFIX="${abslPrefix}" -DCMAKE_CXX_STANDARD=17 -B build .
+        ${cmakePrefix}/bin/cmake --build build --target install
+    else
+        echo "Abseil already installed."
+    fi
+    CMAKE_PACKAGE_ROOT_ARGS+=" -D ABSL_ROOT=$(realpath $abslPrefix) "
+
     if [[ ${equivalenceDeps} == "yes" ]]; then
         _equivalenceDeps
     fi

etc/DependencyInstaller.sh

@@ -65,6 +65,7 @@ cc_library(
 cc_library(
     name = "cugr",
     srcs = [
+        "src/cugr/src/geo.h",
         "src/cugr/src/CUGR.cpp",
         "src/cugr/src/Design.cpp",
         "src/cugr/src/Design.h",
@@ -88,7 +89,6 @@ cc_library(
     ],
     hdrs = [
         "src/cugr/include/CUGR.h",
-        "src/cugr/include/geo.h",
     ],
     includes = [
         "include",

src/grt/BUILD

@@ -6,7 +6,6 @@
 #include <utility>
 #include <vector>
 
-#include "geo.h"
 #include "grt/GRoute.h"
 
 namespace odb {
@@ -26,6 +25,7 @@ namespace grt {
 class Design;
 class GridGraph;
 class GRNet;
+class BoxT;
 
 struct Constants
 {

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

@@ -75,8 +75,8 @@ void CUGR::route()
       netIndices.push_back(net->getIndex());
     }
   }
-  std::cout << netIndices.size() << " / " << gr_nets_.size()
-            << " gr_nets_ have overflows.\n";
+  logger_->report(
+      "{} / {} gr_nets_ have overflows.", netIndices.size(), gr_nets_.size());
 
   // Stage 2: Pattern routing with possible detours
   if (!netIndices.empty()) {
@@ -108,13 +108,13 @@ void CUGR::route()
         netIndices.push_back(net->getIndex());
       }
     }
-    std::cout << netIndices.size() << " / " << gr_nets_.size()
-              << " gr_nets_ have overflows.\n";
+    logger_->report(
+        "{} / {} gr_nets_ have overflows.", netIndices.size(), gr_nets_.size());
   }
 
   // Stage 3: maze routing on sparsified routing graph
   if (!netIndices.empty()) {
-    std::cout << "stage 3: maze routing on sparsified routing graph\n";
+    logger_->report("stage 3: maze routing on sparsified routing graph");
     for (const int netIndex : netIndices) {
       grid_graph_->commitTree(gr_nets_[netIndex]->getRoutingTree(), true);
     }
@@ -148,8 +148,8 @@ void CUGR::route()
         netIndices.push_back(net->getIndex());
       }
     }
-    std::cout << netIndices.size() << " / " << gr_nets_.size()
-              << " gr_nets_ have overflows.\n";
+    logger_->report(
+        "{} / {} gr_nets_ have overflows.", netIndices.size(), gr_nets_.size());
   }
 
   printStatistics();
@@ -202,7 +202,7 @@ NetRouteMap CUGR::getRoutes()
     if (routing_tree) {
       GRTreeNode::preorder(
           routing_tree, [&](const std::shared_ptr<GRTreeNode>& node) {
-            for (const auto& child : node->children) {
+            for (const auto& child : node->getChildren()) {
               if (node->getLayerIdx() == child->getLayerIdx()) {
                 auto [min_x, max_x] = std::minmax({node->x(), child->x()});
                 auto [min_y, max_y] = std::minmax({node->y(), child->y()});
@@ -263,7 +263,7 @@ void CUGR::getGuides(const GRNet* net,
   // 0. Basic guides
   GRTreeNode::preorder(
       routingTree, [&](const std::shared_ptr<GRTreeNode>& node) {
-        for (const auto& child : node->children) {
+        for (const auto& child : node->getChildren()) {
           if (node->getLayerIdx() == child->getLayerIdx()) {
             guides.emplace_back(node->getLayerIdx(),
                                 BoxT(std::min(node->x(), child->x()),
@@ -334,7 +334,7 @@ void CUGR::getGuides(const GRNet* net,
   // 2. Wire segment patches
   GRTreeNode::preorder(
       routingTree, [&](const std::shared_ptr<GRTreeNode>& node) {
-        for (const auto& child : node->children) {
+        for (const auto& child : node->getChildren()) {
           if (node->getLayerIdx() == child->getLayerIdx()) {
             double wire_patch_threshold = constants_.wire_patch_threshold;
             unsigned direction
@@ -389,7 +389,7 @@ void CUGR::printStatistics() const
   for (const auto& net : gr_nets_) {
     GRTreeNode::preorder(
         net->getRoutingTree(), [&](const std::shared_ptr<GRTreeNode>& node) {
-          for (const auto& child : node->children) {
+          for (const auto& child : node->getChildren()) {
             if (node->getLayerIdx() == child->getLayerIdx()) {
               unsigned direction
                   = grid_graph_->getLayerDirection(node->getLayerIdx());
@@ -436,13 +436,13 @@ void CUGR::printStatistics() const
     }
   }
 
-  std::cout << "wire length (metric):  "
-            << wireLength / grid_graph_->getM2Pitch() << "\n";
-  std::cout << "total via count:       " << viaCount << "\n";
-  std::cout << "total wire overflow:   " << (int) overflow << "\n";
+  logger_->report("wire length (metric):  {}",
+                  wireLength / grid_graph_->getM2Pitch());
+  logger_->report("total via count:       {}", viaCount);
+  logger_->report("total wire overflow:   {}", (int) overflow);
 
-  std::cout << "min resource: " << minResource << "\n";
-  std::cout << "bottleneck:   " << bottleneck << "\n";
+  logger_->report("min resource: {}", minResource);
+  logger_->report("bottleneck:   {}", bottleneck);
 }
 
 }  // namespace grt

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

@@ -33,7 +33,7 @@ Design::Design(odb::dbDatabase* db,
 void Design::read()
 {
   lib_dbu_ = block_->getDbUnitsPerMicron();
-  auto dieBound = block_->getDieArea();
+  const odb::Rect dieBound = block_->getDieArea();
   die_region_ = getBoxFromRect(dieBound);
 
   readLayers();
@@ -42,18 +42,19 @@ void Design::read()
 
   readInstanceObstructions();
 
-  int num_special_nets = 0;
-  readSpecialNetObstructions(num_special_nets);
+  const int num_special_nets = readSpecialNetObstructions();
 
   computeGrid();
 
-  std::cout << "design statistics\n";
-  std::cout << "lib DBU:             " << lib_dbu_ << '\n';
-  std::cout << "die region (in DBU): " << die_region_ << '\n';
-  std::cout << "num of nets :        " << nets_.size() << '\n';
-  std::cout << "num of special nets: " << num_special_nets << '\n';
-  std::cout << "gcell grid:          " << gridlines_[0].size() - 1 << " x "
-            << gridlines_[1].size() - 1 << " x " << getNumLayers() << '\n';
+  logger_->report("design statistics");
+  logger_->report("lib DBU:             {}", lib_dbu_);
+  logger_->report("die region (in DBU): {}", die_region_);
+  logger_->report("num of nets :        {}", nets_.size());
+  logger_->report("num of special nets: {}", num_special_nets);
+  logger_->report("gcell grid:          {} x {} x {}",
+                  gridlines_[0].size() - 1,
+                  gridlines_[1].size() - 1,
+                  getNumLayers());
 }
 
 void Design::readLayers()
@@ -184,14 +185,16 @@ void Design::readInstanceObstructions()
   }
 }
 
-void Design::readSpecialNetObstructions(int& num_special_nets)
+int Design::readSpecialNetObstructions()
 {
+  int num_special_nets = 0;
   for (odb::dbNet* db_net : block_->getNets()) {
     if (!db_net->isSpecial() && !db_net->getSigType().isSupply()) {
       continue;
     }
 
-    odb::uint wire_cnt = 0, via_cnt = 0;
+    odb::uint wire_cnt = 0;
+    odb::uint via_cnt = 0;
     db_net->getWireCount(wire_cnt, via_cnt);
     if (wire_cnt == 0) {
       continue;
@@ -231,6 +234,7 @@ void Design::readSpecialNetObstructions(int& num_special_nets)
 
     num_special_nets++;
   }
+  return num_special_nets;
 }
 
 void Design::computeGrid()
@@ -251,7 +255,7 @@ void Design::computeGrid()
 
 void Design::setUnitCosts()
 {
-  int m2_pitch = layers_[1].getPitch();
+  const int m2_pitch = layers_[1].getPitch();
   unit_length_wire_cost_ = constants_.weight_wire_length / m2_pitch;
   unit_via_cost_ = constants_.weight_via_number;
   unit_length_short_costs_.resize(layers_.size());
@@ -264,7 +268,7 @@ void Design::setUnitCosts()
 }
 
 void Design::getAllObstacles(std::vector<std::vector<BoxT>>& all_obstacles,
-                             bool skip_m1) const
+                             const bool skip_m1) const
 {
   all_obstacles.resize(getNumLayers());
 
@@ -278,13 +282,13 @@ void Design::getAllObstacles(std::vector<std::vector<BoxT>>& all_obstacles,
 void Design::printNets() const
 {
   for (const CUGRNet& net : nets_) {
-    std::cout << "Net: " << net.getName() << '\n';
+    logger_->report("Net: {}", net.getName());
     for (const auto& pin : net.getPins()) {
-      std::cout << "\tPin: " << pin.getName() << "\n";
+      logger_->report("\tPin: {}", pin.getName());
       for (const auto& box : pin.getPinShapes()) {
-        std::cout << "\t\t" << box << "\n";  // adjust to 1-based
+        logger_->report("\t\t{}", box);
       }
-      std::cout << '\n';
+      logger_->report("");
     }
   }
 }
@@ -293,14 +297,13 @@ void Design::printBlockages() const
 {
   std::vector<std::vector<BoxT>> all_obstacles;
   getAllObstacles(all_obstacles, true);
-  std::cout << "design obstacles: " << all_obstacles.size() << '\n';
+  logger_->report("design obstacles: {}", all_obstacles.size());
   for (int i = 0; i < all_obstacles.size(); i++) {
-    std::cout << "obs in layer " << (i + 1) << ": " << all_obstacles[i].size()
-              << '\n';
+    logger_->report("obs in layer {}: {}", (i + 1), all_obstacles[i].size());
     for (const auto& obstacle : all_obstacles[i]) {
-      std::cout << "  Obstacle on layer "
-                << (i + 1)  // adjust to 1-based layer index
-                << ": " << obstacle << '\n';
+      logger_->report("  Obstacle on layer {}: {}",
+                      (i + 1),  // adjust to 1-based layer index
+                      obstacle);
     }
   }
 }

src/grt/src/cugr/src/Design.cpp

@@ -63,7 +63,7 @@ class Design
   void readLayers();
   void readNetlist();
   void readInstanceObstructions();
-  void readSpecialNetObstructions(int& num_special_nets);
+  int readSpecialNetObstructions();
   void computeGrid();
   void setUnitCosts();
 
@@ -90,9 +90,9 @@ class Design
   int default_gridline_spacing_;
   std::vector<std::vector<int>> gridlines_;
 
-  Constants constants_;
-  int min_routing_layer_;
-  int max_routing_layer_;
+  const Constants constants_;
+  const int min_routing_layer_;
+  const int max_routing_layer_;
 };
 
 }  // namespace grt

src/grt/src/cugr/src/Design.h

@@ -12,21 +12,21 @@
 
 namespace grt {
 
-GRNet::GRNet(const CUGRNet& baseNet, GridGraph* gridGraph)
+GRNet::GRNet(const CUGRNet& baseNet, const GridGraph* gridGraph)
 {
   index_ = baseNet.getIndex();
   db_net_ = baseNet.getDbNet();
-  int numPins = baseNet.getNumPins();
+  const int numPins = baseNet.getNumPins();
   pin_access_points_.resize(numPins);
   for (CUGRPin& pin : baseNet.getPins()) {
-    std::vector<BoxOnLayer> pinShapes = pin.getPinShapes();
+    const std::vector<BoxOnLayer> pinShapes = pin.getPinShapes();
     std::unordered_set<uint64_t> included;
     for (const auto& pinShape : pinShapes) {
-      BoxT cells = gridGraph->rangeSearchCells(pinShape);
+      const BoxT cells = gridGraph->rangeSearchCells(pinShape);
       for (int x = cells.x.low; x <= cells.x.high; x++) {
         for (int y = cells.y.low; y <= cells.y.high; y++) {
-          GRPoint point(pinShape.getLayerIdx(), x, y);
-          uint64_t hash = gridGraph->hashCell(point);
+          const GRPoint point(pinShape.getLayerIdx(), x, y);
+          const uint64_t hash = gridGraph->hashCell(point);
           if (included.find(hash) == included.end()) {
             pin_access_points_[pin.getIndex()].emplace_back(
                 pinShape.getLayerIdx(), x, y);