Skip to content

Commit 384cd5f

Browse files
malibertymaliberty
authored
Merge pull request #10189 from The-OpenROAD-Project-staging/est-tidy-naming
est: adjust naming to Google-style (excluding method names)
2 parents 718ced1 + db74892 commit 384cd5f

12 files changed

Lines changed: 96 additions & 95 deletions

‎src/cts/src/TritonCTS.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2578,7 +2578,7 @@ void TritonCTS::setAllClocksPropagated()
25782578
}
25792579
}
25802580

2581-
estimate_parasitics_->estimateParasitics(est::ParasiticsSrc::placement);
2581+
estimate_parasitics_->estimateParasitics(est::ParasiticsSrc::kPlacement);
25822582
}
25832583

25842584
void TritonCTS::repairClockNets()

‎src/est/include/est/EstimateParasitics.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@ class NetHash
4949

5050
enum class ParasiticsSrc
5151
{
52-
none,
53-
placement,
54-
global_routing,
55-
detailed_routing
52+
kNone,
53+
kPlacement,
54+
kGlobalRouting,
55+
kDetailedRouting
5656
};
5757

5858
struct ParasiticsResistance
@@ -134,7 +134,7 @@ class EstimateParasitics : public sta::dbStaState, public ParasiticsService
134134
double wireClkVCapacitance(const sta::Scene* scene) const;
135135
void estimateParasitics(ParasiticsSrc src);
136136
void estimateParasitics(ParasiticsSrc src,
137-
std::map<sta::Scene*, std::ostream*>& spef_streams_);
137+
std::map<sta::Scene*, std::ostream*>& spef_streams);
138138
void estimateWireParasitics(sta::SpefWriter* spef_writer = nullptr);
139139
void estimateWireParasitic(const sta::Net* net,
140140
sta::SpefWriter* spef_writer = nullptr);
@@ -261,7 +261,7 @@ class EstimateParasitics : public sta::dbStaState, public ParasiticsService
261261
std::vector<ParasiticsResistance> wire_clk_res_; // ohms/metre
262262
std::vector<ParasiticsCapacitance> wire_clk_cap_; // Farads/meter
263263

264-
ParasiticsSrc parasitics_src_ = ParasiticsSrc::none;
264+
ParasiticsSrc parasitics_src_ = ParasiticsSrc::kNone;
265265

266266
std::unordered_set<const sta::Net*, NetHash> parasitics_invalid_;
267267

‎src/est/include/est/SteinerTree.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include "stt/flute.h"
1919
#include "utl/Logger.h"
2020

21-
const int SteinerNull = -1;
21+
const int kSteinerNull = -1;
2222

