ed255/pod2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix #315, and add cargo check in GitHub CI with zk feature disabled (#316)

Browse source
This commit is contained in:
arnaucube 2025-07-01 12:02:12 +02:00 • committed by GitHub
parent b123185ee9
commit e0d2fce060
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/build.yml vendored
View file

@ -20,6 +20,8 @@ jobs:
toolchain: stable toolchain: stable
- name: Build default - name: Build default
run: cargo build run: cargo build
- name: Build non-zk # check without the zk feature enabled
run: cargo build --no-default-features --features backend_plonky2
- name: Build metrics - name: Build metrics
run: cargo build --features metrics run: cargo build --features metrics
- name: Build time - name: Build time

5
src/backends/plonky2/recursion/circuit.rs
View file

@ -422,7 +422,7 @@ fn estimate_verif_num_gates(degree_bits: usize) -> usize {
{ {
// Formula obtained via linear regression using `test_measure_recursion` // Formula obtained via linear regression using `test_measure_recursion`
// results with `standard_recursion_config`. // results with `standard_recursion_config`.
let num_gates: usize = 236 * degree_bits + 1171; num_gates = 236 * degree_bits + 1171;
} }
// Add 2% for error because the results are not a clean line // Add 2% for error because the results are not a clean line
num_gates * 102 / 100 num_gates * 102 / 100
@ -441,6 +441,7 @@ fn estimate_gates_after_zk(degree_bits: usize) -> usize {
} }
// how many blinding gates are in this zk circuit // how many blinding gates are in this zk circuit
#[cfg(feature = "zk")]
fn blinding_gates(degree_bits: usize) -> usize { fn blinding_gates(degree_bits: usize) -> usize {
// Table data obtained using `test_measure_zk_recursion`, and printing // Table data obtained using `test_measure_zk_recursion`, and printing
// `regular_poly_openings + 2 * z_openings` at method `blind` of the file // `regular_poly_openings + 2 * z_openings` at method `blind` of the file
@ -491,6 +492,7 @@ pub fn common_data_for_recursion<I: InnerCircuit>(
// `ConstantGate`s (that's MAX_CONSTANT_GATES*2 constants in the // `ConstantGate`s (that's MAX_CONSTANT_GATES*2 constants in the
// standard_recursion_config). And if the zk feature is enabled, add // standard_recursion_config). And if the zk feature is enabled, add
// space for the blinding gates. // space for the blinding gates.
#[allow(unused_mut)]
let mut total_num_gates = inner_num_gates let mut total_num_gates = inner_num_gates
+ verif_num_gates * arity + verif_num_gates * arity
+ circuit_data.common.num_public_inputs.div_ceil(8) + circuit_data.common.num_public_inputs.div_ceil(8)
@ -530,6 +532,7 @@ pub fn pad_circuit(builder: &mut CircuitBuilder<F, D>, common_data: &CommonCircu
// have been registered, so we can't know exactly how many `ConstantGates` will be required. // have been registered, so we can't know exactly how many `ConstantGates` will be required.
// We hope that no more than MAX_CONSTANT_GATES*2 constants are used :pray:. Maybe we should // We hope that no more than MAX_CONSTANT_GATES*2 constants are used :pray:. Maybe we should
// make a PR to plonky2 to expose this? // make a PR to plonky2 to expose this?
#[allow(unused_mut)]
let mut num_gates = degree - common_data.num_public_inputs.div_ceil(8) - 1 - MAX_CONSTANT_GATES; let mut num_gates = degree - common_data.num_public_inputs.div_ceil(8) - 1 - MAX_CONSTANT_GATES;
#[cfg(feature = "zk")] #[cfg(feature = "zk")]
{ {