Skip to content

refactor(dyn_malloc): Only allow allocation of every N memory pages #130

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

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

refactor(dyn_malloc): Only allow allocation of every N memory pages #130

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
4 changes: 2 additions & 2 deletions tasm-lib/benchmarks/tasmlib_hashing_algebraic_hasher_sample_indices.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"benchmark_result": {
"clock_cycle_count": 2347,
"hash_table_height": 318,
"u32_table_height": 2621,
"u32_table_height": 2618,
"op_stack_table_height": 1683,
"ram_table_height": 208
},
Expand All @@ -15,7 +15,7 @@
"benchmark_result": {
"clock_cycle_count": 4643,
"hash_table_height": 342,
"u32_table_height": 5220,
"u32_table_height": 5217,
"op_stack_table_height": 3331,
"ram_table_height": 412
},
Expand Down
4 changes: 2 additions & 2 deletions tasm-lib/benchmarks/tasmlib_hashing_algebraic_hasher_sample_scalars.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"benchmark_result": {
"clock_cycle_count": 103,
"hash_table_height": 96,
"u32_table_height": 44,
"u32_table_height": 41,
"op_stack_table_height": 130,
"ram_table_height": 34
},
Expand All @@ -15,7 +15,7 @@
"benchmark_result": {
"clock_cycle_count": 454,
"hash_table_height": 258,
"u32_table_height": 47,
"u32_table_height": 44,
"op_stack_table_height": 886,
"ram_table_height": 304
},
Expand Down
4 changes: 2 additions & 2 deletions ...nchmarks/tasmlib_hashing_algebraic_hasher_sample_scalars_static_length_dyn_malloc_10.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"benchmark_result": {
"clock_cycle_count": 50,
"hash_table_height": 72,
"u32_table_height": 32,
"u32_table_height": 29,
"op_stack_table_height": 89,
"ram_table_height": 32
},
Expand All @@ -15,7 +15,7 @@
"benchmark_result": {
"clock_cycle_count": 50,
"hash_table_height": 72,
"u32_table_height": 32,
"u32_table_height": 29,
"op_stack_table_height": 89,
"ram_table_height": 32
},
Expand Down
4 changes: 2 additions & 2 deletions ...chmarks/tasmlib_hashing_algebraic_hasher_sample_scalars_static_length_dyn_malloc_100.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"benchmark_result": {
"clock_cycle_count": 212,
"hash_table_height": 414,
"u32_table_height": 32,
"u32_table_height": 29,
"op_stack_table_height": 683,
"ram_table_height": 302
},
Expand All @@ -15,7 +15,7 @@
"benchmark_result": {
"clock_cycle_count": 212,
"hash_table_height": 414,
"u32_table_height": 32,
"u32_table_height": 29,
"op_stack_table_height": 683,
"ram_table_height": 302
},
Expand Down
4 changes: 2 additions & 2 deletions ...nchmarks/tasmlib_hashing_algebraic_hasher_sample_scalars_static_length_dyn_malloc_63.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"benchmark_result": {
"clock_cycle_count": 146,
"hash_table_height": 276,
"u32_table_height": 32,
"u32_table_height": 29,
"op_stack_table_height": 441,
"ram_table_height": 192
},
Expand All @@ -15,7 +15,7 @@
"benchmark_result": {
"clock_cycle_count": 146,
"hash_table_height": 276,
"u32_table_height": 32,
"u32_table_height": 29,
"op_stack_table_height": 441,
"ram_table_height": 192
},
Expand Down
4 changes: 2 additions & 2 deletions tasm-lib/benchmarks/tasmlib_hashing_merkle_root.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"benchmark_result": {
"clock_cycle_count": 6965,
"hash_table_height": 3162,
"u32_table_height": 125,
"u32_table_height": 122,
"op_stack_table_height": 13566,
"ram_table_height": 7673
},
Expand All @@ -15,7 +15,7 @@
"benchmark_result": {
"clock_cycle_count": 13651,
"hash_table_height": 6234,
"u32_table_height": 142,
"u32_table_height": 139,
"op_stack_table_height": 26904,
"ram_table_height": 15353
},
Expand Down
4 changes: 2 additions & 2 deletions tasm-lib/benchmarks/tasmlib_hashing_merkle_root_from_xfes_generic.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"benchmark_result": {
"clock_cycle_count": 8285,
"hash_table_height": 3234,
"u32_table_height": 166,
"u32_table_height": 160,
"op_stack_table_height": 13600,
"ram_table_height": 6653
},
Expand All @@ -15,7 +15,7 @@
"benchmark_result": {
"clock_cycle_count": 16251,
"hash_table_height": 6306,
"u32_table_height": 184,
"u32_table_height": 178,
"op_stack_table_height": 26938,
"ram_table_height": 13309
},
Expand Down
4 changes: 2 additions & 2 deletions tasm-lib/benchmarks/tasmlib_hashing_sponge_hasher_squeeze.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"benchmark_result": {
"clock_cycle_count": 29,
"hash_table_height": 42,
"u32_table_height": 32,
"u32_table_height": 29,
"op_stack_table_height": 41,
"ram_table_height": 12
},
Expand All @@ -15,7 +15,7 @@
"benchmark_result": {
"clock_cycle_count": 29,
"hash_table_height": 42,
"u32_table_height": 32,
"u32_table_height": 29,
"op_stack_table_height": 41,
"ram_table_height": 12
},
Expand Down
4 changes: 2 additions & 2 deletions tasm-lib/benchmarks/tasmlib_list_contiguous_list_get_pointer_list.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"benchmark_result": {
"clock_cycle_count": 111,
"hash_table_height": 84,
"u32_table_height": 32,
"u32_table_height": 29,
"op_stack_table_height": 82,
"ram_table_height": 9
},
Expand All @@ -15,7 +15,7 @@
"benchmark_result": {
"clock_cycle_count": 186,
"hash_table_height": 84,
"u32_table_height": 32,
"u32_table_height": 29,
"op_stack_table_height": 142,
"ram_table_height": 15
},
Expand Down
4 changes: 2 additions & 2 deletions tasm-lib/benchmarks/tasmlib_list_higher_order_u32_filter_test_hash_xfield_element_lsb.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"benchmark_result": {
"clock_cycle_count": 870,
"hash_table_height": 338,
"u32_table_height": 629,
"u32_table_height": 626,
"op_stack_table_height": 836,
"ram_table_height": 54
},
Expand All @@ -15,7 +15,7 @@
"benchmark_result": {
"clock_cycle_count": 529,
"hash_table_height": 286,
"u32_table_height": 349,
"u32_table_height": 346,
"op_stack_table_height": 494,
"ram_table_height": 36
},
Expand Down
4 changes: 2 additions & 2 deletions tasm-lib/benchmarks/tasmlib_list_higher_order_u32_map_test_hash_xfield_element.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"benchmark_result": {
"clock_cycle_count": 2870,
"hash_table_height": 822,
"u32_table_height": 33,
"u32_table_height": 30,
"op_stack_table_height": 3290,
"ram_table_height": 437
},
Expand All @@ -15,7 +15,7 @@
"benchmark_result": {
"clock_cycle_count": 3182,
"hash_table_height": 900,
"u32_table_height": 33,
"u32_table_height": 30,
"op_stack_table_height": 3650,
"ram_table_height": 485
},
Expand Down
4 changes: 2 additions & 2 deletions tasm-lib/benchmarks/tasmlib_list_higher_order_u32_zip_xfe_with_digest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"benchmark_result": {
"clock_cycle_count": 394,
"hash_table_height": 96,
"u32_table_height": 32,
"u32_table_height": 29,
"op_stack_table_height": 507,
"ram_table_height": 262
},
Expand All @@ -15,7 +15,7 @@
"benchmark_result": {
"clock_cycle_count": 294,
"hash_table_height": 96,
"u32_table_height": 32,
"u32_table_height": 29,
"op_stack_table_height": 367,
"ram_table_height": 182
},
Expand Down
4 changes: 2 additions & 2 deletions tasm-lib/benchmarks/tasmlib_list_new___digest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"benchmark_result": {
"clock_cycle_count": 33,
"hash_table_height": 36,
"u32_table_height": 32,
"u32_table_height": 29,
"op_stack_table_height": 25,
"ram_table_height": 3
},
Expand All @@ -15,7 +15,7 @@
"benchmark_result": {
"clock_cycle_count": 33,
"hash_table_height": 36,
"u32_table_height": 32,
"u32_table_height": 29,
"op_stack_table_height": 25,
"ram_table_height": 3
},
Expand Down
4 changes: 2 additions & 2 deletions tasm-lib/benchmarks/tasmlib_list_range.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"benchmark_result": {
"clock_cycle_count": 916,
"hash_table_height": 78,
"u32_table_height": 39,
"u32_table_height": 36,
"op_stack_table_height": 767,
"ram_table_height": 49
},
Expand All @@ -15,7 +15,7 @@
"benchmark_result": {
"clock_cycle_count": 4811,
"hash_table_height": 78,
"u32_table_height": 41,
"u32_table_height": 38,
"op_stack_table_height": 4047,
"ram_table_height": 254
},
Expand Down
4 changes: 2 additions & 2 deletions tasm-lib/benchmarks/tasmlib_list_split_off_xfe.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"benchmark_result": {
"clock_cycle_count": 512,
"hash_table_height": 144,
"u32_table_height": 299,
"u32_table_height": 296,
"op_stack_table_height": 559,
"ram_table_height": 305
},
Expand All @@ -15,7 +15,7 @@
"benchmark_result": {
"clock_cycle_count": 8492,
"hash_table_height": 144,
"u32_table_height": 7066,
"u32_table_height": 7063,
"op_stack_table_height": 9679,
"ram_table_height": 6005
},
Expand Down
4 changes: 2 additions & 2 deletions tasm-lib/benchmarks/tasmlib_memory_dyn_malloc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"benchmark_result": {
"clock_cycle_count": 22,
"hash_table_height": 30,
"u32_table_height": 32,
"u32_table_height": 29,
"op_stack_table_height": 19,
"ram_table_height": 2
},
Expand All @@ -15,7 +15,7 @@
"benchmark_result": {
"clock_cycle_count": 22,
"hash_table_height": 30,
"u32_table_height": 32,
"u32_table_height": 29,
"op_stack_table_height": 19,
"ram_table_height": 2
},
Expand Down
4 changes: 2 additions & 2 deletions tasm-lib/benchmarks/tasmlib_mmr_calculate_new_peaks_from_append.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"benchmark_result": {
"clock_cycle_count": 3570,
"hash_table_height": 396,
"u32_table_height": 164,
"u32_table_height": 161,
"op_stack_table_height": 3442,
"ram_table_height": 942
},
Expand All @@ -15,7 +15,7 @@
"benchmark_result": {
"clock_cycle_count": 7037,
"hash_table_height": 582,
"u32_table_height": 164,
"u32_table_height": 161,
"op_stack_table_height": 6814,
"ram_table_height": 1872
},
Expand Down
4 changes: 2 additions & 2 deletions tasm-lib/benchmarks/tasmlib_neptune_mutator_get_swbf_indices_1048576_45.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"benchmark_result": {
"clock_cycle_count": 4618,
"hash_table_height": 481,
"u32_table_height": 4633,
"u32_table_height": 4627,
"op_stack_table_height": 3464,
"ram_table_height": 469
},
Expand All @@ -15,7 +15,7 @@
"benchmark_result": {
"clock_cycle_count": 4618,
"hash_table_height": 481,
"u32_table_height": 4507,
"u32_table_height": 4501,
"op_stack_table_height": 3464,
"ram_table_height": 469
},
Expand Down
4 changes: 2 additions & 2 deletions tasm-lib/benchmarks/tasmlib_verifier_fri_verify.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"benchmark_result": {
"clock_cycle_count": 47806,
"hash_table_height": 14670,
"u32_table_height": 17930,
"u32_table_height": 17894,
"op_stack_table_height": 47915,
"ram_table_height": 17532
},
Expand All @@ -15,7 +15,7 @@
"benchmark_result": {
"clock_cycle_count": 47806,
"hash_table_height": 14670,
"u32_table_height": 17326,
"u32_table_height": 17290,
"op_stack_table_height": 47915,
"ram_table_height": 17532
},
Expand Down
2 changes: 1 addition & 1 deletion ...b/benchmarks/tasmlib_verifier_stark_verify_dynamic_inner_padded_height_256_fri_exp_4.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"benchmark_result": {
"clock_cycle_count": 195675,
"hash_table_height": 139885,
"u32_table_height": 25831,
"u32_table_height": 25451,
"op_stack_table_height": 178100,
"ram_table_height": 285557
},
Expand Down
2 changes: 1 addition & 1 deletion ...b/benchmarks/tasmlib_verifier_stark_verify_dynamic_inner_padded_height_512_fri_exp_4.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"benchmark_result": {
"clock_cycle_count": 204428,
"hash_table_height": 147577,
"u32_table_height": 33586,
"u32_table_height": 34195,
"op_stack_table_height": 184228,
"ram_table_height": 286735
},
Expand Down
2 changes: 1 addition & 1 deletion ...ib/benchmarks/tasmlib_verifier_stark_verify_static_inner_padded_height_256_fri_exp_4.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"benchmark_result": {
"clock_cycle_count": 184245,
"hash_table_height": 126169,
"u32_table_height": 25442,
"u32_table_height": 25582,
"op_stack_table_height": 170476,
"ram_table_height": 281749
},
Expand Down
2 changes: 1 addition & 1 deletion ...ib/benchmarks/tasmlib_verifier_stark_verify_static_inner_padded_height_512_fri_exp_4.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"benchmark_result": {
"clock_cycle_count": 192998,
"hash_table_height": 133861,
"u32_table_height": 34039,
"u32_table_height": 33485,
"op_stack_table_height": 176604,
"ram_table_height": 282927
},
Expand Down
3 changes: 1 addition & 2 deletions tasm-lib/src/hashing/sponge_hasher/squeeze.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ mod test {
use rand::prelude::*;
use triton_vm::twenty_first::prelude::Sponge;

use crate::empty_stack;
use crate::memory::dyn_malloc;
use crate::memory::dyn_malloc::DYN_MALLOC_ADDRESS;
use crate::rust_shadowing_helper_functions;
Expand Down Expand Up @@ -124,7 +123,7 @@ mod test {
let mut unstructured = Unstructured::new(&bytes);

ProcedureInitialState {
stack: empty_stack(),
stack: self.init_stack_for_isolated_run(),
nondeterminism: NonDeterminism::default().with_ram(init_memory),
public_input: Vec::default(),
sponge: Some(Tip5::arbitrary(&mut unstructured).unwrap()),
Expand Down
Loading
Loading