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

[xc7] Add torc_info->site_index_to_bel lookup; also fix Arch::getBelByName()

Browse Source
This commit is contained in:
Eddie Hung 2018-11-03 15:56:06 -07:00
parent aa7f7d6a97
commit 5c56fab0ab
2 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
xc7/arch.cc
View File

@ -36,7 +36,9 @@ std::unique_ptr<const TorcInfo> torc_info;
TorcInfo::TorcInfo(Arch *ctx, const std::string &inDeviceName, const std::string &inPackageName)
: ddb(new DDB(inDeviceName, inPackageName)), sites(ddb->getSites()), tiles(ddb->getTiles()),
segments(ddb->getSegments()), bel_to_site_index(construct_bel_to_site_index(ctx, sites)),
num_bels(bel_to_site_index.size()), site_index_to_type(construct_site_index_to_type(ctx, sites)),
num_bels(bel_to_site_index.size()),
site_index_to_bel(construct_site_index_to_bel(ctx, sites, bel_to_site_index)),
site_index_to_type(construct_site_index_to_type(ctx, sites)),
bel_to_loc(construct_bel_to_loc(sites, tiles, num_bels, site_index_to_type)),
wire_to_tilewire(construct_wire_to_tilewire(segments, tiles, segment_to_wire, trivial_to_wire)),
num_wires(wire_to_tilewire.size()), wire_to_delay(construct_wire_to_delay(wire_to_tilewire, *ddb)),
@ -68,6 +70,18 @@ std::vector<SiteIndex> TorcInfo::construct_bel_to_site_index(Arch *ctx, const Si
}
return bel_to_site_index;
}
std::vector<BelId> TorcInfo::construct_site_index_to_bel(Arch *ctx, const Sites &sites, const std::vector<SiteIndex> &bel_to_site_index)
{
std::vector<BelId> site_index_to_bel;
site_index_to_bel.resize(sites.getSiteCount());
BelId b;
b.index = 0;
for (auto i : bel_to_site_index) {
site_index_to_bel[i] = b;
++b.index;
}
return site_index_to_bel;
}
std::vector<IdString> TorcInfo::construct_site_index_to_type(Arch *ctx, const Sites &sites)
{
std::vector<IdString> site_index_to_type;
@ -344,13 +358,10 @@ IdString Arch::archArgsToId(ArchArgs args) const
BelId Arch::getBelByName(IdString name) const
{
BelId ret;
auto it = torc_info->sites.findSiteIndex(name.str(this));
if (it != SiteIndex(-1))
ret.index = it;
return ret;
return torc_info->site_index_to_bel.at(it);
return BelId();
}
BelId Arch::getBelByLocation(Loc loc) const
@ -602,14 +613,7 @@ IdString Arch::getPipName(PipId pip) const
BelId Arch::getPackagePinBel(const std::string &pin) const
{
// for (int i = 0; i < package_info->num_pins; i++) {
// if (package_info->pins[i].name.get() == pin) {
// BelId id;
// id.index = package_info->pins[i].bel_index;
// return id;
// }
// }
return BelId();
return getBelByName(id(pin));
}
std::string Arch::getBelPackagePin(BelId bel) const

2
xc7/arch.h
View File

@ -307,6 +307,7 @@ struct TorcInfo
const std::vector<SiteIndex> bel_to_site_index;
const int num_bels;
const std::vector<BelId> site_index_to_bel;
const std::vector<IdString> site_index_to_type;
const std::vector<Loc> bel_to_loc;
std::unordered_map<Segments::SegmentReference, int> segment_to_wire;
@ -322,6 +323,7 @@ struct TorcInfo
private:
static std::vector<SiteIndex> construct_bel_to_site_index(Arch *ctx, const Sites &sites);
static std::vector<BelId> construct_site_index_to_bel(Arch *ctx, const Sites &sites, const std::vector<SiteIndex> &bel_to_site_index);
static std::vector<IdString> construct_site_index_to_type(Arch *ctx, const Sites &sites);
static std::vector<Loc> construct_bel_to_loc(const Sites &sites, const Tiles &tiles, const int num_bels,
const std::vector<IdString> &site_index_to_type);