2323
namespace est {
2424

@@ -106,7 +106,7 @@ class SteinerTree
106106
void locAddPin(const odb::Point& loc, const sta::Pin* pin);
107107
int getMaxIndex() const;
108108

109-
static constexpr SteinerPt null_pt = -1;
109+
static constexpr SteinerPt kNullPt = -1;
110110

111111
private:
112112
stt::Tree tree_;

‎src/est/src/EstimateParasitics.cpp‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -160,12 +160,12 @@ void EstimateParasitics::addSignalLayer(odb::dbTechLayer* layer)
160160

161161
void EstimateParasitics::sortClkAndSignalLayers()
162162
{
163-
auto sortLayers = [](const odb::dbTechLayer* a, const odb::dbTechLayer* b) {
163+
auto sort_layers = [](const odb::dbTechLayer* a, const odb::dbTechLayer* b) {
164164
return a->getNumber() < b->getNumber();
165165
};
166166

167-
std::ranges::sort(clk_layers_, sortLayers);
168-
std::ranges::sort(signal_layers_, sortLayers);
167+
std::ranges::sort(clk_layers_, sort_layers);
168+
std::ranges::sort(signal_layers_, sort_layers);
169169
}
170170

171171
void EstimateParasitics::setHWireSignalRC(const sta::Scene* scene,
@@ -373,8 +373,8 @@ void EstimateParasitics::initBlock()
373373
void EstimateParasitics::ensureParasitics()
374374
{
375375
estimateParasitics(global_router_->haveRoutes()
376-
? ParasiticsSrc::global_routing
377-
: ParasiticsSrc::placement);
376+
? ParasiticsSrc::kGlobalRouting
377+
: ParasiticsSrc::kPlacement);
378378
}
379379

380380
void EstimateParasitics::estimateParasitics(ParasiticsSrc src)
@@ -395,26 +395,26 @@ void EstimateParasitics::estimateParasitics(
395395
}
396396

397397
switch (src) {
398-
case ParasiticsSrc::placement:
398+
case ParasiticsSrc::kPlacement:
399399
estimateWireParasitics(spef_writer.get());
400-
parasitics_src_ = ParasiticsSrc::placement;
400+
parasitics_src_ = ParasiticsSrc::kPlacement;
401401
break;
402-
case ParasiticsSrc::global_routing:
402+
case ParasiticsSrc::kGlobalRouting:
403403
estimateGlobalRouteRC(spef_writer.get());
404-
parasitics_src_ = ParasiticsSrc::global_routing;
404+
parasitics_src_ = ParasiticsSrc::kGlobalRouting;
405405
break;
406-
case ParasiticsSrc::detailed_routing:
406+
case ParasiticsSrc::kDetailedRouting:
407407
// TODO: call rcx to extract parasitics and load them to STA
408-
parasitics_src_ = ParasiticsSrc::detailed_routing;
408+
parasitics_src_ = ParasiticsSrc::kDetailedRouting;
409409
break;
410-
case ParasiticsSrc::none:
410+
case ParasiticsSrc::kNone:
411411
break;
412412
}
413413
}
414414

415415
bool EstimateParasitics::haveEstimatedParasitics() const
416416
{
417-
return parasitics_src_ != ParasiticsSrc::none;
417+
return parasitics_src_ != ParasiticsSrc::kNone;
418418
}
419419

420420
void EstimateParasitics::updateParasitics()
@@ -433,7 +433,7 @@ void EstimateParasitics::updateParasitics()
433433
network_->setDefaultLibertyLibrary(default_lib);
434434

435435
switch (parasitics_src_) {
436-
case ParasiticsSrc::placement:
436+
case ParasiticsSrc::kPlacement:
437437
for (const sta::Net* net : parasitics_invalid_) {
438438
//
439439
// TODO: remove this check (we expect all to be flat net)
@@ -456,8 +456,8 @@ void EstimateParasitics::updateParasitics()
456456
estimateWireParasitic(net);
457457
}
458458
break;
459-
case ParasiticsSrc::global_routing:
460-
case ParasiticsSrc::detailed_routing: {
459+
case ParasiticsSrc::kGlobalRouting:
460+
case ParasiticsSrc::kDetailedRouting: {
461461
// TODO: update detailed route for modified nets
462462
incr_groute_->updateRoutes();
463463
for (const sta::Net* net : parasitics_invalid_) {
@@ -471,7 +471,7 @@ void EstimateParasitics::updateParasitics()
471471
}
472472
break;
473473
}
474-
case ParasiticsSrc::none:
474+
case ParasiticsSrc::kNone:
475475
break;
476476
}
477477

@@ -480,7 +480,7 @@ void EstimateParasitics::updateParasitics()
480480
// annotations on the nets affected by a network edit. We need to explicitly
481481
// invalidate those delays. Do it in bulk instead of interleaving with each
482482
// groute call.
483-
if (parasitics_src_ != ParasiticsSrc::none) {
483+
if (parasitics_src_ != ParasiticsSrc::kNone) {
484484
for (const sta::Net* net : parasitics_invalid_) {
485485
debugPrint(logger_,
486486
EST,
@@ -519,20 +519,20 @@ void EstimateParasitics::ensureWireParasitic(const sta::Pin* drvr_pin,
519519
|| parasitics->findPiElmore(drvr_pin, sta::RiseFall::rise(), max_)
520520
== nullptr) {
521521
switch (parasitics_src_) {
522-
case ParasiticsSrc::placement:
522+
case ParasiticsSrc::kPlacement:
523523
estimateWireParasitic(drvr_pin, net);
524524
parasitics_invalid_.erase(net);
525525
break;
526-
case ParasiticsSrc::global_routing: {
526+
case ParasiticsSrc::kGlobalRouting: {
527527
incr_groute_->updateRoutes();
528528
estimateGlobalRouteRC(db_network_->staToDb(net));
529529
parasitics_invalid_.erase(net);
530530
break;
531531
}
532-
case ParasiticsSrc::detailed_routing:
532+
case ParasiticsSrc::kDetailedRouting:
533533
// TODO: call incremental drt for the modified net
534534
break;
535-
case ParasiticsSrc::none:
535+
case ParasiticsSrc::kNone:
536536
break;
537537
}
538538
}
@@ -631,7 +631,7 @@ void EstimateParasitics::estimateWireParasitics(sta::SpefWriter* spef_writer)
631631
sta::Net* cur_net = db_network_->dbToSta(db_net);
632632
estimateWireParasitic(cur_net, spef_writer);
633633
}
634-
parasitics_src_ = ParasiticsSrc::placement;
634+
parasitics_src_ = ParasiticsSrc::kPlacement;
635635
parasitics_invalid_.clear();
636636
}
637637
}
@@ -1331,18 +1331,18 @@ IncrementalParasiticsGuard::IncrementalParasiticsGuard(
13311331
}
13321332

13331333
switch (estimate_parasitics_->getParasiticsSrc()) {
1334-
case ParasiticsSrc::placement:
1334+
case ParasiticsSrc::kPlacement:
13351335
break;
1336-
case ParasiticsSrc::global_routing:
1337-
case ParasiticsSrc::detailed_routing:
1336+
case ParasiticsSrc::kGlobalRouting:
1337+
case ParasiticsSrc::kDetailedRouting:
13381338
// TODO: add IncrementalDRoute
13391339
estimate_parasitics_->setIncrementalGRT(
13401340
new grt::IncrementalGRoute(estimate_parasitics_->getGlobalRouter(),
13411341
estimate_parasitics_->getBlock()));
13421342
// Don't print verbose messages for incremental routing
13431343
estimate_parasitics_->getGlobalRouter()->setVerbose(false);
13441344
break;
1345-
case ParasiticsSrc::none:
1345+
case ParasiticsSrc::kNone:
13461346
break;
13471347
}
13481348

@@ -1374,15 +1374,15 @@ IncrementalParasiticsGuard::~IncrementalParasiticsGuard()
13741374
}
13751375

13761376
switch (estimate_parasitics_->getParasiticsSrc()) {
1377-
case ParasiticsSrc::placement:
1377+
case ParasiticsSrc::kPlacement:
13781378
break;
1379-
case ParasiticsSrc::global_routing:
1380-
case ParasiticsSrc::detailed_routing:
1379+
case ParasiticsSrc::kGlobalRouting:
1380+
case ParasiticsSrc::kDetailedRouting:
13811381
// TODO: add IncrementalDRoute
13821382
delete estimate_parasitics_->getIncrementalGRT();
13831383
estimate_parasitics_->setIncrementalGRT(nullptr);
13841384
break;
1385-
case ParasiticsSrc::none:
1385+
case ParasiticsSrc::kNone:
13861386
break;
13871387
}
13881388

‎src/est/src/EstimateParasitics.i‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,11 @@ using est::ParasiticsSrc;
9090
Tcl_Size length;
9191
const char *arg = Tcl_GetStringFromObj($input, &length);
9292
if (stringEq(arg, "placement"))
93-
$1 = ParasiticsSrc::placement;
93+
$1 = ParasiticsSrc::kPlacement;
9494
else if (stringEq(arg, "global_routing"))
95-
$1 = ParasiticsSrc::global_routing;
95+
$1 = ParasiticsSrc::kGlobalRouting;
9696
else if (stringEq(arg, "detailed_routing"))
97-
$1 = ParasiticsSrc::detailed_routing;
97+
$1 = ParasiticsSrc::kDetailedRouting;
9898
else {
9999
utl::Logger* logger = ord::getLogger();
100100
try {

‎src/est/src/MakeWireParasitics.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ void MakeWireParasitics::estimateParasitics(odb::dbNet* net,
8686
Parasitics* parasitics = corner->parasitics(min_max_);
8787
Parasitic* parasitic = parasitics->makeParasiticNetwork(sta_net, false);
8888

89+
resistor_id_ = 1;
8990
makeRouteParasitics(
9091
parasitics, net, route, sta_net, corner, parasitic, node_map);
9192
makeParasiticsToPins(
@@ -128,6 +129,7 @@ void MakeWireParasitics::estimateParasitics(odb::dbNet* net, grt::GRoute& route)
128129
Parasitics* parasitics = corner->parasitics(min_max_);
129130
Parasitic* parasitic = parasitics->makeParasiticNetwork(sta_net, false);
130131

132+
resistor_id_ = 1;
131133
makeRouteParasitics(
132134
parasitics, net, route, sta_net, corner, parasitic, node_map);
133135
makePartialParasiticsToPins(
@@ -168,7 +170,6 @@ void MakeWireParasitics::makeRouteParasitics(sta::Parasitics* parasitics,
168170
{
169171
const int min_routing_layer = global_router_->getMinRoutingLayer();
170172

171-
size_t resistor_id_ = 1;
172173
for (grt::GSegment& segment : route) {
173174
const int wire_length_dbu = segment.length();
174175

‎src/est/src/SteinerTree.cpp‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ void SteinerTree::setTree(const stt::Tree& tree)
3333
tree_ = tree;
3434

3535
// Find driver steiner point.
36-
drvr_steiner_pt_ = null_pt;
36+
drvr_steiner_pt_ = kNullPt;
3737
const odb::Point drvr_loc = drvr_location_;
3838
const int drvr_x = drvr_loc.getX();
3939
const int drvr_y = drvr_loc.getY();
@@ -133,7 +133,7 @@ void SteinerTree::report(utl::Logger* logger, const sta::Network* network)
133133

134134
std::string SteinerTree::name(const SteinerPt pt, const sta::Network* network)
135135
{
136-
if (pt == null_pt) {
136+
if (pt == kNullPt) {
137137
return "NULL";
138138
}
139139
const sta::PinSeq* pt_pins = pins(pt);
@@ -179,7 +179,7 @@ SteinerPt SteinerTree::top() const
179179
{
180180
const SteinerPt driver = drvrPt();
181181
SteinerPt top = left(driver);
182-
if (top == SteinerNull) {
182+
if (top == kSteinerNull) {
183183
top = right(driver);
184184
}
185185
return top;
@@ -188,15 +188,15 @@ SteinerPt SteinerTree::top() const
188188
SteinerPt SteinerTree::left(const SteinerPt pt) const
189189
{
190190
if (pt >= (int) left_.size()) {
191-
return SteinerNull;
191+
return kSteinerNull;
192192
}
193193
return left_[pt];
194194
}
195195

196196
SteinerPt SteinerTree::right(const SteinerPt pt) const
197197
{
198198
if (pt >= (int) right_.size()) {
199-
return SteinerNull;
199+
return kSteinerNull;
200200
}
201201
return right_[pt];
202202
}
@@ -216,26 +216,26 @@ void SteinerTree::validatePoint(const SteinerPt pt) const
216216
void SteinerTree::populateSides()
217217
{
218218
const int branch_count = branchCount();
219-
left_.resize(branch_count, SteinerNull);
220-
right_.resize(branch_count, SteinerNull);
221-
std::vector<SteinerPt> adj1(branch_count, SteinerNull);
222-
std::vector<SteinerPt> adj2(branch_count, SteinerNull);
223-
std::vector<SteinerPt> adj3(branch_count, SteinerNull);
219+
left_.resize(branch_count, kSteinerNull);
220+
right_.resize(branch_count, kSteinerNull);
221+
std::vector<SteinerPt> adj1(branch_count, kSteinerNull);
222+
std::vector<SteinerPt> adj2(branch_count, kSteinerNull);
223+
std::vector<SteinerPt> adj3(branch_count, kSteinerNull);
224224
for (int i = 0; i < branch_count; i++) {
225225
const stt::Branch& branch_pt = tree_.branch[i];
226226
const SteinerPt j = branch_pt.n;
227227
if (j != i) {
228-
if (adj1[i] == SteinerNull) {
228+
if (adj1[i] == kSteinerNull) {
229229
adj1[i] = j;
230-
} else if (adj2[i] == SteinerNull) {
230+
} else if (adj2[i] == kSteinerNull) {
231231
adj2[i] = j;
232232
} else {
233233
adj3[i] = j;
234234
}
235235

236-
if (adj1[j] == SteinerNull) {
236+
if (adj1[j] == kSteinerNull) {
237237
adj1[j] = i;
238-
} else if (adj2[j] == SteinerNull) {
238+
} else if (adj2[j] == kSteinerNull) {
239239
adj2[j] = i;
240240
} else {
241241
adj3[j] = i;
@@ -273,14 +273,14 @@ void SteinerTree::populateSides(const SteinerPt from,
273273
const std::vector<SteinerPt>& adj2,
274274
const std::vector<SteinerPt>& adj3)
275275
{
276-
if (adj != from && adj != SteinerNull) {
276+
if (adj != from && adj != kSteinerNull) {
277277
if (adj == to) {
278278
logger_->error(EST, 92, "Steiner tree creation error.");
279279
}
280-
if (left_[to] == SteinerNull) {
280+
if (left_[to] == kSteinerNull) {
281281
left_[to] = adj;
282282
populateSides(to, adj, adj1, adj2, adj3);
283-
} else if (right_[to] == SteinerNull) {
283+
} else if (right_[to] == kSteinerNull) {
284284
right_[to] = adj;
285285
populateSides(to, adj, adj1, adj2, adj3);
286286
}

‎src/rsz/src/BaseMove.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -641,9 +641,9 @@ bool BaseMove::replaceCell(sta::Instance* inst,
641641

642642
// Legalize the position of the instance in case it leaves the die
643643
if (estimate_parasitics_->getParasiticsSrc()
644-
== est::ParasiticsSrc::global_routing
644+
== est::ParasiticsSrc::kGlobalRouting
645645
|| estimate_parasitics_->getParasiticsSrc()
646-
== est::ParasiticsSrc::detailed_routing) {
646+
== est::ParasiticsSrc::kDetailedRouting) {
647647
opendp_->legalCellPos(db_network_->staToDb(inst));
648648
}
649649

0 commit comments

Comments
 (0)