Merge remote-tracking branch 'upstream/master' into downsize_move

Author: mguthaus

.github/workflows/github-actions-clang-tidy.yml

@@ -33,4 +33,6 @@ jobs:
           echo "Ownership change attempt finished."
         shell: bash
       - if: steps.review.outputs.total_comments > 0
-        run: exit 1
+        run: |
+          echo "Pendinding review comments. Please resolve all comments before merging."
+          exit 1

src/grt/include/grt/GlobalRouter.h

@@ -149,7 +149,7 @@ class GlobalRouter : public ant::GlobalRouteSource
   void readGuides(const char* file_name);
   void loadGuidesFromDB();
   void saveGuidesFromFile(std::unordered_map<odb::dbNet*, Guides>& guides);
-  void saveGuides();
+  void saveGuides(const std::vector<odb::dbNet*>& nets);
   void writeSegments(const char* file_name);
   void readSegments(const char* file_name);
   bool netIsCovered(odb::dbNet* db_net, std::string& pins_not_covered);

src/grt/src/GlobalRouter.cpp

@@ -329,7 +329,12 @@ void GlobalRouter::globalRoute(bool save_guides,
       logger_->info(GRT, 14, "Routed nets: {}", routes_.size());
     }
     if (save_guides) {
-      saveGuides();
+      std::vector<odb::dbNet*> nets;
+      nets.reserve(block_->getNets().size());
+      for (odb::dbNet* db_net : block_->getNets()) {
+        nets.push_back(db_net);
+      }
+      saveGuides(nets);
     }
   }
 
@@ -402,6 +407,7 @@ int GlobalRouter::repairAntennas(odb::dbMTerm* diode_mterm,
                   "routing source is detailed routing.");
   }
 
+  std::vector<odb::dbNet*> modified_nets;
   while (violations && itr < iterations) {
     if (verbose_) {
       logger_->info(GRT, 6, "Repairing antennas, iteration {}.", itr + 1);
@@ -417,7 +423,7 @@ int GlobalRouter::repairAntennas(odb::dbMTerm* diode_mterm,
         && repair_antennas_->hasNewViolations()) {
       // Run jumper insertion and clean
       repair_antennas_->jumperInsertion(
-          routes_, grid_->getTileSize(), getMaxRoutingLayer());
+          routes_, grid_->getTileSize(), getMaxRoutingLayer(), modified_nets);
       repair_antennas_->clearViolations();
 
       // run again antenna checker
@@ -439,13 +445,14 @@ int GlobalRouter::repairAntennas(odb::dbMTerm* diode_mterm,
       nets_to_repair.clear();
       for (const Net* net : incr_groute.updateRoutes()) {
         nets_to_repair.push_back(net->getDbNet());
+        modified_nets.push_back(net->getDbNet());
       }
     }
     repair_antennas_->clearViolations();
     itr++;
   }
   logger_->metric("antenna_diodes_count", total_diodes_count_);
-  saveGuides();
+  saveGuides(modified_nets);
   return total_diodes_count_;
 }
 
@@ -2399,7 +2406,7 @@ void GlobalRouter::saveGuidesFromFile(
   }
 }
 
