odb: Fixed a bug in restoring dbModule::*_hash_

- Previously, dbModules in a child block (not top block) suffers from empty dbModule::*_hash_ containers because the deserialization logic always searches top block even for the child block.
- Corrected the module search logic to find the child blocks correctly

Signed-off-by: Jaehyun Kim <[email protected]>

Author: jhkim-pii

src/odb/src/db/dbBlock.cpp

@@ -950,17 +950,67 @@ dbIStream& operator>>(dbIStream& stream, _dbBlock& block)
     stream >> *block.inst_tbl_;
     stream >> *block.module_tbl_;
   }
+
+  if (db->isSchema(kSchemaDbRemoveHash)) {
+    // Construct dbinst_hash_
+    dbSet<dbInst> insts((dbBlock*) &block, block.inst_tbl_);
+    for (dbInst* obj : insts) {
+      _dbInst* _obj = (_dbInst*) obj;
+      _dbModule* module = nullptr;
+      if (_obj->module_ == 0) {
+        module = block.module_tbl_->getPtr(block.top_module_);
+      } else {
+        module = block.module_tbl_->getPtr(_obj->module_);
+      }
+      if (_obj->name_) {
+        module->dbinst_hash_[_obj->name_] = _obj->getId();
+      }
+    }
+  }
   if (db->isSchema(kSchemaBlockOwnsScanInsts)) {
     stream >> *block.scan_inst_tbl_;
   }
   stream >> *block.modinst_tbl_;
+  if (db->isSchema(kSchemaDbRemoveHash)) {
+    // Construct modinst_hash_
+    dbSet<dbModInst> modinsts((dbBlock*) &block, block.modinst_tbl_);
+    for (dbModInst* obj : modinsts) {
+      _dbModInst* _obj = (_dbModInst*) obj;
+      _dbModule* module = block.module_tbl_->getPtr(_obj->parent_);
+      if (_obj->name_) {
+        module->modinst_hash_[_obj->name_] = _obj->getId();
+      }
+    }
+  }
   if (db->isSchema(kSchemaUpdateHierarchy)) {
     stream >> *block.modbterm_tbl_;
+    if (db->isSchema(kSchemaDbRemoveHash)) {
+      // Construct modbterm_hash_
+      dbSet<dbModBTerm> modbterms((dbBlock*) &block, block.modbterm_tbl_);
+      for (dbModBTerm* obj : modbterms) {
+        _dbModBTerm* _obj = (_dbModBTerm*) obj;
+        _dbModule* module = block.module_tbl_->getPtr(_obj->parent_);
+        if (_obj->name_) {
+          module->modbterm_hash_[_obj->name_] = _obj->getId();
+        }
+      }
+    }
     if (db->isSchema(kSchemaDbRemoveHash)) {
       stream >> *block.busport_tbl_;
     }
     stream >> *block.moditerm_tbl_;
     stream >> *block.modnet_tbl_;
+    if (db->isSchema(db_schema_db_remove_hash)) {
+      // Construct modnet_hash_
+      dbSet<dbModNet> modnets((dbBlock*) &block, block.modnet_tbl_);
+      for (dbModNet* obj : modnets) {
+        _dbModNet* _obj = (_dbModNet*) obj;
+        _dbModule* module = block.module_tbl_->getPtr(_obj->parent_);
+        if (_obj->name_) {
+          module->modnet_hash_[_obj->name_] = _obj->getId();
+        }
+      }
+    }
   }
   stream >> *block.powerdomain_tbl_;
   stream >> *block.logicport_tbl_;

src/odb/src/db/dbInst.cpp

@@ -194,20 +194,20 @@ dbIStream& operator>>(dbIStream& stream, _dbInst& inst)
 
   dbDatabase* db = (dbDatabase*) (inst.getDatabase());
   if (((_dbDatabase*) db)->isSchema(kSchemaDbRemoveHash)) {
-    _dbBlock* block = (_dbBlock*) (db->getChip()->getBlock());
-    _dbModule* module = nullptr;
-    // if the instance has no module parent put in the top module
-    // We sometimes see instances with _module set to 0 (possibly
-    // introduced downstream) so we stick them in the hash for the
-    // top module.
-    if (inst.module_ == 0) {
-      module = (_dbModule*) (((dbBlock*) block)->getTopModule());
-    } else {
-      module = block->module_tbl_->getPtr(inst.module_);
-    }
-    if (inst.name_) {
-      module->dbinst_hash_[inst.name_] = dbId<_dbInst>(inst.getId());
-    }
+    // _dbBlock* block = (_dbBlock*) (db->getChip()->getBlock());
+    // _dbModule* module = nullptr;
+    // // if the instance has no module parent put in the top module
+    // // We sometimes see instances with _module set to 0 (possibly
+    // // introduced downstream) so we stick them in the hash for the
+    // // top module.
+    // if (inst.module_ == 0) {
+    //   module = (_dbModule*) (((dbBlock*) block)->getTopModule());
+    // } else {
+    //   module = block->module_tbl_->getPtr(inst.module_);
+    // }
+    // if (inst.name_) {
+    //   module->dbinst_hash_[inst.name_] = dbId<_dbInst>(inst.getId());
+    // }
   }
   return stream;
 }

