odb: rename dbUnfoldedBumpInst -> dbUnfoldedChipBumpInst

Signed-off-by: osamahammad21 <osama@precisioninno.com>

Author: osamahammad21

src/odb/include/odb/db.h

@@ -178,7 +178,7 @@ class dbTechLayerTwoWiresForbiddenSpcRule;
 class dbTechLayerVoltageSpacing;
 class dbTechLayerWidthTableRule;
 class dbTechLayerWrongDirSpacingRule;
-class dbUnfoldedBumpInst;
+class dbUnfoldedChipBumpInst;
 class dbUnfoldedChipInst;
 class dbUnfoldedChipNet;
 class dbUnfoldedChipRegionInst;
@@ -7627,7 +7627,7 @@ class dbDatabase : public dbObject
 
   dbSet<dbUnfoldedChipRegionInst> getUnfoldedChipRegionInsts() const;
 
-  dbSet<dbUnfoldedBumpInst> getUnfoldedBumpInsts() const;
+  dbSet<dbUnfoldedChipBumpInst> getUnfoldedChipBumpInsts() const;
 
   dbSet<dbUnfoldedConn> getUnfoldedConns() const;
 
@@ -11410,16 +11410,16 @@ class dbTechLayerWrongDirSpacingRule : public dbObject
   // User Code End dbTechLayerWrongDirSpacingRule
 };
 
-class dbUnfoldedBumpInst : public dbObject
+class dbUnfoldedChipBumpInst : public dbObject
 {
  public:
   dbChipBumpInst* getChipBumpInst() const;
 
   dbUnfoldedChipRegionInst* getParentRegion() const;
 
-  // User Code Begin dbUnfoldedBumpInst
+  // User Code Begin dbUnfoldedChipBumpInst
   Point3D getGlobalPosition() const;
-  // User Code End dbUnfoldedBumpInst
+  // User Code End dbUnfoldedChipBumpInst
 };
 
 class dbUnfoldedChipInst : public dbObject
@@ -11454,7 +11454,7 @@ class dbUnfoldedChipNet : public dbObject
   dbChipNet* getChipNet() const;
 
   // User Code Begin dbUnfoldedChipNet
-  std::vector<dbUnfoldedBumpInst*> getConnectedBumps() const;
+  std::vector<dbUnfoldedChipBumpInst*> getConnectedBumps() const;
   // User Code End dbUnfoldedChipNet
 };
 
@@ -11486,7 +11486,7 @@ class dbUnfoldedChipRegionInst : public dbObject
 
   int getSurfaceZ() const;
 
-  dbSet<dbUnfoldedBumpInst> getBumps() const;
+  dbSet<dbUnfoldedChipBumpInst> getBumps() const;
   // User Code End dbUnfoldedChipRegionInst
 };
 

src/odb/include/odb/dbCompare.inc

@@ -820,10 +820,10 @@ struct less<odb::dbTechLayerWrongDirSpacingRule*>
 };
 
 template <>
-struct less<odb::dbUnfoldedBumpInst*>
+struct less<odb::dbUnfoldedChipBumpInst*>
 {
-  bool operator()(const odb::dbUnfoldedBumpInst* lhs,
-                  const odb::dbUnfoldedBumpInst* rhs) const
+  bool operator()(const odb::dbUnfoldedChipBumpInst* lhs,
+                  const odb::dbUnfoldedChipBumpInst* rhs) const
       = delete;
 };
 

src/odb/include/odb/dbObject.h

@@ -127,7 +127,7 @@ enum dbObjectType
   dbTechLayerVoltageSpacingObj,
   dbTechLayerWidthTableRuleObj,
   dbTechLayerWrongDirSpacingRuleObj,
-  dbUnfoldedBumpInstObj,
+  dbUnfoldedChipBumpInstObj,
   dbUnfoldedChipInstObj,
   dbUnfoldedChipNetObj,
   dbUnfoldedChipRegionInstObj,

src/odb/src/3dblox/checker.cpp

