aboutsummaryrefslogtreecommitdiffstats
path: root/passes
diff options
context:
space:
mode:
authorEddie Hung <eddie@fpgeh.com>2019-11-21 16:32:52 -0800
committerEddie Hung <eddie@fpgeh.com>2019-11-21 16:32:52 -0800
commitfe3627523437cfddc069ec9e2c4607a1aaf9ce2e (patch)
treeadb60aab9fa9641ad58fef2da02f34fb21367d93 /passes
parent39fdcb892b1b65363fdf7c1bc6d9e2612c1c38e6 (diff)
parenta5767474830756319ce0fff53b81573701ec0cd2 (diff)
downloadyosys-fe3627523437cfddc069ec9e2c4607a1aaf9ce2e.tar.gz
yosys-fe3627523437cfddc069ec9e2c4607a1aaf9ce2e.tar.bz2
yosys-fe3627523437cfddc069ec9e2c4607a1aaf9ce2e.zip
Merge remote-tracking branch 'origin/xaig_dff' into eddie/xaig_dff_adff
Diffstat (limited to 'passes')
-rw-r--r--passes/techmap/abc9.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/passes/techmap/abc9.cc b/passes/techmap/abc9.cc
index 34cdd3c3e..8d4ff4025 100644
--- a/passes/techmap/abc9.cc
+++ b/passes/techmap/abc9.cc
@@ -1108,8 +1108,8 @@ 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::SigBit, std::set<RTLIL::Cell*>> bit_to_cell, bit_to_cell_up, bit_to_cell_down;
- typedef std::pair<IdString, SigSpec> endomain_t;
- std::map<endomain_t, int> mergeability_class;
+ typedef std::pair<IdString, SigSpec> ctrldomain_t;
+ std::map<ctrldomain_t, int> mergeability_class;
for (auto cell : all_cells) {
for (auto &conn : cell->connections())
@@ -1149,7 +1149,7 @@ struct Abc9Pass : public Pass {
assigned_cells[abc9_clock].insert(cell->name);
assigned_cells_reverse[cell] = abc9_clock;
- endomain_t key(cell->type, abc9_control);
+ ctrldomain_t key(cell->type, abc9_control);
auto r = mergeability_class.emplace(key, mergeability_class.size() + 1);
auto YS_ATTRIBUTE(unused) r2 = cell->attributes.insert(std::make_pair(ID(abc9_mergeability), r.first->second));
log_assert(r2.second);