WIP: put back zk proof bench and run only 256 bits proof

This commit is contained in:
David Testé
2025-11-17 15:03:01 +01:00
parent ccfa093055
commit 8cc6285f03
2 changed files with 134 additions and 129 deletions

View File

@@ -88,7 +88,7 @@ js-sys = { version = "0.3", optional = true }
console_error_panic_hook = { version = "0.1.7", optional = true } console_error_panic_hook = { version = "0.1.7", optional = true }
serde-wasm-bindgen = { version = "0.6.0", optional = true } serde-wasm-bindgen = { version = "0.6.0", optional = true }
getrandom = { version = "0.2.8", optional = true } getrandom = { version = "0.2.8", optional = true }
bytemuck = "1.14.3" bytemuck = "<1.24"
[features] [features]
boolean = [] boolean = []

View File

@@ -73,135 +73,139 @@ fn zk_throughput_num_elements() -> u64 {
} }
} }
// fn cpu_pke_zk_proof(c: &mut Criterion) { fn cpu_pke_zk_proof(c: &mut Criterion) {
// let bench_name = "zk::pke_zk_proof"; let bench_name = "zk::pke_zk_proof";
// let mut bench_group = c.benchmark_group(bench_name); let mut bench_group = c.benchmark_group(bench_name);
// bench_group bench_group
// .sample_size(15) .sample_size(15)
// .measurement_time(std::time::Duration::from_secs(60)); .measurement_time(std::time::Duration::from_secs(60));
//
// for (param_pke, _param_casting, param_fhe) in [ for (param_pke, _param_casting, param_fhe) in [
// ( (
// BENCH_PARAM_PKE_MESSAGE_2_CARRY_2_KS_PBS_TUNIFORM_2M128, PARAM_PKE_MESSAGE_2_CARRY_2_KS_PBS_TUNIFORM_2M64,
// BENCH_PARAM_KEYSWITCH_MESSAGE_2_CARRY_2_KS_PBS_TUNIFORM_2M128, PARAM_KEYSWITCH_MESSAGE_2_CARRY_2_KS_PBS_TUNIFORM_2M64,
// BENCH_PARAM_MESSAGE_2_CARRY_2_KS_PBS_TUNIFORM_2M128, PARAM_MESSAGE_2_CARRY_2_KS_PBS_TUNIFORM_2M64,
// ), ),
// ( // (
// BENCH_PARAM_PKE_TO_SMALL_MESSAGE_2_CARRY_2_KS_PBS_TUNIFORM_2M128_ZKV1, // BENCH_PARAM_PKE_TO_SMALL_MESSAGE_2_CARRY_2_KS_PBS_TUNIFORM_2M128_ZKV1,
// BENCH_PARAM_KEYSWITCH_PKE_TO_SMALL_MESSAGE_2_CARRY_2_KS_PBS_TUNIFORM_2M128_ZKV1, // BENCH_PARAM_KEYSWITCH_PKE_TO_SMALL_MESSAGE_2_CARRY_2_KS_PBS_TUNIFORM_2M128_ZKV1,
// BENCH_PARAM_MESSAGE_2_CARRY_2_KS_PBS_TUNIFORM_2M128, // BENCH_PARAM_MESSAGE_2_CARRY_2_KS_PBS_TUNIFORM_2M128,
// ), // ),
// ] { ] {
// let param_name = param_fhe.name(); let param_name = param_fhe.name();
// let param_name = param_name.as_str(); let param_name = param_name.as_str();
// let cks = ClientKey::new(param_fhe); let cks = ClientKey::new(param_fhe);
// let sks = ServerKey::new_radix_server_key(&cks); let sks = ServerKey::new_radix_server_key(&cks);
// let compact_private_key = CompactPrivateKey::new(param_pke); let compact_private_key = CompactPrivateKey::new(param_pke);
// let pk = CompactPublicKey::new(&compact_private_key); let pk = CompactPublicKey::new(&compact_private_key);
// // Kept for consistency // Kept for consistency
// let _casting_key = let _casting_key =
// KeySwitchingKey::new((&compact_private_key, None), (&cks, &sks), _param_casting); KeySwitchingKey::new((&compact_private_key, None), (&cks, &sks), _param_casting);
//
// // We have a use case with 320 bits of metadata // We have a use case with 320 bits of metadata
// let mut metadata = [0u8; (320 / u8::BITS) as usize]; let mut metadata = [0u8; (320 / u8::BITS) as usize];
// let mut rng = rand::thread_rng(); let mut rng = rand::thread_rng();
// metadata.fill_with(|| rng.gen()); metadata.fill_with(|| rng.gen());
//
// let zk_vers = param_pke.zk_scheme; let zk_vers = "V2";
//
// for proof_config in default_proof_config().iter() { for proof_config in default_proof_config().iter() {
// let msg_bits = let msg_bits =
// (param_pke.message_modulus.0 * param_pke.carry_modulus.0).ilog2() as usize; (param_pke.message_modulus.0 * param_pke.carry_modulus.0).ilog2() as usize;
// println!("Generating CRS... "); println!("Generating CRS... ");
// let crs = CompactPkeCrs::from_shortint_params( let crs =
// param_pke, CompactPkeCrs::from_shortint_params(param_pke, proof_config.crs_size / msg_bits)
// LweCiphertextCount(proof_config.crs_size / msg_bits), .unwrap();
// )
// .unwrap(); let public_params = crs.public_params();
//
// for bits in proof_config.bits_to_prove.iter() { for bits in proof_config.bits_to_prove.iter() {
// assert_eq!(bits % 64, 0); assert_eq!(bits % 64, 0);
// // Packing, so we take the message and carry modulus to compute our block count // Packing, so we take the message and carry modulus to compute our block count
// let num_block = 64usize.div_ceil( let num_block = 64usize.div_ceil(
// (param_pke.message_modulus.0 * param_pke.carry_modulus.0).ilog2() as usize, (param_pke.message_modulus.0 * param_pke.carry_modulus.0).ilog2() as usize,
// ); );
//
// let fhe_uint_count = bits / 64; let fhe_uint_count = bits / 64;
//
// for compute_load in [ZkComputeLoad::Proof, ZkComputeLoad::Verify] { // for compute_load in [ZkComputeLoad::Proof, ZkComputeLoad::Verify] {
// let zk_load = match compute_load { for compute_load in [ZkComputeLoad::Verify] {
// ZkComputeLoad::Proof => "compute_load_proof", let zk_load = match compute_load {
// ZkComputeLoad::Verify => "compute_load_verify", ZkComputeLoad::Proof => "compute_load_proof",
// }; ZkComputeLoad::Verify => "compute_load_verify",
// };
// let bench_id;
// let bench_id;
// match get_bench_type() {
// BenchmarkType::Latency => { match BENCH_TYPE.get().unwrap() {
// bench_id = format!( BenchmarkType::Latency => {
// bench_id = format!("{bench_name}::{param_name}_{bits}_bits_packed_{zk_load}_ZK{zk_vers:?}");
// "{bench_name}::{param_name}_{bits}_bits_packed_{zk_load}_ZK{zk_vers:?}" bench_group.bench_function(&bench_id, |b| {
// ); bench_group.bench_function(&bench_id, |b| { let input_msg = rng.gen::<u64>();
// let input_msg = rng.gen::<u64>(); let messages = vec![input_msg; fhe_uint_count];
// let messages = vec![input_msg; fhe_uint_count];
// b.iter(|| {
// b.iter(|| { let _ct1 =
// let _ct1 = tfhe::integer::ProvenCompactCiphertextList::builder(&pk)
// tfhe::integer::ProvenCompactCiphertextList::builder(&pk) .extend(messages.iter().copied())
// .extend(messages.iter().copied()) .build_with_proof_packed(&public_params, compute_load)
// .build_with_proof_packed(&crs, &metadata, .unwrap();
// compute_load) .unwrap(); })
// }) });
// }); }
// } BenchmarkType::Throughput => {
// BenchmarkType::Throughput => { let elements = zk_throughput_num_elements() * 2; // This value, found empirically, ensure saturation of current target
// let elements = zk_throughput_num_elements() * 2; // This value, found // machine
// empirically, ensure saturation of current target // machine bench_group.throughput(Throughput::Elements(elements));
// bench_group.throughput(Throughput::Elements(elements));
// bench_id = format!(
// bench_id = format!(
// "{bench_name}::throughput::{param_name}_{bits}_bits_packed_{zk_load}_ZK{zk_vers:?}"
// "{bench_name}::throughput::{param_name}_{bits}_bits_packed_{zk_load}_ZK{zk_vers:?}" );
// ); bench_group.bench_function(&bench_id, |b| { bench_group.bench_function(&bench_id, |b| {
// let messages = (0..elements) let messages = (0..elements)
// .map(|_| { .map(|_| {
// let input_msg = rng.gen::<u64>(); let input_msg = rng.gen::<u64>();
// vec![input_msg; fhe_uint_count] vec![input_msg; fhe_uint_count]
// }) })
// .collect::<Vec<_>>(); .collect::<Vec<_>>();
//
// b.iter(|| { b.iter(|| {
// messages.par_iter().for_each(|msg| { messages.par_iter().for_each(|msg| {
// tfhe::integer::ProvenCompactCiphertextList::builder(&pk) tfhe::integer::ProvenCompactCiphertextList::builder(&pk)
// .extend(msg.iter().copied()) .extend(msg.iter().copied())
// .build_with_proof_packed(&crs, &metadata, .build_with_proof_packed(&public_params, compute_load)
// compute_load) .unwrap(); .unwrap();
// }) })
// }) })
// }); });
// } }
// } }
//
// let shortint_params: PBSParameters = param_fhe.into(); let shortint_params: PBSParameters = param_fhe.into();
//
// write_to_json::<u64, _>( write_to_json::<u64, _>(
// &bench_id, &bench_id,
// shortint_params, shortint_params,
// param_name, param_name,
// "pke_zk_proof", "pke_zk_proof",
// &OperatorType::Atomic, &OperatorType::Atomic,
// shortint_params.message_modulus().0 as u32, shortint_params.message_modulus().0 as u32,
// vec![shortint_params.message_modulus().0.ilog2(); num_block], vec![shortint_params.message_modulus().0.ilog2(); num_block],
// ); );
// } }
// } }
// } }
// } }
//
// bench_group.finish() bench_group.finish()
// } }
//
// criterion_group!(zk_proof, cpu_pke_zk_proof); // criterion_group!(zk_proof, cpu_pke_zk_proof);
pub fn zk_proof() {
let mut criterion: Criterion<_> = (Criterion::default()).configure_from_args();
cpu_pke_zk_proof(&mut criterion);
}
fn cpu_pke_zk_verify(c: &mut Criterion, results_file: &Path) { fn cpu_pke_zk_verify(c: &mut Criterion, results_file: &Path) {
let bench_name = "zk::pke_zk_verify"; let bench_name = "zk::pke_zk_verify";
@@ -421,6 +425,7 @@ pub fn zk_verify() {
fn main() { fn main() {
BENCH_TYPE.get_or_init(|| BenchmarkType::from_env().unwrap()); BENCH_TYPE.get_or_init(|| BenchmarkType::from_env().unwrap());
zk_proof();
zk_verify(); zk_verify();
Criterion::default().configure_from_args().final_summary(); Criterion::default().configure_from_args().final_summary();
} }