Skip to content

Feat/merlin #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Fantoni0 merged 10 commits into from
Jul 2, 2025
Merged

Feat/merlin #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
3544b1f
Improve compute_h and compute_h2
Fantoni0 Jun 11, 2025
dfa43df
Reduce allocations
Fantoni0 Jun 11, 2025
0240f9d
Commit before merge
Fantoni0 Jun 12, 2025
c62f4ce
Merge remote origin/main_folding
Fantoni0 Jun 12, 2025
4b52503
Cargo fmt
Fantoni0 Jun 12, 2025
641e86a
Fix clippy
Fantoni0 Jun 12, 2025
19bda58
Add size to benches
Fantoni0 Jun 19, 2025
2bcbfc5
Update matrex dependency
Fantoni0 Jun 19, 2025
334b26d
Add Merlin support
Fantoni0 Jul 2, 2025
b47a10d
Missing export
Fantoni0 Jul 2, 2025
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
115 changes: 70 additions & 45 deletions benches/mova_matrix.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,21 @@ use folding_schemes::commitment::hyrax::HyraxGenerators;
use folding_schemes::folding::nova::nifs::mova_matrix::{RelaxedCommittedRelation, Witness, NIFS};
use folding_schemes::transcript::poseidon::poseidon_canonical_config;
use folding_schemes::Curve;
use matrex::Matrix;
use matrex::{Matrix, MatrixSize, SparseMatrix};
use rand::{Rng, RngCore};
use std::time::{Duration, Instant};

const NUM_OF_PRECONDITION_FOLDS: &[usize] = &[1, 10, 20, 40];

fn dense_to_sparse_vec<C: Curve>(input: &[C::ScalarField]) -> Vec<(usize, C::ScalarField)> {
input
.iter()
.enumerate()
.filter(|(_, x)| **x != C::ScalarField::from(0))
.map(|(i, x)| (i, *x))
.collect()
}

fn random_sparse_matrix<C: Curve>(n: usize, rng: &mut impl RngCore) -> Matrix<C::ScalarField> {
let elements = (0..n)
.map(|row| {
Expand All @@ -39,7 +48,20 @@ fn get_instances<C: Curve>(
// B matrix
let b = random_sparse_matrix::<C>(n, rng);
// C = A * B matrix
let c = (&a * &b).unwrap();
let c: Matrix<C::ScalarField> = (&a * &b).unwrap();
// Enforce sparse matrices
let c = if c.is_dense() {
Matrix::Sparse(
SparseMatrix::from_vec(
dense_to_sparse_vec::<C>(c.as_dense_slice().unwrap()),
c.rows(),
c.cols(),
)
.unwrap(),
)
} else {
c
};
// Error matrix initialized to 0s
let e = Matrix::zero(n, n);

Expand All @@ -58,57 +80,60 @@ fn get_instances<C: Curve>(
fn bench_mova_matrix(c: &mut Criterion) {
let mut group = c.benchmark_group("mova_matrix_sequential_folding");
let mut rng = ark_std::test_rng();
let mat_dim = 4; // 4x4 matrices
let mat_dim = 16; // Must be a power of 2

for count in NUM_OF_PRECONDITION_FOLDS {
group
.measurement_time(Duration::from_secs(20 * (*count as u64)))
.bench_function(&format!("{count}"), |b| {
// Set up transcript and commitment scheme
let hyrax_params =
HyraxGenerators::<Projective>::setup(&mut rng, mat_dim * mat_dim);
let poseidon_config = poseidon_canonical_config::<Fr>();
let pp_hash = Fr::rand(&mut rng);
.bench_function(
&format!("mova_matrix_sequential_folding/size={mat_dim}x{mat_dim}/n_folds={count}"),
|b| {
// Set up transcript and commitment scheme
let hyrax_params =
HyraxGenerators::<Projective>::setup(&mut rng, mat_dim * mat_dim);
let poseidon_config = poseidon_canonical_config::<Fr>();
let pp_hash = Fr::rand(&mut rng);

b.iter_custom(|iters| {
let mut total_duration = Duration::ZERO;
for _ in 0..iters {
let mut instances: Vec<(
Witness<Projective>,
RelaxedCommittedRelation<Projective>,
)> = get_instances::<Projective>(
count + 1, // we want the number of folds plus one for the acc_instance
mat_dim,
&mut rng,
&hyrax_params,
);
let mut transcript_p = PoseidonSponge::<Fr>::new(&poseidon_config);
let mut acc = instances.pop().unwrap();
b.iter_custom(|iters| {
let mut total_duration = Duration::ZERO;
for _ in 0..iters {
let mut instances: Vec<(
Witness<Projective>,
RelaxedCommittedRelation<Projective>,
)> = get_instances::<Projective>(
count + 1, // we want the number of folds plus one for the acc_instance
mat_dim,
&mut rng,
&hyrax_params,
);
let mut transcript_p = PoseidonSponge::<Fr>::new(&poseidon_config);
let mut acc = instances.pop().unwrap();

for _ in 0..*count {
let mut next = instances.pop().unwrap();
total_duration += {
let timer = Instant::now();
for _ in 0..*count {
let mut next = instances.pop().unwrap();
total_duration += {
let timer = Instant::now();

let (wit_acc, inst_acc, _) =
NIFS::<Projective, PoseidonSponge<Fr>>::prove(
&mut transcript_p,
pp_hash,
&mut next.0,
&next.1,
&acc.0,
&acc.1,
)
.unwrap();
let time = timer.elapsed();
acc = (wit_acc, inst_acc);
time
};
let (wit_acc, inst_acc, _) =
NIFS::<Projective, PoseidonSponge<Fr>>::prove(
&mut transcript_p,
pp_hash,
&mut next.0,
&next.1,
&acc.0,
&acc.1,
)
.unwrap();
let time = timer.elapsed();
acc = (wit_acc, inst_acc);
time
};
}
}
}
total_duration
});
});
total_duration
});
},
);
}
}

Expand Down
3 changes: 1 addition & 2 deletions folding-schemes/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@ num-bigint = "0.4"
num-integer = "0.1"
sha3 = "0.10"
log = "0.4"
matrex = {git = "ssh://git@github.com/NethermindEth/matrex.git", features = ["parallel"]}

matrex = {git = "ssh://git@github.com/NethermindEth/matrex.git", branch = "main", features = ["parallel"]}

[dev-dependencies]
ark-pallas = {version="^0.5.0", features=["r1cs"]}
Expand Down
Loading
Loading