Skip to content

Commit 85053b0

Browse files
committed
fix performance-avoid-endl
Signed-off-by: Matt Liberty <[email protected]>
1 parent 84d603d commit 85053b0

33 files changed

+192
-199
lines changed

src/Main.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ std::string findPathToTclreadlineInit(Tcl_Interp* interp)
371371

372372
if (Tcl_Eval(interp, tcl_script) == TCL_ERROR) {
373373
std::cerr << "Tcl_Eval failed: " << Tcl_GetStringResult(interp)
374-
<< std::endl;
374+
<< '\n';
375375
return "";
376376
}
377377

src/OpenRoad.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ OpenRoad* OpenRoad::openRoad()
166166
void OpenRoad::setOpenRoad(OpenRoad* app, bool reinit_ok)
167167
{
168168
if (!reinit_ok && app_) {
169-
std::cerr << "Attempt to reinitialize the application." << std::endl;
169+
std::cerr << "Attempt to reinitialize the application.\n";
170170
exit(1);
171171
}
172172
app_ = app;

src/cut/src/blif.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -301,12 +301,12 @@ bool Blif::writeBlif(const char* file_name, bool write_arrival_requireds)
301301
if (write_arrival_requireds) {
302302
for (auto& arrival : arrivals_) {
303303
f << ".input_arrival " << arrival.first << " " << arrival.second.first
304-
<< " " << arrival.second.second << std::endl;
304+
<< " " << arrival.second.second << '\n';
305305
}
306306

307307
for (auto& required : requireds_) {
308308
f << ".output_required " << required.first << " " << required.second.first
309-
<< " " << required.second.second << std::endl;
309+
<< " " << required.second.second << '\n';
310310
}
311311
}
312312

src/drt/src/db/obj/frRPin.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ odb::Rect frRPin::getBBox()
3030
pt = accessPoint_->getPoint();
3131
break;
3232
default:
33-
std::cout << "ERROR: Invalid term type in frRPin." << std::endl;
33+
std::cout << "ERROR: Invalid term type in frRPin.\n";
3434
break;
3535
}
3636

src/drt/src/db/tech/frLookupTbl.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -170,20 +170,20 @@ class fr2DLookupTbl
170170
// debug
171171
void printTbl() const
172172
{
173-
std::cout << "rowName: " << rowName_ << std::endl;
173+
std::cout << "rowName: " << rowName_ << '\n';
174174
for (auto& m : rows_) {
175175
std::cout << m << " ";
176176
}
177-
std::cout << "\n colName: " << colName_ << std::endl;
177+
std::cout << "\n colName: " << colName_ << '\n';
178178
for (auto& m : cols_) {
179179
std::cout << m << " ";
180180
}
181-
std::cout << "\n vals: " << std::endl;
181+
std::cout << "\n vals: \n";
182182
for (auto& m : vals_) {
183183
for (auto& n : m) {
184184
std::cout << n << " ";
185185
}
186-
std::cout << std::endl;
186+
std::cout << '\n';
187187
}
188188
}
189189

src/drt/src/db/tech/frViaDef.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,23 +127,23 @@ class frViaDef
127127
if (!layer1Figs_.empty()) {
128128
return (layer1Figs_.at(0))->getLayerNum();
129129
}
130-
std::cout << "Error: via does not have shape on layer 1" << std::endl;
130+
std::cout << "Error: via does not have shape on layer 1\n";
131131
exit(1);
132132
}
133133
frLayerNum getLayer2Num() const
134134
{
135135
if (!layer2Figs_.empty()) {
136136
return (layer2Figs_.at(0))->getLayerNum();
137137
}
138-
std::cout << "Error: via does not have shape on layer 2" << std::endl;
138+
std::cout << "Error: via does not have shape on layer 2\n";
139139
exit(1);
140140
}
141141
frLayerNum getCutLayerNum() const
142142
{
143143
if (!cutFigs_.empty()) {
144144
return (cutFigs_.at(0))->getLayerNum();
145145
}
146-
std::cout << "Error: via does not have shape on layer cut" << std::endl;
146+
std::cout << "Error: via does not have shape on layer cut\n";
147147
exit(1);
148148
}
149149
const std::vector<std::unique_ptr<frShape>>& getLayer1Figs() const

