odb: Expose hpwl api as public in WireLengthEvaluator and fix issue in reportEachNetHpwl.

Signed-off-by: Ted Hong <tedhong@google.com>

Author: hongted

src/odb/include/odb/util.h

@@ -57,12 +57,11 @@ class WireLengthEvaluator
   WireLengthEvaluator(dbBlock* block) : block_(block) {}
   int64_t hpwl() const;
   int64_t hpwl(int64_t& hpwl_x, int64_t& hpwl_y) const;
+  int64_t hpwl(dbNet* net, int64_t& hpwl_x, int64_t& hpwl_y) const;
   void reportEachNetHpwl(utl::Logger* logger) const;
   void reportHpwl(utl::Logger* logger) const;
 
  private:
-  int64_t hpwl(dbNet* net, int64_t& hpwl_x, int64_t& hpwl_y) const;
-
   dbBlock* block_;
 };
 

src/odb/src/db/util.cpp

@@ -518,14 +518,15 @@ int64_t WireLengthEvaluator::hpwl(dbNet* net,
                                   int64_t& hpwl_x,
                                   int64_t& hpwl_y) const
 {
+  hpwl_x = 0;
+  hpwl_y = 0;
+
   if (net->getSigType().isSupply() || net->isSpecial()) {
     return 0;
   }
 
   Rect bbox = net->getTermBBox();
   if (bbox.isInverted()) {
-    hpwl_x = 0;
-    hpwl_y = 0;
     return 0;
   }
 
@@ -538,10 +539,10 @@ int64_t WireLengthEvaluator::hpwl(dbNet* net,
 void WireLengthEvaluator::reportEachNetHpwl(utl::Logger* logger) const
 {
   for (dbNet* net : block_->getNets()) {
-    int64_t tmp;
+    int64_t tmp_x, tmp_y;
     logger->report("{} {}",
                    net->getConstName(),
-                   block_->dbuToMicrons(hpwl(net, tmp, tmp)));
+                   block_->dbuToMicrons(hpwl(net, tmp_x, tmp_y)));
   }
 }