fixed merge conflict

Signed-off-by: Cho Moon <[email protected]>

Author: precisionmoon

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

@@ -21,7 +21,7 @@ jobs:
           build_dir: "./build"
           cmake_command: cmake . -B build
           config_file: ".clang-tidy"
-          exclude: "*/codeGenerator/templates/*,*/third-party/*"
+          exclude: "*/codeGenerator/templates/*,third-party/*,test/orfs/*"
           split_workflow: true
           apt_packages: libomp-15-dev,libfl-dev,libyaml-cpp-dev
       - uses: The-OpenROAD-Project/clang-tidy-review/upload@master

MODULE.bazel

@@ -162,7 +162,7 @@ bazel_dep(name = "bazel-orfs")
 # To bump version, run: bazelisk run @bazel-orfs//:bump
 git_override(
     module_name = "bazel-orfs",
-    commit = "06be7f48c85f3e66e4a79205a68ae2170be88273",
+    commit = "60f7488a0480dc8f17aba1d28da18f0b3e777f73",
     remote = "https://github.com/The-OpenROAD-Project/bazel-orfs.git",
 )
 
@@ -171,10 +171,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-4230-g26b521c49",
+    image = "docker.io/openroad/orfs:v3.0-4324-g16e8a645e",
     # Use OpenROAD of this repo instead of from the docker image
     openroad = "//:openroad",
-    sha256 = "8fc7ac130828053d7f0a9ad93ae8e3a74e9b24be6e76f9900f809ff93a80d005",
+    sha256 = "675813db8a9fbfd08bc86e40675c2a376fc3461b59cbf22d96a2f1905dbb4519",
 )
 use_repo(orfs, "com_github_nixos_patchelf_download")
 use_repo(orfs, "docker_orfs")

MODULE.bazel.lock

@@ -337,6 +337,11 @@ class dbNetwork : public ConcreteNetwork
 
   bool hasPort(const Net* net) const;
 
+  // Return the highest net above the given net.
+  // - If the net is a flat net, return it.
+  // - If the net is a hier net, return the modnet in the highest hierarchy.
+  Net* highestNetAbove(Net* net) const override;
+
   ////////////////////////////////////////////////////////////////
   // Edit functions
   Instance* makeInstance(LibertyCell* cell,

src/dbSta/include/db_sta/dbNetwork.hh

@@ -4056,11 +4056,9 @@ class PinModDbNetConnection : public PinVisitor
                         Logger* logger,
                         const Net* net_to_search);
   void operator()(const Pin* pin) override;
-  const std::set<dbModNet*>& getModNets() const { return modnets_; }
   dbNet* getNet() const { return dbnet_; }
 
  private:
-  std::set<dbModNet*> modnets_;
   dbNet* dbnet_;
   Logger* logger_ = nullptr;
   bool db_net_search_ = false;
@@ -4092,14 +4090,6 @@ void PinModDbNetConnection::operator()(const Pin* pin)
 
   db_network_->staToDb(pin, iterm, bterm, moditerm);
 
-  if (iterm && iterm->getModNet()) {
-    modnets_.insert(iterm->getModNet());
-  } else if (bterm && bterm->getModNet()) {
-    modnets_.insert(bterm->getModNet());
-  } else if (moditerm && moditerm->getModNet()) {
-    modnets_.insert(moditerm->getModNet());
-  }
-
   dbNet* candidate_flat_net = db_network_->flatNet(pin);
   if (candidate_flat_net) {
     //
@@ -5024,4 +5014,36 @@ bool dbNetwork::isPGSupply(dbNet* net) const
   return net->isSpecial() && net->getSigType().isSupply();
 }
 
+Net* dbNetwork::highestNetAbove(Net* net) const
+{
+  if (net == nullptr) {
+    return nullptr;
+  }
+
+  dbNet* dbnet;
+  dbModNet* modnet;
+  staToDb(net, dbnet, modnet);
+
+  if (dbnet) {
+    // If a flat net, return it.
+    // - We should not return the highest modnet related to the flat net.
+    // - Otherwise, it breaks estimate_parasitics function.
+    //   . est module uses flat nets for parasitic estimation
+    //   . It has (highestNetAbove(flat_net) != flat_net) comparison.
+    //   . If highestNetAbove(flat_net) returns the highest modnet, it
+    //     changes the estimate_parasitics behavior.
+    return net;
+  }
+
+  if (modnet) {
+    if (dbNet* related_dbnet = modnet->findRelatedNet()) {
+      if (dbModNet* highest_modnet = related_dbnet->findModNetInHighestHier()) {
+        return dbToSta(highest_modnet);  // Found the highest modnet
+      }
+    }
+  }
+
+  return net;
+}
+
 }  // namespace sta

