Merge remote-tracking branch 'private/master' into gpl-extend-max-iter-by-routability

Author: gudeh

src/cts/README.md

@@ -83,8 +83,8 @@ clock_tree_synthesis
 | `-clustering_exponent` | Value that determines the power used on the difference between sink and means on the CKMeans clustering algorithm. The default value is `4`, and the allowed values are integers `[0, MAX_INT]`. |
 | `-clustering_unbalance_ratio` | Value determines each cluster's maximum capacity during CKMeans. A value of `0.5` (i.e., 50%) means that each cluster will have exactly half of all sinks for a specific region (half for each branch). The default value is `0.6`, and the allowed values are floats `[0, 1.0]`. |
 | `-sink_clustering_enable` | Enables pre-clustering of sinks to create one level of sub-tree before building H-tree. Each cluster is driven by buffer which becomes end point of H-tree structure. |
-| `-sink_clustering_size` | Specifies the maximum number of sinks per cluster for the register tree. The default value is `20`, and the allowed values are integers `[0, MAX_INT]`. |
-| `-sink_clustering_max_diameter` | Specifies maximum diameter (in microns) of sink cluster for the register tree. The default value is `50`, and the allowed values are integers `[0, MAX_INT]`. |
+| `-sink_clustering_size` | Specifies the maximum number of sinks per cluster for the register tree. The allowed values are integers `[0, MAX_INT]`. If this is not specified the size will be automatically chosen between `10, 20 or 30` based on the tree buffer max cap. |
+| `-sink_clustering_max_diameter` | Specifies maximum diameter (in microns) of sink cluster for the register tree. The allowed values are integers `[0, MAX_INT]`. If this is not specified the diameter will be automatically chosen between `50, 100 or 200`, based on the tree buffer max cap. |
 | `-macro_clustering_size` | Specifies the maximum number of sinks per cluster for the macro tree. The default value is `4`, and the allowed values are integers `[0, MAX_INT]`. |
 | `-macro_clustering_max_diameter` | Specifies maximum diameter (in microns) of sink cluster for the macro tree. The default value is `50`, and the allowed values are integers `[0, MAX_INT]`. |
 | `-balance_levels` | Attempt to keep a similar number of levels in the clock tree across non-register cells (e.g., clock-gate or inverter). The default value is `False`, and the allowed values are bool. |

src/gpl/src/initialPlace.cpp

@@ -71,14 +71,6 @@ void InitialPlace::doBicgstabPlace(int threads)
                            instLocVecY_,
                            log_,
                            threads);
-    float error_max = std::max(error.x, error.y);
-    log_->report(
-        "[InitialPlace]  Iter: {} conjugate gradient residual: {:0.8f} HPWL: "
-        "{}",
-        iter,
-        error_max,
-        pbc_->hpwl());
-    updateCoordi();
 
     if (graphics) {
       graphics->cellPlot(true);
@@ -91,6 +83,24 @@ void InitialPlace::doBicgstabPlace(int threads)
       gui->gifAddFrame(region, 500, dbu_per_pixel, 20);
     }
 
+    if (std::isnan(error.x) || std::isnan(error.y)) {
+      log_->warn(GPL,
+                 154,
+                 "Conjugate gradient initial placement solver failed at "
+                 "iteration {}. ",
+                 iter);
+      break;
+    }
+
+    float error_max = std::max(error.x, error.y);
+    log_->report(
+        "[InitialPlace]  Iter: {} conjugate gradient residual: {:0.8f} HPWL: "
+        "{}",
+        iter,
+        error_max,
+        pbc_->hpwl());
+    updateCoordi();
+
     if (error_max <= 1e-5 && iter >= 5) {
       break;
     }

src/gpl/src/mbff.cpp

@@ -637,9 +637,9 @@ MBFF::Mask MBFF::GetArrayMask(dbInst* inst, const bool isTray)
 
   const sta::Cell* cell = network_->dbToSta(inst->getMaster());
   const sta::LibertyCell* lib_cell = getLibertyCell(cell);
-  for (const sta::Sequential* seq : lib_cell->sequentials()) {
-    ret.func_idx = GetMatchingFunc(seq->data(), inst, isTray);
-    break;
+  const auto& seqs = lib_cell->sequentials();
+  if (!seqs.empty()) {
+    ret.func_idx = GetMatchingFunc(seqs.front()->data(), inst, isTray);
   }
 
   ret.is_scan_cell = IsScanCell(inst);
@@ -828,9 +828,13 @@ void MBFF::ModifyPinConnections(const std::vector<Flop>& flops,
         }
         if (IsSupplyPin(iterm)) {
           if (iterm->getSigType() == odb::dbSigType::GROUND) {
-            ground->connect(net);
+            if (ground) {
+              ground->connect(net);
+            }
           } else {
-            power->connect(net);
+            if (power) {
+              power->connect(net);
+            }
           }
         }
         if (IsClockPin(iterm)) {
@@ -1773,6 +1777,10 @@ float MBFF::GetKSilh(const std::vector<std::vector<Flop>>& clusters,
       tot += ((b_j - a_j) / std::max(a_j, b_j));
     }
   }
+
+  if (num_flops == 0) {
+    return 0.0f;
+  }
   return tot / num_flops;
 }
 

