Skip to content

Commit

Permalink
Rename constant_columns -> preprocessed_columns. (#865)
Browse files Browse the repository at this point in the history
  • Loading branch information
ilyalesokhin-starkware authored Nov 4, 2024
1 parent f6214d1 commit 5d388c1
Show file tree
Hide file tree
Showing 11 changed files with 15 additions and 13 deletions.
2 changes: 1 addition & 1 deletion crates/prover/src/constraint_framework/logup.rs
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ pub struct LogupAtRow<E: EvalAtRow> {
cur_frac: Option<Fraction<E::EF, E::EF>>,
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<E: EvalAtRow> LogupAtRow<E> {
Expand Down
2 changes: 1 addition & 1 deletion crates/prover/src/constraint_framework/mod.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion crates/prover/src/examples/blake/air.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion crates/prover/src/examples/blake/round/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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::{
Expand Down
2 changes: 1 addition & 1 deletion crates/prover/src/examples/blake/scheduler/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion crates/prover/src/examples/blake/xor_table/gen.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion crates/prover/src/examples/plonk/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
};
Expand Down
4 changes: 2 additions & 2 deletions crates/prover/src/examples/poseidon/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
};
Expand Down Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions crates/prover/src/examples/state_machine/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
6 changes: 4 additions & 2 deletions crates/prover/src/examples/xor/gkr_lookups/mle_eval.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
};
Expand Down Expand Up @@ -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;
Expand Down

1 comment on commit 5d388c1

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Performance Alert ⚠️

Possible performance regression was detected for benchmark.
Benchmark result of this commit is worse than the previous benchmark result exceeding threshold 2.

Benchmark suite Current: 5d388c1 Previous: f6214d1 Ratio
merkle throughput/simd merkle 29736408 ns/iter (± 422406) 14690867 ns/iter (± 434150) 2.02

This comment was automatically generated by workflow using github-action-benchmark.

CC: @shaharsamocha7

Please sign in to comment.