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

Use mfp<> in equiv_mark

This commit is contained in:
Clifford Wolf 2015-10-27 19:15:35 +01:00
parent f3db70d2f3
commit 0c202a2549
1 changed files with 4 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
passes/equiv/equiv_mark.cc
View File

@ -42,31 +42,7 @@ struct EquivMarkWorker
int next_region; int next_region;
// merge-find // merge-find
dict<int, int> region_mf; mfp<int> region_mf;
int region_find(int r)
{
vector<int> backlog;
while (region_mf.count(r)) {
backlog.push_back(r);
r = region_mf.at(r);
}
for (int q : backlog)
region_mf[q] = r;
return r;
}
void region_merge(int r, int q)
{
r = region_find(r);
q = region_find(q);
if (r != q)
region_mf[r] = q;
}
EquivMarkWorker(Module *module) : module(module), sigmap(module) EquivMarkWorker(Module *module) : module(module), sigmap(module)
{ {
@ -116,7 +92,7 @@ struct EquivMarkWorker
if (cell_regions.count(cell)) { if (cell_regions.count(cell)) {
if (cell_regions.at(cell) != 0) if (cell_regions.at(cell) != 0)
region_merge(cell_regions.at(cell), next_region); region_mf.merge(cell_regions.at(cell), next_region);
continue; continue;
} }
@ -190,7 +166,7 @@ struct EquivMarkWorker
dict<int, int> region_wire_count; dict<int, int> region_wire_count;
for (int i = 0; i < next_region; i++) { for (int i = 0; i < next_region; i++) {
int r = region_find(i); int r = region_mf.find(i);
if (final_region_map.count(r) == 0) if (final_region_map.count(r) == 0)
final_region_map[r] = next_final_region++; final_region_map[r] = next_final_region++;
final_region_map[i] = final_region_map[r]; final_region_map[i] = final_region_map[r];
@ -211,7 +187,7 @@ struct EquivMarkWorker
pool<int> regions; pool<int> regions;
for (auto bit : sigmap(wire)) for (auto bit : sigmap(wire))
if (bit_regions.count(bit)) if (bit_regions.count(bit))
regions.insert(region_find(bit_regions.at(bit))); regions.insert(region_mf.find(bit_regions.at(bit)));
if (GetSize(regions) == 1) { if (GetSize(regions) == 1) {
int r = final_region_map.at(*regions.begin()); int r = final_region_map.at(*regions.begin());