gpl: code review,

include consts and use default log message for gpl progression

Signed-off-by: Augusto Berndt <augusto.berndt@precisioninno.com>

Author: gudeh

src/gpl/src/nesterovBase.cpp

@@ -2032,10 +2032,10 @@ void NesterovBase::checkConsistency()
   if (!log_->debugCheck(GPL, "checkConsistency", 1)) {
     return;
   }
-  auto block = pb_->db()->getChip()->getBlock();
+  const auto block = pb_->db()->getChip()->getBlock();
   const int64_t tolerance = 10000;
 
-  int64_t expected_white_space
+  const int64_t expected_white_space
       = pb_->getDie().coreArea() - pb_->nonPlaceInstsArea();
   if (std::abs(whiteSpaceArea_ - expected_white_space) > tolerance) {
     log_->warn(utl::GPL, 319, "Inconsistent white space area");
@@ -2048,7 +2048,7 @@ void NesterovBase::checkConsistency()
         block->dbuAreaToMicrons(pb_->nonPlaceInstsArea()));
   }
 
-  int64_t expected_movable_area = whiteSpaceArea_ * targetDensity_;
+  const int64_t expected_movable_area = whiteSpaceArea_ * targetDensity_;
   if (std::abs(movableArea_ - expected_movable_area) > tolerance) {
     log_->warn(utl::GPL, 320, "Inconsistent movable area 1");
     log_->report(
@@ -2060,7 +2060,7 @@ void NesterovBase::checkConsistency()
         targetDensity_);
   }
 
-  int64_t expected_filler_area = movableArea_ - getNesterovInstsArea();
+  const int64_t expected_filler_area = movableArea_ - getNesterovInstsArea();
   if (std::abs(totalFillerArea_ - expected_filler_area) > tolerance) {
     log_->warn(utl::GPL, 321, "Inconsistent filler area");
     log_->report(
@@ -3042,8 +3042,8 @@ bool NesterovBase::checkDivergence()
     float hpwl_increase = (static_cast<float>(prev_hpwl_ - prev_reported_hpwl_))
                           / static_cast<float>(prev_reported_hpwl_);
 
-    float overflow_acceptance = 0.05f;
-    float hpwl_acceptance = 0.25f;
+    const float overflow_acceptance = 0.05f;
+    const float hpwl_acceptance = 0.25f;
     if (overflow_change >= overflow_acceptance
         && hpwl_increase >= hpwl_acceptance) {
       isDiverged_ = true;

src/gpl/src/nesterovPlace.cpp

@@ -5,8 +5,6 @@
 
 #include "nesterovPlace.h"
 
-#include <spdlog/fmt/bundled/format.h>
-
 #include <algorithm>
 #include <cmath>
 #include <cstdint>
@@ -447,13 +445,13 @@ void NesterovPlace::runTimingDriven(int iter,
     nbVec_[0]->setTrueReprintIterHeader();
     ++timing_driven_count;
 
-    int nbc_total_gcells_delta
+    const int nbc_total_gcells_delta
         = nbc_->getNewGcellsCount() - nbc_->getDeletedGcellsCount();
     td_accumulated_delta_area += nbc_->getDeltaArea();
     for (auto& nb : nbVec_) {
       nb_gcells_after_td += nb->getGCells().size();
     }
-    int nb_total_gcells_delta = nb_gcells_after_td - nb_gcells_before_td;
+    const int nb_total_gcells_delta = nb_gcells_after_td - nb_gcells_before_td;
     if (nb_total_gcells_delta != nbc_total_gcells_delta) {
       log_->warn(GPL,
                  92,
@@ -666,11 +664,17 @@ void NesterovPlace::routabilitySnapshot(
       nb->saveSnapshot();
     }
 
-    log_->info(GPL, 38, "Routability snapshot saved at iter = {}", iter);
-    log_->report("   Iter: {}, overflow: {:.3f}, HPWL: {}",
-                 iter + 1,
+    log_->info(GPL, 38, "Routability snapshot saved at iter = {}", iter + 1);
+    odb::dbBlock* block = pbc_->db()->getChip()->getBlock();
+    int64_t hpwl = nbc_->getHpwl();
+    double hpwl_percent_change = 0.0;
+    log_->report("{:9d} | {:8.4f} | {:13.6e} | {:8} | {:9} | {:>5}",
+                 iter,
                  average_overflow_unscaled_,
-                 nbc_->getHpwl());
+                 block->dbuToMicrons(hpwl),
+                 " ",
+                 " ",
+                 " ");
     if (graphics_ && graphics_->enabled()) {
       graphics_->addRoutabilitySnapshot(iter);
     }