-void GlobalRouter::saveGuides()
+void GlobalRouter::saveGuides(const std::vector<odb::dbNet*>& nets)
 {
   int offset_x = grid_origin_.x();
   int offset_y = grid_origin_.y();
@@ -2409,7 +2416,7 @@ void GlobalRouter::saveGuides()
   int net_with_jumpers, total_jumpers;
   net_with_jumpers = 0;
   total_jumpers = 0;
-  for (odb::dbNet* db_net : block_->getNets()) {
+  for (odb::dbNet* db_net : nets) {
     auto iter = routes_.find(db_net);
     if (iter == routes_.end()) {
       continue;
@@ -2544,8 +2551,10 @@ void GlobalRouter::readSegments(const char* file_name)
         GRT, 257, "Failed to open global route segments file {}.", file_name);
   }
 
+  int line_count = 0;
   while (fin.good()) {
     getline(fin, line);
+    line_count++;
     if (line == "(" || line.empty() || line == ")") {
       continue;
     }
@@ -2580,8 +2589,13 @@ void GlobalRouter::readSegments(const char* file_name)
                        layer2->getRoutingLevel());
       routes_[db_net].push_back(segment);
     } else {
-      logger_->error(
-          GRT, 261, "Error reading global route segments file {}.", file_name);
+      logger_->error(GRT,
+                     261,
+                     "Error reading global route segments file {} at line {}.\n"
+                     "\t\t Line content: \"{}\".",
+                     file_name,
+                     line_count,
+                     line);
     }
   }
   for (auto& [db_net, segments] : routes_) {
@@ -4810,6 +4824,11 @@ std::vector<Net*> GlobalRouter::updateDirtyRoutes(bool save_guides)
 {
   std::vector<Net*> dirty_nets;
   if (!dirty_nets_.empty()) {
+    std::vector<odb::dbNet*> modified_nets;
+    modified_nets.reserve(dirty_nets.size());
+    for (const Net* net : dirty_nets) {
+      modified_nets.push_back(net->getDbNet());
+    }
     fastroute_->setVerbose(false);
     fastroute_->clearNetsToRoute();
 
@@ -4887,7 +4906,7 @@ std::vector<Net*> GlobalRouter::updateDirtyRoutes(bool save_guides)
     fastroute_->setCriticalNetsPercentage(old_critical_nets_percentage);
     fastroute_->setCongestionReportIterStep(congestion_report_iter_step_);
     if (save_guides) {
-      saveGuides();
+      saveGuides(modified_nets);
     }
   }
 

src/grt/src/RepairAntennas.cpp

@@ -1395,7 +1395,8 @@ int RepairAntennas::addJumperOnSegments(
 
 void RepairAntennas::jumperInsertion(NetRouteMap& routing,
                                      const int& tile_size,
-                                     const int& max_routing_layer)
+                                     const int& max_routing_layer,
+                                     std::vector<odb::dbNet*>& modified_nets)
 {
   // Init jumper size
   tile_size_ = tile_size;
@@ -1452,6 +1453,7 @@ void RepairAntennas::jumperInsertion(NetRouteMap& routing,
         db_net->setJumpers(true);
         net_with_jumpers++;
         total_jumpers += jumper_by_net;
+        modified_nets.push_back(db_net);
       }
     }
   }

src/grt/src/RepairAntennas.h

@@ -123,7 +123,8 @@ class RepairAntennas
   bool hasNewViolations() { return has_new_violations_; }
   void jumperInsertion(NetRouteMap& routing,
                        const int& tile_size,
-                       const int& max_routing_layer);
+                       const int& max_routing_layer,
+                       std::vector<odb::dbNet*>& modified_nets);
 
  private:
   using coord_type = int;

src/grt/test/CMakeLists.txt

@@ -48,6 +48,8 @@ or_integration_tests(
     read_segments_error1
     read_segments_error2
     read_segments_error3
+    read_segments_error4
+    read_segments_error5
     region_adjustment
     remove_buffers1
     remove_buffers2

src/grt/test/read_segments_error4.ok

@@ -0,0 +1,8 @@
+[INFO ODB-0227] LEF file: Nangate45/Nangate45.lef, created 22 layers, 27 vias, 135 library cells
+[INFO ODB-0128] Design: gcd
+[INFO ODB-0130]     Created 54 pins.
+[INFO ODB-0131]     Created 676 components and 2850 component-terminals.
+[INFO ODB-0133]     Created 579 nets and 1498 connections.
+[ERROR GRT-0261] Error reading global route segments file read_segments_error4.segs at line 166.
+		 Line content: "req_msg [29]".
+GRT-0261