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 2023-01-02 09:33:11 +01:00
parent 5cea801a2f
commit f89b959b5f
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/kernel/command.cc
View File

@ -190,7 +190,8 @@ po::options_description CommandHandler::getGeneralOptions()
"placer heap criticality exponent (int, default: 2)");
general.add_options()("placer-heap-timingweight", po::value<int>(), "placer heap timing weight (int, default: 10)");
general.add_options()("placer-heap-cell-placement-timeout", po::value<int>(),
"allow placer to attempt up to max(10000, total cells^2 / N) iterations to place a cell (int N, default: 8, 0 for no timeout)");
"allow placer to attempt up to max(10000, total cells^2 / N) iterations to place a cell (int "
"N, default: 8, 0 for no timeout)");
#if !defined(__wasm)
general.add_options()("parallel-refine", "use new experimental parallelised engine for placement refinement");
@ -332,7 +333,7 @@ void CommandHandler::setupContext(Context *ctx)
if (vm.count("placer-heap-cell-placement-timeout"))
ctx->settings[ctx->id("placerHeap/cellPlacementTimeout")] =
std::to_string(std::max(0, vm["placer-heap-cell-placement-timeout"].as<int>()));
std::to_string(std::max(0, vm["placer-heap-cell-placement-timeout"].as<int>()));
if (vm.count("parallel-refine"))
ctx->settings[ctx->id("placerHeap/parallelRefine")] = true;

7
common/place/placer_heap.cc
View File

@ -219,7 +219,8 @@ class HeAPPlacer
heap_runs.push_back(all_buckets);
// The main HeAP placer loop
if (cfg.cell_placement_timeout > 0)
log_info("Running main analytical placer, max placement attempts per cell = %d.\n", cfg.cell_placement_timeout);
log_info("Running main analytical placer, max placement attempts per cell = %d.\n",
cfg.cell_placement_timeout);
else
log_info("Running main analytical placer.\n");
while (stalled < 5 && (solved_hpwl <= legal_hpwl * 0.8)) {
@ -887,7 +888,9 @@ class HeAPPlacer
while (!placed) {
if (cfg.cell_placement_timeout > 0 && total_iters_for_cell > cfg.cell_placement_timeout)
log_error("Unable to find legal placement for cell '%s' after %d attempts, check constraints and utilisation. Use `--placer-heap-cell-placement-timeout` to change the number of attempts.\n",
log_error("Unable to find legal placement for cell '%s' after %d attempts, check constraints and "
"utilisation. Use `--placer-heap-cell-placement-timeout` to change the number of "
"attempts.\n",
ctx->nameOf(ci), total_iters_for_cell);
// Determine a search radius around the solver location (which increases over time) that is clamped to