Skip to content

Create a query cache for DefId #108649

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.

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

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 4 additions & 2 deletions compiler/rustc_middle/src/query/keys.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ use crate::ty::subst::{GenericArg, SubstsRef};
use crate::ty::{self, Ty, TyCtxt};
use rustc_hir::def_id::{CrateNum, DefId, LocalDefId, LOCAL_CRATE};
use rustc_hir::hir_id::{HirId, OwnerId};
use rustc_query_system::query::{DefaultCacheSelector, SingleCacheSelector, VecCacheSelector};
use rustc_query_system::query::{
DefIdCacheSelector, DefaultCacheSelector, SingleCacheSelector, VecCacheSelector,
};
use rustc_span::symbol::{Ident, Symbol};
use rustc_span::{Span, DUMMY_SP};
use rustc_target::abi::FieldIdx;
Expand Down Expand Up @@ -153,7 +155,7 @@ impl Key for LocalDefId {
}

impl Key for DefId {
type CacheSelector = DefaultCacheSelector<Self>;
type CacheSelector = DefIdCacheSelector;

fn default_span(&self, tcx: TyCtxt<'_>) -> Span {
tcx.def_span(*self)
Expand Down
61 changes: 60 additions & 1 deletion compiler/rustc_query_system/src/query/caches.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@ use crate::dep_graph::DepNodeIndex;

use rustc_data_structures::fx::FxHashMap;
use rustc_data_structures::sharded;
#[cfg(parallel_compiler)]
use rustc_data_structures::sharded::Sharded;
use rustc_data_structures::sync::Lock;
use rustc_index::{Idx, IndexVec};
use rustc_span::def_id::CrateNum;
use rustc_span::def_id::DefId;
use rustc_span::def_id::DefIndex;
use std::fmt::Debug;
use std::hash::Hash;
use std::marker::PhantomData;
Expand Down Expand Up @@ -212,3 +214,60 @@ where
}
}
}

pub struct DefIdCacheSelector;

impl<'tcx, V: 'tcx> CacheSelector<'tcx, V> for DefIdCacheSelector {
type Cache = DefIdCache< V>
where
V: Copy;
}

pub struct DefIdCache<V> {
cache: Sharded<IndexVec<CrateNum, FxHashMap<DefIndex, (V, DepNodeIndex)>>>,
}

impl<V> Default for DefIdCache<V> {
fn default() -> Self {
Self { cache: Default::default() }
}
}

impl<V> QueryCache for DefIdCache<V>
where
V: Copy,
{
type Key = DefId;
type Value = V;

#[inline(always)]
fn lookup(&self, key: &DefId) -> Option<(V, DepNodeIndex)> {
let key_hash = sharded::make_hash(&key.index);
let lock = self.cache.get_shard_by_hash(key_hash).lock();
if let Some(defs) = lock.get(key.krate) {
let result = defs.raw_entry().from_key_hashed_nocheck(key_hash, &key.index);
if let Some((_, value)) = result { Some(*value) } else { None }
} else {
None
}
}

#[inline]
fn complete(&self, key: DefId, value: V, index: DepNodeIndex) {
let key_hash = sharded::make_hash(&key.index);
let mut lock = self.cache.get_shard_by_hash(key_hash).lock();
lock.ensure_contains_elem(key.krate, || FxHashMap::default());
lock[key.krate].insert(key.index, (value, index));
}

fn iter(&self, f: &mut dyn FnMut(&Self::Key, &Self::Value, DepNodeIndex)) {
let shards = self.cache.lock_shards();
for shard in shards.iter() {
for (k, v) in shard.iter_enumerated() {
for (&index, v) in v.iter() {
f(&DefId { krate: k, index }, &v.0, v.1);
}
}
}
}
}
3 changes: 2 additions & 1 deletion compiler/rustc_query_system/src/query/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ pub use self::job::{print_query_stack, QueryInfo, QueryJob, QueryJobId, QueryJob

mod caches;
pub use self::caches::{
CacheSelector, DefaultCacheSelector, QueryCache, SingleCacheSelector, VecCacheSelector,
CacheSelector, DefIdCacheSelector, DefaultCacheSelector, QueryCache, SingleCacheSelector,
VecCacheSelector,
};

mod config;
Expand Down