Merge branch 'main' into improve_range_constraint_size

Author: chriseth

.github/workflows/nightly-tests.yml

@@ -136,7 +136,7 @@ jobs:
             ~/.cargo/registry
             ~/.cargo/git
             target
-          key: ${{ runner.os }}-cargo-release-${{ hashFiles('**/Cargo.toml') }}
+          key: ${{ runner.os }}-cargo-release-apc-${{ hashFiles('**/Cargo.toml') }}
       - name: Build
         run: cargo build --release -p powdr-openvm
       - name: Run tests

.github/workflows/pr-tests.yml

@@ -84,6 +84,9 @@ jobs:
           - "2"
           - "3"
           - "4"
+          - "5"
+          - "6"
+          - "7"
 
     steps:
       - uses: actions/checkout@v4
@@ -105,7 +108,7 @@ jobs:
         run: rustup install nightly-2025-02-14 --component rust-src
       - uses: taiki-e/install-action@nextest
       - name: Run default tests
-        run: cargo nextest run --archive-file tests.tar.zst --workspace-remap . --verbose --partition count:"${{ matrix.test }}"/4 --no-tests=warn
+        run: cargo nextest run --archive-file tests.tar.zst --workspace-remap . --verbose --partition count:"${{ matrix.test }}"/7 --no-tests=warn
         env:
           POWDR_STD: ${{ github.workspace }}/std/
 

autoprecompiles/Cargo.toml

@@ -20,7 +20,7 @@ tracing = "0.1.40"
 tracing-subscriber = { version = "0.3.17", features = ["std", "env-filter"] }
 serde_json = "1.0.140"
 rayon = "1.10.0"
-strum = "0.27.1"
+strum = { version = "0.27.0", features = ["derive"] }
 
 metrics = "0.23.0"
 

autoprecompiles/src/constraint_optimizer.rs

@@ -50,6 +50,9 @@ pub fn optimize_constraints<P: FieldElement, V: Ord + Clone + Eq + Hash + Displa
     let constraint_system = solver_based_optimization(constraint_system, solver)?;
     stats_logger.log("solver-based optimization", &constraint_system);
 
+    let constraint_system = remove_trivial_constraints(constraint_system);
+    stats_logger.log("removing trivial constraints", &constraint_system);
+
     let constraint_system =
         remove_free_variables(constraint_system, solver, bus_interaction_handler.clone());
     stats_logger.log("removing free variables", &constraint_system);
@@ -86,8 +89,10 @@ fn solver_based_optimization<T: FieldElement, V: Clone + Ord + Hash + Display>(
 ) -> Result<JournalingConstraintSystem<T, V>, Error> {
     let assignments = solver.solve()?;
     log::trace!("Solver figured out the following assignments:");
-    for (var, value) in assignments.iter() {
-        log::trace!("  {var} = {value}");
+    if log::log_enabled!(log::Level::Trace) {
+        for (var, value) in assignments.iter() {
+            log::trace!("  {var} = {value}");
+        }
     }
     // Assert that all substitutions are affine so that the degree
     // does not increase.

autoprecompiles/src/lib.rs

@@ -29,6 +29,7 @@ pub mod evaluation;
 pub mod execution_profile;
 pub mod expression;
 pub mod expression_conversion;
+pub mod low_degree_bus_interaction_optimizer;
 pub mod memory_optimizer;
 pub mod optimizer;
 pub mod powdr;