remove ProgramComponent and make the number of rows in the table dynamic

Author: ohad-nir-starkware

stwo_cairo_prover/crates/cairo-air/src/cairo_components.rs

@@ -19,13 +19,13 @@ use crate::components::{
     pedersen_aggregator_window_bits_18, pedersen_aggregator_window_bits_9, pedersen_builtin,
     pedersen_builtin_narrow_windows, pedersen_points_table_window_bits_18,
     pedersen_points_table_window_bits_9, poseidon_3_partial_rounds_chain, poseidon_aggregator,
-    poseidon_builtin, poseidon_full_round_chain, poseidon_round_keys, program_component,
-    qm_31_add_mul_opcode, range_check96_builtin, range_check_11, range_check_12, range_check_18,
-    range_check_20, range_check_252_width_27, 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_6, range_check_7_2_5,
-    range_check_8, range_check_9_9, range_check_builtin, ret_opcode, triple_xor_32,
-    verify_bitwise_xor_12, verify_bitwise_xor_4, verify_bitwise_xor_7, verify_bitwise_xor_8,
-    verify_bitwise_xor_9, verify_instruction, verify_program,
+    poseidon_builtin, poseidon_full_round_chain, poseidon_round_keys, qm_31_add_mul_opcode,
+    range_check96_builtin, range_check_11, range_check_12, range_check_18, range_check_20,
+    range_check_252_width_27, 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_6, range_check_7_2_5, range_check_8,
+    range_check_9_9, range_check_builtin, ret_opcode, triple_xor_32, verify_bitwise_xor_12,
+    verify_bitwise_xor_4, verify_bitwise_xor_7, verify_bitwise_xor_8, verify_bitwise_xor_9,
+    verify_instruction, verify_program,
 };
 use crate::relations::CommonLookupElements;
 
@@ -67,7 +67,6 @@ pub struct CairoComponents {
     pub ec_op_builtin: Option<ec_op_builtin::Component>,
     pub partial_ec_mul_generic: Option<partial_ec_mul_generic::Component>,
     pub verify_program: Option<verify_program::Component>,
-    pub program_component: Option<program_component::Component>,
     pub pedersen_aggregator_window_bits_18: Option<pedersen_aggregator_window_bits_18::Component>,
     pub partial_ec_mul_window_bits_18: Option<partial_ec_mul_window_bits_18::Component>,
     pub pedersen_points_table_window_bits_18:
@@ -528,16 +527,6 @@ impl CairoComponents {
                 interaction_claim.verify_program.unwrap().claimed_sum,
             )
         });
