checkpoint

Cargo.toml

@@ -141,7 +141,7 @@ tempfile = "3.6.0"
 camino = "1.1.6"
 thiserror = "1.0.44"
 tracing = "0.1.37"
-tracing-texray = "0.2.0"
+tracing-texray = { git = "https://github.com/winston-h-zhang/tracing-texray", branch = "shim" }
 tracing-subscriber = "0.3.17"
 
 [[bin]]

benches/fibonacci.rs

@@ -21,6 +21,9 @@ use lurk::{
     state::State,
 };
 
+use tracing_subscriber::{fmt, prelude::*, EnvFilter, Registry};
+use tracing_texray::TeXRayLayer;
+
 mod common;
 use common::set_bench_config;
 
@@ -148,7 +151,8 @@ fn fibonacci_prove<M: measurement::Measurement>(
             b.iter_batched(
                 || frames,
                 |frames| {
-                    let result = prover.prove(&pp, frames, &store);
+                    let result = tracing_texray::examine(tracing::info_span!("bang!"))
+                        .in_scope(|| prover.prove(&pp, frames, &store));
                     let _ = black_box(result);
                 },
                 BatchSize::LargeInput,
@@ -157,14 +161,20 @@ fn fibonacci_prove<M: measurement::Measurement>(
     );
 }
 
+
 fn fibonacci_benchmark(c: &mut Criterion) {
     // Uncomment to record the logs. May negatively impact performance
-    //tracing_subscriber::fmt::init();
+    let subscriber = Registry::default()
+        .with(fmt::layer().pretty())
+        .with(EnvFilter::from_default_env())
+        .with(TeXRayLayer::new().width(120));
+    tracing::subscriber::set_global_default(subscriber).unwrap();
+
     set_bench_config();
     tracing::debug!("{:?}", lurk::config::LURK_CONFIG);
 
     let reduction_counts = rc_env().unwrap_or_else(|_| vec![100]);
-    let batch_sizes = [100, 200];
+    let batch_sizes = [249, 374, 499];
 
     let state = State::init_lurk_state().rccell();
 
@@ -187,6 +197,8 @@ fn fibonacci_benchmark(c: &mut Criterion) {
     }
 }
 
+// RUST_LOG=info LURK_RC=600 LURK_PERF=max-parallel-simple cargo criterion --bench fibonacci --features "cuda" 2> ./benches/gpu-spmvm/600.txt
+// RUST_LOG=info LURK_RC=900 LURK_PERF=max-parallel-simple cargo criterion --bench fibonacci --features "cuda" 2> ./benches/dev/900.txt
 cfg_if::cfg_if! {
     if #[cfg(feature = "flamegraph")] {
         criterion_group! {

benches/gpu-spmvm/600.txt

@@ -0,0 +1,2 @@
+   Compiling sppark v0.1.5
+   Compiling pasta-msm v0.1.4 (https://github.com/lurk-lab/pasta-msm?branch=dev#182b971d)

src/lem/eval.rs

@@ -96,15 +96,15 @@ fn build_frames<
     let mut pc = 0;
     let mut frames = vec![];
     let mut iterations = 0;
-    tracing::info!("{}", &log_fmt(0, &input, &[], store));
+    tracing::debug!("{}", &log_fmt(0, &input, &[], store));
     for _ in 0..limit {
         let mut emitted = vec![];
         let (frame, must_break) =
             compute_frame(lurk_step, cprocs_run, &input, store, lang, &mut emitted, pc)?;
 
         iterations += 1;
         input = frame.output.clone();
-        tracing::info!("{}", &log_fmt(iterations, &input, &emitted, store));
+        tracing::debug!("{}", &log_fmt(iterations, &input, &emitted, store));
         let expr = frame.output[0];
         frames.push(frame);
 

src/lem/multiframe.rs

@@ -826,6 +826,7 @@ impl<'a, F: LurkField, C: Coprocessor<F>> nova::traits::circuit::StepCircuit<F>
         2 * self.lurk_step.input_params.len()
     }
 
+    #[tracing::instrument(skip_all, name = "synthesize")]
     fn synthesize<CS>(
         &self,
         cs: &mut CS,

src/lem/var_map.rs

@@ -2,7 +2,6 @@ use std::collections::hash_map::Entry;
 
 use anyhow::{bail, Result};
 use fxhash::FxHashMap;
-use tracing::info;
 
 use super::Var;
 
@@ -29,7 +28,7 @@ impl<V> VarMap<V> {
             }
             Entry::Occupied(mut o) => {
                 let v = o.insert(v);
-                info!("Variable {} has been overwritten", o.key());
+                tracing::debug!("Variable {} has been overwritten", o.key());
                 Some(v)
             }
         }