Merge branch 'master' of https://github.com/The-OpenROAD-Project-private/OpenROAD into secure-default_logger-for-test

Author: jhkim-pii

src/gpl/src/nesterovPlace.cpp

@@ -1209,11 +1209,12 @@ nesterovDbCbk::nesterovDbCbk(NesterovPlace* nesterov_place)
 void NesterovPlace::createCbkGCell(odb::dbInst* db_inst)
 {
   auto gcell_index = nbc_->createCbkGCell(db_inst);
-  for (auto& nesterov : nbVec_) {
-    // TODO: manage regions, not every NB should create a
-    // gcell.
-    nesterov->createCbkGCell(db_inst, gcell_index);
-  }
+  // Always create gcell on top-level
+  nbVec_[0]->createCbkGCell(db_inst, gcell_index);
+  // TODO: create new gcell in its proper region
+  // for (auto& nesterov : nbVec_) {
+  //   nesterov->createCbkGCell(db_inst, gcell_index);
+  // }
 }
 
 void NesterovPlace::destroyCbkGCell(odb::dbInst* db_inst)

src/grt/src/GlobalRouter.cpp

@@ -574,7 +574,8 @@ std::vector<int> GlobalRouter::routeLayerLengths(odb::dbNet* db_net)
   // dbu wirelength for wires, via count for vias
   std::vector<int> layer_lengths(tech->getLayerCount());
 
