Unnamed repository; edit this file 'description' to name the repository.
Auto merge of #14632 - Veykril:lru-macro, r=lnicola
internal: Increase LRU cache size for parse_expansion and macro_expand queries
| -rw-r--r-- | crates/base-db/src/lib.rs | 2 | ||||
| -rw-r--r-- | crates/hir-expand/src/ast_id_map.rs | 1 | ||||
| -rw-r--r-- | crates/ide-db/src/lib.rs | 16 |
3 files changed, 12 insertions, 7 deletions
diff --git a/crates/base-db/src/lib.rs b/crates/base-db/src/lib.rs index 358ca1453d..b65cf7341f 100644 --- a/crates/base-db/src/lib.rs +++ b/crates/base-db/src/lib.rs @@ -53,7 +53,7 @@ pub struct FileRange { pub range: TextRange, } -pub const DEFAULT_LRU_CAP: usize = 128; +pub const DEFAULT_PARSE_LRU_CAP: usize = 128; pub trait FileLoader { /// Text of the file. diff --git a/crates/hir-expand/src/ast_id_map.rs b/crates/hir-expand/src/ast_id_map.rs index 2b27db0e95..e48caca790 100644 --- a/crates/hir-expand/src/ast_id_map.rs +++ b/crates/hir-expand/src/ast_id_map.rs @@ -115,6 +115,7 @@ impl AstIdMap { } } } + res.arena.shrink_to_fit(); res } diff --git a/crates/ide-db/src/lib.rs b/crates/ide-db/src/lib.rs index b9f9cbd7fb..b0c5820fb0 100644 --- a/crates/ide-db/src/lib.rs +++ b/crates/ide-db/src/lib.rs @@ -149,29 +149,33 @@ impl RootDatabase { } pub fn update_parse_query_lru_capacity(&mut self, lru_capacity: Option<usize>) { - let lru_capacity = lru_capacity.unwrap_or(base_db::DEFAULT_LRU_CAP); + let lru_capacity = lru_capacity.unwrap_or(base_db::DEFAULT_PARSE_LRU_CAP); base_db::ParseQuery.in_db_mut(self).set_lru_capacity(lru_capacity); - hir::db::ParseMacroExpansionQuery.in_db_mut(self).set_lru_capacity(lru_capacity); - hir::db::MacroExpandQuery.in_db_mut(self).set_lru_capacity(lru_capacity); + // macro expansions are usually rather small, so we can afford to keep more of them alive + hir::db::ParseMacroExpansionQuery.in_db_mut(self).set_lru_capacity(4 * lru_capacity); + hir::db::MacroExpandQuery.in_db_mut(self).set_lru_capacity(4 * lru_capacity); } pub fn update_lru_capacities(&mut self, lru_capacities: &FxHashMap<Box<str>, usize>) { use hir::db as hir_db; base_db::ParseQuery.in_db_mut(self).set_lru_capacity( - lru_capacities.get(stringify!(ParseQuery)).copied().unwrap_or(base_db::DEFAULT_LRU_CAP), + lru_capacities + .get(stringify!(ParseQuery)) + .copied() + .unwrap_or(base_db::DEFAULT_PARSE_LRU_CAP), ); hir_db::ParseMacroExpansionQuery.in_db_mut(self).set_lru_capacity( lru_capacities .get(stringify!(ParseMacroExpansionQuery)) .copied() - .unwrap_or(base_db::DEFAULT_LRU_CAP), + .unwrap_or(4 * base_db::DEFAULT_PARSE_LRU_CAP), ); hir_db::MacroExpandQuery.in_db_mut(self).set_lru_capacity( lru_capacities .get(stringify!(MacroExpandQuery)) .copied() - .unwrap_or(base_db::DEFAULT_LRU_CAP), + .unwrap_or(4 * base_db::DEFAULT_PARSE_LRU_CAP), ); macro_rules! update_lru_capacity_per_query { |