mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #119265 - Mark-Simulacrum:remove-cache, r=cjgillot

Browse Source 
Remove metadata decoding DefPathHash cache

My expectation is that this cache is largely useless. Decoding a DefPathHash from metadata is essentially a pair of memory loads - there's no heavyweight processing involved. Caching it behind a HashMap just adds extra cost and incurs hashing overheads for the indices.

Based on https://github.com/rust-lang/rust/pull/119238.
This commit is contained in:
bors 2023-12-24 12:41:58 +00:00
commit ebb821f625
1 changed files with 8 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
compiler/rustc_metadata/src/rmeta/decoder.rs
View File

@ -88,8 +88,6 @@ pub(crate) struct CrateMetadata {
alloc_decoding_state: AllocDecodingState, alloc_decoding_state: AllocDecodingState,
/// Caches decoded `DefKey`s. /// Caches decoded `DefKey`s.
def_key_cache: Lock<FxHashMap<DefIndex, DefKey>>, def_key_cache: Lock<FxHashMap<DefIndex, DefKey>>,
/// Caches decoded `DefPathHash`es.
def_path_hash_cache: Lock<FxHashMap<DefIndex, DefPathHash>>,
// --- Other significant crate properties --- // --- Other significant crate properties ---
/// ID of this crate, from the current compilation session's point of view. /// ID of this crate, from the current compilation session's point of view.
@ -1485,27 +1483,16 @@ impl<'a, 'tcx> CrateMetadataRef<'a> {
DefPath::make(self.cnum, id, |parent| self.def_key(parent)) DefPath::make(self.cnum, id, |parent| self.def_key(parent))
} }
fn def_path_hash_unlocked(
self,
index: DefIndex,
def_path_hashes: &mut FxHashMap<DefIndex, DefPathHash>,
) -> DefPathHash {
*def_path_hashes.entry(index).or_insert_with(|| {
// This is a hack to workaround the fact that we can't easily encode/decode a Hash64
// into the FixedSizeEncoding, as Hash64 lacks a Default impl. A future refactor to
// relax the Default restriction will likely fix this.
let fingerprint = Fingerprint::new(
self.root.stable_crate_id.as_u64(),
self.root.tables.def_path_hashes.get(self, index),
);
DefPathHash::new(self.root.stable_crate_id, fingerprint.split().1)
})
}
#[inline] #[inline]
fn def_path_hash(self, index: DefIndex) -> DefPathHash { fn def_path_hash(self, index: DefIndex) -> DefPathHash {
let mut def_path_hashes = self.def_path_hash_cache.lock(); // This is a hack to workaround the fact that we can't easily encode/decode a Hash64
self.def_path_hash_unlocked(index, &mut def_path_hashes) // into the FixedSizeEncoding, as Hash64 lacks a Default impl. A future refactor to
// relax the Default restriction will likely fix this.
let fingerprint = Fingerprint::new(
self.root.stable_crate_id.as_u64(),
self.root.tables.def_path_hashes.get(self, index),
);
DefPathHash::new(self.root.stable_crate_id, fingerprint.split().1)
} }
#[inline] #[inline]
@ -1832,7 +1819,6 @@ impl CrateMetadata {
extern_crate: Lock::new(None), extern_crate: Lock::new(None),
hygiene_context: Default::default(), hygiene_context: Default::default(),
def_key_cache: Default::default(), def_key_cache: Default::default(),
def_path_hash_cache: Default::default(),
}; };
// Need `CrateMetadataRef` to decode `DefId`s in simplified types. // Need `CrateMetadataRef` to decode `DefId`s in simplified types.