dan/account-changeset-static-files - Branch - paradigmxyz/reth

feat: add StaticFileSegment::AccountChangeSets

#18882

Comparing

dan/account-changeset-static-files

(

8ca8c57

) with

main

(

3380eb6

)

-33%

Regressions: 1

Untouched: 112

Skipped: 4

Benchmarks

Skipped (4)

These benchmarks were skipped, so their baseline results are used instead. If they were deleted in your codebase, archive them to remove them from the performance reports.
Learn more about archiving benchmarks

update_leaf[5000]

crates/trie/sparse/benches/update.rs::benches::update_leaf

Skipped

165.3 µs*

update_leaf[1000]

crates/trie/sparse/benches/update.rs::benches::update_leaf

Skipped

112.6 µs*

remove_leaf[5000]

crates/trie/sparse/benches/update.rs::benches::remove_leaf

Skipped

1.1 ms*

remove_leaf[1000]

crates/trie/sparse/benches/update.rs::benches::remove_leaf

Skipped

261.7 µs*

Failed

prefix set | size: 10 | `Vec` with binary search lookup

crates/trie/common/benches/prefix_set.rs::prefix_set::prefix_set_lookups::Prefix Set Lookups

Regression

-33%

3.8 µs5.7 µs

Passed

prefix set | size: 10 | `Vec` with custom cursor lookup

crates/trie/common/benches/prefix_set.rs::prefix_set::prefix_set_lookups::Prefix Set Lookups

+2%

3.4 µs3.3 µs

size 100000 | updated 1% | depth 3

crates/trie/sparse/benches/rlp_node.rs::rlp_node::update_rlp_node_level::update rlp node level

+1%

21.6 ms21.3 ms

size 100000 | updated 1% | depth 2

crates/trie/sparse/benches/rlp_node.rs::rlp_node::update_rlp_node_level::update rlp node level

+1%

24.4 ms24.2 ms

size 100000 | updated 1% | depth 0

crates/trie/sparse/benches/rlp_node.rs::rlp_node::update_rlp_node_level::update rlp node level

+1%

24.6 ms24.3 ms

size 100000 | updated 1% | depth 1

crates/trie/sparse/benches/rlp_node.rs::rlp_node::update_rlp_node_level::update rlp node level

+1%

24.6 ms24.4 ms

sparse trie[1000]

crates/trie/sparse/benches/root.rs::root::calculate_root_from_leaves::calculate root from leaves

+1%

5.7 ms5.7 ms

size 100000 | updated 1% | depth 4

crates/trie/sparse/benches/rlp_node.rs::rlp_node::update_rlp_node_level::update rlp node level

+1%

11.4 ms11.3 ms

V2[dataset_1024/targets_64]

crates/trie/trie/benches/proof_v2.rs::proof_comparison::bench_proof_algos::Proof

+1%

10.5 ms10.5 ms

V2[dataset_1024/targets_2048]

crates/trie/trie/benches/proof_v2.rs::proof_comparison::bench_proof_algos::Proof

11.3 ms11.3 ms

Legacy[dataset_128/targets_16]

crates/trie/trie/benches/proof_v2.rs::proof_comparison::bench_proof_algos::Proof

747.5 µs744.6 µs

V2[dataset_1024/targets_128]

crates/trie/trie/benches/proof_v2.rs::proof_comparison::bench_proof_algos::Proof

10.6 ms10.6 ms

receipts root | size: 10 | HashBuilder

crates/trie/trie/benches/trie_root.rs::benches::trie_root_benchmark::Receipts root calculation

112.1 µs111.7 µs

Legacy[dataset_1024/targets_128]

crates/trie/trie/benches/proof_v2.rs::proof_comparison::bench_proof_algos::Proof

12.2 ms12.2 ms

V2[dataset_1024/targets_512]

crates/trie/trie/benches/proof_v2.rs::proof_comparison::bench_proof_algos::Proof

10.9 ms10.9 ms

prefix set | size: 100 | `BTreeSet` with `BTreeSet:range` lookup

crates/trie/common/benches/prefix_set.rs::prefix_set::prefix_set_lookups::Prefix Set Lookups

40.2 µs40.1 µs

Legacy[dataset_1024/targets_64]

crates/trie/trie/benches/proof_v2.rs::proof_comparison::bench_proof_algos::Proof

