Multicore improvements #69

str4d · 2021-06-01T01:10:31Z

Cherry-picked from https://github.com/filecoin-project/bellperson

Part of #7.
Closes #21.

str4d · 2021-06-01T01:36:50Z

Ignore the clippy errors and warnings; they are being addressed separately.

CHANGELOG.md

src/multicore.rs

daira · 2021-06-01T10:45:04Z

src/multicore.rs

-        type Item = T;
-        type Error = E;
+    impl<T> Waiter<T> {
+        /// Wait for the result.


As far as I can see, this is inaccurate: std::Option::take will never wait.

It won't, but this is emulating the threaded API. Both instances are effectively blocking, one just blocks for longer.

src/multicore.rs

daira

utACK with suggestions.

src/multicore.rs

…CPUS (cherry picked from commit 37686f8)

Uses the existing env variable to restrict the number of threads used for parallel proving. Cleaned up version of #81 (cherry picked from commit 0c1868d) pick: - Only the changes to bellman::multicore. - Added lazy_static and rayon dependencies.

(cherry picked from commit dca4c5a) pick: Only the changes to bellman::multicore.

(cherry picked from commit c55d5e4) Changes during pick: - Excluded GPU-related changes (not upstreamed yet). - Added fix for change to Field::double API. - Fixed no-multicore Worker impl. Co-authored-by: Jack Grigg <thestr4d@gmail.com>

If a waiter is used from within a thread pool it might deadlock. Don't do that. (cherry picked from commit dc13606)

The Worker/Waiter model creates a Worker that requests that threads be spawned to complete some work. Since there is no bound to the number of requests for work, it's possible to exhaust memory with pending closures waiting to be processed. This was not an issue when 'everything was bounded by a single thread pool', however that setup has race conditions built into it. We have recently spent time splitting that model out, and this should be the final step required. This code places a limit on the number of requests that can be queued in an attempt to lessen the chance of memory exhaustion due to pending requests. It does this by placing a limit that is a simple multiple of the number of cores available (and in testing is far below observed crash criteria). When the number of requests for spawning new threads reaches that limit, instead of adding a new request, we block on execution to help clear the backlog. (cherry picked from commit 74947c0) pick: Also includes log change from b481a34

(cherry picked from commit 007487f)

…dpool This occurring is a programming error. Co-authored-by: Daira Hopwood <daira@jacaranda.org>

Co-authored-by: Daira Hopwood <daira@jacaranda.org>

str4d · 2021-06-04T21:26:25Z

Rebased on 0.10.

daira

utACK

Cargo.toml

Signed-off-by: Daira Hopwood <daira@jacaranda.org>

… is expected to play more nicely with other uses of rayon in the same process (avoiding excess parallelism). Signed-off-by: Daira Hopwood <daira@jacaranda.org>

Signed-off-by: Daira Hopwood <daira@jacaranda.org>

daira

utACK with suggested changes in #71.

CHANGELOG.md

src/multicore.rs

Co-authored-by: str4d <thestr4d@gmail.com>

…icore) implementation. Signed-off-by: Daira Hopwood <daira@jacaranda.org>

Use global rayon threadpool for multicore

str4d

utACK mod comment

src/multicore.rs

daira

