diff options
| author | YRabbit <rabbit@yrabbit.cyou> | 2023-02-02 07:35:38 +1000 |
|---|---|---|
| committer | YRabbit <rabbit@yrabbit.cyou> | 2023-02-02 07:35:38 +1000 |
| commit | 2edc77836dd7686c4deabffcd7b6ebb4a75fdce1 (patch) | |
| tree | 77052038427be7cf713ba6378f01df539f2e4688 /ecp5 | |
| parent | 5d5ea57e2123a6d66aa63bf82ac6110713ab8bc7 (diff) | |
| parent | f328130c0a4cf562ce358d5e2a2a39f3d3dbef5e (diff) | |
| download | nextpnr-2edc77836dd7686c4deabffcd7b6ebb4a75fdce1.tar.gz nextpnr-2edc77836dd7686c4deabffcd7b6ebb4a75fdce1.tar.bz2 nextpnr-2edc77836dd7686c4deabffcd7b6ebb4a75fdce1.zip | |
Merge branch 'master' into gw1nr-9
Diffstat (limited to 'ecp5')
| -rw-r--r-- | ecp5/lpf.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/ecp5/lpf.cc b/ecp5/lpf.cc index 4f02d22d..2e34f54a 100644 --- a/ecp5/lpf.cc +++ b/ecp5/lpf.cc @@ -131,9 +131,16 @@ bool Arch::apply_lpf(std::string filename, std::istream &in) std::string cell = strip_quotes(words.at(2)); if (words.at(3) != "SITE") log_error("expected 'SITE' after 'LOCATE COMP %s' (on line %d)\n", cell.c_str(), lineno); - auto fnd_cell = cells.find(id(cell)); if (words.size() > 5) log_error("unexpected input following LOCATE clause (on line %d)\n", lineno); + auto fnd_cell = cells.find(id(cell)); + // 1-bit wires are treated as scalar by nextpnr. + // In HDL they might have been a singleton vector. + if (fnd_cell == cells.end() && cell.size() >= 3 && cell.substr(cell.size() - 3) == "[0]") { + cell = cell.substr(0, cell.size() - 3); + fnd_cell = cells.find(id(cell)); + } + if (fnd_cell != cells.end()) { fnd_cell->second->attrs[id_LOC] = strip_quotes(words.at(4)); } |