required changes

Signed-off-by: osamahammad21 <[email protected]>

Author: osamahammad21

src/odb/include/odb/db.h

@@ -7133,6 +7133,8 @@ class dbChipInst : public dbObject
 
   dbSet<dbChipRegionInst> getRegions() const;
 
+  dbChipRegionInst* findChipRegionInst(dbChipRegion* chip_region) const;
+
   dbChipRegionInst* findChipRegionInst(const std::string& name) const;
 
   static odb::dbChipInst* create(dbChip* parent_chip,

src/odb/src/codeGenerator/schema/chip/dbChipInst.json

@@ -42,8 +42,8 @@
     },
     {
       "name":"region_insts_map_",
-      "type":"std::unordered_map<std::string, dbId<_dbChipRegionInst>>",
-      "flags":["private", "no-serial"]
+      "type":"std::unordered_map<dbId<_dbChipRegion>, dbId<_dbChipRegionInst>>",
+      "flags":["private", "no-serial", "no-template"]
     }
   ],
   "h_includes": [

src/odb/src/db/dbChipInst.cpp

@@ -162,17 +162,26 @@ dbSet<dbChipRegionInst> dbChipInst::getRegions() const
   return dbSet<dbChipRegionInst>(_chipinst, _db->chip_region_inst_itr_);
 }
 
-dbChipRegionInst* dbChipInst::findChipRegionInst(const std::string& name) const
+dbChipRegionInst* dbChipInst::findChipRegionInst(
+    dbChipRegion* chip_region) const
 {
+  if (chip_region == nullptr) {
+    return nullptr;
+  }
   _dbChipInst* obj = (_dbChipInst*) this;
-  auto it = obj->region_insts_map_.find(name);
+  auto it = obj->region_insts_map_.find(chip_region->getId());
   if (it != obj->region_insts_map_.end()) {
     auto db = (_dbDatabase*) obj->getOwner();
     return (dbChipRegionInst*) db->chip_region_inst_tbl_->getPtr((*it).second);
   }
   return nullptr;
 }
 
+dbChipRegionInst* dbChipInst::findChipRegionInst(const std::string& name) const
+{
+  return findChipRegionInst(getMasterChip()->findChipRegion(name));
+}
+
 dbChipInst* dbChipInst::create(dbChip* parent_chip,
                                dbChip* master_chip,
                                const std::string& name)
@@ -226,7 +235,7 @@ dbChipInst* dbChipInst::create(dbChip* parent_chip,
     regioninst->parent_chipinst_ = chipinst->getOID();
     regioninst->chip_region_inst_next_ = chipinst->chip_region_insts_;
     chipinst->chip_region_insts_ = regioninst->getOID();
-    chipinst->region_insts_map_[region->getName()] = regioninst->getOID();
+    chipinst->region_insts_map_[region->getId()] = regioninst->getOID();
     // create chipBumpInsts
     for (auto bump : region->getChipBumps()) {
       _dbChipBumpInst* bumpinst = db->chip_bump_inst_tbl_->create();

src/odb/src/db/dbChipInst.h

@@ -18,6 +18,9 @@ class dbOStream;
 class _dbDatabase;
 class _dbChip;
 class _dbChipRegionInst;
+// User Code Begin Classes
+class _dbChipRegion;
+// User Code End Classes
 
 class _dbChipInst : public _dbObject
 {
@@ -36,7 +39,8 @@ class _dbChipInst : public _dbObject
   dbId<_dbChip> parent_chip_;
   dbId<_dbChipInst> chipinst_next_;
   dbId<_dbChipRegionInst> chip_region_insts_;
-  std::unordered_map<std::string, dbId<_dbChipRegionInst>> region_insts_map_;
+  std::unordered_map<dbId<_dbChipRegion>, dbId<_dbChipRegionInst>>
+      region_insts_map_;
 };
 dbIStream& operator>>(dbIStream& stream, _dbChipInst& obj);
 dbOStream& operator<<(dbOStream& stream, const _dbChipInst& obj);

src/odb/src/db/dbDatabase.cpp

@@ -311,7 +311,7 @@ dbIStream& operator>>(dbIStream& stream, _dbDatabase& obj)
   // Set the region_insts_map_ of the chipinst
   for (const auto& chip_region_inst : db->getChipRegionInsts()) {
     _dbChipInst* chipinst = (_dbChipInst*) chip_region_inst->getChipInst();
-    chipinst->region_insts_map_[chip_region_inst->getChipRegion()->getName()]
+    chipinst->region_insts_map_[chip_region_inst->getId()]
         = chip_region_inst->getId();
   }
   // User Code End >>