Merge remote-tracking branch 'origin/main' into feat/zkvm-profile-cycles

Author: yczhangsjtu

Cargo.lock

@@ -4,21 +4,24 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-openvm = { git = "https://github.com/scroll-tech/openvm.git", branch = "feat/native_multi_observe", default-features = false }
-openvm-circuit = { git = "https://github.com/scroll-tech/openvm.git", branch = "feat/native_multi_observe", default-features = false, features = ["bench-metrics"] }
-openvm-native-circuit = { git = "https://github.com/scroll-tech/openvm.git", branch = "feat/native_multi_observe", default-features = false }
-openvm-native-compiler = { git = "https://github.com/scroll-tech/openvm.git", branch = "feat/native_multi_observe", default-features = false }
-openvm-native-compiler-derive = { git = "https://github.com/scroll-tech/openvm.git", branch = "feat/native_multi_observe", default-features = false }
-openvm-native-recursion = { git = "https://github.com/scroll-tech/openvm.git", branch = "feat/native_multi_observe", default-features = false }
-openvm-stark-backend = { git = "https://github.com/openvm-org/stark-backend.git", rev = "f48090c9febd021f8ee0349bc929a775fb1fa3ad", default-features = false }
-openvm-stark-sdk = { git = "https://github.com/openvm-org/stark-backend.git", rev = "f48090c9febd021f8ee0349bc929a775fb1fa3ad", default-features = false }
+openvm = { git = "https://github.com/scroll-tech/openvm.git", default-features = false }
+openvm-circuit = { git = "https://github.com/scroll-tech/openvm.git", default-features = false, features = ["bench-metrics"] }
+openvm-native-circuit = { git = "https://github.com/scroll-tech/openvm.git", default-features = false }
+openvm-native-compiler = { git = "https://github.com/scroll-tech/openvm.git", default-features = false }
+openvm-native-compiler-derive = { git = "https://github.com/scroll-tech/openvm.git", default-features = false }
+openvm-native-recursion = { git = "https://github.com/scroll-tech/openvm.git", default-features = false }
+openvm-stark-backend = { git = "https://github.com/openvm-org/stark-backend.git", tag = "v1.1.1", default-features = false }
+openvm-stark-sdk = { git = "https://github.com/openvm-org/stark-backend.git", tag = "v1.1.1", default-features = false }
 
 rand = { version = "0.8.5", default-features = false }
 itertools = { version = "0.13.0", default-features = false }
 bincode = "1.3.3"
 tracing = "0.1.40"
+serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0"
 
 # Plonky3
+# replace all dep with `p3` from gkr-backend
 p3-air = { git = "https://github.com/Plonky3/Plonky3.git", rev = "539bbc84085efb609f4f62cb03cf49588388abdb" }
 p3-baby-bear = { git = "https://github.com/Plonky3/Plonky3.git", rev = "539bbc84085efb609f4f62cb03cf49588388abdb" }
 p3-field = { git = "https://github.com/Plonky3/Plonky3.git", rev = "539bbc84085efb609f4f62cb03cf49588388abdb" }
