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

techmap.CONSTMAP: Handle outputs before inputs.

Browse source 
Fixes #2321.
This commit is contained in:
Marcelina Kościelnicka 2020-08-05 12:28:18 +02:00
parent c39ebe6ae0
commit b4a4cb081d
2 changed files with 37 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

23
passes/techmap/techmap.cc
View file

@ -801,11 +801,31 @@ struct TechmapWorker
}
}
// Handle outputs first, as these cannot be remapped.
for (auto &conn : cell->connections())
{
Wire *twire = tpl->wire(conn.first);
if (!twire->port_output)
continue;
for (int i = 0; i < GetSize(conn.second); i++) {
RTLIL::SigBit bit = sigmap(conn.second[i]);
RTLIL::SigBit tplbit(twire, i);
cellbits_to_tplbits[bit] = tplbit;
}
}
// Now handle inputs, remapping as necessary.
for (auto &conn : cell->connections())
{
Wire *twire = tpl->wire(conn.first);
if (twire->port_output)
continue;
for (int i = 0; i < GetSize(conn.second); i++)
{
RTLIL::SigBit bit = sigmap(conn.second[i]);
RTLIL::SigBit tplbit(tpl->wire(conn.first), i);
RTLIL::SigBit tplbit(twire, i);
if (bit.wire == nullptr)
{
@ -820,6 +840,7 @@ struct TechmapWorker
else
cellbits_to_tplbits[bit] = tplbit;
}
}
RTLIL::SigSig port_conn;
for (auto &it : port_connmap) {