src/drt/src/dr/FlexDR_end.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ void FlexDRWorker::endRemoveNets(
280280
endRemoveNets_pathSeg(design, cptr, boundPts[cptr->getNet()]);
281281
}
282282
} else {
283-
std::cout << "Error: endRemoveNet hasNet() empty" << std::endl;
283+
std::cout << "Error: endRemoveNet hasNet() empty\n";
284284
}
285285
} else if (rptr->typeId() == frcVia) {
286286
auto cptr = static_cast<frVia*>(rptr);
@@ -289,7 +289,7 @@ void FlexDRWorker::endRemoveNets(
289289
endRemoveNets_via(design, cptr);
290290
}
291291
} else {
292-
std::cout << "Error: endRemoveNet hasNet() empty" << std::endl;
292+
std::cout << "Error: endRemoveNet hasNet() empty\n";
293293
}
294294
} else if (rptr->typeId() == frcPatchWire) {
295295
auto cptr = static_cast<frPatchWire*>(rptr);
@@ -298,10 +298,10 @@ void FlexDRWorker::endRemoveNets(
298298
endRemoveNets_patchWire(design, cptr);
299299
}
300300
} else {
301-
std::cout << "Error: endRemoveNet hasNet() empty" << std::endl;
301+
std::cout << "Error: endRemoveNet hasNet() empty\n";
302302
}
303303
} else {
304-
std::cout << "Error: endRemoveNets unsupported type" << std::endl;
304+
std::cout << "Error: endRemoveNets unsupported type\n";
305305
}
306306
}
307307
}
@@ -610,7 +610,7 @@ void FlexDRWorker::endAddNets(
610610
} else if (connFig->typeId() == drcPatchWire) {
611611
endAddNets_patchWire(design, static_cast<drPatchWire*>(connFig.get()));
612612
} else {
613-
std::cout << "Error: endAddNets unsupported type" << std::endl;
613+
std::cout << "Error: endAddNets unsupported type\n";
614614
}
615615
}
616616
if (net->hasExtFigUpdates()) {

src/drt/src/dr/FlexDR_init.cpp

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -237,25 +237,25 @@ void FlexDRWorker::initNetObjs(
237237
if (cptr->hasNet()) {
238238
initNetObjs_pathSeg(cptr, nets, netRouteObjs, netExtObjs);
239239
} else {
240-
std::cout << "Error: initNetObjs hasNet() empty" << std::endl;
240+
std::cout << "Error: initNetObjs hasNet() empty\n";
241241
}
242242
} else if (rptr->typeId() == frcVia) {
243243
auto cptr = static_cast<frVia*>(rptr);
244244
if (cptr->hasNet()) {
245245
initNetObjs_via(cptr, nets, netRouteObjs, netExtObjs);
246246
} else {
247-
std::cout << "Error: initNetObjs hasNet() empty" << std::endl;
247+
std::cout << "Error: initNetObjs hasNet() empty\n";
248248
}
249249
} else if (rptr->typeId() == frcPatchWire) {
250250
auto cptr = static_cast<frPatchWire*>(rptr);
251251
if (cptr->hasNet()) {
252252
initNetObjs_patchWire(cptr, nets, netRouteObjs, netExtObjs);
253253
} else {
254-
std::cout << "Error: initNetObjs hasNet() empty" << std::endl;
254+
std::cout << "Error: initNetObjs hasNet() empty\n";
255255
}
256256
} else {
257257
std::cout << rptr->typeId() << "\n";
258-
std::cout << "Error: initCopyDRObjs unsupported type" << std::endl;
258+
std::cout << "Error: initCopyDRObjs unsupported type\n";
259259
}
260260
}
261261
if (isInitDR()) {
@@ -813,8 +813,7 @@ void FlexDRWorker::initNets_searchRepair_pin2epMap(
813813
}
814814
} else if (connFig->typeId() == drcPatchWire) {
815815
} else {
816-
std::cout << "Error: initNets_searchRepair_pin2epMap unsupported type"
817-
<< std::endl;
816+
std::cout << "Error: initNets_searchRepair_pin2epMap unsupported type\n";
818817
}
819818
}
820819
}
@@ -845,8 +844,7 @@ void FlexDRWorker::initNets_searchRepair_nodeMap_routeObjEnd(
845844
const auto lNum = obj->getLayerNum();
846845
nodeMap[{bp, lNum}].insert(i);
847846
} else {
848-
std::cout << "Error: initNets_searchRepair_nodeMap unsupported type"
849-
<< std::endl;
847+
std::cout << "Error: initNets_searchRepair_nodeMap unsupported type\n";
850848
}
851849
}
852850
}
@@ -1678,7 +1676,7 @@ void FlexDRWorker::initTrackCoords_route(drNet* net,
16781676
}
16791677
} else if (uConnFig->typeId() == drcPatchWire) {
16801678
} else {
1681-
std::cout << "Error: initTrackCoords unsupported type" << std::endl;
1679+
std::cout << "Error: initTrackCoords unsupported type\n";
16821680
}
16831681
}
16841682
}
@@ -1779,7 +1777,7 @@ void FlexDRWorker::initMazeIdx_connFig(drConnFig* connFig)
17791777
} else {
17801778
std::cout << "Error: initMazeIdx_connFig pathseg no idx (" << bp.x()
17811779
<< ", " << bp.y() << ") (" << ep.x() << ", " << ep.y() << ") "
1782-
<< getTech()->getLayer(lNum)->getName() << std::endl;
1780+
<< getTech()->getLayer(lNum)->getName() << '\n';
17831781
}
17841782
} else if (connFig->typeId() == drcVia) {
17851783
auto obj = static_cast<drVia*>(connFig);
@@ -1796,11 +1794,11 @@ void FlexDRWorker::initMazeIdx_connFig(drConnFig* connFig)
17961794
} else {
17971795
std::cout << "Error: initMazeIdx_connFig via no idx (" << bp.x() << ", "
17981796
<< bp.y() << ") "
1799-
<< getTech()->getLayer(layer1Num + 1)->getName() << std::endl;
1797+
<< getTech()->getLayer(layer1Num + 1)->getName() << '\n';
18001798
}
18011799
} else if (connFig->typeId() == drcPatchWire) {
18021800
} else {
1803-
std::cout << "Error: initMazeIdx_connFig unsupported type" << std::endl;
1801+
std::cout << "Error: initMazeIdx_connFig unsupported type\n";
18041802
}
18051803
}
18061804

