Skip to content

Commit de657d5

Browse files
malibertymaliberty
authored
Merge pull request The-OpenROAD-Project#6196 from allight/rename-deleted
Rename deleted_unique_ptr to UniquePtrWithDeleter
2 parents 75f2922 + 5e76d93 commit de657d5

File tree

7 files changed

+28
-28
lines changed

7 files changed

+28
-28
lines changed

‎src/rmp/src/abc_library_factory.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ AbcLibrary AbcLibraryFactory::Build()
317317
}
318318
abc::Abc_SclLibNormalize(abc_library);
319319

320-
return AbcLibrary(utl::deleted_unique_ptr<abc::SC_Lib>(
320+
return AbcLibrary(utl::UniquePtrWithDeleter<abc::SC_Lib>(
321321
abc_library, [](abc::SC_Lib* lib) { abc::Abc_SclLibFree(lib); }));
322322
}
323323

@@ -466,4 +466,4 @@ bool AbcLibrary::IsSupportedCell(const std::string& cell_name)
466466
return supported_cells_.find(cell_name) != supported_cells_.end();
467467
}
468468

469-
} // namespace rmp
469+
} // namespace rmp

‎src/rmp/src/abc_library_factory.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ namespace rmp {
2222
class AbcLibrary
2323
{
2424
public:
25-
AbcLibrary(utl::deleted_unique_ptr<abc::SC_Lib> abc_library)
25+
AbcLibrary(utl::UniquePtrWithDeleter<abc::SC_Lib> abc_library)
2626
: abc_library_(std::move(abc_library))
2727
{
2828
}
@@ -31,7 +31,7 @@ class AbcLibrary
3131
bool IsSupportedCell(const std::string& cell_name);
3232

3333
private:
34-
utl::deleted_unique_ptr<abc::SC_Lib> abc_library_;
34+
utl::UniquePtrWithDeleter<abc::SC_Lib> abc_library_;
3535
std::set<std::string> supported_cells_;
3636
};
3737

@@ -63,4 +63,4 @@ class AbcLibraryFactory
6363
sta::dbSta* db_sta_ = nullptr;
6464
};
6565

66-
} // namespace rmp
66+
} // namespace rmp

‎src/rmp/src/logic_cut.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -256,12 +256,12 @@ void CreateNets(
256256
}
257257
}
258258

259-
utl::deleted_unique_ptr<abc::Abc_Ntk_t> LogicCut::BuildMappedAbcNetwork(
259+
utl::UniquePtrWithDeleter<abc::Abc_Ntk_t> LogicCut::BuildMappedAbcNetwork(
260260
AbcLibrary& abc_library,
261261
sta::dbNetwork* network,
262262
utl::Logger* logger)
263263
{
264-
utl::deleted_unique_ptr<abc::Abc_Ntk_t> abc_network(
264+
utl::UniquePtrWithDeleter<abc::Abc_Ntk_t> abc_network(
265265
abc::Abc_NtkAlloc(abc::Abc_NtkType_t::ABC_NTK_NETLIST,
266266
abc::Abc_NtkFunc_t::ABC_FUNC_MAP,
267267
/*fUseMemMan=*/1),
@@ -611,4 +611,4 @@ void LogicCut::InsertMappedAbcNetwork(abc::Abc_Ntk_t* abc_network,
611611
}
612612
}
613613

614-
} // namespace rmp
614+
} // namespace rmp

‎src/rmp/src/logic_cut.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class LogicCut
5252
&& cut_instances_.empty();
5353
}
5454

