feat: enable arbitrary constraint degree

Cargo.toml

@@ -1,19 +1,19 @@
 [workspace]
 members = [
-    "cli",
-    "core",
-    "derive",
-    "eval",
-    "helper",
-    "primitives",
-    "prover",
-    "recursion/circuit",
-    "recursion/compiler",
-    "recursion/core",
-    "recursion/gnark-ffi",
-    "recursion/program",
-    "sdk",
-    "zkvm/*",
+  "cli",
+  "core",
+  "derive",
+  "eval",
+  "helper",
+  "primitives",
+  "prover",
+  "recursion/circuit",
+  "recursion/compiler",
+  "recursion/core",
+  "recursion/gnark-ffi",
+  "recursion/program",
+  "sdk",
+  "zkvm/*",
 ]
 exclude = ["examples/target"]
 resolver = "2"
@@ -30,28 +30,28 @@ debug = true
 debug-assertions = true
 
 [workspace.dependencies]
-p3-air = { git = "https://github.com/Plonky3/Plonky3.git", branch = "sp1" }
-p3-field = { git = "https://github.com/Plonky3/Plonky3.git", branch = "sp1" }
-p3-commit = { git = "https://github.com/Plonky3/Plonky3.git", branch = "sp1" }
-p3-matrix = { git = "https://github.com/Plonky3/Plonky3.git", branch = "sp1" }
+p3-air = { git = "https://github.com/Plonky3/Plonky3.git", branch = "unistark-pair-support" }
+p3-field = { git = "https://github.com/Plonky3/Plonky3.git", branch = "unistark-pair-support" }
+p3-commit = { git = "https://github.com/Plonky3/Plonky3.git", branch = "unistark-pair-support" }
+p3-matrix = { git = "https://github.com/Plonky3/Plonky3.git", branch = "unistark-pair-support" }
 p3-baby-bear = { git = "https://github.com/Plonky3/Plonky3.git", features = [
   "nightly-features",
-], branch = "sp1" }
-p3-util = { git = "https://github.com/Plonky3/Plonky3.git", branch = "sp1" }
-p3-challenger = { git = "https://github.com/Plonky3/Plonky3.git", branch = "sp1" }
-p3-dft = { git = "https://github.com/Plonky3/Plonky3.git", branch = "sp1" }
-p3-fri = { git = "https://github.com/Plonky3/Plonky3.git", branch = "sp1" }
-p3-goldilocks = { git = "https://github.com/Plonky3/Plonky3.git", branch = "sp1" }
-p3-keccak = { git = "https://github.com/Plonky3/Plonky3.git", branch = "sp1" }
-p3-keccak-air = { git = "https://github.com/Plonky3/Plonky3.git", branch = "sp1" }
-p3-blake3 = { git = "https://github.com/Plonky3/Plonky3.git", branch = "sp1" }
-p3-mds = { git = "https://github.com/Plonky3/Plonky3.git", branch = "sp1" }
-p3-merkle-tree = { git = "https://github.com/Plonky3/Plonky3.git", branch = "sp1" }
-p3-poseidon2 = { git = "https://github.com/Plonky3/Plonky3.git", branch = "sp1" }
-p3-symmetric = { git = "https://github.com/Plonky3/Plonky3.git", branch = "sp1" }
-p3-uni-stark = { git = "https://github.com/Plonky3/Plonky3.git", branch = "sp1" }
-p3-maybe-rayon = { git = "https://github.com/Plonky3/Plonky3.git", branch = "sp1" }
-p3-bn254-fr = { git = "https://github.com/Plonky3/Plonky3.git", branch = "sp1" }
+], branch = "unistark-pair-support" }
+p3-util = { git = "https://github.com/Plonky3/Plonky3.git", branch = "unistark-pair-support" }
+p3-challenger = { git = "https://github.com/Plonky3/Plonky3.git", branch = "unistark-pair-support" }
+p3-dft = { git = "https://github.com/Plonky3/Plonky3.git", branch = "unistark-pair-support" }
+p3-fri = { git = "https://github.com/Plonky3/Plonky3.git", branch = "unistark-pair-support" }
+p3-goldilocks = { git = "https://github.com/Plonky3/Plonky3.git", branch = "unistark-pair-support" }
+p3-keccak = { git = "https://github.com/Plonky3/Plonky3.git", branch = "unistark-pair-support" }
+p3-keccak-air = { git = "https://github.com/Plonky3/Plonky3.git", branch = "unistark-pair-support" }
+p3-blake3 = { git = "https://github.com/Plonky3/Plonky3.git", branch = "unistark-pair-support" }
+p3-mds = { git = "https://github.com/Plonky3/Plonky3.git", branch = "unistark-pair-support" }
+p3-merkle-tree = { git = "https://github.com/Plonky3/Plonky3.git", branch = "unistark-pair-support" }
+p3-poseidon2 = { git = "https://github.com/Plonky3/Plonky3.git", branch = "unistark-pair-support" }
+p3-symmetric = { git = "https://github.com/Plonky3/Plonky3.git", branch = "unistark-pair-support" }
+p3-uni-stark = { git = "https://github.com/Plonky3/Plonky3.git", branch = "unistark-pair-support" }
+p3-maybe-rayon = { git = "https://github.com/Plonky3/Plonky3.git", branch = "unistark-pair-support" }
+p3-bn254-fr = { git = "https://github.com/Plonky3/Plonky3.git", branch = "unistark-pair-support" }
 
 # For local development.
 