11.5 ms11.4 ms

Legacy[dataset_1024/targets_16]

crates/trie/trie/benches/proof_v2.rs::proof_comparison::bench_proof_algos::Proof

10.8 ms10.8 ms

prefix set | size: 100 | `Vec` with custom cursor lookup

crates/trie/common/benches/prefix_set.rs::prefix_set::prefix_set_lookups::Prefix Set Lookups

16.7 µs16.7 µs

sparse trie[init size 1000 | update size 1000 | num updates 10]

crates/trie/sparse/benches/root.rs::root::calculate_root_from_leaves_repeated::calculate root from leaves repeated

49.6 ms49.6 ms

sparse trie[init size 1000 | update size 100 | num updates 1]

crates/trie/sparse/benches/root.rs::root::calculate_root_from_leaves_repeated::calculate root from leaves repeated

1.1 ms1.1 ms

hash builder[init size 1000 | update size 100 | num updates 1]

crates/trie/sparse/benches/root.rs::root::calculate_root_from_leaves_repeated::calculate root from leaves repeated

2.5 ms2.5 ms

sparse trie[init size 10000 | update size 100 | num updates 1]

crates/trie/sparse/benches/root.rs::root::calculate_root_from_leaves_repeated::calculate root from leaves repeated

2.4 ms2.3 ms

Legacy[dataset_128/targets_1]

crates/trie/trie/benches/proof_v2.rs::proof_comparison::bench_proof_algos::Proof

714.9 µs714 µs

V2[dataset_128/targets_1]

crates/trie/trie/benches/proof_v2.rs::proof_comparison::bench_proof_algos::Proof

659.6 µs658.7 µs

V2[dataset_1024/targets_16]

crates/trie/trie/benches/proof_v2.rs::proof_comparison::bench_proof_algos::Proof

10.5 ms10.5 ms

V2[dataset_128/targets_16]

crates/trie/trie/benches/proof_v2.rs::proof_comparison::bench_proof_algos::Proof

681.3 µs680.7 µs

prefix set | size: 1000 | `BTreeSet` with `BTreeSet:range` lookup

crates/trie/common/benches/prefix_set.rs::prefix_set::prefix_set_lookups::Prefix Set Lookups

469.8 µs469.4 µs

Legacy[dataset_128/targets_64]

crates/trie/trie/benches/proof_v2.rs::proof_comparison::bench_proof_algos::Proof

817.2 µs816.6 µs

validate_blob | num blobs: 1 | ValidateBlob

crates/primitives/benches/validate_blob_tx.rs::validate_blob::blob_validation::Blob Transaction KZG validation

150.1 µs150 µs

prefix set | size: 1000 | `Vec` with custom cursor lookup

crates/trie/common/benches/prefix_set.rs::prefix_set::prefix_set_lookups::Prefix Set Lookups

146.2 µs146.2 µs

Legacy[dataset_128/targets_512]

crates/trie/trie/benches/proof_v2.rs::proof_comparison::bench_proof_algos::Proof

1 ms1 ms

validate_blob | num blobs: 2 | ValidateBlob

crates/primitives/benches/validate_blob_tx.rs::validate_blob::blob_validation::Blob Transaction KZG validation

149.5 µs149.5 µs

validate_blob | num blobs: 3 | ValidateBlob

crates/primitives/benches/validate_blob_tx.rs::validate_blob::blob_validation::Blob Transaction KZG validation

150.9 µs150.9 µs

recover ECDSA

crates/primitives/benches/recover_ecdsa_crit.rs::benches::criterion_benchmark

206.7 µs206.6 µs

prefix set | size: 1000 | `BTreeSet` with `Iterator:any` lookup

crates/trie/common/benches/prefix_set.rs::prefix_set::prefix_set_lookups::Prefix Set Lookups

14.9 ms14.9 ms

hash builder[init size 1000 | update size 1000 | num updates 10]

crates/trie/sparse/benches/root.rs::root::calculate_root_from_leaves_repeated::calculate root from leaves repeated

57.3 ms57.3 ms

sparse trie[init size 10000 | update size 1000 | num updates 5]

crates/trie/sparse/benches/root.rs::root::calculate_root_from_leaves_repeated::calculate root from leaves repeated

56 ms56 ms

sparse trie[init size 10000 | update size 1000 | num updates 10]

