fix after merge from main

circuits/src/poseidon2_preimage_pack/columns.rs

@@ -4,9 +4,11 @@ use plonky2::hash::hash_types::RichField;
 
 use crate::columns_view::{columns_view_impl, make_col_map, NumberOfColumns};
 use crate::linear_combination::Column;
+use crate::linear_combination_typed::ColumnWithTypedInput;
+use crate::memory::columns::MemoryCtl;
 use crate::poseidon2::columns::STATE_SIZE;
 use crate::poseidon2_sponge::columns::Poseidon2Sponge;
-use crate::stark::mozak_stark::{Poseidon2PreimagePackTable, Table};
+use crate::stark::mozak_stark::{Poseidon2PreimagePackTable, TableWithTypedOutput};
 
 #[repr(C)]
 #[derive(Clone, Copy, Eq, PartialEq, Debug, Default)]
@@ -77,42 +79,52 @@ impl<F: RichField> From<&Poseidon2Sponge<F>> for Vec<Poseidon2PreimagePack<F>> {
     }
 }
 
+columns_view_impl!(Poseidon2SpongePreimagePackCtl);
+#[repr(C)]
+#[derive(Clone, Copy, Eq, PartialEq, Debug, Default)]
+pub struct Poseidon2SpongePreimagePackCtl<T> {
+    pub clk: T,
+    pub value: T,
+    pub fe_addr: T,
+}
 #[must_use]
