caiyu/nextpnr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ecp5: Fix routing bitgen for non-SERDES 'VCIB' tiles

Browse Source 
Signed-off-by: David Shah <dave@ds0.me>
This commit is contained in:
David Shah 2020-04-10 08:25:16 +01:00
parent ced336492c
commit a8111bba83
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ecp5/bitstream.cc
View File

@ -446,9 +446,10 @@ void fix_tile_names(Context *ctx, ChipConfig &cc)
auto cibdcu = tile.first.find("CIB_DCU"); auto cibdcu = tile.first.find("CIB_DCU");
if (cibdcu != std::string::npos) { if (cibdcu != std::string::npos) {
// Add the V // Add the V
if (newname.at(cibdcu - 1) != 'V') if (newname.at(cibdcu - 1) != 'V') {
newname.insert(cibdcu, 1, 'V'); newname.insert(cibdcu, 1, 'V');
tiletype_xform[tile.first] = newname; tiletype_xform[tile.first] = newname;
}
} else if (boost::ends_with(tile.first, "BMID_0H")) { } else if (boost::ends_with(tile.first, "BMID_0H")) {
newname.back() = 'V'; newname.back() = 'V';
tiletype_xform[tile.first] = newname; tiletype_xform[tile.first] = newname;
@ -459,7 +460,15 @@ void fix_tile_names(Context *ctx, ChipConfig &cc)
} }
// Apply the name changes // Apply the name changes
for (auto xform : tiletype_xform) { for (auto xform : tiletype_xform) {
cc.tiles[xform.second] = cc.tiles.at(xform.first); auto &existing = cc.tiles.at(xform.first);
for (const auto &carc : existing.carcs)
cc.tiles[xform.second].carcs.push_back(carc);
for (const auto &cenum : existing.cenums)
cc.tiles[xform.second].cenums.push_back(cenum);
for (const auto &cword : existing.cwords)
cc.tiles[xform.second].cwords.push_back(cword);
for (const auto &cunknown : existing.cunknowns)
cc.tiles[xform.second].cunknowns.push_back(cunknown);
cc.tiles.erase(xform.first); cc.tiles.erase(xform.first);
} }
} }