caiyu/nextpnr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix tns computation

Browse Source
This commit is contained in:
Eddie Hung 2018-07-31 16:23:35 -07:00
parent a82f6f4105
commit 51956eb961
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/place_common.cc
View File

@ -39,6 +39,7 @@ wirelen_t get_net_metric(const Context *ctx, const NetInfo *net, MetricType type
driver_loc = ctx->getBelLocation(driver_cell->bel); driver_loc = ctx->getBelLocation(driver_cell->bel);
if (driver_gb) if (driver_gb)
return 0; return 0;
delay_t negative_slack = 0;
delay_t worst_slack = std::numeric_limits<delay_t>::max(); delay_t worst_slack = std::numeric_limits<delay_t>::max();
int xmin = driver_loc.x, xmax = driver_loc.x, ymin = driver_loc.y, ymax = driver_loc.y; int xmin = driver_loc.x, xmax = driver_loc.x, ymin = driver_loc.y, ymax = driver_loc.y;
for (auto load : net->users) { for (auto load : net->users) {
@ -51,7 +52,7 @@ wirelen_t get_net_metric(const Context *ctx, const NetInfo *net, MetricType type
delay_t net_delay = ctx->predictDelay(net, load); delay_t net_delay = ctx->predictDelay(net, load);
auto slack = load.budget - net_delay; auto slack = load.budget - net_delay;
if (slack < 0) if (slack < 0)
tns += slack; negative_slack += slack;
worst_slack = std::min(slack, worst_slack); worst_slack = std::min(slack, worst_slack);
} }
@ -70,7 +71,7 @@ wirelen_t get_net_metric(const Context *ctx, const NetInfo *net, MetricType type
wirelength = wirelen_t((ymax - ymin) + (xmax - xmin)); wirelength = wirelen_t((ymax - ymin) + (xmax - xmin));
} }
tns = ctx->getDelayNS(tns); tns += ctx->getDelayNS(negative_slack);
return wirelength; return wirelength;
} }