Merge remote-tracking branch 'private/master' into gui-tcl-worst-path-image

Author: gudeh

.gemini/config.yaml

@@ -0,0 +1,8 @@
+memory_config:
+  disabled: false
+code_review:
+  pull_request_opened:
+    help: false
+    summary: false
+    code_review: true
+    include_drafts: true

.github/workflows/github-actions-lint-tcl.yml

@@ -19,7 +19,7 @@ jobs:
       - name: Install Dependencies
         run: |
           python3 -m venv venv
-          venv/bin/pip install tclint==0.6.1
+          venv/bin/pip install tclint==0.7.0
 
       - name: Lint
         run: |

MODULE.bazel

@@ -146,7 +146,7 @@ bazel_dep(name = "bazel-orfs")
 # To bump version, run: bazelisk run @bazel-orfs//:bump
 git_override(
     module_name = "bazel-orfs",
-    commit = "e96d7d2a4405a99fc689b4f2f676d3bda7b9430b",
+    commit = "1e862b169d97dc0fec5db106559640886e7fd7d0",
     remote = "https://github.com/The-OpenROAD-Project/bazel-orfs.git",
 )
 
@@ -155,10 +155,10 @@ orfs = use_extension("@bazel-orfs//:extension.bzl", "orfs_repositories")
 # To bump version, run: bazelisk run @bazel-orfs//:bump
 orfs.default(
     # Official image https://hub.docker.com/r/openroad/orfs/tags
-    image = "docker.io/openroad/orfs:v3.0-4362-gaec1d8d35",
+    image = "docker.io/openroad/orfs:v3.0-4367-g79b6a48ab",
     # Use OpenROAD of this repo instead of from the docker image
     openroad = "//:openroad",
-    sha256 = "5f94f0481d1339493918208060be116da101405251bce22691ac4b2d662d276e",
+    sha256 = "0d0dd3d8d346360a71f6325ce776a984c5a6296fc6e51956b53f136e1dd13462",
 )
 use_repo(orfs, "com_github_nixos_patchelf_download")
 use_repo(orfs, "docker_orfs")

MODULE.bazel.lock

@@ -504,16 +504,21 @@ void OpenRoad::read3DBloxBMap(const std::string& filename)
   odb::ThreeDBlox parser(logger_, db_);
   parser.readBMap(filename);
 }
+
 void OpenRoad::write3Dbv(const std::string& filename)
 {
   odb::ThreeDBlox writer(logger_, db_, sta_);
   writer.writeDbv(filename, db_->getChip());
 }
+
 void OpenRoad::write3Dbx(const std::string& filename)
 {
   odb::ThreeDBlox writer(logger_, db_, sta_);
   writer.writeDbx(filename, db_->getChip());
 }
