Use VecCache for LocalDefId.
This commit is contained in:
Camille GILLOT
parent
aee4d132e7
commit
15d2f62bd2
3 changed files with 183 additions and 1 deletions
|
|
@ -120,6 +120,14 @@ macro_rules! query_helper_param_ty {
|
|||
}
|
||||
|
||||
macro_rules! query_storage {
|
||||
// FIXME(cjgillot) this macro-based way to perform type-based dispatch is clearly brittle.
|
||||
// It should probably be replaced by an associated type on the `Key` trait.
|
||||
([][CrateNum, $V:ty]) => { VecCache<CrateNum, $V> };
|
||||
([(arena_cache) $($rest:tt)*][CrateNum, $V:ty]) => { VecArenaCache<'tcx, CrateNum, $V> };
|
||||
([][LocalDefId, $V:ty]) => { VecCache<LocalDefId, $V> };
|
||||
([(arena_cache) $($rest:tt)*][LocalDefId, $V:ty]) => { VecArenaCache<'tcx, LocalDefId, $V> };
|
||||
([][hir::OwnerId, $V:ty]) => { VecCache<hir::OwnerId, $V> };
|
||||
([(arena_cache) $($rest:tt)*][hir::OwnerId, $V:ty]) => { VecArenaCache<'tcx, hir::OwnerId, $V> };
|
||||
([][$K:ty, $V:ty]) => { DefaultCache<$K, $V> };
|
||||
([(arena_cache) $($rest:tt)*][$K:ty, $V:ty]) => { ArenaCache<'tcx, $K, $V> };
|
||||
([$other:tt $($modifiers:tt)*][$($args:tt)*]) => { query_storage!([$($modifiers)*][$($args)*]) };
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ use rustc_data_structures::sharded::Sharded;
|
|||
#[cfg(not(parallel_compiler))]
|
||||
use rustc_data_structures::sync::Lock;
|
||||
use rustc_data_structures::sync::WorkerLocal;
|
||||
use rustc_index::vec::{Idx, IndexVec};
|
||||
use std::default::Default;
|
||||
use std::fmt::Debug;
|
||||
use std::hash::Hash;
|
||||
|
|
@ -207,3 +208,174 @@ where
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub struct VecCache<K: Idx, V> {
|
||||
#[cfg(parallel_compiler)]
|
||||
cache: Sharded<IndexVec<K, Option<(V, DepNodeIndex)>>>,
|
||||
#[cfg(not(parallel_compiler))]
|
||||
cache: Lock<IndexVec<K, Option<(V, DepNodeIndex)>>>,
|
||||
}
|
||||
|
||||
impl<K: Idx, V> Default for VecCache<K, V> {
|
||||
fn default() -> Self {
|
||||
VecCache { cache: Default::default() }
|
||||
}
|
||||
}
|
||||
|
||||
impl<K: Eq + Idx, V: Clone + Debug> QueryStorage for VecCache<K, V> {
|
||||
type Value = V;
|
||||
type Stored = V;
|
||||
|
||||
#[inline]
|
||||
fn store_nocache(&self, value: Self::Value) -> Self::Stored {
|
||||
// We have no dedicated storage
|
||||
value
|
||||
}
|
||||
}
|
||||
|
||||
impl<K, V> QueryCache for VecCache<K, V>
|
||||
where
|
||||
K: Eq + Idx + Clone + Debug,
|
||||
V: Clone + Debug,
|
||||
{
|
||||
type Key = K;
|
||||
|
||||
#[inline(always)]
|
||||
fn lookup<R, OnHit>(&self, key: &K, on_hit: OnHit) -> Result<R, ()>
|
||||
where
|
||||
OnHit: FnOnce(&V, DepNodeIndex) -> R,
|
||||
{
|
||||
#[cfg(parallel_compiler)]
|
||||
let lock = self.cache.get_shard_by_hash(key.index() as u64).lock();
|
||||
#[cfg(not(parallel_compiler))]
|
||||
let lock = self.cache.lock();
|
||||
if let Some(Some(value)) = lock.get(*key) {
|
||||
let hit_result = on_hit(&value.0, value.1);
|
||||
Ok(hit_result)
|
||||
} else {
|
||||
Err(())
|
||||
}
|
||||
}
|
||||
|
||||
#[inline]
|
||||
fn complete(&self, key: K, value: V, index: DepNodeIndex) -> Self::Stored {
|
||||
#[cfg(parallel_compiler)]
|
||||
let mut lock = self.cache.get_shard_by_hash(key.index() as u64).lock();
|
||||
#[cfg(not(parallel_compiler))]
|
||||
let mut lock = self.cache.lock();
|
||||
lock.insert(key, (value.clone(), index));
|
||||
value
|
||||
}
|
||||
|
||||
fn iter(&self, f: &mut dyn FnMut(&Self::Key, &Self::Value, DepNodeIndex)) {
|
||||
#[cfg(parallel_compiler)]
|
||||
{
|
||||
let shards = self.cache.lock_shards();
|
||||
for shard in shards.iter() {
|
||||
for (k, v) in shard.iter_enumerated() {
|
||||
if let Some(v) = v {
|
||||
f(&k, &v.0, v.1);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
#[cfg(not(parallel_compiler))]
|
||||
{
|
||||
let map = self.cache.lock();
|
||||
for (k, v) in map.iter_enumerated() {
|
||||
if let Some(v) = v {
|
||||
f(&k, &v.0, v.1);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub struct VecArenaCache<'tcx, K: Idx, V> {
|
||||
arena: WorkerLocal<TypedArena<(V, DepNodeIndex)>>,
|
||||
#[cfg(parallel_compiler)]
|
||||
cache: Sharded<IndexVec<K, Option<&'tcx (V, DepNodeIndex)>>>,
|
||||
#[cfg(not(parallel_compiler))]
|
||||
cache: Lock<IndexVec<K, Option<&'tcx (V, DepNodeIndex)>>>,
|
||||
}
|
||||
|
||||
impl<'tcx, K: Idx, V> Default for VecArenaCache<'tcx, K, V> {
|
||||
fn default() -> Self {
|
||||
VecArenaCache {
|
||||
arena: WorkerLocal::new(|_| TypedArena::default()),
|
||||
cache: Default::default(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl<'tcx, K: Eq + Idx, V: Debug + 'tcx> QueryStorage for VecArenaCache<'tcx, K, V> {
|
||||
type Value = V;
|
||||
type Stored = &'tcx V;
|
||||
|
||||
#[inline]
|
||||
fn store_nocache(&self, value: Self::Value) -> Self::Stored {
|
||||
let value = self.arena.alloc((value, DepNodeIndex::INVALID));
|
||||
let value = unsafe { &*(&value.0 as *const _) };
|
||||
&value
|
||||
}
|
||||
}
|
||||
|
||||
impl<'tcx, K, V: 'tcx> QueryCache for VecArenaCache<'tcx, K, V>
|
||||
where
|
||||
K: Eq + Idx + Clone + Debug,
|
||||
V: Debug,
|
||||
{
|
||||
type Key = K;
|
||||
|
||||
#[inline(always)]
|
||||
fn lookup<R, OnHit>(&self, key: &K, on_hit: OnHit) -> Result<R, ()>
|
||||
where
|
||||
OnHit: FnOnce(&&'tcx V, DepNodeIndex) -> R,
|
||||
{
|
||||
#[cfg(parallel_compiler)]
|
||||
let lock = self.cache.get_shard_by_hash(key.index() as u64).lock();
|
||||
#[cfg(not(parallel_compiler))]
|
||||
let lock = self.cache.lock();
|
||||
if let Some(Some(value)) = lock.get(*key) {
|
||||
let hit_result = on_hit(&&value.0, value.1);
|
||||
Ok(hit_result)
|
||||
} else {
|
||||
Err(())
|
||||
}
|
||||
}
|
||||
|
||||
#[inline]
|
||||
fn complete(&self, key: K, value: V, index: DepNodeIndex) -> Self::Stored {
|
||||
let value = self.arena.alloc((value, index));
|
||||
let value = unsafe { &*(value as *const _) };
|
||||
#[cfg(parallel_compiler)]
|
||||
let mut lock = self.cache.get_shard_by_hash(key.index() as u64).lock();
|
||||
#[cfg(not(parallel_compiler))]
|
||||
let mut lock = self.cache.lock();
|
||||
lock.insert(key, value);
|
||||
&value.0
|
||||
}
|
||||
|
||||
fn iter(&self, f: &mut dyn FnMut(&Self::Key, &Self::Value, DepNodeIndex)) {
|
||||
#[cfg(parallel_compiler)]
|
||||
{
|
||||
let shards = self.cache.lock_shards();
|
||||
for shard in shards.iter() {
|
||||
for (k, v) in shard.iter_enumerated() {
|
||||
if let Some(v) = v {
|
||||
f(&k, &v.0, v.1);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
#[cfg(not(parallel_compiler))]
|
||||
{
|
||||
let map = self.cache.lock();
|
||||
for (k, v) in map.iter_enumerated() {
|
||||
if let Some(v) = v {
|
||||
f(&k, &v.0, v.1);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,7 +7,9 @@ pub use self::job::deadlock;
|
|||
pub use self::job::{print_query_stack, QueryInfo, QueryJob, QueryJobId, QueryJobInfo, QueryMap};
|
||||
|
||||
mod caches;
|
||||
pub use self::caches::{ArenaCache, DefaultCache, QueryCache, QueryStorage};
|
||||
pub use self::caches::{
|
||||
ArenaCache, DefaultCache, QueryCache, QueryStorage, VecArenaCache, VecCache,
|
||||
};
|
||||
|
||||
mod config;
|
||||
pub use self::config::{QueryConfig, QueryDescription, QueryVTable};
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue