Skip to content

Commit 60f8fc4

Browse files
authored
Merge branch 'main' into opt/20-parallel-fri-merkle
2 parents b5696b9 + 35b4ab5 commit 60f8fc4

72 files changed

Lines changed: 10780 additions & 500 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/pr_spec.yaml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: Spec tests
2+
on:
3+
pull_request:
4+
branches:
5+
- main
6+
- 'spec/**'
7+
push:
8+
branches: ["**"]
9+
paths: ["spec/**"]
10+
11+
permissions:
12+
contents: read
13+
14+
concurrency:
15+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
16+
cancel-in-progress: true
17+
18+
jobs:
19+
spec_structure:
20+
name: Spec structure test
21+
runs-on: ubuntu-latest
22+
steps:
23+
- uses: actions/checkout@v6
24+
- uses: actions/setup-python@v6
25+
- run: python3 spec/tooling/chip.py spec/src/config.toml spec/src/signatures.toml spec/src/*.toml

crypto/math/src/fft/polynomial.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ impl<E: IsField> Polynomial<FieldElement<E>> {
215215
///
216216
/// Unlike [`coset_lde_full_into`], this skips the `clear + extend_from_slice` step
217217
/// since data is already in the buffer. Used for transpose elimination: columns are
218-
/// extracted directly into pool buffers, then expanded in-place.
218+
/// extracted directly into owned buffers, then expanded in-place.
219219
pub fn coset_lde_full_expand<F: IsFFTField + IsSubFieldOf<E> + Send + Sync>(
220220
buffer: &mut Vec<FieldElement<E>>,
221221
blowup_factor: usize,

crypto/stark/src/instruments.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ use std::time::Duration;
55
/// Sub-operation timing breakdown for a single table in Rounds 2-4.
66
#[derive(Clone, Debug, Default)]
77
pub struct TableSubOps {
8-
/// reconstruct_round1 (expand_pool_to_lde)
9-
pub trace_lde: Duration,
108
/// evaluator.evaluate()
119
pub constraints: Duration,
1210
/// decompose_and_extend_d2
@@ -28,11 +26,11 @@ pub struct TableSubOps {
2826
/// Sub-operation breakdown for Round 1 aux commit pass.
2927
#[derive(Clone, Debug, Default)]
3028
pub struct Round1SubOps {
31-
/// Main trace: expand_pool_to_lde (LDE/FFT)
29+
/// Main trace: expand_columns_to_lde (LDE/FFT)
3230
pub main_lde: Duration,
3331
/// Main trace: commit_columns_bit_reversed (Merkle)
3432
pub main_merkle: Duration,
35-
/// Aux trace: expand_pool_to_lde (LDE/FFT)
33+
/// Aux trace: expand_columns_to_lde (LDE/FFT)
3634
pub aux_lde: Duration,
3735
/// Aux trace: commit_columns_bit_reversed (Merkle)
3836
pub aux_merkle: Duration,

0 commit comments

Comments
 (0)