odb: rename dbUnfoldedNet -> dbUnfoldedChipNet

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

Author: osamahammad21

src/odb/include/odb/db.h

@@ -180,8 +180,8 @@ class dbTechLayerWidthTableRule;
 class dbTechLayerWrongDirSpacingRule;
 class dbUnfoldedBumpInst;
 class dbUnfoldedChipInst;
+class dbUnfoldedChipNet;
 class dbUnfoldedConn;
-class dbUnfoldedNet;
 class dbUnfoldedRegionInst;
 // Generator Code End ClassDeclarations
 
@@ -7631,7 +7631,7 @@ class dbDatabase : public dbObject
 
   dbSet<dbUnfoldedConn> getUnfoldedConns() const;
 
-  dbSet<dbUnfoldedNet> getUnfoldedNets() const;
+  dbSet<dbUnfoldedChipNet> getUnfoldedChipNets() const;
 
   // User Code Begin dbDatabase
 
@@ -11448,24 +11448,24 @@ class dbUnfoldedChipInst : public dbObject
   // User Code End dbUnfoldedChipInst
 };
 
-class dbUnfoldedConn : public dbObject
+class dbUnfoldedChipNet : public dbObject
 {
  public:
-  dbChipConn* getChipConn() const;
-
-  dbUnfoldedRegionInst* getTopRegion() const;
+  dbChipNet* getChipNet() const;
 
-  dbUnfoldedRegionInst* getBottomRegion() const;
+  // User Code Begin dbUnfoldedChipNet
+  std::vector<dbUnfoldedBumpInst*> getConnectedBumps() const;
+  // User Code End dbUnfoldedChipNet
 };
 
-class dbUnfoldedNet : public dbObject
+class dbUnfoldedConn : public dbObject
 {
  public:
-  dbChipNet* getChipNet() const;
+  dbChipConn* getChipConn() const;
 
-  // User Code Begin dbUnfoldedNet
-  std::vector<dbUnfoldedBumpInst*> getConnectedBumps() const;
-  // User Code End dbUnfoldedNet
+  dbUnfoldedRegionInst* getTopRegion() const;
+
+  dbUnfoldedRegionInst* getBottomRegion() const;
 };
 
 class dbUnfoldedRegionInst : public dbObject

src/odb/include/odb/dbCompare.inc

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

src/odb/include/odb/dbObject.h

@@ -129,8 +129,8 @@ enum dbObjectType
   dbTechLayerWrongDirSpacingRuleObj,
   dbUnfoldedBumpInstObj,
   dbUnfoldedChipInstObj,
+  dbUnfoldedChipNetObj,
   dbUnfoldedConnObj,
-  dbUnfoldedNetObj,
   dbUnfoldedRegionInstObj,
   // Generator Code End DbObjectType
 

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

