Merge remote-tracking branch 'origin/main' into try_zero

powdr-labs · Jan 28, 2025 · 0fa2e78 · 0fa2e78
2 parents a0ef543 + 8d89d80
commit 0fa2e78
Show file tree

Hide file tree

Showing 43 changed files with 978 additions and 400 deletions.
diff --git a/.github/workflows/nightly_tests_list.txt b/.github/workflows/nightly_tests_list.txt
@@ -8,7 +8,6 @@ test(=instruction_tests::bge) |
 test(=instruction_tests::blt) |
 test(=instruction_tests::bltu) |
 test(=instruction_tests::bne) |
-test(=instruction_tests::divu) |
 test(=instruction_tests::j) |
 test(=instruction_tests::jal) |
 test(=instruction_tests::lb) |

diff --git a/ast/src/analyzed/display.rs b/ast/src/analyzed/display.rs
@@ -433,7 +433,7 @@ impl<T: Display> Display for PhantomBusInteractionIdentity<T> {
             f,
             "Constr::PhantomBusInteraction({}, [{}], {});",
             self.multiplicity,
-            self.tuple.0.iter().map(ToString::to_string).format(", "),
+            self.payload.0.iter().map(ToString::to_string).format(", "),
             self.latch,
         )
     }

diff --git a/ast/src/analyzed/mod.rs b/ast/src/analyzed/mod.rs
@@ -1011,22 +1011,22 @@ pub struct PhantomBusInteractionIdentity<T> {
     pub id: u64,
     pub source: SourceRef,
     pub multiplicity: AlgebraicExpression<T>,
-    pub tuple: ExpressionList<T>,
+    pub payload: ExpressionList<T>,
     pub latch: AlgebraicExpression<T>,
 }
 
 impl<T> Children<AlgebraicExpression<T>> for PhantomBusInteractionIdentity<T> {
     fn children_mut(&mut self) -> Box<dyn Iterator<Item = &mut AlgebraicExpression<T>> + '_> {
         Box::new(
             once(&mut self.multiplicity)
-                .chain(self.tuple.children_mut())
+                .chain(self.payload.children_mut())
                 .chain(once(&mut self.latch)),
         )
     }
     fn children(&self) -> Box<dyn Iterator<Item = &AlgebraicExpression<T>> + '_> {
         Box::new(
             once(&self.multiplicity)
-                .chain(self.tuple.children())
+                .chain(self.payload.children())
                 .chain(once(&self.latch)),
         )
     }

diff --git a/backend/src/mock/bus_checker.rs b/backend/src/mock/bus_checker.rs
@@ -137,7 +137,7 @@ impl<'a, F: FieldElement> BusChecker<'a, F> {
                             .unwrap();
 
                             let tuple = identity
-                                .tuple
+                                .payload
                                 .children()
                                 .map(|e| evaluator.evaluate(e))
                                 .collect();

diff --git a/backend/src/mock/connection_constraint_checker.rs b/backend/src/mock/connection_constraint_checker.rs
@@ -77,7 +77,7 @@ impl<F: FieldElement> Connection<F> {
                 ConnectionKind::Permutation,
                 None,
             )),
-            // TODO(bus_interaction)
+            // Handled by bus constraint checker
             Identity::PhantomBusInteraction(_) => Err(()),
         }?;
 

diff --git a/executor/src/lib.rs b/executor/src/lib.rs
@@ -1,6 +1,4 @@
 //! Tooling used for execution of compiled programs
 
-use powdr_ast::analyzed::Identity;
-
 pub mod constant_evaluator;
 pub mod witgen;
diff --git a/executor/src/witgen/block_processor.rs b/executor/src/witgen/block_processor.rs
@@ -1,10 +1,8 @@
 use powdr_number::{DegreeType, FieldElement};
 
-use crate::Identity;
-
 use super::{
     affine_expression::AlgebraicVariable,
-    data_structures::mutable_state::MutableState,
+    data_structures::{identity::Identity, mutable_state::MutableState},
     machines::MachineParts,
     processor::{OuterQuery, Processor, SolverState},
     rows::{RowIndex, UnknownStrategy},
@@ -184,11 +182,10 @@ mod tests {
         let mutable_state = MutableState::new(iter::empty(), &query_callback);
 
         let row_offset = RowIndex::from_degree(0, degree);
-        let identities = analyzed.identities.iter().collect::<Vec<_>>();
         let machine_parts = MachineParts::new(
             &fixed_data,
             Default::default(),
-            identities,
+            fixed_data.identities.iter().collect(),
             fixed_data.witness_cols.keys().collect(),
             Default::default(),
         );

diff --git a/executor/src/witgen/bus_accumulator/mod.rs b/executor/src/witgen/bus_accumulator/mod.rs
@@ -89,7 +89,7 @@ impl<'a, T: FieldElement, Ext: ExtensionField<T> + Sync> BusAccumulatorGenerator
 
         let max_tuple_size = bus_interactions
             .iter()
-            .map(|i| i.tuple.0.len())
+            .map(|i| i.payload.0.len())
             .max()
             .unwrap();
 
@@ -147,7 +147,7 @@ impl<'a, T: FieldElement, Ext: ExtensionField<T> + Sync> BusAccumulatorGenerator
             let multiplicity = evaluator.evaluate(&bus_interaction.multiplicity);
 
             let tuple = bus_interaction
-                .tuple
+                .payload
                 .0
                 .iter()
                 .map(|r| evaluator.evaluate(r))