grt: clang-tidy + gemini reviews

Signed-off-by: Eder Monteiro <[email protected]>

Author: eder-matheus

src/grt/src/GlobalRouter.cpp

@@ -45,6 +45,7 @@
 #include "odb/dbSet.h"
 #include "odb/dbShape.h"
 #include "odb/dbTypes.h"
+#include "odb/geom.h"
 #include "odb/geom_boost.h"
 #include "odb/wOrder.h"
 #include "sta/Clock.hh"
@@ -1193,15 +1194,15 @@ void GlobalRouter::updatePinAccessPoints()
 
     for (Pin& pin : net->getPins()) {
       if (pin.isPort()) {
-        if (bterm_to_aps.find(pin.getBTerm()) != bterm_to_aps.end()) {
-          const auto& bterm_ap = bterm_to_aps[pin.getBTerm()];
+        if (auto it = bterm_to_aps.find(pin.getBTerm()); it != bterm_to_aps.end()) {
+          const auto& bterm_ap = it->second;
           pin.setConnectionLayer(bterm_ap.z());
           pin.setOnGridPosition(
               grid_->getPositionOnGrid(odb::Point(bterm_ap.x(), bterm_ap.y())));
         }
       } else {
-        if (iterm_to_aps.find(pin.getITerm()) != iterm_to_aps.end()) {
-          const auto& iterm_ap = iterm_to_aps[pin.getITerm()];
+        if (auto it = iterm_to_aps.find(pin.getITerm()); it != iterm_to_aps.end()) {
+          const auto& iterm_ap = it->second;
           pin.setConnectionLayer(iterm_ap.z());
           pin.setOnGridPosition(
               grid_->getPositionOnGrid(odb::Point(iterm_ap.x(), iterm_ap.y())));

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

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <csignal>
+#include <map>
 #include <memory>
 #include <set>
 #include <string>
@@ -95,7 +96,7 @@ class CUGR
 
   std::unique_ptr<Design> design_;
   std::unique_ptr<GridGraph> grid_graph_;
-  std::vector<GRNet*> gr_nets_;
+  std::vector<std::unique_ptr<GRNet>> gr_nets_;
   std::map<odb::dbNet*, GRNet*> db_net_map_;
 
   odb::dbDatabase* db_;

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

@@ -7,6 +7,7 @@
 #include <fstream>
 #include <iostream>
 #include <limits>
+#include <map>
 #include <memory>
 #include <set>
 #include <sstream>
@@ -26,6 +27,7 @@
 #include "geo.h"
 #include "grt/GRoute.h"
 #include "odb/db.h"
+#include "odb/geom.h"
 #include "stt/SteinerTreeBuilder.h"
 #include "utl/Logger.h"
 
@@ -57,8 +59,8 @@ void CUGR::init(const int min_routing_layer,
   const std::vector<CUGRNet>& baseNets = design_->getAllNets();
   gr_nets_.reserve(baseNets.size());
   for (const CUGRNet& baseNet : baseNets) {
-    gr_nets_.push_back(new GRNet(baseNet, grid_graph_.get()));
-    db_net_map_[baseNet.getDbNet()] = gr_nets_.back();
+    gr_nets_.push_back(std::make_unique<GRNet>(baseNet, grid_graph_.get()));
+    db_net_map_[baseNet.getDbNet()] = gr_nets_.back().get();
   }
 }
 
@@ -79,7 +81,7 @@ 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],
+    PatternRoute patternRoute(gr_nets_[netIndex].get(),
                               grid_graph_.get(),
                               stt_builder_,
                               constants_,
@@ -104,7 +106,7 @@ void CUGR::patternRouteWithDetours(std::vector<int>& netIndices)
   grid_graph_->extractCongestionView(congestionView);
   sortNetIndices(netIndices);
   for (const int netIndex : netIndices) {
-    GRNet* net = gr_nets_[netIndex];
+    GRNet* net = gr_nets_[netIndex].get();
     grid_graph_->commitTree(net->getRoutingTree(), /*ripup*/ true);
     PatternRoute patternRoute(
         net, grid_graph_.get(), stt_builder_, constants_, logger_);
@@ -134,7 +136,7 @@ void CUGR::mazeRoute(std::vector<int>& netIndices)
   sortNetIndices(netIndices);
   SparseGrid grid(10, 10, 0, 0);
   for (const int netIndex : netIndices) {
-    GRNet* net = gr_nets_[netIndex];
+    GRNet* net = gr_nets_[netIndex].get();
     MazeRoute mazeRoute(net, grid_graph_.get(), logger_);
     mazeRoute.constructSparsifiedGraph(wireCostView, grid);
     mazeRoute.run();
@@ -182,7 +184,7 @@ void CUGR::write(const std::string& guide_file)
   std::stringstream ss;
   for (const auto& net : gr_nets_) {
     std::vector<std::pair<int, BoxT>> guides;
-    getGuides(net, guides);
+    getGuides(net.get(), guides);
 
     ss << net->getName() << '\n';
     ss << "(\n";

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

@@ -10,6 +10,8 @@
 #include "Netlist.h"
 #include "geo.h"
 
+#include "odb/db.h"
+
 namespace grt {
 
 GRNet::GRNet(const CUGRNet& baseNet, const GridGraph* gridGraph)
@@ -62,11 +64,11 @@ bool GRNet::isInsideLayerRange(int layer_index) const
 
 void GRNet::addPreferredAccessPoint(int pin_index, const AccessPoint& ap)
 {
-  if (pin_index_to_iterm_.find(pin_index) != pin_index_to_iterm_.end()) {
-    odb::dbITerm* iterm = pin_index_to_iterm_[pin_index];
+  if (auto it = pin_index_to_iterm_.find(pin_index); it != pin_index_to_iterm_.end()) {
+    odb::dbITerm* iterm = it->second;
     iterm_to_ap_[iterm] = ap;
-  } else if (pin_index_to_bterm_.find(pin_index) != pin_index_to_bterm_.end()) {
-    odb::dbBTerm* bterm = pin_index_to_bterm_[pin_index];
+  } else if (auto it = pin_index_to_bterm_.find(pin_index); it != pin_index_to_bterm_.end()) {
+    odb::dbBTerm* bterm = it->second;
     bterm_to_ap_[bterm] = ap;
   }
 }

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

@@ -1,5 +1,6 @@
 #pragma once
 
+#include <map>
 #include <memory>
 #include <string>
 #include <utility>
@@ -42,11 +43,11 @@ class GRNet
   void clearRoutingTree() { routing_tree_ = nullptr; }
   bool isInsideLayerRange(int layer_index) const;
   void addPreferredAccessPoint(int pin_index, const AccessPoint& ap);
-  std::map<odb::dbBTerm*, AccessPoint>& getBTermAccessPoints()
+  const std::map<odb::dbBTerm*, AccessPoint>& getBTermAccessPoints() const
   {
     return bterm_to_ap_;
   }
-  std::map<odb::dbITerm*, AccessPoint>& getITermAccessPoints()
+  const std::map<odb::dbITerm*, AccessPoint>& getITermAccessPoints() const
   {
     return iterm_to_ap_;
   }