src/dbSta/src/dbNetwork.cc

@@ -5,6 +5,7 @@
 #include <cstdio>
 #include <string>
 
+#include "db_sta/dbNetwork.hh"
 #include "gtest/gtest.h"
 #include "odb/db.h"
 #include "sta/NetworkClass.hh"
@@ -22,7 +23,7 @@ class TestDbSta : public tst::IntegratedFixture
   }
 };
 
-TEST_F(TestDbSta, TestIsConnected)
+TEST_F(TestDbSta, TestHierarchyConnectivity)
 {
   std::string test_name = "TestDbSta_0";
   readVerilogAndSetup(test_name + ".v");
@@ -59,6 +60,41 @@ TEST_F(TestDbSta, TestIsConnected)
 
   bool_return = db_network_->isConnected(sta_net, sta_modnet);
   ASSERT_TRUE(bool_return);
+
+  // Check Network::highestNetAbove(Net* net)
+  odb::dbNet* dbnet_out2 = block_->findNet("out2");
+  ASSERT_NE(dbnet_out2, nullptr);
+  Net* sta_dbnet_out2 = db_network_->dbToSta(dbnet_out2);
+  ASSERT_NE(sta_dbnet_out2, nullptr);
+  Net* sta_highest_net = db_network_->highestNetAbove(sta_dbnet_out2);
+  ASSERT_EQ(sta_highest_net, sta_dbnet_out2);
+
+  odb::dbModNet* modnet_mod_out = block_->findModNet("sub_inst/mod_out");
+  ASSERT_NE(modnet_mod_out, nullptr);
+  Net* sta_modnet_mod_out = db_network_->dbToSta(modnet_mod_out);
+  ASSERT_NE(sta_modnet_mod_out, nullptr);
+  odb::dbModNet* modnet_out2 = block_->findModNet("out2");
+  ASSERT_NE(modnet_out2, nullptr);
+  Net* sta_modnet_out2 = db_network_->dbToSta(modnet_out2);
+  ASSERT_NE(sta_modnet_out2, nullptr);
+  Net* sta_highest_modnet_out
+      = db_network_->highestNetAbove(sta_modnet_mod_out);
+  ASSERT_EQ(sta_highest_modnet_out, sta_modnet_out2);
+
+  // Check get_ports -of_object Net*
+  NetTermIterator* term_iter = db_network_->termIterator(sta_dbnet_out2);
+  while (term_iter->hasNext()) {
+    Term* term = term_iter->next();
+    Pin* pin = db_network_->pin(term);
+    Port* port = db_network_->port(pin);
+    ASSERT_EQ(db_network_->name(port), block_->findBTerm("out2")->getName());
+  }
+
+  // Check dbBTerm::getITerm()
+  odb::dbBTerm* bterm_clk = block_->findBTerm("in1");
+  ASSERT_NE(bterm_clk, nullptr);
+  // There is no related dbITerm for a dbBTerm
+  ASSERT_EQ(bterm_clk->getITerm(), nullptr);
 }
 
 }  // namespace sta

src/dbSta/test/cpp/TestDbSta.cc

@@ -438,6 +438,16 @@ void EstimateParasitics::updateParasitics(bool save_guides)
       break;
   }
 
+  // Router calls into the timer. This means the timer could be caching
+  // delays calculated in the interim period before we had put new parasitic
+  // annotations on the nets affected by a network edit. We need to explicitly
+  // invalidate those delays. Do it in bulk instead of interleaving with each
+  // groute call.
+  if (parasitics_src_ != ParasiticsSrc::none) {
+    for (const Net* net : parasitics_invalid_) {
+      sta_->delaysInvalidFromFanin(net);
+    }
+  }
   parasitics_invalid_.clear();
 }
 

src/est/src/EstimateParasitics.cpp

@@ -1452,10 +1452,8 @@ void NesterovBaseCommon::updateDbGCells()
   if (db_cbk_) {
     db_cbk_->removeOwner();
   }
