Merge pull request #9115 from The-OpenROAD-Project-staging/odb-tidy

odb: clang-tidy src/db

Author: maliberty

src/odb/include/odb/db.h

@@ -1034,7 +1034,7 @@ class dbBlock : public dbObject
   ///
   /// Get ext corner name by the index in ext Db
   ///
-  void getExtCornerName(int corner, char* cName);
+  std::string getExtCornerName(int corner);
 
   ///
   /// Get the index in ext Db by name
@@ -6863,8 +6863,7 @@ class dbViaParams : private _dbViaParams
 {
  public:
   dbViaParams();
-  dbViaParams(const dbViaParams& p);
-  ~dbViaParams();
+  dbViaParams(const dbViaParams& p) = default;
 
   int getXCutSize() const;
   int getYCutSize() const;
@@ -10141,48 +10140,55 @@ class dbTechLayerCutSpacingTableDefRule : public dbObject
   bool isOppositeEnclosureResizeSpacingValid() const;
 
   // User Code Begin dbTechLayerCutSpacingTableDefRule
-  void addPrlForAlignedCutEntry(std::string from, std::string to);
+  void addPrlForAlignedCutEntry(const std::string& from, const std::string& to);
 
-  void addCenterToCenterEntry(std::string from, std::string to);
+  void addCenterToCenterEntry(const std::string& from, const std::string& to);
 
-  void addCenterAndEdgeEntry(std::string from, std::string to);
+  void addCenterAndEdgeEntry(const std::string& from, const std::string& to);
 
-  void addPrlEntry(std::string from, std::string to, int ccPrl);
+  void addPrlEntry(const std::string& from, const std::string& to, int ccPrl);
 
-  void addEndExtensionEntry(std::string cls, int ext);
+  void addEndExtensionEntry(const std::string& cls, int ext);
 
-  void addSideExtensionEntry(std::string cls, int ext);
+  void addSideExtensionEntry(const std::string& cls, int ext);
 
-  void addExactElignedEntry(std::string cls, int spacing);
+  void addExactElignedEntry(const std::string& cls, int spacing);
 
-  void addNonOppEncSpacingEntry(std::string cls, int spacing);
+  void addNonOppEncSpacingEntry(const std::string& cls, int spacing);
 
-  void addOppEncSpacingEntry(std::string cls, int rsz1, int rsz2, int spacing);
+  void addOppEncSpacingEntry(const std::string& cls,
+                             int rsz1,
+                             int rsz2,
+                             int spacing);
 
   dbTechLayer* getSecondLayer() const;
 
-  bool isCenterToCenter(std::string cutClass1, std::string cutClass2);
+  bool isCenterToCenter(const std::string& cutClass1,
+                        const std::string& cutClass2);
 
-  bool isCenterAndEdge(std::string cutClass1, std::string cutClass2);
+  bool isCenterAndEdge(const std::string& cutClass1,
+                       const std::string& cutClass2);
 
-  bool isPrlForAlignedCutClasses(std::string cutClass1, std::string cutClass2);
+  bool isPrlForAlignedCutClasses(const std::string& cutClass1,
+                                 const std::string& cutClass2);
 
   int getPrlEntry(const std::string& cutClass1, const std::string& cutClass2);
 
-  void setSpacingTable(std::vector<std::vector<std::pair<int, int>>> table,
-                       std::map<std::string, uint> row_map,
-                       std::map<std::string, uint> col_map);
+  void setSpacingTable(
+      const std::vector<std::vector<std::pair<int, int>>>& table,
+      const std::map<std::string, uint>& row_map,
+      const std::map<std::string, uint>& col_map);
 
   void getSpacingTable(std::vector<std::vector<std::pair<int, int>>>& table,
                        std::map<std::string, uint>& row_map,
                        std::map<std::string, uint>& col_map);
 
   int getMaxSpacing(std::string cutClass, bool SIDE) const;
 
-  int getExactAlignedSpacing(std::string cutClass) const;
+  int getExactAlignedSpacing(const std::string& cutClass) const;
 
-  int getMaxSpacing(std::string cutClass1,
-                    std::string cutClass2,
+  int getMaxSpacing(const std::string& cutClass1,
+                    const std::string& cutClass2,
                     LOOKUP_STRATEGY strategy = MAX) const;
 
   int getSpacing(std::string class1,
@@ -10208,7 +10214,7 @@ class dbTechLayerCutSpacingTableOrthRule : public dbObject
   void getSpacingTable(std::vector<std::pair<int, int>>& tbl) const;
 
   // User Code Begin dbTechLayerCutSpacingTableOrthRule
-  void setSpacingTable(std::vector<std::pair<int, int>> tbl);
+  void setSpacingTable(const std::vector<std::pair<int, int>>& tbl);
 
   static dbTechLayerCutSpacingTableOrthRule* create(dbTechLayer* parent);
 
@@ -10503,7 +10509,7 @@ class dbTechLayerMinCutRule : public dbObject
 
   // User Code Begin dbTechLayerMinCutRule
 
-  void setCutsPerCutClass(std::string cut_class, int num_cuts);
+  void setCutsPerCutClass(const std::string& cut_class, int num_cuts);
 
   static dbTechLayerMinCutRule* create(dbTechLayer* layer);
 
@@ -10930,17 +10936,17 @@ class dbTechLayerSpacingTablePrlRule : public dbObject
 
   static void destroy(dbTechLayerSpacingTablePrlRule* rule);
 
-  void setTable(std::vector<int> width_tbl,
-                std::vector<int> length_tbl,
-                std::vector<std::vector<int>> spacing_tbl,
-                std::map<uint, std::pair<int, int>> excluded_map);
+  void setTable(const std::vector<int>& width_tbl,
+                const std::vector<int>& length_tbl,
+                const std::vector<std::vector<int>>& spacing_tbl,
+                const std::map<uint, std::pair<int, int>>& excluded_map);
   void getTable(std::vector<int>& width_tbl,
                 std::vector<int>& length_tbl,
                 std::vector<std::vector<int>>& spacing_tbl,
                 std::map<uint, std::pair<int, int>>& excluded_map);
 
   void setSpacingTableInfluence(
-      std::vector<std::tuple<int, int, int>> influence_tbl);
+      const std::vector<std::tuple<int, int, int>>& influence_tbl);
 
   int getSpacing(int width, int length) const;
 

src/odb/include/odb/dbShape.h

@@ -251,7 +251,6 @@ class dbWireShapeItr
 {
  public:
   dbWireShapeItr();
-  ~dbWireShapeItr();
 
   void begin(dbWire* wire);
   bool next(dbShape& shape);
@@ -311,7 +310,6 @@ class dbWirePathItr
 {
  public:
   dbWirePathItr();
-  ~dbWirePathItr();
 
   void begin(dbWire* wire);
   bool getNextPath(dbWirePath& path);
@@ -352,6 +350,16 @@ class dbInstShapeItr
   bool next(dbShape& shape);
 
  private:
+  enum State
+  {
+    kInit = 0,
+    kMtermItr = 1,
+    kMpinItr = 2,
+    kMboxItr = 3,
+    kObsItr = 4,
+    kViaBoxItr = 5,
+    kPinsDone = 6
+  };
   void getShape(dbBox* box, dbShape& shape);
   void getViaBox(dbBox* box, dbShape& shape);
 
@@ -361,7 +369,7 @@ class dbInstShapeItr
   dbSet<dbBox>::iterator box_itr_;
   dbSet<dbMTerm>::iterator mterm_itr_;
   dbSet<dbMPin>::iterator mpin_itr_;
-  int state_;
+  State state_;
   dbInst* inst_;
   dbMaster* master_;
   dbMPin* _mpin_;
@@ -372,7 +380,7 @@ class dbInstShapeItr
   dbSet<dbBox>::iterator via_box_itr_;
   Point via_pt_;
   bool expand_vias_;
-  int prev_state_;
+  State prev_state_;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -388,6 +396,14 @@ class dbITermShapeItr
   bool next(dbShape& shape);
 
  private:
+  enum State
+  {
+    kInit,
+    kMpinItr,
+    kMboxItr,
+    kViaBoxItr
+  };
+
   void getShape(dbBox* box, dbShape& shape);
   void getViaBox(dbBox* box, dbShape& shape);
 
@@ -396,7 +412,7 @@ class dbITermShapeItr
   dbMTerm* mterm_;
   dbSet<dbBox>::iterator box_itr_;
   dbSet<dbMPin>::iterator mpin_itr_;
-  int state_;
+  State state_;
   dbITerm* iterm_;
   dbMPin* mpin_;
   dbTransform transform_;
@@ -495,7 +511,7 @@ class dbHierInstShapeItr
                     bool draw_vias,
                     bool draw_segments);
   bool iterate_leaf(dbInst* inst, unsigned filter, int level);
-  void push_transform(dbTransform t);
+  void push_transform(const dbTransform& t);
   void transform(dbShape& shape);
 
   std::vector<dbTransform> transforms_;

src/odb/include/odb/dbViaParams.h

@@ -16,31 +16,30 @@ class dbOStream;
 class _dbViaParams
 {
  public:
-  _dbViaParams(const _dbViaParams& v);
-  _dbViaParams();
-  ~_dbViaParams();
+  _dbViaParams(const _dbViaParams& v) = default;
+  _dbViaParams() = default;
 
   bool operator==(const _dbViaParams& rhs) const;
   bool operator!=(const _dbViaParams& rhs) const { return !operator==(rhs); }
   friend dbOStream& operator<<(dbOStream& stream, const _dbViaParams& v);
   friend dbIStream& operator>>(dbIStream& stream, _dbViaParams& v);
 
-  int x_cut_size_;
-  int y_cut_size_;
-  int x_cut_spacing_;
-  int y_cut_spacing_;
-  int x_top_enclosure_;
-  int y_top_enclosure_;
-  int x_bot_enclosure_;
-  int y_bot_enclosure_;
-  int num_cut_rows_;
-  int num_cut_cols_;
-  int x_origin_;
-  int y_origin_;
-  int x_top_offset_;
-  int y_top_offset_;
-  int x_bot_offset_;
-  int y_bot_offset_;
+  int x_cut_size_{0};
+  int y_cut_size_{0};
+  int x_cut_spacing_{0};
+  int y_cut_spacing_{0};
+  int x_top_enclosure_{0};
+  int y_top_enclosure_{0};
+  int x_bot_enclosure_{0};
+  int y_bot_enclosure_{0};
+  int num_cut_rows_{1};
+  int num_cut_cols_{1};
+  int x_origin_{0};
+  int y_origin_{0};
+  int x_top_offset_{0};
+  int y_top_offset_{0};
+  int x_bot_offset_{0};
+  int y_bot_offset_{0};
   dbId<_dbTechLayer> top_layer_;
   dbId<_dbTechLayer> cut_layer_;
   dbId<_dbTechLayer> bot_layer_;

src/odb/include/odb/dbWireCodec.h

@@ -180,11 +180,6 @@ class dbWireEncoder
   ///
   dbWireEncoder();
 
-  ///
-  /// dbWireEncoder destructor:
-  ///
-  ~dbWireEncoder();
-
   ///
   /// Begin a new encoding.
   ///
@@ -515,11 +510,6 @@ class dbWireDecoder
   ///
   dbWireDecoder();
 
-  ///
-  /// Destroy a decoder.
-  ///
-  ~dbWireDecoder();
-
   ///
   /// Begin decoding a wire.
   ///

src/odb/include/odb/dbWireGraph.h

@@ -249,8 +249,7 @@ class dbWireGraph
     friend class dbWireGraph;
   };
 
-  dbWireGraph();
-  ~dbWireGraph();
+  dbWireGraph() = default;
 
   // Clear this graph.
   void clear();

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

@@ -6,7 +6,7 @@
   "fields": [
     {
       "name": "type",
-      "type": "uint",
+      "type": "PropTypeEnum",
       "bits": 4,
       "flags": ["private"]
     },

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

@@ -106,7 +106,7 @@ namespace odb {
     {% if 'flags' not in _struct
                     or ('no-serializer' not in _struct['flags']
                         and 'no-serializer-in' not in _struct['flags']) %}
-      {{- si.serializer_in(_struct, klass, _struct.name)}}
+      {{- si.serializer_in(_struct, klass, _struct.name, static=True)}}
     {% endif %}
   {% endfor %}
   {{- si.serializer_in(klass)}}
@@ -116,7 +116,7 @@ namespace odb {
     {% if 'flags' not in _struct
                     or ('no-serializer' not in _struct['flags']
                         and 'no-serializer-out' not in _struct['flags']) %}
-      {{- so.serializer_out(_struct, klass, _struct.name)}}
+      {{- so.serializer_out(_struct, klass, _struct.name, static=True)}}
     {% endif %}
   {% endfor %}
   {{- so.serializer_out(klass)}}

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

@@ -28,6 +28,9 @@ namespace odb {
   //User Code Begin Classes
   //User Code End Classes
 
+  //User Code Begin Types
+  //User Code End Types
+
   {{ macros.make_structs(klass, is_public=False) }}
   // User Code Begin Structs
   // User Code End Structs

src/odb/src/codeGenerator/templates/serializer_in.cpp

@@ -1,5 +1,6 @@
-{% macro serializer_in(klass, parent=None, comment_tag = "") %}
+{% macro serializer_in(klass, parent=None, comment_tag = "", static=False) %}
   {% set sname = (parent.name + "::" if parent else '_') + klass.name %}
+  {% if static %}static{% endif %}
   dbIStream& operator>>(dbIStream& stream, {{sname}}& obj)
   {
     {% for field in klass.fields %}

src/odb/src/codeGenerator/templates/serializer_out.cpp

@@ -1,5 +1,6 @@
-{% macro serializer_out(klass, parent=None, comment_tag = "") %}
+{% macro serializer_out(klass, parent=None, comment_tag = "", static=False) %}
   {% set sname = (parent.name + "::" if parent else '_') + klass.name %}
+  {% if static %}static{% endif %}
   dbOStream& operator<<(dbOStream& stream, const {{sname}}& obj)
   {
     {% if klass.ostream_scope %}