+
+// TODO: bool hierarchy should be removed in the future.
+// It is retained for a while for backward compatibility.
 void OpenRoad::readDb(const char* filename, bool hierarchy)
 {
   try {
@@ -523,7 +528,7 @@ void OpenRoad::readDb(const char* filename, bool hierarchy)
     logger_->error(ORD, 54, "odb file {} is invalid: {}", filename, f.what());
   }
   // treat this as a hierarchical network.
-  if (hierarchy) {
+  if (hierarchy || db_->hasHierarchy()) {
     logger_->warn(
         ORD,
         12,

src/OpenRoad.cc

@@ -233,6 +233,9 @@ sta::define_cmd_args "write_db" {filename}
 sta::define_cmd_args "read_db" {[-hier] filename}
 
 proc read_db { args } {
+  # TODO: -hier is not needed anymore.
+  # - It will be removed in a future release.
+  # - It is currently retained for backward compatibility.
   sta::parse_key_args "read_db" args keys {} flags {-hier}
   sta::check_argc_eq1or2 "read_db" $args
   set filename [file nativename [lindex $args 0]]

src/OpenRoad.tcl

@@ -950,7 +950,7 @@ std::vector<TechChar::SolutionData> TechChar::createPatterns(
   odb::dbNet* net = nullptr;
   // clang-format off
   debugPrint(logger_, CTS, "tech char", 1, "*createPatterns for #nodes = {}"
-             " #topologies = {}", setupWirelength, numberOfNodes, numberOfTopologies);
+             " #topologies = {}", numberOfNodes, numberOfTopologies);
   // clang-format on
   // For each possible topology...
   for (unsigned solutionCounterInt = 0; solutionCounterInt < numberOfTopologies;
@@ -1051,9 +1051,6 @@ std::vector<TechChar::SolutionData> TechChar::createPatterns(
     tmp << "OUT";
     debugPrint(logger_, CTS, "tech char", 1, tmp.str());
     topology.outPort = outPortPin;
-    if (isPureWire) {
-      topology.instVector.push_back(nullptr);
-    }
     topology.isPureWire = isPureWire;
     topology.netVector.push_back(net);
     topology.nodesWithoutBufVector.push_back(nodesWithoutBuf);
@@ -1478,6 +1475,7 @@ std::vector<TechChar::ResultData> TechChar::characterizationPostProcess()
   unsigned maxResultCapacitance = 0;
   unsigned minResultSlew = std::numeric_limits<unsigned>::max();
   unsigned maxResultSlew = 0;
+
   std::vector<ResultData> convertedSolutions;
   for (ResultData solution : selectedSolutions) {
     if (solution.pinSlew <= options_->getMaxCharSlew()) {
@@ -1530,6 +1528,7 @@ std::vector<TechChar::ResultData> TechChar::characterizationPostProcess()
       convertedSolutions.push_back(convertedResult);
     }
   }
+
   // Sets the min and max values and returns the result vector.
   minSlew_ = minResultSlew;
   maxSlew_ = maxResultSlew;
@@ -1631,10 +1630,10 @@ void TechChar::create()
                  masterNames_.size(), solution.instVector.size());
       // clang-format on
       // For each possible buffer combination (different sizes).
-      unsigned buffersUpdate
+      unsigned buffersCombinations
           = getBufferingCombo(masterNames_.size(), solution.instVector.size());
 
-      if (buffersUpdate == 0) {
+      if (buffersCombinations == 0) {
         continue;
       }
 
@@ -1697,12 +1696,13 @@ void TechChar::create()
           }
         }
         // If the solution is not a pure-wire, update the buffer topologies.
-        if (!solution.isPureWire) {
+        if (!solution.isPureWire && buffersCombinations > 1) {
           updateBufferTopologies(solution);
         }
-        // For pure-wire solution buffersUpdate == 1, so it only runs once.
-        buffersUpdate--;
-      } while (buffersUpdate != 0);
+        // For pure-wire solution buffersCombinations == 1, so it only runs
+        // once.
+        buffersCombinations--;
+      } while (buffersCombinations != 0);
     }
     openStaChar_.reset(nullptr);
   }

src/cts/src/TechChar.cpp

@@ -394,9 +394,9 @@ class dbNetwork : public ConcreteNetwork
 
   // hierarchy handler, set in openroad tested in network child traverserser
 
-  void setHierarchy() { hierarchy_ = true; }
-  void disableHierarchy() { hierarchy_ = false; }
-  bool hasHierarchy() const { return hierarchy_; }
+  void setHierarchy() { db_->setHierarchy(true); }
+  void disableHierarchy() { db_->setHierarchy(false); }
+  bool hasHierarchy() const { return db_->hasHierarchy(); }
   bool hasHierarchicalElements() const;
   void reassociateHierFlatNet(dbModNet* mod_net,
                               dbNet* new_flat_net,
@@ -470,7 +470,6 @@ class dbNetwork : public ConcreteNetwork
   static constexpr unsigned DBIDTAG_WIDTH = 0x4;
 
  private:
-  bool hierarchy_ = false;
   std::set<const Cell*> hier_modules_;
   std::set<const Port*> concrete_ports_;
   std::unique_ptr<dbEditHierarchy> hierarchy_editor_;

src/dbSta/include/db_sta/dbNetwork.hh

@@ -252,7 +252,7 @@ void dbEditHierarchy::hierarchicalConnect(dbITerm* source_pin,
   //
   dbNet* source_db_net = source_pin->getNet();
   dbNet* dest_db_net = dest_pin->getNet();
-  if (db_network_->hierarchy_ == false) {
+  if (db_network_->hasHierarchy() == false) {
     // If both source pin and dest pin do not have a corresponding flat net,
     // Create a new net and connect it with source pin.
     if (source_db_net == nullptr && dest_db_net == nullptr) {

src/dbSta/src/dbEditHierarchy.cc

@@ -768,7 +768,7 @@ ObjectId dbNetwork::id(const Port* port) const
     return std::numeric_limits<ObjectId>::max();
   }
 
-  if (hierarchy_) {
+  if (hasHierarchy()) {
     if (isConcretePort(port)) {
       return ConcreteNetwork::id(port);
     }
@@ -790,7 +790,7 @@ ObjectId dbNetwork::id(const Port* port) const
 ObjectId dbNetwork::id(const Cell* cell) const
 {
   // in hierarchical flow we use the object id for the index
-  if (hierarchy_) {
+  if (hasHierarchy()) {
     if (!isConcreteCell(cell)) {
       const dbObject* obj = reinterpret_cast<const dbObject*>(cell);
       return getDbNwkObjectId(obj);
@@ -808,7 +808,7 @@ ObjectId dbNetwork::id(const Instance* instance) const
   if (instance == top_instance_) {
     return 0;
   }
-  if (hierarchy_) {
+  if (hasHierarchy()) {
     const dbObject* obj = reinterpret_cast<const dbObject*>(instance);
     return getDbNwkObjectId(obj);
   }
@@ -840,7 +840,7 @@ const char* dbNetwork::name(const Port* port) const
     return nullptr;
   }
 
-  if (hierarchy_) {
+  if (hasHierarchy()) {
     size_t last_idx = name.find_last_of('/');
     if (last_idx != std::string::npos) {
       name = name.substr(last_idx + 1);
@@ -887,7 +887,7 @@ const char* dbNetwork::name(const Instance* instance) const
     name = mod_inst->getName();
   }
 
-  if (hierarchy_) {
+  if (hasHierarchy()) {
     size_t last_idx = std::string::npos;
     size_t pos = name.length();
     while ((pos = name.rfind('/', pos)) != std::string::npos) {
@@ -1096,7 +1096,7 @@ Instance* dbNetwork::parent(const Instance* instance) const
 
 Port* dbNetwork::findPort(const Cell* cell, const char* name) const
 {
-  if (hierarchy_) {
+  if (hasHierarchy()) {
     dbMaster* db_master;
     dbModule* db_module;
     staToDb(cell, db_master, db_module);
@@ -1125,7 +1125,7 @@ bool dbNetwork::isLeaf(const Instance* instance) const
   if (instance == top_instance_) {
     return false;
   }
-  if (hierarchy_) {
+  if (hasHierarchy()) {
     dbMaster* db_master;
     dbModule* db_module;
     Cell* cur_cell = cell(instance);
@@ -1140,7 +1140,7 @@ bool dbNetwork::isLeaf(const Instance* instance) const
 
 Instance* dbNetwork::findInstance(const char* path_name) const
 {
-  if (hierarchy_) {  // are we in hierarchical mode ?
+  if (hasHierarchy()) {  // are we in hierarchical mode ?
     // find a hierarchical module instance first
     dbModInst* mod_inst = block()->findModInst(path_name);
     if (mod_inst) {
@@ -1395,7 +1395,7 @@ ObjectId dbNetwork::id(const Pin* pin) const
 
   staToDb(pin, iterm, bterm, moditerm);
 
-  if (hierarchy_) {
+  if (hasHierarchy()) {
     // get the id for hierarchical objects using dbid.
     std::uintptr_t tag_value
         = reinterpret_cast<std::uintptr_t>(pin) & kPointerTagMask;
@@ -1784,7 +1784,7 @@ ObjectId dbNetwork::id(const Net* net) const
   dbModNet* modnet = nullptr;
   dbNet* dnet = nullptr;
   staToDb(net, dnet, modnet);
-  if (hierarchy_) {
+  if (hasHierarchy()) {
     const dbObject* obj = reinterpret_cast<const dbObject*>(net);
     return getDbNwkObjectId(obj);
   }
@@ -1865,7 +1865,7 @@ const char* dbNetwork::name(const Net* net) const
     // strip out the parent name in hierarchy mode
     // turn this off to get full flat names
 
-    if (hierarchy_) {
+    if (hasHierarchy()) {
       //
       // If this is not a hierarchical name, return it
       //
@@ -2054,7 +2054,7 @@ const Net* dbNetwork::highestConnectedNet(Net* net) const
 
 ObjectId dbNetwork::id(const Term* term) const
 {
-  if (hierarchy_) {
+  if (hasHierarchy()) {
     const dbObject* obj = reinterpret_cast<const dbObject*>(term);
     return getDbNwkObjectId(obj);
   }
@@ -3408,7 +3408,7 @@ we can decide whether or not to use the ConcreteNetwork api.
 */
 bool dbNetwork::isConcreteCell(const Cell* cell) const
 {
-  if (!hierarchy_) {
+  if (!hasHierarchy()) {
     return true;
   }
 
@@ -3426,7 +3426,7 @@ void dbNetwork::registerConcretePort(const Port* port)
 
 bool dbNetwork::isConcretePort(const Port* port) const
 {
-  if (!hierarchy_) {
+  if (!hasHierarchy()) {
     return true;
   }
   if (concrete_ports_.find(port) != concrete_ports_.end()) {
@@ -3494,7 +3494,7 @@ int dbNetwork::toIndex(const Port* port) const
 
 bool dbNetwork::hasMembers(const Port* port) const
 {
-  if (hierarchy_) {
+  if (hasHierarchy()) {
     dbMTerm* mterm = nullptr;
     dbBTerm* bterm = nullptr;
     dbModBTerm* modbterm = nullptr;
@@ -3580,7 +3580,7 @@ PortMemberIterator* dbNetwork::memberIterator(const Port* port) const
 {
   // top-level port is concrete port. DbNetworkPortMemberIterator cannot handle
   // it.
-  if (!hierarchy_ || isConcretePort(port)) {
+  if (!hasHierarchy() || isConcretePort(port)) {
     return ConcreteNetwork::memberIterator(port);
   }