Skip to content

Fix RV32IM bitwise M31 word collisions #25

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
this-vishalsingh merged 1 commit into from
May 1, 2026
Merged

Fix RV32IM bitwise M31 word collisions #25

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
14 changes: 9 additions & 5 deletions crates/air/benches/constraint_bench.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ use criterion::{black_box, criterion_group, criterion_main, Criterion, Benchmark
use zp1_primitives::M31;
use zp1_air::rv32im::{CpuTraceRow, ConstraintEvaluator};

fn sum_constraints(constraints: Vec<M31>) -> M31 {
constraints.into_iter().fold(M31::ZERO, |acc, c| acc + c)
}

/// Create a test row for bitwise AND operation.
fn create_and_row() -> CpuTraceRow {
let mut row = CpuTraceRow::default();
Expand Down Expand Up @@ -107,7 +111,7 @@ fn bench_and_bit_based(c: &mut Criterion) {
let row = create_and_row();

c.bench_function("AND_bit_based", |b| {
b.iter(|| ConstraintEvaluator::and_constraint(black_box(&row)))
b.iter(|| sum_constraints(ConstraintEvaluator::and_constraint(black_box(&row))))
});
}

Expand All @@ -123,7 +127,7 @@ fn bench_xor_bit_based(c: &mut Criterion) {
let row = create_xor_row();

c.bench_function("XOR_bit_based", |b| {
b.iter(|| ConstraintEvaluator::xor_constraint(black_box(&row)))
b.iter(|| sum_constraints(ConstraintEvaluator::xor_constraint(black_box(&row))))
});
}

Expand All @@ -142,15 +146,15 @@ fn bench_bitwise_comparison(c: &mut Criterion) {
let xor_row = create_xor_row();

group.bench_function("AND/bit_based", |b| {
b.iter(|| ConstraintEvaluator::and_constraint(black_box(&and_row)))
b.iter(|| sum_constraints(ConstraintEvaluator::and_constraint(black_box(&and_row))))
});

group.bench_function("AND/lookup_based", |b| {
b.iter(|| ConstraintEvaluator::and_constraint_lookup(black_box(&and_row)))
});

group.bench_function("XOR/bit_based", |b| {
b.iter(|| ConstraintEvaluator::xor_constraint(black_box(&xor_row)))
b.iter(|| sum_constraints(ConstraintEvaluator::xor_constraint(black_box(&xor_row))))
});

group.bench_function("XOR/lookup_based", |b| {
Expand All @@ -174,7 +178,7 @@ fn bench_batch_evaluation(c: &mut Criterion) {
b.iter(|| {
let mut sum = M31::ZERO;
for row in rows.iter() {
sum = sum + ConstraintEvaluator::and_constraint(black_box(row));
sum = sum + sum_constraints(ConstraintEvaluator::and_constraint(black_box(row)));
}
sum
})
Expand Down
Loading