diff options
| author | Vincent Ambo <mail@tazj.in> | 2022-12-29T14·08+0300 |
|---|---|---|
| committer | tazjin <tazjin@tvl.su> | 2022-12-29T17·44+0000 |
| commit | 91465dc78ec7b4a8c9b651657bb8ad5f25c556a7 (patch) | |
| tree | aaf6b3f624193de87b583b2cb5b0dcbdac89b4ea /tvix/Cargo.lock | |
| parent | 610c44ec1ec2eaf58e5c36d7007d6c1922e49804 (diff) | |
refactor(tvix/eval): persistent, memory-sharing OrdMap for NixAttrs r/5541
This uses the `im::OrdMap` for `NixAttrs` to enable sharing of memory between different iterations of a map. This slightly speeds up eval, but not significantly. Future work might include benchmarking whether using a `HashMap` and only ordering in cases where order is actually required would help. This switches to a fork of `im` that fixes some bugs with its OrdMap implementation. Change-Id: I2f6a5ff471b6d508c1e8a98b13f889f49c0d9537 Reviewed-on: https://cl.tvl.fyi/c/depot/+/7676 Reviewed-by: sterni <sternenseemann@systemli.org> Tested-by: BuildkiteCI
Diffstat (limited to 'tvix/Cargo.lock')
| -rw-r--r-- | tvix/Cargo.lock | 37 |
1 files changed, 16 insertions, 21 deletions
diff --git a/tvix/Cargo.lock b/tvix/Cargo.lock index a3b91e534f..f2c0e391ca 100644 --- a/tvix/Cargo.lock +++ b/tvix/Cargo.lock @@ -185,12 +185,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitmaps" -version = "2.1.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "031043d04099746d8db04daf1fa424b2bc8bd69d92b25962dcde24da39ab64a2" -dependencies = [ - "typenum", -] +checksum = "703642b98a00b3b90513279a8ede3fcfa479c126c5fb46e78f3051522f021403" [[package]] name = "blake3" @@ -829,20 +826,28 @@ dependencies = [ ] [[package]] -name = "im" -version = "15.1.0" +name = "imbl" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0acd33ff0285af998aaf9b57342af478078f53492322fafc47450e09397e0e9" +checksum = "c2806b69cd9f4664844027b64465eacb444c67c1db9c778e341adff0c25cdb0d" dependencies = [ "bitmaps", + "imbl-sized-chunks", "rand_core 0.6.4", "rand_xoshiro", - "sized-chunks", - "typenum", "version_check", ] [[package]] +name = "imbl-sized-chunks" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6957ea0b2541c5ca561d3ef4538044af79f8a05a1eb3a3b148936aaceaa1076" +dependencies = [ + "bitmaps", +] + +[[package]] name = "indexmap" version = "1.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1636,16 +1641,6 @@ dependencies = [ ] [[package]] -name = "sized-chunks" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16d69225bde7a69b235da73377861095455d298f2b970996eec25ddbb42b3d1e" -dependencies = [ - "bitmaps", - "typenum", -] - -[[package]] name = "slab" version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2083,7 +2078,7 @@ dependencies = [ "codemap-diagnostic", "criterion", "dirs", - "im", + "imbl", "itertools", "path-clean", "pretty_assertions", |