Skip to content

Commit db75e3c

Browse files
authored
chore: clean logs (#2561)
1 parent b90f972 commit db75e3c

File tree

22 files changed

+33
-19
lines changed

22 files changed

+33
-19
lines changed

crates/core/executor/src/minimal/arch/x86_64/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ impl MinimalExecutor {
3838
}
3939

4040
/// Transpile the program, saving the JIT function.
41-
#[tracing::instrument(name = "MinimalExecutor::transpile", skip(program))]
41+
#[tracing::instrument(name = "MinimalExecutor::transpile", level = "debug", skip(program))]
4242
fn transpile(program: &Program, is_debug: bool, max_trace_size: Option<u64>) -> JitFunction {
4343
let trace_buf_size = max_trace_size.unwrap_or(0);
4444

crates/core/executor/src/splicing.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,6 @@ impl SplicingVM<'_> {
165165

166166
impl<'a> SplicingVM<'a> {
167167
/// Create a new full-tracing VM from a minimal trace.
168-
#[tracing::instrument(name = "SplicingVM::new", skip_all)]
169168
pub fn new<T: MinimalTrace>(
170169
trace: &'a T,
171170
program: Arc<Program>,

crates/hypercube/src/logup_gkr/prover.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ impl<GC: IopCtx, SC: ShardContext<GC>> GkrProverImpl<GC, SC> {
133133

134134
// Run the GKR circuit and get the output.
135135
let (output, circuit) = {
136-
let _span = tracing::info_span!("generate GKR circuit").entered();
136+
let _span = tracing::debug_span!("generate GKR circuit").entered();
137137
self.trace_generator.generate_gkr_circuit(
138138
chips,
139139
preprocessed_traces.clone(),
@@ -166,7 +166,7 @@ impl<GC: IopCtx, SC: ShardContext<GC>> GkrProverImpl<GC, SC> {
166166
let first_denominator_eval = denominator.eval_at_eq(&first_point_eq).to_host().unwrap()[0];
167167

168168
let (eval_point, round_proofs) = {
169-
let _span = tracing::info_span!("prove GKR circuit").entered();
169+
let _span = tracing::debug_span!("prove GKR circuit").entered();
170170
self.prove_gkr_circuit(
171171
first_numerator_eval,
172172
first_denominator_eval,

crates/prover/src/worker/client/local.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ impl Clone for LocalWorkerClient {
9999

100100
impl WorkerClient for LocalWorkerClient {
101101
async fn submit_task(&self, kind: TaskType, task: RawTaskRequest) -> anyhow::Result<TaskId> {
102-
tracing::info!("submitting task of kind {kind:?}");
102+
tracing::debug!("submitting task of kind {kind:?}");
103103
let task_id = LocalWorkerClientInner::create_id();
104104
// Add the task to the proof index.
105105
self.inner

crates/prover/src/worker/controller/core.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ where
161161
// Create a channel to send the splicing handles to be awaited and their task_ids being
162162
// sent after being submitted to the splicing pipeline.
163163
let (splicing_submit_tx, mut splicing_submit_rx) = mpsc::unbounded_channel();
164-
let span = tracing::info_span!("minimal executor");
164+
let span = tracing::debug_span!("minimal executor");
165165

166166
// Making the minimal executor blocks the rest of execution anyway, so we initialize it before spawning the rest of the tokio tasks.
167167
let mut minimal_executor = if let Some(cache) = &self.minimal_executor_cache {
@@ -197,7 +197,7 @@ where
197197
memory_tx
198198
.send(unsafe_memory)
199199
.map_err(|_| anyhow::anyhow!("failed to send unsafe memory"))?;
200-
tracing::info!("Starting minimal executor");
200+
tracing::debug!("Starting minimal executor");
201201
let now = std::time::Instant::now();
202202
let mut chunk_count = 0;
203203
while let Some(chunk) = minimal_executor.execute_chunk() {
@@ -251,8 +251,8 @@ where
251251
chunk_count += 1;
252252
}
253253
let elapsed = now.elapsed().as_secs_f64();
254-
tracing::info!(
255-
"Minimal Executor finished. elapsed: {}s, mhz: {}",
254+
tracing::debug!(
255+
"minimal Executor finished. elapsed: {}s, mhz: {}",
256256
elapsed,
257257
minimal_executor.global_clk() as f64 / (elapsed * 1e6)
258258
);

crates/prover/src/worker/controller/splicing.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ where
138138
Ok(())
139139
}
140140
}
141-
.instrument(tracing::info_span!("get splices to serialize")),
141+
.instrument(tracing::debug_span!("get splices to serialize")),
142142
);
143143

144144
// This task waits for prove shard tasks to be sent.
@@ -162,7 +162,7 @@ where
162162
Ok::<_, ExecutionError>(())
163163
}
164164
}
165-
.instrument(tracing::info_span!("spawn prove shard tasks")),
165+
.instrument(tracing::debug_span!("spawn prove shard tasks")),
166166
);
167167

168168
let common_prover_input = self
@@ -174,7 +174,7 @@ where
174174
})?;
175175

176176
// Spawn the task that splices the trace.
177-
let span = tracing::info_span!("splicing trace chunk");
177+
let span = tracing::debug_span!("splicing trace chunk");
178178
join_set.spawn_blocking(
179179
move || {
180180
let _guard = span.enter();

crates/prover/src/worker/node/full/mod.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,7 @@ impl SP1LocalNode {
164164
Ok(output)
165165
}
166166

167+
#[instrument(name = "prove", skip_all, fields(mode = ?mode))]
167168
pub async fn prove_with_mode(
168169
&self,
169170
elf: &[u8],

crates/prover/src/worker/prover/core.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ where
265265
);
266266
// Here, we reserve 1/8 of the shard size for common events. In other words,
267267
// we assume that no event will take up more than 1/8 of the shard's events.
268-
let record = tracing::info_span!("allocating record").in_scope(|| {
268+
let record = tracing::debug_span!("allocating record").in_scope(|| {
269269
ExecutionRecord::new_preallocated(
270270
program.clone(),
271271
common_input.nonce,
@@ -458,7 +458,7 @@ where
458458
});
459459

460460
// Generate dependencies on the main record.
461-
let span = tracing::info_span!("generate dependencies");
461+
let span = tracing::debug_span!("generate dependencies");
462462
let machine_clone = self.machine().clone();
463463
let record = tokio::task::spawn_blocking(move || {
464464
let _guard = span.enter();
@@ -470,7 +470,7 @@ where
470470
.map_err(|e| TaskError::Fatal(e.into()))?;
471471

472472
// If this is not a Core proof request, spawn a task to get the recursion program.
473-
let span = tracing::info_span!("get recursion program");
473+
let span = tracing::debug_span!("get recursion program");
474474
let recursion_program_handle = if common_input.mode != ProofMode::Core {
475475
let handle = tokio::task::spawn_blocking({
476476
let normalize_program_compiler = self.normalize_program_compiler.clone();
@@ -634,11 +634,11 @@ impl<A: ArtifactClient, C: SP1ProverComponents>
634634

635635
let permits = self.permits.clone();
636636
let (_pk, vk) = self.core_prover.setup(program, permits).await;
637-
tracing::info!("Setup completed for task {}", id);
637+
tracing::debug!("setup completed for task {}", id);
638638

639639
// Upload the vk
640640
self.artifact_client.upload(&output, vk).await.expect("failed to upload vk");
641-
tracing::info!("Upload completed for artifact {}", output.to_id());
641+
tracing::debug!("upload completed for artifact {}", output.to_id());
642642

643643
// TODO: Add the busy time here.
644644
Ok((id, TaskMetadata::default()))

crates/prover/src/worker/prover/execute.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ pub async fn execute_with_options(
228228
.map_err(|e| anyhow::anyhow!("Gas engine submission failed: {}", e))?;
229229
handle_sender.send(handle)?;
230230
}
231-
tracing::debug!("Minimal executor finished in {} cycles", minimal_executor.global_clk());
231+
tracing::debug!("minimal executor finished in {} cycles", minimal_executor.global_clk());
232232

233233
// Extract cycle tracker data before consuming the executor
234234
#[cfg(feature = "profiling")]

crates/sdk/src/blocking/cpu/mod.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ impl CpuProver {
8080
/// Creates a new [`CpuProver`] with optional custom [`SP1CoreOpts`].
8181
#[must_use]
8282
pub fn new_with_opts(core_opts: Option<sp1_core_executor::SP1CoreOpts>) -> Self {
83+
tracing::info!("initializing cpu prover");
8384
let worker_builder = cpu_worker_builder().with_core_opts(core_opts.unwrap_or_default());
8485
let prover = Arc::new(
8586
crate::blocking::block_on(

0 commit comments

Comments
 (0)