[feat] v0.6.1 from upstream (cyclone MSM)

.github/workflows/ci.yml

@@ -34,15 +34,36 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
+  compat:
+    if: github.event.pull_request.draft == false
+    name: Wasm-compatibility
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        target:
+          - wasm32-unknown-unknown
+          - wasm32-wasi
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions-rs/toolchain@v1
+
+      - name: Download WASM targets
+        run: rustup target add "${{ matrix.target }}"
+      # We run WASM build (for tests) which compiles the lib allowig us to have
+      # `getrandom` as a dev-dependency.
+      - name: Build
+        run: cargo build --tests --release --features "bn256-table derive_serde prefetch" --target "${{ matrix.target }}"
   test:
     if: github.event.pull_request.draft == false
     name: Test
     runs-on: ubuntu-latest
     strategy:
       matrix:
         include:
-          - feature:
           - feature: default
+          - feature: bn256-table
+          - feature: derive_serde
+          - feature: asm
     steps:
       - uses: actions/checkout@v2
       - uses: actions-rs/toolchain@v1

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "halo2curves-axiom"
-version = "0.5.3"
+version = "0.6.1"
 authors = ["Privacy Scaling Explorations team", "Taiko Labs", "Intrinsic Technologies"]
 license = "MIT/Apache-2.0"
 edition = "2021"
@@ -19,6 +19,11 @@ hex = "0.4"
 rand_chacha = "0.3.1"
 sha3 = "0.10.8"
 
+# Added to make sure we are able to build the lib in the CI.
+# Notice this will never be loaded for someone using this lib as dep.
+[target.'cfg(all(target_arch = "wasm32", target_os = "unknown"))'.dev-dependencies]
+getrandom = { version = "0.2", features = ["js"] }
+
 [dependencies]
 subtle = "2.4"
 ff = { version = "0.13.0", default-features = false, features = ["std"] }
@@ -36,13 +41,13 @@ serde = { version = "1.0", default-features = false, optional = true }
 serde_arrays = { version = "0.1.0", optional = true }
 hex = { version = "0.4", optional = true, default-features = false, features = ["alloc", "serde"] }
 blake2b_simd = "1"
-maybe-rayon = { version = "0.1.0", default-features = false }
+rayon = "1.8"
 digest = "0.10.7"
 sha2 = "0.10.8"
+unroll = "0.1.5"
 
 [features]
-default = ["bits", "multicore", "bn256-table", "derive_serde"]
-multicore = ["maybe-rayon/threads"]
+default = ["bits", "bn256-table", "derive_serde"]
 asm = []
 bits = ["ff/bits"]
 bn256-table = []

README.md

@@ -13,6 +13,19 @@ The implementations were originally ported from [matterlabs/pairing](https://git
 * Various features related to serialization and deserialization of curve points and field elements.
 * Curve-specific optimizations and benchmarking capabilities.
 
+## Controlling parallelism
+
+`halo2curves` currently uses [rayon](https://github.com/rayon-rs/rayon) for parallel
+computation. 
+
+The `RAYON_NUM_THREADS` environment variable can be used to set the number of
+threads.
+
+When compiling to WASM-targets, notice that since version `1.7`, `rayon` will fallback automatically (with no need to handle features) to require `getrandom` in order to be able to work.
+For more info related to WASM-compilation.
+
+See: [Rayon: Usage with WebAssembly](https://github.com/rayon-rs/rayon#usage-with-webassembly) for more info.  
+
 ## Benchmarks
 
 Benchmarking is supported through the use of Rust's built-in test framework. Benchmarks can be run without assembly optimizations:

rust-toolchain

@@ -1 +1 @@
-1.70.0
+1.74.0

src/arithmetic.rs

@@ -45,6 +45,30 @@ pub(crate) const fn macx(a: u64, b: u64, c: u64) -> (u64, u64) {
     (res as u64, (res >> 64) as u64)
 }
 
+/// Returns a >= b
+#[inline(always)]
+pub(crate) const fn bigint_geq(a: &[u64; 4], b: &[u64; 4]) -> bool {
+    if a[3] > b[3] {
+        return true;
+    } else if a[3] < b[3] {
+        return false;
+    }
+    if a[2] > b[2] {
+        return true;
+    } else if a[2] < b[2] {
+        return false;
+    }
+    if a[1] > b[1] {
+        return true;
+    } else if a[1] < b[1] {
+        return false;
+    }
+    if a[0] >= b[0] {
+        return true;
+    }
+    false
+}
+
 /// Compute a * b, returning the result.
 #[inline(always)]
 pub(crate) fn mul_512(a: [u64; 4], b: [u64; 4]) -> [u64; 8] {

src/bn256/fq.rs

@@ -3,7 +3,7 @@ use crate::bn256::assembly::field_arithmetic_asm;
 #[cfg(not(feature = "asm"))]
 use crate::{arithmetic::macx, field_arithmetic, field_specific};
 
-use crate::arithmetic::{adc, mac, sbb};
+use crate::arithmetic::{adc, bigint_geq, mac, sbb};
 use crate::extend_field_legendre;
 use crate::ff::{FromUniformBytes, PrimeField, WithSmallOrderMulGroup};
 use crate::{

src/bn256/fr.rs

@@ -18,7 +18,7 @@ pub use table::FR_TABLE;
 #[cfg(not(feature = "bn256-table"))]
 use crate::impl_from_u64;
 
-use crate::arithmetic::{adc, mac, sbb};
+use crate::arithmetic::{adc, bigint_geq, mac, sbb};
 use crate::extend_field_legendre;
 use crate::ff::{FromUniformBytes, PrimeField, WithSmallOrderMulGroup};
 use crate::{