Merge pull request #9096 from The-OpenROAD-Project-staging/odb-naming

Odb naming

Author: maliberty

src/odb/src/codeGenerator/gen.py

@@ -202,7 +202,7 @@ def add_field_attributes(field, klass, flags_struct, schema):
 
     # For fields that we need to free/destroy in the destructor
     if (
-        field["name"] == "_name"
+        field["name"] == "name_"
         and "no-destruct" not in field["flags"]
         or "table" in field
     ):

src/odb/src/codeGenerator/schema.json

@@ -455,7 +455,7 @@
       "parent":"dbDatabase",
       "child":"dbProperty",
       "type":"1_n",
-      "tbl_name":"_prop_tbl",
+      "tbl_name":"prop_tbl_",
       "flags": ["no-serial"]
     },
     {

src/odb/src/codeGenerator/schema/tech/dbCellEdgeSpacing.json

@@ -4,7 +4,7 @@
   "fields": [
     {
       "type": "bit",
-      "name": "except_abutted_"
+      "name": "except_abutted"
     },
     {
       "type": "bit",

src/odb/src/codeGenerator/templates/impl.cpp

@@ -146,7 +146,7 @@ namespace odb {
 
     {% for field in klass.fields %}
       {% if field.table %} 
-        {{field.name}}->collectMemInfo(info.children_["{{field.name}}"]);
+        {{field.name}}->collectMemInfo(info.children["{{field.name}}"]);
       {% endif %}
     {% endfor %}
 

src/odb/src/db/dbAccessPoint.cpp

@@ -140,12 +140,12 @@ void _dbAccessPoint::collectMemInfo(MemInfo& info)
   info.size += sizeof(*this);
 
   // User Code Begin collectMemInfo
-  info.children_["iterms"].add(iterms_);
-  MemInfo& via_info = info.children_["vias"];
+  info.children["iterms"].add(iterms_);
+  MemInfo& via_info = info.children["vias"];
   for (const auto& v : vias_) {
     via_info.add(v);
   }
-  info.children_["path_segs"].add(path_segs_);
+  info.children["path_segs"].add(path_segs_);
   // User Code End collectMemInfo
 }
 

src/odb/src/db/dbBPin.cpp

@@ -284,7 +284,7 @@ void _dbBPin::collectMemInfo(MemInfo& info)
   info.cnt++;
   info.size += sizeof(*this);
 
-  info.children_["ap"].add(aps_);
+  info.children["ap"].add(aps_);
 }
 
 void _dbBPin::removeBox(_dbBox* box)

src/odb/src/db/dbBTerm.cpp

@@ -924,7 +924,7 @@ void _dbBTerm::collectMemInfo(MemInfo& info)
   info.cnt++;
   info.size += sizeof(*this);
 
-  info.children_["name"].add(name_);
+  info.children["name"].add(name_);
 }
 
 dbSet<dbBTerm>::iterator dbBTerm::destroy(dbSet<dbBTerm>::iterator& itr)

src/odb/src/db/dbBlock.cpp

@@ -137,20 +137,20 @@ namespace odb {
 
 struct OldTransform
 {
-  int _orient;
-  int _originX;
-  int _originY;
-  int _sizeX;
-  int _sizeY;
+  int orient;
+  int originX;
+  int originY;
+  int sizeX;
+  int sizeY;
 };
 
 dbIStream& operator>>(dbIStream& stream, OldTransform& t)
 {
-  stream >> t._orient;
-  stream >> t._originX;
-  stream >> t._originY;
-  stream >> t._sizeX;
-  stream >> t._sizeY;
+  stream >> t.orient;
+  stream >> t.originX;
+  stream >> t.originY;
+  stream >> t.sizeX;
+  stream >> t.sizeY;
   return stream;
 }
 
@@ -3711,75 +3711,75 @@ void _dbBlock::collectMemInfo(MemInfo& info)
   info.cnt++;
   info.size += sizeof(*this);
 
-  info.children_["name"].add(name_);
-  info.children_["corner_name"].add(corner_name_list_);
-  info.children_["blocked_regions_for_pins"].add(blocked_regions_for_pins_);
-
-  info.children_["net_hash"].add(net_hash_);
-  info.children_["inst_hash"].add(inst_hash_);
-  info.children_["module_hash"].add(module_hash_);
-  info.children_["modinst_hash"].add(modinst_hash_);
-  info.children_["powerdomain_hash"].add(powerdomain_hash_);
-  info.children_["logicport_hash"].add(logicport_hash_);
-  info.children_["powerswitch_hash"].add(powerswitch_hash_);
-  info.children_["isolation_hash"].add(isolation_hash_);
-  info.children_["levelshifter_hash"].add(levelshifter_hash_);
-  info.children_["group_hash"].add(group_hash_);
-  info.children_["inst_hdr_hash"].add(inst_hdr_hash_);
-  info.children_["bterm_hash"].add(bterm_hash_);
-
-  info.children_["children"].add(children_);
-  info.children_["component_mask_shift"].add(component_mask_shift_);
-
-  bterm_tbl_->collectMemInfo(info.children_["bterm"]);
-  iterm_tbl_->collectMemInfo(info.children_["iterm"]);
-  net_tbl_->collectMemInfo(info.children_["net"]);
-  inst_hdr_tbl_->collectMemInfo(info.children_["inst_hdr"]);
-  inst_tbl_->collectMemInfo(info.children_["inst"]);
-  box_tbl_->collectMemInfo(info.children_["box"]);
-  via_tbl_->collectMemInfo(info.children_["via"]);
-  gcell_grid_tbl_->collectMemInfo(info.children_["gcell_grid"]);
-  track_grid_tbl_->collectMemInfo(info.children_["track_grid"]);
-  obstruction_tbl_->collectMemInfo(info.children_["obstruction"]);
-  blockage_tbl_->collectMemInfo(info.children_["blockage"]);
-  wire_tbl_->collectMemInfo(info.children_["wire"]);
-  swire_tbl_->collectMemInfo(info.children_["swire"]);
-  sbox_tbl_->collectMemInfo(info.children_["sbox"]);
-  row_tbl_->collectMemInfo(info.children_["row"]);
-  fill_tbl_->collectMemInfo(info.children_["fill"]);
-  region_tbl_->collectMemInfo(info.children_["region"]);
-  hier_tbl_->collectMemInfo(info.children_["hier"]);
-  bpin_tbl_->collectMemInfo(info.children_["bpin"]);
-  non_default_rule_tbl_->collectMemInfo(info.children_["non_default_rule"]);
-  layer_rule_tbl_->collectMemInfo(info.children_["layer_rule"]);
-  prop_tbl_->collectMemInfo(info.children_["prop"]);
-  module_tbl_->collectMemInfo(info.children_["module"]);
-  powerdomain_tbl_->collectMemInfo(info.children_["powerdomain"]);
-  logicport_tbl_->collectMemInfo(info.children_["logicport"]);
-  powerswitch_tbl_->collectMemInfo(info.children_["powerswitch"]);
-  isolation_tbl_->collectMemInfo(info.children_["isolation"]);
-  levelshifter_tbl_->collectMemInfo(info.children_["levelshifter"]);
-  modinst_tbl_->collectMemInfo(info.children_["modinst"]);
-  group_tbl_->collectMemInfo(info.children_["group"]);
-  ap_tbl_->collectMemInfo(info.children_["ap"]);
-  global_connect_tbl_->collectMemInfo(info.children_["global_connect"]);
-  guide_tbl_->collectMemInfo(info.children_["guide"]);
-  net_tracks_tbl_->collectMemInfo(info.children_["net_tracks"]);
-  dft_tbl_->collectMemInfo(info.children_["dft"]);
-  modbterm_tbl_->collectMemInfo(info.children_["modbterm"]);
-  moditerm_tbl_->collectMemInfo(info.children_["moditerm"]);
-  modnet_tbl_->collectMemInfo(info.children_["modnet"]);
-  busport_tbl_->collectMemInfo(info.children_["busport"]);
-  cap_node_tbl_->collectMemInfo(info.children_["cap_node"]);
-  r_seg_tbl_->collectMemInfo(info.children_["r_seg"]);
-  cc_seg_tbl_->collectMemInfo(info.children_["cc_seg"]);
-
-  name_cache_->collectMemInfo(info.children_["name_cache"]);
-  info.children_["r_val"].add(*r_val_tbl_);
-  info.children_["c_val"].add(*c_val_tbl_);
-  info.children_["cc_val"].add(*cc_val_tbl_);
-
-  info.children_["module_name_id_map"].add(module_name_id_map_);
+  info.children["name"].add(name_);
+  info.children["corner_name"].add(corner_name_list_);
+  info.children["blocked_regions_for_pins"].add(blocked_regions_for_pins_);
+
+  info.children["net_hash"].add(net_hash_);
+  info.children["inst_hash"].add(inst_hash_);
+  info.children["module_hash"].add(module_hash_);
+  info.children["modinst_hash"].add(modinst_hash_);
+  info.children["powerdomain_hash"].add(powerdomain_hash_);
+  info.children["logicport_hash"].add(logicport_hash_);
+  info.children["powerswitch_hash"].add(powerswitch_hash_);
+  info.children["isolation_hash"].add(isolation_hash_);
+  info.children["levelshifter_hash"].add(levelshifter_hash_);
+  info.children["group_hash"].add(group_hash_);
+  info.children["inst_hdr_hash"].add(inst_hdr_hash_);
+  info.children["bterm_hash"].add(bterm_hash_);
+
+  info.children["children"].add(children_);
+  info.children["component_mask_shift"].add(component_mask_shift_);
+
+  bterm_tbl_->collectMemInfo(info.children["bterm"]);
+  iterm_tbl_->collectMemInfo(info.children["iterm"]);
+  net_tbl_->collectMemInfo(info.children["net"]);
+  inst_hdr_tbl_->collectMemInfo(info.children["inst_hdr"]);
+  inst_tbl_->collectMemInfo(info.children["inst"]);
+  box_tbl_->collectMemInfo(info.children["box"]);
+  via_tbl_->collectMemInfo(info.children["via"]);
+  gcell_grid_tbl_->collectMemInfo(info.children["gcell_grid"]);
+  track_grid_tbl_->collectMemInfo(info.children["track_grid"]);
+  obstruction_tbl_->collectMemInfo(info.children["obstruction"]);
+  blockage_tbl_->collectMemInfo(info.children["blockage"]);
+  wire_tbl_->collectMemInfo(info.children["wire"]);
+  swire_tbl_->collectMemInfo(info.children["swire"]);
+  sbox_tbl_->collectMemInfo(info.children["sbox"]);
+  row_tbl_->collectMemInfo(info.children["row"]);
+  fill_tbl_->collectMemInfo(info.children["fill"]);
+  region_tbl_->collectMemInfo(info.children["region"]);
+  hier_tbl_->collectMemInfo(info.children["hier"]);
+  bpin_tbl_->collectMemInfo(info.children["bpin"]);
+  non_default_rule_tbl_->collectMemInfo(info.children["non_default_rule"]);
+  layer_rule_tbl_->collectMemInfo(info.children["layer_rule"]);
+  prop_tbl_->collectMemInfo(info.children["prop"]);
+  module_tbl_->collectMemInfo(info.children["module"]);
+  powerdomain_tbl_->collectMemInfo(info.children["powerdomain"]);
+  logicport_tbl_->collectMemInfo(info.children["logicport"]);
+  powerswitch_tbl_->collectMemInfo(info.children["powerswitch"]);
+  isolation_tbl_->collectMemInfo(info.children["isolation"]);
+  levelshifter_tbl_->collectMemInfo(info.children["levelshifter"]);
+  modinst_tbl_->collectMemInfo(info.children["modinst"]);
+  group_tbl_->collectMemInfo(info.children["group"]);
+  ap_tbl_->collectMemInfo(info.children["ap"]);
+  global_connect_tbl_->collectMemInfo(info.children["global_connect"]);
+  guide_tbl_->collectMemInfo(info.children["guide"]);
+  net_tracks_tbl_->collectMemInfo(info.children["net_tracks"]);
+  dft_tbl_->collectMemInfo(info.children["dft"]);
+  modbterm_tbl_->collectMemInfo(info.children["modbterm"]);
+  moditerm_tbl_->collectMemInfo(info.children["moditerm"]);
+  modnet_tbl_->collectMemInfo(info.children["modnet"]);
+  busport_tbl_->collectMemInfo(info.children["busport"]);
+  cap_node_tbl_->collectMemInfo(info.children["cap_node"]);
+  r_seg_tbl_->collectMemInfo(info.children["r_seg"]);
+  cc_seg_tbl_->collectMemInfo(info.children["cc_seg"]);
+
+  name_cache_->collectMemInfo(info.children["name_cache"]);
+  info.children["r_val"].add(*r_val_tbl_);
+  info.children["c_val"].add(*c_val_tbl_);
+  info.children["cc_val"].add(*cc_val_tbl_);
+
+  info.children["module_name_id_map"].add(module_name_id_map_);
 }
 
 void _dbBlock::ensureConstraintRegion(const Direction2D& edge,

src/odb/src/db/dbBox.cpp

@@ -950,8 +950,8 @@ dbBox* dbBox::create(dbTechVia* via_,
   }
 
   // link box to via
-  box->next_box_ = via->_boxes;
-  via->_boxes = box->getOID();
+  box->next_box_ = via->boxes_;
+  via->boxes_ = box->getOID();
   return (dbBox*) box;
 }
 

src/odb/src/db/dbBoxItr.cpp

@@ -113,7 +113,7 @@ void dbBoxItr<page_size>::reverse(dbObject* parent)
 
     case dbTechViaObj: {
       _dbTechVia* via = (_dbTechVia*) parent;
-      uint id = via->_boxes;
+      uint id = via->boxes_;
       uint list = 0;
 
       while (id != 0) {
@@ -124,7 +124,7 @@ void dbBoxItr<page_size>::reverse(dbObject* parent)
         id = n;
       }
 
-      via->_boxes = list;
+      via->boxes_ = list;
       break;
     }
 
@@ -237,7 +237,7 @@ uint dbBoxItr<page_size>::begin(dbObject* parent) const
 
     case dbTechViaObj: {
       _dbTechVia* via = (_dbTechVia*) parent;
-      return via->_boxes;
+      return via->boxes_;
     }
 
     case dbBPinObj: {