This commit is contained in:
Jean-Philippe Bossuat
2024-12-31 15:30:57 +01:00
parent c65522099b
commit 8d84727fae
17 changed files with 422 additions and 363 deletions

View File

@@ -3,25 +3,25 @@ use math::{modulus::prime::Prime,dft::ntt::Table};
use math::dft::DFT;
fn forward_inplace(c: &mut Criterion) {
fn runner<T: DFT<u64> + 'static>(prime_instance: Prime<u64>, nth_root: u64) -> Box<dyn FnMut()> {
fn runner(prime_instance: Prime<u64>, nth_root: u64) -> Box<dyn FnMut()> {
let ntt_table: Table<u64> = Table::<u64>::new(prime_instance, nth_root);
let mut a: Vec<u64> = vec![0; (nth_root >> 1) as usize];
for i in 0..a.len(){
a[i] = i as u64;
}
Box::new(move || {
ntt_table.forward_inplace(&mut a)
ntt_table.forward_inplace::<false>(&mut a)
})
}
let mut b: criterion::BenchmarkGroup<'_, criterion::measurement::WallTime> = c.benchmark_group("forward_inplace");
for log_nth_root in 11..18 {
let mut prime_instance: Prime<u64> = Prime::<u64>::new(0x1fffffffffe00001, 1);
let prime_instance: Prime<u64> = Prime::<u64>::new(0x1fffffffffe00001, 1);
let runners = [
("prime", {
runner::<Table<u64>>(prime_instance, 1<<log_nth_root)
runner(prime_instance, 1<<log_nth_root)
}),
];
for (name, mut runner) in runners {
@@ -32,7 +32,7 @@ fn forward_inplace(c: &mut Criterion) {
}
fn forward_inplace_lazy(c: &mut Criterion) {
fn runner<T: DFT<u64> + 'static>(prime_instance: Prime<u64>, nth_root: u64) -> Box<dyn FnMut()> {
fn runner(prime_instance: Prime<u64>, nth_root: u64) -> Box<dyn FnMut()> {
let ntt_table: Table<u64> = Table::<u64>::new(prime_instance, nth_root);
let mut a: Vec<u64> = vec![0; (nth_root >> 1) as usize];
for i in 0..a.len(){
@@ -50,7 +50,7 @@ fn forward_inplace_lazy(c: &mut Criterion) {
let runners = [
("prime", {
runner::<Table<u64>>(prime_instance, 1<<log_nth_root)
runner(prime_instance, 1<<log_nth_root)
}),
];
for (name, mut runner) in runners {
@@ -61,14 +61,14 @@ fn forward_inplace_lazy(c: &mut Criterion) {
}
fn backward_inplace(c: &mut Criterion) {
fn runner<T: DFT<u64> + 'static>(prime_instance: Prime<u64>, nth_root: u64) -> Box<dyn FnMut()> {
fn runner(prime_instance: Prime<u64>, nth_root: u64) -> Box<dyn FnMut()> {
let ntt_table: Table<u64> = Table::<u64>::new(prime_instance, nth_root);
let mut a: Vec<u64> = vec![0; (nth_root >> 1) as usize];
for i in 0..a.len(){
a[i] = i as u64;
}
Box::new(move || {
ntt_table.backward_inplace(&mut a)
ntt_table.backward_inplace::<false>(&mut a)
})
}
@@ -79,7 +79,7 @@ fn backward_inplace(c: &mut Criterion) {
let runners = [
("prime", {
runner::<Table<u64>>(prime_instance, 1<<log_nth_root)
runner(prime_instance, 1<<log_nth_root)
}),
];
for (name, mut runner) in runners {
@@ -90,14 +90,14 @@ fn backward_inplace(c: &mut Criterion) {
}
fn backward_inplace_lazy(c: &mut Criterion) {
fn runner<T: DFT<u64> + 'static>(prime_instance: Prime<u64>, nth_root: u64) -> Box<dyn FnMut()> {
fn runner(prime_instance: Prime<u64>, nth_root: u64) -> Box<dyn FnMut()> {
let ntt_table: Table<u64> = Table::<u64>::new(prime_instance, nth_root);
let mut a: Vec<u64> = vec![0; (nth_root >> 1) as usize];
for i in 0..a.len(){
a[i] = i as u64;
}
Box::new(move || {
ntt_table.backward_inplace_lazy(&mut a)
ntt_table.backward_inplace::<true>(&mut a)
})
}
@@ -108,7 +108,7 @@ fn backward_inplace_lazy(c: &mut Criterion) {
let runners = [
("prime", {
runner::<Table<u64>>(prime_instance, 1<<log_nth_root)
runner(prime_instance, 1<<log_nth_root)
}),
];
for (name, mut runner) in runners {

View File

@@ -1,12 +1,12 @@
use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion};
use math::ring::Ring;
use math::modulus::Operations;
use math::modulus::VecOperations;
use math::modulus::montgomery::Montgomery;
use math::modulus::{NONE, ONCE};
use math::modulus::{BARRETT, ONCE};
const CHUNK: usize= 8;
fn add_vec_unary(c: &mut Criterion) {
fn vec_add_unary(c: &mut Criterion) {
fn runner(r: Ring<u64>) -> Box<dyn FnMut()> {
let mut p0: math::poly::Poly<u64> = r.new_poly();
@@ -16,7 +16,7 @@ fn add_vec_unary(c: &mut Criterion) {
p1.0[i] = i as u64;
}
Box::new(move || {
r.modulus.add_vec_unary_assign::<CHUNK, ONCE>(&p0.0, &mut p1.0);
r.modulus.vec_add_unary_assign::<CHUNK, ONCE>(&p0.0, &mut p1.0);
})
}
@@ -39,17 +39,17 @@ fn add_vec_unary(c: &mut Criterion) {
}
}
fn mul_vec_montgomery_external_unary_assign(c: &mut Criterion) {
fn vec_mul_montgomery_external_unary_assign(c: &mut Criterion) {
fn runner(r: Ring<u64>) -> Box<dyn FnMut()> {
let mut p0: math::poly::Poly<Montgomery<u64>> = r.new_poly_montgomery();
let mut p0: math::poly::Poly<Montgomery<u64>> = r.new_poly();
let mut p1: math::poly::Poly<u64> = r.new_poly();
for i in 0..p0.n(){
p0.0[i] = r.modulus.montgomery.prepare::<ONCE>(i as u64);
p1.0[i] = i as u64;
}
Box::new(move || {
r.modulus.mul_vec_montgomery_external_unary_assign::<CHUNK, NONE>(&p0.0, &mut p1.0);
r.modulus.vec_mul_montgomery_external_unary_assign::<CHUNK, ONCE>(&p0.0, &mut p1.0);
})
}
@@ -72,5 +72,39 @@ fn mul_vec_montgomery_external_unary_assign(c: &mut Criterion) {
}
}
criterion_group!(benches, add_vec_unary, mul_vec_montgomery_external_unary_assign);
fn vec_mul_montgomery_external_binary_assign(c: &mut Criterion) {
fn runner(r: Ring<u64>) -> Box<dyn FnMut()> {
let mut p0: math::poly::Poly<Montgomery<u64>> = r.new_poly();
let mut p1: math::poly::Poly<u64> = r.new_poly();
let mut p2: math::poly::Poly<u64> = r.new_poly();
for i in 0..p0.n(){
p0.0[i] = r.modulus.montgomery.prepare::<ONCE>(i as u64);
p1.0[i] = i as u64;
}
Box::new(move || {
r.modulus.vec_mul_montgomery_external_binary_assign::<CHUNK,ONCE>(&p0.0, & p1.0, &mut p2.0);
})
}
let mut b: criterion::BenchmarkGroup<'_, criterion::measurement::WallTime> = c.benchmark_group("mul_vec_montgomery_external_binary_assign");
for log_n in 11..17 {
let n: usize = 1<<log_n as usize;
let q_base: u64 = 0x1fffffffffe00001u64;
let q_power: usize = 1usize;
let r: Ring<u64> = Ring::<u64>::new(n, q_base, q_power);
let runners = [
("prime", {
runner(r)
}),
];
for (name, mut runner) in runners {
let id = BenchmarkId::new(name, n);
b.bench_with_input(id, &(), |b, _| b.iter(&mut runner));
}
}
}
criterion_group!(benches, vec_add_unary, vec_mul_montgomery_external_unary_assign, vec_mul_montgomery_external_binary_assign);
criterion_main!(benches);