mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-04-12 20:18:20 +00:00
Code Activity

Improve unused-detection for opt_clean driver-driver conflict warning

Browse source 
Signed-off-by: Clifford Wolf <clifford@clifford.at>
This commit is contained in:
Clifford Wolf 2019-05-03 09:12:10 +02:00
parent e5cb9435a0
commit f12e1155f1
1 changed files with 29 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
passes/opt/opt_clean.cc
View file

@ -97,21 +97,19 @@ void rmunused_module_cells(Module *module, bool verbose)
for (auto &it : module->cells_) { for (auto &it : module->cells_) {
Cell *cell = it.second; Cell *cell = it.second;
for (auto &it2 : cell->connections()) { for (auto &it2 : cell->connections()) {
if (!ct_all.cell_known(cell->type) || ct_all.cell_output(cell->type, it2.first)) if (ct_all.cell_known(cell->type) && !ct_all.cell_output(cell->type, it2.first))
for (auto raw_bit : it2.second) { continue;
if (raw_bit.wire == nullptr) for (auto raw_bit : it2.second) {
continue; if (raw_bit.wire == nullptr)
auto bit = sigmap(raw_bit); continue;
if (bit.wire == nullptr) auto bit = sigmap(raw_bit);
driver_driver_logs[raw_bit].push_back(stringf("Driver-driver conflict " if (bit.wire == nullptr)
"for %s between cell %s.%s and constant %s in %s: Resolved using constant.", driver_driver_logs[raw_bit].push_back(stringf("Driver-driver conflict "
log_signal(raw_bit), log_id(cell), log_id(it2.first), log_signal(bit), log_id(module))); "for %s between cell %s.%s and constant %s in %s: Resolved using constant.",
if (bit.wire != nullptr) log_signal(raw_bit), log_id(cell), log_id(it2.first), log_signal(bit), log_id(module)));
wire2driver[bit].insert(cell); if (bit.wire != nullptr)
} wire2driver[bit].insert(cell);
if (!ct_all.cell_known(cell->type) || ct_all.cell_input(cell->type, it2.first)) }
for (auto raw_bit : it2.second)
used_raw_bits.insert(raw_bit);
} }
if (keep_cache.query(cell)) if (keep_cache.query(cell))
queue.insert(cell); queue.insert(cell);
@ -130,12 +128,6 @@ void rmunused_module_cells(Module *module, bool verbose)
} }
} }
for (auto it : driver_driver_logs) {
if (used_raw_bits.count(it.first))
for (auto msg : it.second)
log_warning("%s\n", msg.c_str());
}
while (!queue.empty()) while (!queue.empty())
{ {
pool<SigBit> bits; pool<SigBit> bits;
@ -161,6 +153,22 @@ void rmunused_module_cells(Module *module, bool verbose)
module->remove(cell); module->remove(cell);
count_rm_cells++; count_rm_cells++;
} }
for (auto &it : module->cells_) {
Cell *cell = it.second;
for (auto &it2 : cell->connections()) {
if (ct_all.cell_known(cell->type) && !ct_all.cell_input(cell->type, it2.first))
continue;
for (auto raw_bit : it2.second)
used_raw_bits.insert(raw_bit);
}
}
for (auto it : driver_driver_logs) {
if (used_raw_bits.count(it.first))
for (auto msg : it.second)
log_warning("%s\n", msg.c_str());
}
} }
int count_nontrivial_wire_attrs(RTLIL::Wire *w) int count_nontrivial_wire_attrs(RTLIL::Wire *w)