crates/trie/sparse/benches/root.rs::root::calculate_root_from_leaves_repeated::calculate root from leaves repeated

111.6 ms111.6 ms

receipts root | size: 100 | HashBuilder

crates/trie/trie/benches/trie_root.rs::benches::trie_root_benchmark::Receipts root calculation

936.9 µs936.9 µs

parallel hashing[100]

crates/trie/trie/benches/hash_post_state.rs::post_state::hash_post_state::Hash Post State

258.9 ms258.9 ms

sequence hashing[1000]

crates/trie/trie/benches/hash_post_state.rs::post_state::hash_post_state::Hash Post State

2.6 s2.6 s

sequence hashing[100]

crates/trie/trie/benches/hash_post_state.rs::post_state::hash_post_state::Hash Post State

258.9 ms258.9 ms

hash builder[5000]

crates/trie/sparse/benches/root.rs::root::calculate_root_from_leaves::calculate root from leaves

22.3 ms22.3 ms

prefix set | size: 10 | `BTreeSet` with `Iterator:any` lookup

crates/trie/common/benches/prefix_set.rs::prefix_set::prefix_set_lookups::Prefix Set Lookups

4 µs4 µs

prefix set | size: 100 | `BTreeSet` with `Iterator:any` lookup

crates/trie/common/benches/prefix_set.rs::prefix_set::prefix_set_lookups::Prefix Set Lookups

149.3 µs149.3 µs

prefix set | size: 10 | `BTreeSet` with `BTreeSet:range` lookup

crates/trie/common/benches/prefix_set.rs::prefix_set::prefix_set_lookups::Prefix Set Lookups

5.2 µs5.2 µs

ordered_trie_root

crates/trie/trie/benches/trie_root.rs::benches::trie_root_benchmark::Receipts root calculation::receipts root | size: 1000 | triehash

11.8 ms11.8 ms

V2[dataset_1024/targets_1]

crates/trie/trie/benches/proof_v2.rs::proof_comparison::bench_proof_algos::Proof

10.4 ms10.4 ms

prefix set | size: 1000 | `Vec` with binary search lookup

crates/trie/common/benches/prefix_set.rs::prefix_set::prefix_set_lookups::Prefix Set Lookups

205.7 µs205.7 µs

sparse trie[init size 10000 | update size 100 | num updates 5]

crates/trie/sparse/benches/root.rs::root::calculate_root_from_leaves_repeated::calculate root from leaves repeated

11.1 ms11.1 ms

ordered_trie_root

crates/trie/trie/benches/trie_root.rs::benches::trie_root_benchmark::Receipts root calculation::receipts root | size: 100 | triehash

1.2 ms1.2 ms

sparse trie[5000]

crates/trie/sparse/benches/root.rs::root::calculate_root_from_leaves::calculate root from leaves

28.4 ms28.5 ms

parallel hashing[1000]

crates/trie/trie/benches/hash_post_state.rs::post_state::hash_post_state::Hash Post State

2.6 s2.6 s

Legacy[dataset_10240/targets_512]

crates/trie/trie/benches/proof_v2.rs::proof_comparison::bench_proof_algos::Proof

703.9 ms704.1 ms

receipts root | size: 1000 | HashBuilder

crates/trie/trie/benches/trie_root.rs::benches::trie_root_benchmark::Receipts root calculation

9.1 ms9.1 ms

sparse trie[init size 10000 | update size 100 | num updates 10]

crates/trie/sparse/benches/root.rs::root::calculate_root_from_leaves_repeated::calculate root from leaves repeated

22 ms22.1 ms

sparse trie[init size 1000 | update size 100 | num updates 3]

crates/trie/sparse/benches/root.rs::root::calculate_root_from_leaves_repeated::calculate root from leaves repeated

3.3 ms3.3 ms

hash builder[init size 10000 | update size 100 | num updates 10]

crates/trie/sparse/benches/root.rs::root::calculate_root_from_leaves_repeated::calculate root from leaves repeated

86.1 ms86.1 ms

V2[dataset_10240/targets_512]

crates/trie/trie/benches/proof_v2.rs::proof_comparison::bench_proof_algos::Proof

637.6 ms637.8 ms

sparse trie[init size 1000 | update size 1000 | num updates 3]

