Merge pull request #9139 from The-OpenROAD-Project-staging/odb-rm-uint

odb: replace uint with uint32_t

Author: maliberty

src/odb/include/odb/db.h

@@ -4,6 +4,7 @@
 #pragma once
 
 #include <cstddef>
+#include <cstdint>
 #include <iterator>
 
 #include "odb/dbIterator.h"
@@ -68,15 +69,15 @@ class dbSetIterator<dbBlock>
  private:
   friend class dbSet<dbBlock>;
 
-  dbSetIterator(dbIterator* itr, uint id, dbObject* parent)
+  dbSetIterator(dbIterator* itr, uint32_t id, dbObject* parent)
   {
     itr_ = itr;
     cur_ = id;
     parent_ = parent;
   }
 
   dbIterator* itr_;
-  uint cur_;
+  uint32_t cur_;
   dbObject* parent_;
 };
 
@@ -107,7 +108,7 @@ class dbSet<dbBlock>
   ///
   /// Returns the number of items in this set.
   ///
-  uint size() { return itr_->size(parent_); }
+  uint32_t size() { return itr_->size(parent_); }
 
   ///
   /// Return a begin() iterator.
@@ -128,7 +129,7 @@ class dbSet<dbBlock>
   /// Returns the maximum number sequential elements the this set
   /// may iterate.
   ///
-  uint sequential() { return itr_->sequential(); }
+  uint32_t sequential() { return itr_->sequential(); }
 
   ///
   /// Returns true if this set is reversible.

src/odb/include/odb/dbBlockSet.h

@@ -4,6 +4,7 @@
 #pragma once
 
 #include <cstddef>
+#include <cstdint>
 #include <iterator>
 
 #include "odb/dbIterator.h"
@@ -68,16 +69,16 @@ class dbSetIterator<dbCCSeg>
  private:
   friend class dbSet<dbCCSeg>;
 
-  dbSetIterator(dbIterator* itr, uint id, uint pid)
+  dbSetIterator(dbIterator* itr, uint32_t id, uint32_t pid)
   {
     itr_ = itr;
     cur_ = id;
     pid_ = pid;
   }
 
   dbIterator* itr_;
-  uint cur_;
-  uint pid_;
+  uint32_t cur_;
+  uint32_t pid_;
 };
 
 template <>
@@ -110,7 +111,7 @@ class dbSet<dbCCSeg>
   ///
   /// Returns the number of items in this set.
   ///
-  uint size() { return itr_->size(parent_); }
+  uint32_t size() { return itr_->size(parent_); }
 
   ///
   /// Return a begin() iterator.
@@ -126,7 +127,7 @@ class dbSet<dbCCSeg>
   /// Returns the maximum number sequential elements the this set
   /// may iterate.
   ///
-  uint sequential() { return itr_->sequential(); }
+  uint32_t sequential() { return itr_->sequential(); }
 
   ///
   /// Returns true if this set is reversible.
@@ -147,7 +148,7 @@ class dbSet<dbCCSeg>
  private:
   dbIterator* itr_;
   dbObject* parent_;
-  uint pid_;
+  uint32_t pid_;
 };
 
 }  // namespace odb

src/odb/include/odb/dbCCSegSet.h

@@ -3,6 +3,7 @@
 
 #pragma once
 
+#include <cstdint>
 #include <string>
 
 #include "odb/db.h"
@@ -22,19 +23,19 @@ class dbExtControl : public dbObject
   bool _overCell;
   bool _extracted;
   bool _lefRC;
-  uint _cornerCnt;
-  uint _ccPreseveGeom;
-  uint _ccUp;
-  uint _couplingFlag;
+  uint32_t _cornerCnt;
+  uint32_t _ccPreseveGeom;
+  uint32_t _ccUp;
+  uint32_t _couplingFlag;
   double _coupleThreshold;
   double _mergeResBound;
   bool _mergeViaRes;
   bool _mergeParallelCC;
   bool _exttreePreMerg;
   double _exttreeMaxcap;
   bool _useDbSdb;
