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

clangformat

Browse Source 
Signed-off-by: gatecat <gatecat@ds0.me>
This commit is contained in:
gatecat 2022-03-17 19:24:05 +00:00
parent 2635bab2f1
commit 14d53dfec8
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ice40/pack.cc
View File

@ -59,7 +59,8 @@ static void pack_lut_lutffs(Context *ctx)
if (ctx->verbose) if (ctx->verbose)
log_info("found attached dff %s\n", dff->name.c_str(ctx)); log_info("found attached dff %s\n", dff->name.c_str(ctx));
auto dff_bel = dff->attrs.find(id_BEL); auto dff_bel = dff->attrs.find(id_BEL);
if (lut_bel != ci->attrs.end() && dff_bel != dff->attrs.end() && lut_bel->second != dff_bel->second) { if (lut_bel != ci->attrs.end() && dff_bel != dff->attrs.end() &&
lut_bel->second != dff_bel->second) {
// Locations don't match, can't pack // Locations don't match, can't pack
} else { } else {
lut_to_lc(ctx, ci, packed.get(), false); lut_to_lc(ctx, ci, packed.get(), false);

2
nexus/arch.cc
View File

@ -486,7 +486,7 @@ bool Arch::getCellDelay(const CellInfo *cell, IdString fromPort, IdString toPort
if (fromPort == id_CLK) if (fromPort == id_CLK)
return false; // don't include delays that are actually clock-to-out here return false; // don't include delays that are actually clock-to-out here
return lookup_cell_delay(cell->tmg_index, lookup_port(fromPort), lookup_port(toPort), delay); return lookup_cell_delay(cell->tmg_index, lookup_port(fromPort), lookup_port(toPort), delay);
} else if(cell->type == id_DCS) { } else if (cell->type == id_DCS) {
if (fromPort == id_SELFORCE || fromPort == id_SEL) { if (fromPort == id_SELFORCE || fromPort == id_SEL) {
return false; return false;
} }

4
nexus/pack.cc
View File

@ -2007,14 +2007,14 @@ struct NexusPacker
copy_constraint(ci, id_CLK0, id_DCSOUT); copy_constraint(ci, id_CLK0, id_DCSOUT);
} else if (!have_clk0 && have_clk1) { } else if (!have_clk0 && have_clk1) {
copy_constraint(ci, id_CLK1, id_DCSOUT); copy_constraint(ci, id_CLK1, id_DCSOUT);
} else if ( have_clk0 && have_clk1) { } else if (have_clk0 && have_clk1) {
set_period(ci, id_DCSOUT, std::min(period_clk0, period_clk1)); set_period(ci, id_DCSOUT, std::min(period_clk0, period_clk1));
} }
} else if (ci->type == id_OSC_CORE) { } else if (ci->type == id_OSC_CORE) {
int div = int_or_default(ci->params, id_HF_CLK_DIV, 128); int div = int_or_default(ci->params, id_HF_CLK_DIV, 128);
const float tol = 1.07f; // OSCA has +/-7% frequency tolerance, assume the worst case. const float tol = 1.07f; // OSCA has +/-7% frequency tolerance, assume the worst case.
set_period(ci, id_HFCLKOUT, delay_t((1.0e6 / 450) * (div + 1) / tol)); set_period(ci, id_HFCLKOUT, delay_t((1.0e6 / 450) * (div + 1) / tol));
set_period(ci, id_LFCLKOUT, delay_t((1.0e9 / 32) / tol)); set_period(ci, id_LFCLKOUT, delay_t((1.0e9 / 32) / tol));
} else if (ci->type == id_PLL_CORE) { } else if (ci->type == id_PLL_CORE) {
static const std::array<IdString, 6> div{id_DIVA, id_DIVB, id_DIVC, id_DIVD, id_DIVE, id_DIVF}; static const std::array<IdString, 6> div{id_DIVA, id_DIVB, id_DIVC, id_DIVD, id_DIVE, id_DIVF};
static const std::array<IdString, 6> output{id_CLKOP, id_CLKOS, id_CLKOS2, static const std::array<IdString, 6> output{id_CLKOP, id_CLKOS, id_CLKOS2,