Explore crepe

autoprecompiles/Cargo.toml

@@ -23,6 +23,10 @@ rayon = "1.10.0"
 strum = { version = "0.27.0", features = ["derive"] }
 
 metrics = "0.23.0"
+crepe = { git = "https://github.com/chriseth/crepe", branch = "generics", version = "0.1.8" }
+
+[dev-dependencies]
+expect-test = "1.5.1"
 
 [package.metadata.cargo-udeps.ignore]
 development = ["env_logger"]

autoprecompiles/src/constraint_optimizer.rs

@@ -23,6 +23,7 @@ use crate::{
     low_degree_bus_interaction_optimizer::LowDegreeBusInteractionOptimizer,
     memory_optimizer::{optimize_memory, MemoryBusInteraction},
     range_constraint_optimizer::RangeConstraintHandler,
+    rule_based_optimizer::rule_based_optimization,
     stats_logger::StatsLogger,
 };
 
@@ -57,6 +58,7 @@ pub fn optimize_constraints<
     stats_logger: &mut StatsLogger,
     memory_bus_id: Option<u64>,
     degree_bound: DegreeBound,
+    new_var: &mut impl FnMut(&str) -> V,
 ) -> Result<ConstraintSystem<P, V>, Error> {
     // Index the constraint system for the first time
     let constraint_system = IndexedConstraintSystem::from(constraint_system);
@@ -81,6 +83,14 @@ pub fn optimize_constraints<
         stats_logger,
     );
 
+    let constraint_system = rule_based_optimization(
+        constraint_system,
+        &*solver,
+        bus_interaction_handler.clone(),
+        new_var,
+    );
+    stats_logger.log("rule-based optimization", &constraint_system);
+
     // At this point, we throw away the index and only keep the constraint system, since the rest of the optimisations are defined on the system alone
     let constraint_system: ConstraintSystem<P, V> = constraint_system.into();
 

autoprecompiles/src/lib.rs

@@ -40,6 +40,7 @@ mod stats_logger;
 pub mod symbolic_machine_generator;
 pub use pgo::{PgoConfig, PgoType};
 pub use powdr_constraint_solver::inliner::DegreeBound;
+pub mod rule_based_optimizer;
 pub mod trace_handler;
 
 #[derive(Clone)]

autoprecompiles/src/optimizer.rs

@@ -35,7 +35,7 @@ pub fn optimize<A: Adapter>(
     bus_interaction_handler: A::BusInteractionHandler,
     degree_bound: DegreeBound,
     bus_map: &BusMap<A::CustomBusTypes>,
-    column_allocator: ColumnAllocator,
+    mut column_allocator: ColumnAllocator,
 ) -> Result<(SymbolicMachine<A::PowdrField>, ColumnAllocator), crate::constraint_optimizer::Error> {
     let mut stats_logger = StatsLogger::start(&machine);
 
@@ -44,7 +44,17 @@ pub fn optimize<A: Adapter>(
         stats_logger.log("exec bus optimization", &machine);
     }
 
+    let mut new_var = |name: &str| {
+        let id = column_allocator.issue_next_poly_id();
+        AlgebraicReference {
+            // TODO is it a problem that we do not check the name to be unique?
+            name: format!("{name}_{id}").into(),
+            id,
+        }
+    };
+
     let mut constraint_system = symbolic_machine_to_constraint_system(machine);
+
     let mut solver = new_solver(constraint_system.clone(), bus_interaction_handler.clone());
     loop {
         let stats = stats_logger::Stats::from(&constraint_system);
@@ -55,6 +65,7 @@ pub fn optimize<A: Adapter>(
             &mut stats_logger,
             bus_map.get_bus_id(&BusType::Memory),
             degree_bound,
+            &mut new_var,
         )?
         .clone();
         if stats == stats_logger::Stats::from(&constraint_system) {