src/odb/src/db/dbModBTerm.cpp

@@ -109,12 +109,12 @@ dbIStream& operator>>(dbIStream& stream, _dbModBTerm& obj)
   }
   // User Code Begin >>
   if (obj.getDatabase()->isSchema(kSchemaDbRemoveHash)) {
-    dbDatabase* db = (dbDatabase*) (obj.getDatabase());
-    _dbBlock* block = (_dbBlock*) (db->getChip()->getBlock());
-    _dbModule* module = block->module_tbl_->getPtr(obj.parent_);
-    if (obj.name_) {
-      module->modbterm_hash_[obj.name_] = obj.getId();
-    }
+    // dbDatabase* db = (dbDatabase*) (obj.getDatabase());
+    // _dbBlock* block = (_dbBlock*) (db->getChip()->getBlock());
+    // _dbModule* module = block->module_tbl_->getPtr(obj.parent_);
+    // if (obj.name_) {
+    //   module->modbterm_hash_[obj.name_] = obj.getId();
+    // }
   }
   // User Code End >>
   return stream;

src/odb/src/db/dbModInst.cpp

@@ -107,11 +107,11 @@ dbIStream& operator>>(dbIStream& stream, _dbModInst& obj)
     stream >> obj.moditerms_;
   }
   if (db_->isSchema(kSchemaDbRemoveHash)) {
-    _dbBlock* block = (_dbBlock*) (((dbDatabase*) db_)->getChip()->getBlock());
-    _dbModule* module = block->module_tbl_->getPtr(obj.parent_);
-    if (obj.name_) {
-      module->modinst_hash_[obj.name_] = obj.getId();
-    }
+    // _dbBlock* block = (_dbBlock*) (((dbDatabase*)
+    // db_)->getChip()->getBlock()); _dbModule* module =
+    // block->module_tbl_->getPtr(obj.parent_); if (obj.name_) {
+    //   module->modinst_hash_[obj.name_] = obj.getId();
+    // }
   }
   // User Code End >>
   return stream;

src/odb/src/db/dbModNet.cpp

@@ -108,12 +108,12 @@ dbIStream& operator>>(dbIStream& stream, _dbModNet& obj)
   }
   // User Code Begin >>
   if (obj.getDatabase()->isSchema(kSchemaDbRemoveHash)) {
-    dbDatabase* db = (dbDatabase*) (obj.getDatabase());
-    _dbBlock* block = (_dbBlock*) (db->getChip()->getBlock());
-    _dbModule* module = block->module_tbl_->getPtr(obj.parent_);
-    if (obj.name_) {
-      module->modnet_hash_[obj.name_] = dbId<_dbModNet>(obj.getId());
-    }
+    // dbDatabase* db = (dbDatabase*) (obj.getDatabase());
+    // _dbBlock* block = (_dbBlock*) (db->getChip()->getBlock());
+    // _dbModule* module = block->module_tbl_->getPtr(obj.parent_);
+    // if (obj.name_) {
+    //   module->modnet_hash_[obj.name_] = obj.getId();
+    // }
   }
   // User Code End >>
   return stream;

src/rsz/src/ConcreteSwapArithModules.cc

@@ -261,6 +261,11 @@ bool ConcreteSwapArithModules::doSwapInstances(
         logger_->warn(RSZ, 158, "Module {} has no owner block", old_name);
         continue;
       }
+#include "db_sta/dbSta.hh"
+#include "odb/db.h"
+
+// ...
+
       dbModule* new_master = block->findModule(new_name.c_str());
       if (!new_master) {
         logger_->warn(
@@ -271,6 +276,7 @@ bool ConcreteSwapArithModules::doSwapInstances(
                     inst->getName(),
                     old_name,
                     new_name);
+
       inst->swapMaster(new_master);
       swapped_count++;
     }