src/gpl/src/nesterovBase.cpp

@@ -8,7 +8,6 @@
 #include <algorithm>
 #include <cmath>
 #include <cstddef>
-#include <fstream>
 #include <iostream>
 #include <memory>
 #include <random>

src/gpl/src/nesterovBase.h

@@ -4,6 +4,7 @@
 #pragma once
 
 #include <cstddef>
+#include <fstream>
 #include <memory>
 #include <string>
 #include <unordered_map>
@@ -1267,15 +1268,15 @@ class NesterovBase
 
   bool isDiverged_ = false;
 
-  NesterovPlaceVars* npVars_;
+  NesterovPlaceVars* npVars_ = nullptr;
 
   bool isMaxPhiCoefChanged_ = false;
 
   float minSumOverflow_ = 1e30;
   float hpwlWithMinSumOverflow_ = 1e30;
   int iter_ = 0;
   bool isConverged_ = false;
-  bool reprint_iter_header_;
+  bool reprint_iter_header_ = false;
 
   void initFillerGCells();
 };

src/gpl/src/nesterovPlace.h

@@ -110,7 +110,7 @@ class NesterovPlace
   float wireLengthCoefY_ = 0;
 
   // observability metrics
-  utl::Gauge<double>* hpwl_gauge_;
+  utl::Gauge<double>* hpwl_gauge_ = nullptr;
 
   // half-parameter-wire-length
   int64_t prevHpwl_ = 0;

src/gpl/src/routeBase.cpp

@@ -253,26 +253,6 @@ RouteBase::RouteBase(RouteBaseVars rbVars,
 
 RouteBase::~RouteBase() = default;
 
-void RouteBase::reset()
-{
-  rbVars_.reset();
-  db_ = nullptr;
-  nbc_ = nullptr;
-  log_ = nullptr;
-
-  numCall_ = 0;
-
-  minRc_ = 1e30;
-  minRcTargetDensity_ = 0;
-  min_RC_violated_cnt_ = 0;
-  max_routability_no_improvement_ = 0;
-  max_routability_revert_ = 50;
-
-  nbc_->resetMinRcCellSize();
-
-  resetRoutabilityResources();
-}
-
 void RouteBase::resetRoutabilityResources()
 {
   inflatedAreaDelta_ = 0;

src/gpl/src/routeBase.h

@@ -198,7 +198,6 @@ class RouteBase
   int max_routability_revert_ = 50;
 
   void init();
-  void reset();
   void resetRoutabilityResources();
 
   // update numCall_

src/gpl/src/solver.cpp

@@ -20,16 +20,28 @@ ResidualError cpuSparseSolve(int maxSolverIter,
 {
   omp_set_num_threads(threads);
 
-  ResidualError error;
+  ResidualError residual_error;
   BiCGSTAB<SMatrix, IdentityPreconditioner> solver;
   solver.setMaxIterations(maxSolverIter);
+
   solver.compute(placeInstForceMatrixX);
   instLocVecX = solver.solveWithGuess(fixedInstForceVecX, instLocVecX);
-  error.x = solver.error();
+  if (solver.info() == Eigen::NoConvergence
+      || solver.info() == Eigen::Success) {
+    residual_error.x = solver.error();
+  } else {
+    residual_error.x = std::numeric_limits<float>::quiet_NaN();
+  }
 
   solver.compute(placeInstForceMatrixY);
   instLocVecY = solver.solveWithGuess(fixedInstForceVecY, instLocVecY);
-  error.y = solver.error();
-  return error;
+  if (solver.info() == Eigen::NoConvergence
+      || solver.info() == Eigen::Success) {
+    residual_error.y = solver.error();
+  } else {
+    residual_error.y = std::numeric_limits<float>::quiet_NaN();
+  }
+
+  return residual_error;
 }
 }  // namespace gpl

src/odb/src/db/dbNet.h

@@ -107,7 +107,6 @@ class _dbNet : public _dbObject
   bool operator!=(const _dbNet& rhs) const { return !operator==(rhs); }
   bool operator<(const _dbNet& rhs) const;
   void collectMemInfo(MemInfo& info);
-  dbObjectTable* getObjectTable(dbObjectType type);
 };
 
 dbOStream& operator<<(dbOStream& stream, const _dbNet& net);