Merged the P1/P3 tables into the P0/P2 tables (Pedersen builtin) (#1517)

Co-Authored-By: Dan Carmon <dancar@starkware.co>

Author: dancarmoz

stwo_cairo_prover/crates/cairo-air/src/components/constraints_regression_test_values.rs

@@ -85,7 +85,7 @@ pub const MUL_OPCODE: Expect = expect![[r#"
     (1765238355 + 567102279i) + (1303576643 + 132743394i)u
 "#]];
 pub const PEDERSEN_AGGREGATOR: Expect = expect![[r#"
-    (327144683 + 1605581620i) + (1304969682 + 1548859344i)u
+    (1935068275 + 861457484i) + (903392461 + 608363705i)u
 "#]];
 pub const PARTIAL_EC_MUL: Expect = expect![[r#"
     (895051799 + 1568254972i) + (1038712019 + 2090679041i)u
@@ -171,9 +171,6 @@ pub const RANGE_CHECK_4_3: Expect = expect![[r#"
 pub const RANGE_CHECK_4_4: Expect = expect![[r#"
     (1164138582 + 762844355i) + (1425321120 + 1242804536i)u
 "#]];
-pub const RANGE_CHECK_5_4: Expect = expect![[r#"
-    (916248735 + 2087615263i) + (41966646 + 1245971620i)u
-"#]];
 pub const RANGE_CHECK_9_9: Expect = expect![[r#"
     (1894767386 + 1545920395i) + (422922350 + 1060532858i)u
 "#]];

stwo_cairo_prover/crates/cairo-air/src/components/mod.rs

@@ -53,7 +53,6 @@ pub mod range_check_3_6_6_3;
 pub mod range_check_4_3;
 pub mod range_check_4_4;
 pub mod range_check_4_4_4_4;
-pub mod range_check_5_4;
 pub mod range_check_6;
 pub mod range_check_7_2_5;
 pub mod range_check_8;

stwo_cairo_prover/crates/cairo-air/src/components/pedersen_aggregator.rs

@@ -43,7 +43,6 @@ generate_range_check_constraints!([20], g, G);
 generate_range_check_constraints!([20], h, H);
 generate_range_check_constraints!([4, 3]);
 generate_range_check_constraints!([4, 4]);
-generate_range_check_constraints!([5, 4]);
 generate_range_check_constraints!([9, 9]);
 generate_range_check_constraints!([9, 9], b, B);
 generate_range_check_constraints!([9, 9], c, C);

stwo_cairo_prover/crates/cairo-air/src/components/range_check_5_4.rs

@@ -78,7 +78,6 @@ pub mod read_positive_num_bits_72;
 pub mod read_positive_num_bits_96;
 pub mod read_positive_num_bits_99;
 pub mod read_small;
-pub mod read_split;
 pub mod read_u_32;
 pub mod single_karatsuba_n_7;
 pub mod single_karatsuba_n_8;

stwo_cairo_prover/crates/cairo-air/src/components/range_check_vector.rs

@@ -179,10 +179,6 @@ impl Components {
                     .clone(),
                 memory_id_to_big_lookup_elements: interaction_elements.memory_id_to_value.clone(),
                 partial_ec_mul_lookup_elements: interaction_elements.partial_ec_mul.clone(),
-                pedersen_points_table_lookup_elements: interaction_elements
-                    .pedersen_points_table
-                    .clone(),
-                range_check_5_4_lookup_elements: interaction_elements.range_checks.rc_5_4.clone(),
                 range_check_8_lookup_elements: interaction_elements.range_checks.rc_8.clone(),
             },
             interaction_claim.pedersen_aggregator.claimed_sum,

stwo_cairo_prover/crates/cairo-air/src/components/subroutines/mod.rs

@@ -12,10 +12,9 @@ use crate::components::{
     indented_component_display, range_check_11, range_check_12, range_check_18, range_check_18_b,
     range_check_20, range_check_20_b, range_check_20_c, range_check_20_d, range_check_20_e,
     range_check_20_f, range_check_20_g, range_check_20_h, range_check_3_3_3_3_3,
-    range_check_3_6_6_3, range_check_4_3, range_check_4_4, range_check_4_4_4_4, range_check_5_4,
-    range_check_6, range_check_7_2_5, range_check_8, range_check_9_9, range_check_9_9_b,
-    range_check_9_9_c, range_check_9_9_d, range_check_9_9_e, range_check_9_9_f, range_check_9_9_g,
-    range_check_9_9_h,
+    range_check_3_6_6_3, range_check_4_3, range_check_4_4, range_check_4_4_4_4, range_check_6,
+    range_check_7_2_5, range_check_8, range_check_9_9, range_check_9_9_b, range_check_9_9_c,
+    range_check_9_9_d, range_check_9_9_e, range_check_9_9_f, range_check_9_9_g, range_check_9_9_h,
 };
 use crate::relations;
 
@@ -37,7 +36,6 @@ pub struct RangeChecksClaim {
     pub rc_20_h: range_check_20_h::Claim,
     pub rc_4_3: range_check_4_3::Claim,
     pub rc_4_4: range_check_4_4::Claim,
-    pub rc_5_4: range_check_5_4::Claim,
     pub rc_9_9: range_check_9_9::Claim,
     pub rc_9_9_b: range_check_9_9_b::Claim,
     pub rc_9_9_c: range_check_9_9_c::Claim,
@@ -69,7 +67,6 @@ impl RangeChecksClaim {
         self.rc_20_h.mix_into(channel);
         self.rc_4_3.mix_into(channel);
         self.rc_4_4.mix_into(channel);
-        self.rc_5_4.mix_into(channel);
         self.rc_9_9.mix_into(channel);
         self.rc_9_9_b.mix_into(channel);
         self.rc_9_9_c.mix_into(channel);
@@ -103,7 +100,6 @@ impl RangeChecksClaim {
                 self.rc_20_h.log_sizes(),
                 self.rc_4_3.log_sizes(),
                 self.rc_4_4.log_sizes(),
-                self.rc_5_4.log_sizes(),
                 self.rc_9_9.log_sizes(),
                 self.rc_9_9_b.log_sizes(),
                 self.rc_9_9_c.log_sizes(),
@@ -140,7 +136,6 @@ pub struct RangeChecksInteractionClaim {
     pub rc_20_h: range_check_20_h::InteractionClaim,
     pub rc_4_3: range_check_4_3::InteractionClaim,
     pub rc_4_4: range_check_4_4::InteractionClaim,
-    pub rc_5_4: range_check_5_4::InteractionClaim,
     pub rc_9_9: range_check_9_9::InteractionClaim,
     pub rc_9_9_b: range_check_9_9_b::InteractionClaim,
     pub rc_9_9_c: range_check_9_9_c::InteractionClaim,
@@ -172,7 +167,6 @@ impl RangeChecksInteractionClaim {
         self.rc_20_h.mix_into(channel);
         self.rc_4_3.mix_into(channel);
         self.rc_4_4.mix_into(channel);
-        self.rc_5_4.mix_into(channel);
         self.rc_9_9.mix_into(channel);
         self.rc_9_9_b.mix_into(channel);
         self.rc_9_9_c.mix_into(channel);
@@ -205,7 +199,6 @@ impl RangeChecksInteractionClaim {
         sum += self.rc_20_h.claimed_sum;
         sum += self.rc_4_3.claimed_sum;
         sum += self.rc_4_4.claimed_sum;
-        sum += self.rc_5_4.claimed_sum;
         sum += self.rc_9_9.claimed_sum;
         sum += self.rc_9_9_b.claimed_sum;
         sum += self.rc_9_9_c.claimed_sum;
@@ -239,7 +232,6 @@ pub struct RangeChecksInteractionElements {
     pub rc_20_h: relations::RangeCheck_20_H,
     pub rc_4_3: relations::RangeCheck_4_3,
     pub rc_4_4: relations::RangeCheck_4_4,
-    pub rc_5_4: relations::RangeCheck_5_4,
     pub rc_9_9: relations::RangeCheck_9_9,
     pub rc_9_9_b: relations::RangeCheck_9_9_B,
     pub rc_9_9_c: relations::RangeCheck_9_9_C,
@@ -273,7 +265,6 @@ impl RangeChecksInteractionElements {
             rc_20_h: relations::RangeCheck_20_H::draw(channel),
             rc_4_3: relations::RangeCheck_4_3::draw(channel),
             rc_4_4: relations::RangeCheck_4_4::draw(channel),
-            rc_5_4: relations::RangeCheck_5_4::draw(channel),
             rc_9_9: relations::RangeCheck_9_9::draw(channel),
             rc_9_9_b: relations::RangeCheck_9_9_B::draw(channel),
             rc_9_9_c: relations::RangeCheck_9_9_C::draw(channel),
@@ -307,7 +298,6 @@ pub struct RangeChecksComponents {
     pub rc_20_h: range_check_20_h::Component,
     pub rc_4_3: range_check_4_3::Component,
     pub rc_4_4: range_check_4_4::Component,
-    pub rc_5_4: range_check_5_4::Component,
     pub rc_9_9: range_check_9_9::Component,
     pub rc_9_9_b: range_check_9_9_b::Component,
     pub rc_9_9_c: range_check_9_9_c::Component,
@@ -455,14 +445,6 @@ impl RangeChecksComponents {
             },
             interaction_claim.rc_4_4.claimed_sum,
         );
-        let rc_5_4_component = range_check_5_4::Component::new(
-            tree_span_provider,
-            range_check_5_4::Eval {
-                claim: range_check_5_4::Claim {},
-                range_check_5_4_lookup_elements: interaction_elements.rc_5_4.clone(),
-            },
-            interaction_claim.rc_5_4.claimed_sum,
-        );
         let rc_9_9_component = range_check_9_9::Component::new(
             tree_span_provider,
             range_check_9_9::Eval {
@@ -576,7 +558,6 @@ impl RangeChecksComponents {
             rc_20_h: rc_20_h_component,
             rc_4_3: rc_4_3_component,
             rc_4_4: rc_4_4_component,
-            rc_5_4: rc_5_4_component,
             rc_9_9: rc_9_9_component,
             rc_9_9_b: rc_9_9_b_component,
             rc_9_9_c: rc_9_9_c_component,
@@ -610,7 +591,6 @@ impl RangeChecksComponents {
             &self.rc_20_h as &dyn ComponentProver<SimdBackend>,
             &self.rc_4_3 as &dyn ComponentProver<SimdBackend>,
             &self.rc_4_4 as &dyn ComponentProver<SimdBackend>,
-            &self.rc_5_4 as &dyn ComponentProver<SimdBackend>,
             &self.rc_9_9 as &dyn ComponentProver<SimdBackend>,
             &self.rc_9_9_b as &dyn ComponentProver<SimdBackend>,
             &self.rc_9_9_c as &dyn ComponentProver<SimdBackend>,
@@ -701,11 +681,6 @@ impl std::fmt::Display for RangeChecksComponents {
             "RangeCheck4_4: {}",
             indented_component_display(&self.rc_4_4)
         )?;
-        writeln!(
-            f,
-            "RangeCheck5_4: {}",
-            indented_component_display(&self.rc_5_4)
-        )?;
         writeln!(
             f,
             "RangeCheck9_9: {}",

stwo_cairo_prover/crates/cairo-air/src/components/subroutines/read_split.rs

@@ -33,7 +33,6 @@ relation!(RangeCheck_3_6, 2);
 relation!(RangeCheck_4_3, 2);
 relation!(RangeCheck_4_4_4_4, 4);
 relation!(RangeCheck_4_4, 2);
-relation!(RangeCheck_5_4, 2);
 relation!(RangeCheck_6, 1);
 relation!(RangeCheck_7_2_5, 3);
 relation!(RangeCheck_8, 1);