@@ -282,8 +282,8 @@ void Checker::checkFloatingChips(dbMarkerCategory* top_cat)
       // ground
       else if (conn->getTopRegion() || conn->getBottomRegion()) {
         dbUnfoldedRegionInst* region = conn->getTopRegion()
-                                       ? conn->getTopRegion()
-                                       : conn->getBottomRegion();
+                                           ? conn->getTopRegion()
+                                           : conn->getBottomRegion();
         auto it = chip_map.find(region->getParentChip());
         if (it != chip_map.end()) {
           uf.unite(it->second, ground_node);
@@ -607,8 +607,8 @@ void Checker::checkAlignmentMarkers(dbMarkerCategory* top_cat)
 
 void Checker::checkLogicalConnectivity(dbMarkerCategory* top_cat)
 {
-  std::unordered_map<dbUnfoldedBumpInst*, dbUnfoldedNet*> bump_net_map;
-  for (dbUnfoldedNet* net : db_->getUnfoldedNets()) {
+  std::unordered_map<dbUnfoldedBumpInst*, dbUnfoldedChipNet*> bump_net_map;
+  for (dbUnfoldedChipNet* net : db_->getUnfoldedChipNets()) {
     for (dbUnfoldedBumpInst* bump : net->getConnectedBumps()) {
       bump_net_map[bump] = net;
     }
@@ -652,9 +652,9 @@ void Checker::checkLogicalConnectivity(dbMarkerCategory* top_cat)
       auto top_net_it = bump_net_map.find(top_bump);
       auto bot_net_it = bump_net_map.find(bot_bump);
 
-      dbUnfoldedNet* top_net
+      dbUnfoldedChipNet* top_net
           = top_net_it != bump_net_map.end() ? top_net_it->second : nullptr;
-      dbUnfoldedNet* bot_net
+      dbUnfoldedChipNet* bot_net
           = bot_net_it != bump_net_map.end() ? bot_net_it->second : nullptr;
 
       if (top_net != bot_net) {

src/odb/src/codeGenerator/schema.json

@@ -593,9 +593,9 @@
     },
     {
       "parent":"dbDatabase",
-      "child":"dbUnfoldedNet",
+      "child":"dbUnfoldedChipNet",
       "type":"1_n",
-      "tbl_name":"unfolded_net_tbl_",
+      "tbl_name":"unfolded_chip_net_tbl_",
       "flags": ["no-serial"]
     },
     {

…Generator/schema/chip/dbUnfoldedNet.json …rator/schema/chip/dbUnfoldedChipNet.jsonsrc/odb/src/codeGenerator/schema/chip/dbUnfoldedNet.json renamed to src/odb/src/codeGenerator/schema/chip/dbUnfoldedChipNet.json src/odb/src/codeGenerator/schema/chip/dbUnfoldedNet.json renamed to src/odb/src/codeGenerator/schema/chip/dbUnfoldedChipNet.json

@@ -1,5 +1,5 @@
 {
-  "name": "dbUnfoldedNet",
+  "name": "dbUnfoldedChipNet",
   "type": "dbObject",
   "fields": [
     {

src/odb/src/db/CMakeLists.txt

@@ -162,8 +162,8 @@ add_library(db
     dbTechLayerWrongDirSpacingRule.cpp
     dbUnfoldedBumpInst.cpp
     dbUnfoldedChipInst.cpp
+    dbUnfoldedChipNet.cpp
     dbUnfoldedConn.cpp
-    dbUnfoldedNet.cpp
     dbUnfoldedRegionInst.cpp
     dbChipBumpInstItr.cpp
     dbChipConnItr.cpp

src/odb/src/db/dbDatabase.cpp

@@ -18,8 +18,8 @@
 #include "dbTable.h"
 #include "dbUnfoldedBumpInst.h"
 #include "dbUnfoldedChipInst.h"
+#include "dbUnfoldedChipNet.h"
 #include "dbUnfoldedConn.h"
-#include "dbUnfoldedNet.h"
 #include "dbUnfoldedRegionInst.h"
 #include "odb/db.h"
 #include "odb/dbSet.h"
@@ -141,7 +141,7 @@ bool _dbDatabase::operator==(const _dbDatabase& rhs) const
   if (*unfolded_conn_tbl_ != *rhs.unfolded_conn_tbl_) {
     return false;
   }
-  if (*unfolded_net_tbl_ != *rhs.unfolded_net_tbl_) {
+  if (*unfolded_chip_net_tbl_ != *rhs.unfolded_chip_net_tbl_) {
     return false;
   }
 
@@ -233,8 +233,11 @@ _dbDatabase::_dbDatabase(_dbDatabase* db)
                                      this,
                                      (GetObjTbl_t) &_dbDatabase::getObjectTable,
                                      dbUnfoldedConnObj);
-  unfolded_net_tbl_ = new dbTable<_dbUnfoldedNet>(
-      this, this, (GetObjTbl_t) &_dbDatabase::getObjectTable, dbUnfoldedNetObj);
+  unfolded_chip_net_tbl_ = new dbTable<_dbUnfoldedChipNet>(
+      this,
+      this,
+      (GetObjTbl_t) &_dbDatabase::getObjectTable,
+      dbUnfoldedChipNetObj);
   // User Code Begin Constructor
   magic1_ = kMagic1;
   magic2_ = kMagic2;
@@ -510,8 +513,8 @@ dbObjectTable* _dbDatabase::getObjectTable(dbObjectType type)
       return unfolded_bump_inst_tbl_;
     case dbUnfoldedConnObj:
       return unfolded_conn_tbl_;
-    case dbUnfoldedNetObj:
-      return unfolded_net_tbl_;
+    case dbUnfoldedChipNetObj:
+      return unfolded_chip_net_tbl_;
       // User Code Begin getObjectTable
     case dbTechObj:
       return tech_tbl_;
@@ -549,7 +552,8 @@ void _dbDatabase::collectMemInfo(MemInfo& info)
   unfolded_bump_inst_tbl_->collectMemInfo(
       info.children["unfolded_bump_inst_tbl_"]);
   unfolded_conn_tbl_->collectMemInfo(info.children["unfolded_conn_tbl_"]);
-  unfolded_net_tbl_->collectMemInfo(info.children["unfolded_net_tbl_"]);
+  unfolded_chip_net_tbl_->collectMemInfo(
+      info.children["unfolded_chip_net_tbl_"]);
 
   // User Code Begin collectMemInfo
   tech_tbl_->collectMemInfo(info.children["tech"]);
@@ -573,7 +577,7 @@ _dbDatabase::~_dbDatabase()
   delete unfolded_region_inst_tbl_;
   delete unfolded_bump_inst_tbl_;
   delete unfolded_conn_tbl_;
-  delete unfolded_net_tbl_;
+  delete unfolded_chip_net_tbl_;
   // User Code Begin Destructor
   delete tech_tbl_;
   delete lib_tbl_;
@@ -755,10 +759,10 @@ dbSet<dbUnfoldedConn> dbDatabase::getUnfoldedConns() const
   return dbSet<dbUnfoldedConn>(obj, obj->unfolded_conn_tbl_);
 }
 
-dbSet<dbUnfoldedNet> dbDatabase::getUnfoldedNets() const
+dbSet<dbUnfoldedChipNet> dbDatabase::getUnfoldedChipNets() const
 {
   _dbDatabase* obj = (_dbDatabase*) this;
-  return dbSet<dbUnfoldedNet>(obj, obj->unfolded_net_tbl_);
+  return dbSet<dbUnfoldedChipNet>(obj, obj->unfolded_chip_net_tbl_);
 }
 
 // User Code Begin dbDatabasePublicMethods

src/odb/src/db/dbDatabase.h

@@ -294,7 +294,7 @@ class _dbUnfoldedChipInst;
 class _dbUnfoldedRegionInst;
 class _dbUnfoldedBumpInst;
 class _dbUnfoldedConn;
-class _dbUnfoldedNet;
+class _dbUnfoldedChipNet;
 // User Code Begin Classes
 class dbPropertyItr;
 class dbChipInstItr;
@@ -349,7 +349,7 @@ class _dbDatabase : public _dbObject
   dbTable<_dbUnfoldedRegionInst>* unfolded_region_inst_tbl_;
   dbTable<_dbUnfoldedBumpInst>* unfolded_bump_inst_tbl_;
   dbTable<_dbUnfoldedConn>* unfolded_conn_tbl_;
-  dbTable<_dbUnfoldedNet>* unfolded_net_tbl_;
+  dbTable<_dbUnfoldedChipNet>* unfolded_chip_net_tbl_;
 
   // User Code Begin Fields
   dbTable<_dbTech, 2>* tech_tbl_;

src/odb/src/db/dbObject.cpp

@@ -127,8 +127,8 @@ static const char* name_tbl[] = {"dbGDSLib",
                                  "dbTechLayerWrongDirSpacingRule",
                                  "dbUnfoldedBumpInst",
                                  "dbUnfoldedChipInst",
+                                 "dbUnfoldedChipNet",
                                  "dbUnfoldedConn",
-                                 "dbUnfoldedNet",
                                  "dbUnfoldedRegionInst",
                                  // Generator Code End ObjectNames
 
@@ -254,8 +254,8 @@ static const std::unordered_map<uint32_t, dbObjectType> hash_to_object_type
        {0xF73FA7DF, dbTechLayerWrongDirSpacingRuleObj},
        {0x9DE679DA, dbUnfoldedBumpInstObj},
        {0x18591EB8, dbUnfoldedChipInstObj},
+       {0x5650CD93, dbUnfoldedChipNetObj},
        {0xCF7B84F0, dbUnfoldedConnObj},
-       {0xDC63AD55, dbUnfoldedNetObj},
        {0x4C06DD36, dbUnfoldedRegionInstObj},
        // Generator Code End HashToObjectType
 
@@ -382,8 +382,8 @@ static const std::unordered_map<dbObjectType, uint32_t> object_type_to_hash
        {dbTechLayerWrongDirSpacingRuleObj, 0xF73FA7DF},
        {dbUnfoldedBumpInstObj, 0x9DE679DA},
        {dbUnfoldedChipInstObj, 0x18591EB8},
+       {dbUnfoldedChipNetObj, 0x5650CD93},
        {dbUnfoldedConnObj, 0xCF7B84F0},
-       {dbUnfoldedNetObj, 0xDC63AD55},
        {dbUnfoldedRegionInstObj, 0x4C06DD36},
        // Generator Code End ObjectTypeToHash