From 7fe8cca5d37e8c66ab25f5d94f39f1db60eeccff Mon Sep 17 00:00:00 2001 From: umadayal <uma.dayal@yahoo.com> Date: Tue, 8 Oct 2024 18:13:36 +0000 Subject: [PATCH 1/4] fix --- crates/perf/src/main.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/perf/src/main.rs b/crates/perf/src/main.rs index 631b1ea49c..bb69a6bbba 100644 --- a/crates/perf/src/main.rs +++ b/crates/perf/src/main.rs @@ -131,7 +131,7 @@ fn main() { time_operation(|| prover.verify_shrink(&shrink_proof, &vk)); let (wrapped_bn254_proof, wrap_duration) = - time_operation(|| prover.wrap_bn254(shrink_proof, opts).unwrap()); + time_operation(|| server.wrap_bn254(shrink_proof).unwrap()); let (_, verify_wrap_duration) = time_operation(|| prover.verify_wrap_bn254(&wrapped_bn254_proof, &vk)); From 805bbd65b0cdf6396c465c372ef80dbb1e2d7606 Mon Sep 17 00:00:00 2001 From: umadayal <uma.dayal@yahoo.com> Date: Tue, 8 Oct 2024 18:29:24 +0000 Subject: [PATCH 2/4] uncomment bn254 --- crates/perf/src/main.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/crates/perf/src/main.rs b/crates/perf/src/main.rs index bb69a6bbba..12a23d817f 100644 --- a/crates/perf/src/main.rs +++ b/crates/perf/src/main.rs @@ -133,8 +133,9 @@ fn main() { let (wrapped_bn254_proof, wrap_duration) = time_operation(|| server.wrap_bn254(shrink_proof).unwrap()); - let (_, verify_wrap_duration) = - time_operation(|| prover.verify_wrap_bn254(&wrapped_bn254_proof, &vk)); + // TODO: Verify wrapped bn254 proofs. + // let (_, verify_wrap_duration) = + // time_operation(|| prover.verify_wrap_bn254(&wrapped_bn254_proof, &vk)); let result = PerfResult { cycles, From 24dd5e1066639ccbead5f6e730a810db3e8acd3d Mon Sep 17 00:00:00 2001 From: umadayal <uma.dayal@yahoo.com> Date: Tue, 8 Oct 2024 18:30:32 +0000 Subject: [PATCH 3/4] fail fast: false --- .github/workflows/suite.yml | 3 +++ crates/perf/src/main.rs | 1 + 2 files changed, 4 insertions(+) diff --git a/.github/workflows/suite.yml b/.github/workflows/suite.yml index af6cd60eb8..a394243103 100644 --- a/.github/workflows/suite.yml +++ b/.github/workflows/suite.yml @@ -22,6 +22,7 @@ jobs: test-cpu: if: ${{ fromJSON(github.event.inputs.cpu_workloads)[0] != null }} strategy: + fail-fast: false matrix: workload: ${{ fromJSON(github.event.inputs.cpu_workloads) }} name: ${{ matrix.workload }} (cpu) @@ -60,6 +61,7 @@ jobs: test-cuda: if: ${{ fromJSON(github.event.inputs.cuda_workloads)[0] != null }} strategy: + fail-fast: false matrix: workload: ${{ fromJSON(github.event.inputs.cuda_workloads) }} name: ${{ matrix.workload }} (gpu) @@ -99,6 +101,7 @@ jobs: test-network: if: ${{ fromJSON(github.event.inputs.network_workloads)[0] != null }} strategy: + fail-fast: false matrix: workload: ${{ fromJSON(github.event.inputs.network_workloads) }} name: ${{ matrix.workload }} (network) diff --git a/crates/perf/src/main.rs b/crates/perf/src/main.rs index 12a23d817f..89099237a6 100644 --- a/crates/perf/src/main.rs +++ b/crates/perf/src/main.rs @@ -136,6 +136,7 @@ fn main() { // TODO: Verify wrapped bn254 proofs. // let (_, verify_wrap_duration) = // time_operation(|| prover.verify_wrap_bn254(&wrapped_bn254_proof, &vk)); + let verify_wrap_duration = Duration::from_secs(0); let result = PerfResult { cycles, From e64fe1c7efc3bf062dc88df2ce935f3c155c4cf1 Mon Sep 17 00:00:00 2001 From: umadayal <uma.dayal@yahoo.com> Date: Tue, 8 Oct 2024 19:05:05 +0000 Subject: [PATCH 4/4] makefile --- crates/perf/src/main.rs | 3 +-- crates/prover/Makefile | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/crates/perf/src/main.rs b/crates/perf/src/main.rs index 89099237a6..51f2e70f3c 100644 --- a/crates/perf/src/main.rs +++ b/crates/perf/src/main.rs @@ -130,8 +130,7 @@ fn main() { let (_, verify_shrink_duration) = time_operation(|| prover.verify_shrink(&shrink_proof, &vk)); - let (wrapped_bn254_proof, wrap_duration) = - time_operation(|| server.wrap_bn254(shrink_proof).unwrap()); + let (_, wrap_duration) = time_operation(|| server.wrap_bn254(shrink_proof).unwrap()); // TODO: Verify wrapped bn254 proofs. // let (_, verify_wrap_duration) = diff --git a/crates/prover/Makefile b/crates/prover/Makefile index 49b6a80635..3e9f243d57 100644 --- a/crates/prover/Makefile +++ b/crates/prover/Makefile @@ -20,4 +20,4 @@ release-circuits: test-e2e: RUSTFLAGS='-C target-cpu=native' \ - cargo test --package sp1-prover --lib --release -- tests::test_e2e --exact --show-output \ No newline at end of file + cargo test --package sp1-prover --lib --release -- tests::test_e2e --exact --show-output