Skip to content

Commit 15b6b7f

Browse files
kunxian-xiaVelaciela
authored andcommitted
patch gpu crates
1 parent 5854f81 commit 15b6b7f

File tree

15 files changed

+11510
-61
lines changed

15 files changed

+11510
-61
lines changed

Cargo.lock

+510-56
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+31
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,37 @@ alloy-primitives = { git = "https://github.com/scroll-tech/alloy-core", branch =
8888
ruint = { git = "https://github.com/scroll-tech/uint.git", branch = "v1.12.3" }
8989
tiny-keccak = { git = "https://github.com/scroll-tech/tiny-keccak", branch = "scroll-patch-v2.0.2-euclid-upgrade" }
9090

91+
[patch."https://github.com/openvm-org/stark-backend.git"]
92+
openvm-stark-backend = { git = "ssh://[email protected]/scroll-tech/openvm-stark-gpu.git", tag = "v1.0.0-rc.2", features = ["gpu"] }
93+
openvm-stark-sdk = { git = "ssh://[email protected]/scroll-tech/openvm-stark-gpu.git", tag = "v1.0.0-rc.2", features = ["gpu"] }
94+
95+
[patch."https://github.com/Plonky3/Plonky3.git"]
96+
p3-air = { git = "ssh://[email protected]/scroll-tech/plonky3-gpu.git", tag = "v0.1.0" }
97+
p3-field = { git = "ssh://[email protected]/scroll-tech/plonky3-gpu.git", tag = "v0.1.0" }
98+
p3-commit = { git = "ssh://[email protected]/scroll-tech/plonky3-gpu.git", tag = "v0.1.0" }
99+
p3-matrix = { git = "ssh://[email protected]/scroll-tech/plonky3-gpu.git", tag = "v0.1.0" }
100+
p3-baby-bear = { git = "ssh://[email protected]/scroll-tech/plonky3-gpu.git", features = [
101+
"nightly-features",
102+
], tag = "v0.1.0" }
103+
p3-util = { git = "ssh://[email protected]/scroll-tech/plonky3-gpu.git", tag = "v0.1.0" }
104+
p3-challenger = { git = "ssh://[email protected]/scroll-tech/plonky3-gpu.git", tag = "v0.1.0" }
105+
p3-dft = { git = "ssh://[email protected]/scroll-tech/plonky3-gpu.git", tag = "v0.1.0" }
106+
p3-fri = { git = "ssh://[email protected]/scroll-tech/plonky3-gpu.git", tag = "v0.1.0" }
107+
p3-goldilocks = { git = "ssh://[email protected]/scroll-tech/plonky3-gpu.git", tag = "v0.1.0" }
108+
p3-keccak = { git = "ssh://[email protected]/scroll-tech/plonky3-gpu.git", tag = "v0.1.0" }
109+
p3-keccak-air = { git = "ssh://[email protected]/scroll-tech/plonky3-gpu.git", tag = "v0.1.0" }
110+
p3-blake3 = { git = "ssh://[email protected]/scroll-tech/plonky3-gpu.git", tag = "v0.1.0" }
111+
p3-mds = { git = "ssh://[email protected]/scroll-tech/plonky3-gpu.git", tag = "v0.1.0" }
112+
p3-merkle-tree = { git = "ssh://[email protected]/scroll-tech/plonky3-gpu.git", tag = "v0.1.0" }
113+
p3-monty-31 = { git = "ssh://[email protected]/scroll-tech/plonky3-gpu.git", tag = "v0.1.0" }
114+
p3-poseidon = { git = "ssh://[email protected]/scroll-tech/plonky3-gpu.git", tag = "v0.1.0" }
115+
p3-poseidon2 = { git = "ssh://[email protected]/scroll-tech/plonky3-gpu.git", tag = "v0.1.0" }
116+
p3-poseidon2-air = { git = "ssh://[email protected]/scroll-tech/plonky3-gpu.git", tag = "v0.1.0" }
117+
p3-symmetric = { git = "ssh://[email protected]/scroll-tech/plonky3-gpu.git", tag = "v0.1.0" }
118+
p3-uni-stark = { git = "ssh://[email protected]/scroll-tech/plonky3-gpu.git", tag = "v0.1.0" }
119+
p3-maybe-rayon = { git = "ssh://[email protected]/scroll-tech/plonky3-gpu.git", tag = "v0.1.0" } # the "parallel" feature is NOT on by default to allow single-threaded benchmarking
120+
p3-bn254-fr = { git = "ssh://[email protected]/scroll-tech/plonky3-gpu.git", tag = "v0.1.0" }
121+
91122
[profile.maxperf]
92123
inherits = "release"
93124
lto = "fat"

crates/integration/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ openvm-native-compiler = { workspace = true, default-features = false }
2020
openvm-native-recursion = { workspace = true, default-features = false }
2121
openvm-native-transpiler = { workspace = true, default-features = false }
2222
openvm-transpiler = { workspace = true, default-features = false }
23+
openvm-stark-sdk.workspace = true
2324

2425
alloy-primitives.workspace = true
2526
eyre.workspace = true

crates/integration/src/lib.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ pub trait ProverTester {
5757
/// Setup directory structure for the test suite.
5858
fn setup() -> eyre::Result<()> {
5959
// Setup tracing subscriber.
60-
setup_logger()?;
60+
// setup_logger()?;
6161

6262
// If user has set an output directory, use it.
6363
let dir_testrun = if let Ok(env_dir) = std::env::var(ENV_OUTPUT_DIR) {
@@ -159,6 +159,7 @@ impl<T: Clone, P: Clone> ProveVerifyOutcome<T, P> {
159159
}
160160

161161
/// Setup test environment
162+
#[allow(dead_code)]
162163
fn setup_logger() -> eyre::Result<()> {
163164
let fmt_layer = tracing_subscriber::fmt::layer()
164165
.pretty()

crates/integration/src/testers/chunk.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ impl ProverTester for ChunkProverTester {
5454
}
5555
Err(_) => {
5656
#[cfg(not(feature = "euclidv2"))]
57-
let blocks = 12508460usize..=12508463usize;
57+
let blocks = 10319966usize..=10319974usize;
5858
#[cfg(feature = "euclidv2")]
5959
let blocks = 1usize..=4usize;
6060
blocks

crates/integration/testdata/phase1/witnesses/10319966.json

+1,185
Large diffs are not rendered by default.

crates/integration/testdata/phase1/witnesses/10319967.json

+942
Large diffs are not rendered by default.

crates/integration/testdata/phase1/witnesses/10319968.json

+1,970
Large diffs are not rendered by default.

crates/integration/testdata/phase1/witnesses/10319969.json

+913
Large diffs are not rendered by default.

crates/integration/testdata/phase1/witnesses/10319970.json

+967
Large diffs are not rendered by default.

crates/integration/testdata/phase1/witnesses/10319971.json

+1,301
Large diffs are not rendered by default.

crates/integration/testdata/phase1/witnesses/10319972.json

+1,164
Large diffs are not rendered by default.

crates/integration/testdata/phase1/witnesses/10319973.json

+1,654
Large diffs are not rendered by default.

crates/integration/testdata/phase1/witnesses/10319974.json

+864
Large diffs are not rendered by default.

crates/integration/tests/chunk_circuit.rs

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
use openvm_stark_sdk::bench::run_with_metric_collection;
12
use scroll_zkvm_integration::{
23
ProverTester, prove_verify_multi, prove_verify_single,
34
testers::chunk::{ChunkProverTester, MultiChunkProverTester, read_block_witness_from_testdata},
@@ -141,9 +142,10 @@ fn guest_profiling() -> eyre::Result<()> {
141142
fn setup_prove_verify_single() -> eyre::Result<()> {
142143
ChunkProverTester::setup()?;
143144

144-
prove_verify_single::<ChunkProverTester>(None)?;
145-
146-
Ok(())
145+
run_with_metric_collection("OUTPUT_PATH", || -> eyre::Result<()> {
146+
prove_verify_single::<ChunkProverTester>(None)?;
147+
Ok(())
148+
})
147149
}
148150

149151
#[test]

0 commit comments

Comments
 (0)