odb: rename dbUnfoldedConn -> dbUnfoldedChipConn

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

Author: osamahammad21

src/odb/include/odb/db.h

@@ -179,10 +179,10 @@ class dbTechLayerVoltageSpacing;
 class dbTechLayerWidthTableRule;
 class dbTechLayerWrongDirSpacingRule;
 class dbUnfoldedChipBumpInst;
+class dbUnfoldedChipConn;
 class dbUnfoldedChipInst;
 class dbUnfoldedChipNet;
 class dbUnfoldedChipRegionInst;
-class dbUnfoldedConn;
 // Generator Code End ClassDeclarations
 
 // Extraction Objects
@@ -7629,7 +7629,7 @@ class dbDatabase : public dbObject
 
   dbSet<dbUnfoldedChipBumpInst> getUnfoldedChipBumpInsts() const;
 
-  dbSet<dbUnfoldedConn> getUnfoldedConns() const;
+  dbSet<dbUnfoldedChipConn> getUnfoldedChipConns() const;
 
   dbSet<dbUnfoldedChipNet> getUnfoldedChipNets() const;
 
@@ -11422,6 +11422,16 @@ class dbUnfoldedChipBumpInst : public dbObject
   // User Code End dbUnfoldedChipBumpInst
 };
 
+class dbUnfoldedChipConn : public dbObject
+{
+ public:
+  dbChipConn* getChipConn() const;
+
+  dbUnfoldedChipRegionInst* getTopRegion() const;
+
+  dbUnfoldedChipRegionInst* getBottomRegion() const;
+};
+
 class dbUnfoldedChipInst : public dbObject
 {
  public:
@@ -11490,16 +11500,6 @@ class dbUnfoldedChipRegionInst : public dbObject
   // User Code End dbUnfoldedChipRegionInst
 };
 
-class dbUnfoldedConn : public dbObject
-{
- public:
-  dbChipConn* getChipConn() const;
-
-  dbUnfoldedChipRegionInst* getTopRegion() const;
-
-  dbUnfoldedChipRegionInst* getBottomRegion() const;
-};
-
 // Generator Code End ClassDefinition
 ///
 /// dbProperty - Boolean property.

src/odb/include/odb/dbCompare.inc

@@ -827,6 +827,14 @@ struct less<odb::dbUnfoldedChipBumpInst*>
       = delete;
 };
 
+template <>
+struct less<odb::dbUnfoldedChipConn*>
+{
+  bool operator()(const odb::dbUnfoldedChipConn* lhs,
+                  const odb::dbUnfoldedChipConn* rhs) const
+      = delete;
+};
+
 template <>
 struct less<odb::dbUnfoldedChipInst*>
 {
@@ -851,14 +859,6 @@ struct less<odb::dbUnfoldedChipRegionInst*>
       = delete;
 };
 
-template <>
-struct less<odb::dbUnfoldedConn*>
-{
-  bool operator()(const odb::dbUnfoldedConn* lhs,
-                  const odb::dbUnfoldedConn* rhs) const
-      = delete;
-};
-
 // Generator Code End Less
 
 }  // namespace std

src/odb/include/odb/dbObject.h

@@ -128,10 +128,10 @@ enum dbObjectType
   dbTechLayerWidthTableRuleObj,
   dbTechLayerWrongDirSpacingRuleObj,
   dbUnfoldedChipBumpInstObj,
+  dbUnfoldedChipConnObj,
   dbUnfoldedChipInstObj,
   dbUnfoldedChipNetObj,
   dbUnfoldedChipRegionInstObj,
-  dbUnfoldedConnObj,
   // Generator Code End DbObjectType
 
   // Lib Objects

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

@@ -182,7 +182,7 @@ const char* sideToString(dbUnfoldedChipRegionInst::EffectiveSide side)
   return "UNKNOWN";
 }
 
-MatingSurfaces getMatingSurfaces(dbUnfoldedConn* conn)
+MatingSurfaces getMatingSurfaces(dbUnfoldedChipConn* conn)
 {
   dbUnfoldedChipRegionInst* r1 = conn->getTopRegion();
   dbUnfoldedChipRegionInst* r2 = conn->getBottomRegion();
@@ -205,7 +205,7 @@ MatingSurfaces getMatingSurfaces(dbUnfoldedConn* conn)
       .valid = true, .top_z = top->getSurfaceZ(), .bot_z = bot->getSurfaceZ()};
 }
 
-bool isValid(dbUnfoldedConn* conn)
+bool isValid(dbUnfoldedChipConn* conn)
 {
   auto* r1 = conn->getTopRegion();
   auto* r2 = conn->getBottomRegion();
@@ -268,7 +268,7 @@ void Checker::checkFloatingChips(dbMarkerCategory* top_cat)
     chip_map[chips[i]] = i;
   }
 
