Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: fix program and permutation trace exports #887

Merged
merged 1 commit into from
Jun 4, 2024
Merged

chore: fix program and permutation trace exports #887

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ sp1-zkvm = { path = "../zkvm/entrypoint" }
[features]
debug = []
neon = ["p3-blake3/neon"]
programs = []

[[bench]]
harness = false
Expand Down
2 changes: 1 addition & 1 deletion core/src/stark/permutation.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ pub const fn permutation_trace_width(num_interactions: usize, batch_size: usize)
///
/// The permutation trace has (N+1)*EF::NUM_COLS columns, where N is the number of interactions in
/// the chip.
pub(crate) fn generate_permutation_trace<F: PrimeField, EF: ExtensionField<F>>(
pub fn generate_permutation_trace<F: PrimeField, EF: ExtensionField<F>>(
sends: &[Interaction<F>],
receives: &[Interaction<F>],
preprocessed: Option<&RowMajorMatrix<F>>,
Expand Down
2 changes: 1 addition & 1 deletion core/src/utils/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ pub use options::*;
pub use prove::*;
pub use tracer::*;

#[cfg(test)]
#[cfg(any(test, feature = "programs"))]
pub use programs::*;

use crate::{memory::MemoryCols, operations::field::params::Limbs};
Expand Down
1 change: 0 additions & 1 deletion core/src/utils/programs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,37 +1,36 @@
#[cfg(test)]
pub mod tests {
/// Demos.

pub const CHESS_ELF: &[u8] =

Check warning on line 4 in core/src/utils/programs.rs

View workflow job for this annotation

GitHub Actions / Test (x86-64) 

constant `CHESS_ELF` is never used

Check warning on line 4 in core/src/utils/programs.rs

View workflow job for this annotation

GitHub Actions / Test (ARM) 

constant `CHESS_ELF` is never used
include_bytes!("../../../examples/chess/program/elf/riscv32im-succinct-zkvm-elf");

pub const FIBONACCI_IO_ELF: &[u8] =

Check warning on line 7 in core/src/utils/programs.rs

View workflow job for this annotation

GitHub Actions / Test (x86-64) 

constant `FIBONACCI_IO_ELF` is never used

Check warning on line 7 in core/src/utils/programs.rs

View workflow job for this annotation

GitHub Actions / Test (ARM) 

constant `FIBONACCI_IO_ELF` is never used
include_bytes!("../../../examples/fibonacci/program/elf/riscv32im-succinct-zkvm-elf");

pub const IO_ELF: &[u8] =

Check warning on line 10 in core/src/utils/programs.rs

View workflow job for this annotation

GitHub Actions / Test (x86-64) 

constant `IO_ELF` is never used

Check warning on line 10 in core/src/utils/programs.rs

View workflow job for this annotation

GitHub Actions / Test (ARM) 

constant `IO_ELF` is never used
include_bytes!("../../../examples/io/program/elf/riscv32im-succinct-zkvm-elf");

pub const JSON_ELF: &[u8] =

Check warning on line 13 in core/src/utils/programs.rs

View workflow job for this annotation

GitHub Actions / Test (x86-64) 

constant `JSON_ELF` is never used

Check warning on line 13 in core/src/utils/programs.rs

View workflow job for this annotation

GitHub Actions / Test (ARM) 

constant `JSON_ELF` is never used
include_bytes!("../../../examples/json/program/elf/riscv32im-succinct-zkvm-elf");

pub const REGEX_ELF: &[u8] =

Check warning on line 16 in core/src/utils/programs.rs

View workflow job for this annotation

GitHub Actions / Test (x86-64) 

constant `REGEX_ELF` is never used

Check warning on line 16 in core/src/utils/programs.rs

View workflow job for this annotation

GitHub Actions / Test (ARM) 

constant `REGEX_ELF` is never used
include_bytes!("../../../examples/regex/program/elf/riscv32im-succinct-zkvm-elf");

pub const RSA_ELF: &[u8] =

Check warning on line 19 in core/src/utils/programs.rs

View workflow job for this annotation

GitHub Actions / Test (x86-64) 

constant `RSA_ELF` is never used

Check warning on line 19 in core/src/utils/programs.rs

View workflow job for this annotation

GitHub Actions / Test (ARM) 

constant `RSA_ELF` is never used
include_bytes!("../../../examples/rsa/program/elf/riscv32im-succinct-zkvm-elf");

pub const SSZ_WITHDRAWALS_ELF: &[u8] =

Check warning on line 22 in core/src/utils/programs.rs

View workflow job for this annotation

GitHub Actions / Test (x86-64) 

constant `SSZ_WITHDRAWALS_ELF` is never used

Check warning on line 22 in core/src/utils/programs.rs

View workflow job for this annotation

GitHub Actions / Test (ARM) 

constant `SSZ_WITHDRAWALS_ELF` is never used
include_bytes!("../../../examples/ssz-withdrawals/program/elf/riscv32im-succinct-zkvm-elf");

pub const TENDERMINT_ELF: &[u8] =

Check warning on line 25 in core/src/utils/programs.rs

View workflow job for this annotation

GitHub Actions / Test (x86-64) 

constant `TENDERMINT_ELF` is never used

Check warning on line 25 in core/src/utils/programs.rs

View workflow job for this annotation

GitHub Actions / Test (ARM) 

constant `TENDERMINT_ELF` is never used
include_bytes!("../../../examples/tendermint/program/elf/riscv32im-succinct-zkvm-elf");

/// Tests.

pub const FIBONACCI_ELF: &[u8] =

Check warning on line 30 in core/src/utils/programs.rs

View workflow job for this annotation

GitHub Actions / Test (x86-64) 

constant `FIBONACCI_ELF` is never used

Check warning on line 30 in core/src/utils/programs.rs

View workflow job for this annotation

GitHub Actions / Test (ARM) 

constant `FIBONACCI_ELF` is never used
include_bytes!("../../../tests/fibonacci/elf/riscv32im-succinct-zkvm-elf");

pub const ED25519_ELF: &[u8] =

Check warning on line 33 in core/src/utils/programs.rs

View workflow job for this annotation

GitHub Actions / Test (x86-64) 

constant `ED25519_ELF` is never used

Check warning on line 33 in core/src/utils/programs.rs

View workflow job for this annotation

GitHub Actions / Test (ARM) 

constant `ED25519_ELF` is never used
include_bytes!("../../../tests/ed25519/elf/riscv32im-succinct-zkvm-elf");

pub const CYCLE_TRACKER_ELF: &[u8] =
Expand Down
Loading