@@ -1826,7 +1824,7 @@ void FlexDRWorker::initMazeIdx_ap(drAccessPattern* ap)
18261824
}
18271825
} else {
18281826
std::cout << "Error: initMazeIdx_ap no idx (" << bp.x() << ", " << bp.y()
1829-
<< ") " << getTech()->getLayer(lNum)->getName() << std::endl;
1827+
<< ") " << getTech()->getLayer(lNum)->getName() << '\n';
18301828
}
18311829

18321830
if (gridGraph_.hasMazeIdx(bp, lNum + 2)) {
@@ -2085,8 +2083,7 @@ void FlexDRWorker::initMazeCost_marker_route_queue_addHistoryCost(
20852083
if (i == 4) {
20862084
std::cout
20872085
<< "Warning: marker bloat 4x width but could not find two grids "
2088-
"to add marker cost"
2089-
<< std::endl;
2086+
"to add marker cost\n";
20902087
std::cout << " marker -- src: ";
20912088
for (auto src : marker.getSrcs()) {
20922089
if (src) {
@@ -2563,7 +2560,8 @@ void FlexDRWorker::route_queue_update_from_marker(
25632560
allowAvoidRipup = true;
25642561
dNet->setNRipupAvoids(0);
25652562
}
2566-
routes.emplace_back(dNet, dNet->getNumReroutes(), true, checkingObj);
2563+
routes.emplace_back(
2564+
dNet, dNet->getNumReroutes(), true, checkingObj);
25672565
}
25682566
}
25692567
}

src/drt/src/dr/FlexDR_maze.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1937,8 +1937,7 @@ void FlexDRWorker::route_queue_main(std::queue<RouteQueueEntry>& rerouteQueue)
19371937
if (router_cfg_->VERBOSE > 0) {
19381938
std::cout
19391939
<< "Warning: no output maze log specified, skipped writing "
1940-
"maze log"
1941-
<< std::endl;
1940+
"maze log\n";
19421941
}
19431942
} else {
19441943
gridGraph_.print();
@@ -2458,7 +2457,7 @@ void FlexDRWorker::routeNet_postAstarUpdate(
24582457
}
24592458
}
24602459
} else {
2461-
std::cout << "Error: routeNet_postAstarUpdate path is empty" << std::endl;
2460+
std::cout << "Error: routeNet_postAstarUpdate path is empty\n";
24622461
}
24632462
// must be before comment line ABC so that the used actual src is set in
24642463
// gridgraph

