Merge branch 'master' into grt_fix

Signed-off-by: Eder Monteiro <emrmonteiro@precisioninno.com>
eder-matheus · Dec 24, 2024 · 06e5f6f · 06e5f6f
2 parents ac8d418 + 8603ef1
commit 06e5f6f
Show file tree

Hide file tree

Showing 203 changed files with 430 additions and 422 deletions.
diff --git a/src/Exception-py.i b/src/Exception-py.i
@@ -32,9 +32,9 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 %{
-#include <stdlib.h>
 
 #include <boost/stacktrace.hpp>
+#include <cstdlib>
 #include <sstream>
 
 #include "ord/OpenRoad.hh"

diff --git a/src/Exception.i b/src/Exception.i
@@ -15,10 +15,9 @@
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 %{
-#include <new>
-#include <stdlib.h>
-
 #include <boost/stacktrace.hpp>
+#include <cstdlib>
+#include <new>
 #include <sstream>
 
 #include "ord/OpenRoad.hh"

diff --git a/src/gpl/src/fftsg.cpp b/src/gpl/src/fftsg.cpp
@@ -777,8 +777,9 @@ void makect(int nc, int* ip, float* c)
 #define CDFT_4THREADS_BEGIN_N 65536
 #endif
 #include <pthread.h>
-#include <stdio.h>
-#include <stdlib.h>
+
+#include <cstdio>
+#include <cstdlib>
 #define cdft_thread_t pthread_t
 #define cdft_thread_create(thp, func, argp)                   \
   {                                                           \
@@ -804,9 +805,10 @@ void makect(int nc, int* ip, float* c)
 #ifndef CDFT_4THREADS_BEGIN_N
 #define CDFT_4THREADS_BEGIN_N 524288
 #endif
-#include <stdio.h>
-#include <stdlib.h>
 #include <windows.h>
+
+#include <cstdio>
+#include <cstdlibd>
 #define cdft_thread_t HANDLE
 #define cdft_thread_create(thp, func, argp)                               \
   {                                                                       \

diff --git a/src/gpl/src/nesterovPlace.cpp b/src/gpl/src/nesterovPlace.cpp
@@ -477,10 +477,18 @@ int NesterovPlace::doNesterovPlace(int start_iter)
                                  + nesterov->totalFillerArea())
               / static_cast<float>(nesterov->whiteSpaceArea()));
 
-          log_->info(GPL,
-                     107,
-                     "Timing-driven: RSZ delta area:     {}",
-                     block->dbuAreaToMicrons(nbc_->getDeltaArea()));
+          float rsz_delta_area_microns
+              = block->dbuAreaToMicrons(nbc_->getDeltaArea());
+          float rsz_delta_area_percentage
+              = (nbc_->getDeltaArea()
+                 / static_cast<float>(nesterov->nesterovInstsArea()))
+                * 100.0f;
+          log_->info(
+              GPL,
+              107,
+              "Timing-driven: repair_design delta area: {:.3f} um^2 ({:+.2f}%)",
+              rsz_delta_area_microns,
+              rsz_delta_area_percentage);
           log_->info(GPL,
                      108,
                      "Timing-driven: new target density: {}",

diff --git a/src/gpl/src/routeBase.cpp b/src/gpl/src/routeBase.cpp
@@ -570,7 +570,7 @@ std::pair<bool, bool> RouteBase::routability()
   if (curRc < rbVars_.targetRC) {
     log_->info(GPL,
                77,
-               "FinalRC lower than targetRC({}), routability not needed.",
+               "FinalRC lower than targetRC({:.4f}), routability not needed.",
                rbVars_.targetRC);
     resetRoutabilityResources();
     return std::make_pair(false, false);
@@ -582,7 +582,7 @@ std::pair<bool, bool> RouteBase::routability()
   //
   if ((minRc_ - curRc) > 0.001) {
     log_->info(
-        GPL, 78, "FinalRC lower than minRC ({}), min RC updated.", minRc_);
+        GPL, 78, "FinalRC lower than minRC ({:.4f}), min RC updated.", minRc_);
     minRc_ = curRc;
     minRcTargetDensity_ = nbVec_[0]->targetDensity();
     minRcViolatedCnt_ = 0;
@@ -675,11 +675,17 @@ std::pair<bool, bool> RouteBase::routability()
   }
 
   dbBlock* block = db_->getChip()->getBlock();
+  float inflated_area_delta_microns
+      = block->dbuAreaToMicrons(inflatedAreaDelta_);
+  float inflated_area_delta_percentage = (static_cast<float>(inflatedAreaDelta_)
+                                          / nbVec_[0]->nesterovInstsArea())
+                                         * 100.0f;
   log_->info(GPL,
              45,
-             "{:20} {:10.3f} um^2",
+             "{:20} {:10.3f} um^2 ({:+.2f}%)",
              "InflatedAreaDelta:",
-             block->dbuAreaToMicrons(inflatedAreaDelta_));
+             inflated_area_delta_microns,
+             inflated_area_delta_percentage);
   log_->info(
       GPL, 46, "{:20} {:10.3f}", "TargetDensity:", nbVec_[0]->targetDensity());
 
@@ -832,7 +838,7 @@ float RouteBase::getRudyRC() const
     }
   }
 
