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.

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

feat: runtime opts #1579

Merged
merged 48 commits into from
Oct 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
80cd500
update sp1 circuit version
ctian1 Sep 8, 2024
c5fb8b0
fix: uncomment
jtguibas Sep 9, 2024
aeaf94e
update tag to rc4
jtguibas Sep 9, 2024
bc6590e
faster weierstrass
ctian1 Sep 14, 2024
43881bf
working different memory
ctian1 Sep 15, 2024
eb84291
tweak
ctian1 Sep 15, 2024
34248ea
memory tweaks -> 9s
ctian1 Sep 16, 2024
e2a69d3
use hashmap for program memory
ctian1 Sep 16, 2024
9311de7
fix
ctian1 Sep 16, 2024
414599a
fix
ctian1 Sep 16, 2024
559cfef
weierstrass tracegen, rug FieldOpCols populate
ctian1 Sep 18, 2024
d49d26b
keccak + more opts
ctian1 Sep 18, 2024
4241ff0
fix
ctian1 Sep 18, 2024
eec4ae2
cleanup
ctian1 Sep 25, 2024
99cd61d
fixes
ctian1 Sep 25, 2024
3bfcc63
fix
ctian1 Sep 25, 2024
4142f1c
tweak
ctian1 Sep 26, 2024
ec036ca
Merge branch 'tamir/v1.3.0-rc2' into chris/more-runtime-opts-2
ctian1 Sep 30, 2024
6be10d5
Merge remote-tracking branch 'origin/tamir/v1.3.0-rc2' into chris/mor…
ctian1 Sep 30, 2024
e241093
vk_merkle_data serde
ctian1 Sep 30, 2024
55f5da2
Merge remote-tracking branch 'origin/tamir/v1.3.0-rc2' into chris/mor…
ctian1 Sep 30, 2024
02a10ba
better gnark-ffi rerun-if-changed
ctian1 Sep 30, 2024
14b0432
comment out shapes
ctian1 Sep 30, 2024
fcc4f22
test
ctian1 Sep 30, 2024
17b6816
shape tweak
ctian1 Sep 30, 2024
942700c
tweak
ctian1 Sep 30, 2024
dcebfe3
tweak shape
ctian1 Sep 30, 2024
d5ec989
tweak
ctian1 Sep 30, 2024
8eb214e
Merge remote-tracking branch 'origin/tamir/v1.3.0-rc2' into chris/mor…
ctian1 Oct 1, 2024
a52eb47
uninitialized_memory fix
ctian1 Oct 1, 2024
efdd21c
cleanup
ctian1 Oct 1, 2024
bc167ac
fix
ctian1 Oct 1, 2024
0f58190
fix
ctian1 Oct 1, 2024
3ef7522
cleanup
ctian1 Oct 1, 2024
590e683
cleanup
ctian1 Oct 1, 2024
69d0f81
Merge remote-tracking branch 'origin/tamir/v1.3.0-rc2' into chris/mor…
ctian1 Oct 1, 2024
b628d2a
ProofShape::from_traces
ctian1 Oct 1, 2024
bbbabfe
fix
ctian1 Oct 1, 2024
01db3c8
fix
ctian1 Oct 1, 2024
82bd385
fix
ctian1 Oct 1, 2024
36ab134
fix
ctian1 Oct 1, 2024
b2b7d7b
Merge remote-tracking branch 'origin/tamir/v1.3.0-rc2' into chris/mor…
ctian1 Oct 3, 2024
f08b2d2
tweak
ctian1 Oct 3, 2024
c53a623
Merge remote-tracking branch 'origin/tamir/v1.3.0-rc2' into chris/mor…
ctian1 Oct 3, 2024
d7d0984
cleanup zeroed_f_vec
ctian1 Oct 3, 2024
3738838
comment
ctian1 Oct 3, 2024
b35e584
fix
ctian1 Oct 3, 2024
5b5c8d7
fix
ctian1 Oct 3, 2024
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
30 changes: 30 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions crates/core/executor/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -51,3 +51,4 @@ sp1-zkvm = { workspace = true }

[features]
programs = []
bigint-rug = ["sp1-curves/bigint-rug"]
9 changes: 5 additions & 4 deletions crates/core/executor/src/disassembler/elf.rs
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
use std::{cmp::min, collections::BTreeMap};
use std::cmp::min;

use elf::{
abi::{EM_RISCV, ET_EXEC, PF_X, PT_LOAD},
endian::LittleEndian,
file::Class,
ElfBytes,
};
use hashbrown::HashMap;
use sp1_primitives::consts::{MAXIMUM_MEMORY_SIZE, WORD_SIZE};

/// RISC-V 32IM ELF (Executable and Linkable Format) File.
Expand All @@ -26,7 +27,7 @@ pub(crate) struct Elf {
/// The base address of the program.
pub(crate) pc_base: u32,
/// The initial memory image, useful for global constants.
pub(crate) memory_image: BTreeMap<u32, u32>,
pub(crate) memory_image: HashMap<u32, u32>,
}

impl Elf {
Expand All @@ -36,7 +37,7 @@ impl Elf {
instructions: Vec<u32>,
pc_start: u32,
pc_base: u32,
memory_image: BTreeMap<u32, u32>,
memory_image: HashMap<u32, u32>,
) -> Self {
Self { instructions, pc_start, pc_base, memory_image }
}
Expand All @@ -50,7 +51,7 @@ impl Elf {
///
/// Reference: [Executable and Linkable Format](https://en.wikipedia.org/wiki/Executable_and_Linkable_Format)
pub(crate) fn decode(input: &[u8]) -> eyre::Result<Self> {
let mut image: BTreeMap<u32, u32> = BTreeMap::new();
let mut image: HashMap<u32, u32> = HashMap::new();

// Parse the ELF file assuming that it is little-endian..
let elf = ElfBytes::<LittleEndian>::minimal_parse(input)?;
Expand Down
Loading
Loading