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

Merge pull request #794 from YosysHQ/gatecat/router2p5

Browse Source 
router2: Improved bidir routing and timing-driven ripup option
This commit is contained in:
gatecat 2021-08-16 14:08:20 +01:00 committed by GitHub
commit b37d133c43
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 449 additions and 437 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/command.cc
View File

@ -173,6 +173,8 @@ po::options_description CommandHandler::getGeneralOptions()
general.add_options()("router2-heatmap", po::value<std::string>(), general.add_options()("router2-heatmap", po::value<std::string>(),
"prefix for router2 resource congestion heatmaps"); "prefix for router2 resource congestion heatmaps");
general.add_options()("router2-tmg-ripup", "enable experimental timing-driven ripup in router2");
general.add_options()("report", po::value<std::string>(), general.add_options()("report", po::value<std::string>(),
"write timing and utilization report in JSON format to file"); "write timing and utilization report in JSON format to file");
@ -286,6 +288,8 @@ void CommandHandler::setupContext(Context *ctx)
ctx->settings[ctx->id("placerHeap/timingWeight")] = std::to_string(vm["placer-heap-timingweight"].as<int>()); ctx->settings[ctx->id("placerHeap/timingWeight")] = std::to_string(vm["placer-heap-timingweight"].as<int>());
if (vm.count("router2-heatmap")) if (vm.count("router2-heatmap"))
ctx->settings[ctx->id("router2/heatmap")] = vm["router2-heatmap"].as<std::string>(); ctx->settings[ctx->id("router2/heatmap")] = vm["router2-heatmap"].as<std::string>();
if (vm.count("router2-tmg-ripup"))
ctx->settings[ctx->id("router2/tmg_ripup")] = true;
// Setting default values // Setting default values
if (ctx->settings.find(ctx->id("target_freq")) == ctx->settings.end()) if (ctx->settings.find(ctx->id("target_freq")) == ctx->settings.end())

861
common/router2.cc
View File

File diff suppressed because it is too large Load Diff

21
common/timing.cc
View File

@ -269,6 +269,22 @@ void TimingAnalyser::setup_port_domains()
// If there are loops, repeat the process until a fixed point is reached, as there might be unusual ways to // If there are loops, repeat the process until a fixed point is reached, as there might be unusual ways to
// visit points, which would result in a missing domain key and therefore crash later on // visit points, which would result in a missing domain key and therefore crash later on
} while (have_loops && updated_domains); } while (have_loops && updated_domains);
for (auto &dp : domain_pairs) {
auto &launch_data = domains.at(dp.key.launch);
auto &capture_data = domains.at(dp.key.capture);
if (launch_data.key.clock != capture_data.key.clock)
continue;
IdString clk = launch_data.key.clock;
if (!ctx->nets.count(clk))
continue;
NetInfo *clk_net = ctx->nets.at(clk).get();
if (!clk_net->clkconstr)
continue;
delay_t period = clk_net->clkconstr->period.minDelay();
if (launch_data.key.edge != capture_data.key.edge)
period /= 2;
dp.period = DelayPair(period);
}
} }
void TimingAnalyser::reset_times() void TimingAnalyser::reset_times()
@ -457,11 +473,12 @@ void TimingAnalyser::compute_slack()
auto &dp = domain_pairs.at(pdp.first); auto &dp = domain_pairs.at(pdp.first);
auto &arr = pd.arrival.at(dp.key.launch); auto &arr = pd.arrival.at(dp.key.launch);
auto &req = pd.required.at(dp.key.capture); auto &req = pd.required.at(dp.key.capture);
pdp.second.setup_slack = dp.period.minDelay() - (arr.value.maxDelay() - req.value.minDelay()); pdp.second.setup_slack = 0 - (arr.value.maxDelay() - req.value.minDelay());
if (!setup_only) if (!setup_only)
pdp.second.hold_slack = arr.value.minDelay() - req.value.maxDelay(); pdp.second.hold_slack = arr.value.minDelay() - req.value.maxDelay();
pdp.second.max_path_length = arr.path_length + req.path_length; pdp.second.max_path_length = arr.path_length + req.path_length;
pd.worst_setup_slack = std::min(pd.worst_setup_slack, pdp.second.setup_slack); if (dp.key.launch == dp.key.capture)
pd.worst_setup_slack = std::min(pd.worst_setup_slack, dp.period.minDelay() + pdp.second.setup_slack);
dp.worst_setup_slack = std::min(dp.worst_setup_slack, pdp.second.setup_slack); dp.worst_setup_slack = std::min(dp.worst_setup_slack, pdp.second.setup_slack);
if (!setup_only) { if (!setup_only) {
pd.worst_hold_slack = std::min(pd.worst_hold_slack, pdp.second.hold_slack); pd.worst_hold_slack = std::min(pd.worst_hold_slack, pdp.second.hold_slack);