odb: Code clean-up

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

Author: jhkim-pii

src/odb/src/db/dbBlock.cpp

@@ -950,7 +950,6 @@ 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_);

src/odb/src/db/dbInst.cpp

@@ -191,24 +191,6 @@ dbIStream& operator>>(dbIStream& stream, _dbInst& inst)
   stream >> inst.iterms_;
   stream >> inst.halo_;
   stream >> inst.pin_access_idx_;
-
-  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());
-    // }
-  }
   return stream;
 }
 

src/odb/src/db/dbModBTerm.cpp

@@ -107,16 +107,6 @@ dbIStream& operator>>(dbIStream& stream, _dbModBTerm& obj)
   if (obj.getDatabase()->isSchema(kSchemaHierPortRemoval)) {
     stream >> obj.prev_entry_;
   }
-  // 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();
-    // }
-  }
-  // User Code End >>
   return stream;
 }
 

src/odb/src/db/dbModInst.cpp

@@ -106,14 +106,6 @@ dbIStream& operator>>(dbIStream& stream, _dbModInst& obj)
   if (db_->isSchema(kSchemaUpdateHierarchy)) {
     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();
-    // }
-  }
-  // User Code End >>
   return stream;
 }
 

src/odb/src/db/dbModNet.cpp

@@ -106,16 +106,6 @@ dbIStream& operator>>(dbIStream& stream, _dbModNet& obj)
   if (obj.getDatabase()->isSchema(kSchemaUpdateHierarchy)) {
     stream >> obj.bterms_;
   }
-  // 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_] = obj.getId();
-    // }
-  }
-  // User Code End >>
   return stream;
 }
 

src/rsz/src/ConcreteSwapArithModules.cc

@@ -261,11 +261,6 @@ 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(
@@ -276,7 +271,6 @@ bool ConcreteSwapArithModules::doSwapInstances(
                     inst->getName(),
                     old_name,
                     new_name);
-
       inst->swapMaster(new_master);
       swapped_count++;
     }