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

Fixed preservation of important attributes in techmap

This commit is contained in:
Clifford Wolf 2016-05-06 13:59:30 +02:00
parent ec1938737b
commit aadca148da
1 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
passes/techmap/techmap.cc
View File

@ -234,8 +234,10 @@ struct TechmapWorker
tpl_written_bits.insert(bit); tpl_written_bits.insert(bit);
SigMap port_signal_map; SigMap port_signal_map;
SigSig port_signal_assign;
for (auto &it : cell->connections()) { for (auto &it : cell->connections())
{
RTLIL::IdString portname = it.first; RTLIL::IdString portname = it.first;
if (positional_ports.count(portname) > 0) if (positional_ports.count(portname) > 0)
portname = positional_ports.at(portname); portname = positional_ports.at(portname);
@ -244,16 +246,22 @@ struct TechmapWorker
log_error("Can't map port `%s' of cell `%s' to template `%s'!\n", portname.c_str(), cell->name.c_str(), tpl->name.c_str()); log_error("Can't map port `%s' of cell `%s' to template `%s'!\n", portname.c_str(), cell->name.c_str(), tpl->name.c_str());
continue; continue;
} }
RTLIL::Wire *w = tpl->wires_.at(portname); RTLIL::Wire *w = tpl->wires_.at(portname);
RTLIL::SigSig c; RTLIL::SigSig c, extra_connect;
if (w->port_output && !w->port_input) { if (w->port_output && !w->port_input) {
c.first = it.second; c.first = it.second;
c.second = RTLIL::SigSpec(w); c.second = RTLIL::SigSpec(w);
apply_prefix(cell->name.str(), c.second, module); apply_prefix(cell->name.str(), c.second, module);
extra_connect.first = c.second;
extra_connect.second = c.first;
} else if (!w->port_output && w->port_input) { } else if (!w->port_output && w->port_input) {
c.first = RTLIL::SigSpec(w); c.first = RTLIL::SigSpec(w);
c.second = it.second; c.second = it.second;
apply_prefix(cell->name.str(), c.first, module); apply_prefix(cell->name.str(), c.first, module);
extra_connect.first = c.first;
extra_connect.second = c.second;
} else { } else {
SigSpec sig_tpl = w, sig_tpl_pf = w, sig_mod = it.second; SigSpec sig_tpl = w, sig_tpl_pf = w, sig_mod = it.second;
apply_prefix(cell->name.str(), sig_tpl_pf, module); apply_prefix(cell->name.str(), sig_tpl_pf, module);
@ -266,28 +274,48 @@ struct TechmapWorker
c.second.append(sig_mod[i]); c.second.append(sig_mod[i]);
} }
} }
extra_connect.first = sig_tpl_pf;
extra_connect.second = sig_mod;
} }
if (c.second.size() > c.first.size()) if (c.second.size() > c.first.size())
c.second.remove(c.first.size(), c.second.size() - c.first.size()); c.second.remove(c.first.size(), c.second.size() - c.first.size());
if (c.second.size() < c.first.size()) if (c.second.size() < c.first.size())
c.second.append(RTLIL::SigSpec(RTLIL::State::S0, c.first.size() - c.second.size())); c.second.append(RTLIL::SigSpec(RTLIL::State::S0, c.first.size() - c.second.size()));
log_assert(c.first.size() == c.second.size()); log_assert(c.first.size() == c.second.size());
if (flatten_mode) {
if (flatten_mode)
{
// more conservative approach: // more conservative approach:
// connect internal and external wires // connect internal and external wires
if (sigmaps.count(module) == 0) if (sigmaps.count(module) == 0)
sigmaps[module].set(module); sigmaps[module].set(module);
if (sigmaps.at(module)(c.first).has_const()) if (sigmaps.at(module)(c.first).has_const())
log_error("Mismatch in directionality for cell port %s.%s.%s: %s <= %s\n", log_error("Mismatch in directionality for cell port %s.%s.%s: %s <= %s\n",
log_id(module), log_id(cell), log_id(it.first), log_signal(c.first), log_signal(c.second)); log_id(module), log_id(cell), log_id(it.first), log_signal(c.first), log_signal(c.second));
module->connect(c); module->connect(c);
} else { }
else
{
// approach that yields nicer outputs: // approach that yields nicer outputs:
// replace internal wires that are connected to external wires // replace internal wires that are connected to external wires
if (w->port_output) if (w->port_output)
port_signal_map.add(c.second, c.first); port_signal_map.add(c.second, c.first);
else else
port_signal_map.add(c.first, c.second); port_signal_map.add(c.first, c.second);
for (auto &attr : w->attributes) {
if (attr.first == "\\src")
continue;
module->connect(extra_connect);
break;
}
} }
} }