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

iopadmap: Fix z assignment removal. 

Fixes #3360.
This commit is contained in:
Marcelina Kościelnicka 2022-06-07 02:18:08 +02:00
parent aa0b47c74a
commit 9e8a2ac051
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
passes/techmap/iopadmap.cc
View File

@ -240,13 +240,13 @@ struct IopadmapPass : public Pass {
for (auto module : design->selected_modules()) for (auto module : design->selected_modules())
{ {
dict<Wire *, dict<int, pair<Cell *, IdString>>> rewrite_bits; dict<Wire *, dict<int, pair<Cell *, IdString>>> rewrite_bits;
pool<SigSig> remove_conns; dict<SigSig, pool<int>> remove_conns;
if (!toutpad_celltype.empty() || !tinoutpad_celltype.empty()) if (!toutpad_celltype.empty() || !tinoutpad_celltype.empty())
{ {
dict<SigBit, Cell *> tbuf_bits; dict<SigBit, Cell *> tbuf_bits;
pool<SigBit> driven_bits; pool<SigBit> driven_bits;
dict<SigBit, SigSig> z_conns; dict<SigBit, std::pair<SigSig, int>> z_conns;
// Gather tristate buffers and always-on drivers. // Gather tristate buffers and always-on drivers.
for (auto cell : module->cells()) for (auto cell : module->cells())
@ -266,7 +266,7 @@ struct IopadmapPass : public Pass {
SigBit dstbit = conn.first[i]; SigBit dstbit = conn.first[i];
SigBit srcbit = conn.second[i]; SigBit srcbit = conn.second[i];
if (!srcbit.wire && srcbit.data == State::Sz) { if (!srcbit.wire && srcbit.data == State::Sz) {
z_conns[dstbit] = conn; z_conns[dstbit] = {conn, i};
continue; continue;
} }
driven_bits.insert(dstbit); driven_bits.insert(dstbit);
@ -317,8 +317,9 @@ struct IopadmapPass : public Pass {
// enable. // enable.
en_sig = SigBit(State::S0); en_sig = SigBit(State::S0);
data_sig = SigBit(State::Sx); data_sig = SigBit(State::Sx);
if (z_conns.count(wire_bit)) auto it = z_conns.find(wire_bit);
remove_conns.insert(z_conns[wire_bit]); if (it != z_conns.end())
remove_conns[it->second.first].insert(it->second.second);
} }
if (wire->port_input) if (wire->port_input)
@ -477,9 +478,22 @@ struct IopadmapPass : public Pass {
if (!remove_conns.empty()) { if (!remove_conns.empty()) {
std::vector<SigSig> new_conns; std::vector<SigSig> new_conns;
for (auto &conn : module->connections()) for (auto &conn : module->connections()) {
if (!remove_conns.count(conn)) auto it = remove_conns.find(conn);
if (it == remove_conns.end()) {
new_conns.push_back(conn); new_conns.push_back(conn);
} else {
SigSpec lhs, rhs;
for (int i = 0; i < GetSize(conn.first); i++) {
if (!it->second.count(i)) {
lhs.append(conn.first[i]);
rhs.append(conn.second[i]);
}
}
new_conns.push_back(SigSig(lhs, rhs));
}
}
module->new_connections(new_conns); module->new_connections(new_conns);
} }