odb: clang changes and remove dbChipRegion::destroy

osamahammad21 · osamahammad21 · commit 4a69e9be315b · 2025-08-20T01:49:29.000+03:00
Signed-off-by: osamahammad21 &lt;osama21@aucegypt.edu&gt;
diff --git a/src/odb/include/odb/db.h b/src/odb/include/odb/db.h
@@ -7055,9 +7055,9 @@ class dbChipConn : public dbObject
 
   static dbChipConn* create(const std::string& name,
                             dbChip* parent_chip,
-                            std::vector<dbChipInst*> top_region_path,
+                            const std::vector<dbChipInst*>& top_region_path,
                             dbChipRegionInst* top_region,
-                            std::vector<dbChipInst*> bottom_region_path,
+                            const std::vector<dbChipInst*>& bottom_region_path,
                             dbChipRegionInst* bottom_region);
 
   static void destroy(dbChipConn* chipConn);
@@ -7123,7 +7123,6 @@ class dbChipRegion : public dbObject
                               Side side,
                               dbTechLayer* layer);
 
-  static void destroy(dbChipRegion* chipRegion);
   // User Code End dbChipRegion
 };
 
diff --git a/src/odb/src/db/dbChip.cpp b/src/odb/src/db/dbChip.cpp
@@ -552,11 +552,6 @@ dbChip* dbChip::getChip(dbDatabase* db_, uint dbid_)
 void dbChip::destroy(dbChip* chip_)
 {
   _dbChip* chip = (_dbChip*) chip_;
-  // Destroy chip regions
-  dbSet<dbChipRegion> chipRegions = chip_->getChipRegions();
-  for (dbChipRegion* chipRegion : chipRegions) {
-    dbChipRegion::destroy(chipRegion);
-  }
   // Destroy chip connections
   dbSet<dbChipConn> chipConns = chip_->getChipConns();
   for (dbChipConn* chipConn : chipConns) {
diff --git a/src/odb/src/db/dbChipConn.cpp b/src/odb/src/db/dbChipConn.cpp
@@ -138,8 +138,9 @@ std::vector<dbChipInst*> dbChipConn::getTopRegionPath() const
   _dbChipConn* obj = (_dbChipConn*) this;
   _dbDatabase* _db = (_dbDatabase*) obj->getOwner();
   std::vector<dbChipInst*> top_region_path;
-  for (auto chipinst_id : obj->top_region_path_) {
-    top_region_path.push_back(
+  top_region_path.reserve(obj->top_region_path_.size());
+  for (const auto& chipinst_id : obj->top_region_path_) {
+    top_region_path.emplace_back(
         (dbChipInst*) _db->chip_inst_tbl_->getPtr(chipinst_id));
   }
   return top_region_path;
@@ -150,8 +151,9 @@ std::vector<dbChipInst*> dbChipConn::getBottomRegionPath() const
   _dbChipConn* obj = (_dbChipConn*) this;
   _dbDatabase* _db = (_dbDatabase*) obj->getOwner();
   std::vector<dbChipInst*> bottom_region_path;
-  for (auto chipinst_id : obj->bottom_region_path_) {
-    bottom_region_path.push_back(
+  bottom_region_path.reserve(obj->bottom_region_path_.size());
+  for (const auto& chipinst_id : obj->bottom_region_path_) {
+    bottom_region_path.emplace_back(
         (dbChipInst*) _db->chip_inst_tbl_->getPtr(chipinst_id));
   }
   return bottom_region_path;
@@ -164,6 +166,7 @@ std::vector<dbId<_dbChipInst>> extractChipInstsPath(
   _dbDatabase* _db = (_dbDatabase*) parent_chip->getImpl()->getOwner();
   utl::Logger* logger = _db->getLogger();
   std::vector<dbId<_dbChipInst>> chip_insts_path;
+  chip_insts_path.reserve(chip_insts.size());
   for (auto chipinst : chip_insts) {
     if (chipinst->getParentChip() != parent_chip) {
       logger->error(utl::ODB,
@@ -173,18 +176,19 @@ std::vector<dbId<_dbChipInst>> extractChipInstsPath(
                     chipinst->getName(),
                     parent_chip->getName());
     }
-    chip_insts_path.push_back(chipinst->getImpl()->getOID());
+    chip_insts_path.emplace_back(chipinst->getImpl()->getOID());
     parent_chip = chipinst->getMasterChip();
   }
   return chip_insts_path;
 }
 
-dbChipConn* dbChipConn::create(const std::string& name,
-                               dbChip* parent_chip,
-                               std::vector<dbChipInst*> top_region_path,
-                               dbChipRegionInst* top_region,
-                               std::vector<dbChipInst*> bottom_region_path,
-                               dbChipRegionInst* bottom_region)
+dbChipConn* dbChipConn::create(
+    const std::string& name,
+    dbChip* parent_chip,
+    const std::vector<dbChipInst*>& top_region_path,
+    dbChipRegionInst* top_region,
+    const std::vector<dbChipInst*>& bottom_region_path,
+    dbChipRegionInst* bottom_region)
 {
   _dbDatabase* _db = (_dbDatabase*) top_region->getImpl()->getOwner();
   if (parent_chip == nullptr || top_region_path.empty()
diff --git a/src/odb/src/db/dbChipRegion.cpp b/src/odb/src/db/dbChipRegion.cpp
@@ -16,7 +16,6 @@
 #include "dbChipInst.h"
 #include "dbChipRegionInst.h"
 #include "dbTech.h"
-#include "dbTechLayer.h"
 #include "utl/Logger.h"
 // User Code End Includes
 namespace odb {
@@ -180,48 +179,6 @@ dbChipRegion* dbChipRegion::create(dbChip* chip,
 
   return (dbChipRegion*) chip_region;
 }
-
-void dbChipRegion::destroy(dbChipRegion* chipRegion)
-{
-  if (chipRegion == nullptr) {
-    return;
-  }
-
-  _dbChipRegion* chip_region = (_dbChipRegion*) chipRegion;
-  _dbChip* chip = (_dbChip*) chip_region->getOwner();
-
-  // remove region insts
-  _dbDatabase* _db = (_dbDatabase*) chip->getOwner();
-  for (auto chipinst : ((dbDatabase*) _db)->getChipInsts()) {
-    _dbChipInst* _chipinst = (_dbChipInst*) chipinst;
-    if (_chipinst->master_chip_ != chip->getOID()) {
-      continue;
-    }
-    // iterate over chip_region_insts
-    uint region_inst_id = _chipinst->chip_region_insts_;
-    _dbChipRegionInst* prev_regioninst = nullptr;
-    while (region_inst_id != 0) {
-      _dbChipRegionInst* _regioninst
-          = (_dbChipRegionInst*) _db->chip_region_inst_tbl_->getPtr(
-              region_inst_id);
-      if (_regioninst->region_ == chip_region->getOID()) {
-        if (prev_regioninst == nullptr) {
-          _chipinst->chip_region_insts_ = _regioninst->chip_region_inst_next_;
-          _db->chip_region_inst_tbl_->destroy(_regioninst);
-          break;
-        } else {
-          prev_regioninst->chip_region_inst_next_
-              = _regioninst->chip_region_inst_next_;
-          _db->chip_region_inst_tbl_->destroy(_regioninst);
-          break;
-        }
-      }
-      prev_regioninst = _regioninst;
-      region_inst_id = _regioninst->chip_region_inst_next_;
-    }
-  }
-  chip->chip_region_tbl_->destroy(chip_region);
-}
 // User Code End dbChipRegionPublicMethods
 }  // namespace odb
 // Generator Code End Cpp
diff --git a/src/odb/test/cpp/TestChips.cpp b/src/odb/test/cpp/TestChips.cpp
@@ -195,6 +195,7 @@ BOOST_FIXTURE_TEST_CASE(test_chip_complex_destroy, F_CHIP_HIERARCHY)
   // Clean up remaining instances
   dbChipInst::destroy(memory_inst);
   dbChipInst::destroy(io_inst);
+  BOOST_TEST(db->getChipRegionInsts().size() == 0);
   BOOST_TEST(system_chip->getChipInsts().size() == 0);
 }
 BOOST_FIXTURE_TEST_CASE(test_chip_regions, F_CHIP_HIERARCHY)
@@ -225,16 +226,7 @@ BOOST_FIXTURE_TEST_CASE(test_chip_regions, F_CHIP_HIERARCHY)
   iterateChipRegions(memory_chip, {"R1", "R2", "R3"});
   iterateChipRegionInsts(memory_inst, {"R1", "R2", "R3"});
   iterateChipRegions(io_chip, {"R1"});
-  dbChipRegion::destroy(memory_chip_region_r2);
-  iterateChipRegions(memory_chip, {"R1", "R3"});
-  iterateChipRegionInsts(memory_inst, {"R1", "R3"});
-  dbChipRegion::destroy(memory_chip_region_r1);
-  iterateChipRegions(memory_chip, {"R3"});
-  iterateChipRegionInsts(memory_inst, {"R3"});
-
-  dbChipRegion::create(memory_chip, "R1", dbChipRegion::Side::FRONT, layer_l1);
-  iterateChipRegions(memory_chip, {"R1", "R3"});
-  iterateChipRegionInsts(memory_inst, {"R1", "R3"});
+
   try {
     dbChipRegion::create(cpu_chip, "R1", dbChipRegion::Side::FRONT, layer_l1);
     BOOST_TEST(false);
@@ -253,7 +245,6 @@ BOOST_FIXTURE_TEST_CASE(test_chip_regions, F_CHIP_HIERARCHY)
 
 BOOST_FIXTURE_TEST_CASE(test_chip_conns, F_CHIP_HIERARCHY)
 {
-  dbChipRegion::create(cache_chip, "R1", dbChipRegion::Side::BACK, nullptr);
   dbChipRegionInst* cache_region_inst_r1
       = (dbChipRegionInst*) (*cache_inst->getRegions().begin());
   dbChipRegionInst* memory_region_inst_r1 = nullptr;
