Skip to content

Commit 4539be8

Browse files
StavbeStavbe
committed
sync air infra
1 parent 0f461f5 commit 4539be8

24 files changed

Lines changed: 14 additions & 95 deletions

‎crates/cairo_air/src/sample_evaluations.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// AIR version 4d9c5adb
1+
// AIR version b2db0c90
22
use stwo::core::fields::{cm31::CM31, m31::M31, qm31::QM31};
33
pub const ADD_AP_OPCODE_SAMPLE_EVAL_RESULT: QM31 =
44
QM31(CM31(M31(1435814162), M31(1618992457)), CM31(M31(840348268), M31(442754761)));

‎crates/circuit_air/src/circuit_eval_components/blake_g.rs‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ pub fn accumulate_constraints<Value: IValue>(
7676
xor_col51,
7777
enabler_col52,
7878
] = input.try_into().unwrap();
79-
let enabler = context.one();
8079

8180
triple_sum_32::accumulate_constraints(
8281
&[
@@ -91,7 +90,6 @@ pub fn accumulate_constraints<Value: IValue>(
9190
],
9291
context,
9392
component_data,
94-
enabler,
9593
acc,
9694
);
9795

@@ -113,7 +111,6 @@ pub fn accumulate_constraints<Value: IValue>(
113111
],
114112
context,
115113
component_data,
116-
enabler,
117114
acc,
118115
)
119116
.try_into()
@@ -132,7 +129,6 @@ pub fn accumulate_constraints<Value: IValue>(
132129
],
133130
context,
134131
component_data,
135-
enabler,
136132
acc,
137133
);
138134

@@ -154,7 +150,6 @@ pub fn accumulate_constraints<Value: IValue>(
154150
],
155151
context,
156152
component_data,
157-
enabler,
158153
acc,
159154
)
160155
.try_into()
@@ -173,7 +168,6 @@ pub fn accumulate_constraints<Value: IValue>(
173168
],
174169
context,
175170
component_data,
176-
enabler,
177171
acc,
178172
);
179173

@@ -195,7 +189,6 @@ pub fn accumulate_constraints<Value: IValue>(
195189
],
196190
context,
197191
component_data,
198-
enabler,
199192
acc,
200193
)
201194
.try_into()
@@ -214,7 +207,6 @@ pub fn accumulate_constraints<Value: IValue>(
214207
],
215208
context,
216209
component_data,
217-
enabler,
218210
acc,
219211
);
220212

@@ -236,7 +228,6 @@ pub fn accumulate_constraints<Value: IValue>(
236228
],
237229
context,
238230
component_data,
239-
enabler,
240231
acc,
241232
)
242233
.try_into()

‎crates/circuit_air/src/circuit_eval_components/blake_gate.rs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
// This file was created by the AIR team.
2-
31
use super::prelude::*;
42

53
pub const N_TRACE_COLUMNS: usize = 151;
@@ -242,7 +240,6 @@ pub fn accumulate_constraints<Value: IValue>(
242240
],
243241
context,
244242
component_data,
245-
compress_enabler,
246243
acc,
247244
)
248245
.try_into()

‎crates/circuit_air/src/circuit_eval_components/subroutines/bitwise_xor_num_bits_12.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ pub fn accumulate_constraints<Value: IValue>(
1010
input: &[Var],
1111
context: &mut Context<Value>,
1212
component_data: &dyn ComponentDataTrait<Value>,
13-
enabler: Var,
1413
acc: &mut CompositionConstraintAccumulator,
1514
) -> Vec<Var> {
1615
let [bitwise_xor_num_bits_12_input_limb_0, bitwise_xor_num_bits_12_input_limb_1, xor_col0] =
@@ -23,7 +22,7 @@ pub fn accumulate_constraints<Value: IValue>(
2322
eval!(context, bitwise_xor_num_bits_12_input_limb_1),
2423
eval!(context, xor_col0),
2524
];
26-
let numerator_0 = eval!(context, enabler);
25+
let numerator_0 = eval!(context, 1);
2726
acc.add_to_relation(context, numerator_0, tuple_0);
2827
vec![]
2928
}

‎crates/circuit_air/src/circuit_eval_components/subroutines/bitwise_xor_num_bits_4.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ pub fn accumulate_constraints<Value: IValue>(
1010
input: &[Var],
1111
context: &mut Context<Value>,
1212
component_data: &dyn ComponentDataTrait<Value>,
13-
enabler: Var,
1413
acc: &mut CompositionConstraintAccumulator,
1514
) -> Vec<Var> {
1615
let [bitwise_xor_num_bits_4_input_limb_0, bitwise_xor_num_bits_4_input_limb_1, xor_col0] =
@@ -23,7 +22,7 @@ pub fn accumulate_constraints<Value: IValue>(
2322
eval!(context, bitwise_xor_num_bits_4_input_limb_1),
2423
eval!(context, xor_col0),
2524
];
26-
let numerator_0 = eval!(context, enabler);
25+
let numerator_0 = eval!(context, 1);
2726
acc.add_to_relation(context, numerator_0, tuple_0);
2827
vec![]
2928
}

