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

router2: Add per-thread rng

Browse Source 
Signed-off-by: David Shah <dave@ds0.me>
This commit is contained in:
David Shah 2020-12-01 09:21:44 +00:00
parent 8b5c0dc1e4
commit b6c91d1621
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/router2.cc
View File

@ -254,6 +254,8 @@ struct Router2
std::queue<int> backwards_queue; std::queue<int> backwards_queue;
std::vector<int> dirty_wires; std::vector<int> dirty_wires;
DeterministicRNG rng;
}; };
enum ArcRouteResult enum ArcRouteResult
@ -628,7 +630,7 @@ struct Router2
next_score.togo_cost); next_score.togo_cost);
#endif #endif
// Add wire to queue if it meets criteria // Add wire to queue if it meets criteria
t.queue.push(QueuedWire(next_idx, dh, ctx->getPipLocation(dh), next_score, ctx->rng())); t.queue.push(QueuedWire(next_idx, dh, ctx->getPipLocation(dh), next_score, t.rng.rng()));
set_visited(t, next_idx, dh, next_score); set_visited(t, next_idx, dh, next_score);
if (next == dst_wire) { if (next == dst_wire) {
toexplore = std::min(toexplore, iter + 5); toexplore = std::min(toexplore, iter + 5);
@ -948,6 +950,7 @@ struct Router2
// Don't multithread if fewer than 200 nets (heuristic) // Don't multithread if fewer than 200 nets (heuristic)
if (route_queue.size() < 200) { if (route_queue.size() < 200) {
ThreadContext st; ThreadContext st;
st.rng.rngseed(ctx->rng64());
for (size_t j = 0; j < route_queue.size(); j++) { for (size_t j = 0; j < route_queue.size(); j++) {
route_net(st, nets_by_udata[route_queue[j]], false); route_net(st, nets_by_udata[route_queue[j]], false);
} }
@ -956,6 +959,9 @@ struct Router2
const int Nq = 4, Nv = 2, Nh = 2; const int Nq = 4, Nv = 2, Nh = 2;
const int N = Nq + Nv + Nh; const int N = Nq + Nv + Nh;
std::vector<ThreadContext> tcs(N + 1); std::vector<ThreadContext> tcs(N + 1);
for (auto &th : tcs) {
th.rng.rngseed(ctx->rng64());
}
for (auto n : route_queue) { for (auto n : route_queue) {
auto &nd = nets.at(n); auto &nd = nets.at(n);
auto ni = nets_by_udata.at(n); auto ni = nets_by_udata.at(n);