aboutsummaryrefslogtreecommitdiffstats
path: root/common/router2.cc
diff options
context:
space:
mode:
authorwhitequark <whitequark@whitequark.org>2020-05-23 19:50:09 +0000
committerwhitequark <whitequark@whitequark.org>2020-05-23 20:57:26 +0000
commite7bb04769d5d7262d3ecfd0de49953078174a880 (patch)
tree20100cd95832d9da3dcebcdb263ba5b05482ffe2 /common/router2.cc
parent2692c6f6cce41d22847058c85715e8822feb9b87 (diff)
downloadnextpnr-e7bb04769d5d7262d3ecfd0de49953078174a880.tar.gz
nextpnr-e7bb04769d5d7262d3ecfd0de49953078174a880.tar.bz2
nextpnr-e7bb04769d5d7262d3ecfd0de49953078174a880.zip
Port nextpnr-{ice40,ecp5} to WASI.
This involves very few changes, all typical to WASM ports: * WASM doesn't currently support threads or atomics so those are disabled. * WASM doesn't currently support exceptions so the exception machinery is stubbed out. * WASM doesn't (and can't) have mmap(), so an emulation library is used. That library currently doesn't support MAP_SHARED flags, so MAP_PRIVATE is used instead. There is also an update to bring ECP5 bbasm CMake rules to parity with iCE40 ones, since although it is possible to embed chipdb into nextpnr on WASM, a 200 MB WASM file has very few practical uses. The README is not updated and there is no included toolchain file because at the moment it's not possible to build nextpnr with upstream boost and wasi-libc. Boost requires a patch (merged, will be available in boost 1.74.0), wasi-libc requires a few unmerged patches.
Diffstat (limited to 'common/router2.cc')
-rw-r--r--common/router2.cc20
1 files changed, 17 insertions, 3 deletions
diff --git a/common/router2.cc b/common/router2.cc
index 26e78eaa..4dfd868b 100644
--- a/common/router2.cc
+++ b/common/router2.cc
@@ -33,7 +33,6 @@
#include <deque>
#include <fstream>
#include <queue>
-#include <thread>
#include "log.h"
#include "nextpnr.h"
#include "router1.h"
@@ -985,8 +984,22 @@ struct Router2
}
if (ctx->verbose)
log_info("%d/%d nets not multi-threadable\n", int(tcs.at(N).route_nets.size()), int(route_queue.size()));
+#ifdef NPNR_DISABLE_THREADS
+ // Singlethreaded routing - quadrants
+ for (int i = 0; i < Nq; i++) {
+ router_thread(tcs.at(i));
+ }
+ // Vertical splits
+ for (int i = Nq; i < Nq + Nv; i++) {
+ router_thread(tcs.at(i));
+ }
+ // Horizontal splits
+ for (int i = Nq + Nv; i < Nq + Nv + Nh; i++) {
+ router_thread(tcs.at(i));
+ }
+#else
// Multithreaded part of routing - quadrants
- std::vector<std::thread> threads;
+ std::vector<boost::thread> threads;
for (int i = 0; i < Nq; i++) {
threads.emplace_back([this, &tcs, i]() { router_thread(tcs.at(i)); });
}
@@ -1007,6 +1020,7 @@ struct Router2
for (auto &t : threads)
t.join();
threads.clear();
+#endif
// Singlethreaded part of routing - nets that cross partitions
// or don't fit within bounding box
for (auto st_net : tcs.at(N).route_nets)
@@ -1130,4 +1144,4 @@ Router2Cfg::Router2Cfg(Context *ctx)
perf_profile = ctx->setting<float>("router2/perfProfile", false);
}
-NEXTPNR_NAMESPACE_END \ No newline at end of file
+NEXTPNR_NAMESPACE_END