riscv
/
yosys
mirror of https://github.com/YosysHQ/yosys.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Now also move net labes to the right position in splice cmd

This commit is contained in:
Clifford Wolf 2014-02-08 00:06:00 +01:00
parent 274bcef66c
commit 2c51619c2b
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
passes/cmds/splice.cc
View File

@ -186,7 +186,7 @@ struct SpliceWorker
} }
} }
std::vector<std::pair<RTLIL::Wire*, RTLIL::SigSpec>> rework_outputs; std::vector<std::pair<RTLIL::Wire*, RTLIL::SigSpec>> rework_wires;
for (auto &it : module->wires) for (auto &it : module->wires)
if (it.second->port_output) { if (it.second->port_output) {
@ -197,10 +197,17 @@ struct SpliceWorker
continue; continue;
RTLIL::SigSpec new_sig = get_spliced_signal(sig); RTLIL::SigSpec new_sig = get_spliced_signal(sig);
if (new_sig != sig) if (new_sig != sig)
rework_outputs.push_back(std::pair<RTLIL::Wire*, RTLIL::SigSpec>(it.second, new_sig)); rework_wires.push_back(std::pair<RTLIL::Wire*, RTLIL::SigSpec>(it.second, new_sig));
} else
if (!it.second->port_input) {
RTLIL::SigSpec sig = sigmap(it.second);
if (spliced_signals_cache.count(sig) && spliced_signals_cache.at(sig) != sig)
rework_wires.push_back(std::pair<RTLIL::Wire*, RTLIL::SigSpec>(it.second, spliced_signals_cache.at(sig)));
else if (sliced_signals_cache.count(sig) && sliced_signals_cache.at(sig) != sig)
rework_wires.push_back(std::pair<RTLIL::Wire*, RTLIL::SigSpec>(it.second, sliced_signals_cache.at(sig)));
} }
for (auto &it : rework_outputs) for (auto &it : rework_wires)
{ {
module->wires.erase(it.first->name); module->wires.erase(it.first->name);
RTLIL::Wire *new_port = new RTLIL::Wire(*it.first); RTLIL::Wire *new_port = new RTLIL::Wire(*it.first);