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

Cleanup

Browse Source
This commit is contained in:
Miodrag Milanovic 2024-07-03 13:53:48 +02:00
parent 7869140621
commit 0a62392bb6
2 changed files with 24 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
himbaechel/uarch/ng-ultra/pack.cc
View File

@ -293,6 +293,10 @@ void NgUltraPacker::bind_attr_loc(CellInfo *cell, dict<IdString, Property> *attr
{ {
if (attrs->count(id_LOC)) { if (attrs->count(id_LOC)) {
std::string name = attrs->at(id_LOC).as_string(); std::string name = attrs->at(id_LOC).as_string();
if (boost::starts_with(name,"TILE[")) {
boost::replace_all(name, ".DFF", ".FE");
boost::replace_all(name, ".LUT", ".FE");
}
if (!uarch->locations.count(name)) { if (!uarch->locations.count(name)) {
log_error("Unable to find location %s\n", name.c_str()); log_error("Unable to find location %s\n", name.c_str());
} }
@ -304,7 +308,7 @@ void NgUltraPacker::bind_attr_loc(CellInfo *cell, dict<IdString, Property> *attr
void NgUltraPacker::pack_xluts(void) void NgUltraPacker::pack_xluts(void)
{ {
log_info("Pack XLUTs...\n"); log_info("Pack XLUTs...\n");
int xlut_used = 0, lut_only = 0;//, lut_and_ff = 0; int xlut_used = 0, lut_only = 0;
for (auto &cell : ctx->cells) { for (auto &cell : ctx->cells) {
CellInfo &ci = *cell.second; CellInfo &ci = *cell.second;
if (!ci.type.in(id_NX_LUT)) if (!ci.type.in(id_NX_LUT))
@ -355,8 +359,6 @@ void NgUltraPacker::pack_xluts(void)
log_info(" %6d XLUTs used\n", xlut_used); log_info(" %6d XLUTs used\n", xlut_used);
if (lut_only) if (lut_only)
log_info(" %6d FEs used as LUT only\n", lut_only); log_info(" %6d FEs used as LUT only\n", lut_only);
//if (lut_and_ff)
// log_info(" %6d FEs used as LUT and DFF\n", lut_and_ff);
flush_cells(); flush_cells();
} }
@ -1906,8 +1908,6 @@ void NgUltraPacker::pre_place(void)
break; break;
} }
} }
//if (!found)
// log_error(" No more available PLLs for driving '%s'.\n", ci.name.c_str(ctx));
} }
} }
// If PLL use any other pin, location is not relevant, so we pick available // If PLL use any other pin, location is not relevant, so we pick available
@ -1915,7 +1915,6 @@ void NgUltraPacker::pre_place(void)
CellInfo &ci = *cell.second; CellInfo &ci = *cell.second;
if (!ci.type.in(id_PLL) || ci.bel != BelId()) if (!ci.type.in(id_PLL) || ci.bel != BelId())
continue; continue;
//log_warning(" PLL '%s' is not driven by clock dedicated pin.\n", ci.name.c_str(ctx));
if (uarch->unused_pll.empty()) if (uarch->unused_pll.empty())
log_error(" No more available PLLs for driving '%s'.\n", ci.name.c_str(ctx)); log_error(" No more available PLLs for driving '%s'.\n", ci.name.c_str(ctx));
BelId bel = uarch->unused_pll.begin()->first; BelId bel = uarch->unused_pll.begin()->first;
@ -2034,7 +2033,6 @@ void NgUltraImpl::postPlace()
log_info("Running post-placement ...\n"); log_info("Running post-placement ...\n");
packer.duplicate_gck(); packer.duplicate_gck();
packer.insert_bypass_gck(); packer.insert_bypass_gck();
//log_info("Running post-placement legalisation...\n");
log_break(); log_break();
ctx->assignArchInfo(); ctx->assignArchInfo();
} }