crates/trie/sparse/benches/root.rs::root::calculate_root_from_leaves_repeated::calculate root from leaves repeated

15 ms15 ms

sparse trie[init size 10000 | update size 100 | num updates 3]

crates/trie/sparse/benches/root.rs::root::calculate_root_from_leaves_repeated::calculate root from leaves repeated

6.7 ms6.7 ms

sparse trie[init size 1000 | update size 1000 | num updates 5]

crates/trie/sparse/benches/root.rs::root::calculate_root_from_leaves_repeated::calculate root from leaves repeated

24.9 ms24.9 ms

ordered_trie_root

crates/trie/trie/benches/trie_root.rs::benches::trie_root_benchmark::Receipts root calculation::receipts root | size: 10 | triehash

131.9 µs132 µs

hash builder[init size 1000 | update size 1000 | num updates 5]

crates/trie/sparse/benches/root.rs::root::calculate_root_from_leaves_repeated::calculate root from leaves repeated

28.7 ms28.8 ms

sparse trie[init size 1000 | update size 100 | num updates 10]

crates/trie/sparse/benches/root.rs::root::calculate_root_from_leaves_repeated::calculate root from leaves repeated

10.8 ms10.8 ms

Legacy[dataset_1024/targets_1]

crates/trie/trie/benches/proof_v2.rs::proof_comparison::bench_proof_algos::Proof

10.6 ms10.6 ms

Legacy[dataset_10240/targets_128]

crates/trie/trie/benches/proof_v2.rs::proof_comparison::bench_proof_algos::Proof

654.4 ms654.8 ms

Legacy[dataset_128/targets_128]

crates/trie/trie/benches/proof_v2.rs::proof_comparison::bench_proof_algos::Proof

866 µs866.7 µs

V2[dataset_10240/targets_128]

crates/trie/trie/benches/proof_v2.rs::proof_comparison::bench_proof_algos::Proof

636.6 ms637.1 ms

Legacy[dataset_10240/targets_2048]

crates/trie/trie/benches/proof_v2.rs::proof_comparison::bench_proof_algos::Proof

869.7 ms870.6 ms

V2[dataset_10240/targets_16]

crates/trie/trie/benches/proof_v2.rs::proof_comparison::bench_proof_algos::Proof

636.1 ms636.9 ms

Legacy[dataset_10240/targets_16]

crates/trie/trie/benches/proof_v2.rs::proof_comparison::bench_proof_algos::Proof

639.2 ms640.1 ms

validate_blob | num blobs: 5 | ValidateBlob

crates/primitives/benches/validate_blob_tx.rs::validate_blob::blob_validation::Blob Transaction KZG validation

153.4 µs153.6 µs

validate_blob | num blobs: 4 | ValidateBlob

crates/primitives/benches/validate_blob_tx.rs::validate_blob::blob_validation::Blob Transaction KZG validation

152 µs152.3 µs

prefix set | size: 100 | `Vec` with binary search lookup

crates/trie/common/benches/prefix_set.rs::prefix_set::prefix_set_lookups::Prefix Set Lookups

19.4 µs19.4 µs

Legacy[dataset_10240/targets_64]

crates/trie/trie/benches/proof_v2.rs::proof_comparison::bench_proof_algos::Proof

645.8 ms646.8 ms

Legacy[dataset_10240/targets_1]

crates/trie/trie/benches/proof_v2.rs::proof_comparison::bench_proof_algos::Proof

637.3 ms638.4 ms

V2[dataset_10240/targets_2048]

crates/trie/trie/benches/proof_v2.rs::proof_comparison::bench_proof_algos::Proof

637.8 ms638.8 ms

sparse trie[init size 1000 | update size 100 | num updates 5]

crates/trie/sparse/benches/root.rs::root::calculate_root_from_leaves_repeated::calculate root from leaves repeated

5.4 ms5.4 ms

V2[dataset_10240/targets_1]

crates/trie/trie/benches/proof_v2.rs::proof_comparison::bench_proof_algos::Proof

635.7 ms636.8 ms

V2[dataset_10240/targets_64]

crates/trie/trie/benches/proof_v2.rs::proof_comparison::bench_proof_algos::Proof

636.2 ms637.3 ms

validate_blob | num blobs: 6 | ValidateBlob

