Skip to content

Commit 0ee780f

Browse files
ShuangWu121ShuangWu121
committed
clean a bit
1 parent 74232d8 commit 0ee780f

File tree

3 files changed

+55
-132
lines changed

3 files changed

+55
-132
lines changed

Diff for: ‎backend/src/stwo/bus_acc_gen.rs

+3-60
Original file line numberDiff line numberDiff line change
@@ -101,11 +101,7 @@ impl PowdrLogupColGenerator<'_> {
101101

102102
self.gen.trace.push(self.numerator.clone());
103103

104-
// println!(
105-
// "\n fraction trace now in logup generator is {:?} ",
106-
// self.gen.trace
107-
// );
108-
// println!("length of gen.trace after fraction {}", self.gen.trace.len());
104+
109105

110106
let mut last_value = QM31::zero();
111107

@@ -132,7 +128,7 @@ impl PowdrLogupColGenerator<'_> {
132128
}
133129
self.gen.trace.push(self.numerator);
134130

135-
//println!("\n length of gen.trace after accumulator compute {}", self.gen.trace.len());
131+
136132

137133

138134

@@ -162,62 +158,9 @@ impl PowdrLogupColGenerator<'_> {
162158
})
163159
})
164160
.collect_vec();
165-
// println!(
166-
// "\n the gen.trace trace in the bus acc gen is {:?}",
167-
// self.gen.trace
168-
// );
169-
170-
// println!(
171-
// "\n the trace in the bus acc gen is {:?}",
172-
// trace
173-
// );
161+
174162
trace[trace.len().saturating_sub(4)..].to_vec()
175163

176164
}
177165

178-
// pub fn compute_acc_col(mut self)->
179-
// ColumnVec<CircleEvaluation<SimdBackend, BaseField, BitReversedOrder>>
180-
// {
181-
182-
// // let mut last_col_coords = self.trace.pop().unwrap().columns;
183-
184-
// // // Compute cumsum_shift.
185-
// // let coordinate_sums = last_col_coords.each_ref().map(|c| {
186-
// // c.data
187-
// // .iter()
188-
// // .copied()
189-
// // .sum::<PackedBaseField>()
190-
// // .pointwise_sum()
191-
// // });
192-
193-
// let mut acc=PackedQM31::zero();
194-
195-
// #[allow(clippy::needless_range_loop)]
196-
// for vec_row in 0..(1 << (self.gen.log_size - LOG_N_LANES)) {
197-
// unsafe {
198-
// let value = self.gen.trace.last().unwrap().packed_at(vec_row);
199-
// acc=acc+value;
200-
// let prev_value = self
201-
// .gen
202-
// .trace
203-
// .last()
204-
// .map(|col| col.packed_at(vec_row))
205-
// .unwrap_or_else(PackedSecureField::zero);
206-
// self.numerator.set_packed(vec_row, acc)
207-
// };
208-
// }
209-
// self.gen.trace.push(self.numerator);
210-
211-
// let trace = self.gen
212-
// .trace.clone()
213-
// .into_iter()
214-
// .flat_map(|eval| {
215-
// eval.columns.map(|col| {
216-
// CircleEvaluation::new(CanonicCoset::new(self.log_size).circle_domain(), col)
217-
// })
218-
// })
219-
// .collect_vec();
220-
// trace
221-
222-
// }
223166
}

Diff for: ‎backend/src/stwo/circuit_builder.rs

