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

id_QUARTER_SLICE -> id_SLICE_LUT6, fix getBelLocation()

Browse Source
This commit is contained in:
Eddie Hung 2018-08-14 08:42:27 -07:00
parent 72c785db0e
commit b8b9813056
4 changed files with 53 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
xc7/arch.cc
View File

@ -35,7 +35,7 @@ NEXTPNR_NAMESPACE_BEGIN
std::unique_ptr<const TorcInfo> torc_info; std::unique_ptr<const TorcInfo> torc_info;
TorcInfo::TorcInfo(Arch *ctx, const std::string &inDeviceName, const std::string &inPackageName) TorcInfo::TorcInfo(Arch *ctx, const std::string &inDeviceName, const std::string &inPackageName)
: ddb(new DDB(inDeviceName, inPackageName)), sites(ddb->getSites()), tiles(ddb->getTiles()), site_index_to_type(construct_site_index_to_type(ctx, sites)) : ddb(new DDB(inDeviceName, inPackageName)), sites(ddb->getSites()), tiles(ddb->getTiles()), site_index_to_type(construct_site_index_to_type(ctx, sites)), site_index_to_z_offset(construct_site_index_to_z_offset(sites, site_index_to_type))
{ {
} }
std::vector<IdString> TorcInfo::construct_site_index_to_type(Arch* ctx, const Sites &sites) std::vector<IdString> TorcInfo::construct_site_index_to_type(Arch* ctx, const Sites &sites)
@ -43,16 +43,31 @@ std::vector<IdString> TorcInfo::construct_site_index_to_type(Arch* ctx, const Si
std::vector<IdString> site_index_to_type; std::vector<IdString> site_index_to_type;
site_index_to_type.resize(sites.getSiteCount()); site_index_to_type.resize(sites.getSiteCount());
for (SiteIndex i(0); i < sites.getSiteCount(); ++i) { for (SiteIndex i(0); i < sites.getSiteCount(); ++i) {
const auto& s = sites.getSite(i); auto s = sites.getSite(i);
auto pd = s.getPrimitiveDefPtr(); auto pd = s.getPrimitiveDefPtr();
const auto& type = pd->getName(); auto type = pd->getName();
if (type == "SLICEL" || type == "SLICEM") if (type == "SLICEL" || type == "SLICEM")
site_index_to_type[i] = id_QUARTER_SLICE; site_index_to_type[i] = id_SLICE_LUT6;
else else
site_index_to_type[i] = ctx->id(type); site_index_to_type[i] = ctx->id(type);
} }
return site_index_to_type; return site_index_to_type;
} }
std::vector<int8_t> TorcInfo::construct_site_index_to_z_offset(const Sites &sites, const std::vector<IdString> &site_index_to_type)
{
std::vector<int8_t> site_index_to_z_offset;
site_index_to_z_offset.resize(site_index_to_type.size());
for (SiteIndex i(0); i < site_index_to_type.size(); ++i) {
if (site_index_to_type[i] == id_SLICE_LUT6) {
auto site = sites.getSite(i);
auto site_name = site.getName();
auto site_name_back = site_name.back();
if (site_name_back == '1' || site_name_back == '3' || site_name_back == '5' || site_name_back == '7' || site_name_back == '9')
site_index_to_z_offset[i] = 4;
}
}
return site_index_to_z_offset;
}
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
@ -129,7 +144,7 @@ BelId Arch::getBelByLocation(Loc loc) const
for (SiteIndex i(0); i < torc_info->sites.getSiteCount(); ++i) { for (SiteIndex i(0); i < torc_info->sites.getSiteCount(); ++i) {
BelId b; BelId b;
b.index = i; b.index = i;
if (torc_info->site_index_to_type[i] == id_QUARTER_SLICE) { if (torc_info->site_index_to_type[i] == id_SLICE_LUT6) {
b.pos = BelId::A; b.pos = BelId::A;
bel_by_loc[getBelLocation(b)] = b; bel_by_loc[getBelLocation(b)] = b;
b.pos = BelId::B; b.pos = BelId::B;
@ -198,12 +213,19 @@ WireId Arch::getBelPinWire(BelId bel, IdString pin) const
{ {
WireId ret; WireId ret;
const auto& site = torc_info->sites.getSite(bel.index); auto &site = torc_info->sites.getSite(bel.index);
auto pin_name = pin.str(this); auto pin_name = pin.str(this);
if (torc_info->site_index_to_type[bel.index] == id_QUARTER_SLICE) if (torc_info->site_index_to_type[bel.index] == id_SLICE_LUT6) {
pin_name[0] = bel.pos; // For all LUT based inputs (I1-I6,O,OQ,OMUX) then change the I/O into the LUT
if (pin_name[0] == 'I' || pin_name[0] == 'O')
pin_name[0] = bel.pos;
}
ret.index = site.getPinTilewire(pin_name); ret.index = site.getPinTilewire(pin_name);
if (ret.index.isUndefined())
log_error("no wire found for site '%s' pin '%s' \n", torc_info->site_index_to_name(bel.index).c_str(), pin_name.c_str());
// NPNR_ASSERT(bel != BelId()); // NPNR_ASSERT(bel != BelId());
// //
// int num_bel_wires = chip_info->bel_data[bel.index].num_bel_wires; // int num_bel_wires = chip_info->bel_data[bel.index].num_bel_wires;
@ -702,7 +724,7 @@ std::vector<GraphicElement> Arch::getDecalGraphics(DecalId decal) const
bool Arch::getCellDelay(const CellInfo *cell, IdString fromPort, IdString toPort, DelayInfo &delay) const bool Arch::getCellDelay(const CellInfo *cell, IdString fromPort, IdString toPort, DelayInfo &delay) const
{ {
if (cell->type == id_QUARTER_SLICE) if (cell->type == id_SLICE_LUT6)
{ {
if (fromPort.index >= id_I1.index && fromPort.index <= id_I6.index) if (fromPort.index >= id_I1.index && fromPort.index <= id_I6.index)
return toPort == id_O || toPort == id_OQ; return toPort == id_O || toPort == id_OQ;
@ -717,7 +739,7 @@ bool Arch::getCellDelay(const CellInfo *cell, IdString fromPort, IdString toPort
// Get the port class, also setting clockPort to associated clock if applicable // Get the port class, also setting clockPort to associated clock if applicable
TimingPortClass Arch::getPortTimingClass(const CellInfo *cell, IdString port, IdString &clockPort) const TimingPortClass Arch::getPortTimingClass(const CellInfo *cell, IdString port, IdString &clockPort) const
{ {
if (cell->type == id_QUARTER_SLICE) { if (cell->type == id_SLICE_LUT6) {
if (port == id_CLK) if (port == id_CLK)
return TMG_CLOCK_INPUT; return TMG_CLOCK_INPUT;
if (port == id_CIN) if (port == id_CIN)
@ -782,7 +804,7 @@ void Arch::assignArchInfo()
void Arch::assignCellInfo(CellInfo *cell) void Arch::assignCellInfo(CellInfo *cell)
{ {
cell->belType = cell->type; cell->belType = cell->type;
if (cell->type == id_QUARTER_SLICE) { if (cell->type == id_SLICE_LUT6) {
cell->lcInfo.dffEnable = bool_or_default(cell->params, id_DFF_ENABLE); cell->lcInfo.dffEnable = bool_or_default(cell->params, id_DFF_ENABLE);
cell->lcInfo.carryEnable = bool_or_default(cell->params, id_CARRY_ENABLE); cell->lcInfo.carryEnable = bool_or_default(cell->params, id_CARRY_ENABLE);
cell->lcInfo.negClk = bool_or_default(cell->params, id_NEG_CLK); cell->lcInfo.negClk = bool_or_default(cell->params, id_NEG_CLK);

28
xc7/arch.h
View File

@ -243,7 +243,7 @@ struct TorcInfo {
SiteIndex sites_begin() const { return SiteIndex(0); } SiteIndex sites_begin() const { return SiteIndex(0); }
SiteIndex sites_end() const { return SiteIndex(sites.getSiteCount()); } SiteIndex sites_end() const { return SiteIndex(sites.getSiteCount()); }
const TileInfo& site_index_to_tile_info(SiteIndex si) const { const TileInfo& site_index_to_tile_info(SiteIndex si) const {
const auto& site = sites.getSite(si); auto &site = sites.getSite(si);
return tiles.getTileInfo(site.getTileIndex()); return tiles.getTileInfo(site.getTileIndex());
} }
const std::string& site_index_to_name(SiteIndex si) const { const std::string& site_index_to_name(SiteIndex si) const {
@ -251,7 +251,11 @@ struct TorcInfo {
} }
const std::vector<IdString> site_index_to_type; const std::vector<IdString> site_index_to_type;
const std::vector<int8_t> site_index_to_z_offset;
private:
static std::vector<IdString> construct_site_index_to_type(Arch *ctx, const Sites &sites); static std::vector<IdString> construct_site_index_to_type(Arch *ctx, const Sites &sites);
static std::vector<int8_t> construct_site_index_to_z_offset(const Sites &sites, const std::vector<IdString> &site_index_to_type);
}; };
extern std::unique_ptr<const TorcInfo> torc_info; extern std::unique_ptr<const TorcInfo> torc_info;
@ -262,14 +266,12 @@ struct BelIterator : public BelId
{ {
BelIterator operator++() BelIterator operator++()
{ {
if (torc_info->site_index_to_type[index] == id_QUARTER_SLICE) { if (pos >= A && pos < D) {
if (pos < D) { ++pos;
++pos; return *this;
return *this;
}
} }
if (torc_info->site_index_to_type[++index] == id_QUARTER_SLICE) if (torc_info->site_index_to_type[++index] == id_SLICE_LUT6)
pos = A; pos = A;
else else
pos = NOT_APPLICABLE; pos = NOT_APPLICABLE;
@ -446,7 +448,8 @@ struct Arch : BaseCtx
{ {
NPNR_ASSERT(bel != BelId()); NPNR_ASSERT(bel != BelId());
auto name = torc_info->site_index_to_name(bel.index); auto name = torc_info->site_index_to_name(bel.index);
if (torc_info->site_index_to_type[bel.index] == id_QUARTER_SLICE) { if (torc_info->site_index_to_type[bel.index] == id_SLICE_LUT6) {
// Append LUT name to name
name.reserve(name.size() + 2); name.reserve(name.size() + 2);
name += "_"; name += "_";
name += bel.pos; name += bel.pos;
@ -507,11 +510,16 @@ struct Arch : BaseCtx
Loc getBelLocation(BelId bel) const Loc getBelLocation(BelId bel) const
{ {
const auto& tile_info = torc_info->site_index_to_tile_info(bel.index); auto &tile_info = torc_info->site_index_to_tile_info(bel.index);
Loc loc; Loc loc;
loc.x = tile_info.getCol(); loc.x = tile_info.getCol();
loc.y = tile_info.getRow(); loc.y = tile_info.getRow();
loc.z = 0; if (torc_info->site_index_to_type[bel.index] == id_SLICE_LUT6) {
loc.z = bel.pos - 'A';
// Apply offset if upper slice
loc.z += torc_info->site_index_to_z_offset[bel.index];
}
return loc; return loc;
} }

2
xc7/cells.cc
View File

@ -43,7 +43,7 @@ std::unique_ptr<CellInfo> create_ice_cell(Context *ctx, IdString type, std::stri
} }
new_cell->type = type; new_cell->type = type;
if (type == ctx->id("XC7_LC")) { if (type == ctx->id("XC7_LC")) {
new_cell->type = id_QUARTER_SLICE; // HACK HACK HACK: Place one LC into each slice new_cell->type = id_SLICE_LUT6;
new_cell->params[ctx->id("LUT_INIT")] = "0"; new_cell->params[ctx->id("LUT_INIT")] = "0";
new_cell->params[ctx->id("NEG_CLK")] = "0"; new_cell->params[ctx->id("NEG_CLK")] = "0";
new_cell->params[ctx->id("CARRY_ENABLE")] = "0"; new_cell->params[ctx->id("CARRY_ENABLE")] = "0";

2
xc7/constids.inc
View File

@ -455,7 +455,7 @@ X(FDCE)
X(FDPE) X(FDPE)
X(BUFGCTRL) X(BUFGCTRL)
X(QUARTER_SLICE) X(SLICE_LUT6)
X(IOBUF) X(IOBUF)
X(IOB33S) X(IOB33S)
X(IOB33M) // What is the difference between IOB33S and IOB33M? X(IOB33M) // What is the difference between IOB33S and IOB33M?