core/src/air/builder.rs

@@ -651,4 +651,5 @@ impl<'a, SC: StarkGenericConfig> EmptyMessageBuilder for VerifierConstraintFolde
 impl<F: Field> EmptyMessageBuilder for SymbolicAirBuilder<F> {}
 
 #[cfg(debug_assertions)]
+#[cfg(not(doctest))]
 impl<'a, F: Field> EmptyMessageBuilder for p3_uni_stark::DebugConstraintBuilder<'a, F> {}

core/src/alu/add_sub/mod.rs

@@ -180,12 +180,6 @@ where
         builder.assert_bool(local.is_add);
         builder.assert_bool(local.is_sub);
         builder.assert_bool(is_real);
-
-        // Degree 3 constraint to avoid "OodEvaluationMismatch".
-        builder.assert_zero(
-            local.operand_1[0] * local.operand_1[0] * local.operand_1[0]
-                - local.operand_1[0] * local.operand_1[0] * local.operand_1[0],
-        );
     }
 }
 

core/src/alu/bitwise/mod.rs

@@ -162,11 +162,6 @@ where
         builder.assert_bool(local.is_or);
         builder.assert_bool(local.is_and);
         builder.assert_bool(is_real);
-
-        // Degree 3 constraint to avoid "OodEvaluationMismatch".
-        builder.assert_zero(
-            local.a[0] * local.b[0] * local.c[0] - local.a[0] * local.b[0] * local.c[0],
-        );
     }
 }
 

core/src/alu/divrem/mod.rs

@@ -766,11 +766,6 @@ where
                 local.is_real,
             );
         }
-
-        // A dummy constraint to keep the degree 3.
-        builder.assert_zero(
-            local.a[0] * local.b[0] * local.c[0] - local.a[0] * local.b[0] * local.c[0],
-        )
     }
 }
 

core/src/alu/lt/mod.rs

@@ -240,11 +240,6 @@ where
 
         let is_real = local.is_slt + local.is_sltu;
 
-        // Dummy degree 3 constraint to avoid "OodEvaluationMismatch".
-        builder.assert_zero(
-            local.a[0] * local.b[0] * local.c[0] - local.a[0] * local.b[0] * local.c[0],
-        );
-
         // We can compute the signed set-less-than as follows:
         // SLT (signed) = b_s * (1 - c_s) + (b_s == c_s) * SLTU(b_<s, c_<s)
         // Source: Jolt 5.3: Set Less Than (https://people.cs.georgetown.edu/jthaler/Jolt-paper.pdf)

core/src/alu/mul/mod.rs

@@ -441,11 +441,6 @@ where
             local.shard,
             local.is_real,
         );
-
-        // A dummy constraint to keep the degree at least 3.
-        builder.assert_zero(
-            local.a[0] * local.b[0] * local.c[0] - local.a[0] * local.b[0] * local.c[0],
-        );
     }
 }
 

core/src/alu/sll/mod.rs

@@ -343,11 +343,6 @@ where
             local.shard,
             local.is_real,
         );
-
-        // A dummy constraint to keep the degree at least 3.
-        builder.assert_zero(
-            local.a[0] * local.b[0] * local.c[0] - local.a[0] * local.b[0] * local.c[0],
-        );
     }
 }
 

core/src/bytes/air.rs

@@ -72,8 +72,5 @@ impl<AB: SP1AirBuilder + PairBuilder> Air<AB> for ByteChip<AB::F> {
                 ),
             }
         }
-
-        // Dummy constraint for normalizing to degree 3.
-        builder.assert_zero(local.b * local.b * local.b - local.b * local.b * local.b);
     }
 }

core/src/memory/global.rs

@@ -130,12 +130,6 @@ where
         let local = main.row_slice(0);
         let local: &MemoryInitCols<AB::Var> = (*local).borrow();
 
-        // Dummy constraint of degree 3.
-        builder.assert_eq(
-            local.is_real * local.is_real * local.is_real,
-            local.is_real * local.is_real * local.is_real,
-        );
-
         if self.kind == MemoryChipType::Initialize {
             let mut values = vec![AB::Expr::zero(), AB::Expr::zero(), local.addr.into()];
             values.extend(local.value.map(Into::into));

core/src/operations/add.rs

@@ -107,8 +107,5 @@ impl<F: Field> AddOperation<F> {
             builder.slice_range_check_u8(&b.0, shard, is_real.clone());
             builder.slice_range_check_u8(&cols.value.0, shard, is_real);
         }
-
-        // Degree 3 constraint to avoid "OodEvaluationMismatch".
-        builder.assert_zero(a[0] * b[0] * cols.value[0] - a[0] * b[0] * cols.value[0]);
     }
 }