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

router2: fix 8935c186 (again)

Browse Source
This commit is contained in:
Lofty 2023-06-19 11:19:42 +01:00 committed by myrtle
parent 6c0b4443d5
commit cbd6496d35
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/route/router2.cc
View File

@ -31,9 +31,9 @@
#include <algorithm> #include <algorithm>
#include <boost/container/flat_map.hpp> #include <boost/container/flat_map.hpp>
#include <chrono> #include <chrono>
#include <cmath>
#include <deque> #include <deque>
#include <fstream> #include <fstream>
#include <limits>
#include <queue> #include <queue>
#include <set> #include <set>
@ -710,7 +710,7 @@ struct Router2
auto curr = t.fwd_queue.top(); auto curr = t.fwd_queue.top();
t.fwd_queue.pop(); t.fwd_queue.pop();
++explored; ++explored;
if (was_visited_bwd(curr.wire, FLT_MAX)) { if (was_visited_bwd(curr.wire, std::numeric_limits<float>::max())) {
// Meet in the middle; done // Meet in the middle; done
midpoint_wire = curr.wire; midpoint_wire = curr.wire;
break; break;
@ -754,7 +754,7 @@ struct Router2
auto curr = t.bwd_queue.top(); auto curr = t.bwd_queue.top();
t.bwd_queue.pop(); t.bwd_queue.pop();
++explored; ++explored;
if (was_visited_fwd(curr.wire, FLT_MAX)) { if (was_visited_fwd(curr.wire, std::numeric_limits<float>::max())) {
// Meet in the middle; done // Meet in the middle; done
midpoint_wire = curr.wire; midpoint_wire = curr.wire;
break; break;
@ -804,7 +804,7 @@ struct Router2
if (midpoint_wire != -1) { if (midpoint_wire != -1) {
ROUTE_LOG_DBG(" Routed (explored %d wires): ", explored); ROUTE_LOG_DBG(" Routed (explored %d wires): ", explored);
int cursor_bwd = midpoint_wire; int cursor_bwd = midpoint_wire;
while (was_visited_fwd(cursor_bwd, FLT_MAX)) { while (was_visited_fwd(cursor_bwd, std::numeric_limits<float>::max())) {
PipId pip = flat_wires.at(cursor_bwd).pip_fwd; PipId pip = flat_wires.at(cursor_bwd).pip_fwd;
if (pip == PipId() && cursor_bwd != src_wire_idx) if (pip == PipId() && cursor_bwd != src_wire_idx)
break; break;
@ -843,7 +843,7 @@ struct Router2
NPNR_ASSERT(cursor_bwd == src_wire_idx); NPNR_ASSERT(cursor_bwd == src_wire_idx);
int cursor_fwd = midpoint_wire; int cursor_fwd = midpoint_wire;
while (was_visited_bwd(cursor_fwd, FLT_MAX)) { while (was_visited_bwd(cursor_fwd, std::numeric_limits<float>::max())) {
PipId pip = flat_wires.at(cursor_fwd).pip_bwd; PipId pip = flat_wires.at(cursor_fwd).pip_bwd;
if (pip == PipId()) { if (pip == PipId()) {
break; break;