-  if (!db_net->getSigType().isSupply()) {
+  if (!db_net->getSigType().isSupply() && !db_net->isSpecial()
+      && db_net->getSWires().empty() && !db_net->isConnectedByAbutment()) {
     GRoute& route = routes[db_net];
     std::set<RoutePt> route_pts;
     // Compute wirelengths from route segments

src/gui/src/heatMap.cpp

@@ -97,7 +97,7 @@ void HeatMapDataSource::dumpToFile(const std::string& file)
 
   const double dbu_to_micron = block_->getDbUnitsPerMicron();
 
-  csv << "x0,y0,x1,y1,value" << std::endl;
+  csv << "x0,y0,x1,y1,value (" << getValueUnits() << ")" << '\n';
   for (const auto& map_col : map_) {
     for (const auto& map_value : map_col) {
       if (!map_value->has_value) {

src/mpl/src/SimulatedAnnealingCore.cpp

@@ -263,62 +263,68 @@ void SimulatedAnnealingCore<T>::calOutlinePenalty()
 template <class T>
 void SimulatedAnnealingCore<T>::calWirelength()
 {
-  // Initialization
-  wirelength_ = 0.0;
   if (core_weights_.wirelength <= 0.0) {
     return;
   }
 
-  // calculate the total net weight
-  float tot_net_weight = 0.0;
-  for (const auto& net : nets_) {
-    tot_net_weight += net.weight;
-  }
+  wirelength_ = computeNetsWireLength(nets_);
 
-  if (tot_net_weight <= 0.0) {
-    return;
+  if (graphics_) {
+    graphics_->setWirelengthPenalty({.name = "Wire Length",
+                                     .weight = core_weights_.wirelength,
+                                     .value = wirelength_,
+                                     .normalization_factor = norm_wirelength_});
   }
+}
+
+template <class T>
+float SimulatedAnnealingCore<T>::computeNetsWireLength(
+    const std::vector<BundledNet>& nets) const
+{
+  float nets_wire_length = 0.0;
+  float nets_weight_sum = 0.0;
 
   for (const auto& net : nets_) {
-    T& source = macros_[net.terminals.first];
-    T& target = macros_[net.terminals.second];
+    nets_weight_sum += net.weight;
+  }
 
-    if (target.isClusterOfUnplacedIOPins()) {
-      computeWLForClusterOfUnplacedIOPins(source, target, net.weight);
-      continue;
-    }
+  if (nets_weight_sum != 0.0) {
+    for (const auto& net : nets) {
+      const T& source = macros_[net.terminals.first];
+      const T& target = macros_[net.terminals.second];
 
-    const float x1 = source.getPinX();
-    const float y1 = source.getPinY();
-    const float x2 = target.getPinX();
-    const float y2 = target.getPinY();
-    wirelength_ += net.weight * (std::abs(x2 - x1) + std::abs(y2 - y1));
-  }
+      if (target.isClusterOfUnplacedIOPins()) {
+        nets_wire_length
+            += computeWLForClusterOfUnplacedIOPins(source, target, net.weight);
+      } else {
+        const float x1 = source.getPinX();
+        const float y1 = source.getPinY();
+        const float x2 = target.getPinX();
+        const float y2 = target.getPinY();
 
-  // normalization
-  wirelength_ = wirelength_ / tot_net_weight
-                / (outline_.getHeight() + outline_.getWidth());
+        nets_wire_length
+            += net.weight * (std::abs(x2 - x1) + std::abs(y2 - y1));
+      }
+    }
 
-  if (graphics_) {
-    graphics_->setWirelengthPenalty({"Wire Length",
-                                     core_weights_.wirelength,
-                                     wirelength_,
-                                     norm_wirelength_});
+    nets_wire_length = nets_wire_length / nets_weight_sum
+                       / (outline_.getHeight() + outline_.getWidth());
   }
+
+  return nets_wire_length;
 }
 
 template <class T>
-void SimulatedAnnealingCore<T>::computeWLForClusterOfUnplacedIOPins(
+double SimulatedAnnealingCore<T>::computeWLForClusterOfUnplacedIOPins(
     const T& macro,
     const T& unplaced_ios,
-    const float net_weight)
+    const float net_weight) const
 {
   // To generate maximum cost.
   const float max_dist = die_area_.getPerimeter() / 2;
 
   if (isOutsideTheOutline(macro)) {
-    wirelength_ += net_weight * max_dist;
-    return;
+    return net_weight * max_dist;
   }
 
   const odb::Point macro_location(block_->micronsToDbu(macro.getPinX()),
@@ -341,7 +347,7 @@ void SimulatedAnnealingCore<T>::computeWLForClusterOfUnplacedIOPins(
         = computeDistToNearestRegion(macro_location, {constraint}, nullptr);
   }
 
-  wirelength_ += net_weight * block_->dbuToMicrons(smallest_distance);
+  return net_weight * block_->dbuToMicrons(smallest_distance);
 }
 
 // We consider the macro outside the outline based on the location of

src/mpl/src/SimulatedAnnealingCore.h

@@ -116,9 +116,10 @@ class SimulatedAnnealingCore
   virtual void calPenalty() = 0;
   void calOutlinePenalty();
   void calWirelength();
-  void computeWLForClusterOfUnplacedIOPins(const T& macro,
-                                           const T& unplaced_ios,
-                                           float net_weight);
+  float computeNetsWireLength(const std::vector<BundledNet>& nets) const;
+  double computeWLForClusterOfUnplacedIOPins(const T& macro,
+                                             const T& unplaced_ios,
+                                             float net_weight) const;
   bool isOutsideTheOutline(const T& macro) const;
   void calGuidancePenalty();
   void calFencePenalty();

src/odb/include/odb/dbId.h

@@ -20,7 +20,7 @@ class dbId
   dbId(unsigned int id) : id_(id) {}
 
   operator unsigned int() const { return id_; }
-  unsigned int& id() { return id_; }
+  unsigned int id() const { return id_; }
 
   bool isValid() const { return id_ != invalid; }
   void clear() { id_ = invalid; }

src/odb/src/db/dbJournal.cpp

@@ -1010,7 +1010,9 @@ void dbJournal::redo_updateNetField()
     case _dbNet::kNonDefaultRule: {
       uint prev_rule;
       log_.pop(prev_rule);
-      log_.pop(net->non_default_rule_.id());
+      unsigned int id;
+      log_.pop(id);
+      net->non_default_rule_ = id;
       bool prev_block_rule;
       bool cur_block_rule;
       log_.pop(prev_block_rule);

src/psm/README.md

@@ -145,6 +145,7 @@ set_pdnsim_source_settings
     [-bump_size size]
     [-bump_interval interval]
     [-strap_track_pitch pitch]
+    [-external_resistance resistance]
 ```
 
 #### Options
@@ -154,7 +155,8 @@ set_pdnsim_source_settings
 | `-bump_dx`,`-bump_dy` | Set the bump pitch to decide the voltage source location. The default bump pitch is 140um. |
 | `-bump_size` | Set the bump size. The default bump size is 70um. |
 | `-bump_interval` | Set the bump population interval, this is used to depopulate the bump grid to emulate signals and other power connections. The default bump pitch is 3. |
-| `-strap_track_pitch` | Sets the track pitck to use for moduling voltage sources as straps. The default is 10x. |
+| `-strap_track_pitch` | Sets the track pitch to use for modeling voltage sources as straps. The default is 10x. |
+| `-external_resistance` | Set to model the resistance of the package or power network outside the chip/block. The default value is 0.0. |
 
 ### Insert Decap Cells
 The `insert_decap` command inserts decap cells in the areas with the highest

src/psm/include/psm/pdnsim.h

@@ -56,6 +56,9 @@ class PDNSim : public odb::dbBlockCallBackObj
 
     // Straps
     int strap_track_pitch = 10;
+
+    // Source resistance
+    float resistance = 0.0;  // Ohms
   };
 
   using IRDropByPoint = std::map<odb::Point, double>;

src/psm/src/connection.cpp

@@ -204,15 +204,23 @@ TermConnection::TermConnection(Node* node0, Node* node1)
 {
 }
 
-Connection::Resistance TermConnection::getResistance(
-    const ResistanceMap& res_map) const
+std::string TermConnection::describe() const
 {
-  return kResistance;
+  return "Terminal Connection";
 }
 
-std::string TermConnection::describe() const
+/////////////////////////////
+
+FixedResistanceConnection::FixedResistanceConnection(Node* node0,
+                                                     Node* node1,
+                                                     Resistance resistance)
+    : Connection(node0, node1), res_(resistance)
 {
-  return "Terminal Connection";
+}
+
+std::string FixedResistanceConnection::describe() const
+{
+  return "Fixed Resistance Connection";
 }
 
 }  // namespace psm