Skip to content

tmp #1477

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

Draft
Stavbe wants to merge 1 commit into
base: stav/auto_gen_cairo_air
Choose a base branch
from
Draft

tmp #1477

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
2 changes: 1 addition & 1 deletion stwo_cairo_prover/crates/cairo-air/src/blake/air.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ use stwo::prover::ComponentProver;
use stwo_cairo_serialize::{CairoDeserialize, CairoSerialize};
use stwo_constraint_framework::TraceLocationAllocator;

use crate::cairo_interaction_elements::CairoInteractionElements;
use crate::cairo_claim::{accumulate_relation_uses, RelationUsesDict};
use crate::cairo_interaction_elements::CairoInteractionElements;
use crate::components::{
blake_g, blake_round, blake_round_sigma, triple_xor_32, verify_bitwise_xor_12,
};
Expand Down
2 changes: 1 addition & 1 deletion stwo_cairo_prover/crates/cairo-air/src/builtins_air.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ use stwo::prover::ComponentProver;
use stwo_cairo_serialize::{CairoDeserialize, CairoSerialize};
use stwo_constraint_framework::TraceLocationAllocator;

use crate::cairo_interaction_elements::CairoInteractionElements;
use crate::cairo_claim::{accumulate_relation_uses, RelationUsesDict};
use crate::cairo_interaction_elements::CairoInteractionElements;
use crate::components::{
add_mod_builtin, bitwise_builtin, indented_component_display, mul_mod_builtin,
pedersen_builtin, poseidon_builtin, range_check_builtin_bits_128, range_check_builtin_bits_96,
Expand Down
171 changes: 156 additions & 15 deletions stwo_cairo_prover/crates/cairo-air/src/cairo_claim.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,52 @@
use std::collections::HashMap;

use itertools::chain;
use serde::{Deserialize, Serialize};
use stwo::core::channel::Channel;
use stwo::core::pcs::TreeVec;
use stwo_cairo_serialize::{CairoDeserialize, CairoSerialize};
use serde::{Deserialize, Serialize};

use crate::blake::air::BlakeContextClaim;
use crate::builtins_air::BuiltinsClaim;
use std::collections::HashMap;
use crate::verifier::RelationUse;
use crate::public_data::PublicData;
use crate::components::{
memory_address_to_id, memory_id_to_big, verify_bitwise_xor_4, verify_bitwise_xor_7,
verify_bitwise_xor_8, verify_bitwise_xor_8_b, verify_bitwise_xor_9, verify_instruction,
add_ap_opcode, add_opcode, add_opcode_small, assert_eq_opcode, assert_eq_opcode_double_deref,
assert_eq_opcode_imm, blake_compress_opcode, call_opcode_abs, call_opcode_rel_imm,
generic_opcode, jnz_opcode_non_taken, jnz_opcode_taken, jump_opcode_abs,
jump_opcode_double_deref, jump_opcode_rel, jump_opcode_rel_imm, memory_address_to_id,
memory_id_to_big, mul_opcode, mul_opcode_small, qm_31_add_mul_opcode, ret_opcode,
verify_bitwise_xor_4, verify_bitwise_xor_7, verify_bitwise_xor_8, verify_bitwise_xor_8_b,
verify_bitwise_xor_9, verify_instruction,
};
use crate::opcodes_air::OpcodeClaim;
use crate::pedersen::air::PedersenContextClaim;
use crate::poseidon::air::PoseidonContextClaim;
use crate::public_data::PublicData;
use crate::range_checks_air::RangeChecksClaim;
use crate::verifier::RelationUse;

#[derive(Serialize, Deserialize, CairoSerialize, CairoDeserialize)]
pub struct CairoClaim {
pub public_data: PublicData,
pub opcodes: OpcodeClaim,
// Opcode claim fields (inlined)
pub add: Vec<add_opcode::Claim>,
pub add_small: Vec<add_opcode_small::Claim>,
pub add_ap: Vec<add_ap_opcode::Claim>,
pub assert_eq: Vec<assert_eq_opcode::Claim>,
pub assert_eq_imm: Vec<assert_eq_opcode_imm::Claim>,
pub assert_eq_double_deref: Vec<assert_eq_opcode_double_deref::Claim>,
pub blake: Vec<blake_compress_opcode::Claim>,
pub call: Vec<call_opcode_abs::Claim>,
pub call_rel_imm: Vec<call_opcode_rel_imm::Claim>,
pub generic: Vec<generic_opcode::Claim>,
pub jnz: Vec<jnz_opcode_non_taken::Claim>,
pub jnz_taken: Vec<jnz_opcode_taken::Claim>,
pub jump: Vec<jump_opcode_abs::Claim>,
pub jump_double_deref: Vec<jump_opcode_double_deref::Claim>,
pub jump_rel: Vec<jump_opcode_rel::Claim>,
pub jump_rel_imm: Vec<jump_opcode_rel_imm::Claim>,
pub mul: Vec<mul_opcode::Claim>,
pub mul_small: Vec<mul_opcode_small::Claim>,
pub qm31: Vec<qm_31_add_mul_opcode::Claim>,
pub ret: Vec<ret_opcode::Claim>,
pub verify_instruction: verify_instruction::Claim,
pub blake_context: BlakeContextClaim,
pub builtins: BuiltinsClaim,
Expand All @@ -41,7 +67,26 @@ impl CairoClaim {
pub fn mix_into(&self, channel: &mut impl Channel) {
let Self {
public_data,
opcodes,
add,
add_small,
add_ap,
assert_eq,
assert_eq_imm,
assert_eq_double_deref,
blake,
call,
call_rel_imm,
generic,
jnz,
jnz_taken,
jump,
jump_double_deref,
jump_rel,
jump_rel_imm,
mul,
mul_small,
qm31,
ret,
verify_instruction,
blake_context,
builtins,
Expand All @@ -57,7 +102,33 @@ impl CairoClaim {
verify_bitwise_xor_9,
} = self;
public_data.mix_into(channel);
opcodes.mix_into(channel);
// Mix opcode vectors: first length then each claim
macro_rules! mix_component_vector {
($field:ident) => {
channel.mix_u64($field.len() as u64);
$field.iter().for_each(|c| c.mix_into(channel));
};
}
mix_component_vector!(add);
mix_component_vector!(add_small);
mix_component_vector!(add_ap);
mix_component_vector!(assert_eq);
mix_component_vector!(assert_eq_imm);
mix_component_vector!(assert_eq_double_deref);
mix_component_vector!(blake);
mix_component_vector!(call);
mix_component_vector!(call_rel_imm);
mix_component_vector!(generic);
mix_component_vector!(jnz);
mix_component_vector!(jnz_taken);
mix_component_vector!(jump);
mix_component_vector!(jump_double_deref);
mix_component_vector!(jump_rel);
mix_component_vector!(jump_rel_imm);
mix_component_vector!(mul);
mix_component_vector!(mul_small);
mix_component_vector!(qm31);
mix_component_vector!(ret);
verify_instruction.mix_into(channel);
blake_context.mix_into(channel);
builtins.mix_into(channel);
Expand All @@ -77,7 +148,28 @@ impl CairoClaim {
/// Does not include the preprocessed trace log sizes.
pub fn log_sizes(&self) -> TreeVec<Vec<u32>> {
let log_sizes_list = vec![
self.opcodes.log_sizes(),
TreeVec::concat_cols(chain!(
self.add.iter().map(|c| c.log_sizes()),
self.add_small.iter().map(|c| c.log_sizes()),
self.add_ap.iter().map(|c| c.log_sizes()),
self.assert_eq.iter().map(|c| c.log_sizes()),
self.assert_eq_imm.iter().map(|c| c.log_sizes()),
self.assert_eq_double_deref.iter().map(|c| c.log_sizes()),
self.blake.iter().map(|c| c.log_sizes()),
self.call.iter().map(|c| c.log_sizes()),
self.call_rel_imm.iter().map(|c| c.log_sizes()),
self.generic.iter().map(|c| c.log_sizes()),
self.jnz.iter().map(|c| c.log_sizes()),
self.jnz_taken.iter().map(|c| c.log_sizes()),
self.jump.iter().map(|c| c.log_sizes()),
self.jump_double_deref.iter().map(|c| c.log_sizes()),
self.jump_rel.iter().map(|c| c.log_sizes()),
self.jump_rel_imm.iter().map(|c| c.log_sizes()),
self.mul.iter().map(|c| c.log_sizes()),
self.mul_small.iter().map(|c| c.log_sizes()),
self.qm31.iter().map(|c| c.log_sizes()),
self.ret.iter().map(|c| c.log_sizes()),
)),
self.verify_instruction.log_sizes(),
self.blake_context.log_sizes(),
self.builtins.log_sizes(),
Expand All @@ -99,7 +191,26 @@ impl CairoClaim {
pub fn accumulate_relation_uses(&self, relation_uses: &mut RelationUsesDict) {
let Self {
public_data: _,
opcodes,
add,
add_small,
add_ap,
assert_eq,
assert_eq_imm,
assert_eq_double_deref,
blake,
call,
call_rel_imm,
generic,
jnz,
jnz_taken,
jump,
jump_double_deref,
jump_rel,
jump_rel_imm,
mul,
mul_small,
qm31,
ret,
verify_instruction,
blake_context,
builtins,
Expand All @@ -119,7 +230,37 @@ impl CairoClaim {
// - verify_bitwise_xor_*
// - memory_address_to_id

opcodes.accumulate_relation_uses(relation_uses);
macro_rules! relation_uses_vec {
($field:ident, $module:ident) => {
$field.iter().for_each(|c| {
accumulate_relation_uses(
relation_uses,
$module::RELATION_USES_PER_ROW,
c.log_size,
)
});
};
}
relation_uses_vec!(add, add_opcode);
relation_uses_vec!(add_small, add_opcode_small);
relation_uses_vec!(add_ap, add_ap_opcode);
relation_uses_vec!(assert_eq, assert_eq_opcode);
relation_uses_vec!(assert_eq_imm, assert_eq_opcode_imm);
relation_uses_vec!(assert_eq_double_deref, assert_eq_opcode_double_deref);
relation_uses_vec!(blake, blake_compress_opcode);
relation_uses_vec!(call, call_opcode_abs);
relation_uses_vec!(call_rel_imm, call_opcode_rel_imm);
relation_uses_vec!(generic, generic_opcode);
relation_uses_vec!(jnz, jnz_opcode_non_taken);
relation_uses_vec!(jnz_taken, jnz_opcode_taken);
relation_uses_vec!(jump, jump_opcode_abs);
relation_uses_vec!(jump_double_deref, jump_opcode_double_deref);
relation_uses_vec!(jump_rel, jump_opcode_rel);
relation_uses_vec!(jump_rel_imm, jump_opcode_rel_imm);
relation_uses_vec!(mul, mul_opcode);
relation_uses_vec!(mul_small, mul_opcode_small);
relation_uses_vec!(qm31, qm_31_add_mul_opcode);
relation_uses_vec!(ret, ret_opcode);
builtins.accumulate_relation_uses(relation_uses);
blake_context.accumulate_relation_uses(relation_uses);
pedersen_context.accumulate_relation_uses(relation_uses);
Expand Down Expand Up @@ -163,10 +304,10 @@ pub fn accumulate_relation_uses<const N: usize>(
}
}


#[cfg(test)]
mod tests {
use std::collections::HashMap;

use super::accumulate_relation_uses;
use crate::verifier::RelationUse;

Expand All @@ -191,4 +332,4 @@ mod tests {
assert_eq!(relation_uses.get("relation_1"), Some(&12));
assert_eq!(relation_uses.get("relation_2"), Some(&26));
}
}
}
Loading
Loading