utACK (modulo @str4d's suggested change to a comment).

src/multiexp.rs

str4d requested a review from ebfull June 1, 2021 01:10

str4d mentioned this pull request Jun 1, 2021

External control of thread usage, memory usage, progress indicators #7

Open

daira reviewed Jun 1, 2021

View reviewed changes

CHANGELOG.md Outdated Show resolved Hide resolved

daira reviewed Jun 1, 2021

View reviewed changes

src/multicore.rs Outdated Show resolved Hide resolved

daira reviewed Jun 1, 2021

View reviewed changes

src/multicore.rs Outdated Show resolved Hide resolved

daira reviewed Jun 1, 2021

View reviewed changes

src/multicore.rs Outdated Show resolved Hide resolved

daira reviewed Jun 1, 2021

View reviewed changes

src/multicore.rs Outdated Show resolved Hide resolved

daira reviewed Jun 1, 2021

View reviewed changes

src/multicore.rs Show resolved Hide resolved

daira reviewed Jun 1, 2021

View reviewed changes

src/multicore.rs Outdated Show resolved Hide resolved

daira approved these changes Jun 1, 2021

View reviewed changes

daira reviewed Jun 1, 2021

View reviewed changes

src/multicore.rs Outdated Show resolved Hide resolved

str4d commented Jun 1, 2021

View reviewed changes

src/multicore.rs Outdated Show resolved Hide resolved

daira reviewed Jun 1, 2021

View reviewed changes

src/multicore.rs Outdated Show resolved Hide resolved

str4d force-pushed the fil-multicore branch from 46dcfe3 to e674d2d Compare June 1, 2021 12:53

dignifiedquire and others added 14 commits June 4, 2021 22:23

feat: allow controll of the maximum number of cpus using BELLMAN_NUM_…

d90bb21

…CPUS (cherry picked from commit 37686f8)

fix: only spawn threads into a pool, to avoid unlimited thread spawns

4970b8f

(cherry picked from commit dca4c5a) pick: Only the changes to bellman::multicore.

chore: log error if waiter is used within a thread pool

4d85780

If a waiter is used from within a thread pool it might deadlock. Don't do that. (cherry picked from commit dc13606)

style: remove verbose logging

103113a

(cherry picked from commit 007487f)

Bump crossbeam-channel dependence

360788d

multicore: Simplify NUM_CPUS definition

9f05fec

Update changelog with multicore changes

d7ec539

CI: Build for wasm32-wasi target to ensure no-multicore works

510b908

Remove broken intra-doc link

6e9f575

multicore: Unconditionally panic if Waiter::wait is called from threa…

22caab9

…dpool This occurring is a programming error. Co-authored-by: Daira Hopwood <daira@jacaranda.org>

multicore: Code simplification

a4b4e14

Co-authored-by: Daira Hopwood <daira@jacaranda.org>

multicore: Documentation tweaks

7d81964

Co-authored-by: Daira Hopwood <daira@jacaranda.org>

str4d force-pushed the fil-multicore branch from e674d2d to 7d81964 Compare June 4, 2021 21:26

daira approved these changes Jun 5, 2021

View reviewed changes

daira reviewed Aug 15, 2021

View reviewed changes

Cargo.toml Outdated Show resolved Hide resolved

daira added 3 commits August 15, 2021 09:56

Update dependencies.

6916c3b

Signed-off-by: Daira Hopwood <daira@jacaranda.org>

Use global threadpool unless we exceed WORKER_SPAWN_MAX_COUNT. This…

1815042

… is expected to play more nicely with other uses of rayon in the same process (avoiding excess parallelism). Signed-off-by: Daira Hopwood <daira@jacaranda.org>

Rename multicore::log_num_cpus to log_num_threads.

1e39743

Signed-off-by: Daira Hopwood <daira@jacaranda.org>

daira reviewed Aug 15, 2021

View reviewed changes

CHANGELOG.md Outdated Show resolved Hide resolved

src/multicore.rs Outdated Show resolved Hide resolved

daira mentioned this pull request Aug 25, 2021

Use global rayon threadpool for multicore #71

Merged

daira and others added 4 commits August 25, 2021 16:56

Relax dependencies for log and num_cpus

313245b

Simplify by removing the overflow thread pool

e3a4ea6

Co-authored-by: str4d <thestr4d@gmail.com>

Bugfix: log_num_cpus should be renamed also for the dummy (non-mult…

a94da42

…icore) implementation. Signed-off-by: Daira Hopwood <daira@jacaranda.org>

Merge pull request #71 from daira/daira-multicore

6af1fcf

Use global rayon threadpool for multicore

str4d commented Aug 26, 2021

View reviewed changes

src/multicore.rs Outdated Show resolved Hide resolved

daira approved these changes Aug 27, 2021

View reviewed changes

Fix code comment after switch to global threadpool

5e68a2e

ebfull approved these changes Sep 2, 2021

View reviewed changes

src/multiexp.rs Outdated Show resolved Hide resolved

Remove println! statements from test

2c96556

str4d merged commit e6b2fd8 into main Sep 2, 2021

str4d deleted the fil-multicore branch September 2, 2021 17:48

str4d mentioned this pull request Jan 31, 2022

bellman: remove deprecated and unmaintained futures_cpupool zcash/librustzcash#263

Closed

r0wdy1 mentioned this pull request May 5, 2022

Parallel proof creation in ZeroPool zkBob/fawkes-crypto#1

Closed

eigmax mentioned this pull request Apr 29, 2023

Multithread support for plonkjs 0xEigenLabs/plonkjs#8

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Multicore improvements #69

Multicore improvements #69

str4d commented Jun 1, 2021 •

edited

Loading

str4d commented Jun 1, 2021

daira Jun 1, 2021 •

edited

Loading

str4d Jun 1, 2021

daira left a comment

str4d commented Jun 4, 2021

daira left a comment

daira left a comment

str4d left a comment

daira left a comment

Multicore improvements #69

Multicore improvements #69

Conversation

str4d commented Jun 1, 2021 • edited Loading

str4d commented Jun 1, 2021

daira Jun 1, 2021 • edited Loading

Choose a reason for hiding this comment

str4d Jun 1, 2021

Choose a reason for hiding this comment

daira left a comment

Choose a reason for hiding this comment

str4d commented Jun 4, 2021

daira left a comment

Choose a reason for hiding this comment

daira left a comment

Choose a reason for hiding this comment

str4d left a comment

Choose a reason for hiding this comment

daira left a comment

Choose a reason for hiding this comment

str4d commented Jun 1, 2021 •

edited

Loading

daira Jun 1, 2021 •

edited

Loading