grt: fix mem leaks in cugr

Signed-off-by: Matt Liberty <[email protected]>

Author: maliberty

src/grt/src/GlobalRouter.cpp

@@ -141,6 +141,7 @@ void GlobalRouter::clear()
 GlobalRouter::~GlobalRouter()
 {
   delete fastroute_;
+  delete cugr_;
   delete grid_;
   for (auto [ignored, net] : db_net_map_) {
     delete net;

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

@@ -4,6 +4,7 @@
 #include <csignal>
 #include <fstream>
 #include <iostream>
+#include <memory>
 #include <mutex>
 #include <set>
 #include <sstream>
@@ -66,6 +67,7 @@ class CUGR
   CUGR(odb::dbDatabase* db,
        utl::Logger* log,
        stt::SteinerTreeBuilder* stt_builder);
+  ~CUGR();
   void init(int min_routing_layer, int max_routing_layer);
   void route();
   void write(const std::string& guide_file);
@@ -77,9 +79,9 @@ class CUGR
                  std::vector<std::pair<int, grt::BoxT>>& guides);
   void printStatistics() const;
 
-  Design* design_ = nullptr;
-  GridGraph* grid_graph_ = nullptr;
-  std::vector<GRNet*> gr_nets_;
+  std::unique_ptr<Design> design_;
+  std::unique_ptr<GridGraph> grid_graph_;
+  std::vector<std::unique_ptr<GRNet>> gr_nets_;
 
   odb::dbDatabase* db_;
   utl::Logger* logger_;

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

@@ -20,40 +20,42 @@ CUGR::CUGR(odb::dbDatabase* db,
 {
 }
 
+CUGR::~CUGR() = default;
+
 void CUGR::init(const int min_routing_layer, const int max_routing_layer)
 {
-  design_ = new Design(
+  design_ = std::make_unique<Design>(
       db_, logger_, constants_, min_routing_layer, max_routing_layer);
-  grid_graph_ = new GridGraph(design_, constants_);
+  grid_graph_ = std::make_unique<GridGraph>(design_.get(), constants_);
   // Instantiate the global routing netlist
   const std::vector<CUGRNet>& baseNets = design_->getAllNets();
   gr_nets_.reserve(baseNets.size());
   for (const CUGRNet& baseNet : baseNets) {
-    gr_nets_.push_back(new GRNet(baseNet, design_, grid_graph_));
+    gr_nets_.push_back(std::make_unique<GRNet>(baseNet, grid_graph_.get()));
   }
 }
 
 void CUGR::route()
 {
   std::vector<int> netIndices;
   netIndices.reserve(gr_nets_.size());
-  for (GRNet* net : gr_nets_) {
+  for (const auto& net : gr_nets_) {
     netIndices.push_back(net->getIndex());
   }
   // Stage 1: Pattern routing
   logger_->report("stage 1: pattern routing");
   sortNetIndices(netIndices);
   for (const int netIndex : netIndices) {
     PatternRoute patternRoute(
-        gr_nets_[netIndex], grid_graph_, stt_builder_, constants_);
+        gr_nets_[netIndex].get(), grid_graph_.get(), stt_builder_, constants_);
     patternRoute.constructSteinerTree();
     patternRoute.constructRoutingDAG();
     patternRoute.run();
     grid_graph_->commitTree(gr_nets_[netIndex]->getRoutingTree());
   }
 
   netIndices.clear();
-  for (GRNet* net : gr_nets_) {
+  for (const auto& net : gr_nets_) {
     if (grid_graph_->checkOverflow(net->getRoutingTree()) > 0) {
       netIndices.push_back(net->getIndex());
     }
@@ -73,9 +75,10 @@ void CUGR::route()
     // }
     sortNetIndices(netIndices);
     for (const int netIndex : netIndices) {
-      GRNet* net = gr_nets_[netIndex];
+      GRNet* net = gr_nets_[netIndex].get();
       grid_graph_->commitTree(net->getRoutingTree(), true);
-      PatternRoute patternRoute(net, grid_graph_, stt_builder_, constants_);
+      PatternRoute patternRoute(
+          net, grid_graph_.get(), stt_builder_, constants_);
       patternRoute.constructSteinerTree();
       patternRoute.constructRoutingDAG();
       patternRoute.constructDetours(
@@ -85,7 +88,7 @@ void CUGR::route()
     }
 
     netIndices.clear();
-    for (GRNet* net : gr_nets_) {
+    for (const auto& net : gr_nets_) {
       if (grid_graph_->checkOverflow(net->getRoutingTree()) > 0) {
         netIndices.push_back(net->getIndex());
       }
@@ -98,24 +101,24 @@ void CUGR::route()
   if (!netIndices.empty()) {
     std::cout << "stage 3: maze routing on sparsified routing graph\n";
     for (const int netIndex : netIndices) {
-      GRNet* net = gr_nets_[netIndex];
-      grid_graph_->commitTree(net->getRoutingTree(), true);
+      grid_graph_->commitTree(gr_nets_[netIndex]->getRoutingTree(), 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];
+      GRNet* net = gr_nets_[netIndex].get();
       // grid_graph_->commitTree(net->getRoutingTree(), true);
       // grid_graph_->updateWireCostView(wireCostView, net->getRoutingTree());
-      MazeRoute mazeRoute(net, grid_graph_);
+      MazeRoute mazeRoute(net, grid_graph_.get());
       mazeRoute.constructSparsifiedGraph(wireCostView, grid);
       mazeRoute.run();
       std::shared_ptr<SteinerTreeNode> tree = mazeRoute.getSteinerTree();
       assert(tree != nullptr);
 
-      PatternRoute patternRoute(net, grid_graph_, stt_builder_, constants_);
+      PatternRoute patternRoute(
+          net, grid_graph_.get(), stt_builder_, constants_);
       patternRoute.setSteinerTree(tree);
       patternRoute.constructRoutingDAG();
       patternRoute.run();
@@ -125,7 +128,7 @@ void CUGR::route()
       grid.step();
     }
     netIndices.clear();
-    for (GRNet* net : gr_nets_) {
+    for (const auto& net : gr_nets_) {
       if (grid_graph_->checkOverflow(net->getRoutingTree()) > 0) {
         netIndices.push_back(net->getIndex());
       }
@@ -145,9 +148,9 @@ void CUGR::write(const std::string& guide_file)
   area_of_pin_patches_ = 0;
   area_of_wire_patches_ = 0;
   std::stringstream ss;
-  for (const GRNet* net : gr_nets_) {
+  for (const auto& net : gr_nets_) {
     std::vector<std::pair<int, BoxT>> guides;
-    getGuides(net, guides);
+    getGuides(net.get(), guides);
 
     ss << net->getName() << std::endl;
     ss << "(" << std::endl;
@@ -171,7 +174,7 @@ void CUGR::write(const std::string& guide_file)
 NetRouteMap CUGR::getRoutes()
 {
   NetRouteMap routes;
-  for (const GRNet* net : gr_nets_) {
+  for (const auto& net : gr_nets_) {
     if (net->getNumPins() < 2) {
       continue;
     }
@@ -366,7 +369,7 @@ void CUGR::printStatistics() const
                    std::vector<std::vector<int>>(
                        grid_graph_->getSize(0),
                        std::vector<int>(grid_graph_->getSize(1), 0)));
-  for (GRNet* net : gr_nets_) {
+  for (const auto& net : gr_nets_) {
     GRTreeNode::preorder(
         net->getRoutingTree(), [&](const std::shared_ptr<GRTreeNode>& node) {
           for (const auto& child : node->children) {

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

@@ -4,7 +4,7 @@
 
 namespace grt {
 
-GRNet::GRNet(const CUGRNet& baseNet, Design* design, GridGraph* gridGraph)
+GRNet::GRNet(const CUGRNet& baseNet, GridGraph* gridGraph)
 {
   index_ = baseNet.getIndex();
   db_net_ = baseNet.getDbNet();

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

@@ -10,7 +10,7 @@ namespace grt {
 class GRNet
 {
  public:
-  GRNet(const CUGRNet& baseNet, Design* design, GridGraph* gridGraph);
+  GRNet(const CUGRNet& baseNet, GridGraph* gridGraph);
 
   int getIndex() const { return index_; }
   odb::dbNet* getDbNet() const { return db_net_; }