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

ecp5: Regression fix & format

Browse Source 
Signed-off-by: David Shah <dave@ds0.me>
This commit is contained in:
David Shah 2018-11-15 11:54:28 +00:00
parent 91a0927196
commit 7e1df82462
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ecp5/archdefs.h
View File

@ -87,7 +87,10 @@ struct BelId
bool operator==(const BelId &other) const { return index == other.index && location == other.location; } bool operator==(const BelId &other) const { return index == other.index && location == other.location; }
bool operator!=(const BelId &other) const { return index != other.index || location != other.location; } bool operator!=(const BelId &other) const { return index != other.index || location != other.location; }
bool operator<(const BelId &other) const { return location == other.location ? index < other.index : location < other.location; } bool operator<(const BelId &other) const
{
return location == other.location ? index < other.index : location < other.location;
}
}; };
struct WireId struct WireId
@ -97,7 +100,10 @@ struct WireId
bool operator==(const WireId &other) const { return index == other.index && location == other.location; } bool operator==(const WireId &other) const { return index == other.index && location == other.location; }
bool operator!=(const WireId &other) const { return index != other.index || location != other.location; } bool operator!=(const WireId &other) const { return index != other.index || location != other.location; }
bool operator<(const WireId &other) const { return location == other.location ? index < other.index : location < other.location; } bool operator<(const WireId &other) const
{
return location == other.location ? index < other.index : location < other.location;
}
}; };
struct PipId struct PipId
@ -107,7 +113,10 @@ struct PipId
bool operator==(const PipId &other) const { return index == other.index && location == other.location; } bool operator==(const PipId &other) const { return index == other.index && location == other.location; }
bool operator!=(const PipId &other) const { return index != other.index || location != other.location; } bool operator!=(const PipId &other) const { return index != other.index || location != other.location; }
bool operator<(const PipId &other) const { return location == other.location ? index < other.index : location < other.location; } bool operator<(const PipId &other) const
{
return location == other.location ? index < other.index : location < other.location;
}
}; };
struct GroupId struct GroupId

1
ecp5/bitstream.cc
View File

@ -426,6 +426,7 @@ 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')
newname.insert(cibdcu, 1, 'V'); newname.insert(cibdcu, 1, 'V');
tiletype_xform[tile.first] = newname; tiletype_xform[tile.first] = newname;
} else if (tile.first.substr(tile.first.size() - 7) == "BMID_0H") { } else if (tile.first.substr(tile.first.size() - 7) == "BMID_0H") {