Skip to content

Commit e39cc59

Browse files
kbieganskikbieganski
committed
cgt: cut: Fix lints
Signed-off-by: Krzysztof Bieganski <[email protected]>
1 parent 621ccfc commit e39cc59

File tree

6 files changed

+28
-25
lines changed

6 files changed

+28
-25
lines changed

‎src/cgt/include/cgt/ClockGating.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,8 @@ class ClockGating
143143
// Helper for inserting new instances/nets into a network.
144144
NetworkBuilder network_builder_;
145145

146-
Logger* logger_;
147-
sta::dbSta* sta_;
146+
Logger* logger_ = nullptr;
147+
sta::dbSta* sta_ = nullptr;
148148
std::unique_ptr<cut::AbcLibraryFactory> abc_factory_;
149149
std::unique_ptr<cut::AbcLibrary> abc_library_;
150150
};

‎src/cgt/src/ClockGating.cpp‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -512,7 +512,7 @@ void ClockGating::run()
512512
continue;
513513
}
514514

515-
correct_conds = gate_cond_cover;
515+
correct_conds = std::move(gate_cond_cover);
516516
searchClockGates(instance,
517517
correct_conds,
518518
correct_conds.begin(),
@@ -657,10 +657,11 @@ void ClockGating::searchClockGates(sta::Instance* const instance,
657657
abc::Abc_Ntk_t& abc_network,
658658
const bool clk_enable)
659659
{
660-
if (end - begin < 2) {
660+
size_t half_len = (end - begin) / 2;
661+
if (half_len == 0) {
661662
return;
662663
}
663-
auto mid = begin + (end - begin) / 2;
664+
auto mid = begin + half_len;
664665
auto combined_candidate_names
665666
= combinedGatingCondNames(sta_->getDbNetwork(), mid, end, clk_enable);
666667
debugPrint(
@@ -684,6 +685,7 @@ void ClockGating::searchClockGates(sta::Instance* const instance,
684685
"Clock gating signals: '{}' can be dropped",
685686
combined_candidate_names);
686687
good_gate_conds.erase(mid, end);
688+
mid = begin + half_len;
687689
} else if (end - mid > 1) {
688690
debugPrint(logger_,
689691
CGT,
@@ -825,6 +827,8 @@ static abc::Abc_Obj_t* regDataFunctionToAbc(sta::dbNetwork* const network,
825827
case sta::FuncExpr::op_or:
826828
case sta::FuncExpr::op_xor:
827829
expr_stack.push_back(expr->right());
830+
expr_stack.push_back(expr->left());
831+
break;
828832
case sta::FuncExpr::op_not:
829833
expr_stack.push_back(expr->left());
830834
break;

‎src/cut/include/cut/logic_cut.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ namespace cut {
1818
class LogicCut
1919
{
2020
public:
21-
LogicCut(std::vector<sta::Net*>& primary_inputs,
22-
std::vector<sta::Net*>& primary_outputs,
23-
sta::InstanceSet& cut_instances)
21+
LogicCut(std::vector<sta::Net*>&& primary_inputs,
22+
std::vector<sta::Net*>&& primary_outputs,
23+
sta::InstanceSet&& cut_instances)
2424
: primary_inputs_(std::move(primary_inputs)),
2525
primary_outputs_(std::move(primary_outputs)),
2626
cut_instances_(std::move(cut_instances))

‎src/cut/src/blif.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -534,7 +534,7 @@ bool Blif::readBlif(const char* file_name, odb::dbBlock* block)
534534
auto port_ = network_->libertyPort(pin_);
535535
if (port_->isClock()) {
536536
mtermName = mTerm->getName();
537-
netName = connection;
537+
netName = std::move(connection);
538538
break;
539539
}
540540
}

‎src/cut/src/logic_extractor.cpp‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,9 @@ LogicCut LogicExtractorFactory::BuildLogicCut(AbcLibrary& abc_network)
385385
std::vector<sta::Net*> primary_output_nets
386386
= ConvertIoPinsToNets(filtered_primary_outputs);
387387

388-
return LogicCut(primary_input_nets, primary_output_nets, cut_instances);
388+
return LogicCut(std::move(primary_input_nets),
389+
std::move(primary_output_nets),
390+
std::move(cut_instances));
389391
}
390392

391393
} // namespace cut

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

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ class AbcTest : public ::testing::Test
7575
sta_ = std::unique_ptr<sta::dbSta>(sta::makeDbSta());
7676
sta_->initVars(Tcl_CreateInterp(), db_.get(), &logger_);
7777
auto path = std::filesystem::canonical("./Nangate45/Nangate45_typ.lib");
78-
library_ = sta_->readLiberty(path.string().c_str(),
78+
library_ = sta_->readLiberty(path.c_str(),
7979
sta_->findCorner("default"),
8080
/*min_max=*/sta::MinMaxAll::all(),
8181
/*infer_latches=*/false);
@@ -87,10 +87,9 @@ class AbcTest : public ::testing::Test
8787
= std::filesystem::canonical("./Nangate45/Nangate45_tech.lef");
8888
auto stdcell_lef
8989
= std::filesystem::canonical("./Nangate45/Nangate45_stdcell.lef");
90-
odb::dbTech* tech
91-
= lef_reader.createTech("nangate45", tech_lef.string().c_str());
90+
odb::dbTech* tech = lef_reader.createTech("nangate45", tech_lef.c_str());
9291
odb::dbLib* lib
93-
= lef_reader.createLib(tech, "nangate45", stdcell_lef.string().c_str());
92+
= lef_reader.createLib(tech, "nangate45", stdcell_lef.c_str());
9493

9594
sta_->postReadLef(/*tech=*/nullptr, lib);
9695

@@ -174,7 +173,7 @@ class AbcTestSky130 : public AbcTest
174173
sta_->initVars(Tcl_CreateInterp(), db_.get(), &logger_);
175174
auto path = std::filesystem::canonical(
176175
"./sky130/sky130_fd_sc_hd__ss_n40C_1v40.lib");
177-
library_ = sta_->readLiberty(path.string().c_str(),
176+
library_ = sta_->readLiberty(path.c_str(),
178177
sta_->findCorner("default"),
179178
/*min_max=*/sta::MinMaxAll::all(),
180179
/*infer_latches=*/false);
@@ -185,10 +184,8 @@ class AbcTestSky130 : public AbcTest
185184
auto tech_lef = std::filesystem::canonical("./sky130/sky130hd.tlef");
186185
auto stdcell_lef
187186
= std::filesystem::canonical("./sky130/sky130hd_std_cell.lef");
188-
odb::dbTech* tech
189-
= lef_reader.createTech("sky130", tech_lef.string().c_str());
190-
odb::dbLib* lib
191-
= lef_reader.createLib(tech, "sky130", stdcell_lef.string().c_str());
187+
odb::dbTech* tech = lef_reader.createTech("sky130", tech_lef.c_str());
188+
odb::dbLib* lib = lef_reader.createLib(tech, "sky130", stdcell_lef.c_str());
192189

193190
sta_->postReadLef(/*tech=*/nullptr, lib);
194191

@@ -220,7 +217,7 @@ class AbcTestAsap7 : public AbcTest
220217

221218
for (const std::string& liberty_path : liberty_paths) {
222219
auto path = std::filesystem::canonical(liberty_path);
223-
library_ = sta_->readLiberty(path.string().c_str(),
220+
library_ = sta_->readLiberty(path.c_str(),
224221
sta_->findCorner("default"),
225222
/*min_max=*/sta::MinMaxAll::all(),
226223
/*infer_latches=*/false);
@@ -233,10 +230,8 @@ class AbcTestAsap7 : public AbcTest
233230
= std::filesystem::canonical("./asap7/asap7_tech_1x_201209.lef");
234231
auto stdcell_lef
235232
= std::filesystem::canonical("./asap7/asap7sc7p5t_28_R_1x_220121a.lef");
236-
odb::dbTech* tech
237-
= lef_reader.createTech("asap7", tech_lef.string().c_str());
238-
odb::dbLib* lib
239-
= lef_reader.createLib(tech, "asap7", stdcell_lef.string().c_str());
233+
odb::dbTech* tech = lef_reader.createTech("asap7", tech_lef.c_str());
234+
odb::dbLib* lib = lef_reader.createLib(tech, "asap7", stdcell_lef.c_str());
240235

241236
sta_->postReadLef(/*tech=*/nullptr, lib);
242237

@@ -667,7 +662,9 @@ TEST_F(AbcTestSky130, EnsureThatSky130MultiOutputConstCellsAreMapped)
667662
std::vector<sta::Net*> primary_outputs = {flop_net};
668663
sta::InstanceSet cut_instances(network);
669664
cut_instances.insert(flop_input_instance);
670-
LogicCut cut(primary_inputs, primary_outputs, cut_instances);
665+
LogicCut cut(std::move(primary_inputs),
666+
std::move(primary_outputs),
667+
std::move(cut_instances));
671668

672669
// Create abc network that matches the underlying LogicCut
673670
utl::UniquePtrWithDeleter<abc::Abc_Ntk_t> abc_network(

0 commit comments

Comments
 (0)