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

Fix use of getBudgetOverride in Timing::follow_net()

Browse Source
This commit is contained in:
Eddie Hung 2018-08-06 08:34:37 -07:00
parent 0f3459dbe5
commit 8e8ba0293c
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
common/timing.cc
View File

@ -48,22 +48,26 @@ struct Timing
delay_t follow_net(NetInfo *net, int path_length, delay_t slack) delay_t follow_net(NetInfo *net, int path_length, delay_t slack)
{ {
delay_t net_budget = slack / (path_length + 1); const delay_t default_budget = slack / (path_length + 1);
delay_t net_budget = default_budget;
for (auto &usr : net->users) { for (auto &usr : net->users) {
auto delay = net_delays ? ctx->getNetinfoRouteDelay(net, usr) : delay_t();
if (crit_path) if (crit_path)
current_path.push_back(&usr); current_path.push_back(&usr);
// If budget override is less than existing budget, then do not increment // If budget override exists, use that value and do not increment path_length
// path length auto budget = default_budget;
int pl = path_length + 1; if (ctx->getBudgetOverride(net, usr, budget)) {
auto budget = ctx->getBudgetOverride(net, usr, net_budget); if (update)
if (budget < net_budget) { usr.budget = std::min(usr.budget, budget);
net_budget = budget; budget = follow_user_port(usr, path_length, slack - budget);
pl = std::max(1, path_length); net_budget = std::min(net_budget, budget);
}
else {
budget = follow_user_port(usr, path_length + 1, slack - delay);
net_budget = std::min(net_budget, budget);
if (update)
usr.budget = std::min(usr.budget, delay + budget);
} }
auto delay = net_delays ? ctx->getNetinfoRouteDelay(net, usr) : delay_t();
net_budget = std::min(net_budget, follow_user_port(usr, pl, slack - delay));
if (update)
usr.budget = std::min(usr.budget, delay + net_budget);
if (crit_path) if (crit_path)
current_path.pop_back(); current_path.pop_back();
} }