mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2026-06-01 06:37:51 +00:00
Code Activity

opt_clean: refactor

Browse source
This commit is contained in:
Emil J. Tywoniak 2026-02-24 00:30:08 +01:00
parent 8dc9c48d4a
commit 17d667eab0
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
passes/opt/opt_clean.cc
View file

@ -833,13 +833,13 @@ struct WireDeleter {
pool<RTLIL::Wire*> del_wires_queue; pool<RTLIL::Wire*> del_wires_queue;
ShardedVector<RTLIL::Wire*> remove_init; ShardedVector<RTLIL::Wire*> remove_init;
ShardedVector<std::pair<RTLIL::Wire*, RTLIL::Const>> set_init; ShardedVector<std::pair<RTLIL::Wire*, RTLIL::Const>> set_init;
ShardedVector<RTLIL::SigSig> connections; ShardedVector<RTLIL::SigSig> new_connections;
ShardedVector<RTLIL::Wire*> remove_unused_bits; ShardedVector<RTLIL::Wire*> remove_unused_bits;
ShardedVector<std::pair<RTLIL::Wire*, RTLIL::Const>> set_unused_bits; ShardedVector<std::pair<RTLIL::Wire*, RTLIL::Const>> set_unused_bits;
WireDeleter(UsedSigAnalysis& used_sig_analysis, bool purge_mode, const AnalysisContext& actx) : WireDeleter(UsedSigAnalysis& used_sig_analysis, bool purge_mode, const AnalysisContext& actx) :
remove_init(actx.subpool), remove_init(actx.subpool),
set_init(actx.subpool), set_init(actx.subpool),
connections(actx.subpool), new_connections(actx.subpool),
remove_unused_bits(actx.subpool), remove_unused_bits(actx.subpool),
set_unused_bits(actx.subpool) { set_unused_bits(actx.subpool) {
ShardedVector<RTLIL::Wire*> del_wires(actx.subpool); ShardedVector<RTLIL::Wire*> del_wires(actx.subpool);
@ -894,7 +894,7 @@ struct WireDeleter {
new_conn.second.append(s2[i]); new_conn.second.append(s2[i]);
} }
if (new_conn.first.size() > 0) if (new_conn.first.size() > 0)
connections.insert(ctx, std::move(new_conn)); new_connections.insert(ctx, std::move(new_conn));
if (initval.is_fully_undef()) { if (initval.is_fully_undef()) {
if (has_init_attribute) if (has_init_attribute)
remove_init.insert(ctx, wire); remove_init.insert(ctx, wire);
@ -932,13 +932,14 @@ struct WireDeleter {
}); });
del_wires_queue.insert(del_wires.begin(), del_wires.end()); del_wires_queue.insert(del_wires.begin(), del_wires.end());
} }
// now decide for each wire if we should be deleting it // Decide for each wire if we should be deleting it
void commit_attrs(RTLIL::Module* mod) { // and fix up attributes
void commit_changes(RTLIL::Module* mod) {
for (RTLIL::Wire *wire : remove_init) for (RTLIL::Wire *wire : remove_init)
wire->attributes.erase(ID::init); wire->attributes.erase(ID::init);
for (auto &p : set_init) for (auto &p : set_init)
p.first->attributes[ID::init] = std::move(p.second); p.first->attributes[ID::init] = std::move(p.second);
for (auto &conn : connections) for (auto &conn : new_connections)
mod->connect(std::move(conn)); mod->connect(std::move(conn));
for (RTLIL::Wire *wire : remove_unused_bits) for (RTLIL::Wire *wire : remove_unused_bits)
wire->attributes.erase(ID::unused_bits); wire->attributes.erase(ID::unused_bits);
@ -988,7 +989,7 @@ bool rmunused_module_signals(RTLIL::Module *module, ParallelDispatchThreadPool::
used_sig_analysis.clear(ctx); used_sig_analysis.clear(ctx);
}); });
deleter.commit_attrs(module); deleter.commit_changes(module);
int deleted_and_unreported = deleter.delete_wires(module, verbose); int deleted_and_unreported = deleter.delete_wires(module, verbose);
int deleted_total = GetSize(deleter.del_wires_queue); int deleted_total = GetSize(deleter.del_wires_queue);