Merge pull request #8328 from The-OpenROAD-Project-staging/cugr-refactor2

Cugr refactor2

Author: maliberty

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

@@ -41,7 +41,7 @@ void CUGR::init(const int min_routing_layer, const int max_routing_layer)
 {
   design_ = std::make_unique<Design>(
       db_, logger_, constants_, min_routing_layer, max_routing_layer);
-  grid_graph_ = std::make_unique<GridGraph>(design_.get(), constants_);
+  grid_graph_ = std::make_unique<GridGraph>(design_.get(), constants_, logger_);
   // Instantiate the global routing netlist
   const std::vector<CUGRNet>& baseNets = design_->getAllNets();
   gr_nets_.reserve(baseNets.size());
@@ -67,8 +67,11 @@ void CUGR::patternRoute(std::vector<int>& netIndices)
   logger_->report("stage 1: pattern routing");
   sortNetIndices(netIndices);
   for (const int netIndex : netIndices) {
-    PatternRoute patternRoute(
-        gr_nets_[netIndex].get(), grid_graph_.get(), stt_builder_, constants_);
+    PatternRoute patternRoute(gr_nets_[netIndex].get(),
+                              grid_graph_.get(),
+                              stt_builder_,
+                              constants_,
+                              logger_);
     patternRoute.constructSteinerTree();
     patternRoute.constructRoutingDAG();
     patternRoute.run();
@@ -90,8 +93,9 @@ void CUGR::patternRouteWithDetours(std::vector<int>& netIndices)
   sortNetIndices(netIndices);
   for (const int netIndex : netIndices) {
     GRNet* net = gr_nets_[netIndex].get();
-    grid_graph_->commitTree(net->getRoutingTree(), true);
-    PatternRoute patternRoute(net, grid_graph_.get(), stt_builder_, constants_);
+    grid_graph_->commitTree(net->getRoutingTree(), /*ripup*/ true);
+    PatternRoute patternRoute(
+        net, grid_graph_.get(), stt_builder_, constants_, logger_);
     patternRoute.constructSteinerTree();
     patternRoute.constructRoutingDAG();
     // KEY DIFFERENCE compared to stage 1 (patternRoute)
@@ -110,21 +114,23 @@ void CUGR::mazeRoute(std::vector<int>& netIndices)
   }
   logger_->report("stage 3: maze routing on sparsified routing graph");
   for (const int netIndex : netIndices) {
-    grid_graph_->commitTree(gr_nets_[netIndex]->getRoutingTree(), true);
+    grid_graph_->commitTree(gr_nets_[netIndex]->getRoutingTree(),
+                            /*ripup*/ true);
   }
   GridGraphView<CostT> wireCostView;
   grid_graph_->extractWireCostView(wireCostView);
   sortNetIndices(netIndices);
   SparseGrid grid(10, 10, 0, 0);
   for (const int netIndex : netIndices) {
     GRNet* net = gr_nets_[netIndex].get();
-    MazeRoute mazeRoute(net, grid_graph_.get());
+    MazeRoute mazeRoute(net, grid_graph_.get(), logger_);
     mazeRoute.constructSparsifiedGraph(wireCostView, grid);
     mazeRoute.run();
     std::shared_ptr<SteinerTreeNode> tree = mazeRoute.getSteinerTree();
     assert(tree != nullptr);
 
-    PatternRoute patternRoute(net, grid_graph_.get(), stt_builder_, constants_);
+    PatternRoute patternRoute(
+        net, grid_graph_.get(), stt_builder_, constants_, logger_);
     patternRoute.setSteinerTree(tree);
     patternRoute.constructRoutingDAG();
     patternRoute.run();
@@ -169,10 +175,10 @@ void CUGR::write(const std::string& guide_file)
     ss << net->getName() << '\n';
     ss << "(\n";
     for (const auto& guide : guides) {
-      ss << grid_graph_->getGridline(0, guide.second.x.low()) << " "
-         << grid_graph_->getGridline(1, guide.second.y.low()) << " "
-         << grid_graph_->getGridline(0, guide.second.x.high() + 1) << " "
-         << grid_graph_->getGridline(1, guide.second.y.high() + 1) << " "
+      ss << grid_graph_->getGridline(0, guide.second.lx()) << " "
+         << grid_graph_->getGridline(1, guide.second.ly()) << " "
+         << grid_graph_->getGridline(0, guide.second.hx() + 1) << " "
+         << grid_graph_->getGridline(1, guide.second.hy() + 1) << " "
          << grid_graph_->getLayerName(guide.first) << "\n";
     }
     ss << ")\n";
@@ -325,8 +331,8 @@ void CUGR::getGuides(const GRNet* net,
                             (int) grid_graph_->getSize(0) - 1),
                    std::min(gpt.y() + padding,
                             (int) grid_graph_->getSize(1) - 1)));
-          area_of_pin_patches_ += (guides.back().second.x.range() + 1)
-                                  * (guides.back().second.y.range() + 1);
+          area_of_pin_patches_ += (guides.back().second.x().range() + 1)
+                                  * (guides.back().second.y().range() + 1);
         }
       }
     }

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

@@ -274,7 +274,7 @@ void Design::getAllObstacles(std::vector<std::vector<BoxT>>& all_obstacles,
 
   for (const BoxOnLayer& obs : obstacles_) {
     if (obs.getLayerIdx() > 0 || !skip_m1) {
-      all_obstacles[obs.getLayerIdx()].emplace_back(obs.x, obs.y);
+      all_obstacles[obs.getLayerIdx()].emplace_back(obs.x(), obs.y());
     }
   }
 }

src/grt/src/cugr/src/GRNet.cpp

@@ -23,8 +23,8 @@ GRNet::GRNet(const CUGRNet& baseNet, const GridGraph* gridGraph)
     std::unordered_set<uint64_t> included;
     for (const auto& pinShape : pinShapes) {
       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++) {
+      for (int x = cells.lx(); x <= cells.hx(); x++) {
+        for (int y = cells.ly(); y <= cells.hy(); y++) {
           const GRPoint point(pinShape.getLayerIdx(), x, y);
           const uint64_t hash = gridGraph->hashCell(point);
           if (included.find(hash) == included.end()) {

src/grt/src/cugr/src/GRNet.h

@@ -23,6 +23,7 @@ class GRNet
   odb::dbNet* getDbNet() const { return db_net_; }
   std::string getName() const { return db_net_->getName(); }
   int getNumPins() const { return pin_access_points_.size(); }
+  // vector foreach pin -> list of APs
   const std::vector<std::vector<GRPoint>>& getPinAccessPoints() const
   {
     return pin_access_points_;