odb: rename dbUnfoldedRegionInst -> dbUnfoldedChipRegionInst

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

Author: osamahammad21

src/odb/include/odb/db.h

@@ -181,8 +181,8 @@ class dbTechLayerWrongDirSpacingRule;
 class dbUnfoldedBumpInst;
 class dbUnfoldedChipInst;
 class dbUnfoldedChipNet;
+class dbUnfoldedChipRegionInst;
 class dbUnfoldedConn;
-class dbUnfoldedRegionInst;
 // Generator Code End ClassDeclarations
 
 // Extraction Objects
@@ -7625,7 +7625,7 @@ class dbDatabase : public dbObject
 
   dbSet<dbUnfoldedChipInst> getUnfoldedChipInsts() const;
 
-  dbSet<dbUnfoldedRegionInst> getUnfoldedRegionInsts() const;
+  dbSet<dbUnfoldedChipRegionInst> getUnfoldedChipRegionInsts() const;
 
   dbSet<dbUnfoldedBumpInst> getUnfoldedBumpInsts() const;
 
@@ -11415,7 +11415,7 @@ class dbUnfoldedBumpInst : public dbObject
  public:
   dbChipBumpInst* getChipBumpInst() const;
 
-  dbUnfoldedRegionInst* getParentRegion() const;
+  dbUnfoldedChipRegionInst* getParentRegion() const;
 
   // User Code Begin dbUnfoldedBumpInst
   Point3D getGlobalPosition() const;
@@ -11432,7 +11432,7 @@ class dbUnfoldedChipInst : public dbObject
   // User Code Begin dbUnfoldedChipInst
   Cuboid getCuboid() const;
 
-  dbSet<dbUnfoldedRegionInst> getRegions() const;
+  dbSet<dbUnfoldedChipRegionInst> getRegions() const;
 
   ///
   /// Return the chip-instance path that uniquely identifies this unfolded
@@ -11444,7 +11444,7 @@ class dbUnfoldedChipInst : public dbObject
   /// Find the unfolded region within this chip whose source region instance
   /// matches `source`. Returns nullptr if no match.
   ///
-  dbUnfoldedRegionInst* findRegion(dbChipRegionInst* source) const;
+  dbUnfoldedChipRegionInst* findRegion(dbChipRegionInst* source) const;
   // User Code End dbUnfoldedChipInst
 };
 
@@ -11458,17 +11458,7 @@ class dbUnfoldedChipNet : public dbObject
   // User Code End dbUnfoldedChipNet
 };
 
-class dbUnfoldedConn : public dbObject
-{
- public:
-  dbChipConn* getChipConn() const;
-
-  dbUnfoldedRegionInst* getTopRegion() const;
-
-  dbUnfoldedRegionInst* getBottomRegion() const;
-};
-
-class dbUnfoldedRegionInst : public dbObject
+class dbUnfoldedChipRegionInst : public dbObject
 {
  public:
   enum class EffectiveSide
@@ -11483,7 +11473,7 @@ class dbUnfoldedRegionInst : public dbObject
 
   dbUnfoldedChipInst* getParentChip() const;
 
-  // User Code Begin dbUnfoldedRegionInst
+  // User Code Begin dbUnfoldedChipRegionInst
   Cuboid getCuboid() const;
 
   EffectiveSide getEffectiveSide() const;
@@ -11497,7 +11487,17 @@ class dbUnfoldedRegionInst : public dbObject
   int getSurfaceZ() const;
 
   dbSet<dbUnfoldedBumpInst> getBumps() const;
-  // User Code End dbUnfoldedRegionInst
+  // User Code End dbUnfoldedChipRegionInst
+};
+
+class dbUnfoldedConn : public dbObject
+{
+ public:
+  dbChipConn* getChipConn() const;
+
+  dbUnfoldedChipRegionInst* getTopRegion() const;
+
+  dbUnfoldedChipRegionInst* getBottomRegion() const;
 };
 
 // Generator Code End ClassDefinition

src/odb/include/odb/dbCompare.inc

@@ -844,18 +844,18 @@ struct less<odb::dbUnfoldedChipNet*>
 };
 
 template <>
