merged in latest master

Signed-off-by: andyfox-rushc <[email protected]>
andyfox-rushc · Oct 14, 2024 · 3e13f9a · 3e13f9a
2 parents fc26a76 + e6735ce
commit 3e13f9a
Show file tree

Hide file tree

Showing 129 changed files with 2,084 additions and 850 deletions.
diff --git a/default.nix b/default.nix
@@ -67,6 +67,7 @@
   # or-tools
   stdenv,
   overrideSDK,
+  git,
 }: let
   or-tools' =
     (or-tools.override {
@@ -102,6 +103,10 @@
       patchShebangs .
     '';
 
+    shellHook = ''
+      alias ord-format-changed="${git}/bin/git diff --name-only | grep -E '\.(cpp|cc|c|h|hh)$' | xargs clang-format -i -style=file:.clang-format"; 
+    '';
+
     qt5Libs = [
       libsForQt5.qt5.qtbase
       libsForQt5.qt5.qtcharts

diff --git a/src/dbSta/src/dbNetwork.cc b/src/dbSta/src/dbNetwork.cc
@@ -848,23 +848,19 @@ Instance* dbNetwork::parent(const Instance* instance) const
   staToDb(instance, db_inst, mod_inst);
   if (mod_inst) {
     auto parent_module = mod_inst->getParent();
-    if (parent_module){
-      if (auto parent_inst = parent_module->getModInst()) {
-        if (parent_inst){
-          return dbToSta(parent_inst);
-        }
-    }
+    if (parent_module) {
+      auto parent_inst = parent_module->getModInst();
+      if (parent_inst) {
+        return dbToSta(parent_inst);
+      }
     }
   }
-  if (hierarchy_){
-    if (db_inst) {
-      auto parent_module = db_inst->getModule();
-      if (parent_module){
-        if (auto parent_inst = parent_module->getModInst()) {
-          if (parent_inst){
-            return dbToSta(parent_inst);
-          }
-        }
+  if (db_inst) {
+    auto parent_module = db_inst->getModule();
+    if (parent_module) {
+      auto parent_inst = parent_module->getModInst();
+      if (parent_inst) {
+        return dbToSta(parent_inst);
       }
     }
   }

diff --git a/src/dft/src/dft.tcl b/src/dft/src/dft.tcl
@@ -99,7 +99,7 @@ proc set_dft_config { args } {
 }
 
 sta::define_cmd_args "report_dft_config" { }
-proc report_dft_config { } {
+proc report_dft_config { args } {
   sta::parse_key_args "report_dft_config" args keys {} flags {}
   dft::report_dft_config
 }
diff --git a/src/drt/src/db/obj/frBlock.h b/src/drt/src/db/obj/frBlock.h
@@ -286,6 +286,14 @@ class frBlock : public frBlockObject
     }
     return Point(idxX, idxY);
   }
+  bool isValidGCellIdx(const Point& pt) const
+  {
+    const auto& gp = getGCellPatterns();
+    const auto& xgp = gp[0];
+    const auto& ygp = gp[1];
+    return pt.x() >= 0 && pt.x() < xgp.getCount() && pt.y() >= 0
+           && pt.y() < ygp.getCount();
+  }
   const frList<std::unique_ptr<frMarker>>& getMarkers() const
   {
     return markers_;