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 2021-12-12 13:02:39 +00:00
parent 3c8af04ca5
commit 35feb7ebba
2 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nexus/main.cc
View File

@ -52,7 +52,8 @@ po::options_description NexusCommandHandler::getArchOptions()
specific.add_options()("pdc", po::value<std::string>(), "physical constraints file"); specific.add_options()("pdc", po::value<std::string>(), "physical constraints file");
specific.add_options()("no-post-place-opt", "disable post-place repacking (debugging use only)"); specific.add_options()("no-post-place-opt", "disable post-place repacking (debugging use only)");
specific.add_options()("no-pack-lutff", "disable packing (clustering) LUTs and FFs together"); specific.add_options()("no-pack-lutff", "disable packing (clustering) LUTs and FFs together");
specific.add_options()("carry-lutff-ratio", po::value<float>(), "ratio of FFs to be added to carry-chain LUT clusters"); specific.add_options()("carry-lutff-ratio", po::value<float>(),
"ratio of FFs to be added to carry-chain LUT clusters");
return specific; return specific;
} }

18
nexus/pack.cc
View File

@ -2304,7 +2304,8 @@ struct NexusPacker
} }
} }
FFControlSet gather_ff_settings(CellInfo* cell) { FFControlSet gather_ff_settings(CellInfo *cell)
{
NPNR_ASSERT(cell->type == id_OXIDE_FF); NPNR_ASSERT(cell->type == id_OXIDE_FF);
FFControlSet ctrlset; FFControlSet ctrlset;
@ -2321,7 +2322,8 @@ struct NexusPacker
return ctrlset; return ctrlset;
} }
void pack_lutffs () { void pack_lutffs()
{
log_info("Inferring LUT+FF pairs...\n"); log_info("Inferring LUT+FF pairs...\n");
float carry_ratio = 1.0f; float carry_ratio = 1.0f;
@ -2365,9 +2367,7 @@ struct NexusPacker
if (lut->type != id_OXIDE_COMB) { if (lut->type != id_OXIDE_COMB) {
continue; continue;
} }
if (di->driver.port != id_F && if (di->driver.port != id_F && di->driver.port != id_OFX) {
di->driver.port != id_OFX)
{
continue; continue;
} }
@ -2462,12 +2462,8 @@ struct NexusPacker
} }
// Print statistics // Print statistics
log_info(" Created %zu LUT+FF pairs and extended %zu clusters using total %zu FFs and %zu LUTs\n", log_info(" Created %zu LUT+FF pairs and extended %zu clusters using total %zu FFs and %zu LUTs\n", num_pair,
num_pair, num_glue, num_ff, num_comb);
num_glue,
num_ff,
num_comb
);
} }
explicit NexusPacker(Context *ctx) : ctx(ctx) {} explicit NexusPacker(Context *ctx) : ctx(ctx) {}