Merge pull request The-OpenROAD-Project#6754 from The-OpenROAD-Project-staging/odb-codegen2

Odb codegen2

Author: maliberty

src/odb/include/odb/db.h

@@ -494,15 +494,6 @@ class dbDatabase : public dbObject
   ///
   static void destroy(dbDatabase* db);
 
-  ///
-  /// Create a duplicate (IN-MEMORY) instance of a database.
-  ///
-  /// WARNING: This action may result in an out-of-memory condition if
-  ///          there is not enough memory (or swap space) to maintain
-  ///          multiple in-core databases.
-  ///
-  static dbDatabase* duplicate(dbDatabase* db);
-
   ///
   /// Translate a database-id back to a pointer.
   ///
@@ -1580,17 +1571,6 @@ class dbBlock : public dbObject
   void clearUserInstFlags();
 
  public:
-  ///
-  /// This method copies the via-table from the src block to the destination
-  /// block.
-  ///
-  /// WARNING: This method deletes any vias previously defined in the
-  /// destination block.
-  ///          If there are wire which reference these vias, the references will
-  ///          be left dangling.
-  ///
-  static void copyViaTable(dbBlock* dst, dbBlock* src);
-
   ///
   /// Create a chip's top-block. Returns nullptr of a top-block already
   /// exists.

src/odb/src/codeGenerator/templates/db.h

@@ -34,15 +34,7 @@ class {{klass.name}} : public {{klass.type}}
 
     {% endif %}
     {% if 'no-get' not in field.flags %}
-      {% if field.dbSetGetter %}
-        dbSet<{{field.type}}> get{{field.functional_name}}() const;
-      {% elif field.isPassByRef %}
-        void {{field.getterFunctionName}}({{field.getterReturnType}}& tbl) const;
-      {% elif field.isHashTable %}
-        {{field.getterReturnType}} {{field.getterFunctionName}}(const char* name) const;
-      {% else %}
-        {{field.getterReturnType}} {{field.getterFunctionName}}() const;
-      {% endif %}
+      {{ macros.getter_signature(field) }};
     {% endif %}
 
   {% endfor %}

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

@@ -1,3 +1,4 @@
+{% import 'macros' as macros %}
 ///////////////////////////////////////////////////////////////////////////////
 // BSD 3-Clause License
 //
@@ -133,23 +134,6 @@ namespace odb {
     // User Code End Constructor
   }
 
-  _{{klass.name}}::_{{klass.name}}(_dbDatabase* db, const _{{klass.name}}& r)
-  {
-    {% for field in klass.fields %}
-      {% for component in field.components %}
-        {% if field.table %}
-          {{field.name}} = new dbTable<_{{field.type}}>(db, this, *r.{{field.name}});
-        {% elif field.isHashTable %}
-          {{field.name}}.setTable({{field.table_name}});
-        {% else %}
-          {{component}}=r.{{component}};
-        {% endif %}
-      {% endfor %}
-    {% endfor %}
-    //User Code Begin CopyConstructor
-    //User Code End CopyConstructor
-  }
-
   {% for _struct in klass.structs %}
     {% if 'flags' not in _struct or ('no-serializer' not in _struct['flags'] and 'no-serializer-in' not in _struct['flags']) %}
       {% set sname = klass.name+'::'+_struct.name %}
