chore: bump sp1, support arch override (#199)

* fix: remove programs feature, bump lockfiles

* bump v4

* sm_86

* bump

* arch env var

* fix

* sp1 public dev

* use -gencode

* remove rug

* bump

* fix

---------

Co-authored-by: N <[email protected]>

Author: ctian1

Cargo.lock

@@ -19,14 +19,13 @@ debug-assertions = true
 [workspace.dependencies]
 
 # sp1
-sp1-core-executor = { git = "https://github.com/succinctlabs/sp1-wip", branch = "dev", features = ["bigint-rug"] }
-sp1-core-machine = { git = "https://github.com/succinctlabs/sp1-wip", branch = "dev" }
-sp1-prover = { git = "https://github.com/succinctlabs/sp1-wip", branch = "dev" }
-sp1-recursion-core = { git = "https://github.com/succinctlabs/sp1-wip", branch = "dev" }
-sp1-cuda = { git = "https://github.com/succinctlabs/sp1-wip", branch = "dev" }
-sp1-stark = { git = "https://github.com/succinctlabs/sp1-wip", branch = "dev" }
-sp1-eval = { git = "https://github.com/succinctlabs/sp1-wip", branch = "dev" }
-test-artifacts = { git = "https://github.com/succinctlabs/sp1-wip", branch = "dev" }
+sp1-core-executor = { version = "4.1.0" } 
+sp1-core-machine = { version = "4.1.0" }
+sp1-prover = { version = "4.1.0" }
+sp1-recursion-core = { version = "4.1.0" }
+sp1-cuda = { version = "4.1.0" }
+sp1-stark = { version = "4.1.0" }
+sp1-eval = { version = "4.1.0" }
 
 # p3
 p3-interpolation = "=0.2.0-succinct"
@@ -52,15 +51,15 @@ p3-maybe-rayon = "=0.2.0-succinct"
 p3-bn254-fr = "=0.2.0-succinct"
 
 # for local development
-# sp1-core-executor = { path = "../sp1-wip/crates/core/executor", features = [
+# sp1-core-executor = { path = "../sp1/crates/core/executor", features = [
 #     "bigint-rug",
 # ] }
-# sp1-core-machine = { path = "../sp1-wip/crates/core/machine" }
-# sp1-prover = { path = "../sp1-wip/crates/prover", features = ["native-gnark"] }
-# sp1-recursion-core = { path = "../sp1-wip/crates/recursion/core" }
-# sp1-cuda = { path = "../sp1-wip/crates/cuda" }
-# sp1-stark = { path = "../sp1-wip/crates/stark" }
-# sp1-eval = { path = "../sp1-wip/crates/eval" }
+# sp1-core-machine = { path = "../sp1/crates/core/machine" }
+# sp1-prover = { path = "../sp1/crates/prover", features = ["native-gnark"] }
+# sp1-recursion-core = { path = "../sp1/crates/recursion/core" }
+# sp1-cuda = { path = "../sp1/crates/cuda" }
+# sp1-stark = { path = "../sp1/crates/stark" }
+# sp1-eval = { path = "../sp1/crates/eval" }
 
 # p3-field = { path = "../Plonky3/field" }
 # p3-air = { path = "../Plonky3/air" }

Cargo.toml

@@ -52,5 +52,4 @@ ignore = "0.4.23"
 rand = "0.8.5"
 p3-fri = { workspace = true }
 p3-uni-stark = { workspace = true }
-test-artifacts = { workspace = true }
 serial_test = "3.1.1"

core/Cargo.toml

@@ -186,7 +186,8 @@ fn main() {
         cc_builder.flag("-lnvToolsExt");
         cc_builder.flag("-ldl");
         cc_builder.flag("--expt-relaxed-constexpr");
-        cc_builder.flag("-arch=sm_89");
+        cc_builder.flag("-gencode=arch=compute_86,code=sm_86");
+        cc_builder.flag("-gencode=arch=compute_89,code=sm_89");
 
         env::set_var("DEP_SPPARK_ROOT", "../sppark");
         if let Some(include) = env::var_os("DEP_SPPARK_ROOT") {

core/build.rs

@@ -452,7 +452,9 @@ mod tests {
     use sp1_core_executor::Program;
     use sp1_core_machine::{memory::MemoryLocalChip, riscv::ByteChip};
     use sp1_stark::InteractionBuilder;
-    use test_artifacts::FIBONACCI_ELF;
+
+    const FIBONACCI_ELF: &[u8] =
+        include_bytes!("../../../perf/programs/fibonacci/riscv32im-succinct-zkvm-elf");
 
     type F = BabyBear;
     const D: usize = 4;

core/src/stark/permutation.rs

@@ -329,7 +329,8 @@ mod tests {
 
     use rand::thread_rng;
 
-    use test_artifacts::FIBONACCI_ELF;
+    const FIBONACCI_ELF: &[u8] =
+        include_bytes!("../../../perf/programs/fibonacci/riscv32im-succinct-zkvm-elf");
     use tracing::info;
 
     use crate::{

core/src/stark/quotient.rs

@@ -4,7 +4,7 @@ mod tracer;
 
 #[allow(unused_imports)]
 pub use nvtx::*;
-use sp1_core_executor::{ExecutionRecord, Executor, Program, Trace};
+use sp1_core_executor::{ExecutionRecord, Executor, Program};
 use sp1_stark::SP1CoreOpts;
 #[allow(unused_imports)]
 pub use tracer::*;
@@ -14,6 +14,6 @@ pub use stats::*;
 pub fn execute_core(program: Program) -> ExecutionRecord {
     let opts = SP1CoreOpts::default();
     let mut runtime = Executor::new(program, opts);
-    runtime.run::<Trace>().unwrap();
+    runtime.run().unwrap();
     *(runtime.record)
 }

core/src/utils/mod.rs

@@ -22,7 +22,6 @@ p3-field = { workspace = true }
 sp1-prover = { workspace = true }
 sp1-core-executor = { workspace = true }
 sp1-core-machine = { workspace = true }
-test-artifacts = { workspace = true }
 p3-baby-bear = { workspace = true }
 sp1-stark = { workspace = true }
 serial_test = "3.1.1"