From 9c0fd6816eb2d5377cd59258a1d30ac00bfe1ba5 Mon Sep 17 00:00:00 2001 From: Eddie Hung Date: Fri, 7 Dec 2018 14:48:53 -0800 Subject: [PATCH] Add X back into predictDelay() for global resources --- xc7/delay.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xc7/delay.cc b/xc7/delay.cc index 722e6932..921f65d3 100644 --- a/xc7/delay.cc +++ b/xc7/delay.cc @@ -105,6 +105,7 @@ delay_t Arch::estimateDelay(WireId src, WireId dst) const const auto &dst_tw = torc_info->wire_to_tilewire[dst.index]; const auto &dst_loc = torc_info->tile_to_xy[dst_tw.getTileIndex()]; + auto abs_delta_x = abs(dst_loc.first - src_loc.first); if (!torc_info->wire_is_global[src.index] || torc_info->wire_is_global[dst.index]) { auto abs_delta_x = abs(dst_loc.first - src_loc.first); auto abs_delta_y = abs(dst_loc.second - src_loc.second); @@ -129,7 +130,7 @@ delay_t Arch::estimateDelay(WireId src, WireId dst) const src_y -= src_y % 50; dst_y -= dst_y % 50; auto abs_delta_y = abs(src_y - dst_y); - return abs_delta_y * 64; // arbitrary factor + return abs_delta_x + abs_delta_y; } }