@@ -256,27 +240,18 @@ namespace odb {
     {% endif %}
 
     {% if 'no-get' not in field.flags %}
+      {{- macros.getter_signature(field, klass) -}}
+      {
       {% if field.dbSetGetter %}
-        dbSet<{{field.type}}> {{klass.name}}::get{{field.functional_name}}() const
-        {
           _{{klass.name}}* obj = (_{{klass.name}}*)this;
           return dbSet<{{field.type}}>(obj, obj->{{field.name}});
-        }
       {% elif field.isPassByRef %}
-        void {{klass.name}}::{{field.getterFunctionName}}({{field.getterReturnType}}& tbl) const
-        {
           _{{klass.name}}* obj = (_{{klass.name}}*)this;
           tbl = obj->{{field.name}};
-        }
       {% elif field.isHashTable %}
-        {{field.getterReturnType}} {{klass.name}}::{{field.getterFunctionName}}(const char* name) const
-        {
           _{{klass.name}}* obj = (_{{klass.name}}*)this;
           return ({{field.getterReturnType}}) obj->{{field.name}}.find(name);
-        }
       {% else %}
-        {{field.getterReturnType}} {{klass.name}}::{{field.getterFunctionName}}({% if field.isHashTable %}const char* name{% endif %}) const
-        {
           _{{klass.name}}* obj = (_{{klass.name}}*)this;
           {% if field.isRef %}
             if(obj->{{field.name}} == 0) {
@@ -289,8 +264,8 @@ namespace odb {
           {% else %}
             return obj->{{field.name}};
           {% endif %}
-        }
       {% endif %}
+      }
     {% endif %}
   {% endfor %}
 

src/odb/src/codeGenerator/templates/impl.h

@@ -67,13 +67,10 @@ namespace odb {
     // User Code Begin Enums
     // User Code End Enums
 
-    _{{klass.name}}(_dbDatabase*, const _{{klass.name}}& r);
     _{{klass.name}}(_dbDatabase*);
 
     {% if klass.needs_non_default_destructor %}
       ~_{{klass.name}}();
-    {% else %}
-      ~_{{klass.name}}() = default;
     {% endif %}
 
     bool operator==(const _{{klass.name}}& rhs) const;
@@ -87,12 +84,12 @@ namespace odb {
     // User Code End Methods
 
     {% for field in klass.fields %}
-      {% if field.table %} 
-        dbTable<_{{field.type}}>* {{field.name}}; 
+      {% if "comment" in field %}
+        {{field.comment}}
+      {% endif %}
+      {% if field.table %}
+        dbTable<_{{field.type}}>* {{field.name}};
       {% else %}
-        {% if "comment" in field %}
-          {{field.comment}}
-        {% endif %}
         {{field.type}} {{field.name}};
       {% endif %}
     {% endfor %}

src/odb/src/codeGenerator/templates/itr.cpp

@@ -34,6 +34,7 @@
 #include "{{itr.name}}.h"
 #include "{{itr.parentObject}}.h"
 #include "dbTable.h"
+#include "dbTable.hpp"
 {% for include in itr.includes %}
   #include "{{include}}"
 {% endfor %}

src/odb/src/codeGenerator/templates/macros

@@ -30,3 +30,16 @@
     {% endif %}
   {% endfor %}
 {%- endmacro %}
+
+{% macro getter_signature(field, klass=None) -%}
+  {% if klass %}{% set prefix = klass.name + "::" %}{% endif %}
+  {% if field.dbSetGetter %}
+    dbSet<{{field.type}}> {{prefix}}get{{field.functional_name}}() const
+  {% elif field.isPassByRef %}
+    void {{prefix}}{{field.getterFunctionName}}({{field.getterReturnType}}& tbl) const
+  {% elif field.isHashTable %}
+    {{field.getterReturnType}} {{prefix}}{{field.getterFunctionName}}(const char* name) const
+  {% else %}
+    {{field.getterReturnType}} {{prefix}}{{field.getterFunctionName}}() const
+  {% endif %}
+{%- endmacro %}

src/odb/src/db/dbAccessPoint.cpp

@@ -115,21 +115,6 @@ _dbAccessPoint::_dbAccessPoint(_dbDatabase* db)
   // User Code End Constructor
 }
 
-_dbAccessPoint::_dbAccessPoint(_dbDatabase* db, const _dbAccessPoint& r)
-{
-  point_ = r.point_;
-  layer_ = r.layer_;
-  lib_ = r.lib_;
-  master_ = r.master_;
-  mpin_ = r.mpin_;
-  bpin_ = r.bpin_;
-  // User Code Begin CopyConstructor
-  iterms_ = r.iterms_;
-  low_type_ = r.low_type_;
-  high_type_ = r.high_type_;
-  // User Code End CopyConstructor
-}
-
 dbIStream& operator>>(dbIStream& stream, _dbAccessPoint& obj)
 {
   stream >> obj.point_;

src/odb/src/db/dbAccessPoint.h

@@ -58,11 +58,8 @@ class _dbObject;
 class _dbAccessPoint : public _dbObject
 {
  public:
-  _dbAccessPoint(_dbDatabase*, const _dbAccessPoint& r);
   _dbAccessPoint(_dbDatabase*);
 
-  ~_dbAccessPoint() = default;
-
   bool operator==(const _dbAccessPoint& rhs) const;
   bool operator!=(const _dbAccessPoint& rhs) const { return !operator==(rhs); }
   bool operator<(const _dbAccessPoint& rhs) const;

src/odb/src/db/dbBPinItr.cpp

@@ -36,6 +36,7 @@
 #include "dbBTerm.h"
 #include "dbBlock.h"
 #include "dbTable.h"
+#include "dbTable.hpp"
 
 namespace odb {
 

src/odb/src/db/dbBTermItr.cpp

@@ -36,6 +36,7 @@
 #include "dbBlock.h"
 #include "dbNet.h"
 #include "dbTable.h"
+#include "dbTable.hpp"
 
 namespace odb {