Skip to content

Commit 3892a63

Browse files
gudehgudeh
committed
gpl: clang-format
Signed-off-by: Augusto Berndt <augusto.berndt@precisioninno.com>
1 parent 7039941 commit 3892a63

3 files changed

Lines changed: 78 additions & 57 deletions

File tree

‎src/gpl/src/nesterovBase.cpp‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1863,8 +1863,8 @@ void NesterovBase::initFillerGCells()
18631863
uniformTargetDensity_ = ceilf(uniformTargetDensity_ * 100) / 100;
18641864

18651865
log_->report("TargetDensity: {:.4f} (UniformTargetDensity: {:.4f})",
1866-
targetDensity_,
1867-
uniformTargetDensity_);
1866+
targetDensity_,
1867+
uniformTargetDensity_);
18681868

18691869
if (totalFillerArea_ < 0) {
18701870
log_->warn(GPL,
@@ -2560,7 +2560,6 @@ void NesterovBase::updateSingleGradient(
25602560
= nbc_->getWireLengthGradientWA(gCell, wlCoeffX, wlCoeffY);
25612561
densityGrads[gCellIndex] = getDensityGradient(gCell);
25622562

2563-
25642563
sumGrads[gCellIndex].x = wireLengthGrads[gCellIndex].x
25652564
+ densityPenalty_ * densityGrads[gCellIndex].x;
25662565
sumGrads[gCellIndex].y = wireLengthGrads[gCellIndex].y
@@ -2977,7 +2976,7 @@ bool NesterovBase::checkDivergence()
29772976
&& sum_overflow_unscaled_ - minSumOverflow_ >= 0.02f
29782977
&& hpwlWithMinSumOverflow_ * 1.2f < prev_hpwl_) {
29792978
isDiverged_ = true;
2980-
log_->warn(GPL, 323,"Divergence detected between consecutive iterations");
2979+
log_->warn(GPL, 323, "Divergence detected between consecutive iterations");
29812980
}
29822981

29832982
// Check if both overflow and HPWL increase
@@ -2990,9 +2989,15 @@ bool NesterovBase::checkDivergence()
29902989

29912990
float overflow_acceptance = 0.05f;
29922991
float hpwl_acceptance = 0.25f;
2993-
if (overflow_change >= overflow_acceptance && hpwl_increase >= hpwl_acceptance) {
2992+
if (overflow_change >= overflow_acceptance
2993+
&& hpwl_increase >= hpwl_acceptance) {
29942994
isDiverged_ = true;
2995-
log_->warn(GPL, 324,"Divergence detected between reported values. Overflow change: {:g}, HPWL increase: {:g}%.", overflow_change, hpwl_increase * 100.0f);
2995+
log_->warn(GPL,
2996+
324,
2997+
"Divergence detected between reported values. Overflow "
2998+
"change: {:g}, HPWL increase: {:g}%.",
2999+
overflow_change,
3000+
hpwl_increase * 100.0f);
29963001
}
29973002
}
29983003

‎src/gpl/src/nesterovBase.h‎

Lines changed: 44 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -873,8 +873,11 @@ class NesterovBaseCommon
873873
void resetDeltaArea() { delta_area_ = 0; }
874874
int getNewGcellsCount() { return new_gcells_count_; }
875875
int getDeletedGcellsCount() { return deleted_gcells_count_; }
876-
void resetNewGcellsCount() { new_gcells_count_ = 0;
877-
deleted_gcells_count_ = 0; }
876+
void resetNewGcellsCount()
877+
{
878+
new_gcells_count_ = 0;
879+
deleted_gcells_count_ = 0;
880+
}
878881

879882
private:
880883
NesterovBaseVars nbVars_;
@@ -997,49 +1000,59 @@ class NesterovBase
9971000
float getTargetDensity() const;
9981001

9991002
void setTargetDensity(float targetDensity);
1000-
void checkConsistency() {
1003+
void checkConsistency()
1004+
{
10011005
auto block = pb_->db()->getChip()->getBlock();
10021006
const int64_t tolerance = 10000;
1003-
1004-
int64_t expected_white_space = pb_->getDie().coreArea() - pb_->nonPlaceInstsArea();
1005-
if(std::abs(whiteSpaceArea_ - expected_white_space) > tolerance) {
1007+
1008+
int64_t expected_white_space
1009+
= pb_->getDie().coreArea() - pb_->nonPlaceInstsArea();
1010+
if (std::abs(whiteSpaceArea_ - expected_white_space) > tolerance) {
10061011
log_->warn(utl::GPL, 319, "Inconsistent white space area");
1007-
log_->report("whiteSpaceArea_: {} (expected:{}) | coreArea: {}, nonPlaceInstsArea: {}",
1008-
block->dbuAreaToMicrons(whiteSpaceArea_),
1009-
block->dbuAreaToMicrons(expected_white_space),
1010-
block->dbuAreaToMicrons(pb_->getDie().coreArea()),
1011-
block->dbuAreaToMicrons(pb_->nonPlaceInstsArea()));
1012+
log_->report(
1013+
"whiteSpaceArea_: {} (expected:{}) | coreArea: {}, "
1014+
"nonPlaceInstsArea: {}",
1015+
block->dbuAreaToMicrons(whiteSpaceArea_),
1016+
block->dbuAreaToMicrons(expected_white_space),
1017+
block->dbuAreaToMicrons(pb_->getDie().coreArea()),
1018+
block->dbuAreaToMicrons(pb_->nonPlaceInstsArea()));
10121019
}
10131020

10141021
int64_t expected_movable_area = whiteSpaceArea_ * targetDensity_;
1015-
if(std::abs(movableArea_ - expected_movable_area) > tolerance) {
1022+
if (std::abs(movableArea_ - expected_movable_area) > tolerance) {
10161023
log_->warn(utl::GPL, 320, "Inconsistent movable area 1");
1017-
log_->report("movableArea_: {} (expected:{}) | whiteSpaceArea_: {}, targetDensity_: {}",
1018-
block->dbuAreaToMicrons(movableArea_),
1019-
block->dbuAreaToMicrons(expected_movable_area),
1020-
block->dbuAreaToMicrons(whiteSpaceArea_),
1021-
targetDensity_);
1024+
log_->report(
1025+
"movableArea_: {} (expected:{}) | whiteSpaceArea_: {}, "
1026+
"targetDensity_: {}",
1027+
block->dbuAreaToMicrons(movableArea_),
1028+
block->dbuAreaToMicrons(expected_movable_area),
1029+
block->dbuAreaToMicrons(whiteSpaceArea_),
1030+
targetDensity_);
10221031
}
10231032

10241033
int64_t expected_filler_area = movableArea_ - getNesterovInstsArea();
1025-
if(std::abs(totalFillerArea_ - expected_filler_area) > tolerance) {
1026-
log_->warn(utl::GPL, 321,"Inconsistent filler area");
1027-
log_->report("totalFillerArea_: {} (expected:{}) | movableArea_: {}, getNesterovInstsArea_: {}",
1028-
block->dbuAreaToMicrons(totalFillerArea_),
1029-
block->dbuAreaToMicrons(expected_filler_area),
1030-
block->dbuAreaToMicrons(movableArea_),
1031-
block->dbuAreaToMicrons(getNesterovInstsArea()));
1034+
if (std::abs(totalFillerArea_ - expected_filler_area) > tolerance) {
1035+
log_->warn(utl::GPL, 321, "Inconsistent filler area");
1036+
log_->report(
1037+
"totalFillerArea_: {} (expected:{}) | movableArea_: {}, "
1038+
"getNesterovInstsArea_: {}",
1039+
block->dbuAreaToMicrons(totalFillerArea_),
1040+
block->dbuAreaToMicrons(expected_filler_area),
1041+
block->dbuAreaToMicrons(movableArea_),
1042+
block->dbuAreaToMicrons(getNesterovInstsArea()));
10321043
}
10331044

10341045
float expected_density = movableArea_ * 1.0 / whiteSpaceArea_;
10351046
float density_diff = std::abs(targetDensity_ - expected_density);
1036-
if(density_diff > 1e-6) {
1037-
log_->warn(utl::GPL, 322,"Inconsistent target density");
1038-
log_->report("targetDensity_: {} (expected:{}) | movableArea_: {}, whiteSpaceArea_: {}",
1039-
targetDensity_,
1040-
expected_density,
1041-
block->dbuAreaToMicrons(movableArea_),
1042-
block->dbuAreaToMicrons(whiteSpaceArea_));
1047+
if (density_diff > 1e-6) {
1048+
log_->warn(utl::GPL, 322, "Inconsistent target density");
1049+
log_->report(
1050+
"targetDensity_: {} (expected:{}) | movableArea_: {}, "
1051+
"whiteSpaceArea_: {}",
1052+
targetDensity_,
1053+
expected_density,
1054+
block->dbuAreaToMicrons(movableArea_),
1055+
block->dbuAreaToMicrons(whiteSpaceArea_));
10431056
}
10441057
}
10451058

‎src/gpl/src/nesterovPlace.cpp‎

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,8 @@ NesterovPlace::~NesterovPlace()
7373
reset();
7474
}
7575

76-
void NesterovPlace::npUpdatePrevGradient(const std::shared_ptr<NesterovBase>& nb)
76+
void NesterovPlace::npUpdatePrevGradient(
77+
const std::shared_ptr<NesterovBase>& nb)
7778
{
7879
nb->nbUpdatePrevGradient(wireLengthCoefX_, wireLengthCoefY_);
7980
float wireLengthGradSum = nb->getWireLengthGradSum();
@@ -137,7 +138,8 @@ void NesterovPlace::npUpdateCurGradient(const std::shared_ptr<NesterovBase>& nb)
137138
checkInvalidValues(wireLengthGradSum, densityGradSum);
138139
}
139140

140-
void NesterovPlace::npUpdateNextGradient(const std::shared_ptr<NesterovBase>& nb)
141+
void NesterovPlace::npUpdateNextGradient(
142+
const std::shared_ptr<NesterovBase>& nb)
141143
{
142144
nb->nbUpdateNextGradient(wireLengthCoefX_, wireLengthCoefY_);
143145

@@ -443,7 +445,8 @@ void NesterovPlace::runTimingDriven(int iter,
443445
nbVec_[0]->setTrueReprintIterHeader();
444446
++timing_driven_count;
445447

446-
int nbc_total_gcells_delta = nbc_->getNewGcellsCount() - nbc_->getDeletedGcellsCount();
448+
int nbc_total_gcells_delta
449+
= nbc_->getNewGcellsCount() - nbc_->getDeletedGcellsCount();
447450
td_accumulated_delta_area += nbc_->getDeltaArea();
448451
for (auto& nb : nbVec_) {
449452
nb_gcells_after_td += nb->getGCells().size();
@@ -484,7 +487,7 @@ void NesterovPlace::runTimingDriven(int iter,
484487
+ nesterov->getNesterovInstsArea()
485488
+ nesterov->getTotalFillerArea())
486489
/ static_cast<float>(nesterov->getWhiteSpaceArea()));
487-
490+
488491
nesterov->setMovableArea(nesterov->getTargetDensity()
489492
* nesterov->getWhiteSpaceArea());
490493
float rsz_delta_area_microns
@@ -527,8 +530,8 @@ void NesterovPlace::runTimingDriven(int iter,
527530
nbc_->resetDeltaArea();
528531
nbc_->resetNewGcellsCount();
529532
nesterov->updateAreas();
530-
nesterov->updateDensitySize();
531-
nesterov->checkConsistency();
533+
nesterov->updateDensitySize();
534+
nesterov->checkConsistency();
532535
}
533536

534537
// update snapshot after non-virtual TD
@@ -751,8 +754,9 @@ void NesterovPlace::runRoutability(int iter,
751754
}
752755

753756
if (is_routability_need_ && isRevertInitNeeded) {
754-
log_->info(
755-
GPL, 87, "Routability end iteration: increase inflation and revert "
757+
log_->info(GPL,
758+
87,
759+
"Routability end iteration: increase inflation and revert "
756760
"back to snapshot.");
757761
}
758762

@@ -896,14 +900,13 @@ void NesterovPlace::reportResults(int nesterov_iter,
896900

897901
if (graphics_ && npVars_.debug_generate_images) {
898902
updateDb();
899-
std::string label = fmt::format("Final Iter {} |R: ? |T: ?",
900-
nesterov_iter);
901-
902-
graphics_->saveLabeledImage(fmt::format("{}/final_nesterov_{:05d}.png",
903-
getReportsDir(),
904-
nesterov_iter),
905-
label,
906-
/* select_buffers = */ false);
903+
std::string label = fmt::format("Final Iter {} |R: ? |T: ?", nesterov_iter);
904+
905+
graphics_->saveLabeledImage(
906+
fmt::format(
907+
"{}/final_nesterov_{:05d}.png", getReportsDir(), nesterov_iter),
908+
label,
909+
/* select_buffers = */ false);
907910
}
908911

909912
if (nesterov_iter >= npVars_.maxNesterovIter) {
@@ -1008,10 +1011,10 @@ int NesterovPlace::doNesterovPlace(int start_iter)
10081011
updateDb();
10091012
std::string label = fmt::format("init_nesterov");
10101013

1011-
graphics_->saveLabeledImage(fmt::format("{}/init_nesterov.png",
1012-
getReportsDir()),
1013-
label,
1014-
/* select_buffers = */ false);
1014+
graphics_->saveLabeledImage(
1015+
fmt::format("{}/init_nesterov.png", getReportsDir()),
1016+
label,
1017+
/* select_buffers = */ false);
10151018
}
10161019

10171020
// Core Nesterov Loop

0 commit comments

Comments
 (0)