Update to new benchmarking framework (#126)

arkworks-rs · Sep 10, 2022 · 363426c · 363426c
1 parent 55a092a
commit 363426c
Show file tree

Hide file tree

Showing 42 changed files with 244 additions and 448 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -103,7 +103,6 @@ jobs:
         exclude:
           - dir: scripts/
           - dir: curve-constraint-tests/
-          - dir: curve-benches/
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -159,10 +158,10 @@ jobs:
         uses: actions-rs/cargo@v1
         with:
             command: check
-            args: --examples --workspace --exclude ark-curve-constraint-tests --exclude ark-curve-benches --target aarch64-unknown-none
+            args: --examples --workspace --exclude ark-curve-constraint-tests --target aarch64-unknown-none
 
       - name: build
         uses: actions-rs/cargo@v1
         with:
             command: build
-            args: --workspace --exclude ark-curve-constraint-tests --exclude ark-curve-benches --target aarch64-unknown-none
+            args: --workspace --exclude ark-curve-constraint-tests --target aarch64-unknown-none
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,6 @@
 [workspace]
 
 members = [
-    "curve-benches",
     "curve-constraint-tests",
 
     "bls12_377",
@@ -31,6 +30,7 @@ members = [
     "pallas",
     "vesta",
 ]
+resolver = "2"
 
 [profile.release]
 opt-level = 3
@@ -64,5 +64,6 @@ ark-ff = { git = "https://github.com/arkworks-rs/algebra" }
 ark-serialize = { git = "https://github.com/arkworks-rs/algebra" }
 ark-algebra-bench-templates = { git = "https://github.com/arkworks-rs/algebra" }
 ark-algebra-test-templates = { git = "https://github.com/arkworks-rs/algebra" }
+
 ark-r1cs-std = { git = "https://github.com/arkworks-rs/r1cs-std" }
-ark-std = { git = "https://github.com/arkworks-rs/std" }
+ark-std = { git = "https://github.com/arkworks-rs/std" }
diff --git a/bls12_377/Cargo.toml b/bls12_377/Cargo.toml
@@ -22,6 +22,7 @@ ark-std = { version="^0.3.0", default-features = false }
 ark-relations = { version="^0.3.0", default-features = false }
 ark-serialize = { version="^0.3.0", default-features = false }
 ark-algebra-test-templates = { version="^0.3.0", default-features = false }
+ark-algebra-bench-templates = { version = "^0.3.0", default-features = false }
 ark-curve-constraint-tests = { path = "../curve-constraint-tests", default-features = false }
 
 [features]
@@ -31,4 +32,9 @@ std = [ "ark-std/std", "ark-ff/std", "ark-ec/std" ]
 curve = [ "scalar_field", "base_field" ]
 scalar_field = []
 base_field = []
-r1cs = [ "base_field", "ark-r1cs-std" ]
+r1cs = [ "base_field", "ark-r1cs-std" ]
+
+[[bench]]
+name = "bls12_377"
+path = "benches/bls12_377.rs"
+harness = false
diff --git a/bls12_377/benches/bls12_377.rs b/bls12_377/benches/bls12_377.rs
@@ -0,0 +1,16 @@
+use ark_algebra_bench_templates::*;
+
+use ark_bls12_377::{
+    fq::Fq, fq2::Fq2, fr::Fr, Bls12_377, Fq12, G1Projective as G1, G2Projective as G2,
+};
+
+bench!(
+    Name = "Bls12_377",
+    Pairing = Bls12_377,
+    G1 = G1,
+    G2 = G2,
+    ScalarField = Fr,
+    G1BaseField = Fq,
+    G2BaseField = Fq2,
+    TargetField = Fq12,
+);
diff --git a/bls12_381/Cargo.toml b/bls12_381/Cargo.toml
@@ -20,10 +20,16 @@ ark-std = { version="^0.3.0", default-features = false }
 [dev-dependencies]
 ark-serialize = { version="^0.3.0", default-features = false }
 ark-algebra-test-templates = { version="^0.3.0", default-features = false }
+ark-algebra-bench-templates = { version = "^0.3.0", default-features = false }
 
 [features]
 default = [ "curve" ]
 std = [ "ark-std/std", "ark-ff/std", "ark-ec/std" ]
 
 curve = [ "scalar_field" ]
 scalar_field = []
+
+[[bench]]
+name = "bls12_381"
+path = "benches/bls12_381.rs"
+harness = false
diff --git a/bls12_381/benches/bls12_381.rs b/bls12_381/benches/bls12_381.rs
@@ -0,0 +1,16 @@
+use ark_algebra_bench_templates::*;
+
+use ark_bls12_381::{
+    fq::Fq, fq2::Fq2, fr::Fr, Bls12_381, Fq12, G1Projective as G1, G2Projective as G2,
+};
+
+bench!(
+    Name = "Bls12_381",
+    Pairing = Bls12_381,
+    G1 = G1,
+    G2 = G2,
+    ScalarField = Fr,
+    G1BaseField = Fq,
+    G2BaseField = Fq2,
+    TargetField = Fq12,
+);
diff --git a/bn254/Cargo.toml b/bn254/Cargo.toml
@@ -20,10 +20,16 @@ ark-std = { version="^0.3.0", default-features = false }
 [dev-dependencies]
 ark-serialize = { version="^0.3.0", default-features = false }
 ark-algebra-test-templates = { version="^0.3.0", default-features = false }
+ark-algebra-bench-templates = { version = "^0.3.0", default-features = false }
 
 [features]
 default = [ "curve" ]
 std = [ "ark-std/std", "ark-ff/std", "ark-ec/std" ]
 
 curve = [ "scalar_field" ]
 scalar_field = []
+
+[[bench]]
+name = "bn254"
+path = "benches/bn254.rs"
+harness = false
diff --git a/bn254/benches/bn254.rs b/bn254/benches/bn254.rs
@@ -0,0 +1,13 @@
+use ark_algebra_bench_templates::*;
+use ark_bn254::{fq::Fq, fq2::Fq2, fr::Fr, Bn254, Fq12, G1Projective as G1, G2Projective as G2};
+
+bench!(
+    Name = "BN254",
+    Pairing = Bn254,
+    G1 = G1,
+    G2 = G2,
+    ScalarField = Fr,
+    G1BaseField = Fq,
+    G2BaseField = Fq2,
+    TargetField = Fq12,
+);
diff --git a/bw6_761/Cargo.toml b/bw6_761/Cargo.toml
@@ -21,7 +21,13 @@ ark-bls12-377 = { version="^0.3.0", path = "../bls12_377", default-features = fa
 [dev-dependencies]
 ark-serialize = { version="^0.3.0", default-features = false }
 ark-algebra-test-templates = { version="^0.3.0", default-features = false }
+ark-algebra-bench-templates = { version="^0.3.0", default-features = false }
 
 [features]
 default = []
 std = [ "ark-std/std", "ark-ff/std", "ark-ec/std", "ark-bls12-377/std" ]
+
+[[bench]]
+name = "bw6_761"
+path = "benches/bw6_761.rs"
+harness = false
diff --git a/bw6_761/benches/bw6_761.rs b/bw6_761/benches/bw6_761.rs
@@ -0,0 +1,16 @@
+use ark_algebra_bench_templates::*;
+
+use ark_bw6_761::{
+    fq::Fq, fq3::Fq3, fq6::Fq6, fr::Fr, g1::G1Projective as G1, g2::G2Projective as G2, BW6_761,
+};
+
+bench!(
+    Name = "BW6_761",
+    Pairing = BW6_761,
+    G1 = G1,
+    G2 = G2,
+    ScalarField = Fr,
+    G1BaseField = Fq,
+    G2BaseField = Fq3,
+    TargetField = Fq6,
+);
diff --git a/cp6_782/Cargo.toml b/cp6_782/Cargo.toml
@@ -22,7 +22,13 @@ ark-serialize = { version = "^0.3.0", default-features = false }
 
 [dev-dependencies]
 ark-algebra-test-templates = { version = "^0.3.0", default-features = false }
+ark-algebra-bench-templates = { version="^0.3.0", default-features = false }
 
 [features]
 default = []
 std = [ "ark-std/std", "ark-ff/std", "ark-ec/std", "ark-bls12-377/std" ]
+
+[[bench]]
+name = "cp6_782"
+path = "benches/cp6_782.rs"
+harness = false
diff --git a/cp6_782/benches/cp6_782.rs b/cp6_782/benches/cp6_782.rs
@@ -0,0 +1,15 @@
+use ark_algebra_bench_templates::*;
+use ark_cp6_782::{
+    fq::Fq, fq3::Fq3, fq6::Fq6, fr::Fr, g1::G1Projective as G1, g2::G2Projective as G2, CP6_782,
+};
+
+bench!(
+    Name = "CP6_782",
+    Pairing = CP6_782,
+    G1 = G1,
+    G2 = G2,
+    ScalarField = Fr,
+    G1BaseField = Fq,
+    G2BaseField = Fq3,
+    TargetField = Fq6,
+);
diff --git a/curve-benches/Cargo.toml b/curve-benches/Cargo.toml
diff --git a/curve-benches/LICENSE-APACHE b/curve-benches/LICENSE-APACHE
diff --git a/curve-benches/LICENSE-MIT b/curve-benches/LICENSE-MIT
diff --git a/curve-benches/benches/bls12_377.rs b/curve-benches/benches/bls12_377.rs
diff --git a/curve-benches/benches/bls12_381.rs b/curve-benches/benches/bls12_381.rs