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

Cope with width != 1 when re-mapping cells

This commit is contained in:
Eddie Hung 2019-02-15 12:55:52 -08:00
parent 956ee545c5
commit 914546efd9
1 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
passes/techmap/abc9.cc
View File

@ -642,11 +642,12 @@ void abc9_module(RTLIL::Design *design, RTLIL::Module *current_module, std::stri
cell->parameters = c->parameters; cell->parameters = c->parameters;
for (auto &conn : c->connections()) { for (auto &conn : c->connections()) {
RTLIL::SigSpec newsig; RTLIL::SigSpec newsig;
for (auto &c : conn.second.chunks()) { for (auto c : conn.second.chunks()) {
if (c.width == 0) if (c.width == 0)
continue; continue;
//log_assert(c.width == 1); //log_assert(c.width == 1);
newsig.append(module->wires_[remap_name(c.wire->name)]); c.wire = module->wires_[remap_name(c.wire->name)];
newsig.append(c);
} }
cell->setPort(conn.first, newsig); cell->setPort(conn.first, newsig);
} }
@ -715,7 +716,7 @@ void abc9_module(RTLIL::Design *design, RTLIL::Module *current_module, std::stri
conn.second = RTLIL::SigSpec(wire, 0, GetSize(remap_wire)); conn.second = RTLIL::SigSpec(wire, 0, GetSize(remap_wire));
in_wires++; in_wires++;
connections.emplace_back(std::move(conn)); connections.emplace_back(std::move(conn));
printf("INPUT: assign %s = %s\n", remap_wire->name.c_str(), w->name.c_str()); printf("INPUT: assign %s = %s\n", remap_wire->name.c_str(), wire->name.c_str());
} }
else if (w->port_output) { else if (w->port_output) {
RTLIL::SigSig conn; RTLIL::SigSig conn;
@ -724,18 +725,31 @@ void abc9_module(RTLIL::Design *design, RTLIL::Module *current_module, std::stri
conn.second = remap_wire; conn.second = remap_wire;
for (int i = 0; i < GetSize(remap_wire); i++) for (int i = 0; i < GetSize(remap_wire); i++)
output_bits.insert({wire, i}); output_bits.insert({wire, i});
printf("OUTPUT: assign %s = %s\n", w->name.c_str(), remap_wire->name.c_str()); printf("OUTPUT: assign %s = %s\n", wire->name.c_str(), remap_wire->name.c_str());
connections.emplace_back(std::move(conn)); connections.emplace_back(std::move(conn));
} }
else log_abort(); else log_abort();
} }
auto f = [&output_bits](RTLIL::SigSpec &s) { // Go through all cell output connections,
if (!s.is_bit()) return; // and for those output ports driving wires
RTLIL::SigBit b = s.as_bit(); // also driven by mapped_mod, disconnect them
if (output_bits.count(b)) for (auto cell : module->cells()) {
s = RTLIL::State::Sx; for (auto &it : cell->connections_) {
}; auto port_name = it.first;
module->rewrite_sigspecs(f); if (!cell->output(port_name)) continue;
auto &signal = it.second;
if (!signal.is_bit()) continue;
if (output_bits.count(signal.as_bit()))
signal = RTLIL::State::Sx;
}
}
// Do the same for module connections
for (auto &it : module->connections_) {
auto &signal = it.first;
if (!signal.is_bit()) continue;
if (output_bits.count(signal.as_bit()))
signal = RTLIL::State::Sx;
}
for (const auto &c : connections) for (const auto &c : connections)
module->connect(c); module->connect(c);