[prime]: nth_root does not mutate prime anymore

This commit is contained in:
Jean-Philippe Bossuat
2024-12-20 13:49:37 +01:00
parent 5dd371f6b0
commit ad68ce83cf
9 changed files with 74 additions and 41 deletions

View File

@@ -3,8 +3,8 @@ 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: &mut Prime<u64>, nth_root: u64) -> Box<dyn FnMut()+ '_> {
let ntt_table: Table<'_, u64> = Table::<u64>::new(prime_instance, nth_root);
fn runner<T: DFT<u64> + 'static>(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;
@@ -21,7 +21,7 @@ fn forward_inplace(c: &mut Criterion) {
let runners = [
("prime", {
runner::<Table<'_, u64>>(&mut prime_instance, 1<<log_nth_root)
runner::<Table<u64>>(prime_instance, 1<<log_nth_root)
}),
];
for (name, mut runner) in runners {
@@ -32,8 +32,8 @@ fn forward_inplace(c: &mut Criterion) {
}
fn forward_inplace_lazy(c: &mut Criterion) {
fn runner<T: DFT<u64> + 'static>(prime_instance: &mut Prime<u64>, nth_root: u64) -> Box<dyn FnMut()+ '_> {
let ntt_table: Table<'_, u64> = Table::<u64>::new(prime_instance, nth_root);
fn runner<T: DFT<u64> + 'static>(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;
@@ -46,11 +46,11 @@ fn forward_inplace_lazy(c: &mut Criterion) {
let mut b: criterion::BenchmarkGroup<'_, criterion::measurement::WallTime> = c.benchmark_group("forward_inplace_lazy");
for log_nth_root in 11..17 {
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>>(&mut prime_instance, 1<<log_nth_root)
runner::<Table<u64>>(prime_instance, 1<<log_nth_root)
}),
];
for (name, mut runner) in runners {
@@ -61,8 +61,8 @@ fn forward_inplace_lazy(c: &mut Criterion) {
}
fn backward_inplace(c: &mut Criterion) {
fn runner<T: DFT<u64> + 'static>(prime_instance: &mut Prime<u64>, nth_root: u64) -> Box<dyn FnMut()+ '_> {
let ntt_table: Table<'_, u64> = Table::<u64>::new(prime_instance, nth_root);
fn runner<T: DFT<u64> + 'static>(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;
@@ -75,11 +75,11 @@ fn backward_inplace(c: &mut Criterion) {
let mut b: criterion::BenchmarkGroup<'_, criterion::measurement::WallTime> = c.benchmark_group("backward_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>>(&mut prime_instance, 1<<log_nth_root)
runner::<Table<u64>>(prime_instance, 1<<log_nth_root)
}),
];
for (name, mut runner) in runners {
@@ -90,8 +90,8 @@ fn backward_inplace(c: &mut Criterion) {
}
fn backward_inplace_lazy(c: &mut Criterion) {
fn runner<T: DFT<u64> + 'static>(prime_instance: &mut Prime<u64>, nth_root: u64) -> Box<dyn FnMut()+ '_> {
let ntt_table: Table<'_, u64> = Table::<u64>::new(prime_instance, nth_root);
fn runner<T: DFT<u64> + 'static>(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;
@@ -104,11 +104,11 @@ fn backward_inplace_lazy(c: &mut Criterion) {
let mut b: criterion::BenchmarkGroup<'_, criterion::measurement::WallTime> = c.benchmark_group("backward_inplace_lazy");
for log_nth_root in 11..17 {
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>>(&mut prime_instance, 1<<log_nth_root)
runner::<Table<u64>>(prime_instance, 1<<log_nth_root)
}),
];
for (name, mut runner) in runners {