Merge remote-tracking branch 'private/master' into gpl-extend-max-iter-by-routability

gudeh · gudeh · commit 50bc7f2b7ee4 · 2025-07-24T15:53:01.000Z
diff --git a/WORKSPACE b/WORKSPACE
@@ -8,9 +8,9 @@ workspace(name = "openroad")
 
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
-rules_hdl_git_hash = "4bfc8987e521f2002e7b898ba94d3df4c6204913"
+rules_hdl_git_hash = "80266603b55778dd30531c9b286152a7b664fbb7"
 
-rules_hdl_git_sha256 = "227ac0288299f2b0f31a188113cef9f733258398fd616215275bddab1e43d019"
+rules_hdl_git_sha256 = "38f04d38cfbf46c52643325b496673d607ce5ea6fda99dc1dfa3997a520bb0c2"
 
 http_archive(
     name = "rules_hdl",
diff --git a/include/ord/OpenRoad.hh b/include/ord/OpenRoad.hh
@@ -187,6 +187,7 @@ class OpenRoad
                         int bloat_factor,
                         bool bloat_occupied_layers);
 
+  void writeDef(const char* filename, const char* version);
   void writeDef(const char* filename,
                 // major.minor (avoid including defout.h)
                 const string& version);
diff --git a/src/OpenRoad.cc b/src/OpenRoad.cc
@@ -348,6 +348,11 @@ static odb::defout::Version stringToDefVersion(const string& version)
   return odb::defout::Version::DEF_5_8;
 }
 
+void OpenRoad::writeDef(const char* filename, const char* version)
+{
+  writeDef(filename, std::string(version));
+}
+
 void OpenRoad::writeDef(const char* filename, const string& version)
 {
   odb::dbChip* chip = db_->getChip();
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
@@ -89,7 +89,11 @@ messages(
 )
 
 else()
-  message(STATUS "GUI is not enabled")
+  if(BUILD_GUI)
+    message(STATUS "QT5 not found. GUI is disabled")
+  else()
+    message(STATUS "GUI is not enabled")
+  endif()
   add_library(gui 
     src/stub.cpp 
     src/stub_heatMap.cpp
diff --git a/src/gui/src/dbDescriptors.cpp b/src/gui/src/dbDescriptors.cpp
@@ -619,6 +619,11 @@ Descriptor::Properties DbInstDescriptor::getDBProperties(
     props.push_back({"Timing/Power", gui->makeSelected(sta_inst)});
   }
 
+  odb::dbScanInst* scan_inst = inst->getScanInst();
+  if (scan_inst != nullptr) {
+    props.push_back({"Scan Inst", gui->makeSelected(scan_inst)});
+  }
+
   return props;
 }
 
diff --git a/src/odb/include/odb/db.h b/src/odb/include/odb/db.h
@@ -3263,6 +3263,12 @@ class dbInst : public dbObject
   ///
   bool isEndCap() const;
 
+  ///
+  /// Get the scan version of this instance.
+  /// Returns nullptr if this instance has no scan version.
+  ///
+  dbScanInst* getScanInst() const;
+
   void setPinAccessIdx(uint idx);
 
   uint getPinAccessIdx() const;
@@ -8440,6 +8446,8 @@ class dbScanInst : public dbObject
 
   dbInst* getInst() const;
 
+  void insertAtFront(dbScanList* scan_list);
+
   static dbScanInst* create(dbScanList* scan_list, dbInst* inst);
   // User Code End dbScanInst
 };
@@ -8452,9 +8460,8 @@ class dbScanInst : public dbObject
 class dbScanList : public dbObject
 {
  public:
-  dbSet<dbScanInst> getScanInsts() const;
-
   // User Code Begin dbScanList
+  dbSet<dbScanInst> getScanInsts() const;
   dbScanInst* add(dbInst* inst);
   static dbScanList* create(dbScanPartition* scan_partition);
   // User Code End dbScanList
diff --git a/src/odb/include/odb/dbId.h b/src/odb/include/odb/dbId.h
@@ -40,3 +40,17 @@ class dbId
 };
 
 }  // namespace odb
+
+// Enable unordered_map/set usage
+namespace std {
+
+template <typename T>
+struct hash<odb::dbId<T>>
+{
+  std::size_t operator()(const odb::dbId<T>& db_id) const
+  {
+    return std::hash<unsigned int>()(db_id);
+  }
+};
+
+}  // namespace std
diff --git a/src/odb/src/codeGenerator/schema.json b/src/odb/src/codeGenerator/schema.json
@@ -153,6 +153,15 @@
       "reversible": "true",
       "orderReversed": "true",
       "sequential": 0
