Merge branch 'master' into mpl-dbu

Author: joaomai

src/OpenRoad.cc

@@ -495,6 +495,7 @@ void OpenRoad::read3Dbx(const std::string& filename)
 {
   odb::ThreeDBlox parser(logger_, db_, sta_);
   parser.readDbx(filename);
+  parser.check();
 }
 
 void OpenRoad::read3DBloxBMap(const std::string& filename)

src/grt/src/GlobalRouter.cpp

@@ -78,6 +78,7 @@ GlobalRouter::GlobalRouter(utl::Logger* logger,
       grid_origin_(0, 0),
       groute_renderer_(nullptr),
       grid_(new Grid),
+      is_incremental_(false),
       adjustment_(0.0),
       congestion_report_iter_step_(0),
       allow_congestion_(false),
@@ -2329,8 +2330,7 @@ void GlobalRouter::loadGuidesFromDB()
 void GlobalRouter::ensurePinsPositions(odb::dbNet* db_net)
 {
   std::string pins_not_covered;
-  netIsCovered(db_net, pins_not_covered);
-  if (!pins_not_covered.empty()) {
+  if (!netIsCovered(db_net, pins_not_covered)) {
     Net* net = db_net_map_[db_net];
     for (Pin& pin : net->getPins()) {
       if (pins_not_covered.find(pin.getName()) != std::string::npos) {

src/grt/src/RepairAntennas.cpp

@@ -41,7 +41,10 @@ RepairAntennas::RepairAntennas(GlobalRouter* grouter,
       unique_diode_index_(1),
       illegal_diode_placement_count_(0),
       has_new_violations_(false),
-      routing_source_(RoutingSource::None)
+      routing_source_(RoutingSource::None),
+      tile_size_(0),
+      jumper_size_(0),
+      smaller_seg_size_(0)
 {
   block_ = db_->getChip()->getBlock();
   while (block_->findInst(

src/grt/src/Rudy.cpp

@@ -47,7 +47,11 @@ Rudy::Rudy(odb::dbBlock* block, grt::GlobalRouter* grouter)
     }
     pitch_terms += 1.0 / pitch;
   }
-  wire_width_ = (1 / pitch_terms) * 1.25;  // = harm. mean / num_routing_layers
+
+  if (pitch_terms != 0) {
+    wire_width_
+        = (1 / pitch_terms) * 1.25;  // = harm. mean / num_routing_layers
+  }
 
   int x_grids, y_grids;
   grouter_->getGridSize(x_grids, y_grids);

src/grt/src/cugr/src/GridGraph.cpp

@@ -405,6 +405,14 @@ AccessPointSet GridGraph::selectAccessPoints(const GRNet* net) const
     if (bestAccessDist.first == 0) {
       logger_->warn(utl::GRT, 274, "pin is hard to access.");
     }
+
+    if (bestIndex == -1) {
+      logger_->error(utl::GRT,
+                     283,
+                     "No preferred access point found for pin on net {}.",
+                     net->getName());
+    }
+
     const PointT selectedPoint = accessPoints[bestIndex];
     const AccessPoint ap{selectedPoint, {}};
     auto it = selected_access_points.emplace(ap).first;

src/grt/src/cugr/src/MazeRoute.cpp

@@ -220,7 +220,12 @@ void MazeRoute::run()
     }
 
     solutions_.emplace_back(foundSolution);
-    assert(foundPinIndex >= 0);
+    if (foundPinIndex == -1) {
+      logger_->error(utl::GRT,
+                     282,
+                     "Failed to find connected pin on net {}.",
+                     net_->getName());
+    }
     visited[foundPinIndex] = true;
     numDetached -= 1;
 
@@ -266,7 +271,13 @@ std::shared_ptr<SteinerTreeNode> MazeRoute::getSteinerTree() const
         if (!lastNode || !temp->prev) {
           // Both the start and the end of the path should contain pins
           const int pinIndex = graph_.getVertexPin(temp->vertex);
-          assert(pinIndex != -1);
+          if (pinIndex == -1) {
+            logger_->error(utl::GRT,
+                           284,
+                           "Pin index not found for vertex {} on net {}.",
+                           temp->vertex,
+                           net_->getName());
+          }
           node->setFixedLayers(graph_.getPseudoPin(pinIndex).layers);
         }
         lastNode = std::move(node);
@@ -279,7 +290,13 @@ std::shared_ptr<SteinerTreeNode> MazeRoute::getSteinerTree() const
       }
     }
   }
-  assert(tree);
+
+  if (tree == nullptr) {
+    logger_->error(utl::GRT,
+                   285,
+                   "Steiner tree construction failed for net {}.",
+                   net_->getName());
+  }
 
   // Remove redundant tree nodes
   SteinerTreeNode::preorder(

src/grt/src/cugr/src/PatternRoute.cpp

@@ -640,6 +640,12 @@ std::shared_ptr<GRTreeNode> PatternRoute::getRoutingTree(
     }
   }
   assert(parentLayerIndex >= 0);
+  if (parentLayerIndex < 0) {
+    logger_->error(utl::GRT,
+                   286,
+                   "Failed to determine parent layer index on net {}.",
+                   net_->getName());
+  }
   std::shared_ptr<GRTreeNode> routingNode
       = std::make_shared<GRTreeNode>(parentLayerIndex, node->x(), node->y());
   std::shared_ptr<GRTreeNode> lowestRoutingNode = routingNode;

src/grt/src/fastroute/include/DataType.h

@@ -60,6 +60,7 @@ struct Segment  // A Segment is a 2-pin connection
         y1(y1),
         x2(x2),
         y2(y2),
+        Zpoint(-1),
         cost(cost),
         xFirst(false),
         HVH(false)
@@ -174,8 +175,8 @@ struct TreeNode
   int nbr_count = 0;
   int nbr[3];   // three neighbors
   int edge[3];  // three adjacent edges
-  int hID;
-  int lID;
+  int hID = -1;
+  int lID = -1;
   // If two nodes are at the same x & y then the duplicate will have
   // stackAlias set to the index of the first node.  This does not
   // apply to pins nodes, only Steiner nodes.
@@ -219,7 +220,7 @@ struct TreeEdge
 {
   bool assigned;
 
-  int len;  // the Manhanttan Distance for two end nodes
+  int len = 0;  // the Manhanttan Distance for two end nodes
   int n1, n1a;
   int n2, n2a;
   Route route;

src/grt/src/fastroute/include/Graph2D.h

@@ -122,9 +122,9 @@ class Graph2D
   std::vector<int> getMultipleCongestedNDRnet();
 
  private:
-  int x_grid_;
-  int y_grid_;
-  int num_layers_;
+  int x_grid_ = 0;
+  int y_grid_ = 0;
+  int num_layers_ = 0;
   std::set<std::string> congestion_nets_;
 
   void updateCongList(const std::string& net_name, double edge_cost);
@@ -156,7 +156,7 @@ class Graph2D
       h_ndr_nets_;  // The way it is indexed is (X, Y)
   std::vector<NDRCongestion> congested_ndrs_;
 
-  utl::Logger* logger_;
+  utl::Logger* logger_ = nullptr;
 
   std::set<std::pair<int, int>> h_used_ggrid_;
   std::set<std::pair<int, int>> v_used_ggrid_;

src/grt/src/fastroute/src/utility.cpp

@@ -393,7 +393,7 @@ void FastRouteCore::ensurePinCoverage()
 
         TreeEdge new_edge;
         new_edge.assigned = true;
-        new_edge.route = via_route;
+        new_edge.route = std::move(via_route);
         treeedges.emplace_back(new_edge);
       }
     }
@@ -2876,7 +2876,7 @@ int FastRouteCore::splitEdge(std::vector<TreeEdge>& treeedges,
   new_node.edge[1] = new_edge_id;
   new_node.edge[2] = edge_n1n2;
 
-  treeedges.push_back(new_edge);
+  treeedges.push_back(std::move(new_edge));
   treenodes.push_back(new_node);
 
   return new_node_id;