feat: integrate blst backend and proof verification optimizations

Author: dignifiedquire

.circleci/config.yml

@@ -29,6 +29,7 @@ jobs:
             - cargo-v28-{{ checksum "rust-toolchain" }}-{{ checksum "Cargo.toml" }}-{{ checksum "Cargo.lock" }}-{{ arch }}
       - run: rustup install $(cat rust-toolchain)
       - run: rustup default $(cat rust-toolchain)
+      - run: rustup install nightly
       - run: rustup component add rustfmt-preview
       - run: rustup component add clippy
       - run: cargo update
@@ -127,9 +128,10 @@ jobs:
             RUST_TEST_THREADS: 1
           no_output_timeout: 30m
 
-  # Running with `use_fil_blst=true` should be integrated directly into the test code. For now we
-  # just re-run the tests that exercise the fil-blst code path with that setting set.
-  test_fil_blst:
+
+  # Running with `use_multicore_sdr=true` should be integrated directly into the test code. For now we
+  # just re-run the lifecycle tests to exercise the use_multicore_sdr code path with that setting set.
+  test_multicore_sdr:
     docker:
       - image: filecoin/rust:latest
     working_directory: /mnt/crate
@@ -144,19 +146,28 @@ jobs:
             - cargo-v28-{{ checksum "rust-toolchain" }}-{{ checksum "Cargo.toml" }}-{{ checksum "Cargo.lock" }}-{{ arch }}
       - restore_parameter_cache
       - run:
-          name: Test with fil-blst enabled
+          name: Test with use_multicore_sdr pairing enabled
           command: |
             ulimit -n 20000
             ulimit -u 20000
             ulimit -n 20000
-            cargo +$(cat rust-toolchain) test --verbose --release --test api -- --ignored
+            cargo +nightly -Zpackage-features test --all --verbose --release --test api -- --ignored lifecycle
           environment:
             RUST_TEST_THREADS: 1
-            FIL_PROOFS_USE_FIL_BLST: true
+            FIL_PROOFS_USE_MULTICORE_SDR: true
 
-  # Running with `use_multicore_sdr=true` should be integrated directly into the test code. For now we
-  # just re-run the lifecycle tests to exercise the use_multicore_sdr code path with that setting set.
-  test_multicore_sdr:
+      - run:
+          name: Test with use_multicore_sdr and blst enabled
+          command: |
+            ulimit -n 20000
+            ulimit -u 20000
+            ulimit -n 20000
+            cargo +nightly -Zpackage-features test --all --no-default-features --features gpu,blst --verbose --release --test api -- --ignored lifecycle
+          environment:
+            RUST_TEST_THREADS: 1
+            FIL_PROOFS_USE_MULTICORE_SDR: true
+
+  test_blst:
     docker:
       - image: filecoin/rust:latest
     working_directory: /mnt/crate
@@ -171,15 +182,23 @@ jobs:
             - cargo-v28-{{ checksum "rust-toolchain" }}-{{ checksum "Cargo.toml" }}-{{ checksum "Cargo.lock" }}-{{ arch }}
       - restore_parameter_cache
       - run:
-          name: Test with use_multicore_sdr enabled
+          name: Test ignored with blst enabled 
           command: |
             ulimit -n 20000
             ulimit -u 20000
             ulimit -n 20000
-            cargo +$(cat rust-toolchain) test --verbose --release -- --ignored lifecycle
+            cargo +nightly -Zpackage-features test --all --no-default-features --features gpu,blst --verbose --release --test api -- --ignored
           environment:
             RUST_TEST_THREADS: 1
-            FIL_PROOFS_USE_MULTICORE_SDR: true
+
+      - run:
+          name: Test with blst enabled 
+          command: |
+            ulimit -n 20000
+            ulimit -u 20000
+            ulimit -n 20000
+            cargo +nightly -Zpackage-features test --all --no-default-features --features gpu,blst --verbose
+
 
   bench:
     docker:
@@ -415,11 +434,12 @@ workflows:
           requires:
             - cargo_fetch
             - ensure_groth_parameters_and_keys_linux
-      - test_fil_blst:
+
+      - test_multicore_sdr:
           requires:
             - cargo_fetch
             - ensure_groth_parameters_and_keys_linux
-      - test_multicore_sdr:
+      - test_blst:
           requires:
             - cargo_fetch
             - ensure_groth_parameters_and_keys_linux

fil-proofs-tooling/Cargo.toml

@@ -10,6 +10,8 @@ repository = "https://github.com/filecoin-project/rust-fil-proofs"
 readme = "README.md"
 
 [dependencies]
+storage-proofs = { path = "../storage-proofs", default-features = false }
+filecoin-proofs = { path = "../filecoin-proofs", default-features = false }
 clap = "2"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
@@ -20,38 +22,36 @@ regex = "1.3.7"
 commandspec = "0.12.2"
 chrono = { version = "0.4.7", features = ["serde"] }
 memmap = "0.7.0"
-bellperson = "0.9.1"
-paired = "0.20.0"
+bellperson = { version = "0.11", default-features = false }
 rand = "0.7"
-storage-proofs = { path = "../storage-proofs"}
-filecoin-proofs = { path = "../filecoin-proofs"}
 tempfile = "3.0.8"
 cpu-time = "1.0.0"
 git2 = "0.13.6"
-heim = { version = "0.1.0-beta.1", features = ["host", "memory", "cpu"] }
+heim = { git = "https://github.com/heim-rs/heim", rev = "e22e235", features = ["host", "memory", "cpu"] }
 async-std = "1.6"
 blake2s_simd = "0.5.6"
 fil_logger = "0.1"
 log = "0.4.8"
-uom = "0.28"
+uom = "0.30"
 merkletree = "0.21.0"
 bincode = "1.1.2"
 anyhow = "1.0.23"
 ff = { version = "0.2.3", package = "fff" }
 rand_xorshift = "0.2.0"
 bytefmt = "0.1.7"
 rayon = "1.3.0"
-flexi_logger = "0.14.7"
+flexi_logger = "0.16.1"
 typenum = "1.11.2"
-generic-array = "0.13.2"
+generic-array = "0.14.4"
 byte-unit = "4.0.9"
 
 [features]
 default = ["gpu", "measurements"]
 gpu = ["storage-proofs/gpu", "filecoin-proofs/gpu", "bellperson/gpu"]
 measurements = ["storage-proofs/measurements"]
 profile = ["storage-proofs/profile", "measurements"]
-
+pairing = ["storage-proofs/pairing", "filecoin-proofs/pairing", "bellperson/pairing"]
+blst = ["storage-proofs/blst", "filecoin-proofs/blst", "bellperson/blst"]
 
 [target.'cfg(target_arch = "x86_64")'.dependencies]
-raw-cpuid = "7.0.3"
+raw-cpuid = "8.1.2"