+    },
+    {
+      "name": "dbScanListScanInstItr",
+      "parentObject": "dbScanInst",
+      "tableName": "scan_inst_tbl",
+      "reversible": "true",
+      "orderReversed": "true",
+      "sequential": 0,
+      "includes": ["dbScanList.h", "dbScanInst.h"]
     }
   ],
   "relations":[
@@ -301,12 +310,6 @@
       "type": "1_n",
       "tbl_name": "scan_lists_"
     },
-    {
-      "parent": "dbScanList",
-      "child": "dbScanInst",
-      "type": "1_n",
-      "tbl_name": "scan_insts_"
-    },
     {
       "parent": "dbDft",
       "child": "dbScanChain",
diff --git a/src/odb/src/codeGenerator/schema/scan/dbScanInst.json b/src/odb/src/codeGenerator/schema/scan/dbScanInst.json
@@ -42,6 +42,18 @@
       "type": "uint",
       "default": "0",
       "flags": ["private"]
+    },
+    {
+      "name": "_next_list_scan_inst",
+      "type": "dbId<_dbScanInst>",
+      "flags": ["private"],
+      "schema":"db_schema_block_owns_scan_insts"
+    },
+    {
+      "name": "_prev_list_scan_inst",
+      "type": "dbId<_dbScanInst>",
+      "flags": ["private"],
+      "schema":"db_schema_block_owns_scan_insts"
     }
   ],
   "enums": [
diff --git a/src/odb/src/codeGenerator/schema/scan/dbScanList.json b/src/odb/src/codeGenerator/schema/scan/dbScanList.json
@@ -9,6 +9,27 @@
     "optimizing the scan chain."],
   "cpp_includes": [
     "dbScanChain.h",
-    "dbScanPartition.h"
+    "dbScanPartition.h",
+    "dbDft.h",
+    "dbScanListScanInstItr.h"],
+  "fields": [
+    {
+      "name": "_unused",
+      "type": "uint",
+      "flags": [
+        "private"
+      ],
+      "default": 0,
+      "comment": "// As the elements of a free dbTable are 12 bytes long, we need this additional member in order to make _dbScanList big enough to allow safe casting between table members.",
+      "schema": "db_schema_block_owns_scan_insts"
+    },
+    {
+      "name": "_first_scan_inst",
+      "type": "dbId<_dbScanInst>",
+      "flags": [
+        "private"
+      ],
+      "schema": "db_schema_block_owns_scan_insts"
+    }
   ]
 }
diff --git a/src/odb/src/db/CMakeLists.txt b/src/odb/src/db/CMakeLists.txt
@@ -161,6 +161,7 @@ add_library(db
     dbModulePortItr.cpp
     dbNetTrackItr.cpp
     dbRegionGroupItr.cpp
+    dbScanListScanInstItr.cpp
     # Generator Code End cpp
 )
 
diff --git a/src/odb/src/db/dbBlock.cpp b/src/odb/src/db/dbBlock.cpp
@@ -91,6 +91,8 @@
 #include "dbSBoxItr.h"
 #include "dbSWire.h"
 #include "dbSWireItr.h"
+#include "dbScanInst.h"
+#include "dbScanListScanInstItr.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
 #include "dbTech.h"
@@ -180,6 +182,9 @@ _dbBlock::_dbBlock(_dbDatabase* db)
   _inst_tbl = new dbTable<_dbInst>(
       db, this, (GetObjTbl_t) &_dbBlock::getObjectTable, dbInstObj);
 
+  _scan_inst_tbl = new dbTable<_dbScanInst>(
+      db, this, (GetObjTbl_t) &_dbBlock::getObjectTable, dbScanInstObj);
+
   _module_tbl = new dbTable<_dbModule>(
       db, this, (GetObjTbl_t) &_dbBlock::getObjectTable, dbModuleObj);
 
@@ -338,6 +343,8 @@ _dbBlock::_dbBlock(_dbDatabase* db)
 
   _inst_iterm_itr = new dbInstITermItr(_iterm_tbl);
 
+  _scan_list_scan_inst_itr = new dbScanListScanInstItr(_scan_inst_tbl);
+
   _box_itr = new dbBoxItr<1024>(_box_tbl, nullptr, false);
 
   _swire_itr = new dbSWireItr(_swire_tbl);