crates/primitives/benches/validate_blob_tx.rs::validate_blob::blob_validation::Blob Transaction KZG validation

154.8 µs155.1 µs

V2[dataset_128/targets_64]

crates/trie/trie/benches/proof_v2.rs::proof_comparison::bench_proof_algos::Proof

713.9 µs715.4 µs

sparse trie[init size 10000 | update size 1000 | num updates 1]

crates/trie/sparse/benches/root.rs::root::calculate_root_from_leaves_repeated::calculate root from leaves repeated

11.7 ms11.7 ms

hash builder[init size 1000 | update size 100 | num updates 3]

crates/trie/sparse/benches/root.rs::root::calculate_root_from_leaves_repeated::calculate root from leaves repeated

7.5 ms7.5 ms

sparse trie[init size 10000 | update size 1000 | num updates 3]

crates/trie/sparse/benches/root.rs::root::calculate_root_from_leaves_repeated::calculate root from leaves repeated

33.8 ms33.9 ms

hash builder[init size 1000 | update size 100 | num updates 10]

crates/trie/sparse/benches/root.rs::root::calculate_root_from_leaves_repeated::calculate root from leaves repeated

24.7 ms24.7 ms

hash builder[1000]

crates/trie/sparse/benches/root.rs::root::calculate_root_from_leaves::calculate root from leaves

4.5 ms4.5 ms

hash builder[init size 10000 | update size 1000 | num updates 1]

crates/trie/sparse/benches/root.rs::root::calculate_root_from_leaves_repeated::calculate root from leaves repeated

26.4 ms26.5 ms

Legacy[dataset_128/targets_2048]

crates/trie/trie/benches/proof_v2.rs::proof_comparison::bench_proof_algos::Proof

1.2 ms1.3 ms

hash builder[init size 10000 | update size 1000 | num updates 10]

crates/trie/sparse/benches/root.rs::root::calculate_root_from_leaves_repeated::calculate root from leaves repeated

253.5 ms254.4 ms

Legacy[dataset_1024/targets_512]

crates/trie/trie/benches/proof_v2.rs::proof_comparison::bench_proof_algos::Proof

15.5 ms15.5 ms

hash builder[init size 1000 | update size 100 | num updates 5]

crates/trie/sparse/benches/root.rs::root::calculate_root_from_leaves_repeated::calculate root from leaves repeated

12.4 ms12.5 ms

hash builder[init size 1000 | update size 1000 | num updates 3]

crates/trie/sparse/benches/root.rs::root::calculate_root_from_leaves_repeated::calculate root from leaves repeated

17.3 ms17.3 ms

hash builder[init size 1000 | update size 1000 | num updates 1]

crates/trie/sparse/benches/root.rs::root::calculate_root_from_leaves_repeated::calculate root from leaves repeated

5.8 ms5.8 ms

hash builder[init size 10000 | update size 1000 | num updates 5]

crates/trie/sparse/benches/root.rs::root::calculate_root_from_leaves_repeated::calculate root from leaves repeated

-1%

127.6 ms128.3 ms

size 100000 | updated 1% | depth 5

crates/trie/sparse/benches/rlp_node.rs::rlp_node::update_rlp_node_level::update rlp node level

-1%

8.3 ms8.3 ms

hash builder[init size 10000 | update size 100 | num updates 5]

crates/trie/sparse/benches/root.rs::root::calculate_root_from_leaves_repeated::calculate root from leaves repeated

-1%

43.9 ms44.2 ms

sparse trie[init size 1000 | update size 1000 | num updates 1]

crates/trie/sparse/benches/root.rs::root::calculate_root_from_leaves_repeated::calculate root from leaves repeated

-1%

5.1 ms5.1 ms

hash builder[init size 10000 | update size 1000 | num updates 3]

crates/trie/sparse/benches/root.rs::root::calculate_root_from_leaves_repeated::calculate root from leaves repeated

-1%

77.1 ms77.7 ms

size 100000 | updated 0.1% | depth 3

crates/trie/sparse/benches/rlp_node.rs::rlp_node::update_rlp_node_level::update rlp node level

-1%

2.4 ms2.4 ms

Legacy[dataset_1024/targets_2048]

crates/trie/trie/benches/proof_v2.rs::proof_comparison::bench_proof_algos::Proof

-1%

19.6 ms19.7 ms