-  log_->info(GPL, 81, "TotalRouteOverflow: {}", totalRouteOverflow);
+  log_->info(GPL, 81, "TotalRouteOverflow: {:.4f}", totalRouteOverflow);
   log_->info(GPL, 82, "OverflowTileCnt: {}", overflowTileCnt);
 
   int arraySize = edgeCongArray.size();
@@ -863,10 +869,10 @@ float RouteBase::getRudyRC() const
   avg020RC /= ceil(0.020 * arraySize);
   avg050RC /= ceil(0.050 * arraySize);
 
-  log_->info(GPL, 83, "0.5%RC: {}", avg005RC);
-  log_->info(GPL, 84, "1.0%RC: {}", avg010RC);
-  log_->info(GPL, 85, "2.0%RC: {}", avg020RC);
-  log_->info(GPL, 86, "5.0%RC: {}", avg050RC);
+  log_->info(GPL, 83, "0.5%RC: {:.4f}", avg005RC);
+  log_->info(GPL, 84, "1.0%RC: {:.4f}", avg010RC);
+  log_->info(GPL, 85, "2.0%RC: {:.4f}", avg020RC);
+  log_->info(GPL, 86, "5.0%RC: {:.4f}", avg050RC);
 
   float finalRC = (rbVars_.rcK1 * avg005RC + rbVars_.rcK2 * avg010RC
                    + rbVars_.rcK3 * avg020RC + rbVars_.rcK4 * avg050RC)
@@ -918,8 +924,8 @@ float RouteBase::getGrtRC() const
     }
   }
 
-  log_->info(GPL, 63, "TotalRouteOverflowH2: {}", totalRouteOverflowH2);
-  log_->info(GPL, 64, "TotalRouteOverflowV2: {}", totalRouteOverflowV2);
+  log_->info(GPL, 63, "TotalRouteOverflowH2: {:.4f}", totalRouteOverflowH2);
+  log_->info(GPL, 64, "TotalRouteOverflowV2: {:.4f}", totalRouteOverflowV2);
   log_->info(GPL, 65, "OverflowTileCnt2: {}", overflowTileCnt2);
 
   int horArraySize = horEdgeCongArray.size();
@@ -975,15 +981,15 @@ float RouteBase::getGrtRC() const
   verAvg020RC /= ceil(0.020 * verArraySize);
   verAvg050RC /= ceil(0.050 * verArraySize);
 