-  assert(omp_get_thread_num() == 0);
-#pragma omp parallel for num_threads(num_threads_)
-  for (auto it = getGCells().begin(); it < getGCells().end(); ++it) {
-    auto& gCell = *it;  // old-style loop for old OpenMP
+
+  for (auto& gCell : getGCells()) {
     if (gCell->isInstance()) {
       for (Instance* inst : gCell->insts()) {
         odb::dbInst* db_inst = inst->dbInst();
@@ -1468,6 +1466,7 @@ void NesterovBaseCommon::updateDbGCells()
       }
     }
   }
+
   if (db_cbk_) {
     db_cbk_->addOwner(pbc_->db()->getChip()->getBlock());
   }

src/gpl/src/nesterovBase.cpp

@@ -79,14 +79,14 @@ Iteration | Overflow |     HPWL (um) |  HPWL(%) |   Penalty | Group
 [INFO GPL-0065] TotalRouteOverflowV2: 0.0000
 [INFO GPL-0066] OverflowTileCnt2: 0
 [INFO GPL-0067] 0.5%RC: 0.9733
-[INFO GPL-0068] 1.0%RC: 0.9407
-[INFO GPL-0069] 2.0%RC: 0.8615
-[INFO GPL-0070] 5.0%RC: 0.7035
+[INFO GPL-0068] 1.0%RC: 0.9481
+[INFO GPL-0069] 2.0%RC: 0.8652
+[INFO GPL-0070] 5.0%RC: 0.6905
 [INFO GPL-0071] 0.5rcK: 1.00
 [INFO GPL-0072] 1.0rcK: 1.00
 [INFO GPL-0073] 2.0rcK: 0.00
 [INFO GPL-0074] 5.0rcK: 0.00
-[INFO GPL-0075] Final routing congestion: 0.95703703
+[INFO GPL-0075] Final routing congestion: 0.96074075
 [INFO GPL-0050] Weighted routing congestion is lower than target routing congestion(1.2500), end routability optimization.
 [INFO GPL-0090] Routability finished. Target routing congestion achieved succesfully.
 Iteration | Overflow |     HPWL (um) |  HPWL(%) |   Penalty | Group
@@ -103,7 +103,7 @@ Iteration | Overflow |     HPWL (um) |  HPWL(%) |   Penalty | Group
 [INFO GPL-1001] Global placement finished at iteration 355
 [INFO GPL-1003] Routability mode iteration count: 64
 [INFO GPL-0039] Number of routing layers: 0
-[INFO GPL-1005] Routability final weighted congestion: 0.4408
+[INFO GPL-1005] Routability final weighted congestion: 0.4360
 [INFO GPL-1002] Placed Cell Area              619.7347
 [INFO GPL-1003] Available Free Area           953.8760
 [INFO GPL-1004] Minimum Feasible Density        0.6500 (cell_area / free_area)

src/gpl/test/simple01-rd.ok

@@ -79,14 +79,14 @@ Iteration | Overflow |     HPWL (um) |  HPWL(%) |   Penalty | Group
 [INFO GPL-0065] TotalRouteOverflowV2: 0.0000
 [INFO GPL-0066] OverflowTileCnt2: 0
 [INFO GPL-0067] 0.5%RC: 0.9733
-[INFO GPL-0068] 1.0%RC: 0.9407
-[INFO GPL-0069] 2.0%RC: 0.8615
-[INFO GPL-0070] 5.0%RC: 0.7035
+[INFO GPL-0068] 1.0%RC: 0.9481
+[INFO GPL-0069] 2.0%RC: 0.8652
+[INFO GPL-0070] 5.0%RC: 0.6905
 [INFO GPL-0071] 0.5rcK: 1.00
 [INFO GPL-0072] 1.0rcK: 1.00
 [INFO GPL-0073] 2.0rcK: 0.00
 [INFO GPL-0074] 5.0rcK: 0.00
-[INFO GPL-0075] Final routing congestion: 0.95703703
+[INFO GPL-0075] Final routing congestion: 0.96074075
 [INFO GPL-0050] Weighted routing congestion is lower than target routing congestion(1.0000), end routability optimization.
 [INFO GPL-0090] Routability finished. Target routing congestion achieved succesfully.
 Iteration | Overflow |     HPWL (um) |  HPWL(%) |   Penalty | Group
@@ -103,7 +103,7 @@ Iteration | Overflow |     HPWL (um) |  HPWL(%) |   Penalty | Group
 [INFO GPL-1001] Global placement finished at iteration 355
 [INFO GPL-1003] Routability mode iteration count: 64
 [INFO GPL-0039] Number of routing layers: 0
-[INFO GPL-1005] Routability final weighted congestion: 0.4408
+[INFO GPL-1005] Routability final weighted congestion: 0.4360
 [INFO GPL-1002] Placed Cell Area              619.7347
 [INFO GPL-1003] Available Free Area           953.8760
 [INFO GPL-1004] Minimum Feasible Density        0.6500 (cell_area / free_area)