Formal preprocessed columns in expressions.

crates/prover/src/constraint_framework/expr.rs

@@ -6,6 +6,7 @@ use num_traits::{One, Zero};
 use rand::rngs::SmallRng;
 use rand::{Rng, SeedableRng};
 
+use super::preprocessed_columns::PreprocessedColumn;
 use super::{AssertEvaluator, EvalAtRow, Relation, RelationEntry, INTERACTION_TRACE_IDX};
 use crate::core::fields::cm31::CM31;
 use crate::core::fields::m31::{self, BaseField};
@@ -912,6 +913,10 @@ impl EvalAtRow for ExprEvaluator {
         intermediate
     }
 
+    fn get_preprocessed_column(&mut self, column: PreprocessedColumn) -> Self::F {
+        BaseExpr::Param(column.name().to_string())
+    }
+
     super::logup_proxy!();
 }
 
@@ -1089,9 +1094,9 @@ mod tests {
         let constraint_0 = ((col_1_0[0]) * (intermediate0)) * (1 / (col_1_0[0] + col_1_1[0]));
 
 \
-        let constraint_1 = (SecureCol(col_2_4[0], col_2_6[0], col_2_8[0], col_2_10[0]) \
-            - (SecureCol(col_2_5[-1], col_2_7[-1], col_2_9[-1], col_2_11[-1]) \
-                - ((total_sum) * (col_0_3[0])))) \
+        let constraint_1 = (SecureCol(col_2_3[0], col_2_5[0], col_2_7[0], col_2_9[0]) \
+            - (SecureCol(col_2_4[-1], col_2_6[-1], col_2_8[-1], col_2_10[-1]) \
+                - ((total_sum) * (preprocessed.is_first)))) \
             * (intermediate1) \
             - (1);"
             .to_string();

crates/prover/src/constraint_framework/preprocessed_columns.rs

@@ -14,6 +14,16 @@ pub enum PreprocessedColumn {
     Plonk(usize),
 }
 
+impl PreprocessedColumn {
+    pub const fn name(&self) -> &'static str {
+        match self {
+            PreprocessedColumn::XorTable(..) => "preprocessed.xor_table",
+            PreprocessedColumn::IsFirst(_) => "preprocessed.is_first",
+            PreprocessedColumn::Plonk(_) => "preprocessed.plonk",
+        }
+    }
+}
+
 /// Generates a column with a single one at the first position, and zeros elsewhere.
 pub fn gen_is_first<B: Backend>(log_size: u32) -> CircleEvaluation<B, BaseField, BitReversedOrder> {
     let mut col = Col::<B, BaseField>::zeros(1 << log_size);

crates/prover/src/examples/state_machine/mod.rs

@@ -369,17 +369,17 @@ mod tests {
 
 \
         let constraint_0 = (SecureCol(\
-            col_2_5[claimed_sum_offset], \
-            col_2_8[claimed_sum_offset], \
-            col_2_11[claimed_sum_offset], \
-            col_2_14[claimed_sum_offset]\
+            col_2_4[claimed_sum_offset], \
+            col_2_7[claimed_sum_offset], \
+            col_2_10[claimed_sum_offset], \
+            col_2_13[claimed_sum_offset]\
         ) - (claimed_sum)) \
-            * (col_0_2[0]);
+            * (preprocessed.is_first);
 
 \
-        let constraint_1 = (SecureCol(col_2_3[0], col_2_6[0], col_2_9[0], col_2_12[0]) \
-            - (SecureCol(col_2_4[-1], col_2_7[-1], col_2_10[-1], col_2_13[-1]) \
-                - ((total_sum) * (col_0_2[0])))\
+        let constraint_1 = (SecureCol(col_2_2[0], col_2_5[0], col_2_8[0], col_2_11[0]) \
+            - (SecureCol(col_2_3[-1], col_2_6[-1], col_2_9[-1], col_2_12[-1]) \
+                - ((total_sum) * (preprocessed.is_first)))\
             ) \
             * ((intermediate0) * (intermediate1)) \
             - (intermediate1 - (intermediate0));"