diff --git a/crates/prover/src/constraint_framework/logup.rs b/crates/prover/src/constraint_framework/logup.rs index 387a8600f..2a66e6fe5 100644 --- a/crates/prover/src/constraint_framework/logup.rs +++ b/crates/prover/src/constraint_framework/logup.rs @@ -41,7 +41,7 @@ pub struct LogupAtRow { cur_frac: Option>, is_finalized: bool, /// The value of the `is_first` constant column at current row. - /// See [`super::constant_columns::gen_is_first()`]. + /// See [`super::preprocessed_columns::gen_is_first()`]. pub is_first: E::F, } impl LogupAtRow { diff --git a/crates/prover/src/constraint_framework/mod.rs b/crates/prover/src/constraint_framework/mod.rs index f39ebfea1..5059021d3 100644 --- a/crates/prover/src/constraint_framework/mod.rs +++ b/crates/prover/src/constraint_framework/mod.rs @@ -1,12 +1,12 @@ /// ! This module contains helpers to express and use constraints for components. mod assert; mod component; -pub mod constant_columns; mod cpu_domain; pub mod expr; mod info; pub mod logup; mod point; +pub mod preprocessed_columns; mod simd_domain; use std::array; diff --git a/crates/prover/src/constraint_framework/constant_columns.rs b/crates/prover/src/constraint_framework/preprocessed_columns.rs similarity index 100% rename from crates/prover/src/constraint_framework/constant_columns.rs rename to crates/prover/src/constraint_framework/preprocessed_columns.rs diff --git a/crates/prover/src/examples/blake/air.rs b/crates/prover/src/examples/blake/air.rs index ec4de8c0b..1dce58836 100644 --- a/crates/prover/src/examples/blake/air.rs +++ b/crates/prover/src/examples/blake/air.rs @@ -8,7 +8,7 @@ use tracing::{span, Level}; use super::round::{blake_round_info, BlakeRoundComponent, BlakeRoundEval}; use super::scheduler::{BlakeSchedulerComponent, BlakeSchedulerEval}; use super::xor_table::{XorTableComponent, XorTableEval}; -use crate::constraint_framework::constant_columns::gen_is_first; +use crate::constraint_framework::preprocessed_columns::gen_is_first; use crate::constraint_framework::TraceLocationAllocator; use crate::core::air::{Component, ComponentProver}; use crate::core::backend::simd::m31::LOG_N_LANES; diff --git a/crates/prover/src/examples/blake/round/mod.rs b/crates/prover/src/examples/blake/round/mod.rs index ec35987a4..c54e3e391 100644 --- a/crates/prover/src/examples/blake/round/mod.rs +++ b/crates/prover/src/examples/blake/round/mod.rs @@ -55,7 +55,7 @@ mod tests { use itertools::Itertools; - use crate::constraint_framework::constant_columns::gen_is_first; + use crate::constraint_framework::preprocessed_columns::gen_is_first; use crate::constraint_framework::FrameworkEval; use crate::core::poly::circle::CanonicCoset; use crate::examples::blake::round::r#gen::{ diff --git a/crates/prover/src/examples/blake/scheduler/mod.rs b/crates/prover/src/examples/blake/scheduler/mod.rs index 8d389f09e..11a4c51b5 100644 --- a/crates/prover/src/examples/blake/scheduler/mod.rs +++ b/crates/prover/src/examples/blake/scheduler/mod.rs @@ -56,7 +56,7 @@ mod tests { use itertools::Itertools; - use crate::constraint_framework::constant_columns::gen_is_first; + use crate::constraint_framework::preprocessed_columns::gen_is_first; use crate::constraint_framework::FrameworkEval; use crate::core::poly::circle::CanonicCoset; use crate::examples::blake::round::RoundElements; diff --git a/crates/prover/src/examples/blake/xor_table/gen.rs b/crates/prover/src/examples/blake/xor_table/gen.rs index ed07d48bf..8317de321 100644 --- a/crates/prover/src/examples/blake/xor_table/gen.rs +++ b/crates/prover/src/examples/blake/xor_table/gen.rs @@ -4,8 +4,8 @@ use itertools::Itertools; use tracing::{span, Level}; use super::{column_bits, limb_bits, XorAccumulator, XorElements}; -use crate::constraint_framework::constant_columns::gen_is_first; use crate::constraint_framework::logup::{LogupTraceGenerator, LookupElements}; +use crate::constraint_framework::preprocessed_columns::gen_is_first; use crate::core::backend::simd::column::BaseColumn; use crate::core::backend::simd::m31::{PackedBaseField, LOG_N_LANES}; use crate::core::backend::simd::qm31::PackedSecureField; diff --git a/crates/prover/src/examples/plonk/mod.rs b/crates/prover/src/examples/plonk/mod.rs index db6502fc9..dacd6aba6 100644 --- a/crates/prover/src/examples/plonk/mod.rs +++ b/crates/prover/src/examples/plonk/mod.rs @@ -2,10 +2,10 @@ use itertools::Itertools; use num_traits::One; use tracing::{span, Level}; -use crate::constraint_framework::constant_columns::gen_is_first; use crate::constraint_framework::logup::{ ClaimedPrefixSum, LogupAtRow, LogupTraceGenerator, LookupElements, }; +use crate::constraint_framework::preprocessed_columns::gen_is_first; use crate::constraint_framework::{ assert_constraints, EvalAtRow, FrameworkComponent, FrameworkEval, TraceLocationAllocator, }; diff --git a/crates/prover/src/examples/poseidon/mod.rs b/crates/prover/src/examples/poseidon/mod.rs index 80a6c6516..75e7b9413 100644 --- a/crates/prover/src/examples/poseidon/mod.rs +++ b/crates/prover/src/examples/poseidon/mod.rs @@ -5,8 +5,8 @@ use std::ops::{Add, AddAssign, Mul, Sub}; use itertools::Itertools; use tracing::{info, span, Level}; -use crate::constraint_framework::constant_columns::gen_is_first; use crate::constraint_framework::logup::{LogupAtRow, LogupTraceGenerator, LookupElements}; +use crate::constraint_framework::preprocessed_columns::gen_is_first; use crate::constraint_framework::{ EvalAtRow, FrameworkComponent, FrameworkEval, TraceLocationAllocator, }; @@ -399,8 +399,8 @@ mod tests { use itertools::Itertools; use num_traits::One; - use crate::constraint_framework::constant_columns::gen_is_first; use crate::constraint_framework::logup::{LogupAtRow, LookupElements}; + use crate::constraint_framework::preprocessed_columns::gen_is_first; use crate::constraint_framework::{assert_constraints, EvalAtRow}; use crate::core::air::Component; use crate::core::channel::Blake2sChannel; diff --git a/crates/prover/src/examples/state_machine/mod.rs b/crates/prover/src/examples/state_machine/mod.rs index 1855a1980..25ef09531 100644 --- a/crates/prover/src/examples/state_machine/mod.rs +++ b/crates/prover/src/examples/state_machine/mod.rs @@ -9,7 +9,7 @@ use components::{ use gen::{gen_interaction_trace, gen_trace}; use itertools::{chain, Itertools}; -use crate::constraint_framework::constant_columns::gen_is_first; +use crate::constraint_framework::preprocessed_columns::gen_is_first; use crate::constraint_framework::TraceLocationAllocator; use crate::core::backend::simd::m31::LOG_N_LANES; use crate::core::backend::simd::SimdBackend; @@ -176,7 +176,7 @@ mod tests { }; use super::gen::{gen_interaction_trace, gen_trace}; use super::{prove_state_machine, verify_state_machine}; - use crate::constraint_framework::constant_columns::gen_is_first; + use crate::constraint_framework::preprocessed_columns::gen_is_first; use crate::constraint_framework::{assert_constraints, FrameworkEval, TraceLocationAllocator}; use crate::core::channel::Blake2sChannel; use crate::core::fields::m31::M31; diff --git a/crates/prover/src/examples/xor/gkr_lookups/mle_eval.rs b/crates/prover/src/examples/xor/gkr_lookups/mle_eval.rs index a2711ed26..985bfaf51 100644 --- a/crates/prover/src/examples/xor/gkr_lookups/mle_eval.rs +++ b/crates/prover/src/examples/xor/gkr_lookups/mle_eval.rs @@ -8,7 +8,7 @@ use itertools::{chain, zip_eq, Itertools}; use num_traits::{One, Zero}; use tracing::{span, Level}; -use crate::constraint_framework::constant_columns::gen_is_first; +use crate::constraint_framework::preprocessed_columns::gen_is_first; use crate::constraint_framework::{ EvalAtRow, InfoEvaluator, PointEvaluator, SimdDomainEvaluator, TraceLocationAllocator, }; @@ -725,7 +725,9 @@ mod tests { eval_prefix_sum_constraints, gen_carry_quotient_col, MleEvalPoint, MleEvalProverComponent, MleEvalVerifierComponent, }; - use crate::constraint_framework::constant_columns::{gen_is_first, gen_is_step_with_offset}; + use crate::constraint_framework::preprocessed_columns::{ + gen_is_first, gen_is_step_with_offset, + }; use crate::constraint_framework::{assert_constraints, EvalAtRow, TraceLocationAllocator}; use crate::core::air::{Component, ComponentProver, Components}; use crate::core::backend::simd::prefix_sum::inclusive_prefix_sum;