Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions extensions/native/circuit/src/sumcheck/chip.rs
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,8 @@ where
let eval_rlc = FieldExtension::multiply(alpha_acc, eval);
prod_specific.eval_rlc = eval_rlc;

if mode == NEXT_LAYER_MODE && round + 1 < max_round - 1 {
let to_next_round = if mode == NEXT_LAYER_MODE { 1 } else { 0 };
if round + to_next_round < max_round - 1 {
eval_acc = FieldExtension::add(eval_acc, eval_rlc);
prod_row.should_acc = F::ONE;
prod_row.prod_acc = F::ONE;
Expand Down Expand Up @@ -445,7 +446,8 @@ where
FieldExtension::multiply(alpha_denominator, q_eval),
);
logup_specific.eval_rlc = eval_rlc;
if mode == NEXT_LAYER_MODE && round + 1 < max_round - 1 {
let to_next_round = if mode == NEXT_LAYER_MODE { 1 } else { 0 };
if round + to_next_round < max_round - 1 {
eval_acc = FieldExtension::add(eval_acc, eval_rlc);
logup_row.should_acc = F::ONE;
logup_row.logup_acc = F::ONE;
Expand Down Expand Up @@ -480,12 +482,16 @@ where
let specific: &mut ProdSpecificCols<F> =
row.specific[..ProdSpecificCols::<F>::width()].borrow_mut();

eval_acc = FieldExtension::subtract(eval_acc, specific.eval_rlc);
if row.should_acc == F::ONE {
eval_acc = FieldExtension::subtract(eval_acc, specific.eval_rlc);
}
row.eval_acc = eval_acc;
} else if row.logup_row == F::ONE {
let specific: &mut LogupSpecificCols<F> =
row.specific[..LogupSpecificCols::<F>::width()].borrow_mut();
eval_acc = FieldExtension::subtract(eval_acc, specific.eval_rlc);
if row.should_acc == F::ONE {
eval_acc = FieldExtension::subtract(eval_acc, specific.eval_rlc);
}
row.eval_acc = eval_acc;
}
}
Expand Down
8 changes: 5 additions & 3 deletions extensions/native/circuit/src/sumcheck/execution.rs
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,8 @@ unsafe fn execute_e12_impl<F: PrimeField32, CTX: ExecutionCtxTrait>(

exec_state.vm_write(NATIVE_AS, r_evals_ptr_u32 + (1 + i) * EXT_DEG as u32, &eval);

if mode == NEXT_LAYER_MODE && round + 1 < max_round - 1 {
let to_next_round = if mode == NEXT_LAYER_MODE { 1 } else { 0 };
if round + to_next_round < max_round - 1 {
// update eval_acc
eval_acc = FieldExtension::add(eval_acc, FieldExtension::multiply(alpha_acc, eval));
}
Expand All @@ -270,8 +271,8 @@ unsafe fn execute_e12_impl<F: PrimeField32, CTX: ExecutionCtxTrait>(
.vm_read(NATIVE_AS, logup_offset + i)
.map(|x: F| x.as_canonical_u32());
let start = calculate_3d_ext_idx(
logup_specs_inner_len,
logup_specs_inner_inner_len,
logup_specs_inner_len,
i,
round,
0,
Expand Down Expand Up @@ -325,7 +326,8 @@ unsafe fn execute_e12_impl<F: PrimeField32, CTX: ExecutionCtxTrait>(
FieldExtension::multiply(alpha_numerator, p_eval),
FieldExtension::multiply(alpha_denominator, q_eval),
);
if mode == NEXT_LAYER_MODE && round + 1 < max_round - 1 {
let to_next_round = if mode == NEXT_LAYER_MODE { 1 } else { 0 };
if round + to_next_round < max_round - 1 {
// update eval_acc
eval_acc = FieldExtension::add(eval_acc, eval_rlc);
}
Expand Down
Loading
Loading