diff options
| author | Eddie Hung <eddie@fpgeh.com> | 2019-09-23 10:58:28 -0700 |
|---|---|---|
| committer | Eddie Hung <eddie@fpgeh.com> | 2019-09-23 10:58:28 -0700 |
| commit | bcee87a45768a1650fb7770d301cfeb8e87a1b8d (patch) | |
| tree | 66913e20744dc9bb3764c0be8076186129202fbe /passes | |
| parent | 4401e5f142d9728c09ac95e1cab9b30c449210fe (diff) | |
| parent | 0a2d8db793fee47d8237c472c1d2d5ca4e21f865 (diff) | |
| download | yosys-bcee87a45768a1650fb7770d301cfeb8e87a1b8d.tar.gz yosys-bcee87a45768a1650fb7770d301cfeb8e87a1b8d.tar.bz2 yosys-bcee87a45768a1650fb7770d301cfeb8e87a1b8d.zip | |
Merge remote-tracking branch 'origin/master' into xc7dsp
Diffstat (limited to 'passes')
| -rw-r--r-- | passes/techmap/techmap.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/passes/techmap/techmap.cc b/passes/techmap/techmap.cc index cf40b2f17..1d0362ad6 100644 --- a/passes/techmap/techmap.cc +++ b/passes/techmap/techmap.cc @@ -224,7 +224,7 @@ struct TechmapWorker for (auto bit : sigmaps.at(tpl)(it.second)) if (bit.wire != nullptr) - autopurge_tpl_bits.insert(it.second); + autopurge_tpl_bits.insert(bit); } } IdString w_name = it.second->name; @@ -359,6 +359,12 @@ struct TechmapWorker for (auto &attr : w->attributes) { if (attr.first == ID(src)) continue; + auto lhs = GetSize(extra_connect.first); + auto rhs = GetSize(extra_connect.second); + if (lhs > rhs) + extra_connect.first.remove(rhs, lhs-rhs); + else if (rhs > lhs) + extra_connect.second.remove(lhs, rhs-lhs); module->connect(extra_connect); break; } |