‎crates/circuit_air/src/circuit_eval_components/subroutines/bitwise_xor_num_bits_7.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ pub fn accumulate_constraints<Value: IValue>(
1010
input: &[Var],
1111
context: &mut Context<Value>,
1212
component_data: &dyn ComponentDataTrait<Value>,
13-
enabler: Var,
1413
acc: &mut CompositionConstraintAccumulator,
1514
) -> Vec<Var> {
1615
let [bitwise_xor_num_bits_7_input_limb_0, bitwise_xor_num_bits_7_input_limb_1, xor_col0] =
@@ -23,7 +22,7 @@ pub fn accumulate_constraints<Value: IValue>(
2322
eval!(context, bitwise_xor_num_bits_7_input_limb_1),
2423
eval!(context, xor_col0),
2524
];
26-
let numerator_0 = eval!(context, enabler);
25+
let numerator_0 = eval!(context, 1);
2726
acc.add_to_relation(context, numerator_0, tuple_0);
2827
vec![]
2928
}

‎crates/circuit_air/src/circuit_eval_components/subroutines/bitwise_xor_num_bits_8.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ pub fn accumulate_constraints<Value: IValue>(
1010
input: &[Var],
1111
context: &mut Context<Value>,
1212
component_data: &dyn ComponentDataTrait<Value>,
13-
enabler: Var,
1413
acc: &mut CompositionConstraintAccumulator,
1514
) -> Vec<Var> {
1615
let [bitwise_xor_num_bits_8_input_limb_0, bitwise_xor_num_bits_8_input_limb_1, xor_col0] =
@@ -23,7 +22,7 @@ pub fn accumulate_constraints<Value: IValue>(
2322
eval!(context, bitwise_xor_num_bits_8_input_limb_1),
2423
eval!(context, xor_col0),
2524
];
26-
let numerator_0 = eval!(context, enabler);
25+
let numerator_0 = eval!(context, 1);
2726
acc.add_to_relation(context, numerator_0, tuple_0);
2827
vec![]
2928
}

‎crates/circuit_air/src/circuit_eval_components/subroutines/bitwise_xor_num_bits_8_b.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ pub fn accumulate_constraints<Value: IValue>(
1010
input: &[Var],
1111
context: &mut Context<Value>,
1212
component_data: &dyn ComponentDataTrait<Value>,
13-
enabler: Var,
1413
acc: &mut CompositionConstraintAccumulator,
1514
) -> Vec<Var> {
1615
let [bitwise_xor_num_bits_8_b_input_limb_0, bitwise_xor_num_bits_8_b_input_limb_1, xor_col0] =
@@ -23,7 +22,7 @@ pub fn accumulate_constraints<Value: IValue>(
2322
eval!(context, bitwise_xor_num_bits_8_b_input_limb_1),
2423
eval!(context, xor_col0),
2524
];
26-
let numerator_0 = eval!(context, enabler);
25+
let numerator_0 = eval!(context, 1);
2726
acc.add_to_relation(context, numerator_0, tuple_0);
2827
vec![]
2928
}

‎crates/circuit_air/src/circuit_eval_components/subroutines/bitwise_xor_num_bits_9.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ pub fn accumulate_constraints<Value: IValue>(
1010
input: &[Var],
1111
context: &mut Context<Value>,
1212
component_data: &dyn ComponentDataTrait<Value>,
13-
enabler: Var,
1413
acc: &mut CompositionConstraintAccumulator,
1514
) -> Vec<Var> {
1615
let [bitwise_xor_num_bits_9_input_limb_0, bitwise_xor_num_bits_9_input_limb_1, xor_col0] =
@@ -23,7 +22,7 @@ pub fn accumulate_constraints<Value: IValue>(
2322
eval!(context, bitwise_xor_num_bits_9_input_limb_1),
2423
eval!(context, xor_col0),
2524
];
26-
let numerator_0 = eval!(context, enabler);
25+
let numerator_0 = eval!(context, 1);
2726
acc.add_to_relation(context, numerator_0, tuple_0);
2827
vec![]
2928
}

‎crates/circuit_air/src/circuit_eval_components/subroutines/create_blake_round_input.rs‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ pub fn accumulate_constraints<Value: IValue>(
1010
input: &[Var],
1111
context: &mut Context<Value>,
1212
component_data: &dyn ComponentDataTrait<Value>,
13-
enabler: Var,
1413
acc: &mut CompositionConstraintAccumulator,
1514
) -> Vec<Var> {
1615
let [
@@ -69,15 +68,13 @@ pub fn accumulate_constraints<Value: IValue>(
6968
],
7069
context,
7170
component_data,
72-
enabler,
7371
acc,
7472
);
7573

7674
bitwise_xor_num_bits_8::accumulate_constraints(
7775
&[eval!(context, ms_8_bits_col0), eval!(context, 82), eval!(context, xor_col3)],
7876
context,
7977
component_data,
80-
enabler,
8178
acc,
8279
);
8380

@@ -89,15 +86,13 @@ pub fn accumulate_constraints<Value: IValue>(
8986
],
9087
context,
9188
component_data,
92-
enabler,
9389
acc,
9490
);
9591

9692
bitwise_xor_num_bits_8::accumulate_constraints(
9793
&[eval!(context, ms_8_bits_col1), eval!(context, 81), eval!(context, xor_col5)],
9894
context,
9995
component_data,
100-
enabler,
10196
acc,
10297
);
10398
vec![

0 commit comments

Comments
 (0)