Merge pull request #8054 from osamahammad21/odb-chipbump

ODB: dbChipBump, dbChipBumpInst and dbChipNet

Author: maliberty

src/odb/include/odb/db.h

@@ -106,8 +106,11 @@ class dbAccessPoint;
 class dbBusPort;
 class dbCellEdgeSpacing;
 class dbChip;
+class dbChipBump;
+class dbChipBumpInst;
 class dbChipConn;
 class dbChipInst;
+class dbChipNet;
 class dbChipRegion;
 class dbChipRegionInst;
 class dbDatabase;
@@ -7012,6 +7015,8 @@ class dbChip : public dbObject
 
   dbSet<dbChipConn> getChipConns() const;
 
+  dbSet<dbChipNet> getChipNets() const;
+
   ///
   /// Create a new chip.
   /// Returns nullptr if there is no database technology.
@@ -7032,6 +7037,41 @@ class dbChip : public dbObject
   // User Code End dbChip
 };
 
+class dbChipBump : public dbObject
+{
+ public:
+  // User Code Begin dbChipBump
+  dbChip* getChip() const;
+
+  dbChipRegion* getChipRegion() const;
+
+  dbInst* getInst() const;
+
+  dbNet* getNet() const;
+
+  dbBTerm* getBTerm() const;
+
+  void setNet(dbNet* net);
+
+  void setBTerm(dbBTerm* bterm);
+
+  static dbChipBump* create(dbChipRegion* chip_region, dbInst* inst);
+
+  // User Code End dbChipBump
+};
+
+class dbChipBumpInst : public dbObject
+{
+ public:
+  // User Code Begin dbChipBumpInst
+
+  dbChipBump* getChipBump() const;
+
+  dbChipRegionInst* getChipRegionInst() const;
+
+  // User Code End dbChipBumpInst
+};
+
 class dbChipConn : public dbObject
 {
  public:
@@ -7094,6 +7134,27 @@ class dbChipInst : public dbObject
   // User Code End dbChipInst
 };
 
+class dbChipNet : public dbObject
+{
+ public:
+  std::string getName() const;
+
+  // User Code Begin dbChipNet
+  dbChip* getChip() const;
+
+  uint getNumBumpInsts() const;
+
+  dbChipBumpInst* getBumpInst(uint index, std::vector<dbChipInst*>& path) const;
+
+  void addBumpInst(dbChipBumpInst* bump_inst,
+                   const std::vector<dbChipInst*>& path);
+
+  static dbChipNet* create(dbChip* chip, const std::string& name);
+
+  static void destroy(dbChipNet* net);
+  // User Code End dbChipNet
+};
+
 class dbChipRegion : public dbObject
 {
  public:
@@ -7111,6 +7172,8 @@ class dbChipRegion : public dbObject
 
   Rect getBox() const;
 
+  dbSet<dbChipBump> getChipBumps() const;
+
   // User Code Begin dbChipRegion
   dbChip* getChip() const;
 
@@ -7135,6 +7198,8 @@ class dbChipRegionInst : public dbObject
 
   dbChipRegion* getChipRegion() const;
 
+  dbSet<dbChipBumpInst> getChipBumpInsts() const;
+
   // User Code End dbChipRegionInst
 };
 
@@ -7153,6 +7218,10 @@ class dbDatabase : public dbObject
 
   dbSet<dbChipConn> getChipConns() const;
 
+  dbSet<dbChipBumpInst> getChipBumpInsts() const;
+
+  dbSet<dbChipNet> getChipNets() const;
+
   // User Code Begin dbDatabase
 
   void setTopChip(dbChip* chip);

src/odb/include/odb/dbCompare.h

@@ -479,6 +479,25 @@ struct less<odb::dbChip*>
   }
 };
 
+template <>
+struct less<odb::dbChipBump*>
+{
+  bool operator()(const odb::dbChipBump* lhs, const odb::dbChipBump* rhs) const
+  {
+    return odb::compare_by_id(lhs, rhs);
+  }
+};
+
+template <>
+struct less<odb::dbChipBumpInst*>
+{
+  bool operator()(const odb::dbChipBumpInst* lhs,
+                  const odb::dbChipBumpInst* rhs) const
+  {
+    return odb::compare_by_id(lhs, rhs);
+  }
+};
+
 template <>
 struct less<odb::dbChipConn*>
 {
@@ -497,6 +516,15 @@ struct less<odb::dbChipInst*>
   }
 };
 
+template <>
+struct less<odb::dbChipNet*>
+{
+  bool operator()(const odb::dbChipNet* lhs, const odb::dbChipNet* rhs) const
+  {
+    return odb::compare_by_id(lhs, rhs);
+  }
+};
+
 template <>
 struct less<odb::dbChipRegion*>
 {

src/odb/include/odb/dbObject.h

@@ -61,8 +61,11 @@ enum dbObjectType
   dbBusPortObj,
   dbCellEdgeSpacingObj,
   dbChipObj,
+  dbChipBumpObj,
+  dbChipBumpInstObj,
   dbChipConnObj,
   dbChipInstObj,
+  dbChipNetObj,
   dbChipRegionObj,
   dbChipRegionInstObj,
   dbDatabaseObj,

src/odb/src/codeGenerator/schema.json

@@ -189,6 +189,24 @@
       "orderReversed": "true",
       "sequential": 0,
       "includes": ["dbChipConn.h", "dbChip.h"]
+    },
+    {
+      "name": "dbChipBumpInstItr",
+      "parentObject": "dbChipBumpInst",
+      "tableName": "chip_bump_inst_tbl",
+      "reversible": "true",
+      "orderReversed": "true",
+      "sequential": 0,
+      "includes": ["dbChipBumpInst.h", "dbChipRegionInst.h"]
+    },
+    {
+      "name": "dbChipNetItr",
+      "parentObject": "dbChipNet",
+      "tableName": "chip_net_tbl",
+      "reversible": "true",
+      "orderReversed": "true",
+      "sequential": 0,
+      "includes": ["dbChipNet.h", "dbChip.h"]
     }
   ],
   "relations":[
@@ -407,6 +425,14 @@
       "schema":"db_schema_chip_region",
       "tbl_name":"chip_region_tbl_"
     },
