Merge branch 'main' into robin/miden/constraint_eval

Author: Nashtare

CHANGELOG.md

@@ -1,5 +1,8 @@
 ## Unreleased
 
+- Dropped BabyBear support; simplified tests, benchmarks, and dev-utils to Goldilocks-only ([#52](https://github.com/0xMiden/p3-miden/pull/52)).
+- Added crate-local `testing` modules to `p3-miden-lmcs` and `p3-miden-lifted-fri` behind a `testing` feature flag ([#52](https://github.com/0xMiden/p3-miden/pull/52)).
+- Moved `p3-miden-lifted-examples` from `[[example]]` to `[[bin]]` entries ([#52](https://github.com/0xMiden/p3-miden/pull/52)).
 - perf: fold constraints on the fly ([#55](https://github.com/0xMiden/p3-miden/pull/55))
 
 ## 0.5.0 (2026-03-10)

Cargo.lock

@@ -44,7 +44,6 @@ p3-symmetric = { version = "0.5.0", default-features = false }
 p3-util = { version = "0.5.0", default-features = false }
 
 # Plonky3 (concrete implementations — dev/test/bench only in core crates)
-p3-baby-bear = { version = "0.5.0", default-features = false }
 p3-blake3 = { version = "0.5.0", default-features = false }
 p3-bn254 = { version = "0.5.0", default-features = false }
 p3-fri = { version = "0.5.0", default-features = false }

Cargo.toml

@@ -96,7 +96,7 @@ build-avx512: ## Build with avx512 support
 
 .PHONY: bench
 bench: ## Run benchmarks
-	cargo bench
+	cargo bench --workspace --features testing
 
 # --- installing ----------------------------------------------------------------------------------
 

Makefile

@@ -13,10 +13,8 @@ homepage.workspace = true
 p3-miden-stateful-hasher.workspace = true
 
 # Plonky3
-p3-baby-bear.workspace = true
 p3-challenger.workspace = true
 p3-commit.workspace = true
-p3-dft.workspace = true
 p3-field.workspace = true
 p3-goldilocks.workspace = true
 p3-keccak.workspace = true
@@ -27,9 +25,5 @@ p3-symmetric.workspace = true
 # Third-party
 rand.workspace = true
 
-# Criterion only for std targets (not wasm32)
-[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-criterion.workspace = true
-
 [features]
 parallel = []

p3-miden-dev-utils/Cargo.toml

@@ -3,13 +3,13 @@
 //! This module contains:
 //! - `BenchScenario` and `PcsScenario` traits for generic benchmarking
 //! - Macros for generating config-specific modules
-//! - Config implementations (baby_bear_poseidon2, goldilocks_poseidon2, etc.)
+//! - Config implementations (goldilocks_poseidon2, goldilocks_keccak)
 //!
 //! # Usage
 //!
 //! ## For tests (import specific config module)
 //! ```ignore
-//! use p3_miden_dev_utils::configs::baby_bear_poseidon2::*;
+//! use p3_miden_dev_utils::configs::goldilocks_poseidon2::*;
 //!
 //! #[test]
 //! fn test_example() {
@@ -19,10 +19,10 @@
 //!
 //! ## For benchmarks (use trait-based dispatch)
 //! ```ignore
-//! use p3_miden_dev_utils::{BenchScenario, BabyBearPoseidon2};
+//! use p3_miden_dev_utils::{BenchScenario, GoldilocksPoseidon2};
 //!
 //! fn bench<S: BenchScenario>() {
-//!     let mmcs = S::packed_mmcs();
+//!     let mmcs = S::mmcs();
 //! }
 //! ```
 
@@ -37,7 +37,7 @@ use p3_field::{ExtensionField, Field, TwoAdicField};
 /// Trait for benchmark scenarios defining field + hash configuration.
 ///
 /// Each implementor represents a specific combination from the matrix:
-/// - Fields: BabyBear, Goldilocks
+/// - Fields: Goldilocks
 /// - Hashes: Poseidon2, Keccak
 ///
 /// # Example
@@ -46,13 +46,13 @@ use p3_field::{ExtensionField, Field, TwoAdicField};
 /// fn bench_generic<S: BenchScenario>(c: &mut Criterion) {
 ///     for &log_height in LOG_HEIGHTS {
 ///         let group_name = format!("MyBench/{}/{}", S::FIELD_NAME, S::HASH_NAME);
-///         let mmcs = S::packed_mmcs();
+///         let mmcs = S::mmcs();
 ///         // ...
 ///     }
 /// }
 /// ```
 pub trait BenchScenario {
-    /// Base field type (e.g., BabyBear, Goldilocks)
+    /// Base field type (e.g., Goldilocks)
     type F: Field + TwoAdicField + Ord;
 
     /// Extension field type
@@ -95,27 +95,14 @@ pub trait PcsScenario: BenchScenario {
 
 /// Helper trait for creating permutations from RNG.
 ///
-/// This is needed because BabyBear and Goldilocks permutations have
+/// This is needed because Goldilocks permutations have
 /// the same method but it's not defined in a common trait.
 pub trait PermFromRng: Sized {
     fn new_from_rng_128(rng: &mut SmallRng) -> Self;
 }
 
 use rand::rngs::SmallRng;
 
-// BabyBear Poseidon2 implementations (only 16 and 24 are supported)
-impl PermFromRng for p3_baby_bear::Poseidon2BabyBear<16> {
-    fn new_from_rng_128(rng: &mut SmallRng) -> Self {
-        p3_baby_bear::Poseidon2BabyBear::new_from_rng_128(rng)
-    }
-}
-
-impl PermFromRng for p3_baby_bear::Poseidon2BabyBear<24> {
-    fn new_from_rng_128(rng: &mut SmallRng) -> Self {
-        p3_baby_bear::Poseidon2BabyBear::new_from_rng_128(rng)
-    }
-}
-
 // Goldilocks Poseidon2 implementations (8 and 12 are common)
 impl PermFromRng for p3_goldilocks::Poseidon2Goldilocks<8> {
     fn new_from_rng_128(rng: &mut SmallRng) -> Self {
@@ -350,34 +337,6 @@ macro_rules! impl_keccak_config {
 // Config modules
 // =============================================================================
 
-/// BabyBear + Keccak configuration.
-pub mod baby_bear_keccak {
-    use p3_baby_bear::BabyBear;
-
-    crate::impl_keccak_config!(
-        scenario: BabyBearKeccak,
-        field: BabyBear,
-        ext_degree: 4,
-        field_name: "babybear"
-    );
-}
-
-/// BabyBear + Poseidon2 configuration.
-pub mod baby_bear_poseidon2 {
-    use p3_baby_bear::{BabyBear, Poseidon2BabyBear};
-
-    crate::impl_poseidon2_config!(
-        scenario: BabyBearPoseidon2,
-        field: BabyBear,
-        ext_degree: 4,
-        perm: Poseidon2BabyBear,
-        width: 16,
-        rate: 8,
-        digest: 8,
-        field_name: "babybear"
-    );
-}
-
 /// Goldilocks + Keccak configuration.
 pub mod goldilocks_keccak {
     use p3_goldilocks::Goldilocks;
@@ -407,7 +366,5 @@ pub mod goldilocks_poseidon2 {
 }
 
 // Re-export scenario structs at module level
-pub use baby_bear_keccak::BabyBearKeccak;
-pub use baby_bear_poseidon2::BabyBearPoseidon2;
 pub use goldilocks_keccak::GoldilocksKeccak;
 pub use goldilocks_poseidon2::GoldilocksPoseidon2;

p3-miden-dev-utils/src/bench.rs

@@ -3,10 +3,6 @@
 //! This module contains constants and helper functions that define
 //! reproducible test/benchmark scenarios.
 
-use alloc::{vec, vec::Vec};
-
-use p3_field::PackedValue;
-
 // =============================================================================
 // Seeds
 // =============================================================================
@@ -38,44 +34,3 @@ pub const RELATIVE_SPECS: &[&[(usize, usize)]] = &[
     &[(4, 8), (2, 20), (0, 20)],
     &[(0, 16)],
 ];
-
-// =============================================================================
-// Matrix scenarios
-// =============================================================================
-
-/// Common matrix group scenarios for testing lifting with varying heights.
-///
-/// Each scenario is a list of (height, width) pairs, sorted by ascending height.
-/// The `rate` parameter controls the RATE-based width scenarios.
-///
-/// # Parameters
-/// - `pack_width`: The SIMD packing width (e.g., `P::WIDTH` for packed field)
-/// - `rate`: The sponge rate for width alignment scenarios
-pub fn matrix_scenarios<P: PackedValue>(rate: usize) -> Vec<Vec<(usize, usize)>> {
-    let pack_width = P::WIDTH.max(2);
-    vec![
-        // Single matrices
-        vec![(1, 1)],
-        vec![(1, rate - 1)],
-        // Multiple heights (must be ascending)
-        vec![(2, 3), (4, 5), (8, rate)],
-        vec![(1, 5), (1, 3), (2, 7), (4, 1), (8, rate + 1)],
-        // Packing boundary tests
-        vec![
-            (pack_width / 2, rate - 1),
-            (pack_width, rate),
-            (pack_width * 2, rate + 3),
-        ],
-        vec![(pack_width, rate + 5), (pack_width * 2, 25)],
-        vec![
-            (1, rate * 2),
-            (pack_width / 2, rate * 2 - 1),
-            (pack_width, rate * 2),
-            (pack_width * 2, rate * 3 - 2),
-        ],
-        // Same-height matrices
-        vec![(4, rate - 1), (4, rate), (8, rate + 3), (8, rate * 2)],
-        // Single tall matrix
-        vec![(pack_width * 2, rate - 1)],
-    ]
-}