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

Bugfixes in equiv_struct

This commit is contained in:
Clifford Wolf 2016-01-08 09:39:27 +01:00
parent d00c63c927
commit f5008f4f8a
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
passes/equiv/equiv_struct.cc
View File

@ -143,6 +143,7 @@ struct EquivStructWorker
SigBit sig_y = sigmap(cell->getPort("\\Y").as_bit()); SigBit sig_y = sigmap(cell->getPort("\\Y").as_bit());
if (sig_a == sig_b && equiv_inputs.count(sig_y)) { if (sig_a == sig_b && equiv_inputs.count(sig_y)) {
log(" Purging redundant $equiv cell %s.\n", log_id(cell)); log(" Purging redundant $equiv cell %s.\n", log_id(cell));
module->connect(sig_y, sig_a);
module->remove(cell); module->remove(cell);
merge_count++; merge_count++;
} }
@ -205,11 +206,13 @@ struct EquivStructWorker
const char *strategy = nullptr; const char *strategy = nullptr;
vector<Cell*> gold_cells, gate_cells, other_cells; vector<Cell*> gold_cells, gate_cells, other_cells;
vector<pair<Cell*, Cell*>> cell_pairs; vector<pair<Cell*, Cell*>> cell_pairs;
IdString cells_type;
for (auto cell_name : merge_cache[key]) { for (auto cell_name : merge_cache[key]) {
Cell *c = module->cell(cell_name); Cell *c = module->cell(cell_name);
if (c != nullptr) { if (c != nullptr) {
string n = cell_name.str(); string n = cell_name.str();
cells_type = c->type;
if (GetSize(n) > 5 && n.substr(GetSize(n)-5) == "_gold") if (GetSize(n) > 5 && n.substr(GetSize(n)-5) == "_gold")
gold_cells.push_back(c); gold_cells.push_back(c);
else if (GetSize(n) > 5 && n.substr(GetSize(n)-5) == "_gate") else if (GetSize(n) > 5 && n.substr(GetSize(n)-5) == "_gate")
@ -219,6 +222,9 @@ struct EquivStructWorker
} }
} }
if (phase && cells_type == "$equiv")
continue;
if (GetSize(gold_cells) > 1 || GetSize(gate_cells) > 1 || GetSize(other_cells) > 1) if (GetSize(gold_cells) > 1 || GetSize(gate_cells) > 1 || GetSize(other_cells) > 1)
{ {
strategy = "deduplicate"; strategy = "deduplicate";
@ -256,8 +262,9 @@ struct EquivStructWorker
continue; continue;
run_strategy: run_strategy:
log(" %s merging %d cells (from group of %d) using strategy %s:\n", phase ? "Bwd" : "Fwd", int total_group_size = GetSize(gold_cells) + GetSize(gate_cells) + GetSize(other_cells);
2*GetSize(cell_pairs), GetSize(gold_cells) + GetSize(gate_cells) + GetSize(other_cells), strategy); log(" %s merging %d %s cells (from group of %d) using strategy %s:\n", phase ? "Bwd" : "Fwd",
2*GetSize(cell_pairs), log_id(cells_type), total_group_size, strategy);
for (auto it : cell_pairs) { for (auto it : cell_pairs) {
log(" Merging cells %s and %s.\n", log_id(it.first), log_id(it.second)); log(" Merging cells %s and %s.\n", log_id(it.first), log_id(it.second));
merge_cell_pair(it.first, it.second); merge_cell_pair(it.first, it.second);