55-
utl::deleted_unique_ptr<abc::Abc_Ntk_t> BuildMappedAbcNetwork(
55+
utl::UniquePtrWithDeleter<abc::Abc_Ntk_t> BuildMappedAbcNetwork(
5656
AbcLibrary& abc_library,
5757
sta::dbNetwork* network,
5858
utl::Logger* logger);

‎src/rmp/test/cpp/TestAbc.cc

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ class AbcTest : public ::testing::Test
5454
protected:
5555
void SetUp() override
5656
{
57-
db_ = utl::deleted_unique_ptr<odb::dbDatabase>(odb::dbDatabase::create(),
58-
&odb::dbDatabase::destroy);
57+
db_ = utl::UniquePtrWithDeleter<odb::dbDatabase>(odb::dbDatabase::create(),
58+
&odb::dbDatabase::destroy);
5959
std::call_once(init_sta_flag, []() {
6060
sta::initSta();
6161
abc::Abc_Start();
@@ -137,7 +137,7 @@ class AbcTest : public ::testing::Test
137137
return primary_output_name_to_index;
138138
}
139139

140-
utl::deleted_unique_ptr<odb::dbDatabase> db_;
140+
utl::UniquePtrWithDeleter<odb::dbDatabase> db_;
141141
sta::Unit* power_unit_;
142142
std::unique_ptr<sta::dbSta> sta_;
143143
sta::LibertyLibrary* library_;
@@ -251,7 +251,7 @@ TEST_F(AbcTest, TestLibraryInstallation)
251251
gate = abc::Mio_GateReadNext(gate);
252252
}
253253

254-
utl::deleted_unique_ptr<abc::Abc_Ntk_t> network(
254+
utl::UniquePtrWithDeleter<abc::Abc_Ntk_t> network(
255255
abc::Abc_NtkAlloc(abc::Abc_NtkType_t::ABC_NTK_NETLIST,
256256
abc::Abc_NtkFunc_t::ABC_FUNC_MAP,
257257
/*fUseMemMan=*/1),
@@ -284,11 +284,11 @@ TEST_F(AbcTest, TestLibraryInstallation)
284284

285285
abc::Abc_ObjAddFanin(output, output_net);
286286

287-
utl::deleted_unique_ptr<abc::Abc_Ntk_t> logic_network(
287+
utl::UniquePtrWithDeleter<abc::Abc_Ntk_t> logic_network(
288288
abc::Abc_NtkToLogic(network.get()), &abc::Abc_NtkDelete);
289289

290290
std::array<int, 2> input_vector = {1, 1};
291-
utl::deleted_unique_ptr<int> output_vector(
291+
utl::UniquePtrWithDeleter<int> output_vector(
292292
abc::Abc_NtkVerifySimulatePattern(logic_network.get(),
293293
input_vector.data()),
294294
&free);
@@ -397,20 +397,20 @@ TEST_F(AbcTest, BuildAbcMappedNetworkFromLogicCut)
397397
logic_extractor.AppendEndpoint(flop_input_vertex);
398398
LogicCut cut = logic_extractor.BuildLogicCut(abc_library);
399399

400-
utl::deleted_unique_ptr<abc::Abc_Ntk_t> abc_network
400+
utl::UniquePtrWithDeleter<abc::Abc_Ntk_t> abc_network
401401
= cut.BuildMappedAbcNetwork(abc_library, network, &logger_);
402402

403403
abc::Abc_NtkSetName(abc_network.get(), strdup("temp_network_name"));
404404

405-
utl::deleted_unique_ptr<abc::Abc_Ntk_t> logic_network(
405+
utl::UniquePtrWithDeleter<abc::Abc_Ntk_t> logic_network(
406406
abc::Abc_NtkToLogic(abc_network.get()), &abc::Abc_NtkDelete);
407407

408408
// Build map of primary output names to primary output indicies in ABC
409409
std::map<std::string, int> primary_output_name_to_index
410410
= AbcLogicNetworkNameToPrimaryOutputIds(logic_network.get());
411411

412412
std::array<int, 2> input_vector = {1, 1};
413-
utl::deleted_unique_ptr<int> output_vector(
413+
utl::UniquePtrWithDeleter<int> output_vector(
414414
abc::Abc_NtkVerifySimulatePattern(logic_network.get(),
415415
input_vector.data()),
416416
&free);
@@ -467,7 +467,7 @@ TEST_F(AbcTest, InsertingMappedLogicCutDoesNotThrow)
467467
logic_extractor.AppendEndpoint(flop_input_vertex);
468468
LogicCut cut = logic_extractor.BuildLogicCut(abc_library);
469469

470-
utl::deleted_unique_ptr<abc::Abc_Ntk_t> mapped_abc_network
470+
utl::UniquePtrWithDeleter<abc::Abc_Ntk_t> mapped_abc_network
471471
= cut.BuildMappedAbcNetwork(abc_library, network, &logger_);
472472

473473
rmp::UniqueName unique_name;
@@ -497,7 +497,7 @@ TEST_F(AbcTest,
497497
logic_extractor.AppendEndpoint(flop_input_vertex);
498498
LogicCut cut = logic_extractor.BuildLogicCut(abc_library);
499499

500-
utl::deleted_unique_ptr<abc::Abc_Ntk_t> mapped_abc_network
500+
utl::UniquePtrWithDeleter<abc::Abc_Ntk_t> mapped_abc_network
501501
= cut.BuildMappedAbcNetwork(abc_library, network, &logger_);
502502

503503
rmp::UniqueName unique_name;
@@ -511,13 +511,13 @@ TEST_F(AbcTest,
511511
LogicCut cut_post_insert
512512
= logic_extractor_post_insert.BuildLogicCut(abc_library);
513513

514-
utl::deleted_unique_ptr<abc::Abc_Ntk_t> mapped_abc_network_post_insert
514+
utl::UniquePtrWithDeleter<abc::Abc_Ntk_t> mapped_abc_network_post_insert
515515
= cut.BuildMappedAbcNetwork(abc_library, network, &logger_);
516516

517517
abc::Abc_NtkSetName(mapped_abc_network_post_insert.get(),
518518
strdup("temp_network_name"));
519519

520-
utl::deleted_unique_ptr<abc::Abc_Ntk_t> logic_network(
520+
utl::UniquePtrWithDeleter<abc::Abc_Ntk_t> logic_network(
521521
abc::Abc_NtkToLogic(mapped_abc_network_post_insert.get()),
522522
&abc::Abc_NtkDelete);
523523

@@ -526,7 +526,7 @@ TEST_F(AbcTest,
526526
= AbcLogicNetworkNameToPrimaryOutputIds(logic_network.get());
527527

528528
std::array<int, 2> input_vector = {1, 1};
529-
utl::deleted_unique_ptr<int> output_vector(
529+
utl::UniquePtrWithDeleter<int> output_vector(
530530
abc::Abc_NtkVerifySimulatePattern(logic_network.get(),
531531
input_vector.data()),
532532
&free);

‎src/rsz/test/cpp/TestBufferRemoval.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ class BufRemTest : public ::testing::Test
4848
void SetUp() override
4949
{
5050
// this will be so much easier with read_def
51-
db_ = utl::deleted_unique_ptr<odb::dbDatabase>(odb::dbDatabase::create(),
52-
&odb::dbDatabase::destroy);
51+
db_ = utl::UniquePtrWithDeleter<odb::dbDatabase>(odb::dbDatabase::create(),
52+
&odb::dbDatabase::destroy);
5353
std::call_once(init_sta_flag, []() { sta::initSta(); });
5454
sta_ = std::unique_ptr<sta::dbSta>(ord::makeDbSta());
5555
sta_->initVars(Tcl_CreateInterp(), db_.get(), &logger_);
@@ -197,7 +197,7 @@ class BufRemTest : public ::testing::Test
197197
return nullptr;
198198
}
199199

200-
utl::deleted_unique_ptr<odb::dbDatabase> db_;
200+
utl::UniquePtrWithDeleter<odb::dbDatabase> db_;
201201
sta::Unit* power_unit_;
202202
std::unique_ptr<sta::dbSta> sta_;
203203
sta::LibertyLibrary* library_;

‎src/utl/include/utl/deleter.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@
1010
namespace utl {
1111

1212
template <typename T>
13-
using deleted_unique_ptr = std::unique_ptr<T, std::function<void(T*)>>;
13+
using UniquePtrWithDeleter = std::unique_ptr<T, std::function<void(T*)>>;
1414

15-
}
15+
}

0 commit comments

Comments
 (0)