-  uint _CCnoPowerSource;
-  uint _CCnoPowerTarget;
+  uint32_t _CCnoPowerSource;
+  uint32_t _CCnoPowerTarget;
   bool _usingMetalPlanes;
   std::string _ruleFileName;
   std::string _extractedCornerList;

src/odb/include/odb/dbExtControl.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "odb/odb.h"
+#include <cstdint>
 
 namespace odb {
 
@@ -17,12 +17,12 @@ class dbIterator
   virtual bool reversible() const = 0;
   virtual bool orderReversed() const = 0;
   virtual void reverse(dbObject* parent) = 0;
-  virtual uint sequential() const = 0;
-  virtual uint size(dbObject* parent) const = 0;
-  virtual uint begin(dbObject* parent) const = 0;
-  virtual uint end(dbObject* parent) const = 0;
-  virtual uint next(uint id, ...) const = 0;
-  virtual dbObject* getObject(uint id, ...) = 0;
+  virtual uint32_t sequential() const = 0;
+  virtual uint32_t size(dbObject* parent) const = 0;
+  virtual uint32_t begin(dbObject* parent) const = 0;
+  virtual uint32_t end(dbObject* parent) const = 0;
+  virtual uint32_t next(uint32_t id, ...) const = 0;
+  virtual dbObject* getObject(uint32_t id, ...) = 0;
 };
 
 }  // namespace odb

src/odb/include/odb/dbIterator.h

@@ -4,6 +4,7 @@
 #pragma once
 
 #include <cassert>
+#include <cstdint>
 #include <map>
 #include <vector>
 
@@ -52,7 +53,7 @@ inline const D& dbMap<T, D>::operator[](T* object) const
     return (*itr).second;
   }
 
-  uint idx = object->getId();
+  uint32_t idx = object->getId();
   assert(idx && (idx < _vector->size()));
   return (*_vector)[idx];
 }
@@ -64,7 +65,7 @@ inline D& dbMap<T, D>::operator[](T* object)
     return map_->at(object);
   }
 
-  uint idx = object->getId();
+  uint32_t idx = object->getId();
   assert(idx && (idx < _vector->size()));
   return (*_vector)[idx];
 }

src/odb/include/odb/dbMap.hpp

@@ -9,7 +9,6 @@
 
 #include "boost/multi_array.hpp"
 #include "odb/dbStream.h"
