mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-10-31 11:42:30 +00:00
Code Activity

Put $__ABC9_{FF_,ASYNC} into same clock domain as abc9_flop

Browse source
This commit is contained in:
Eddie Hung 2019-12-16 16:48:31 -08:00
parent 42f990f3a6
commit d9bf7061cd
1 changed files with 27 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

32
passes/techmap/abc9.cc
View file

@ -1095,7 +1095,7 @@ struct Abc9Pass : public Pass {
std::map<RTLIL::Cell*, std::set<RTLIL::SigBit>> cell_to_bit, cell_to_bit_up, cell_to_bit_down; std::map<RTLIL::Cell*, std::set<RTLIL::SigBit>> cell_to_bit, cell_to_bit_up, cell_to_bit_down;
std::map<RTLIL::SigBit, std::set<RTLIL::Cell*>> bit_to_cell, bit_to_cell_up, bit_to_cell_down; std::map<RTLIL::SigBit, std::set<RTLIL::Cell*>> bit_to_cell, bit_to_cell_up, bit_to_cell_down;
for (auto cell : all_cells) { for (auto cell : all_cells)
for (auto &conn : cell->connections()) for (auto &conn : cell->connections())
for (auto bit : assign_map(conn.second)) for (auto bit : assign_map(conn.second))
if (bit.wire != nullptr) { if (bit.wire != nullptr) {
@ -1111,6 +1111,7 @@ struct Abc9Pass : public Pass {
} }
} }
for (auto cell : all_cells) {
auto inst_module = design->module(cell->type); auto inst_module = design->module(cell->type);
if (!inst_module || !inst_module->attributes.count("\\abc9_flop")) if (!inst_module || !inst_module->attributes.count("\\abc9_flop"))
continue; continue;
@ -1121,10 +1122,7 @@ struct Abc9Pass : public Pass {
SigSpec abc9_clock = assign_map(abc9_clock_wire); SigSpec abc9_clock = assign_map(abc9_clock_wire);
unassigned_cells.erase(cell); unassigned_cells.erase(cell);
expand_queue.insert(cell);
expand_queue_up.insert(cell); expand_queue_up.insert(cell);
expand_queue_down.insert(cell);
clkdomain_t key(abc9_clock, cell->type); clkdomain_t key(abc9_clock, cell->type);
assigned_cells[key].insert(cell->name); assigned_cells[key].insert(cell->name);
assigned_cells_reverse[cell] = key; assigned_cells_reverse[cell] = key;
@ -1141,6 +1139,30 @@ struct Abc9Pass : public Pass {
log_error("'%s.$abc9_init' is not a constant wire present in module '%s'.\n", cell->name.c_str(), log_id(module)); log_error("'%s.$abc9_init' is not a constant wire present in module '%s'.\n", cell->name.c_str(), log_id(module));
r2 = cell->attributes.insert(std::make_pair(ID(abc9_init), abc9_init.as_const())); r2 = cell->attributes.insert(std::make_pair(ID(abc9_init), abc9_init.as_const()));
log_assert(r2.second); log_assert(r2.second);
// Also assign these special ABC9 cells to the
// same clock domain
for (auto b : cell_to_bit_down[cell])
for (auto c : bit_to_cell_down[b])
if (c->type == "$__ABC9_FF_") {
cell = c;
unassigned_cells.erase(cell);
assigned_cells[key].insert(cell->name);
assigned_cells_reverse[cell] = key;
break;
}
for (auto b : cell_to_bit_down[cell])
for (auto c : bit_to_cell_down[b])
if (c->type == "$__ABC9_ASYNC") {
cell = c;
unassigned_cells.erase(cell);
assigned_cells[key].insert(cell->name);
assigned_cells_reverse[cell] = key;
break;
}
expand_queue.insert(cell);
expand_queue_down.insert(cell);
} }
while (!expand_queue_up.empty() || !expand_queue_down.empty()) while (!expand_queue_up.empty() || !expand_queue_down.empty())
@ -1153,7 +1175,7 @@ struct Abc9Pass : public Pass {
for (auto bit : cell_to_bit_up[cell]) for (auto bit : cell_to_bit_up[cell])
for (auto c : bit_to_cell_up[bit]) for (auto c : bit_to_cell_up[bit])
if (unassigned_cells.count(c) && !c->type.in("$__ABC9_FF_", "$__ABC9_ASYNC_")) { if (unassigned_cells.count(c)) {
unassigned_cells.erase(c); unassigned_cells.erase(c);
next_expand_queue_up.insert(c); next_expand_queue_up.insert(c);
assigned_cells[key].insert(c->name); assigned_cells[key].insert(c->name);