-  log_->info(GPL, 66, "0.5%RC: {}", std::fmax(horAvg005RC, verAvg005RC));
-  log_->info(GPL, 67, "1.0%RC: {}", std::fmax(horAvg010RC, verAvg010RC));
-  log_->info(GPL, 68, "2.0%RC: {}", std::fmax(horAvg020RC, verAvg020RC));
-  log_->info(GPL, 69, "5.0%RC: {}", std::fmax(horAvg050RC, verAvg050RC));
+  log_->info(GPL, 66, "0.5%RC: {:.4f}", std::fmax(horAvg005RC, verAvg005RC));
+  log_->info(GPL, 67, "1.0%RC: {:.4f}", std::fmax(horAvg010RC, verAvg010RC));
+  log_->info(GPL, 68, "2.0%RC: {:.4f}", std::fmax(horAvg020RC, verAvg020RC));
+  log_->info(GPL, 69, "5.0%RC: {:.4f}", std::fmax(horAvg050RC, verAvg050RC));
 
-  log_->info(GPL, 70, "0.5rcK: {}", rbVars_.rcK1);
-  log_->info(GPL, 71, "1.0rcK: {}", rbVars_.rcK2);
-  log_->info(GPL, 72, "2.0rcK: {}", rbVars_.rcK3);
-  log_->info(GPL, 73, "5.0rcK: {}", rbVars_.rcK4);
+  log_->info(GPL, 70, "0.5rcK: {:.2f}", rbVars_.rcK1);
+  log_->info(GPL, 71, "1.0rcK: {:.2f}", rbVars_.rcK2);
+  log_->info(GPL, 72, "2.0rcK: {:.2f}", rbVars_.rcK3);
+  log_->info(GPL, 73, "5.0rcK: {:.2f}", rbVars_.rcK4);
 
   float finalRC = (rbVars_.rcK1 * std::fmax(horAvg005RC, verAvg005RC)
                    + rbVars_.rcK2 * std::fmax(horAvg010RC, verAvg010RC)

diff --git a/src/gpl/test/convergence01.ok b/src/gpl/test/convergence01.ok
@@ -53,7 +53,7 @@
 [INFO GPL-0101] Iter: 0, overflow: 0.127, keep rsz at: 0.3
 [INFO GPL-0106] Timing-driven: worst slack 6.35e-09
 [INFO GPL-0103] Timing-driven: weighted 4 nets.
-[INFO GPL-0107] Timing-driven: RSZ delta area:     -1.0206
+[INFO GPL-0107] Timing-driven: repair_design delta area: -1.021 um^2 (-6.57%)
 [INFO GPL-0108] Timing-driven: new target density: 0.49125
 [NesterovSolve] Iter:   10 overflow: 0.379 HPWL: 13036
 [NesterovSolve] Iter:   20 overflow: 0.522 HPWL: 6251

diff --git a/src/gpl/test/simple01-rd.ok b/src/gpl/test/simple01-rd.ok
@@ -72,19 +72,19 @@
 [INFO GPL-0038] TileCnt:      14   14
 [INFO GPL-0039] numRoutingLayers: 10
 [INFO GPL-0040] NumTiles: 196
-[INFO GPL-0063] TotalRouteOverflowH2: 0
-[INFO GPL-0064] TotalRouteOverflowV2: 0
+[INFO GPL-0063] TotalRouteOverflowH2: 0.0000
+[INFO GPL-0064] TotalRouteOverflowV2: 0.0000
 [INFO GPL-0065] OverflowTileCnt2: 0
-[INFO GPL-0066] 0.5%RC: 1
-[INFO GPL-0067] 1.0%RC: 0.9481481512387594
-[INFO GPL-0068] 2.0%RC: 0.8666666746139526
-[INFO GPL-0069] 5.0%RC: 0.7277037196689182
-[INFO GPL-0070] 0.5rcK: 1
-[INFO GPL-0071] 1.0rcK: 1
-[INFO GPL-0072] 2.0rcK: 0
-[INFO GPL-0073] 5.0rcK: 0
+[INFO GPL-0066] 0.5%RC: 1.0000
+[INFO GPL-0067] 1.0%RC: 0.9481
+[INFO GPL-0068] 2.0%RC: 0.8667
+[INFO GPL-0069] 5.0%RC: 0.7277
+[INFO GPL-0070] 0.5rcK: 1.00
+[INFO GPL-0071] 1.0rcK: 1.00
+[INFO GPL-0072] 2.0rcK: 0.00
+[INFO GPL-0073] 5.0rcK: 0.00
 [INFO GPL-0074] FinalRC: 0.97407407
-[INFO GPL-0077] FinalRC lower than targetRC(1.25), routability not needed.
+[INFO GPL-0077] FinalRC lower than targetRC(1.2500), routability not needed.
 [NesterovSolve] Iter:  290 overflow: 0.267 HPWL: 4778698
 [NesterovSolve] Iter:  300 overflow: 0.233 HPWL: 4810713
 [NesterovSolve] Iter:  310 overflow: 0.202 HPWL: 4848299

diff --git a/src/gpl/test/simple01-td-tune.ok b/src/gpl/test/simple01-td-tune.ok
@@ -88,7 +88,7 @@
 [INFO GPL-0101] Iter: 278, overflow: 0.294, keep rsz at: 0.3
 [INFO GPL-0106] Timing-driven: worst slack 1.41e-09
 [INFO GPL-0103] Timing-driven: weighted 32 nets.
-[INFO GPL-0107] Timing-driven: RSZ delta area:     -12.768
+[INFO GPL-0107] Timing-driven: repair_design delta area: -12.768 um^2 (-2.31%)
 [INFO GPL-0108] Timing-driven: new target density: 0.6866146
 [NesterovSolve] Iter:  280 overflow: 0.305 HPWL: 2863594
 [NesterovSolve] Iter:  290 overflow: 0.290 HPWL: 2675862
@@ -99,7 +99,7 @@
 [INFO GPL-0101] Iter: 322, overflow: 0.194, keep rsz at: 0.3
 [INFO GPL-0106] Timing-driven: worst slack 1.41e-09
 [INFO GPL-0103] Timing-driven: weighted 35 nets.
-[INFO GPL-0107] Timing-driven: RSZ delta area:     -6.65
+[INFO GPL-0107] Timing-driven: repair_design delta area: -6.650 um^2 (-1.23%)
 [INFO GPL-0108] Timing-driven: new target density: 0.67964303
 [NesterovSolve] Iter:  330 overflow: 0.170 HPWL: 2651271
 [NesterovSolve] Iter:  340 overflow: 0.132 HPWL: 2674704

diff --git a/src/gpl/test/simple01-td.ok b/src/gpl/test/simple01-td.ok
@@ -81,7 +81,7 @@
 [INFO GPL-0101] Iter: 285, overflow: 0.284, keep rsz at: 0.3
 [INFO GPL-0106] Timing-driven: worst slack 1.41e-09
 [INFO GPL-0103] Timing-driven: weighted 34 nets.
-[INFO GPL-0107] Timing-driven: RSZ delta area:     -14.098
+[INFO GPL-0107] Timing-driven: repair_design delta area: -14.098 um^2 (-2.55%)
 [INFO GPL-0108] Timing-driven: new target density: 0.6852203
 [NesterovSolve] Iter:  290 overflow: 0.290 HPWL: 2640387
 [NesterovSolve] Iter:  300 overflow: 0.261 HPWL: 2660468
@@ -90,7 +90,7 @@
 [INFO GPL-0101] Iter: 316, overflow: 0.201, keep rsz at: 0.3
 [INFO GPL-0106] Timing-driven: worst slack 1.41e-09
 [INFO GPL-0103] Timing-driven: weighted 35 nets.
-[INFO GPL-0107] Timing-driven: RSZ delta area:     -5.32
+[INFO GPL-0107] Timing-driven: repair_design delta area: -5.320 um^2 (-0.99%)
 [INFO GPL-0108] Timing-driven: new target density: 0.67964303
 [NesterovSolve] Iter:  320 overflow: 0.185 HPWL: 2623574
 [NesterovSolve] Iter:  330 overflow: 0.180 HPWL: 2647293
@@ -99,7 +99,7 @@
 [INFO GPL-0101] Iter: 342, overflow: 0.143, keep rsz at: 0.3
 [INFO GPL-0106] Timing-driven: worst slack 1.41e-09
 [INFO GPL-0103] Timing-driven: weighted 31 nets.
-[INFO GPL-0107] Timing-driven: RSZ delta area:     0
+[INFO GPL-0107] Timing-driven: repair_design delta area: 0.000 um^2 (+0.00%)
 [INFO GPL-0108] Timing-driven: new target density: 0.67964303
 [NesterovSolve] Iter:  350 overflow: 0.127 HPWL: 2703881
 [NesterovSolve] Iter:  360 overflow: 0.101 HPWL: 2726281

diff --git a/src/gpl/test/simple02-rd.ok b/src/gpl/test/simple02-rd.ok
@@ -72,19 +72,19 @@
 [INFO GPL-0038] TileCnt:      14   14
 [INFO GPL-0039] numRoutingLayers: 10
 [INFO GPL-0040] NumTiles: 196
-[INFO GPL-0063] TotalRouteOverflowH2: 0
-[INFO GPL-0064] TotalRouteOverflowV2: 0
+[INFO GPL-0063] TotalRouteOverflowH2: 0.0000
+[INFO GPL-0064] TotalRouteOverflowV2: 0.0000
 [INFO GPL-0065] OverflowTileCnt2: 0
-[INFO GPL-0066] 0.5%RC: 1
-[INFO GPL-0067] 1.0%RC: 0.9481481512387594
-[INFO GPL-0068] 2.0%RC: 0.8666666746139526
-[INFO GPL-0069] 5.0%RC: 0.7277037196689182
-[INFO GPL-0070] 0.5rcK: 1
-[INFO GPL-0071] 1.0rcK: 1
-[INFO GPL-0072] 2.0rcK: 0
-[INFO GPL-0073] 5.0rcK: 0
+[INFO GPL-0066] 0.5%RC: 1.0000
+[INFO GPL-0067] 1.0%RC: 0.9481
+[INFO GPL-0068] 2.0%RC: 0.8667
+[INFO GPL-0069] 5.0%RC: 0.7277
+[INFO GPL-0070] 0.5rcK: 1.00
+[INFO GPL-0071] 1.0rcK: 1.00
+[INFO GPL-0072] 2.0rcK: 0.00
+[INFO GPL-0073] 5.0rcK: 0.00
 [INFO GPL-0074] FinalRC: 0.97407407
-[INFO GPL-0077] FinalRC lower than targetRC(1), routability not needed.
+[INFO GPL-0077] FinalRC lower than targetRC(1.0000), routability not needed.
 [NesterovSolve] Iter:  290 overflow: 0.267 HPWL: 4778698
 [NesterovSolve] Iter:  300 overflow: 0.233 HPWL: 4810713
 [NesterovSolve] Iter:  310 overflow: 0.202 HPWL: 4848299

diff --git a/src/gpl/test/simple03-rd.ok b/src/gpl/test/simple03-rd.ok
@@ -70,14 +70,14 @@
 [INFO GPL-0036] TileBBox: (    0    0 ) ( 4200 4200 ) DBU
 [INFO GPL-0038] TileCnt:      14   14
 [INFO GPL-0040] NumTiles: 196
-[INFO GPL-0081] TotalRouteOverflow: 0
+[INFO GPL-0081] TotalRouteOverflow: 0.0000
 [INFO GPL-0082] OverflowTileCnt: 0
-[INFO GPL-0083] 0.5%RC: 0.48812615871429443
-[INFO GPL-0084] 1.0%RC: 0.47513705492019653
-[INFO GPL-0085] 2.0%RC: 0.4542953372001648
-[INFO GPL-0086] 5.0%RC: 0.424800443649292
+[INFO GPL-0083] 0.5%RC: 0.4881
+[INFO GPL-0084] 1.0%RC: 0.4751
+[INFO GPL-0085] 2.0%RC: 0.4543
+[INFO GPL-0086] 5.0%RC: 0.4248
 [INFO GPL-0087] FinalRC: 0.4816316
-[INFO GPL-0077] FinalRC lower than targetRC(1.25), routability not needed.
+[INFO GPL-0077] FinalRC lower than targetRC(1.2500), routability not needed.
 [NesterovSolve] Iter:  290 overflow: 0.267 HPWL: 4778698
 [NesterovSolve] Iter:  300 overflow: 0.233 HPWL: 4810713
 [NesterovSolve] Iter:  310 overflow: 0.202 HPWL: 4848299

diff --git a/src/gpl/test/simple04-rd.ok b/src/gpl/test/simple04-rd.ok
@@ -70,14 +70,14 @@
 [INFO GPL-0036] TileBBox: (    0    0 ) ( 4200 4200 ) DBU
 [INFO GPL-0038] TileCnt:      14   14
 [INFO GPL-0040] NumTiles: 196
-[INFO GPL-0081] TotalRouteOverflow: 0
+[INFO GPL-0081] TotalRouteOverflow: 0.0000
 [INFO GPL-0082] OverflowTileCnt: 0
-[INFO GPL-0083] 0.5%RC: 0.48812615871429443
-[INFO GPL-0084] 1.0%RC: 0.47513705492019653
-[INFO GPL-0085] 2.0%RC: 0.4542953372001648
-[INFO GPL-0086] 5.0%RC: 0.424800443649292
+[INFO GPL-0083] 0.5%RC: 0.4881
+[INFO GPL-0084] 1.0%RC: 0.4751
+[INFO GPL-0085] 2.0%RC: 0.4543
+[INFO GPL-0086] 5.0%RC: 0.4248
 [INFO GPL-0087] FinalRC: 0.4816316
-[INFO GPL-0077] FinalRC lower than targetRC(0.67), routability not needed.
+[INFO GPL-0077] FinalRC lower than targetRC(0.6700), routability not needed.
 [NesterovSolve] Iter:  290 overflow: 0.267 HPWL: 4778698
 [NesterovSolve] Iter:  300 overflow: 0.233 HPWL: 4810713
 [NesterovSolve] Iter:  310 overflow: 0.202 HPWL: 4848299

diff --git a/src/mpl/src/ParquetFP/src/FPcommon.h b/src/mpl/src/ParquetFP/src/FPcommon.h
@@ -33,11 +33,10 @@
 #ifndef FPCOMMON
 #define FPCOMMON
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
-
 #include <algorithm>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include <fstream>
 #include <iomanip>
 #include <iostream>

diff --git a/src/mpl/src/ParquetFP/src/SolveMulti.h b/src/mpl/src/ParquetFP/src/SolveMulti.h
@@ -33,10 +33,9 @@
 #ifndef SOLVEMULTI_H
 #define SOLVEMULTI_H
 
-#include <math.h>
-#include <stdlib.h>
-
 #include <algorithm>
+#include <cmath>
+#include <cstdlib>
 #include <vector>
 
 namespace parquetfp {

diff --git a/src/odb/include/odb/cdl.h b/src/odb/include/odb/cdl.h
@@ -35,9 +35,9 @@
 
 #pragma once
 
-#include <stdio.h>
 #include <unistd.h>
 
+#include <cstdio>
 #include <list>
 #include <string>
 

diff --git a/src/odb/include/odb/util.h b/src/odb/include/odb/util.h
@@ -32,9 +32,8 @@
 
 #pragma once
 
-#include <string.h>
-
 #include <cassert>
+#include <cstring>
 #include <string>
 #include <vector>
 

diff --git a/src/odb/src/db/dbBlock.cpp b/src/odb/src/db/dbBlock.cpp
@@ -32,9 +32,9 @@
 
 #include "dbBlock.h"
 
-#include <errno.h>
 #include <unistd.h>
 
+#include <cerrno>
 #include <fstream>
 #include <memory>
 #include <set>

diff --git a/src/odb/src/db/dbWireCodec.cpp b/src/odb/src/db/dbWireCodec.cpp
@@ -32,7 +32,7 @@
 
 #include "odb/dbWireCodec.h"
 
-#include <ctype.h>
+#include <cctype>
 
 #include "dbBlock.h"
 #include "dbDatabase.h"