-  for (dbUnfoldedConn* conn : db_->getUnfoldedConns()) {
+  for (dbUnfoldedChipConn* conn : db_->getUnfoldedChipConns()) {
     if (isValid(conn)) {
       // Case 1: Both regions exist - connect the two chips together
       if (conn->getTopRegion() && conn->getBottomRegion()) {
@@ -379,7 +379,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<dbUnfoldedChipRegionInst*> used;
-  for (dbUnfoldedConn* conn : db_->getUnfoldedConns()) {
+  for (dbUnfoldedChipConn* conn : db_->getUnfoldedChipConns()) {
     if (auto* r = conn->getTopRegion(); r && r->isInternalExt()) {
       used.insert(r);
     }
@@ -426,7 +426,7 @@ void Checker::checkConnectionRegions(dbMarkerCategory* top_cat)
   };
   int count = 0;
   dbMarkerCategory* cat = nullptr;
-  for (dbUnfoldedConn* conn : db_->getUnfoldedConns()) {
+  for (dbUnfoldedChipConn* conn : db_->getUnfoldedChipConns()) {
     if (!isValid(conn)) {
       if (!cat) {
         cat = dbMarkerCategory::createOrReplace(top_cat, "Connection regions");
@@ -550,7 +550,7 @@ void Checker::checkAlignmentMarkers(dbMarkerCategory* top_cat)
     violation_count++;
   };
 
-  for (dbUnfoldedConn* conn : db_->getUnfoldedConns()) {
+  for (dbUnfoldedChipConn* conn : db_->getUnfoldedChipConns()) {
     if (!isValid(conn)) {
       continue;
     }
@@ -623,7 +623,7 @@ void Checker::checkLogicalConnectivity(dbMarkerCategory* top_cat)
   };
 
   dbMarkerCategory* cat = nullptr;
-  for (dbUnfoldedConn* conn : db_->getUnfoldedConns()) {
+  for (dbUnfoldedChipConn* conn : db_->getUnfoldedChipConns()) {
     if (!isValid(conn)) {
       continue;
     }

src/odb/src/codeGenerator/schema.json

@@ -586,9 +586,9 @@
     },
     {
       "parent":"dbDatabase",
-      "child":"dbUnfoldedConn",
+      "child":"dbUnfoldedChipConn",
       "type":"1_n",
-      "tbl_name":"unfolded_conn_tbl_",
+      "tbl_name":"unfolded_chip_conn_tbl_",
       "flags": ["no-serial"]
     },
     {

…enerator/schema/chip/dbUnfoldedConn.json …ator/schema/chip/dbUnfoldedChipConn.jsonsrc/odb/src/codeGenerator/schema/chip/dbUnfoldedConn.json renamed to src/odb/src/codeGenerator/schema/chip/dbUnfoldedChipConn.json src/odb/src/codeGenerator/schema/chip/dbUnfoldedConn.json renamed to src/odb/src/codeGenerator/schema/chip/dbUnfoldedChipConn.json

@@ -1,5 +1,5 @@
 {
-  "name": "dbUnfoldedConn",
+  "name": "dbUnfoldedChipConn",
   "type": "dbObject",
   "fields": [
     {

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

@@ -24,7 +24,6 @@
     {
       "name": "effective_side_",
       "type": "uint32_t",
-      "default": 0,
       "bits": 2,
       "flags": ["private"]
     },

src/odb/src/db/CMakeLists.txt

@@ -161,10 +161,10 @@ add_library(db
     dbTechLayerWidthTableRule.cpp
     dbTechLayerWrongDirSpacingRule.cpp
     dbUnfoldedChipBumpInst.cpp
+    dbUnfoldedChipConn.cpp
     dbUnfoldedChipInst.cpp
     dbUnfoldedChipNet.cpp
     dbUnfoldedChipRegionInst.cpp
-    dbUnfoldedConn.cpp
     dbChipBumpInstItr.cpp
     dbChipConnItr.cpp
     dbChipInstItr.cpp

src/odb/src/db/dbDatabase.cpp

@@ -17,10 +17,10 @@
 #include "dbProperty.h"
 #include "dbTable.h"
 #include "dbUnfoldedChipBumpInst.h"
+#include "dbUnfoldedChipConn.h"
 #include "dbUnfoldedChipInst.h"
 #include "dbUnfoldedChipNet.h"
 #include "dbUnfoldedChipRegionInst.h"
-#include "dbUnfoldedConn.h"
 #include "odb/db.h"
 #include "odb/dbSet.h"
 // User Code Begin Includes
@@ -138,7 +138,7 @@ bool _dbDatabase::operator==(const _dbDatabase& rhs) const
   if (*unfolded_chip_bump_inst_tbl_ != *rhs.unfolded_chip_bump_inst_tbl_) {
     return false;
   }
-  if (*unfolded_conn_tbl_ != *rhs.unfolded_conn_tbl_) {
+  if (*unfolded_chip_conn_tbl_ != *rhs.unfolded_chip_conn_tbl_) {
     return false;
   }
   if (*unfolded_chip_net_tbl_ != *rhs.unfolded_chip_net_tbl_) {
@@ -228,11 +228,11 @@ _dbDatabase::_dbDatabase(_dbDatabase* db)
       this,
       (GetObjTbl_t) &_dbDatabase::getObjectTable,
       dbUnfoldedChipBumpInstObj);
-  unfolded_conn_tbl_
-      = new dbTable<_dbUnfoldedConn>(this,
-                                     this,
-                                     (GetObjTbl_t) &_dbDatabase::getObjectTable,
-                                     dbUnfoldedConnObj);
+  unfolded_chip_conn_tbl_ = new dbTable<_dbUnfoldedChipConn>(
+      this,
+      this,
+      (GetObjTbl_t) &_dbDatabase::getObjectTable,
+      dbUnfoldedChipConnObj);
   unfolded_chip_net_tbl_ = new dbTable<_dbUnfoldedChipNet>(
       this,
       this,
@@ -513,8 +513,8 @@ dbObjectTable* _dbDatabase::getObjectTable(dbObjectType type)
       return unfolded_chip_region_inst_tbl_;
     case dbUnfoldedChipBumpInstObj:
       return unfolded_chip_bump_inst_tbl_;
-    case dbUnfoldedConnObj:
-      return unfolded_conn_tbl_;
+    case dbUnfoldedChipConnObj:
+      return unfolded_chip_conn_tbl_;
     case dbUnfoldedChipNetObj:
       return unfolded_chip_net_tbl_;
       // User Code Begin getObjectTable
@@ -553,7 +553,8 @@ void _dbDatabase::collectMemInfo(MemInfo& info)
       info.children["unfolded_chip_region_inst_tbl_"]);
   unfolded_chip_bump_inst_tbl_->collectMemInfo(
       info.children["unfolded_chip_bump_inst_tbl_"]);
-  unfolded_conn_tbl_->collectMemInfo(info.children["unfolded_conn_tbl_"]);
+  unfolded_chip_conn_tbl_->collectMemInfo(
+      info.children["unfolded_chip_conn_tbl_"]);
   unfolded_chip_net_tbl_->collectMemInfo(
       info.children["unfolded_chip_net_tbl_"]);
 
@@ -578,7 +579,7 @@ _dbDatabase::~_dbDatabase()
   delete unfolded_chip_inst_tbl_;
   delete unfolded_chip_region_inst_tbl_;
   delete unfolded_chip_bump_inst_tbl_;
-  delete unfolded_conn_tbl_;
+  delete unfolded_chip_conn_tbl_;
   delete unfolded_chip_net_tbl_;
   // User Code Begin Destructor
   delete tech_tbl_;
@@ -758,10 +759,10 @@ dbSet<dbUnfoldedChipBumpInst> dbDatabase::getUnfoldedChipBumpInsts() const
   return dbSet<dbUnfoldedChipBumpInst>(obj, obj->unfolded_chip_bump_inst_tbl_);
 }
 
-dbSet<dbUnfoldedConn> dbDatabase::getUnfoldedConns() const
+dbSet<dbUnfoldedChipConn> dbDatabase::getUnfoldedChipConns() const
 {
   _dbDatabase* obj = (_dbDatabase*) this;
-  return dbSet<dbUnfoldedConn>(obj, obj->unfolded_conn_tbl_);
+  return dbSet<dbUnfoldedChipConn>(obj, obj->unfolded_chip_conn_tbl_);
 }
 
 dbSet<dbUnfoldedChipNet> dbDatabase::getUnfoldedChipNets() const

src/odb/src/db/dbDatabase.h

@@ -293,7 +293,7 @@ class _dbChipNet;
 class _dbUnfoldedChipInst;
 class _dbUnfoldedChipRegionInst;
 class _dbUnfoldedChipBumpInst;
-class _dbUnfoldedConn;
+class _dbUnfoldedChipConn;
 class _dbUnfoldedChipNet;
 // User Code Begin Classes
 class dbPropertyItr;
@@ -348,7 +348,7 @@ class _dbDatabase : public _dbObject
   dbTable<_dbUnfoldedChipInst>* unfolded_chip_inst_tbl_;
   dbTable<_dbUnfoldedChipRegionInst>* unfolded_chip_region_inst_tbl_;
   dbTable<_dbUnfoldedChipBumpInst>* unfolded_chip_bump_inst_tbl_;
-  dbTable<_dbUnfoldedConn>* unfolded_conn_tbl_;
+  dbTable<_dbUnfoldedChipConn>* unfolded_chip_conn_tbl_;
   dbTable<_dbUnfoldedChipNet>* unfolded_chip_net_tbl_;
 
   // User Code Begin Fields