@@ -406,6 +413,7 @@ _dbBlock::~_dbBlock()
   delete _net_tbl;
   delete _inst_hdr_tbl;
   delete _inst_tbl;
+  delete _scan_inst_tbl;
   delete _module_tbl;
   delete _modinst_tbl;
   delete _modbterm_tbl;
@@ -450,6 +458,7 @@ _dbBlock::~_dbBlock()
   delete _net_bterm_itr;
   delete _net_iterm_itr;
   delete _inst_iterm_itr;
+  delete _scan_list_scan_inst_itr;
   delete _box_itr;
   delete _swire_itr;
   delete _sbox_itr;
@@ -785,6 +794,7 @@ dbOStream& operator<<(dbOStream& stream, const _dbBlock& block)
   stream << *block._inst_hdr_tbl;
   stream << *block._module_tbl;
   stream << *block._inst_tbl;
+  stream << *block._scan_inst_tbl;
   stream << *block._modinst_tbl;
   stream << *block._modbterm_tbl;
   stream << *block._busport_tbl;
@@ -836,6 +846,7 @@ dbOStream& operator<<(dbOStream& stream, const _dbBlock& block)
   stream << block._max_layer_for_clock;
   stream << block._bterm_groups;
   stream << block._bterm_top_layer_grid;
+  stream << block._inst_scan_inst_map;
 
   //---------------------------------------------------------- stream out
   // properties
@@ -941,6 +952,9 @@ dbIStream& operator>>(dbIStream& stream, _dbBlock& block)
     stream >> *block._inst_tbl;
     stream >> *block._module_tbl;
   }
+  if (db->isSchema(db_schema_block_owns_scan_insts)) {
+    stream >> *block._scan_inst_tbl;
+  }
   stream >> *block._modinst_tbl;
   if (db->isSchema(db_schema_update_hierarchy)) {
     stream >> *block._modbterm_tbl;
@@ -1011,6 +1025,9 @@ dbIStream& operator>>(dbIStream& stream, _dbBlock& block)
   if (db->isSchema(db_schema_bterm_top_layer_grid)) {
     stream >> block._bterm_top_layer_grid;
   }
+  if (db->isSchema(db_schema_map_insts_to_scan_insts)) {
+    stream >> block._inst_scan_inst_map;
+  }
 
   //---------------------------------------------------------- stream in
   // properties
diff --git a/src/odb/src/db/dbBlock.h b/src/odb/src/db/dbBlock.h
@@ -33,6 +33,8 @@ class _dbITerm;
 class _dbNet;
 class _dbInst;
 class _dbInstHdr;
+class _dbScanInst;
+class dbScanListScanInstItr;
 class _dbWire;
 class _dbVia;
 class _dbGCellGrid;
@@ -200,6 +202,7 @@ class _dbBlock : public _dbObject
   dbTable<_dbNet>* _net_tbl;
   dbTable<_dbInstHdr>* _inst_hdr_tbl;
   dbTable<_dbInst>* _inst_tbl;
+  dbTable<_dbScanInst>* _scan_inst_tbl;
   dbTable<_dbBox, 1024>* _box_tbl;
   dbTable<_dbVia, 1024>* _via_tbl;
   dbTable<_dbGCellGrid>* _gcell_grid_tbl;
@@ -251,6 +254,7 @@ class _dbBlock : public _dbObject
   dbNetBTermItr* _net_bterm_itr;
   dbNetITermItr* _net_iterm_itr;
   dbInstITermItr* _inst_iterm_itr;
+  dbScanListScanInstItr* _scan_list_scan_inst_itr;
   dbBoxItr<1024>* _box_itr;
   dbSWireItr* _swire_itr;
   dbSBoxItr* _sbox_itr;
@@ -283,6 +287,7 @@ class _dbBlock : public _dbObject
 
   std::unordered_map<std::string, int> _module_name_id_map;
   std::unordered_map<std::string, int> _inst_name_id_map;
+  std::unordered_map<dbId<_dbInst>, dbId<_dbScanInst>> _inst_scan_inst_map;
 
   unsigned char _num_ext_dbs;
 
diff --git a/src/odb/src/db/dbDatabase.h b/src/odb/src/db/dbDatabase.h
@@ -43,7 +43,15 @@ namespace odb {
 const uint db_schema_major = 0;  // Not used...
 const uint db_schema_initial = 57;
 
-const uint db_schema_minor = 109;  // Current revision number
+const uint db_schema_minor = 111;  // Current revision number
+
+// Revision where the map which associates instances to their
+// scan version was added
+const uint db_schema_map_insts_to_scan_insts = 111;
+
+// Revision where the ownership of the scan insts was changed
+// from the its scan list to the block
+const uint db_schema_block_owns_scan_insts = 110;
 
 // Revision where is_connect_to_term_ flag was added to dbGuide
 const uint db_schema_guide_connected_to_term = 109;
diff --git a/src/odb/src/db/dbInst.cpp b/src/odb/src/db/dbInst.cpp
@@ -29,6 +29,7 @@
 #include "dbNet.h"
 #include "dbNullIterator.h"
 #include "dbRegion.h"
+#include "dbScanInst.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
 #include "odb/db.h"
@@ -785,6 +786,22 @@ bool dbInst::isEndCap() const
   return getMaster()->isEndCap();
 }
 
+dbScanInst* dbInst::getScanInst() const
+{
+  _dbInst* inst = (_dbInst*) this;
+  _dbBlock* block = (_dbBlock*) inst->getOwner();
+  auto itr = block->_inst_scan_inst_map.find(inst->getId());
+
+  if (itr == block->_inst_scan_inst_map.end()) {
+    return nullptr;
+  }
+
+  dbId<_dbScanInst> scan_inst_id = itr->second;
+  _dbScanInst* scan_inst = block->_scan_inst_tbl->getPtr(scan_inst_id);
+
+  return (dbScanInst*) scan_inst;
+}
+
 dbSet<dbITerm> dbInst::getITerms()
 {
   _dbInst* inst = (_dbInst*) this;
@@ -1411,6 +1428,15 @@ void dbInst::destroy(dbInst* inst_)
                              inst->_name);
   }
 