-#include "odb/odb.h"
 
 namespace odb {
 
@@ -18,17 +17,17 @@ class dbMatrix
 {
  public:
   dbMatrix() = default;
-  dbMatrix(uint n, uint m);
+  dbMatrix(int n, int m);
 
-  uint numRows() const { return matrix_.shape()[0]; }
-  uint numCols() const { return matrix_.shape()[1]; }
-  uint numElems() const;
+  int numRows() const { return matrix_.shape()[0]; }
+  int numCols() const { return matrix_.shape()[1]; }
+  int numElems() const;
 
-  void resize(uint n, uint m);
+  void resize(int n, int m);
   void clear();
 
-  const T& operator()(uint i, uint j) const;
-  T& operator()(uint i, uint j);
+  const T& operator()(int i, int j) const;
+  T& operator()(int i, int j);
 
   dbMatrix<T>& operator=(const dbMatrix<T>& rhs);
 
@@ -45,8 +44,8 @@ inline dbOStream& operator<<(dbOStream& stream, const dbMatrix<T>& mat)
   stream << mat.numRows();
   stream << mat.numCols();
 
-  for (uint i = 0; i < mat.numRows(); ++i) {
-    for (uint j = 0; j < mat.numCols(); ++j) {
+  for (int i = 0; i < mat.numRows(); ++i) {
+    for (int j = 0; j < mat.numCols(); ++j) {
       stream << mat(i, j);
     }
   }
@@ -57,15 +56,15 @@ inline dbOStream& operator<<(dbOStream& stream, const dbMatrix<T>& mat)
 template <class T>
 inline dbIStream& operator>>(dbIStream& stream, dbMatrix<T>& mat)
 {
-  uint n;
-  uint m;
+  int n;
+  int m;
 
   stream >> n;
   stream >> m;
   mat.resize(n, m);
 
-  for (uint i = 0; i < mat.numRows(); ++i) {
-    for (uint j = 0; j < mat.numCols(); ++j) {
+  for (int i = 0; i < mat.numRows(); ++i) {
+    for (int j = 0; j < mat.numCols(); ++j) {
       stream >> mat(i, j);
     }
   }
@@ -74,7 +73,7 @@ inline dbIStream& operator>>(dbIStream& stream, dbMatrix<T>& mat)
 }
 
 template <class T>
-inline dbMatrix<T>::dbMatrix(uint n, uint m)
+inline dbMatrix<T>::dbMatrix(int n, int m)
 {
   resize(n, m);
 }
@@ -86,25 +85,25 @@ inline void dbMatrix<T>::clear()
 }
 
 template <class T>
-inline uint dbMatrix<T>::numElems() const
+inline int dbMatrix<T>::numElems() const
 {
   return matrix_.num_elements();
 }
 
 template <class T>
-inline void dbMatrix<T>::resize(uint n, uint m)
+inline void dbMatrix<T>::resize(int n, int m)
 {
   matrix_.resize(boost::extents[n][m]);
 }
 
 template <class T>
-inline const T& dbMatrix<T>::operator()(uint i, uint j) const
+inline const T& dbMatrix<T>::operator()(int i, int j) const
 {
   return matrix_[i][j];
 }
 
 template <class T>
-inline T& dbMatrix<T>::operator()(uint i, uint j)
+inline T& dbMatrix<T>::operator()(int i, int j)
 {
   return matrix_[i][j];
 }

src/odb/include/odb/dbMatrix.h

@@ -4,6 +4,7 @@
 #pragma once
 
 #include <cstddef>
+#include <cstdint>
 #include <iterator>
 
 #include "odb/dbIterator.h"
@@ -68,15 +69,15 @@ class dbSetIterator<dbNet>
  private:
   friend class dbSet<dbNet>;
 
-  dbSetIterator(dbIterator* itr, uint id, dbObject* parent)
+  dbSetIterator(dbIterator* itr, uint32_t id, dbObject* parent)
   {
     itr_ = itr;
     cur_ = id;
     parent_ = parent;
   }
 
   dbIterator* itr_;
-  uint cur_;
+  uint32_t cur_;
   dbObject* parent_;
 };
 
@@ -107,7 +108,7 @@ class dbSet<dbNet>
   ///
   /// Returns the number of items in this set.
   ///
-  uint size() { return itr_->size(parent_); }
+  uint32_t size() { return itr_->size(parent_); }
 
   ///
   /// Return a begin() iterator.
@@ -123,7 +124,7 @@ class dbSet<dbNet>
   /// Returns the maximum number sequential elements the this set
   /// may iterate.
   ///
-  uint sequential() { return itr_->sequential(); }
+  uint32_t sequential() { return itr_->sequential(); }
 
   ///
   /// Returns true if this set is reversible.

src/odb/include/odb/dbNetSet.h

@@ -3,10 +3,9 @@
 
 #pragma once
 
+#include <cstdint>
 #include <string>
 
-#include "odb/odb.h"
-
 namespace utl {
 class Logger;
 }
@@ -163,7 +162,7 @@ class dbObject
  public:
   dbObjectType getObjectType() const;
   dbDatabase* getDb() const;
-  uint getId() const;
+  uint32_t getId() const;
   const char* getTypeName() const;
   std::string getName() const;
   bool isValid() const;