Skip to content

Commit 200eaaf

Browse files
kunxian-xiakunxian-xia
authored
fmt whole codebase (#38)
1 parent 2400506 commit 200eaaf

File tree

6 files changed

+151
-137
lines changed

6 files changed

+151
-137
lines changed

‎src/arithmetics/mod.rs

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ use ceno_mle::expression::{Expression, Fixed, Instance};
44
use ceno_zkvm::structs::{ChallengeId, WitnessId};
55
use ff_ext::ExtensionField;
66
use ff_ext::{BabyBearExt4, SmallField};
7+
use itertools::Either;
78
use openvm_native_compiler::prelude::*;
89
use openvm_native_compiler_derive::iter_zip;
910
use openvm_native_recursion::challenger::ChallengerVariable;
1011
use openvm_native_recursion::challenger::{
1112
duplex::DuplexChallengerVariable, CanObserveVariable, FeltChallenger,
1213
};
13-
use itertools::Either;
1414
use p3_field::{FieldAlgebra, FieldExtensionAlgebra};
1515
type E = BabyBearExt4;
1616
const HASH_RATE: usize = 8;
@@ -161,7 +161,8 @@ impl<C: Config> PolyEvaluator<C> {
161161

162162
builder.range(0, idx_bound).for_each(|idx_vec, builder| {
163163
let left_idx: Usize<C::N> = builder.eval(idx_vec[0] * Usize::from(2));
164-
let right_idx: Usize<C::N> = builder.eval(idx_vec[0] * Usize::from(2) + Usize::from(1));
164+
let right_idx: Usize<C::N> =
165+
builder.eval(idx_vec[0] * Usize::from(2) + Usize::from(1));
165166
let left = builder.get(&evals_ext, left_idx);
166167
let right = builder.get(&evals_ext, right_idx);
167168

@@ -418,7 +419,11 @@ pub fn eq_eval_less_or_equal_than<C: Config>(
418419
builder.assign(&ans, ans - v1 * running_product2 * a_i * b_i);
419420
});
420421

421-
builder.assign(&running_product2, running_product2 * (a_i * b_i * bit_ext + (one_ext - a_i) * (one_ext - b_i) * (one_ext - bit_ext)));
422+
builder.assign(
423+
&running_product2,
424+
running_product2
425+
* (a_i * b_i * bit_ext + (one_ext - a_i) * (one_ext - b_i) * (one_ext - bit_ext)),
426+
);
422427
builder.assign(&idx, idx - C::N::ONE);
423428
});
424429

@@ -602,15 +607,9 @@ pub fn evaluate_ceno_expr<C: Config, T>(
602607
structural_wit_in(builder, *witness_id, *max_len, *offset, *multi_factor)
603608
}
604609
Expression::Instance(i) => instance(builder, *i),
605-
Expression::Constant(scalar) => {
606-
match scalar {
607-
Either::Left(s) => {
608-
constant(builder, E::from_base(*s))
609-
},
610-
Either::Right(s) => {
611-
constant(builder, *s)
612-
},
613-
}
610+
Expression::Constant(scalar) => match scalar {
611+
Either::Left(s) => constant(builder, E::from_base(*s)),
612+
Either::Right(s) => constant(builder, *s),
614613
},
615614
Expression::Sum(a, b) => {
616615
let a = evaluate_ceno_expr(

‎src/e2e/mod.rs

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ use openvm_stark_sdk::config::setup_tracing_with_log_level;
2222
use openvm_stark_sdk::{
2323
config::baby_bear_poseidon2::BabyBearPoseidon2Config, p3_baby_bear::BabyBear,
2424
};
25-
use std::thread;
2625
use std::collections::HashMap;
2726
use std::fs::File;
27+
use std::thread;
2828

2929
type SC = BabyBearPoseidon2Config;
3030
type EF = <SC as StarkGenericConfig>::Challenge;
@@ -129,7 +129,8 @@ pub fn parse_zkvm_proof_import(
129129
for v_vec in &opcode_proof.r_out_evals {
130130
let mut arr: Vec<E> = vec![];
131131
for v in v_vec {
132-
let v_e: E = serde_json::from_value(serde_json::to_value(v.clone()).unwrap()).unwrap();
132+
let v_e: E =
133+
serde_json::from_value(serde_json::to_value(v.clone()).unwrap()).unwrap();
133134
arr.push(v_e);
134135
}
135136
record_r_out_evals.push(arr);
@@ -138,7 +139,8 @@ pub fn parse_zkvm_proof_import(
138139
for v_vec in &opcode_proof.w_out_evals {
139140
let mut arr: Vec<E> = vec![];
140141
for v in v_vec {
141-
let v_e: E = serde_json::from_value(serde_json::to_value(v.clone()).unwrap()).unwrap();
142+
let v_e: E =
143+
serde_json::from_value(serde_json::to_value(v.clone()).unwrap()).unwrap();
142144
arr.push(v_e);
143145
}
144146
record_w_out_evals.push(arr);
@@ -147,7 +149,8 @@ pub fn parse_zkvm_proof_import(
147149
for v_vec in &opcode_proof.lk_out_evals {
148150
let mut arr: Vec<E> = vec![];
149151
for v in v_vec {
150-
let v_e: E = serde_json::from_value(serde_json::to_value(v.clone()).unwrap()).unwrap();
152+
let v_e: E =
153+
serde_json::from_value(serde_json::to_value(v.clone()).unwrap()).unwrap();
151154
arr.push(v_e);
152155
}
153156
record_lk_out_evals.push(arr);
@@ -227,7 +230,7 @@ pub fn parse_zkvm_proof_import(
227230
});
228231
}
229232
}
230-
233+
231234
let mut wits_in_evals: Vec<E> = vec![];
232235
for v in &opcode_proof.wits_in_evals {
233236
let v_e: E = serde_json::from_value(serde_json::to_value(v.clone()).unwrap()).unwrap();
@@ -266,7 +269,8 @@ pub fn parse_zkvm_proof_import(
266269
for v_vec in &table_proof.r_out_evals {
267270
let mut arr: Vec<E> = vec![];
268271
for v in v_vec {
269-
let v_e: E = serde_json::from_value(serde_json::to_value(v.clone()).unwrap()).unwrap();
272+
let v_e: E =
273+
serde_json::from_value(serde_json::to_value(v.clone()).unwrap()).unwrap();
270274
arr.push(v_e);
271275
}
272276
record_r_out_evals.push(arr);
@@ -275,7 +279,8 @@ pub fn parse_zkvm_proof_import(
275279
for v_vec in &table_proof.w_out_evals {
276280
let mut arr: Vec<E> = vec![];
277281
for v in v_vec {
278-
let v_e: E = serde_json::from_value(serde_json::to_value(v.clone()).unwrap()).unwrap();
282+
let v_e: E =
283+
serde_json::from_value(serde_json::to_value(v.clone()).unwrap()).unwrap();
279284
arr.push(v_e);
280285
}
281286
record_w_out_evals.push(arr);
@@ -284,7 +289,8 @@ pub fn parse_zkvm_proof_import(
284289
for v_vec in &table_proof.lk_out_evals {
285290
let mut arr: Vec<E> = vec![];
286291
for v in v_vec {
287-
let v_e: E = serde_json::from_value(serde_json::to_value(v.clone()).unwrap()).unwrap();
292+
let v_e: E =
293+
serde_json::from_value(serde_json::to_value(v.clone()).unwrap()).unwrap();
288294
arr.push(v_e);
289295
}
290296
record_lk_out_evals.push(arr);
@@ -411,7 +417,7 @@ pub fn inner_test_thread() {
411417

412418
let verifier = ZKVMVerifier::new(vk);
413419
let (zkvm_proof_input, proving_sequence) = parse_zkvm_proof_import(zkvm_proof, &verifier);
414-
420+
415421
// OpenVM DSL
416422
let mut builder = AsmBuilder::<F, EF>::default();
417423

‎src/extensions/mod.rs

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,13 @@ use crate::zkvm_verifier::verifier::verify_zkvm_proof;
1111
use crate::{
1212
arithmetics::{
1313
build_eq_x_r_vec_sequential, ceil_log2, concat, dot_product as ext_dot_product,
14-
eq_eval_less_or_equal_than, eval_wellform_address_vec,
15-
gen_alpha_pows, max_usize_arr, max_usize_vec, next_pow2_instance_padding, product,
16-
sum as ext_sum,
17-
},
18-
tower_verifier::{
19-
binding::PointVariable,
20-
program::iop_verifier_state_verify,
14+
eq_eval_less_or_equal_than, eval_wellform_address_vec, gen_alpha_pows, max_usize_arr,
15+
max_usize_vec, next_pow2_instance_padding, product, sum as ext_sum,
2116
},
17+
tower_verifier::{binding::PointVariable, program::iop_verifier_state_verify},
2218
};
23-
use ceno_zkvm::{circuit_builder::SetTableSpec, scheme::verifier::ZKVMVerifier};
2419
use ceno_mle::expression::StructuralWitIn;
20+
use ceno_zkvm::{circuit_builder::SetTableSpec, scheme::verifier::ZKVMVerifier};
2521
use ff_ext::BabyBearExt4;
2622
use itertools::interleave;
2723
use itertools::max;

‎src/tower_verifier/program.rs

Lines changed: 18 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
use super::binding::{
2-
IOPProverMessageVariable, PointAndEvalVariable, PointVariable,
3-
};
1+
use super::binding::{IOPProverMessageVariable, PointAndEvalVariable, PointVariable};
42
use crate::arithmetics::{
5-
challenger_multi_observe, dot_product, eq_eval, evaluate_at_point_degree_1, extend, exts_to_felts,
6-
fixed_dot_product, gen_alpha_pows, is_smaller_than, reverse, UniPolyExtrapolator, print_ext_arr,
3+
challenger_multi_observe, dot_product, eq_eval, evaluate_at_point_degree_1, extend,
4+
exts_to_felts, fixed_dot_product, gen_alpha_pows, is_smaller_than, print_ext_arr, reverse,
5+
UniPolyExtrapolator,
76
};
87
use crate::transcript::transcript_observe_label;
98
use crate::zkvm_verifier::binding::TowerProofInputVariable;
@@ -149,19 +148,13 @@ pub fn verify_tower_proof<C: Config>(
149148
let one: Ext<C::F, C::EF> = builder.constant(C::EF::ONE);
150149
let zero: Ext<C::F, C::EF> = builder.constant(C::EF::ZERO);
151150

152-
builder.assert_usize_eq(
153-
proof.prod_specs_eval.len(),
154-
num_prod_spec.clone(),
155-
);
151+
builder.assert_usize_eq(proof.prod_specs_eval.len(), num_prod_spec.clone());
156152
iter_zip!(builder, prod_out_evals).for_each(|ptr_vec, builder| {
157153
let ptr = ptr_vec[0];
158154
let evals = builder.iter_ptr_get(&prod_out_evals, ptr);
159155
builder.assert_usize_eq(evals.len(), num_fanin.clone());
160156
});
161-
builder.assert_usize_eq(
162-
proof.logup_specs_eval.len(),
163-
num_logup_spec.clone(),
164-
);
157+
builder.assert_usize_eq(proof.logup_specs_eval.len(), num_logup_spec.clone());
165158
iter_zip!(builder, logup_out_evals).for_each(|ptr_vec, builder| {
166159
let ptr = ptr_vec[0];
167160
let evals = builder.iter_ptr_get(&logup_out_evals, ptr);
@@ -206,12 +199,7 @@ pub fn verify_tower_proof<C: Config>(
206199
let prod_spec_point_n_eval: Array<C, PointAndEvalVariable<C>> =
207200
builder.dyn_array(num_prod_spec.clone());
208201

209-
iter_zip!(
210-
builder,
211-
prod_out_evals,
212-
prod_spec_point_n_eval
213-
)
214-
.for_each(|ptr_vec, builder| {
202+
iter_zip!(builder, prod_out_evals, prod_spec_point_n_eval).for_each(|ptr_vec, builder| {
215203
let ptr = ptr_vec[0];
216204
let evals = builder.iter_ptr_get(&prod_out_evals, ptr);
217205
let e = evaluate_at_point_degree_1(builder, &evals, &initial_rt);
@@ -309,8 +297,7 @@ pub fn verify_tower_proof<C: Config>(
309297

310298
let curr_pt = initial_rt.clone();
311299
let curr_eval = initial_claim.clone();
312-
let op_range: RVar<C::N> =
313-
builder.eval_expr(max_num_variables - Usize::from(1));
300+
let op_range: RVar<C::N> = builder.eval_expr(max_num_variables - Usize::from(1));
314301
let round: Felt<C::F> = builder.constant(C::F::ZERO);
315302

316303
let mut next_rt = PointAndEvalVariable {
@@ -369,8 +356,7 @@ pub fn verify_tower_proof<C: Config>(
369356
builder.if_eq(skip, var_zero.clone()).then(|builder| {
370357
builder.if_ne(round_var, round_limit).then_or_else(
371358
|builder| {
372-
let prod_slice =
373-
builder.get(&proof.prod_specs_eval, spec_index);
359+
let prod_slice = builder.get(&proof.prod_specs_eval, spec_index);
374360
let prod_round_slice = builder.get(&prod_slice, round_var);
375361
builder.assign(&prod, one * one);
376362
for j in 0..NUM_FANIN {
@@ -390,11 +376,8 @@ pub fn verify_tower_proof<C: Config>(
390376
});
391377

392378
let num_variables_len = num_variables.len();
393-
let logup_num_variables_slice = num_variables.slice(
394-
builder,
395-
num_prod_spec.clone(),
396-
num_variables_len.clone(),
397-
);
379+
let logup_num_variables_slice =
380+
num_variables.slice(builder, num_prod_spec.clone(), num_variables_len.clone());
398381

399382
builder
400383
.range(0, num_logup_spec.clone())
@@ -419,8 +402,7 @@ pub fn verify_tower_proof<C: Config>(
419402
builder.if_eq(skip, var_zero).then(|builder| {
420403
builder.if_ne(round_var, round_limit).then_or_else(
421404
|builder| {
422-
let prod_slice =
423-
builder.get(&proof.logup_specs_eval, spec_index);
405+
let prod_slice = builder.get(&proof.logup_specs_eval, spec_index);
424406
let prod_round_slice = builder.get(&prod_slice, round_var);
425407

426408
let p1 = builder.get(&prod_round_slice, 0);
@@ -479,14 +461,12 @@ pub fn verify_tower_proof<C: Config>(
479461
builder.cycle_tracker_start("derive next layer for prod specs");
480462
let spec_index = i_vec[0];
481463
let skip = builder.get(&should_skip, spec_index.clone());
482-
let max_round =
483-
builder.get(&num_variables, spec_index.clone());
464+
let max_round = builder.get(&num_variables, spec_index.clone());
484465
let round_limit: RVar<C::N> = builder.eval_expr(max_round - RVar::from(1));
485466

486467
// now skip is 0 if and only if current round_var is smaller than round_limit.
487468
builder.if_eq(skip, var_zero.clone()).then(|builder| {
488-
let prod_slice =
489-
builder.get(&proof.prod_specs_eval, spec_index);
469+
let prod_slice = builder.get(&proof.prod_specs_eval, spec_index);
490470
let prod_round_slice = builder.get(&prod_slice, round_var);
491471
let evals = fixed_dot_product(builder, &coeffs, &prod_round_slice, zero);
492472

@@ -520,11 +500,8 @@ pub fn verify_tower_proof<C: Config>(
520500

521501
let next_logup_spec_evals: Ext<<C as Config>::F, <C as Config>::EF> =
522502
builder.eval(zero + zero);
523-
let logup_num_variables_slice = num_variables.slice(
524-
builder,
525-
num_prod_spec.clone(),
526-
num_variables_len.clone(),
527-
);
503+
let logup_num_variables_slice =
504+
num_variables.slice(builder, num_prod_spec.clone(), num_variables_len.clone());
528505

529506
builder
530507
.range(0, num_logup_spec.clone())
@@ -544,8 +521,7 @@ pub fn verify_tower_proof<C: Config>(
544521

545522
// now skip is 0 if and only if current round_var is smaller than round_limit.
546523
builder.if_eq(skip, var_zero).then(|builder| {
547-
let prod_slice =
548-
builder.get(&proof.logup_specs_eval, spec_index);
524+
let prod_slice = builder.get(&proof.logup_specs_eval, spec_index);
549525
let prod_round_slice = builder.get(&prod_slice, round_var);
550526
let p1 = builder.get(&prod_round_slice, 0);
551527
let p2 = builder.get(&prod_round_slice, 1);
@@ -952,4 +928,4 @@ mod tests {
952928
unsafe { Vec::from_raw_parts(new_ptr, length, capacity) }
953929
}
954930
}
955-
*/
931+
*/

‎src/zkvm_verifier/binding.rs

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -378,9 +378,15 @@ impl Hintable<InnerConfig> for ZKVMOpcodeProofInput {
378378
let log2_num_instances = ceil_log2(next_pow2_instance);
379379
stream.extend(<usize as Hintable<InnerConfig>>::write(&log2_num_instances));
380380

381-
stream.extend(<usize as Hintable<InnerConfig>>::write(&self.record_r_out_evals_len));
382-
stream.extend(<usize as Hintable<InnerConfig>>::write(&self.record_w_out_evals_len));
383-
stream.extend(<usize as Hintable<InnerConfig>>::write(&self.record_lk_out_evals_len));
381+
stream.extend(<usize as Hintable<InnerConfig>>::write(
382+
&self.record_r_out_evals_len,
383+
));
384+
stream.extend(<usize as Hintable<InnerConfig>>::write(
385+
&self.record_w_out_evals_len,
386+
));
387+
stream.extend(<usize as Hintable<InnerConfig>>::write(
388+
&self.record_lk_out_evals_len,
389+
));
384390

385391
stream.extend(self.record_r_out_evals.write());
386392
stream.extend(self.record_w_out_evals.write());
@@ -463,9 +469,15 @@ impl Hintable<InnerConfig> for ZKVMTableProofInput {
463469
let log2_num_instances = ceil_log2(self.num_instances);
464470
stream.extend(<usize as Hintable<InnerConfig>>::write(&log2_num_instances));
465471

466-
stream.extend(<usize as Hintable<InnerConfig>>::write(&self.record_r_out_evals_len));
467-
stream.extend(<usize as Hintable<InnerConfig>>::write(&self.record_w_out_evals_len));
468-
stream.extend(<usize as Hintable<InnerConfig>>::write(&self.record_lk_out_evals_len));
472+
stream.extend(<usize as Hintable<InnerConfig>>::write(
473+
&self.record_r_out_evals_len,
474+
));
475+
stream.extend(<usize as Hintable<InnerConfig>>::write(
476+
&self.record_w_out_evals_len,
477+
));
478+
stream.extend(<usize as Hintable<InnerConfig>>::write(
479+
&self.record_lk_out_evals_len,
480+
));
469481

470482
stream.extend(self.record_r_out_evals.write());
471483
stream.extend(self.record_w_out_evals.write());

0 commit comments

Comments
 (0)