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

machxo2: Implement bel_to_cell and API functions using it.

Browse Source
This commit is contained in:
William D. Jones 2020-12-06 22:50:15 -05:00 committed by gatecat
parent 682de724a8
commit 5f748272fc
2 changed files with 47 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
machxo2/arch.cc
View File

@ -167,22 +167,6 @@ uint32_t Arch::getBelChecksum(BelId bel) const
return 0; return 0;
} }
void Arch::bindBel(BelId bel, CellInfo *cell, PlaceStrength strength)
{
}
void Arch::unbindBel(BelId bel)
{
}
bool Arch::checkBelAvail(BelId bel) const { return false; }
CellInfo *Arch::getBoundBelCell(BelId bel) const { return nullptr; }
CellInfo *Arch::getConflictingBelCell(BelId bel) const { return nullptr; }
const std::map<IdString, std::string> &Arch::getBelAttrs(BelId bel) const { return attrs_dummy; } const std::map<IdString, std::string> &Arch::getBelAttrs(BelId bel) const { return attrs_dummy; }
WireId Arch::getBelPinWire(BelId bel, IdString pin) const WireId Arch::getBelPinWire(BelId bel, IdString pin) const

52
machxo2/arch.h
View File

@ -311,6 +311,8 @@ struct Arch : BaseCtx
const ChipInfoPOD *chip_info; const ChipInfoPOD *chip_info;
const PackageInfoPOD *package_info; const PackageInfoPOD *package_info;
std::vector<CellInfo *> bel_to_cell;
// Placeholders to be removed. // Placeholders to be removed.
std::unordered_map<Loc, BelId> bel_by_loc; std::unordered_map<Loc, BelId> bel_by_loc;
std::vector<BelId> bel_id_dummy; std::vector<BelId> bel_id_dummy;
@ -327,6 +329,11 @@ struct Arch : BaseCtx
return &(chip_info->tiles[id.location.y * chip_info->width + id.location.x]); return &(chip_info->tiles[id.location.y * chip_info->width + id.location.x]);
} }
int getBelFlatIndex(BelId bel) const
{
return (bel.location.y * chip_info->width + bel.location.x) * max_loc_bels + bel.index;
}
// --------------------------------------------------------------- // ---------------------------------------------------------------
// Common Arch API. Every arch must provide the following methods. // Common Arch API. Every arch must provide the following methods.
@ -373,11 +380,46 @@ struct Arch : BaseCtx
const std::vector<BelId> &getBelsByTile(int x, int y) const; const std::vector<BelId> &getBelsByTile(int x, int y) const;
bool getBelGlobalBuf(BelId bel) const; bool getBelGlobalBuf(BelId bel) const;
uint32_t getBelChecksum(BelId bel) const; uint32_t getBelChecksum(BelId bel) const;
void bindBel(BelId bel, CellInfo *cell, PlaceStrength strength);
void unbindBel(BelId bel); void bindBel(BelId bel, CellInfo *cell, PlaceStrength strength)
bool checkBelAvail(BelId bel) const; {
CellInfo *getBoundBelCell(BelId bel) const; NPNR_ASSERT(bel != BelId());
CellInfo *getConflictingBelCell(BelId bel) const; int idx = getBelFlatIndex(bel);
NPNR_ASSERT(bel_to_cell.at(idx) == nullptr);
bel_to_cell[idx] = cell;
cell->bel = bel;
cell->belStrength = strength;
refreshUiBel(bel);
}
void unbindBel(BelId bel)
{
NPNR_ASSERT(bel != BelId());
int idx = getBelFlatIndex(bel);
NPNR_ASSERT(bel_to_cell.at(idx) != nullptr);
bel_to_cell[idx]->bel = BelId();
bel_to_cell[idx]->belStrength = STRENGTH_NONE;
bel_to_cell[idx] = nullptr;
refreshUiBel(bel);
}
bool checkBelAvail(BelId bel) const
{
NPNR_ASSERT(bel != BelId());
return bel_to_cell[getBelFlatIndex(bel)] == nullptr;
}
CellInfo *getBoundBelCell(BelId bel) const
{
NPNR_ASSERT(bel != BelId());
return bel_to_cell[getBelFlatIndex(bel)];
}
CellInfo *getConflictingBelCell(BelId bel) const
{
NPNR_ASSERT(bel != BelId());
return bel_to_cell[getBelFlatIndex(bel)];
}
BelRange getBels() const BelRange getBels() const
{ {