-struct less<odb::dbUnfoldedConn*>
+struct less<odb::dbUnfoldedChipRegionInst*>
 {
-  bool operator()(const odb::dbUnfoldedConn* lhs,
-                  const odb::dbUnfoldedConn* rhs) const
+  bool operator()(const odb::dbUnfoldedChipRegionInst* lhs,
+                  const odb::dbUnfoldedChipRegionInst* rhs) const
       = delete;
 };
 
 template <>
-struct less<odb::dbUnfoldedRegionInst*>
+struct less<odb::dbUnfoldedConn*>
 {
-  bool operator()(const odb::dbUnfoldedRegionInst* lhs,
-                  const odb::dbUnfoldedRegionInst* rhs) const
+  bool operator()(const odb::dbUnfoldedConn* lhs,
+                  const odb::dbUnfoldedConn* rhs) const
       = delete;
 };
 

src/odb/include/odb/dbObject.h

@@ -130,8 +130,8 @@ enum dbObjectType
   dbUnfoldedBumpInstObj,
   dbUnfoldedChipInstObj,
   dbUnfoldedChipNetObj,
+  dbUnfoldedChipRegionInstObj,
   dbUnfoldedConnObj,
-  dbUnfoldedRegionInstObj,
   // Generator Code End DbObjectType
 
   // Lib Objects

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

@@ -167,25 +167,25 @@ void matchMarkersBetweenChips(
   }
 }
 
