Skip to content

Commit 69fa661

Browse files
authored
Merge pull request #10881 from The-OpenROAD-Project-staging/stt-drop-unused-db-param
stt: drop unused dbDatabase* from SteinerTreeBuilder
2 parents dc823bb + 67feac6 commit 69fa661

7 files changed

Lines changed: 7 additions & 9 deletions

File tree

src/OpenRoad.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ void OpenRoad::init(Tcl_Interp* tcl_interp,
215215
sta_ = new sta::dbSta(tcl_interp, db_, logger_);
216216
verilog_network_ = new dbVerilogNetwork(sta_);
217217
ioPlacer_ = new ppl::IOPlacer(db_, logger_);
218-
stt_builder_ = new stt::SteinerTreeBuilder(db_, logger_);
218+
stt_builder_ = new stt::SteinerTreeBuilder(logger_);
219219
antenna_checker_ = new ant::AntennaChecker(db_, logger_);
220220
opendp_ = new dpl::Opendp(db_, logger_);
221221
global_router_ = new grt::GlobalRouter(logger_,

src/gpl/test/mbff_test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class MBFFTestFixture : public tst::Fixture
4444
logger_ = getLogger();
4545
service_registry_ = std::make_unique<utl::ServiceRegistry>(logger_);
4646
verilog_network_ = std::make_unique<ord::dbVerilogNetwork>(getSta());
47-
stt_builder_ = std::make_unique<stt::SteinerTreeBuilder>(getDb(), logger_);
47+
stt_builder_ = std::make_unique<stt::SteinerTreeBuilder>(logger_);
4848
antenna_checker_ = std::make_unique<ant::AntennaChecker>(getDb(), logger_);
4949
opendp_ = std::make_unique<dpl::Opendp>(getDb(), logger_);
5050
global_router_

src/rsz/test/cpp/TestBufferRemoval.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class BufRemTest : public tst::Nangate45Fixture
3636
protected:
3737
BufRemTest()
3838
: // initializer resizer
39-
stt_(db_.get(), &logger_),
39+
stt_(&logger_),
4040
service_registry_(&logger_),
4141
dp_(db_.get(), &logger_),
4242
ant_(db_.get(), &logger_),

src/rsz/test/cpp/TestBufferRemoval2.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class BufRemTest2 : public tst::Nangate45Fixture
3030
{
3131
protected:
3232
BufRemTest2()
33-
: stt_(db_.get(), &logger_),
33+
: stt_(&logger_),
3434
service_registry_(&logger_),
3535
dp_(db_.get(), &logger_),
3636
ant_(db_.get(), &logger_),

src/stt/include/stt/SteinerTreeBuilder.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ struct Tree
4949
class SteinerTreeBuilder
5050
{
5151
public:
52-
SteinerTreeBuilder(odb::dbDatabase* db, utl::Logger* logger);
52+
explicit SteinerTreeBuilder(utl::Logger* logger);
5353
~SteinerTreeBuilder();
5454

5555
Tree makeSteinerTree(const std::vector<int>& x,
@@ -96,7 +96,6 @@ class SteinerTreeBuilder
9696
std::pair<int, float> min_hpwl_alpha_;
9797

9898
utl::Logger* logger_;
99-
odb::dbDatabase* db_;
10099
std::unique_ptr<flt::Flute> flute_;
101100
};
102101

src/stt/src/SteinerTreeBuilder.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,11 @@ namespace stt {
2222

2323
static void reportSteinerBranches(const stt::Tree& tree, utl::Logger* logger);
2424

25-
SteinerTreeBuilder::SteinerTreeBuilder(odb::dbDatabase* db, utl::Logger* logger)
25+
SteinerTreeBuilder::SteinerTreeBuilder(utl::Logger* logger)
2626
: alpha_(0.3),
2727
min_fanout_alpha_({0, -1}),
2828
min_hpwl_alpha_({0, -1}),
2929
logger_(logger),
30-
db_(db),
3130
flute_(new flt::Flute())
3231
{
3332
}

src/tst/src/IntegratedFixture.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ namespace tst {
3131

3232
IntegratedFixture::IntegratedFixture(Technology tech,
3333
const std::string& test_root_path)
34-
: stt_(db_.get(), &logger_),
34+
: stt_(&logger_),
3535
service_registry_(&logger_),
3636
dp_(db_.get(), &logger_),
3737
ant_(db_.get(), &logger_),

0 commit comments

Comments
 (0)