+  dbScanInst* scan_inst = inst_->getScanInst();
+  if (scan_inst) {
+    inst->getLogger()->error(
+        utl::ODB,
+        505,
+        "Attempt to destroy instance {} with an associated scan inst.",
+        inst->_name);
+  }
+
   uint i;
   uint n = inst->_iterms.size();
 
diff --git a/src/odb/src/db/dbScanInst.cpp b/src/odb/src/db/dbScanInst.cpp
diff --git a/src/odb/src/db/dbScanInst.h b/src/odb/src/db/dbScanInst.h
diff --git a/src/odb/src/db/dbScanList.cpp b/src/odb/src/db/dbScanList.cpp
diff --git a/src/odb/src/db/dbScanList.h b/src/odb/src/db/dbScanList.h
diff --git a/src/odb/src/db/dbScanListScanInstItr.cpp b/src/odb/src/db/dbScanListScanInstItr.cpp
diff --git a/src/odb/src/db/dbScanListScanInstItr.h b/src/odb/src/db/dbScanListScanInstItr.h
diff --git a/src/odb/src/defin/definReader.cpp b/src/odb/src/defin/definReader.cpp

Original file line number	Diff line number	Diff line change
`@@ -348,6 +348,11 @@ static odb::defout::Version stringToDefVersion(const string& version)`
`348`	`348`	`return odb::defout::Version::DEF_5_8;`
`349`	`349`	`}`
`350`	`350`
	`351`	`+void OpenRoad::writeDef(const char* filename, const char* version)`
	`352`	`+{`
	`353`	`+ writeDef(filename, std::string(version));`
	`354`	`+}`
	`355`	`+`
`351`	`356`	`void OpenRoad::writeDef(const char* filename, const string& version)`
`352`	`357`	`{`
`353`	`358`	`odb::dbChip* chip = db_->getChip();`
Original file line number	Diff line number	Diff line change
`@@ -619,6 +619,11 @@ Descriptor::Properties DbInstDescriptor::getDBProperties(`
`619`	`619`	`props.push_back({"Timing/Power", gui->makeSelected(sta_inst)});`
`620`	`620`	`}`
`621`	`621`
	`622`	`+ odb::dbScanInst* scan_inst = inst->getScanInst();`
	`623`	`+ if (scan_inst != nullptr) {`
	`624`	`+ props.push_back({"Scan Inst", gui->makeSelected(scan_inst)});`
	`625`	`+ }`
	`626`	`+`
`622`	`627`	`return props;`
`623`	`628`	`}`
`624`	`629`