Merge branch 'master' of github.com:The-OpenROAD-Project-private/OpenROAD into grt-soft-ndr-nets

Author: jfgava

src/cgt/BUILD

@@ -26,6 +26,9 @@ cc_library(
         "include/cgt/NetworkBuilder.h",
         "include/cgt/RandomBits.h",
     ],
+    defines = [
+        "ABC_NAMESPACE=abc",
+    ],
     includes = [
         "include",
     ],

src/cts/src/CtsOptions.cpp

@@ -27,6 +27,18 @@ void CtsOptions::inDbInstCreate(odb::dbInst* inst, odb::dbRegion* region)
   recordBuffer(inst->getMaster(), getType(inst));
 }
 
+void CtsOptions::limitSinkClusteringSizes(unsigned limit)
+{
+  if (sinkClustersSizeSet_) {
+    setSinkClusteringSize(std::min(limit, sinkClustersSize_));
+    return;
+  }
+  auto lowerBound = std::lower_bound(
+      sinkClusteringSizes_.begin(), sinkClusteringSizes_.end(), limit);
+  sinkClusteringSizes_.erase(lowerBound, sinkClusteringSizes_.end());
+  sinkClusteringSizes_.push_back(limit);
+}
+
 void CtsOptions::recordBuffer(odb::dbMaster* master, MasterType type)
 {
   switch (type) {

src/cts/src/CtsOptions.h

@@ -187,6 +187,10 @@ class CtsOptions : public odb::dbBlockCallBackObj
     maxDiameterSet_ = true;
   }
   bool isMaxDiameterSet() const { return maxDiameterSet_; }
+  const std::vector<unsigned>& getSinkClusteringDiameters()
+  {
+    return sinkClusteringDiameters_;
+  }
   unsigned getSinkClusteringSize() const { return sinkClustersSize_; }
   void setSinkClusteringSize(unsigned size)
   {
@@ -195,6 +199,11 @@ class CtsOptions : public odb::dbBlockCallBackObj
     sinkClustersSizeSet_ = true;
   }
   bool isSinkClusteringSizeSet() const { return sinkClustersSizeSet_; }
+  const std::vector<unsigned>& getSinkClusteringSizes()
+  {
+    return sinkClusteringSizes_;
+  }
+  void limitSinkClusteringSizes(unsigned limit);
   unsigned getSinkClusteringLevels() const { return sinkClusteringLevels_; }
   void setSinkClusteringLevels(unsigned levels)
   {
@@ -311,8 +320,10 @@ class CtsOptions : public odb::dbBlockCallBackObj
   int sinks_ = 0;
   double maxDiameter_ = 50;
   bool maxDiameterSet_ = false;
+  std::vector<unsigned> sinkClusteringDiameters_ = {50, 100, 200};
   unsigned sinkClustersSize_ = 20;
   bool sinkClustersSizeSet_ = false;
+  std::vector<unsigned> sinkClusteringSizes_ = {10, 20, 30};
   double macroMaxDiameter_ = 50;
   bool macroMaxDiameterSet_ = false;
   unsigned macroSinkClustersSize_ = 4;

src/cts/src/HTreeBuilder.cpp

@@ -34,9 +34,9 @@ void HTreeBuilder::preSinkClustering(
   bool maxDiameterSet = (type_ == TreeType::MacroTree)
                             ? options_->isMacroMaxDiameterSet()
                             : options_->isMaxDiameterSet();
-  unsigned clusterSizeSet = (type_ == TreeType::MacroTree)
-                                ? options_->isMacroSinkClusteringSizeSet()
-                                : options_->isSinkClusteringSizeSet();
+  bool clusterSizeSet = (type_ == TreeType::MacroTree)
+                            ? options_->isMacroSinkClusteringSizeSet()
+                            : options_->isSinkClusteringSizeSet();
 
   unsigned min_clustering_sinks = (type_ == TreeType::MacroTree)
                                       ? min_clustering_macro_sinks_
@@ -94,7 +94,7 @@ void HTreeBuilder::preSinkClustering(
                  bestDiameter);
   } else if (!clusterSizeSet && maxDiameterSet) {
     // only diameter is set, try clustering sizes of 10, 20 and 30
-    for (unsigned clusterSize2 : clusterSizes()) {
+    for (unsigned clusterSize2 : options_->getSinkClusteringSizes()) {
       // clang-format off
       debugPrint(logger_, CTS, "clustering", 1, "**** match.run({}, {}, {}) ****",
                  clusterSize2, maxDiameter, wireSegmentUnit_);
@@ -107,7 +107,7 @@ void HTreeBuilder::preSinkClustering(
     }
   } else if (clusterSizeSet && !maxDiameterSet) {
     // only clustering size is set, try diameters of 50, 100 and 200 um
-    for (unsigned clusterDiameter2 : clusterDiameters()) {
+    for (unsigned clusterDiameter2 : options_->getSinkClusteringDiameters()) {
       // clang-format off
       debugPrint(logger_, CTS, "clustering", 1, "**** match.run({}, {}, {}) ****",
                  clusterSize, clusterDiameter2, wireSegmentUnit_);
@@ -124,7 +124,7 @@ void HTreeBuilder::preSinkClustering(
     // try diameters of 50, 100 and 200 um
     for (unsigned clusterDiameter2 : clusterDiameters()) {
       // try clustering sizes of 10, 20 and 30
-      for (unsigned clusterSize2 : clusterSizes()) {
+      for (unsigned clusterSize2 : options_->getSinkClusteringSizes()) {
         // clang-format off
         debugPrint(logger_, CTS, "clustering", 1, "**** match.run({}, {}, {}) ****",
                    clusterSize2, clusterDiameter2, wireSegmentUnit_);

src/cts/src/TritonCTS.cpp

@@ -178,7 +178,7 @@ int TritonCTS::getBufferFanoutLimit(const std::string& bufferName)
       fanout = std::min(fanout, (int) tempFanout);
     }
   }
-  return fanout;
+  return fanout == std::numeric_limits<int>::max() ? 0 : fanout;
 }
 
 void TritonCTS::setupCharacterization()
@@ -215,10 +215,7 @@ void TritonCTS::setupCharacterization()
   }
 
   if (sinkMaxFanout) {
-    if (options_->getSinkClusteringSize() > sinkMaxFanout) {
-      options_->setSinkClusteringSize(sinkMaxFanout);
-    }
-
+    options_->limitSinkClusteringSizes(sinkMaxFanout);
     if (sinkMaxFanout < options_->getMaxFanout()) {
       options_->setMaxFanout(sinkMaxFanout);
     }

src/cts/test/CMakeLists.txt

@@ -21,6 +21,7 @@ or_integration_tests(
     check_charBuf
     check_max_fanout1
     check_max_fanout2
+    check_max_fanout3
     check_wire_rc_cts
     dummy_load
     find_clock