Skip to content

Commit 5bf133c

Browse files
StavbeStavbe
committed
manual changes
1 parent fd90feb commit 5bf133c

9 files changed

Lines changed: 6 additions & 41 deletions

File tree

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,6 @@ pub fn accumulate_constraints<Value: IValue>(
242242
],
243243
context,
244244
component_data,
245-
compress_enabler,
246245
acc,
247246
)
248247
.try_into()

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,10 @@ use super::super::prelude::*;
55
pub const RELATION_USES_PER_ROW: [RelationUse; 1] =
66
[RelationUse { relation_id: "VerifyBitwiseXor_8", uses: 4 }];
77

8-
#[allow(unused_variables)]
98
pub fn accumulate_constraints<Value: IValue>(
109
input: &[Var],
1110
context: &mut Context<Value>,
1211
component_data: &dyn ComponentDataTrait<Value>,
13-
enabler: Var,
1412
acc: &mut CompositionConstraintAccumulator,
1513
) -> Vec<Var> {
1614
let [
@@ -69,15 +67,13 @@ pub fn accumulate_constraints<Value: IValue>(
6967
],
7068
context,
7169
component_data,
72-
enabler,
7370
acc,
7471
);
7572

7673
bitwise_xor_num_bits_8::accumulate_constraints(
7774
&[eval!(context, ms_8_bits_col0), eval!(context, 82), eval!(context, xor_col3)],
7875
context,
7976
component_data,
80-
enabler,
8177
acc,
8278
);
8379

@@ -89,15 +85,13 @@ pub fn accumulate_constraints<Value: IValue>(
8985
],
9086
context,
9187
component_data,
92-
enabler,
9388
acc,
9489
);
9590

