diff options
| author | Eddie Hung <eddieh@ece.ubc.ca> | 2018-11-13 12:12:26 -0800 |
|---|---|---|
| committer | Eddie Hung <eddieh@ece.ubc.ca> | 2018-11-13 12:12:26 -0800 |
| commit | 4134bfa78e9d56593ee306e482f778e5fc04f3d0 (patch) | |
| tree | b9417fd07f87fd564554b76071063696e8a2f026 /common/place_common.cc | |
| parent | 2d39cde17be718d76e6f5c06c8f06c70d44c7918 (diff) | |
| download | nextpnr-4134bfa78e9d56593ee306e482f778e5fc04f3d0.tar.gz nextpnr-4134bfa78e9d56593ee306e482f778e5fc04f3d0.tar.bz2 nextpnr-4134bfa78e9d56593ee306e482f778e5fc04f3d0.zip | |
[timing] Resolve another merge conflict
Diffstat (limited to 'common/place_common.cc')
| -rw-r--r-- | common/place_common.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/place_common.cc b/common/place_common.cc index 1c262c6f..04e9b7d0 100644 --- a/common/place_common.cc +++ b/common/place_common.cc @@ -36,8 +36,8 @@ wirelen_t get_net_metric(const Context *ctx, const NetInfo *net, MetricType type bool driver_gb = ctx->getBelGlobalBuf(driver_cell->bel); if (driver_gb) return 0; - IdString clock_port; - bool timing_driven = ctx->timing_driven && type == MetricType::COST && ctx->getPortTimingClass(driver_cell, net->driver.port, clock_port) != TMG_IGNORE; + int clock_count; + bool timing_driven = ctx->timing_driven && type == MetricType::COST && ctx->getPortTimingClass(driver_cell, net->driver.port, clock_count) != TMG_IGNORE; delay_t negative_slack = 0; delay_t worst_slack = std::numeric_limits<delay_t>::max(); Loc driver_loc = ctx->getBelLocation(driver_cell->bel); |