@@ -455,7 +455,7 @@ void Checker::checkBumpPhysicalAlignment(dbMarkerCategory* top_cat)
   int violation_count = 0;
   for (dbUnfoldedChipInst* chip : db_->getUnfoldedChipInsts()) {
     for (dbUnfoldedChipRegionInst* region : chip->getRegions()) {
-      for (dbUnfoldedBumpInst* bump : region->getBumps()) {
+      for (dbUnfoldedChipBumpInst* bump : region->getBumps()) {
         const Point3D p = bump->getGlobalPosition();
         if (!region->getCuboid().getEnclosingRect().intersects(
                 {p.x(), p.y()})) {
@@ -607,14 +607,14 @@ void Checker::checkAlignmentMarkers(dbMarkerCategory* top_cat)
 
 void Checker::checkLogicalConnectivity(dbMarkerCategory* top_cat)
 {
-  std::unordered_map<dbUnfoldedBumpInst*, dbUnfoldedChipNet*> bump_net_map;
+  std::unordered_map<dbUnfoldedChipBumpInst*, dbUnfoldedChipNet*> bump_net_map;
   for (dbUnfoldedChipNet* net : db_->getUnfoldedChipNets()) {
-    for (dbUnfoldedBumpInst* bump : net->getConnectedBumps()) {
+    for (dbUnfoldedChipBumpInst* bump : net->getConnectedBumps()) {
       bump_net_map[bump] = net;
     }
   }
 
-  auto get_net_name = [&](dbUnfoldedBumpInst* bump) -> std::string {
+  auto get_net_name = [&](dbUnfoldedChipBumpInst* bump) -> std::string {
     auto it = bump_net_map.find(bump);
     if (it != bump_net_map.end()) {
       return it->second->getChipNet()->getName();
@@ -633,20 +633,20 @@ void Checker::checkLogicalConnectivity(dbMarkerCategory* top_cat)
       continue;
     }
 
-    std::map<Point, dbUnfoldedBumpInst*> bot_bumps;
-    for (dbUnfoldedBumpInst* bump : bot_region->getBumps()) {
+    std::map<Point, dbUnfoldedChipBumpInst*> bot_bumps;
+    for (dbUnfoldedChipBumpInst* bump : bot_region->getBumps()) {
       const Point3D pos = bump->getGlobalPosition();
       bot_bumps[Point(pos.x(), pos.y())] = bump;
     }
 
-    for (dbUnfoldedBumpInst* top_bump : top_region->getBumps()) {
+    for (dbUnfoldedChipBumpInst* top_bump : top_region->getBumps()) {
       const Point3D top_pos = top_bump->getGlobalPosition();
       const Point p(top_pos.x(), top_pos.y());
       auto it = bot_bumps.find(p);
       if (it == bot_bumps.end()) {
         continue;
       }
-      dbUnfoldedBumpInst* bot_bump = it->second;
+      dbUnfoldedChipBumpInst* bot_bump = it->second;
 
       // Check logical connectivity
       auto top_net_it = bump_net_map.find(top_bump);

src/odb/src/codeGenerator/schema.json

@@ -220,13 +220,13 @@
       "includes": ["dbUnfoldedChipRegionInst.h", "dbUnfoldedChipInst.h"]
     },
     {
-      "name": "dbUnfoldedBumpInstItr",
-      "parentObject": "dbUnfoldedBumpInst",
+      "name": "dbUnfoldedChipBumpInstItr",
+      "parentObject": "dbUnfoldedChipBumpInst",
       "tableName": "unfolded_bump_inst_tbl",
       "reversible": "true",
       "orderReversed": "true",
       "sequential": 0,
-      "includes": ["dbUnfoldedBumpInst.h", "dbUnfoldedChipRegionInst.h"]
+      "includes": ["dbUnfoldedChipBumpInst.h", "dbUnfoldedChipRegionInst.h"]
     }
   ],
   "relations":[
@@ -579,7 +579,7 @@
     },
     {
       "parent":"dbDatabase",
-      "child":"dbUnfoldedBumpInst",
+      "child":"dbUnfoldedChipBumpInst",
       "type":"1_n",
       "tbl_name":"unfolded_bump_inst_tbl_",
       "flags": ["no-serial"]

…ator/schema/chip/dbUnfoldedBumpInst.json …/schema/chip/dbUnfoldedChipBumpInst.jsonsrc/odb/src/codeGenerator/schema/chip/dbUnfoldedBumpInst.json renamed to src/odb/src/codeGenerator/schema/chip/dbUnfoldedChipBumpInst.json src/odb/src/codeGenerator/schema/chip/dbUnfoldedBumpInst.json renamed to src/odb/src/codeGenerator/schema/chip/dbUnfoldedChipBumpInst.json

@@ -1,5 +1,5 @@
 {
-  "name": "dbUnfoldedBumpInst",
+  "name": "dbUnfoldedChipBumpInst",
   "type": "dbObject",
   "fields": [
     {
@@ -16,7 +16,7 @@
     },
     {
       "name": "region_next_",
-      "type": "dbId<_dbUnfoldedBumpInst>",
+      "type": "dbId<_dbUnfoldedChipBumpInst>",
       "flags": ["private"]
     }
   ],

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

@@ -10,7 +10,7 @@
     },
     {
       "name": "connected_bumps_",
-      "type": "dbVector<dbId<_dbUnfoldedBumpInst>>",
+      "type": "dbVector<dbId<_dbUnfoldedChipBumpInst>>",
       "flags": ["private"]
     }
   ],
@@ -20,6 +20,6 @@
   ],
   "cpp_includes": [
     "dbChipNet.h",
-    "dbUnfoldedBumpInst.h"
+    "dbUnfoldedChipBumpInst.h"
   ]
 }

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

@@ -41,7 +41,7 @@
     },
     {
       "name": "bump_",
-      "type": "dbId<_dbUnfoldedBumpInst>",
+      "type": "dbId<_dbUnfoldedChipBumpInst>",
       "flags": ["private"]
     }
   ],

src/odb/src/db/CMakeLists.txt

@@ -160,7 +160,7 @@ add_library(db
     dbTechLayerVoltageSpacing.cpp
     dbTechLayerWidthTableRule.cpp
     dbTechLayerWrongDirSpacingRule.cpp
-    dbUnfoldedBumpInst.cpp
+    dbUnfoldedChipBumpInst.cpp
     dbUnfoldedChipInst.cpp
     dbUnfoldedChipNet.cpp
     dbUnfoldedChipRegionInst.cpp
@@ -188,7 +188,7 @@ add_library(db
     dbNetTrackItr.cpp
     dbRegionGroupItr.cpp
     dbScanListScanInstItr.cpp
-    dbUnfoldedBumpInstItr.cpp
+    dbUnfoldedChipBumpInstItr.cpp
     dbUnfoldedChipRegionInstItr.cpp
     # Generator Code End cpp
 )

src/odb/src/db/dbDatabase.cpp

@@ -16,7 +16,7 @@
 #include "dbCore.h"
 #include "dbProperty.h"
 #include "dbTable.h"
-#include "dbUnfoldedBumpInst.h"
+#include "dbUnfoldedChipBumpInst.h"
 #include "dbUnfoldedChipInst.h"
 #include "dbUnfoldedChipNet.h"
 #include "dbUnfoldedChipRegionInst.h"
@@ -67,7 +67,7 @@
 #include "dbTechLayerMinCutRule.h"
 #include "dbTechLayerSpacingRule.h"
 #include "dbUnfoldedBuilder.h"
-#include "dbUnfoldedBumpInstItr.h"
+#include "dbUnfoldedChipBumpInstItr.h"
 #include "dbUnfoldedChipRegionInstItr.h"
 #include "odb/dbBlockCallBackObj.h"
 #include "odb/dbDatabaseObserver.h"
@@ -223,11 +223,11 @@ _dbDatabase::_dbDatabase(_dbDatabase* db)
       this,
       (GetObjTbl_t) &_dbDatabase::getObjectTable,
       dbUnfoldedChipRegionInstObj);
-  unfolded_bump_inst_tbl_ = new dbTable<_dbUnfoldedBumpInst>(
+  unfolded_bump_inst_tbl_ = new dbTable<_dbUnfoldedChipBumpInst>(
       this,
       this,
       (GetObjTbl_t) &_dbDatabase::getObjectTable,
-      dbUnfoldedBumpInstObj);
+      dbUnfoldedChipBumpInstObj);
   unfolded_conn_tbl_
       = new dbTable<_dbUnfoldedConn>(this,
                                      this,
@@ -275,7 +275,7 @@ _dbDatabase::_dbDatabase(_dbDatabase* db)
   unfolded_region_itr_
       = new dbUnfoldedChipRegionInstItr(unfolded_chip_region_inst_tbl_);
 
-  unfolded_bump_itr_ = new dbUnfoldedBumpInstItr(unfolded_bump_inst_tbl_);
+  unfolded_bump_itr_ = new dbUnfoldedChipBumpInstItr(unfolded_bump_inst_tbl_);
   // User Code End Constructor
 }
 
@@ -510,7 +510,7 @@ dbObjectTable* _dbDatabase::getObjectTable(dbObjectType type)
       return unfolded_chip_inst_tbl_;
     case dbUnfoldedChipRegionInstObj:
       return unfolded_chip_region_inst_tbl_;
-    case dbUnfoldedBumpInstObj:
+    case dbUnfoldedChipBumpInstObj:
       return unfolded_bump_inst_tbl_;
     case dbUnfoldedConnObj:
       return unfolded_conn_tbl_;
@@ -645,7 +645,7 @@ _dbDatabase::_dbDatabase(_dbDatabase* /* unused: db */, int id)
   unfolded_region_itr_
       = new dbUnfoldedChipRegionInstItr(unfolded_chip_region_inst_tbl_);
 
-  unfolded_bump_itr_ = new dbUnfoldedBumpInstItr(unfolded_bump_inst_tbl_);
+  unfolded_bump_itr_ = new dbUnfoldedChipBumpInstItr(unfolded_bump_inst_tbl_);
 }
 
 utl::Logger* _dbDatabase::getLogger() const
@@ -750,10 +750,10 @@ dbSet<dbUnfoldedChipRegionInst> dbDatabase::getUnfoldedChipRegionInsts() const
                                          obj->unfolded_chip_region_inst_tbl_);
 }
 
-dbSet<dbUnfoldedBumpInst> dbDatabase::getUnfoldedBumpInsts() const
+dbSet<dbUnfoldedChipBumpInst> dbDatabase::getUnfoldedChipBumpInsts() const
 {
   _dbDatabase* obj = (_dbDatabase*) this;
-  return dbSet<dbUnfoldedBumpInst>(obj, obj->unfolded_bump_inst_tbl_);
+  return dbSet<dbUnfoldedChipBumpInst>(obj, obj->unfolded_bump_inst_tbl_);
 }
 
 dbSet<dbUnfoldedConn> dbDatabase::getUnfoldedConns() const