Skip to content

Commit 8097057

Browse files
committed
Merge remote-tracking branch 'origin/master' into dbvwriter
2 parents 92ae560 + 6a1b435 commit 8097057

19 files changed

+5549
-188
lines changed

src/drt/src/dr/FlexDR_end.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@ void FlexDRWorker::endGetModNets(frOrderedIdSet<frNet*>& modNets)
2626
{
2727
for (auto& net : nets_) {
2828
if (net->isModified()) {
29-
modNets.insert(net->getFrNet());
29+
auto fr_net = net->getFrNet();
30+
fr_net->setModified(true);
31+
modNets.insert(fr_net);
3032
}
3133
}
3234
// change modified flag to true if another subnet get routed

src/drt/src/dr/FlexDR_maze.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1906,9 +1906,6 @@ void FlexDRWorker::route_queue_main(std::queue<RouteQueueEntry>& rerouteQueue)
19061906
}
19071907
// init
19081908
net->setModified(true);
1909-
if (net->getFrNet()) {
1910-
net->getFrNet()->setModified(true);
1911-
}
19121909
net->setNumMarkers(0);
19131910
if (graphics_) {
19141911
graphics_->startNet(net);

src/gui/src/stub.cpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -267,4 +267,12 @@ void Gui::setDisplayControlsVisible(const std::string& name, bool value)
267267
{
268268
}
269269

270+
void Gui::clearHighlights(int highlight_group)
271+
{
272+
}
273+
274+
void Gui::addNetToHighlightSet(const char* name, int highlight_group)
275+
{
276+
}
277+
270278
} // namespace gui

src/pad/src/ICeWall.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -686,7 +686,7 @@ void ICeWall::placePads(const std::vector<odb::dbInst*>& insts,
686686
utl::PAD,
687687
"Place",
688688
1,
689-
"{}: Row width ({:.4f} um), total instance ({}) width {:.4f} um)",
689+
"{}: Row width ({:.4f} um), total instance ({}) width ({:.4f} um)",
690690
row->getName(),
691691
row_width / dbus,
692692
insts.size(),

0 commit comments

Comments
 (0)