diff options
| author | Eddie Hung <eddieh@ece.ubc.ca> | 2018-08-05 22:55:58 -0700 |
|---|---|---|
| committer | Eddie Hung <eddieh@ece.ubc.ca> | 2018-08-05 22:55:58 -0700 |
| commit | f048deb33dcc1f334fbe54877bdeb4ce4a5ca35d (patch) | |
| tree | b4f20bbbb207a53b9cba48c19d5aa6a81696c28a | |
| parent | 6c8319e29a68d8d54b747e95c3f4a8df8a14d3ba (diff) | |
| download | nextpnr-f048deb33dcc1f334fbe54877bdeb4ce4a5ca35d.tar.gz nextpnr-f048deb33dcc1f334fbe54877bdeb4ce4a5ca35d.tar.bz2 nextpnr-f048deb33dcc1f334fbe54877bdeb4ce4a5ca35d.zip | |
Restore initial assign_budget() call after pack(), restrict call after initial_placement to slack_redist
| -rw-r--r-- | common/placer1.cc | 3 | ||||
| -rw-r--r-- | ice40/main.cc | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/common/placer1.cc b/common/placer1.cc index 4ba0f3cf..1d00e77a 100644 --- a/common/placer1.cc +++ b/common/placer1.cc @@ -138,7 +138,8 @@ class SAPlacer if ((placed_cells - constr_placed_cells) % 500 != 0) log_info(" initial placement placed %d/%d cells\n", int(placed_cells - constr_placed_cells), int(autoplaced.size())); - assign_budget(ctx); + if (ctx->slack_redist_iter > 0) + assign_budget(ctx); ctx->yield(); log_info("Running simulated annealing placer.\n"); diff --git a/ice40/main.cc b/ice40/main.cc index 358bf3c5..78236af1 100644 --- a/ice40/main.cc +++ b/ice40/main.cc @@ -366,6 +366,7 @@ int main(int argc, char *argv[]) if (!ctx->pack() && !ctx->force) log_error("Packing design failed.\n"); + assign_budget(ctx.get()); ctx->check(); print_utilisation(ctx.get()); if (!vm.count("pack-only")) { |