diff options
| author | David Shah <dave@ds0.me> | 2019-07-03 12:39:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-03 12:39:38 +0100 |
| commit | 8f2813279c5888e655ee6f50f198cf8cb11b0b50 (patch) | |
| tree | 0aac9464d3ea87d37cd0689903ba08094b7c0984 /common/placer_heap.cc | |
| parent | ff958830d1097b9bfa3c3b34094e671741ef563d (diff) | |
| parent | e27dc41a7646fd3377d2400059c916fbcc35119c (diff) | |
| download | nextpnr-8f2813279c5888e655ee6f50f198cf8cb11b0b50.tar.gz nextpnr-8f2813279c5888e655ee6f50f198cf8cb11b0b50.tar.bz2 nextpnr-8f2813279c5888e655ee6f50f198cf8cb11b0b50.zip | |
Merge pull request #284 from YosysHQ/json_write
Initial support for writing to json files from nextpnr.
Diffstat (limited to 'common/placer_heap.cc')
| -rw-r--r-- | common/placer_heap.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/common/placer_heap.cc b/common/placer_heap.cc index f9b639f8..cd800085 100644 --- a/common/placer_heap.cc +++ b/common/placer_heap.cc @@ -234,7 +234,7 @@ class HeAPPlacer std::chrono::duration<double>(run_stopt - run_startt).count()); } - if (ctx->timing_driven) + if (cfg.timing_driven) get_criticalities(ctx, &net_crit); if (legal_hpwl < best_hpwl) { @@ -1516,11 +1516,12 @@ int HeAPPlacer::CutSpreader::seq = 0; bool placer_heap(Context *ctx, PlacerHeapCfg cfg) { return HeAPPlacer(ctx, cfg).place(); } -PlacerHeapCfg::PlacerHeapCfg(Context *ctx) : Settings(ctx) +PlacerHeapCfg::PlacerHeapCfg(Context *ctx) { - alpha = get<float>("placerHeap/alpha", 0.1); - criticalityExponent = get<int>("placerHeap/criticalityExponent", 2); - timingWeight = get<int>("placerHeap/timingWeight", 10); + alpha = ctx->setting<float>("placerHeap/alpha", 0.1); + criticalityExponent = ctx->setting<int>("placerHeap/criticalityExponent", 2); + timingWeight = ctx->setting<int>("placerHeap/timingWeight", 10); + timing_driven = ctx->setting<bool>("timing_driven"); } NEXTPNR_NAMESPACE_END @@ -1538,7 +1539,7 @@ bool placer_heap(Context *ctx, PlacerHeapCfg cfg) return false; } -PlacerHeapCfg::PlacerHeapCfg(Context *ctx) : Settings(ctx) {} +PlacerHeapCfg::PlacerHeapCfg(Context *ctx) {} NEXTPNR_NAMESPACE_END |