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

Improvements in "bufnorm" pass 

Signed-off-by: Claire Xenia Wolf <claire@clairexen.net>
This commit is contained in:
Claire Xenia Wolf 2023-09-28 20:42:07 +02:00 committed by Martin Povišer
parent 32808a0393
commit f4b7ea5fb3
1 changed files with 141 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

186
passes/techmap/bufnorm.cc
View File

@ -31,8 +31,36 @@ struct BufnormPass : public Pass {
log(" bufnorm [options] [selection]\n");
log("\n");
log("Insert buffer cells into the design as needed, to make sure that each wire\n");
log("has exactly one driving cell port, and aliasing wires are buffered using a\n");
log("chain of buffers in canonical order.\n");
log("has exactly one driving cell port, and aliasing wires are buffered using\n");
log("buffer cells, than can be chained in a canonical order.\n");
log("\n");
log("Running 'bufnorm' on the whole design enters 'buffered-normalized mode'.\n");
log("The commands 'bufnorm -conn' exits 'buffered-normalized mode' again.\n");
log("\n");
log(" -bits\n");
log(" Create single-bit $_BUF_ cells instead of multi-bit $pos cells.\n");
log("\n");
log(" -chain\n");
log(" Chain all alias wires. By default only wires with the 'keep'\n");
log(" attribute on them are chained.\n");
log("\n");
log(" -chain-outputs\n");
log(" Chain ouput ports. (Uneffected by -flat.)\n");
log("\n");
log(" -flat\n");
log(" Do not chain any wires, not even the ones marked with 'keep'.\n");
log("\n");
log(" -nosticky\n");
log(" Disable 'sticky' behavior of output ports already driving whole\n");
log(" wires, and always enforce canonical sort order instead.\n");
log("\n");
log(" -alphasort\n");
log(" Strictly use alphanumeric sort for chain-order. (Default is\n");
log(" to chain 'keep' wires first, then ports in declaration order,\n");
log(" and then the other wires in alphanumeric sort order.)\n");
log("\n");
log(" -conn\n");
log(" Remove buffers and exit 'buffered-normalized mode'.\n");
log("\n");
}
void execute(std::vector<std::string> args, RTLIL::Design *design) override
@ -40,6 +68,8 @@ struct BufnormPass : public Pass {
log_header(design, "Executing BUFNORM pass (convert to buffer-normalized form).\n");
bool connections_mode = false, bits_mode = false;
bool chain_mode = false, flat_mode = false, nosticky_mode = false;
bool chain_outputs_mode = false, alphasort_mode = false;
IdString buf_celltype, buf_inport = ID::A, buf_outport = ID::Y;
size_t argidx;
@ -54,16 +84,39 @@ struct BufnormPass : public Pass {
bits_mode = true;
continue;
}
if (arg == "-buf" && argidx+3 < args.size()) {
buf_celltype = RTLIL::escape_id(args[++argidx]);
buf_inport = RTLIL::escape_id(args[++argidx]);
buf_outport = RTLIL::escape_id(args[++argidx]);
if (arg == "-chain") {
chain_mode = true;
continue;
}
if (arg == "-chain-outputs") {
chain_outputs_mode = true;
continue;
}
if (arg == "-flat") {
flat_mode = true;
continue;
}
if (arg == "-nosticky") {
nosticky_mode = true;
continue;
}
if (arg == "-alphasort") {
alphasort_mode = true;
continue;
}
//if (arg == "-buf" && argidx+3 < args.size()) {
// buf_celltype = RTLIL::escape_id(args[++argidx]);
// buf_inport = RTLIL::escape_id(args[++argidx]);
// buf_outport = RTLIL::escape_id(args[++argidx]);
// continue;
//}
break;
}
extra_args(args, argidx, design);
if (chain_mode && flat_mode)
log_cmd_error("Options -chain and -flat are exclusive.\n");
if (buf_celltype == IdString())
buf_celltype = bits_mode ? ID($_BUF_) : ID($pos);
@ -78,43 +131,34 @@ struct BufnormPass : public Pass {
vector<Cell*> old_buffers;
for (auto cell : module->cells())
{
if (cell->type == buf_celltype)
{
SigSpec insig = sigmap(cell->getPort(buf_inport));
SigSpec outsig = sigmap(cell->getPort(buf_outport));
for (int i = 0; i < GetSize(insig) && i < GetSize(outsig); i++)
sigmap.add(insig[i], outsig[i]);
old_buffers.push_back(cell);
}
else
{
for (auto &conn : cell->connections())
{
if (!cell->output(conn.first) || conn.second.is_wire())
continue;
SigSpec insig = module->addWire(NEW_ID, GetSize(conn.second));
SigSpec outsig = sigmap(conn.second);
for (int i = 0; i < GetSize(insig) && i < GetSize(outsig); i++)
sigmap.add(insig[i], outsig[i]);
cell->setPort(conn.first, insig);
}
}
if (cell->type != buf_celltype)
continue;
SigSpec insig = sigmap(cell->getPort(buf_inport));
SigSpec outsig = sigmap(cell->getPort(buf_outport));
for (int i = 0; i < GetSize(insig) && i < GetSize(outsig); i++)
sigmap.add(insig[i], outsig[i]);
old_buffers.push_back(cell);
}
for (auto cell : old_buffers)
module->remove(cell);
}
dict<SigBit, pool<Wire*>> bit2wires;
dict<SigSpec, pool<Wire*>> whole_wires;
dict<SigBit, SigBit> mapped_bits;
pool<Wire*> unmapped_wires;
for (auto wire : module->wires())
{
for (auto key : sigmap(wire))
bit2wires[key].insert(wire);
SigSpec keysig = sigmap(wire);
whole_wires[keysig].insert(wire);
for (auto keybit : sigmap(wire))
bit2wires[keybit].insert(wire);
if (wire->port_input) {
log(" primary input: %s\n", log_id(module));
log(" primary input: %s\n", log_id(wire));
for (auto bit : SigSpec(wire))
mapped_bits[sigmap(bit)] = bit;
} else {
@ -122,6 +166,36 @@ struct BufnormPass : public Pass {
}
}
struct {
bool alphasort_mode;
bool operator()(Wire *a, Wire *b) const
{
if (!alphasort_mode)
{
// Wires with keep attribute first
bool keep_a = a->get_bool_attribute(ID::keep);
bool keep_b = a->get_bool_attribute(ID::keep);
if (keep_a != keep_b) return keep_a;
// Ports before non-ports
if ((a->port_id != 0) != (b->port_id != 0))
return a->port_id != 0;
// Ports in declaration order
if (a->port_id != b->port_id)
return a->port_id < b->port_id;
}
// Nets with public names first
if (a->name.isPublic() != b->name.isPublic())
return a->name.isPublic();
// Otherwise just sort by name alphanumerically
return a->name.str() < b->name.str();
}
} compareWires;
compareWires.alphasort_mode = alphasort_mode;
for (auto cell : module->cells())
{
for (auto &conn : cell->connections())
@ -129,38 +203,60 @@ struct BufnormPass : public Pass {
if (!cell->output(conn.first))
continue;
Wire *w = conn.second.as_wire();
Wire *w = nullptr;
if (!nosticky_mode && conn.second.is_wire())
w = conn.second.as_wire();
if (w == nullptr)
{
SigSpec keysig = sigmap(conn.second);
auto it = whole_wires.find(keysig);
if (it != whole_wires.end()) {
it->second.sort(compareWires);
w = *(it->second.begin());
} else {
w = module->addWire(NEW_ID, GetSize(conn.second));
for (int i = 0; i < GetSize(w); i++)
sigmap.add(SigBit(w, i), keysig[i]);
}
}
if (w->name.isPublic())
log(" directly driven by cell %s port %s: %s\n",
log_id(cell), log_id(conn.first), log_id(w));
for (auto bit : conn.second)
for (auto bit : SigSpec(w))
mapped_bits[sigmap(bit)] = bit;
unmapped_wires.erase(w);
cell->setPort(conn.first, w);
}
}
struct {
bool operator()(Wire *a, Wire *b) const {
if (a->port_id != b->port_id)
return a->port_id < b->port_id;
return a->name.str() < b->name.str();
}
} compareWires;
unmapped_wires.sort(compareWires);
pool<Cell*> added_buffers;
unmapped_wires.sort(compareWires);
for (auto wire : unmapped_wires)
{
bool chain_this_wire = chain_mode;
if (!flat_mode && wire->get_bool_attribute(ID::keep))
chain_this_wire = true;
if (chain_outputs_mode && wire->port_output)
chain_this_wire = true;
SigSpec keysig = sigmap(wire), insig = wire, outsig = wire;
for (int i = 0; i < GetSize(insig); i++)
insig[i] = mapped_bits.at(keysig[i], State::Sx);
for (int i = 0; i < GetSize(outsig); i++)
mapped_bits[keysig[i]] = outsig[i];
if (chain_this_wire) {
for (int i = 0; i < GetSize(outsig); i++)
mapped_bits[keysig[i]] = outsig[i];
}
log(" adding buffer for %s -> %s\n", log_signal(insig), log_signal(outsig));
log(" %s %s for %s -> %s\n",
chain_this_wire ? "chaining" : "adding",
connections_mode ? "connection" : "buffer",
log_signal(insig), log_signal(outsig));
if (connections_mode) {
if (bits_mode) {