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

Gowin Himbaechel: HCLK Bug fixes and corrections

Browse Source
This commit is contained in:
Saviour 2024-08-01 18:55:17 +01:00
parent 95594c0fec
commit 954cf8aa24
3 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
himbaechel/uarch/gowin/cst.cc
View File

@ -63,9 +63,10 @@ struct GowinCstReader
for (auto &bel : ctx->getBelsInBucket(ctx->getBelBucketForCellType(id_CLKDIV))) { for (auto &bel : ctx->getBelsInBucket(ctx->getBelBucketForCellType(id_CLKDIV))) {
auto this_loc = ctx->getBelLocation(bel); auto this_loc = ctx->getBelLocation(bel);
if (!lr && this_loc.y == y_coord && this_loc.z == bel_z) // top or bottom side if (lr && this_loc.x == x_coord && this_loc.z == bel_z && this_loc.y != 0 &&
this_loc.y != maxY - 1) // left or right side
return bel; return bel;
else if (lr && this_loc.x == x_coord && this_loc.z == bel_z) // left or right side else if (!lr && this_loc.y == y_coord && this_loc.z == bel_z) // top or bottom side
return bel; return bel;
} }
return BelId(); return BelId();

33
himbaechel/uarch/gowin/gowin.cc
View File

@ -388,13 +388,22 @@ void GowinImpl::place_constrained_hclk_cells()
std::map<IdString, std::pair<IdString, int>> true_clkdivs; std::map<IdString, std::pair<IdString, int>> true_clkdivs;
std::set<BelId> used_bels; std::set<BelId> used_bels;
for (auto constr_pair : constrained_clkdivs) { for (auto constr_pair : constrained_clkdivs) {
BelId option1 = ctx->getBelByName(constr_pair.first); BelId option0 = ctx->getBelByName(constr_pair.first);
BelId option2 = gwu.get_other_hclk_clkdiv2(option1); BelId option1 = gwu.get_other_hclk_clkdiv2(option0);
// On the GW1N-9 devices, only the lower CLKDIV can be fed by a CLKDIV2
std::vector<BelId> options = {option1, option0};
if (chip.str(ctx) == "GW1N-9C") {
auto ci = ctx->cells.at(constr_pair.second).get();
for (auto cluster_child_cell : ci->constr_children)
if (cluster_child_cell->type == id_CLKDIV2 && options.back() == option0) {
options.pop_back();
break;
}
}
// log_info("%s: option1: %s, option2: %s\n", constr_pair.second.c_str(ctx), ctx->nameOfBel(option1),
// ctx->nameOfBel(option2));
bool placed = false; bool placed = false;
for (auto option : {option1, option2}) { for (auto option : options) {
if (placed || (used_bels.find(option) != used_bels.end())) if (placed || (used_bels.find(option) != used_bels.end()))
continue; continue;
for (auto option_cell : bel_cell_map[option]) { for (auto option_cell : bel_cell_map[option]) {
@ -413,8 +422,8 @@ void GowinImpl::place_constrained_hclk_cells()
// We create a new alias to represent this // We create a new alias to represent this
if (!placed) { if (!placed) {
auto new_alias = std::pair<IdString, int>(constr_pair.second, -1); auto new_alias = std::pair<IdString, int>(constr_pair.second, -1);
bel_cell_map[option1].insert(new_alias); for (auto option : options)
bel_cell_map[option2].insert(new_alias); bel_cell_map[option].insert(new_alias);
alias_cells.push_back(new_alias); alias_cells.push_back(new_alias);
true_clkdivs[constr_pair.second] = new_alias; true_clkdivs[constr_pair.second] = new_alias;
} }
@ -457,12 +466,14 @@ void GowinImpl::place_constrained_hclk_cells()
for (auto cell_alias : alias_cells) { for (auto cell_alias : alias_cells) {
auto ci = ctx->cells.at(cell_alias.first).get(); auto ci = ctx->cells.at(cell_alias.first).get();
if (final_placement.find(cell_alias) == final_placement.end()) if (final_placement.find(cell_alias) == final_placement.end() && ctx->debug)
if (ci->type == id_CLKDIV2 || ci->type == id_CLKDIV) if (ci->type == id_CLKDIV2 || ci->type == id_CLKDIV)
log_error("Unable to place HCLK cell %s; no BELs available to implement cell type %s\n", log_info("Custom HCLK Placer: Unable to place HCLK cell %s; no BELs available to implement cell type "
ci->name.c_str(ctx), ci->type.c_str(ctx)); "%s\n",
ci->name.c_str(ctx), ci->type.c_str(ctx));
else else
log_error("Unable to route HCLK signal from %s to IOLOGIC\n", ci->name.c_str(ctx)); log_info("Custom HCLK Placer: Unable to guarantee route for HCLK signal from %s to IOLOGIC\n",
ci->name.c_str(ctx));
else { else {
auto placement = final_placement[cell_alias]; auto placement = final_placement[cell_alias];

2
himbaechel/uarch/gowin/gowin.h
View File

@ -70,7 +70,7 @@ inline bool is_clkdiv(const CellInfo *cell) { return type_is_clkdiv(cell->type);
inline bool type_is_clkdiv2(IdString cell_type) { return cell_type == id_CLKDIV2; } inline bool type_is_clkdiv2(IdString cell_type) { return cell_type == id_CLKDIV2; }
inline bool is_clkdiv2(const CellInfo *cell) { return type_is_clkdiv2(cell->type); } inline bool is_clkdiv2(const CellInfo *cell) { return type_is_clkdiv2(cell->type); }
// Return true for HCLK BELs // Return true for HCLK Cells
inline bool is_hclk(const CellInfo *cell) { return type_is_clkdiv2(cell->type) || type_is_clkdiv(cell->type); } inline bool is_hclk(const CellInfo *cell) { return type_is_clkdiv2(cell->type) || type_is_clkdiv(cell->type); }
// ========================================== // ==========================================