mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-11-04 05:19:11 +00:00
Code Activity

check: Improve found loop logging

Browse source 
Print the detected loop in-order, and include source location for each
node, if available.
This commit is contained in:
Martin Povišer 2024-02-01 10:40:45 +01:00
parent 6e5f40e364
commit c5ae74af34
1 changed files with 29 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

39
passes/cmds/check.cc
View file

@ -104,8 +104,7 @@ struct CheckPass : public Pass {
dict<SigBit, vector<string>> wire_drivers; dict<SigBit, vector<string>> wire_drivers;
dict<SigBit, int> wire_drivers_count; dict<SigBit, int> wire_drivers_count;
pool<SigBit> used_wires; pool<SigBit> used_wires;
TopoSort<string> topo; TopoSort<std::pair<RTLIL::IdString, int>> topo;
for (auto &proc_it : module->processes) for (auto &proc_it : module->processes)
{ {
std::vector<RTLIL::CaseRule*> all_cases = {&proc_it.second->root_case}; std::vector<RTLIL::CaseRule*> all_cases = {&proc_it.second->root_case};
@ -164,16 +163,16 @@ struct CheckPass : public Pass {
if (cell->input(conn.first)) if (cell->input(conn.first))
for (auto bit : sig) for (auto bit : sig)
if (bit.wire) { if (bit.wire) {
if (logic_cell) if (logic_cell && bit.wire)
topo.edge(stringf("wire %s", log_signal(bit)), topo.edge(std::make_pair(bit.wire->name, bit.offset),
stringf("cell %s (%s)", log_id(cell), log_id(cell->type))); std::make_pair(cell->name, -1));
used_wires.insert(bit); used_wires.insert(bit);
} }
if (cell->output(conn.first)) if (cell->output(conn.first))
for (int i = 0; i < GetSize(sig); i++) { for (int i = 0; i < GetSize(sig); i++) {
if (logic_cell) if (logic_cell && sig[i].wire)
topo.edge(stringf("cell %s (%s)", log_id(cell), log_id(cell->type)), topo.edge(std::make_pair(cell->name, -1),
stringf("wire %s", log_signal(sig[i]))); std::make_pair(sig[i].wire->name, sig[i].offset));
if (sig[i].wire || !cell->input(conn.first)) if (sig[i].wire || !cell->input(conn.first))
wire_drivers[sig[i]].push_back(stringf("port %s[%d] of cell %s (%s)", wire_drivers[sig[i]].push_back(stringf("port %s[%d] of cell %s (%s)",
@ -239,8 +238,28 @@ struct CheckPass : public Pass {
topo.sort(); topo.sort();
for (auto &loop : topo.loops) { for (auto &loop : topo.loops) {
string message = stringf("found logic loop in module %s:\n", log_id(module)); string message = stringf("found logic loop in module %s:\n", log_id(module));
for (auto &str : loop) for (auto &pair : loop) {
message += stringf(" %s\n", str.c_str()); RTLIL::AttrObject *obj;
if (pair.second == -1)
obj = module->cell(pair.first);
else
obj = module->wire(pair.first);
log_assert(obj);
std::string src;
if (obj->has_attribute(ID::src)) {
std::string src_attr = obj->get_src_attribute();
src = stringf(" source: %s", src_attr.c_str());
}
if (pair.second == -1) {
Cell *cell = module->cell(pair.first);
log_assert(cell);
message += stringf(" cell %s (%s)%s\n", log_id(cell), log_id(cell->type), src.c_str());
} else {
Wire *wire = module->wire(pair.first);
log_assert(wire);
message += stringf(" wire %s%s\n", log_signal(SigBit(wire, pair.second)), src.c_str());
}
}
log_warning("%s", message.c_str()); log_warning("%s", message.c_str());
counter++; counter++;
} }