9691
bitwise_xor_num_bits_8::accumulate_constraints(
9792
&[eval!(context, ms_8_bits_col1), eval!(context, 81), eval!(context, xor_col5)],
9893
context,
9994
component_data,
100-
enabler,
10195
acc,
10296
);
10397
vec![

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,6 @@ impl FrameworkEval for Eval {
298298
xor_col52.clone(),
299299
xor_col53.clone(),
300300
&self.common_lookup_elements,
301-
E::EF::from(blake_gate_enabler.clone()),
302301
t0.clone(),
303302
t1.clone(),
304303
&mut eval,

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,13 @@ impl BitwiseXorNumBits8 {
1616
[bitwise_xor_num_bits_8_input_limb_0, bitwise_xor_num_bits_8_input_limb_1]: [E::F; 2],
1717
xor_col0: E::F,
1818
common_lookup_elements: &relations::CommonLookupElements,
19-
enabler: E::EF,
2019
eval: &mut E,
2120
) -> [E::F; 0] {
2221
let M31_112558620 = E::F::from(M31::from(112558620));
2322

2423
eval.add_to_relation(RelationEntry::new(
2524
common_lookup_elements,
26-
enabler,
25+
E::EF::one(),
2726
&[
2827
M31_112558620.clone(),
2928
bitwise_xor_num_bits_8_input_limb_0.clone(),

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ impl CreateBlakeRoundInput {
1212
#[allow(clippy::double_parens)]
1313
#[allow(non_snake_case)]
1414
#[allow(clippy::unused_unit)]
15-
#[allow(unused_variables)]
1615
#[allow(clippy::too_many_arguments)]
1716
pub fn evaluate<E: EvalAtRow>(
1817
[
@@ -41,7 +40,6 @@ impl CreateBlakeRoundInput {
4140
xor_col4: E::F,
4241
xor_col5: E::F,
4342
common_lookup_elements: &relations::CommonLookupElements,
44-
enabler: E::EF,
4543
t0: E::F,
4644
t1: E::F,
4745
eval: &mut E,
@@ -73,28 +71,24 @@ impl CreateBlakeRoundInput {
7371
[split_16_low_part_size_8_output_tmp_4d188_1_limb_0.clone(), M31_127.clone()],
7472
xor_col2.clone(),
7573
common_lookup_elements,
76-
enabler.clone(),
7774
eval,
7875
);
7976
BitwiseXorNumBits8::evaluate(
8077
[ms_8_bits_col0.clone(), M31_82.clone()],
8178
xor_col3.clone(),
8279
common_lookup_elements,
83-
enabler.clone(),
8480
eval,
8581
);
8682
BitwiseXorNumBits8::evaluate(
8783
[split_16_low_part_size_8_output_tmp_4d188_3_limb_0.clone(), M31_14.clone()],
8884
xor_col4.clone(),
8985
common_lookup_elements,
90-
enabler.clone(),
9186
eval,
9287
);
9388
BitwiseXorNumBits8::evaluate(
9489
[ms_8_bits_col1.clone(), M31_81.clone()],
9590
xor_col5.clone(),
9691
common_lookup_elements,
97-
enabler.clone(),
9892
eval,
9993
);
10094
[

‎crates/circuit_air/src/components/subroutines/xor_rot_32_r_16.rs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,14 +66,12 @@ impl XorRot32R16 {
6666
],
6767
xor_col4.clone(),
6868
common_lookup_elements,
69-
E::EF::one(),
7069
eval,
7170
);
7271
BitwiseXorNumBits8::evaluate(
7372
[ms_8_bits_col0.clone(), ms_8_bits_col2.clone()],
7473
xor_col5.clone(),
7574
common_lookup_elements,
76-
E::EF::one(),
7775
eval,
7876
);
7977
BitwiseXorNumBits8B::evaluate(

‎crates/circuit_air/src/components/subroutines/xor_rot_32_r_8.rs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,14 +66,12 @@ impl XorRot32R8 {
6666
],
6767
xor_col4.clone(),
6868
common_lookup_elements,
69-
E::EF::one(),
7069
eval,
7170
);
7271
BitwiseXorNumBits8::evaluate(
7372
[ms_8_bits_col0.clone(), ms_8_bits_col2.clone()],
7473
xor_col5.clone(),
7574
common_lookup_elements,
76-
E::EF::one(),
7775
eval,
7876
);
7977
BitwiseXorNumBits8B::evaluate(

‎crates/circuit_air/src/components/triple_xor_32.rs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -134,28 +134,24 @@ impl FrameworkEval for Eval {
134134
],
135135
xor_col12.clone(),
136136
&self.common_lookup_elements,
137-
E::EF::one(),
138137
&mut eval,
139138
);
140139
BitwiseXorNumBits8::evaluate(
141140
[xor_col12.clone(), split_16_low_part_size_8_output_tmp_298db_9_limb_0.clone()],
142141
xor_col13.clone(),
143142
&self.common_lookup_elements,
144-
E::EF::one(),
145143
&mut eval,
146144
);
147145
BitwiseXorNumBits8::evaluate(
148146
[ms_8_bits_col6.clone(), ms_8_bits_col8.clone()],
149147
xor_col14.clone(),
150148
&self.common_lookup_elements,
151-
E::EF::one(),
152149
&mut eval,
153150
);
154151
BitwiseXorNumBits8::evaluate(
155152
[xor_col14.clone(), ms_8_bits_col10.clone()],
156153
xor_col15.clone(),
157154
&self.common_lookup_elements,
158-
E::EF::one(),
159155
&mut eval,
160156
);
161157
BitwiseXorNumBits8B::evaluate(

‎crates/circuit_prover/src/witness/components/blake_gate.rs‎

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ impl ClaimGenerator {
196196
&mut blake_message_state,
197197
);
198198
for inputs in sub_component_inputs.verify_bitwise_xor_8 {
199-
verify_bitwise_xor_8_state.add_packed_inputs(&inputs[..n_rows / N_LANES], 0);
199+
verify_bitwise_xor_8_state.add_packed_inputs(&inputs, 0);
200200
}
201201
for inputs in sub_component_inputs.range_check_16 {
202202
range_check_16_state.add_packed_inputs(&inputs[..n_rows / N_LANES], 0);
@@ -1957,16 +1957,10 @@ impl InteractionClaimGenerator {
19571957
&self.lookup_data.verify_bitwise_xor_8_1,
19581958
)
19591959
.into_par_iter()
1960-
.enumerate()
1961-
.for_each(|(i, (writer, values0, values1))| {
1962-
let blake_gate_enabler = blake_gate_enabler_col.packed_at(i);
1960+
.for_each(|(writer, values0, values1)| {
19631961
let denom0: PackedQM31 = common_lookup_elements.combine(values0);
19641962
let denom1: PackedQM31 = common_lookup_elements.combine(values1);
1965-
writer.write_frac(
1966-
(PackedQM31::from(blake_gate_enabler) * denom0)
1967-
+ (PackedQM31::from(blake_gate_enabler) * denom1),
1968-
denom0 * denom1,
1969-
);
1963+
writer.write_frac(denom0 + denom1, denom0 * denom1);
19701964
});
19711965
col_gen.finalize_col();
19721966

@@ -1977,16 +1971,10 @@ impl InteractionClaimGenerator {
19771971
&self.lookup_data.verify_bitwise_xor_8_3,
19781972
)
19791973
.into_par_iter()
1980-
.enumerate()
1981-
.for_each(|(i, (writer, values0, values1))| {
1982-
let blake_gate_enabler = blake_gate_enabler_col.packed_at(i);
1974+
.for_each(|(writer, values0, values1)| {
19831975
let denom0: PackedQM31 = common_lookup_elements.combine(values0);
19841976
let denom1: PackedQM31 = common_lookup_elements.combine(values1);
1985-
writer.write_frac(
1986-
(PackedQM31::from(blake_gate_enabler) * denom0)
1987-
+ (PackedQM31::from(blake_gate_enabler) * denom1),
1988-
denom0 * denom1,
1989-
);
1977+
writer.write_frac(denom0 + denom1, denom0 * denom1);
19901978
});
19911979

19921980
col_gen.finalize_col();

0 commit comments

Comments
 (0)