@@ -29,7 +32,7 @@ p3-challenger = { git = "https://github.com/Plonky3/Plonky3.git", rev = "539bbc8
 p3-monty-31 = { git = "https://github.com/Plonky3/Plonky3.git", rev = "539bbc84085efb609f4f62cb03cf49588388abdb" }
 p3-symmetric = { git = "https://github.com/Plonky3/Plonky3.git", rev = "539bbc84085efb609f4f62cb03cf49588388abdb" }
 p3-fri = { git = "https://github.com/Plonky3/Plonky3.git", rev = "539bbc84085efb609f4f62cb03cf49588388abdb" }
-p3-goldilocks = { git = "https://github.com/Plonky3/plonky3", rev = "539bbc84085efb609f4f62cb03cf49588388abdb" }
+p3-goldilocks = { git = "https://github.com/Plonky3/Plonky3.git", rev = "539bbc84085efb609f4f62cb03cf49588388abdb" }
 
 # WHIR
 ark-std = { version = "0.5", features = ["std"] }
@@ -38,26 +41,36 @@ ark-poly = "0.5"
 ark-serialize = "0.5"
 
 # Ceno
-ceno_mle = { git = "https://github.com/scroll-tech/ceno.git", branch = "build/smaller_field_support_plonky3_539bbc", package = "multilinear_extensions" }
-ceno_sumcheck = { git = "https://github.com/scroll-tech/ceno.git", branch = "build/smaller_field_support_plonky3_539bbc", package = "sumcheck" }
-ceno_transcript = { git = "https://github.com/scroll-tech/ceno.git", branch = "build/smaller_field_support_plonky3_539bbc", package = "transcript" }
-ceno_witness = { git = "https://github.com/scroll-tech/ceno.git", branch = "build/smaller_field_support_plonky3_539bbc", package = "witness" }
-ceno_zkvm = { git = "https://github.com/scroll-tech/ceno.git", branch = "build/smaller_field_support_plonky3_539bbc" }
-ceno_emul = { git = "https://github.com/scroll-tech/ceno.git", branch = "build/smaller_field_support_plonky3_539bbc" }
-mpcs = { git = "https://github.com/scroll-tech/ceno.git", branch = "build/smaller_field_support_plonky3_539bbc" }
-ff_ext = { git = "https://github.com/scroll-tech/ceno.git", branch = "build/smaller_field_support_plonky3_539bbc" }
-serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0"
+ceno_mle = { git = "https://github.com/scroll-tech/gkr-backend.git", rev = "v1.0.0-alpha.6", package = "multilinear_extensions" }
+ceno_sumcheck = { git = "https://github.com/scroll-tech/gkr-backend.git", rev = "v1.0.0-alpha.6", package = "sumcheck" }
+ceno_transcript = { git = "https://github.com/scroll-tech/gkr-backend.git", rev = "v1.0.0-alpha.6", package = "transcript" }
+ceno_witness = { git = "https://github.com/scroll-tech/gkr-backend.git", rev = "v1.0.0-alpha.6", package = "witness" }
+ceno_zkvm = { git = "https://github.com/scroll-tech/ceno.git", branch = "master" }
+ceno_emul = { git = "https://github.com/scroll-tech/ceno.git", branch = "master" }
+gkr_iop = { git = "https://github.com/scroll-tech/ceno.git", branch = "master" }
+mpcs = { git = "https://github.com/scroll-tech/gkr-backend.git", rev = "v1.0.0-alpha.6" }
+ff_ext = { git = "https://github.com/scroll-tech/gkr-backend.git", rev = "v1.0.0-alpha.6" }
 
 [features]
+default = ["parallel", "nightly-features"]
+nightly-features = [
+  "ceno_zkvm/nightly-features",
+  "openvm-stark-sdk/nightly-features",
+]
+parallel = ["openvm-stark-backend/parallel"]
 bench-metrics = ["openvm-circuit/bench-metrics"]
 
-# [patch."https://github.com/scroll-tech/ceno.git"]
-# ceno_mle = { path = "../ceno/multilinear_extensions", package = "multilinear_extensions" }
-# ceno_sumcheck = { path = "../ceno/sumcheck", package = "sumcheck" }
-# ceno_transcript = { path = "../ceno/transcript", package = "transcript" }
-# ceno_witness = { path = "../ceno/witness", package = "witness" }
-# ceno_zkvm = { path = "../ceno/ceno_zkvm" }
-# ceno_emul = { path = "../ceno/ceno_emul" }
-# mpcs = { path = "../ceno/mpcs" }
-# ff_ext = { path = "../ceno/ff_ext" }
+# [patch."https://github.com/scroll-tech/gkr-backend"]
+# ff_ext = { path = "../gkr-backend/crates/ff_ext", package = "ff_ext" }
+# ceno_mle = { path = "../gkr-backend/crates/multilinear_extensions", package = "multilinear_extensions" }
+# mpcs = { path = "../gkr-backend/crates/mpcs", package = "mpcs" }
+# ceno_poseidon = { path = "../gkr-backend/crates/poseidon", package = "poseidon" }
+# ceno_sumcheck = { path = "../gkr-backend/crates/sumcheck", package = "sumcheck" }
+# ceno_transcript = { path = "../gkr-backend/crates/transcript", package = "transcript" }
+# ceno_whir = { path = "../gkr-backend/crates/whir", package = "whir" }
+# ceno_witness = { path = "../gkr-backend/crates/witness", package = "witness" }
+
+# [patch."https://github.com/scroll-tech/ceno"]
+# ceno_zkvm = { path = "../ceno/ceno_zkvm", package = "ceno_zkvm" }
+# ceno_emul = { path = "../ceno/ceno_emul", package = "ceno_emul" }
+# gkr_iop = { path = "../ceno/gkr_iop", package = "gkr_iop" }

Cargo.toml

@@ -1,4 +1,4 @@
 [toolchain]
 channel = "nightly-2025-03-25"
 targets = ["riscv32im-unknown-none-elf"]
-components = ["clippy", "rustfmt", "rust-src"]
+components = ["clippy", "rustfmt", "rust-src"]

rust-toolchain.toml

@@ -9,11 +9,11 @@ if [ ! -d "$REPO_ROOT/build/ceno" ] || [ -z "$(ls -A "$REPO_ROOT/build/ceno" 2>/
 fi
 
 # Enter the ceno directory
-cd $REPO_ROOT/build/ceno && git checkout build/smaller_field_support_plonky3_539bbc
+cd $REPO_ROOT/build/ceno && git checkout master && git pull origin master
 
 # Execute the ceno_zkvm e2e test
 RUST_LOG=info cargo run --release --package ceno_zkvm --bin e2e -- --platform=ceno \
-    --hints=10 --public-io=4191 examples/target/riscv32im-ceno-zkvm-elf/release/examples/fibonacci \
+    examples/target/riscv32im-ceno-zkvm-elf/release/examples/keccak_syscall \
     --field=baby-bear
 
 mkdir -p $REPO_ROOT/src/e2e/encoded