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

ice40: Only place IO at valid pins

Browse Source 
Signed-off-by: David Shah <davey1576@gmail.com>
This commit is contained in:
David Shah 2018-06-15 21:29:02 +02:00
parent 2479b4ecbf
commit cabdfe3616
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ice40/arch_place.cc
View File

@ -22,8 +22,8 @@
NEXTPNR_NAMESPACE_BEGIN NEXTPNR_NAMESPACE_BEGIN
static const NetInfo * static const NetInfo *get_net_or_nullptr(const CellInfo *cell,
get_net_or_nullptr(const CellInfo *cell, const IdString port) const IdString port)
{ {
auto found = cell->ports.find(port); auto found = cell->ports.find(port);
if (found != cell->ports.end()) if (found != cell->ports.end())
@ -97,7 +97,8 @@ bool isValidBelForCell(Design *design, CellInfo *cell, BelId bel)
cells.push_back(cell); cells.push_back(cell);
return logicCellsCompatible(cells); return logicCellsCompatible(cells);
} else if (cell->type == "SB_IO") {
return design->chip.getBelPackagePin(bel) != "";
} else { } else {
// TODO: IO cell clock checks // TODO: IO cell clock checks
return true; return true;

9
ice40/chip.cc
View File

@ -273,6 +273,15 @@ BelId Chip::getPackagePinBel(const std::string &pin) const
return BelId(); return BelId();
} }
std::string Chip::getBelPackagePin(BelId bel) const
{
for (int i = 0; i < package_info->num_pins; i++) {
if (package_info->pins[i].bel_index == bel.index) {
return std::string(package_info->pins[i].name);
}
}
return "";
}
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
bool Chip::estimatePosition(BelId bel, float &x, float &y) const bool Chip::estimatePosition(BelId bel, float &x, float &y) const

1
ice40/chip.h
View File

@ -691,6 +691,7 @@ struct Chip
} }
BelId getPackagePinBel(const std::string &pin) const; BelId getPackagePinBel(const std::string &pin) const;
std::string getBelPackagePin(BelId bel) const;
// ------------------------------------------------- // -------------------------------------------------