Skip to content
This repository was archived by the owner on Sep 9, 2025. It is now read-only.

Add a macro to instantiate bivariate_sumcheck tests #783

Open
GraDKh wants to merge 1 commit into
base: dgordon/add_macros_for_compute_tests
Choose a base branch
from
Open

Add a macro to instantiate bivariate_sumcheck tests #783

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
42 changes: 0 additions & 42 deletions crates/core/src/protocols/sumcheck/v3/bivariate_mlecheck.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -517,45 +517,3 @@ fn calculate_round_evals<'a, F: TowerField, Hal: ComputeLayer<F>>(
let evals = TryInto::<[F; 2]>::try_into(evals).expect("kernel returns two values");
Ok(evals)
}

#[cfg(test)]
mod tests {
use binius_compute::cpu::layer::CpuLayerHolder;
use binius_core_test_utils::bivariate_sumcheck::generic_test_bivariate_mlecheck_prove_verify;
use binius_fast_compute::layer::FastCpuLayerHolder;
use binius_field::{
arch::OptimalUnderlier, as_packed_field::PackedType, tower::CanonicalTowerFamily,
};
use binius_math::B128;

#[test]
fn test_bivariate_mlecheck_prove_verify() {
let compute_holder = CpuLayerHolder::<B128>::new(1 << 13, 1 << 12);
let n_vars = 8;
let n_multilins = 8;
let n_compositions = 8;
generic_test_bivariate_mlecheck_prove_verify(
compute_holder,
n_vars,
n_multilins,
n_compositions,
);
}

#[test]
fn test_bivariate_mlecheck_prove_verify_fast() {
type F = B128;
type P = PackedType<OptimalUnderlier, F>;

let compute_holder = FastCpuLayerHolder::<CanonicalTowerFamily, P>::new(1 << 13, 1 << 12);
let n_vars = 8;
let n_multilins = 8;
let n_compositions = 8;
generic_test_bivariate_mlecheck_prove_verify(
compute_holder,
n_vars,
n_multilins,
n_compositions,
);
}
}
66 changes: 0 additions & 66 deletions crates/core/src/protocols/sumcheck/v3/bivariate_product.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,69 +429,3 @@ pub enum PhaseState<F: Field> {
InitialSums(Vec<F>),
BatchedSum(F),
}

#[cfg(test)]
mod tests {
use binius_compute::cpu::layer::CpuLayerHolder;
use binius_core_test_utils::bivariate_sumcheck::{
generic_test_bivariate_sumcheck_prove_verify, generic_test_calculate_round_evals,
};
use binius_fast_compute::layer::FastCpuLayerHolder;
use binius_field::{
BinaryField128b, arch::OptimalUnderlier, as_packed_field::PackedType,
tower::CanonicalTowerFamily,
};
use binius_math::B128;

#[test]
fn test_calculate_round_evals() {
let compute_holder = CpuLayerHolder::new(1 << 11, 1 << 10);
let n_vars = 8;
generic_test_calculate_round_evals(compute_holder, n_vars)
}

#[test]
fn test_calculate_round_evals_fast_cpu() {
type F = BinaryField128b;
type Packed = PackedType<OptimalUnderlier, F>;

let compute_holder =
FastCpuLayerHolder::<CanonicalTowerFamily, Packed>::new(1 << 11, 1 << 10);
let n_vars = 8;
generic_test_calculate_round_evals(compute_holder, n_vars)
}

#[test]
fn test_bivariate_sumcheck_prove_verify() {
let n_vars = 8;
let n_multilins = 8;
let n_compositions = 8;

let compute_holder = CpuLayerHolder::<B128>::new(1 << 13, 1 << 12);
generic_test_bivariate_sumcheck_prove_verify(
compute_holder,
n_vars,
n_multilins,
n_compositions,
)
}

#[test]
fn test_bivariate_sumcheck_prove_verify_fast() {
type F = BinaryField128b;
type Packed = PackedType<OptimalUnderlier, F>;

let n_vars = 8;
let n_multilins = 8;
let n_compositions = 8;
let compute_holder =
FastCpuLayerHolder::<CanonicalTowerFamily, Packed>::new(1 << 13, 1 << 12);

generic_test_bivariate_sumcheck_prove_verify(
compute_holder,
n_vars,
n_multilins,
n_compositions,
)
}
}
41 changes: 41 additions & 0 deletions crates/core/test_utils/src/bivariate_sumcheck.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,3 +456,44 @@ pub fn generic_test_bivariate_mlecheck_prove_verify<
assert_eq!(multilin_i.evaluate(query.to_ref()).unwrap(), eval);
}
}

#[macro_export]
macro_rules! instantiate_bivariate_sumcheck_tests {
($compute_holder:ty) => {
#[test]
fn test_calculate_round_evals() {
let compute_holder = <$compute_holder>::new(1 << 11, 1 << 10);
let n_vars = 8;
$crate::bivariate_sumcheck::generic_test_calculate_round_evals(compute_holder, n_vars)
}

#[test]
fn test_bivariate_sumcheck_prove_verify() {
let n_vars = 8;
let n_multilins = 8;
let n_compositions = 8;

let compute_holder = <$compute_holder>::new(1 << 13, 1 << 12);
$crate::bivariate_sumcheck::generic_test_bivariate_sumcheck_prove_verify(
compute_holder,
n_vars,
n_multilins,
n_compositions,
)
}

#[test]
fn test_bivariate_mlecheck_prove_verify() {
let compute_holder = <$compute_holder>::new(1 << 13, 1 << 12);
let n_vars = 8;
let n_multilins = 8;
let n_compositions = 8;
$crate::bivariate_sumcheck::generic_test_bivariate_mlecheck_prove_verify(
compute_holder,
n_vars,
n_multilins,
n_compositions,
);
}
};
}
23 changes: 23 additions & 0 deletions crates/core/tests/bivariate_sumcheck.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
// Copyright 2025 Irreducible Inc.

use binius_compute::cpu::layer::CpuLayerHolder;
use binius_core_test_utils::instantiate_bivariate_sumcheck_tests;
use binius_fast_compute::layer::FastCpuLayerHolder;
use binius_field::{
arch::OptimalUnderlier, as_packed_field::PackedType, tower::CanonicalTowerFamily,
};
use binius_math::B128;

mod cpu_layer {
use super::*;

instantiate_bivariate_sumcheck_tests!(CpuLayerHolder<B128>);
}

mod fast_cpu_layer {
use super::*;

instantiate_bivariate_sumcheck_tests!(
FastCpuLayerHolder::<CanonicalTowerFamily, PackedType<OptimalUnderlier, B128>>
);
}
Loading