Merge pull request #8922 from The-OpenROAD-Project-staging/odb-refactor2

Odb refactor - name, next_entry, oid rename, dbBPin cleanup

Author: maliberty

src/Design.cc

@@ -3,6 +3,7 @@
 
 #include "ord/Design.h"
 
+#include <algorithm>
 #include <cmath>
 #include <cstdint>
 #include <istream>
@@ -224,7 +225,7 @@ std::uint64_t Design::getNetRoutedLength(odb::dbNet* net)
     for (odb::dbSWire* swire : net->getSWires()) {
       for (odb::dbSBox* wire : swire->getWires()) {
         if (wire != nullptr && !(wire->isVia())) {
-          route_length += wire->getLength();
+          route_length += std::max(wire->getDX(), wire->getDY());
         }
       }
     }

src/grt/src/GlobalRouter.cpp

@@ -1408,7 +1408,7 @@ std::vector<LayerId> GlobalRouter::findTransitionLayers()
     int via_width = 0;
     for (const auto box : default_vias[tech_layer]->getBoxes()) {
       if (box->getTechLayer() == tech_layer) {
-        via_width = vertical ? box->getWidth() : box->getLength();
+        via_width = vertical ? box->getDY() : box->getDX();
         break;
       }
     }
@@ -3487,17 +3487,17 @@ void getViaDims(std::map<odb::dbTechLayer*, odb::dbTechVia*> default_vias,
   if (default_vias.find(tech_layer) != default_vias.end()) {
     for (auto box : default_vias[tech_layer]->getBoxes()) {
       if (box->getTechLayer() == tech_layer) {
-        width_up = std::min(box->getWidth(), box->getLength());
-        prl_up = std::max(box->getWidth(), box->getLength());
+        width_up = std::min(box->getDX(), box->getDY());
+        prl_up = std::max(box->getDX(), box->getDY());
         break;
       }
     }
   }
   if (default_vias.find(bottom_layer) != default_vias.end()) {
     for (auto box : default_vias[bottom_layer]->getBoxes()) {
       if (box->getTechLayer() == tech_layer) {
-        width_down = std::min(box->getWidth(), box->getLength());
-        prl_down = std::max(box->getWidth(), box->getLength());
+        width_down = std::min(box->getDX(), box->getDY());
+        prl_down = std::max(box->getDX(), box->getDY());
         break;
       }
     }

src/odb/include/odb/db.h

@@ -264,8 +264,6 @@ class dbBox : public dbObject
   /// Get the height (yMax-yMin) of the box.
   ///
   uint getDY() const;
-  uint getWidth(uint dir = 1) const;
-  uint getLength(uint dir = 1) const;
 
   ///
   /// Set temporary flag visited
@@ -1674,7 +1672,7 @@ class dbBPin : public dbObject
   ///
   /// Get the placement status of this block-terminal.
   ///
-  dbPlacementStatus getPlacementStatus();
+  dbPlacementStatus getPlacementStatus() const;
 
   ///
   /// Set the placement status of this block-terminal.
@@ -1699,7 +1697,7 @@ class dbBPin : public dbObject
   ///
   /// Returns true if this bpin has an effective-width rule.
   ///
-  bool hasEffectiveWidth();
+  bool hasEffectiveWidth() const;
 
   ///
   /// Set the effective width rule.
@@ -1709,12 +1707,12 @@ class dbBPin : public dbObject
   ///
   /// Return the effective width rule.
   ///
-  int getEffectiveWidth();
+  int getEffectiveWidth() const;
 
   ///
   /// Returns true if this bpin has an min-spacing rule.
   ///
-  bool hasMinSpacing();
+  bool hasMinSpacing() const;
 
   ///
   /// Set the min spacing rule.
@@ -1724,7 +1722,7 @@ class dbBPin : public dbObject
   ///
   /// Return the min spacing rule.
   ///
-  int getMinSpacing();
+  int getMinSpacing() const;
 
   std::vector<dbAccessPoint*> getAccessPoints() const;
 

src/odb/src/codeGenerator/gen.py

@@ -89,7 +89,7 @@ def make_parent_hash_field(parent, relation, parent_field):
 
 def make_child_next_field(child, relation):
     """Adds a next entry field to the child of a hashed relationsip"""
-    inChildNextEntry = {"name": "_next_entry"}
+    inChildNextEntry = {"name": "next_entry_"}
     inChildNextEntry["type"] = "dbId<_" + relation["child"] + ">"
     inChildNextEntry["flags"] = ["private"]
     inChildNextEntry["flags"].extend(relation.get("flags", []))

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

@@ -3,7 +3,7 @@
     "needs_non_default_destructor" : "true",
     "fields": [
         {
-            "name":"_flags",
+            "name":"flags_",
             "type":"uint",
             "flags":["private"],
             "default":"0",

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

@@ -19,7 +19,7 @@
   ],
   "fields": [
     {
-      "name": "_name",
+      "name": "name_",
       "type": "char *",
       "schema": "db_schema_chip_extended",
       "default": "nullptr",
@@ -197,4 +197,4 @@
     "dbPropertyItr.h",
     "dbChipConn.h"
   ]
-} 
+} 

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

@@ -3,7 +3,7 @@
   "type":"dbObject",
   "fields":[
     {
-      "name":"_name",
+      "name":"name_",
       "type":"char *",
       "default": "nullptr",
       "flags":["no-set"]
@@ -15,7 +15,7 @@
       "flags":["no-set","no-get"]
     },
     {
-      "name":"_next_entry",
+      "name":"next_entry_",
       "type":"dbId<_dbGroup>",
       "flags":["no-set","no-get"]
     },

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

@@ -3,13 +3,13 @@
   "type":"dbObject",
   "fields":[
     {
-      "name":"_name",
+      "name":"name_",
       "type":"char *",
       "default": "nullptr",
       "flags":["no-set"]
     },
     {
-      "name":"_next_entry",
+      "name":"next_entry_",
       "type":"dbId<_dbIsolation>",
       "flags":["no-set","no-get"]
     },

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

@@ -3,13 +3,13 @@
   "type": "dbObject",
   "fields": [
     {
-      "name": "_name",
+      "name": "name_",
       "type": "char *",
       "default": "nullptr",
       "flags": ["no-set"]
     },
     {
-      "name": "_next_entry",
+      "name": "next_entry_",
       "type": "dbId<_dbLevelShifter>",
       "flags": ["no-set", "no-get"]
     },

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

@@ -3,13 +3,13 @@
   "type":"dbObject",
   "fields":[
     {
-      "name":"_name",
+      "name":"name_",
       "type":"char *",
       "default": "nullptr",
       "flags":["no-set"]
     },
     {
-      "name":"_next_entry",
+      "name":"next_entry_",
       "type":"dbId<_dbLogicPort>",
       "flags":["no-set","no-get"]
     },