-const char* sideToString(dbUnfoldedRegionInst::EffectiveSide side)
+const char* sideToString(dbUnfoldedChipRegionInst::EffectiveSide side)
 {
   switch (side) {
-    case dbUnfoldedRegionInst::EffectiveSide::TOP:
+    case dbUnfoldedChipRegionInst::EffectiveSide::TOP:
       return "TOP";
-    case dbUnfoldedRegionInst::EffectiveSide::BOTTOM:
+    case dbUnfoldedChipRegionInst::EffectiveSide::BOTTOM:
       return "BOTTOM";
-    case dbUnfoldedRegionInst::EffectiveSide::INTERNAL:
+    case dbUnfoldedChipRegionInst::EffectiveSide::INTERNAL:
       return "INTERNAL";
-    case dbUnfoldedRegionInst::EffectiveSide::INTERNAL_EXT:
+    case dbUnfoldedChipRegionInst::EffectiveSide::INTERNAL_EXT:
       return "INTERNAL_EXT";
   }
   return "UNKNOWN";
 }
 
 MatingSurfaces getMatingSurfaces(dbUnfoldedConn* conn)
 {
-  dbUnfoldedRegionInst* r1 = conn->getTopRegion();
-  dbUnfoldedRegionInst* r2 = conn->getBottomRegion();
+  dbUnfoldedChipRegionInst* r1 = conn->getTopRegion();
+  dbUnfoldedChipRegionInst* r2 = conn->getBottomRegion();
   if (!r1 || !r2) {
     return {.valid = false, .top_z = 0, .bot_z = 0};
   }
@@ -281,9 +281,9 @@ void Checker::checkFloatingChips(dbMarkerCategory* top_cat)
       // Case 2: Virtual connection (one region is null) - connect chip to
       // ground
       else if (conn->getTopRegion() || conn->getBottomRegion()) {
-        dbUnfoldedRegionInst* region = conn->getTopRegion()
-                                           ? conn->getTopRegion()
-                                           : conn->getBottomRegion();
+        dbUnfoldedChipRegionInst* region = conn->getTopRegion()
+                                               ? conn->getTopRegion()
+                                               : conn->getBottomRegion();
         auto it = chip_map.find(region->getParentChip());
         if (it != chip_map.end()) {
           uf.unite(it->second, ground_node);
@@ -378,7 +378,7 @@ void Checker::checkInternalExtUsage(dbMarkerCategory* top_cat)
 {
   // The struct model maintained an isUsed bit on each region; in the
   // dbObject model we derive it here on demand by scanning connections.
-  std::unordered_set<dbUnfoldedRegionInst*> used;
+  std::unordered_set<dbUnfoldedChipRegionInst*> used;
   for (dbUnfoldedConn* conn : db_->getUnfoldedConns()) {
     if (auto* r = conn->getTopRegion(); r && r->isInternalExt()) {
       used.insert(r);
@@ -390,7 +390,7 @@ void Checker::checkInternalExtUsage(dbMarkerCategory* top_cat)
 
   dbMarkerCategory* cat = nullptr;
   for (dbUnfoldedChipInst* chip : db_->getUnfoldedChipInsts()) {
-    for (dbUnfoldedRegionInst* region : chip->getRegions()) {
+    for (dbUnfoldedChipRegionInst* region : chip->getRegions()) {
       if (region->isInternalExt() && !used.contains(region)) {
         if (!cat) {
           cat = dbMarkerCategory::createOrReplace(top_cat,
@@ -414,7 +414,7 @@ void Checker::checkInternalExtUsage(dbMarkerCategory* top_cat)
 
 void Checker::checkConnectionRegions(dbMarkerCategory* top_cat)
 {
-  auto describe = [](dbUnfoldedRegionInst* r, dbMarker* marker) {
+  auto describe = [](dbUnfoldedChipRegionInst* r, dbMarker* marker) {
     const Cuboid cuboid = r->getCuboid();
     marker->addSource(r->getChipRegionInst());
     marker->addShape(
@@ -454,7 +454,7 @@ void Checker::checkBumpPhysicalAlignment(dbMarkerCategory* top_cat)
   dbMarkerCategory* cat = nullptr;
   int violation_count = 0;
   for (dbUnfoldedChipInst* chip : db_->getUnfoldedChipInsts()) {
-    for (dbUnfoldedRegionInst* region : chip->getRegions()) {
+    for (dbUnfoldedChipRegionInst* region : chip->getRegions()) {
       for (dbUnfoldedBumpInst* bump : region->getBumps()) {
         const Point3D p = bump->getGlobalPosition();
         if (!region->getCuboid().getEnclosingRect().intersects(
@@ -554,8 +554,8 @@ void Checker::checkAlignmentMarkers(dbMarkerCategory* top_cat)
     if (!isValid(conn)) {
       continue;
     }
-    dbUnfoldedRegionInst* ra = conn->getTopRegion();
-    dbUnfoldedRegionInst* rb = conn->getBottomRegion();
+    dbUnfoldedChipRegionInst* ra = conn->getTopRegion();
+    dbUnfoldedChipRegionInst* rb = conn->getBottomRegion();
     if (!ra || !rb) {
       continue;
     }
@@ -627,8 +627,8 @@ void Checker::checkLogicalConnectivity(dbMarkerCategory* top_cat)
     if (!isValid(conn)) {
       continue;
     }
-    dbUnfoldedRegionInst* top_region = conn->getTopRegion();
-    dbUnfoldedRegionInst* bot_region = conn->getBottomRegion();
+    dbUnfoldedChipRegionInst* top_region = conn->getTopRegion();
+    dbUnfoldedChipRegionInst* bot_region = conn->getBottomRegion();
     if (!top_region || !bot_region) {
       continue;
     }

src/odb/src/codeGenerator/schema.json

@@ -211,13 +211,13 @@
       "includes": ["dbChipNet.h", "dbChip.h"]
     },
     {
-      "name": "dbUnfoldedRegionInstItr",
-      "parentObject": "dbUnfoldedRegionInst",
-      "tableName": "unfolded_region_inst_tbl",
+      "name": "dbUnfoldedChipRegionInstItr",
+      "parentObject": "dbUnfoldedChipRegionInst",
+      "tableName": "unfolded_chip_region_inst_tbl",
       "reversible": "true",
       "orderReversed": "true",
       "sequential": 0,
-      "includes": ["dbUnfoldedRegionInst.h", "dbUnfoldedChipInst.h"]
+      "includes": ["dbUnfoldedChipRegionInst.h", "dbUnfoldedChipInst.h"]
     },
     {
       "name": "dbUnfoldedBumpInstItr",
@@ -226,7 +226,7 @@
       "reversible": "true",
       "orderReversed": "true",
       "sequential": 0,
-      "includes": ["dbUnfoldedBumpInst.h", "dbUnfoldedRegionInst.h"]
+      "includes": ["dbUnfoldedBumpInst.h", "dbUnfoldedChipRegionInst.h"]
     }
   ],
   "relations":[
@@ -572,9 +572,9 @@
     },
     {
       "parent":"dbDatabase",
-      "child":"dbUnfoldedRegionInst",
+      "child":"dbUnfoldedChipRegionInst",
       "type":"1_n",
-      "tbl_name":"unfolded_region_inst_tbl_",
+      "tbl_name":"unfolded_chip_region_inst_tbl_",
       "flags": ["no-serial"]
     },
     {

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

@@ -10,7 +10,7 @@
     },
     {
       "name": "parent_region_",
-      "type": "dbId<_dbUnfoldedRegionInst>",
+      "type": "dbId<_dbUnfoldedChipRegionInst>",
       "flags": ["no-set"],
       "parent": "dbDatabase"
     },
@@ -27,7 +27,7 @@
     "dbChipBumpInst.h",
     "dbChipBump.h",
     "dbInst.h",
-    "dbUnfoldedRegionInst.h",
+    "dbUnfoldedChipRegionInst.h",
     "dbUnfoldedChipInst.h",
     "odb/geom.h"
   ]

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

@@ -19,7 +19,7 @@
     },
     {
       "name": "region_",
-      "type": "dbId<_dbUnfoldedRegionInst>",
+      "type": "dbId<_dbUnfoldedChipRegionInst>",
       "flags": ["private"]
     }
   ],

…or/schema/chip/dbUnfoldedRegionInst.json …chema/chip/dbUnfoldedChipRegionInst.jsonsrc/odb/src/codeGenerator/schema/chip/dbUnfoldedRegionInst.json renamed to src/odb/src/codeGenerator/schema/chip/dbUnfoldedChipRegionInst.json src/odb/src/codeGenerator/schema/chip/dbUnfoldedRegionInst.json renamed to src/odb/src/codeGenerator/schema/chip/dbUnfoldedChipRegionInst.json

@@ -1,5 +1,5 @@
 {
-  "name": "dbUnfoldedRegionInst",
+  "name": "dbUnfoldedChipRegionInst",
   "type": "dbObject",
   "enums": [
     {
@@ -36,7 +36,7 @@
     },
     {
       "name": "chip_next_",
-      "type": "dbId<_dbUnfoldedRegionInst>",
+      "type": "dbId<_dbUnfoldedChipRegionInst>",
       "flags": ["private"]
     },
     {

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

@@ -10,13 +10,13 @@
     },
     {
       "name": "top_region_",
-      "type": "dbId<_dbUnfoldedRegionInst>",
+      "type": "dbId<_dbUnfoldedChipRegionInst>",
       "flags": ["no-set"],
       "parent": "dbDatabase"
     },
     {
       "name": "bottom_region_",
-      "type": "dbId<_dbUnfoldedRegionInst>",
+      "type": "dbId<_dbUnfoldedChipRegionInst>",
       "flags": ["no-set"],
       "parent": "dbDatabase"
     }
@@ -26,6 +26,6 @@
   ],
   "cpp_includes": [
     "dbChipConn.h",
-    "dbUnfoldedRegionInst.h"
+    "dbUnfoldedChipRegionInst.h"
   ]
 }

src/odb/src/db/CMakeLists.txt

@@ -163,8 +163,8 @@ add_library(db
     dbUnfoldedBumpInst.cpp
     dbUnfoldedChipInst.cpp
     dbUnfoldedChipNet.cpp
+    dbUnfoldedChipRegionInst.cpp
     dbUnfoldedConn.cpp
-    dbUnfoldedRegionInst.cpp
     dbChipBumpInstItr.cpp
     dbChipConnItr.cpp
     dbChipInstItr.cpp
@@ -189,7 +189,7 @@ add_library(db
     dbRegionGroupItr.cpp
     dbScanListScanInstItr.cpp
     dbUnfoldedBumpInstItr.cpp
-    dbUnfoldedRegionInstItr.cpp
+    dbUnfoldedChipRegionInstItr.cpp
     # Generator Code End cpp
 )