From 146079e0eed33cff5bad7084335bf6828b4c9155 Mon Sep 17 00:00:00 2001 From: John Guibas Date: Tue, 8 Oct 2024 22:16:15 -0700 Subject: [PATCH 1/6] finish unstaged changes --- crates/perf/workflow.sh | 54 ++++++++++++++++++++--------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/crates/perf/workflow.sh b/crates/perf/workflow.sh index 3ee788994c..968a38d77f 100755 --- a/crates/perf/workflow.sh +++ b/crates/perf/workflow.sh @@ -24,26 +24,6 @@ CPU_WORKLOADS=( # Define the list of CUDA workloads. CUDA_WORKLOADS=( - # "fibonacci-17k" - # "ssz-withdrawals" - # "tendermint" - # "rsp-20526624" - # "rsa" - # "regex" - # "chess" - # "json" - # "blobstream-01j6z63fgafrc8jeh0k12gbtvw" - # "blobstream-01j6z95bdme9svevmfyc974bja" - # "blobstream-01j6z9ak0ke9srsppgywgke6fj" - # "vector-01j6xsv35re96tkgyda115320t" - # "vector-01j6xzy366ff5tbkzcrs8pma02" - # "vector-01j6y06de0fdaafemr8b1t69z3" - # "raiko-a7-10" - # "op-succinct-op-sepolia-range-17985900-17985905" -) - -# Define the list of network workloads. -NETWORK_WORKLOADS=( "fibonacci-17k" "ssz-withdrawals" "tendermint" @@ -58,14 +38,34 @@ NETWORK_WORKLOADS=( "vector-01j6xsv35re96tkgyda115320t" "vector-01j6xzy366ff5tbkzcrs8pma02" "vector-01j6y06de0fdaafemr8b1t69z3" - "raiko-a7-10" - "op-succinct-op-sepolia-1818303090-18303120" - "op-succinct-op-sepolia-18200000-18200030" - "op-succinct-op-sepolia-18250000-18250030" - "op-succinct-op-sepolia-18303044-18303074" - "op-succinct-op-sepolia-range-17685896-17685897" + "raiko-a7-10" "op-succinct-op-sepolia-range-17985900-17985905" - "op-succinct-op-sepolia-range-18129400-18129401" +) + +# Define the list of network workloads. +NETWORK_WORKLOADS=( + # "fibonacci-17k" + # "ssz-withdrawals" + # "tendermint" + # "rsp-20526624" + # "rsa" + # "regex" + # "chess" + # "json" + # "blobstream-01j6z63fgafrc8jeh0k12gbtvw" + # "blobstream-01j6z95bdme9svevmfyc974bja" + # "blobstream-01j6z9ak0ke9srsppgywgke6fj" + # "vector-01j6xsv35re96tkgyda115320t" + # "vector-01j6xzy366ff5tbkzcrs8pma02" + # "vector-01j6y06de0fdaafemr8b1t69z3" + # "raiko-a7-10" + # "op-succinct-op-sepolia-1818303090-18303120" + # "op-succinct-op-sepolia-18200000-18200030" + # "op-succinct-op-sepolia-18250000-18250030" + # "op-succinct-op-sepolia-18303044-18303074" + # "op-succinct-op-sepolia-range-17685896-17685897" + # "op-succinct-op-sepolia-range-17985900-17985905" + # "op-succinct-op-sepolia-range-18129400-18129401" ) # Create a JSON object with the list of workloads. From 9ac4162a0e90cf864231887ebee2bd1bbfec940c Mon Sep 17 00:00:00 2001 From: John Guibas Date: Tue, 8 Oct 2024 22:16:50 -0700 Subject: [PATCH 2/6] new shapes --- crates/prover/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/prover/src/lib.rs b/crates/prover/src/lib.rs index e3702a8118..2d67042d99 100644 --- a/crates/prover/src/lib.rs +++ b/crates/prover/src/lib.rs @@ -109,7 +109,7 @@ const COMPRESS_CACHE_SIZE: usize = 3; pub const REDUCE_BATCH_SIZE: usize = 2; const SHAPES_URL_PREFIX: &str = "https://sp1-circuits.s3.us-east-2.amazonaws.com/shapes"; -const SHAPES_VERSION: &str = "5202143e0"; +const SHAPES_VERSION: &str = "146079e0e"; lazy_static! { static ref SHAPES_INIT: Once = Once::new(); } From 7dd6c8530629198530cd884cc6838c29e9783473 Mon Sep 17 00:00:00 2001 From: John Guibas Date: Tue, 8 Oct 2024 22:44:13 -0700 Subject: [PATCH 3/6] hm --- crates/cuda/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/cuda/src/lib.rs b/crates/cuda/src/lib.rs index 0ca8e2e1c8..12cc57f943 100644 --- a/crates/cuda/src/lib.rs +++ b/crates/cuda/src/lib.rs @@ -84,7 +84,7 @@ impl SP1CudaProver { /// [SP1ProverClient] that can be used to communicate with the container. pub fn new() -> Result> { let container_name = "sp1-gpu"; - let image_name = "public.ecr.aws/succinct-labs/sp1-gpu:b0756e2"; + let image_name = "public.ecr.aws/succinct-labs/sp1-gpu:4b00830"; let cleaned_up = Arc::new(AtomicBool::new(false)); let cleanup_name = container_name; From 002e00d1fa40570288a49b1ab137a69347fc3589 Mon Sep 17 00:00:00 2001 From: John Guibas Date: Tue, 8 Oct 2024 22:50:27 -0700 Subject: [PATCH 4/6] get rid of verify vk --- crates/cuda/src/lib.rs | 2 -- 1 file changed, 2 deletions(-) diff --git a/crates/cuda/src/lib.rs b/crates/cuda/src/lib.rs index 12cc57f943..089d6915c8 100644 --- a/crates/cuda/src/lib.rs +++ b/crates/cuda/src/lib.rs @@ -107,8 +107,6 @@ impl SP1CudaProver { "run", "-e", &format!("RUST_LOG={}", rust_log_level), - "-e", - &format!("VERIFY_VK={}", "false"), "-p", "3000:3000", "--rm", From 01a7581499ea000243f478cad2753daaa3048c58 Mon Sep 17 00:00:00 2001 From: John Guibas Date: Tue, 8 Oct 2024 23:00:58 -0700 Subject: [PATCH 5/6] update gpu image with new shapes --- crates/cuda/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/cuda/src/lib.rs b/crates/cuda/src/lib.rs index 089d6915c8..ed6e21f566 100644 --- a/crates/cuda/src/lib.rs +++ b/crates/cuda/src/lib.rs @@ -84,7 +84,7 @@ impl SP1CudaProver { /// [SP1ProverClient] that can be used to communicate with the container. pub fn new() -> Result> { let container_name = "sp1-gpu"; - let image_name = "public.ecr.aws/succinct-labs/sp1-gpu:4b00830"; + let image_name = "public.ecr.aws/succinct-labs/sp1-gpu:a4e646b"; let cleaned_up = Arc::new(AtomicBool::new(false)); let cleanup_name = container_name; From 069cc25f523e15802d5840bd2ce57b0e189b70ba Mon Sep 17 00:00:00 2001 From: umadayal Date: Wed, 9 Oct 2024 06:47:04 +0000 Subject: [PATCH 6/6] no vk + no fixed shapes --- crates/prover/src/lib.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/crates/prover/src/lib.rs b/crates/prover/src/lib.rs index 2d67042d99..8330b42b68 100644 --- a/crates/prover/src/lib.rs +++ b/crates/prover/src/lib.rs @@ -233,16 +233,16 @@ impl SP1Prover { let core_shape_config = env::var("FIX_CORE_SHAPES") .map(|v| v.eq_ignore_ascii_case("true")) - .unwrap_or(true) + .unwrap_or(false) .then_some(CoreShapeConfig::default()); let recursion_shape_config = env::var("FIX_RECURSION_SHAPES") .map(|v| v.eq_ignore_ascii_case("true")) - .unwrap_or(true) + .unwrap_or(false) .then_some(RecursionShapeConfig::default()); let vk_verification = - env::var("VERIFY_VK").map(|v| v.eq_ignore_ascii_case("true")).unwrap_or(true); + env::var("VERIFY_VK").map(|v| v.eq_ignore_ascii_case("true")).unwrap_or(false); tracing::info!("vk verification: {}", vk_verification);