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

[move][stdlib] Add efficient BigOrderedMap implementation #14753

Merged
merged 20 commits into from
Jan 13, 2025
Merged

[move][stdlib] Add efficient BigOrderedMap implementation #14753

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
50838d9
original Guotang's commit
igor-aptos Sep 19, 2024
4ccc69b
Update BTreeMap to only modify leaf node on happy path, and inline va…
igor-aptos Sep 20, 2024
7b5e5d0
removed drop+copy requirement on value
igor-aptos Sep 23, 2024
d539041
making key generic
igor-aptos Sep 23, 2024
f9293b9
split order (max_degree) for inner and leaf nodes
igor-aptos Sep 24, 2024
95f0982
using move 2 syntax
igor-aptos Sep 24, 2024
e4cee1e
fixing slots, and creating SlotsStorage, to add reusing slots afterwards
igor-aptos Sep 24, 2024
a9a1151
add reusable/preinitialized storage slots
igor-aptos Sep 25, 2024
f24dbbc
updating function naming to be consistent
igor-aptos Sep 25, 2024
1904069
addressing review comments
igor-aptos Sep 27, 2024
2883969
Separate BigOrderedMap and OrderedMap
igor-aptos Oct 3, 2024
4f724cd
Documentation and method names. handling sizes
igor-aptos Oct 4, 2024
59cf335
inlining v1
igor-aptos Oct 17, 2024
652e784
remove 'parent' field in Node
igor-aptos Oct 18, 2024
2446fcd
inline root node directly
igor-aptos Oct 18, 2024
1904d63
shortcircuit when inlined (i.e. when root is leaf)
igor-aptos Oct 21, 2024
b12b46b
changing iterator to public(friend)
igor-aptos Nov 19, 2024
b0fcaba
addressing comments
igor-aptos Jan 7, 2025
dc6c05d
address comments
igor-aptos Jan 9, 2025
294b435
extend prover timeout
igor-aptos Jan 13, 2025
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
11 changes: 3 additions & 8 deletions aptos-move/e2e-benchmark/data/calibration_values.tsv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,6 @@ VectorRangeMove { vec_len: 3000, element_len: 1, index: 1000, move_len: 500, rep
VectorTrimAppend { vec_len: 100, element_len: 100, index: 0, repeats: 0 } 119 0.909 1.201 293.5
VectorTrimAppend { vec_len: 100, element_len: 100, index: 10, repeats: 1000 } 119 0.951 1.143 12571.2
VectorRangeMove { vec_len: 100, element_len: 100, index: 50, move_len: 10, repeats: 1000 } 6 0.925 1.001 5316.2
MapInsertRemove { len: 10, repeats: 0, use_simple_map: false } 6 0.925 1.001 378
MapInsertRemove { len: 10, repeats: 100, use_simple_map: false } 6 0.925 1.001 8184
MapInsertRemove { len: 10, repeats: 100, use_simple_map: true } 6 0.925 1.001 8201.7
MapInsertRemove { len: 100, repeats: 0, use_simple_map: false } 6 0.925 1.001 5094
MapInsertRemove { len: 100, repeats: 100, use_simple_map: false } 6 0.925 1.001 15838
MapInsertRemove { len: 100, repeats: 100, use_simple_map: true } 6 0.925 1.001 39802.4
MapInsertRemove { len: 1000, repeats: 0, use_simple_map: false } 6 0.925 1.001 66878
MapInsertRemove { len: 1000, repeats: 100, use_simple_map: false } 6 0.925 1.001 79826
MapInsertRemove { len: 100, repeats: 100, map_type: OrderedMap } 6 0.925 1.001 15838
MapInsertRemove { len: 100, repeats: 100, map_type: SimpleMap } 6 0.925 1.001 39802.4
MapInsertRemove { len: 1000, repeats: 100, map_type: OrderedMap } 6 0.925 1.001 79826
33 changes: 4 additions & 29 deletions aptos-move/e2e-benchmark/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use aptos_transaction_generator_lib::{
entry_point_trait::{AutomaticArgs, EntryPointTrait, MultiSigConfig},
publishing::publish_util::{Package, PackageHandler},
};
use aptos_transaction_workloads_lib::{EntryPoints, LoopType};
use aptos_transaction_workloads_lib::{EntryPoints, LoopType, MapType};
use aptos_types::{account_address::AccountAddress, transaction::TransactionPayload};
use rand::{rngs::StdRng, SeedableRng};
use serde_json::json;
Expand Down Expand Up @@ -238,45 +238,20 @@ fn main() {
move_len: 10,
repeats: 1000,
},
EntryPoints::MapInsertRemove {
len: 10,
repeats: 0,
use_simple_map: false,
},
EntryPoints::MapInsertRemove {
len: 10,
repeats: 100,
use_simple_map: false,
},
EntryPoints::MapInsertRemove {
len: 10,
repeats: 100,
use_simple_map: true,
},
EntryPoints::MapInsertRemove {
len: 100,
repeats: 0,
use_simple_map: false,
},
EntryPoints::MapInsertRemove {
len: 100,
repeats: 100,
use_simple_map: false,
map_type: MapType::OrderedMap,
},
EntryPoints::MapInsertRemove {
len: 100,
repeats: 100,
use_simple_map: true,
},
EntryPoints::MapInsertRemove {
len: 1000,
repeats: 0,
use_simple_map: false,
map_type: MapType::SimpleMap,
},
EntryPoints::MapInsertRemove {
len: 1000,
repeats: 100,
use_simple_map: false,
map_type: MapType::OrderedMap,
},
];

Expand Down
Loading
Loading