mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-04-13 04:28:18 +00:00
Code Activity

Use abc_mergeability attr for "r" extension

Browse source
This commit is contained in:
Eddie Hung 2019-09-27 18:41:43 -07:00
parent 313d2478e9
commit cfa6dd61ef
1 changed files with 64 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

120
backends/aiger/xaiger.cc
View file

@ -85,7 +85,7 @@ struct XAigerWriter
dict<SigBit, pair<SigBit, SigBit>> and_map; dict<SigBit, pair<SigBit, SigBit>> and_map;
vector<std::tuple<SigBit,RTLIL::Cell*,RTLIL::IdString,int>> ci_bits; vector<std::tuple<SigBit,RTLIL::Cell*,RTLIL::IdString,int>> ci_bits;
vector<std::tuple<SigBit,RTLIL::Cell*,RTLIL::IdString,int,int>> co_bits; vector<std::tuple<SigBit,RTLIL::Cell*,RTLIL::IdString,int,int>> co_bits;
vector<SigBit> ff_bits; vector<std::pair<SigBit,int>> ff_bits;
dict<SigBit, float> arrival_times; dict<SigBit, float> arrival_times;
vector<pair<int, int>> aig_gates; vector<pair<int, int>> aig_gates;
@ -319,11 +319,12 @@ struct XAigerWriter
auto abc_flop_q = r.first->second.q_port; auto abc_flop_q = r.first->second.q_port;
SigBit q = cell->getPort(abc_flop_q); SigBit q = cell->getPort(abc_flop_q);
SigBit O = sigmap(q); log_assert(q == sigmap(q));
if (O != q) undriven_bits.erase(q);
alias_map[O] = q; auto it = cell->attributes.find(ID(abc_mergeability));
undriven_bits.erase(O); log_assert(it != cell->attributes.end());
ff_bits.emplace_back(q); ff_bits.emplace_back(q, it->second.as_int());
cell->attributes.erase(it);
auto arrival = r.first->second.q_arrival; auto arrival = r.first->second.q_arrival;
if (arrival) if (arrival)
@ -343,56 +344,57 @@ struct XAigerWriter
for (auto bit : sigmap(conn.second)) for (auto bit : sigmap(conn.second))
bit_drivers[bit].insert(cell->name); bit_drivers[bit].insert(cell->name);
} }
continue;
} }
else {
bool cell_known = inst_module || cell->known();
for (const auto &c : cell->connections()) {
if (c.second.is_fully_const()) continue;
auto port_wire = inst_module ? inst_module->wire(c.first) : nullptr;
auto is_input = (port_wire && port_wire->port_input) || !cell_known || cell->input(c.first);
auto is_output = (port_wire && port_wire->port_output) || !cell_known || cell->output(c.first);
if (!is_input && !is_output)
log_error("Connection '%s' on cell '%s' (type '%s') not recognised!\n", log_id(c.first), log_id(cell), log_id(cell->type));
if (is_input) { bool cell_known = inst_module || cell->known();
for (auto b : c.second) { for (const auto &c : cell->connections()) {
Wire *w = b.wire; if (c.second.is_fully_const()) continue;
if (!w) continue; auto port_wire = inst_module ? inst_module->wire(c.first) : nullptr;
if (!w->port_output || !cell_known) { auto is_input = (port_wire && port_wire->port_input) || !cell_known || cell->input(c.first);
SigBit I = sigmap(b); auto is_output = (port_wire && port_wire->port_output) || !cell_known || cell->output(c.first);
if (I != b) if (!is_input && !is_output)
alias_map[b] = I; log_error("Connection '%s' on cell '%s' (type '%s') not recognised!\n", log_id(c.first), log_id(cell), log_id(cell->type));
output_bits.insert(b);
unused_bits.erase(b);
if (!cell_known) if (is_input) {
keep_bits.insert(b); for (auto b : c.second) {
} Wire *w = b.wire;
if (!w) continue;
if (!w->port_output || !cell_known) {
SigBit I = sigmap(b);
if (I != b)
alias_map[b] = I;
output_bits.insert(b);
unused_bits.erase(b);
if (!cell_known)
keep_bits.insert(b);
} }
} }
if (is_output) { }
int arrival = 0; if (is_output) {
if (port_wire) { int arrival = 0;
auto it = port_wire->attributes.find("\\abc_arrival"); if (port_wire) {
if (it != port_wire->attributes.end()) { auto it = port_wire->attributes.find("\\abc_arrival");
if (it->second.flags != 0) if (it != port_wire->attributes.end()) {
log_error("Attribute 'abc_arrival' on port '%s' of module '%s' is not an integer.\n", log_id(port_wire), log_id(cell->type)); if (it->second.flags != 0)
arrival = it->second.as_int(); log_error("Attribute 'abc_arrival' on port '%s' of module '%s' is not an integer.\n", log_id(port_wire), log_id(cell->type));
} arrival = it->second.as_int();
} }
}
for (auto b : c.second) { for (auto b : c.second) {
Wire *w = b.wire; Wire *w = b.wire;
if (!w) continue; if (!w) continue;
input_bits.insert(b); input_bits.insert(b);
SigBit O = sigmap(b); SigBit O = sigmap(b);
if (O != b) if (O != b)
alias_map[O] = b; alias_map[O] = b;
undriven_bits.erase(O); undriven_bits.erase(O);
if (arrival) if (arrival)
arrival_times[b] = arrival; arrival_times[b] = arrival;
}
} }
} }
} }
@ -540,12 +542,15 @@ struct XAigerWriter
undriven_bits.erase(bit); undriven_bits.erase(bit);
if (!undriven_bits.empty() && !holes_mode) { if (!undriven_bits.empty() && !holes_mode) {
bool whole_module = module->design->selected_whole_module(module->name);
undriven_bits.sort(); undriven_bits.sort();
for (auto bit : undriven_bits) { for (auto bit : undriven_bits) {
log_warning("Treating undriven bit %s.%s like $anyseq.\n", log_id(module), log_signal(bit)); if (whole_module)
log_warning("Treating undriven bit %s.%s like $anyseq.\n", log_id(module), log_signal(bit));
input_bits.insert(bit); input_bits.insert(bit);
} }
log_warning("Treating a total of %d undriven bits in %s like $anyseq.\n", GetSize(undriven_bits), log_id(module)); if (whole_module)
log_warning("Treating a total of %d undriven bits in %s like $anyseq.\n", GetSize(undriven_bits), log_id(module));
} }
init_map.sort(); init_map.sort();
@ -576,7 +581,8 @@ struct XAigerWriter
aig_map[bit] = 2*aig_m; aig_map[bit] = 2*aig_m;
} }
for (auto bit : ff_bits) { for (const auto &i : ff_bits) {
const SigBit &bit = i.first;
aig_m++, aig_i++; aig_m++, aig_i++;
log_assert(!aig_map.count(bit)); log_assert(!aig_map.count(bit));
aig_map[bit] = 2*aig_m; aig_map[bit] = 2*aig_m;
@ -663,7 +669,8 @@ struct XAigerWriter
aig_outputs.push_back(bit2aig(bit)); aig_outputs.push_back(bit2aig(bit));
} }
for (auto bit : ff_bits) { for (auto &i : ff_bits) {
const SigBit &bit = i.first;
aig_o++; aig_o++;
aig_outputs.push_back(ff_aig_map.at(bit)); aig_outputs.push_back(ff_aig_map.at(bit));
} }
@ -853,9 +860,9 @@ struct XAigerWriter
auto write_r_buffer = std::bind(write_buffer, std::ref(r_buffer), std::placeholders::_1); auto write_r_buffer = std::bind(write_buffer, std::ref(r_buffer), std::placeholders::_1);
log_debug("flopNum = %d\n", GetSize(ff_bits)); log_debug("flopNum = %d\n", GetSize(ff_bits));
write_r_buffer(ff_bits.size()); write_r_buffer(ff_bits.size());
int mergeability_class = 1; for (const auto &i : ff_bits) {
for (auto bit : ff_bits) { write_r_buffer(i.second);
write_r_buffer(mergeability_class++); const SigBit &bit = i.first;
write_i_buffer(arrival_times.at(bit, 0)); write_i_buffer(arrival_times.at(bit, 0));
//write_o_buffer(0); //write_o_buffer(0);
} }
@ -869,7 +876,8 @@ struct XAigerWriter
std::stringstream s_buffer; std::stringstream s_buffer;
auto write_s_buffer = std::bind(write_buffer, std::ref(s_buffer), std::placeholders::_1); auto write_s_buffer = std::bind(write_buffer, std::ref(s_buffer), std::placeholders::_1);
write_s_buffer(ff_bits.size()); write_s_buffer(ff_bits.size());
for (auto bit : ff_bits) { for (const auto &i : ff_bits) {
const SigBit &bit = i.first;
auto it = bit.wire->attributes.find("\\init"); auto it = bit.wire->attributes.find("\\init");
if (it != bit.wire->attributes.end()) { if (it != bit.wire->attributes.end()) {
auto init = it->second[bit.offset]; auto init = it->second[bit.offset];