-pub fn lookup_for_poseidon2_sponge() -> Table {
-    let data = col_map().map(Column::from);
+pub fn lookup_for_poseidon2_sponge() -> TableWithTypedOutput<Poseidon2SpongePreimagePackCtl<Column>>
+{
+    let data = COL_MAP;
     Poseidon2PreimagePackTable::new(
-        vec![
-            data.clk,
-            Column::reduce_with_powers(
+        Poseidon2SpongePreimagePackCtl {
+            clk: data.clk,
+            value: ColumnWithTypedInput::reduce_with_powers(
                 // FIXME: Check why does not work just reduce_with_power on &data.bytes
                 {
-                    let mut r = data.bytes.clone();
+                    let mut r = data.bytes;
                     r.reverse();
-                    &r.clone()
+                    r
                 },
-                1 << 8,
+                i64::from(1 << 8),
             ),
-            data.fe_addr,
-        ],
-        col_map().map(Column::from).is_executed,
+            fe_addr: data.fe_addr,
+        },
+        COL_MAP.is_executed,
     )
 }
+
 #[must_use]
-pub fn lookup_for_input_memory(index: u8) -> Table {
+pub fn lookup_for_input_memory(index: u8) -> TableWithTypedOutput<MemoryCtl<Column>> {
     assert!(
         usize::from(index) < MozakPoseidon2::DATA_CAPACITY_PER_FIELD_ELEMENT,
         "poseidon2-preimage data_for_input_memory: index can be 0..{:?}",
         MozakPoseidon2::DATA_CAPACITY_PER_FIELD_ELEMENT
     );
-    let data = col_map().map(Column::from);
+    let data = COL_MAP;
     Poseidon2PreimagePackTable::new(
-        vec![
-            data.clk,
-            Column::constant(0),                // is_store
-            Column::constant(1),                // is_load
-            data.bytes[index as usize].clone(), // value
-            data.byte_addr + i64::from(index),  // address
-        ],
-        col_map().map(Column::from).is_executed,
+        MemoryCtl {
+            clk: data.clk,
+            is_store: ColumnWithTypedInput::constant(0), // is_store
+            is_load: ColumnWithTypedInput::constant(1),  // is_load
+            value: data.bytes[index as usize],           // value
+            addr: data.byte_addr + i64::from(index),     // address
+        },
+        COL_MAP.is_executed,
     )
 }

circuits/src/poseidon2_sponge/columns.rs

@@ -12,6 +12,7 @@ use crate::memory::columns::MemoryCtl;
 use crate::poseidon2::columns::Poseidon2StateCtl;
 #[cfg(feature = "enable_poseidon_starks")]
 use crate::poseidon2_output_bytes::columns::Poseidon2OutputBytesCtl;
+use crate::poseidon2_preimage_pack::columns::Poseidon2SpongePreimagePackCtl;
 #[cfg(feature = "enable_poseidon_starks")]
 use crate::stark::mozak_stark::{Poseidon2SpongeTable, TableWithTypedOutput};
 
@@ -118,15 +119,17 @@ pub fn lookup_for_input_memory(limb_index: u8) -> TableWithTypedOutput<MemoryCtl
 }
 
 #[must_use]
-pub fn lookup_for_preimage_pack(limb_index: u8) -> Table {
+pub fn lookup_for_preimage_pack(
+    limb_index: u8,
+) -> TableWithTypedOutput<Poseidon2SpongePreimagePackCtl<Column>> {
     assert!(limb_index < 8, "limb_index can be 0..7");
-    let sponge = col_map().map(Column::from);
+    let sponge = COL_MAP;
     Poseidon2SpongeTable::new(
-        vec![
-            sponge.clk,
-            sponge.preimage[limb_index as usize].clone(), // value
-            sponge.input_addr + i64::from(limb_index),    // address
-        ],
+        Poseidon2SpongePreimagePackCtl {
+            clk: sponge.clk,
+            value: sponge.preimage[limb_index as usize], // value
+            fe_addr: sponge.input_addr + i64::from(limb_index), // address
+        },
         sponge.ops.is_init_permute + sponge.ops.is_permute,
     )
 }

circuits/src/stark/mozak_stark.rs

@@ -38,14 +38,16 @@ use crate::poseidon2_output_bytes::columns::Poseidon2OutputBytes;
 #[cfg(feature = "enable_poseidon_starks")]
 use crate::poseidon2_output_bytes::columns::Poseidon2OutputBytesCtl;
 use crate::poseidon2_output_bytes::stark::Poseidon2OutputBytesStark;
+use crate::poseidon2_preimage_pack::columns::{
+    Poseidon2PreimagePack, Poseidon2SpongePreimagePackCtl,
+};
+#[cfg(feature = "enable_poseidon_starks")]
+use crate::poseidon2_preimage_pack::stark::Poseidon2PreimagePackStark;
 #[cfg(feature = "enable_poseidon_starks")]
-use crate::poseidon2_sponge;
 use crate::poseidon2_sponge::columns::Poseidon2Sponge;
 #[cfg(feature = "enable_poseidon_starks")]
 use crate::poseidon2_sponge::columns::Poseidon2SpongeCtl;
 use crate::poseidon2_sponge::stark::Poseidon2SpongeStark;
-#[cfg(feature = "enable_poseidon_starks")]
-use crate::poseidon2_preimage_pack::stark::Poseidon2PreimagePackStark;
 use crate::program::columns::{InstructionRow, ProgramRom};
 use crate::program::stark::ProgramStark;
 use crate::rangecheck::columns::{rangecheck_looking, RangeCheckColumnsView, RangeCheckCtl};
@@ -568,8 +570,11 @@ table_impl!(
     Poseidon2OutputBytes
 );
 #[cfg(feature = "enable_poseidon_starks")]
-table_impl!(Poseidon2PreimagePackTable, TableKind::Poseidon2PreimagePack);
-
+table_impl!(
+    Poseidon2PreimagePackTable,
+    TableKind::Poseidon2PreimagePack,
+    Poseidon2PreimagePack
+);
 
 pub trait Lookups {
     type Row: IntoIterator<Item = Column>;
@@ -821,12 +826,13 @@ impl Lookups for Poseidon2OutputBytesPoseidon2SpongeTable {
 pub struct Poseidon2Sponge2Poseidon2PreimagePackTable;
 #[cfg(feature = "enable_poseidon_starks")]
 impl Lookups for Poseidon2Sponge2Poseidon2PreimagePackTable {
-    fn lookups() -> CrossTableLookup {
+    type Row = Poseidon2SpongePreimagePackCtl<Column>;
+
+    fn lookups_with_typed_output() -> CrossTableLookupWithTypedOutput<Self::Row> {
         let mut tables = vec![];
         tables.extend((0..8).map(crate::poseidon2_sponge::columns::lookup_for_preimage_pack));
-        CrossTableLookup::new(
-            tables,
+        CrossTableLookupWithTypedOutput::new(tables, vec![
             poseidon2_preimage_pack::columns::lookup_for_poseidon2_sponge(),
-        )
+        ])
     }
 }