+12-18
Original file line numberDiff line numberDiff line change
@@ -350,10 +350,10 @@ impl FrameworkEval for PowdrEval {
350350
for id in &self.analyzed.identities {
351351
match id {
352352
Identity::Polynomial(identity) => {
353-
// println!("evaluating normal constraint");
354-
// let expr = evaluator.evaluate(&identity.expression);
355-
// eval.add_constraint(expr);
356-
// println!("constraint added");
353+
354+
let expr = evaluator.evaluate(&identity.expression);
355+
eval.add_constraint(expr);
356+
357357
}
358358
Identity::Connect(..) => {
359359
unimplemented!("Connect is not implemented in stwo yet")
@@ -366,11 +366,9 @@ impl FrameworkEval for PowdrEval {
366366
}
367367
Identity::PhantomBusInteraction(id) => {
368368
println!("machine name: {}", self.machine_name);
369-
// if id.id!=29{
370-
// println!("bus id: {}, skip", id.id);
371-
// continue;
372-
// }
373-
//println!("\n bus relation is: {}", id);
369+
370+
371+
println!("\n bus relation is: {}", id);
374372

375373
self.bus_info_to_interation_map
376374
.iter()
@@ -388,20 +386,16 @@ impl FrameworkEval for PowdrEval {
388386

389387
let payload: Vec<<E as EvalAtRow>::F> =
390388
id.payload.0.iter().map(|e| {
391-
println!("find expression {:?}", e);
389+
392390
evaluator.evaluate(e)}).collect();
393391

394392
let multiplicity =
395393
<E as EvalAtRow>::EF::from(evaluator.evaluate(&id.multiplicity));
396-
println!("multiplicity is {:?}", multiplicity);
397-
println!("finish evaluating multiplicity");
394+
398395

399396
let denominator: <E as EvalAtRow>::EF = self.lookup_elements.combine(&payload);
400-
println!("denominator is {:?}", denominator);
397+
401398

402-
// println!("finish evaluating denominator");
403-
404-
// Is_not_First * ((acc-acc_prev)*payload_linear_combination - multiplicity) = 0
405399
eval.add_constraint::<<E as EvalAtRow>::EF>(
406400
<E as EvalAtRow>::EF::from(selector_not_first.clone())
407401
* ((bus_accumulator_eval.get(&id.id).unwrap()[1].clone()
@@ -410,8 +404,8 @@ impl FrameworkEval for PowdrEval {
410404
- multiplicity),
411405
);
412406

413-
// println!("finish adding constraint");
414-
// add boundary constraints for accumulator
407+
408+
// TODO:add publics constraints for accumulator
415409
}
416410
Identity::PhantomPermutation(..) | Identity::PhantomLookup(..) => {}
417411
}

Diff for: ‎backend/src/stwo/prover.rs

+40-54
Original file line numberDiff line numberDiff line change
@@ -182,14 +182,14 @@ where
182182
//Group the fixed columns by size
183183
let fixed_columns = &fixed_columns[&size];
184184
let log_size = size.ilog2();
185-
println!("grouped fixed columns with log size: {}", log_size);
186-
println!(
187-
"with fixed columns names are {:?}",
188-
fixed_columns
189-
.iter()
190-
.map(|(name, vec)| (name, vec.len().ilog2()))
191-
.collect::<Vec<_>>()
192-
);
185+
// println!("grouped fixed columns with log size: {}", log_size);
186+
// println!(
187+
// "with fixed columns names are {:?}",
188+
// fixed_columns
189+
// .iter()
190+
// .map(|(name, vec)| (name, vec.len().ilog2()))
191+
// .collect::<Vec<_>>()
192+
// );
193193
let mut constant_trace: ColumnVec<
194194
CircleEvaluation<SimdBackend, BaseField, BitReversedOrder>,
195195
> = fixed_columns
@@ -372,14 +372,14 @@ where
372372
.clone()
373373
})
374374
{
375-
println!(
376-
"constant trace size by machine {}, sizes are: {:?}",
377-
machine,
378-
constant_trace
379-
.iter()
380-
.map(|col| col.data.len().ilog2())
381-
.collect::<Vec<_>>()
382-
);
375+
// println!(
376+
// "constant trace size by machine {}, sizes are: {:?}",
377+
// machine,
378+
// constant_trace
379+
// .iter()
380+
// .map(|col| col.data.len().ilog2())
381+
// .collect::<Vec<_>>()
382+
// );
383383
constant_cols.extend(constant_trace)
384384
}
385385
machine_log_sizes.insert(machine.clone(), machine_length.ilog2());
@@ -442,25 +442,25 @@ where
442442

443443
// commit to constant columns
444444
let mut tree_builder = commitment_scheme.tree_builder();
445-
println!(
446-
"constant trace size: {:?}",
447-
constant_cols
448-
.iter()
449-
.map(|col| col.data.len().ilog2())
450-
.collect::<Vec<_>>()
451-
);
445+
// println!(
446+
// "constant trace size: {:?}",
447+
// constant_cols
448+
// .iter()
449+
// .map(|col| col.data.len().ilog2())
450+
// .collect::<Vec<_>>()
451+
// );
452452
tree_builder.extend_evals(constant_cols);
453453
tree_builder.commit(prover_channel);
454454

455455
// commit to witness columns of stage 0
456456
let mut tree_builder = commitment_scheme.tree_builder();
457-
println!(
458-
"stage0 witness trace size: {:?}",
459-
stage0_witness_cols_circle_domain_eval
460-
.iter()
461-
.map(|col| col.data.len().ilog2())
462-
.collect::<Vec<_>>()
463-
);
457+
// println!(
458+
// "stage0 witness trace size: {:?}",
459+
// stage0_witness_cols_circle_domain_eval
460+
// .iter()
461+
// .map(|col| col.data.len().ilog2())
462+
// .collect::<Vec<_>>()
463+
// );
464464
tree_builder.extend_evals(stage0_witness_cols_circle_domain_eval);
465465

466466
tree_builder.commit(prover_channel);
@@ -524,11 +524,11 @@ where
524524
if stage0_witness_name_list.contains(witness_name) {
525525
None
526526
} else {
527-
println!(
528-
"stage 1 witness name {} and size {}",
529-
witness_name,
530-
vec.len().ilog2()
531-
);
527+
// println!(
528+
// "stage 1 witness name {} and size {}",
529+
// witness_name,
530+
// vec.len().ilog2()
531+
// );
532532
Some(gen_stwo_circle_column(
533533
*domain_map
534534
.get(&(vec.len().ilog2() as usize))
@@ -657,13 +657,7 @@ where
657657

658658
for index in 0..(1 << log_size_payload) {
659659
bitreverse_multiplicity_col.set(
660-
// bit_reverse_index(
661-
// coset_index_to_circle_domain_index(
662-
// index,
663-
// log_size_payload,
664-
// ),
665-
// log_size_payload,
666-
// ),
660+
667661
index,
668662
into_stwo_field(&evaluate(
669663
log_size_payload,
@@ -684,27 +678,19 @@ where
684678
.iter()
685679
.map(|col| col.data[vec_row]) // Extract data at vec_row
686680
.collect();
687-
// println!("payload denom values are {:?}", payload_denom_values);
681+
688682
let q: PackedSecureField =
689683
lookup_elements.combine(&payload_denom_values);
690684

691-
// println!("multiplicity is {:?}", p);
692-
// println!("payload is {:?}", q);
685+
693686

694687
col_gen.write_frac(vec_row, p.into(), q);
695688
}
696689

697690
let trace = col_gen.finalize_col();
698-
//let trace=col_gen.compute_acc_col();
699-
// let (trace, claim_sum) = logup_gen.finalize_last();
691+
700692
let mut tree_builder = commitment_scheme.tree_builder();
701-
// println!(
702-
// "for interaction {}, supply totally {} number of acc witness",
703-
// interaction_id,
704-
// trace.len()
705-
// );
706-
//println!("\n at the end, the acc that is extended to the commit the acc trace is {:?}", trace);
707-
// println!("the acc sum is {:?}",claim_sum);
693+
708694
tree_builder.extend_evals(trace.clone());
709695
tree_builder.commit(prover_channel);
710696
}

0 commit comments

Comments
 (0)