-        let program_component_component = cairo_claim.program_component.map(|program_component| {
-            program_component::Component::new(
-                tree_span_provider,
-                program_component::Eval {
-                    claim: program_component,
-                    common_lookup_elements: common_lookup_elements.clone(),
-                },
-                interaction_claim.program_component.unwrap().claimed_sum,
-            )
-        });
         let pedersen_aggregator_window_bits_18_component = cairo_claim
             .pedersen_aggregator_window_bits_18
             .map(|pedersen_aggregator_window_bits_18| {
@@ -968,7 +957,6 @@ impl CairoComponents {
             ec_op_builtin: ec_op_builtin_component,
             partial_ec_mul_generic: partial_ec_mul_generic_component,
             verify_program: verify_program_component,
-            program_component: program_component_component,
             pedersen_aggregator_window_bits_18: pedersen_aggregator_window_bits_18_component,
             partial_ec_mul_window_bits_18: partial_ec_mul_window_bits_18_component,
             pedersen_points_table_window_bits_18: pedersen_points_table_window_bits_18_component,
@@ -1117,9 +1105,6 @@ impl CairoComponents {
         if let Some(component) = &self.verify_program {
             vec.push(component as &dyn Component);
         }
-        if let Some(component) = &self.program_component {
-            vec.push(component as &dyn Component);
-        }
         if let Some(component) = &self.pedersen_aggregator_window_bits_18 {
             vec.push(component as &dyn Component);
         }
@@ -1450,13 +1435,6 @@ impl Display for CairoComponents {
                 indented_component_display(component)
             )?;
         }
-        if let Some(ref component) = self.program_component {
-            writeln!(
-                f,
-                "ProgramComponent: {}",
-                indented_component_display(component)
-            )?;
-        }
         if let Some(ref component) = self.pedersen_aggregator_window_bits_18 {
             writeln!(
                 f,

stwo_cairo_prover/crates/cairo-air/src/claims.rs

@@ -54,7 +54,6 @@ pub struct CairoClaim {
     pub ec_op_builtin: Option<ec_op_builtin::Claim>,
     pub partial_ec_mul_generic: Option<partial_ec_mul_generic::Claim>,
     pub verify_program: Option<verify_program::Claim>,
-    pub program_component: Option<program_component::Claim>,
     pub pedersen_aggregator_window_bits_18: Option<pedersen_aggregator_window_bits_18::Claim>,
     pub partial_ec_mul_window_bits_18: Option<partial_ec_mul_window_bits_18::Claim>,
     pub pedersen_points_table_window_bits_18: Option<pedersen_points_table_window_bits_18::Claim>,
@@ -518,9 +517,6 @@ impl CairoClaim {
         self.verify_program
             .as_ref()
             .inspect(|c| log_sizes_list.push(c.log_sizes()));
-        self.program_component
-            .as_ref()
-            .inspect(|c| log_sizes_list.push(c.log_sizes()));
         self.pedersen_aggregator_window_bits_18
             .as_ref()
             .inspect(|c| log_sizes_list.push(c.log_sizes()));
@@ -883,13 +879,6 @@ impl CairoClaim {
             component_log_sizes.push(0_u32);
             component_enable_bits.push(false);
         }
-        if let Some(_c) = self.program_component {
-            component_log_sizes.push(program_component::LOG_SIZE);
-            component_enable_bits.push(true);
-        } else {
-            component_log_sizes.push(0_u32);
-            component_enable_bits.push(false);
-        }
         if let Some(c) = self.pedersen_aggregator_window_bits_18 {
             component_log_sizes.push(c.log_size);
             component_enable_bits.push(true);
@@ -1165,7 +1154,6 @@ pub struct CairoInteractionClaim {
     pub ec_op_builtin: Option<ec_op_builtin::InteractionClaim>,
     pub partial_ec_mul_generic: Option<partial_ec_mul_generic::InteractionClaim>,
     pub verify_program: Option<verify_program::InteractionClaim>,
-    pub program_component: Option<program_component::InteractionClaim>,
     pub pedersen_aggregator_window_bits_18:
         Option<pedersen_aggregator_window_bits_18::InteractionClaim>,
     pub partial_ec_mul_window_bits_18: Option<partial_ec_mul_window_bits_18::InteractionClaim>,
@@ -1402,11 +1390,6 @@ impl CairoInteractionClaim {
         } else {
             claimed_sums.push(SecureField::zero());
         }
-        if let Some(c) = self.program_component {
-            claimed_sums.push(c.claimed_sum);
-        } else {
-            claimed_sums.push(SecureField::zero());
-        }
         if let Some(c) = self.pedersen_aggregator_window_bits_18 {
             claimed_sums.push(c.claimed_sum);
         } else {
@@ -1735,9 +1718,6 @@ pub fn lookup_sum(
     interaction_claim.verify_program.as_ref().inspect(|ic| {
         sum += ic.claimed_sum;
     });
-    interaction_claim.program_component.as_ref().inspect(|ic| {
-        sum += ic.claimed_sum;
-    });
     interaction_claim
         .pedersen_aggregator_window_bits_18
         .as_ref()

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

@@ -86,5 +86,4 @@ pub(crate) fn indented_component_display<E: FrameworkEval>(
         .map(|line| format!("\t{line}"))
         .join("\n")
 }
-pub mod program_component;
 pub mod verify_program;

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

@@ -4,6 +4,7 @@ pub use stwo::core::fields::m31::M31;
 pub use stwo::core::fields::qm31::{SecureField, SECURE_EXTENSION_DEGREE};
 pub use stwo::core::pcs::TreeVec;
 pub use stwo_cairo_common::preprocessed_columns::preprocessed_trace::{PreProcessedColumn, Seq};
+pub use stwo_cairo_common::preprocessed_columns::program::ProgramColumn;
 pub use stwo_cairo_serialize::{CairoDeserialize, CairoSerialize};
 pub use stwo_constraint_framework::preprocessed_columns::PreProcessedColumnId;
 pub use stwo_constraint_framework::{EvalAtRow, FrameworkComponent, FrameworkEval, RelationEntry};