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

made higher estimate and use proper speed

Browse Source
This commit is contained in:
Miodrag Milanovic 2023-09-28 14:16:34 +02:00 committed by myrtle
parent c2e7d3d611
commit f0325730a8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
machxo2/arch.cc
View File

@ -70,7 +70,7 @@ static void get_chip_info(std::string device, const ChipInfoPOD **chip_info, con
*package_info = nullptr; *package_info = nullptr;
*package_name = pkg.name.get(); *package_name = pkg.name.get();
*device_name = chip.name.get(); *device_name = chip.name.get();
*device_speed = speedgrade.index; *device_speed = speedgrade.speed;
*speed_grade = &(db_ptr->get()->speed_grades[speedgrade.index]); *speed_grade = &(db_ptr->get()->speed_grades[speedgrade.index]);
for (auto &pi : db_ptr->get()->package_info) { for (auto &pi : db_ptr->get()->package_info) {
if (pkg.name.get() == pi.name.get()) { if (pkg.name.get() == pi.name.get()) {
@ -404,7 +404,7 @@ delay_t Arch::estimateDelay(WireId src, WireId dst) const
int dx = abs(src_loc.first - dst_loc.first), dy = abs(src_loc.second - dst_loc.second); int dx = abs(src_loc.first - dst_loc.first), dy = abs(src_loc.second - dst_loc.second);
return (120 - 22 * device_speed) * return (500 - 22 * device_speed) *
(6 + std::max(dx - 5, 0) + std::max(dy - 5, 0) + 2 * (std::min(dx, 5) + std::min(dy, 5))); (6 + std::max(dx - 5, 0) + std::max(dy - 5, 0) + 2 * (std::min(dx, 5) + std::min(dy, 5)));
} }
@ -482,7 +482,7 @@ delay_t Arch::predictDelay(BelId src_bel, IdString src_pin, BelId dst_bel, IdStr
int dx = abs(driver_loc.x - sink_loc.x), dy = abs(driver_loc.y - sink_loc.y); int dx = abs(driver_loc.x - sink_loc.x), dy = abs(driver_loc.y - sink_loc.y);
return (120 - 22 * device_speed) * return (500 - 22 * device_speed) *
(3 + std::max(dx - 5, 0) + std::max(dy - 5, 0) + 2 * (std::min(dx, 5) + std::min(dy, 5))); (3 + std::max(dx - 5, 0) + std::max(dy - 5, 0) + 2 * (std::min(dx, 5) + std::min(dy, 5)));
} }