src/drt/src/dr/FlexDR_rq.cpp

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ void FlexDRWorkerRegionQuery::add(drConnFig* connFig)
6767
impl_->shapes.at(via->getViaDef()->getLayer1Num())
6868
.insert(std::make_pair(frb, via));
6969
} else {
70-
std::cout << "Error: unsupported region query add" << std::endl;
70+
std::cout << "Error: unsupported region query add\n";
7171
}
7272
}
7373
for (auto& uShape : via->getViaDef()->getLayer2Figs()) {
@@ -78,7 +78,7 @@ void FlexDRWorkerRegionQuery::add(drConnFig* connFig)
7878
impl_->shapes.at(via->getViaDef()->getLayer2Num())
7979
.insert(std::make_pair(frb, via));
8080
} else {
81-
std::cout << "Error: unsupported region query add" << std::endl;
81+
std::cout << "Error: unsupported region query add\n";
8282
}
8383
}
8484
for (auto& uShape : via->getViaDef()->getCutFigs()) {
@@ -89,11 +89,11 @@ void FlexDRWorkerRegionQuery::add(drConnFig* connFig)
8989
impl_->shapes.at(via->getViaDef()->getCutLayerNum())
9090
.insert(std::make_pair(frb, via));
9191
} else {
92-
std::cout << "Error: unsupported region query add" << std::endl;
92+
std::cout << "Error: unsupported region query add\n";
9393
}
9494
}
9595
} else {
96-
std::cout << "Error: unsupported region query add" << std::endl;
96+
std::cout << "Error: unsupported region query add\n";
9797
}
9898
}
9999

@@ -117,7 +117,7 @@ void FlexDRWorkerRegionQuery::Impl::add(
117117
allShapes.at(via->getViaDef()->getLayer1Num())
118118
.emplace_back(frb, via);
119119
} else {
120-
std::cout << "Error: unsupported region query add" << std::endl;
120+
std::cout << "Error: unsupported region query add\n";
121121
}
122122
}
123123
for (auto& uShape : via->getViaDef()->getLayer2Figs()) {
@@ -128,7 +128,7 @@ void FlexDRWorkerRegionQuery::Impl::add(
128128
allShapes.at(via->getViaDef()->getLayer2Num())
129129
.emplace_back(frb, via);
130130
} else {
131-
std::cout << "Error: unsupported region query add" << std::endl;
131+
std::cout << "Error: unsupported region query add\n";
132132
}
133133
}
134134
for (auto& uShape : via->getViaDef()->getCutFigs()) {
@@ -139,11 +139,11 @@ void FlexDRWorkerRegionQuery::Impl::add(
139139
allShapes.at(via->getViaDef()->getCutLayerNum())
140140
.emplace_back(frb, via);
141141
} else {
142-
std::cout << "Error: unsupported region query add" << std::endl;
142+
std::cout << "Error: unsupported region query add\n";
143143
}
144144
}
145145
} else {
146-
std::cout << "Error: unsupported region query add" << std::endl;
146+
std::cout << "Error: unsupported region query add\n";
147147
}
148148
}
149149

@@ -165,7 +165,7 @@ void FlexDRWorkerRegionQuery::remove(drConnFig* connFig)
165165
impl_->shapes.at(via->getViaDef()->getLayer1Num())
166166
.remove(std::make_pair(frb, via));
167167
} else {
168-
std::cout << "Error: unsupported region query remove" << std::endl;
168+
std::cout << "Error: unsupported region query remove\n";
169169
}
170170
}
171171
for (auto& uShape : via->getViaDef()->getLayer2Figs()) {
@@ -176,7 +176,7 @@ void FlexDRWorkerRegionQuery::remove(drConnFig* connFig)
176176
impl_->shapes.at(via->getViaDef()->getLayer2Num())
177177
.remove(std::make_pair(frb, via));
178178
} else {
179-
std::cout << "Error: unsupported region query remove" << std::endl;
179+
std::cout << "Error: unsupported region query remove\n";
180180
}
181181
}
182182
for (auto& uShape : via->getViaDef()->getCutFigs()) {
@@ -187,11 +187,11 @@ void FlexDRWorkerRegionQuery::remove(drConnFig* connFig)
187187
impl_->shapes.at(via->getViaDef()->getCutLayerNum())
188188
.remove(std::make_pair(frb, via));
189189
} else {
190-
std::cout << "Error: unsupported region query remove" << std::endl;
190+
std::cout << "Error: unsupported region query remove\n";
191191
}
192192
}
193193
} else {
194-
std::cout << "Error: unsupported region query remove" << std::endl;
194+
std::cout << "Error: unsupported region query remove\n";
195195
}
196196
}
197197

0 commit comments

Comments
 (0)