+    {
+      "parent":"dbChipRegion",
+      "child":"dbChipBump",
+      "type":"1_n", 
+      "flags": [],
+      "schema":"db_schema_chip_bump",
+      "tbl_name":"chip_bump_tbl_"
+    },
     {
       "parent":"dbDatabase",
       "child":"dbChip",
@@ -446,6 +472,22 @@
       "tbl_name":"chip_conn_tbl_",
       "schema":"db_schema_chip_region",
       "flags": ["no-serial"]
+    },
+    {
+      "parent":"dbDatabase",
+      "child":"dbChipBumpInst",
+      "type":"1_n",
+      "tbl_name":"chip_bump_inst_tbl_",
+      "schema":"db_schema_chip_bump",
+      "flags": ["no-serial"]
+    },
+    {
+      "parent":"dbDatabase",
+      "child":"dbChipNet",
+      "type":"1_n",
+      "tbl_name":"chip_net_tbl_",
+      "schema":"db_schema_chip_region",
+      "flags": ["no-serial"]
     }
   ]
 }

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

@@ -154,6 +154,12 @@
       "type": "dbId<_dbChipConn>",
       "flags": ["private"],
       "schema": "db_schema_chip_region"
+    },
+    {
+      "name": "nets_",
+      "type": "dbId<_dbChipNet>",
+      "flags": ["private"],
+      "schema": "db_schema_chip_bump"
     }
   ],
   "declared_classes": ["dbPropertyItr", "_dbNameCache","dbBlockItr"],

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

@@ -0,0 +1,13 @@
+{
+  "name": "dbChipBump",
+  "type": "dbObject",
+  "fields": [
+    { "name": "inst_", "type":"dbId<_dbInst>", "flags": ["private"] },
+    { "name": "chip_", "type":"dbId<_dbChip>", "flags": ["private"] },
+    { "name": "chip_region_", "type":"dbId<_dbChipRegion>", "flags": ["private"] },
+    { "name": "net_", "type":"dbId<_dbNet>", "flags": ["private"] },
+    { "name": "bterm_", "type":"dbId<_dbBTerm>", "flags": ["private"] }
+  ],
+  "h_includes": ["odb/dbId.h"],
+  "cpp_includes": ["dbInst.h", "dbChip.h"]
+} 

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

@@ -0,0 +1,11 @@
+{
+  "name": "dbChipBumpInst",
+  "type": "dbObject",
+  "fields": [
+    { "name": "chip_bump_", "type":"dbId<_dbChipBump>", "flags": ["private"] },
+    { "name": "chip_region_inst_", "type":"dbId<_dbChipRegionInst>", "flags": ["private"] },
+    { "name": "region_next_", "type":"dbId<_dbChipBumpInst>", "flags": ["private"] }
+  ],
+  "h_includes": ["odb/dbId.h"],
+  "cpp_includes": ["dbInst.h", "dbChip.h"]
+} 

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

@@ -0,0 +1,43 @@
+{
+    "name": "dbChipNet",
+    "type": "dbObject",
+    "fields": [
+        {
+            "name": "name_",
+            "type": "std::string",
+            "flags": [
+                "no-set"
+            ]
+        },
+        {
+            "name": "chip_",
+            "type": "dbId<_dbChip>",
+            "flags": [
+                "private"
+            ]
+        },
+        {
+            "name": "chip_net_next_",
+            "type": "dbId<_dbChipNet>",
+            "flags": [
+                "private"
+            ]
+        },
+        {
+            "name": "bump_insts_paths_",
+            "type": "std::vector<std::pair<std::vector<dbId<_dbChipInst>>, dbId<_dbChipBumpInst>>>",
+            "flags": [
+                "private"
+            ]
+        }
+    ],
+    "h_includes": [
+        "odb/dbId.h"
+    ],
+    "cpp_includes": [
+        "dbChipRegionInst.h",
+        "dbChipInst.h",
+        "dbChipBumpInst.h",
+        "dbChip.h"
+    ]
+}

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

@@ -16,6 +16,11 @@
         "name":"chip_region_inst_next_",
         "type":"dbId<_dbChipRegionInst>",
         "flags":["private"]
+      },
+      {
+        "name":"chip_bump_insts_",
+        "type":"dbId<_dbChipBumpInst>",
+        "flags":["private"]
       }
   ],
   "h_includes": [

src/odb/src/db/CMakeLists.txt

@@ -88,8 +88,11 @@ add_library(db
     dbBusPort.cpp
     dbCellEdgeSpacing.cpp
     dbChip.cpp
+    dbChipBump.cpp
+    dbChipBumpInst.cpp
     dbChipConn.cpp
     dbChipInst.cpp
+    dbChipNet.cpp
     dbChipRegion.cpp
     dbChipRegionInst.cpp
     dbDatabase.cpp
@@ -148,8 +151,10 @@ add_library(db
     dbTechLayerTwoWiresForbiddenSpcRule.cpp
     dbTechLayerWidthTableRule.cpp
     dbTechLayerWrongDirSpacingRule.cpp
+    dbChipBumpInstItr.cpp
     dbChipConnItr.cpp
     dbChipInstItr.cpp
+    dbChipNetItr.cpp
     dbChipRegionInstItr.cpp
     dbGroupInstItr.cpp
     dbGroupItr.cpp