Merge pull request #10570 from gadfort/odb-areas

odb: convert areas from double/int/uint to int64_t

Author: maliberty

src/dbSta/src/IpChecker.cc

@@ -660,7 +660,6 @@ void IpChecker::checkPinMinDimensions(odb::dbMaster* master)
 void IpChecker::checkPinMinArea(odb::dbMaster* master)
 {
   std::string master_name = master->getName();
-  int dbu_per_micron = db_->getTech()->getDbUnitsPerMicron();
 
   for (odb::dbMTerm* mterm : master->getMTerms()) {
     for (odb::dbMPin* mpin : mterm->getMPins()) {
@@ -670,10 +669,8 @@ void IpChecker::checkPinMinArea(odb::dbMaster* master)
           continue;
         }
 
-        // getArea() returns microns^2, convert to DBU^2
-        double min_area_um2 = layer->getArea();
-        int64_t min_area_dbu2 = static_cast<int64_t>(
-            min_area_um2 * dbu_per_micron * dbu_per_micron);
+        // getArea() returns DBU^2
+        const int64_t min_area_dbu2 = layer->getArea();
 
         odb::Rect rect = box->getBox();
         int64_t shape_area

src/drt/src/io/io.cpp

@@ -2167,8 +2167,7 @@ void io::Parser::addRoutingLayer(odb::dbTechLayer* layer)
   setRoutingLayerProperties(layer, tmpLayer);
   // read minArea rule
   if (layer->hasArea()) {
-    frCoord minArea = frCoord(round(layer->getArea() * getTech()->getDBUPerUU()
-                                    * getTech()->getDBUPerUU()));
+    frCoord minArea = frCoord(layer->getArea());
     std::unique_ptr<frConstraint> uCon
         = std::make_unique<frAreaConstraint>(minArea);
     auto rptr = static_cast<frAreaConstraint*>(uCon.get());
@@ -2226,7 +2225,7 @@ void io::Parser::addRoutingLayer(odb::dbTechLayer* layer)
           "minEnclosedArea constraint with width is not supported, skipped.");
       continue;
     }
-    frUInt4 _minEnclosedArea;
+    int64_t _minEnclosedArea;
     rule->getEnclosure(_minEnclosedArea);
     frCoord minEnclosedArea = _minEnclosedArea;
     auto minEnclosedAreaConstraint

src/grt/src/cugr/src/Layers.cpp

@@ -26,9 +26,8 @@ MetalLayer::MetalLayer(odb::dbTechLayer* tech_layer,
 
   // Design rules not parsed thoroughly
   // Min area
-  const int database_unit = tech_layer->getTech()->getDbUnitsPerMicron();
-  const int min_area = tech_layer->getArea() * database_unit * database_unit;
-  min_length_ = std::max(min_area / width_ - width_, 0);
+  const int64_t min_area = tech_layer->getArea();
+  min_length_ = std::max(static_cast<int>(min_area / width_) - width_, 0);
 
   // Parallel run spacing
   std::vector<std::vector<uint32_t>> spacing_table;

src/gui/src/dbDescriptors.cpp

@@ -3035,9 +3035,9 @@ Descriptor::Properties DbTechLayerDescriptor::getDBProperties(
                        Property::convert_dbu(layer->getSpacing(), true));
   }
   if (layer->hasArea()) {
-    props.emplace_back(
-        "Minimum area",
-        convertUnits(layer->getArea() * 1e-6 * 1e-6, true) + "m²");
+    const double dbu_per_meter = db_->getDbuPerMicron() * 1e6;
+    const double area = layer->getArea() / (dbu_per_meter * dbu_per_meter);
+    props.emplace_back("Minimum area", convertUnits(area, true) + "m²");
   }
   if (layer->getResistance() != 0.0) {
     props.emplace_back("Resistance",

src/odb/include/odb/db.h

@@ -6507,7 +6507,7 @@ class dbTechLayerSpacingRule : public dbObject
   bool getCutCenterToCenter() const;
   bool getCutSameNet() const;
   bool getCutParallelOverlap() const;
-  uint32_t getCutArea() const;
+  int64_t getCutArea() const;
 
   void setSameNetPgOnly(bool pgonly);
   bool getSameNetPgOnly();
@@ -6528,7 +6528,7 @@ class dbTechLayerSpacingRule : public dbObject
   void setCutCenterToCenter(bool c2c);
   void setCutSameNet(bool same_net);
   void setCutParallelOverlap(bool overlap);
-  void setCutArea(uint32_t area);
+  void setCutArea(int64_t area);
   void setEol(uint32_t width,
               uint32_t within,
               bool parallelEdge,
@@ -6591,8 +6591,8 @@ class dbTechMinCutRule : public dbObject
 class dbTechMinEncRule : public dbObject
 {
  public:
-  bool getEnclosure(uint32_t& area) const;
-  void setEnclosure(uint32_t area);
+  bool getEnclosure(int64_t& area) const;
+  void setEnclosure(int64_t area);
   bool getEnclosureWidth(uint32_t& width) const;
   void setEnclosureWidth(uint32_t width);
 
@@ -9437,8 +9437,8 @@ class dbTechLayer : public dbObject
   ///  reasonable default exists.
   ///
   bool hasArea() const;
-  double getArea() const;
-  void setArea(double area);
+  int64_t getArea() const;
+  void setArea(int64_t area);
 
   ///
   ///  Get/set MAXWIDTH parameter.  This interface is used when a
@@ -9576,9 +9576,9 @@ class dbTechLayer : public dbObject
 class dbTechLayerAreaRule : public dbObject
 {
  public:
-  void setArea(int area);
+  void setArea(int64_t area);
 
-  int getArea() const;
+  int64_t getArea() const;
 
   void setExceptMinWidth(int except_min_width);
 
@@ -10115,9 +10115,9 @@ class dbTechLayerCutSpacingRule : public dbObject
 
   uint32_t getParLength() const;
 
-  void setCutArea(int cut_area);
+  void setCutArea(int64_t cut_area);
 
-  int getCutArea() const;
+  int64_t getCutArea() const;
 
   void setCenterToCenter(bool center_to_center);
 
@@ -10737,9 +10737,9 @@ class dbTechLayerMinCutRule : public dbObject
 
   int getLengthWithinDist() const;
 
-  void setArea(int area);
+  void setArea(int64_t area);
 
-  int getArea() const;
+  int64_t getArea() const;
 
   void setAreaWithinDist(int area_within_dist);
 

src/odb/include/odb/dbStream.h

@@ -73,6 +73,12 @@ class dbOStream
     return *this;
   }
 
+  dbOStream& operator<<(int64_t c)
+  {
+    writeValueAsBytes(c);
+    return *this;
+  }
+
   dbOStream& operator<<(uint64_t c)
   {
     writeValueAsBytes(c);
@@ -316,6 +322,12 @@ class dbIStream
     return *this;
   }
 
+  dbIStream& operator>>(int64_t& c)
+  {
+    f_.read(reinterpret_cast<char*>(&c), sizeof(c));
+    return *this;
+  }
+
   dbIStream& operator>>(uint64_t& c)
   {
     f_.read(reinterpret_cast<char*>(&c), sizeof(c));

src/odb/include/odb/lefin.h

@@ -55,6 +55,9 @@ class lefinReader
   // convert distance value to db-units
   int dbdist(double value) { return lround(value * dist_factor_); }
 
+  // convert area value to squared db-units
+  int64_t dbarea(const double value) { return llround(value * area_factor_); }
+
   enum AntennaType
   {
     ANTENNA_INPUT_GATE_AREA,
@@ -172,9 +175,6 @@ class lefinReader
   void init();
   void setDBUPerMicron(int dbu);
 
-  // convert area value to squared db-units
-  int dbarea(const double value) { return lround(value * area_factor_); }
-
   bool readLefInner(const char* lef_file);
   bool readLef(const char* lef_file);
   bool addGeoms(dbObject* object,
@@ -225,6 +225,9 @@ class lefin
   // convert distance value to db-units
   int dbdist(double value);
 
+  // convert area value to db-units^2
+  int64_t dbarea(double value);
+
   // Create a technology from the tech-data of this LEF file.
   dbTech* createTech(const char* name, const char* lef_file);
 

src/odb/include/odb/lefout.h

@@ -46,7 +46,7 @@ class lefout
 {
  public:
   double lefdist(int value) { return value * dist_factor_; }
-  double lefarea(int value) { return value * area_factor_; }
+  double lefarea(int64_t value) { return value * area_factor_; }
 
   lefout(utl::Logger* logger, std::ostream& out) : _out(out)
   {

src/odb/src/codeGenerator/gen.py

@@ -32,6 +32,7 @@
 STD_TYPE_HDR = {
     "int16_t": "cstdint",
     "uint32_t": "cstdint",
+    "int64_t": "cstdint",
     "pair": "utility",
 }
 

src/odb/src/codeGenerator/helper.py

@@ -25,6 +25,7 @@
     "std::string",
     "uint32_t",
     "uint8_t",
+    "int64_t",
 }
 
 # Value structs that are comparison leaves in components() but are not scalars.
@@ -60,8 +61,9 @@
     "uint8_t",
     "uint16_t",
     "uint32_t",
-    "uint64_t",
     "size_t",
+    "uint64_t",
+    "int64_t",
 }
 
 _removable = {"const", "static", "unsigned"}