hash builder[init size 10000 | update size 100 | num updates 1]

crates/trie/sparse/benches/root.rs::root::calculate_root_from_leaves_repeated::calculate root from leaves repeated

-1%

9.5 ms9.6 ms

size 100000 | updated 0.1% | depth 4

crates/trie/sparse/benches/rlp_node.rs::rlp_node::update_rlp_node_level::update rlp node level

-1%

1.3 ms1.4 ms

V2[dataset_128/targets_512]

crates/trie/trie/benches/proof_v2.rs::proof_comparison::bench_proof_algos::Proof

-1%

780.7 µs790.1 µs

hash builder[init size 10000 | update size 100 | num updates 3]

crates/trie/sparse/benches/root.rs::root::calculate_root_from_leaves_repeated::calculate root from leaves repeated

-1%

26.7 ms27.1 ms

V2[dataset_128/targets_128]

crates/trie/trie/benches/proof_v2.rs::proof_comparison::bench_proof_algos::Proof

-1%

718.1 µs728.4 µs

V2[dataset_128/targets_2048]

crates/trie/trie/benches/proof_v2.rs::proof_comparison::bench_proof_algos::Proof

-2%

894.9 µs916.8 µs

size 100000 | updated 0.1% | depth 1

crates/trie/sparse/benches/rlp_node.rs::rlp_node::update_rlp_node_level::update rlp node level

-3%

3.6 ms3.7 ms

size 100000 | updated 0.1% | depth 0

crates/trie/sparse/benches/rlp_node.rs::rlp_node::update_rlp_node_level::update rlp node level

-3%

3.6 ms3.7 ms

size 100000 | updated 0.1% | depth 2

crates/trie/sparse/benches/rlp_node.rs::rlp_node::update_rlp_node_level::update rlp node level

-3%

3.4 ms3.5 ms

size 100000 | updated 0.1% | depth 5

crates/trie/sparse/benches/rlp_node.rs::rlp_node::update_rlp_node_level::update rlp node level

-4%

1.1 ms1.1 ms

Commits

Click on a commit to change the comparison range

Base

main

3380eb6

-32.51%

feat: add StaticFileSegment::AccountChangeSets chore: add changeset info to segment header feat(provider): implement append_account_changeset chore: formatting and more TODOs chore: add stub for account_before_block fix: use proper value for account changeset static files feat: impl binary search for address in changeset feat: finish writer fn, add tests chore: add fallback to db when not found in static files feat: add account_changesets_range to ChangesetReader feat: add support for account changesets in IndexAccountHistory feat: add support for account changesets in static file producer chore: serialization changes feat: add support for account changesets in db get chore: docs and attempt to fix db get fix: properly upgrade segment header serialize / deserialize feat: add read-only segments feat: add cli flag for enabling v2 static files chore: remove Segment for AccountChangeSets chore: add unreachable! for unreachable db get branch chore: remove noisy traces chore: make binary search more concise feat: add support for account changeset static file pruning feat: make HashedPostState::from_reverts work with static files fix: don't write to db chore: update book cli chore: make clippy happy chore: fix test compilation chore: fix feat propagation feat: add StaticFileRangeWalker skeleton fix: fix inclusive ranges feat: impl removal for changesets in exec unwind chore: replace prefixsetloader with fn that uses provider chore(trie): propagate errors from root methods chore: make clippy happy chore: no underscores chore(static-file): call increment_block when appending account changesets chore(merkle-changesets): add logs for changeset reverts fix: return 0 for start feat: add account_changeset_count to ChangeSetReader fix: introduce walker to prevent OOM in IndexAccountHistory fix: remove static file v2 read-only segment stuff chore: remove traces feat: add storage_settings branches chore: backwards compat segment header writing fix: only try to read offsets for offset segments fix: fix test for account changeset format chore: add lz4 and make database check better fix: custom serializer for SegmentHeader chore: update settings cli to have account changeset option chore: integrate EitherWriter for account changesets chore: rm outdated doc chore: check storage settings for reading always chore: add note on changeset static file initialization chore: doc fixes chore: make clippy happy chore: update book cli chore: use core instead of std chore: fix doc links fix: stop using stale storage settings fix: fix incremental walker loop chore: update snapshot test wip: rangebounds

8ca8c57

17 days ago

by Rjected

Home Terms Privacy Docs