bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Make an optimal cold path for query_cache_hit

Browse source
This commit is contained in:
John Kåre Alsaker 2023-02-01 04:49:09 +01:00
parent e60ccfc6a9
commit 9539737008
4 changed files with 28 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

1
compiler/rustc_data_structures/src/lib.rs
View file

@ -11,6 +11,7 @@
#![feature(associated_type_bounds)]
#![feature(auto_traits)]
#![feature(cell_leak)]
#![feature(core_intrinsics)]
#![feature(extend_one)]
#![feature(hash_raw_entry)]
#![feature(hasher_prefixfree_extras)]

41
compiler/rustc_data_structures/src/profiling.rs
View file

@ -88,6 +88,7 @@ use std::borrow::Borrow;
use std::collections::hash_map::Entry;
use std::error::Error;
use std::fs;
use std::intrinsics::unlikely;
use std::path::Path;
use std::process;
use std::sync::Arc;
@ -393,13 +394,20 @@ impl SelfProfilerRef {
}
/// Record a query in-memory cache hit.
#[inline(never)]
#[inline(always)]
pub fn query_cache_hit(&self, query_invocation_id: QueryInvocationId) {
self.instant_query_event(
|profiler| profiler.query_cache_hit_event_kind,
query_invocation_id,
EventFilter::QUERY_CACHE_HITS,
);
#[inline(never)]
#[cold]
fn cold_call(profiler_ref: &SelfProfilerRef, query_invocation_id: QueryInvocationId) {
profiler_ref.instant_query_event(
|profiler| profiler.query_cache_hit_event_kind,
query_invocation_id,
);
}
if unlikely(self.event_filter_mask.contains(EventFilter::QUERY_CACHE_HITS)) {
cold_call(self, query_invocation_id);
}
}
/// Start profiling a query being blocked on a concurrent execution.
@ -444,20 +452,15 @@ impl SelfProfilerRef {
&self,
event_kind: fn(&SelfProfiler) -> StringId,
query_invocation_id: QueryInvocationId,
event_filter: EventFilter,
) {
drop(self.exec(event_filter, |profiler| {
let event_id = StringId::new_virtual(query_invocation_id.0);
let thread_id = get_thread_id();
profiler.profiler.record_instant_event(
event_kind(profiler),
EventId::from_virtual(event_id),
thread_id,
);
TimingGuard::none()
}));
let event_id = StringId::new_virtual(query_invocation_id.0);
let thread_id = get_thread_id();
let profiler = self.profiler.as_ref().unwrap();
profiler.profiler.record_instant_event(
event_kind(profiler),
EventId::from_virtual(event_id),
thread_id,
);
}
pub fn with_profiler(&self, f: impl FnOnce(&SelfProfiler)) {

2
compiler/rustc_query_system/src/dep_graph/graph.rs
View file

@ -47,7 +47,7 @@ impl DepNodeIndex {
}
impl From<DepNodeIndex> for QueryInvocationId {
#[inline]
#[inline(always)]
fn from(dep_node_index: DepNodeIndex) -> Self {
QueryInvocationId(dep_node_index.as_u32())
}

16
compiler/rustc_query_system/src/query/plumbing.rs
View file

@ -346,9 +346,7 @@ where
{
match cache.lookup(&key) {
Some((value, index)) => {
if std::intrinsics::unlikely(tcx.profiler().enabled()) {
tcx.profiler().query_cache_hit(index.into());
}
tcx.profiler().query_cache_hit(index.into());
tcx.dep_graph().read_index(index);
Some(value)
}
@ -408,9 +406,7 @@ where
panic!("value must be in cache after waiting")
};
if std::intrinsics::unlikely(qcx.dep_context().profiler().enabled()) {
qcx.dep_context().profiler().query_cache_hit(index.into());
}
qcx.dep_context().profiler().query_cache_hit(index.into());
query_blocked_prof_timer.finish_with_query_invocation_id(index.into());
(v, Some(index))
@ -722,9 +718,7 @@ where
}
Some((_, dep_node_index)) => {
dep_graph.read_index(dep_node_index);
if std::intrinsics::unlikely(qcx.dep_context().profiler().enabled()) {
qcx.dep_context().profiler().query_cache_hit(dep_node_index.into());
}
qcx.dep_context().profiler().query_cache_hit(dep_node_index.into());
(false, None)
}
}
@ -778,9 +772,7 @@ where
// Ensure that only one of them runs the query.
let cache = Q::query_cache(qcx);
if let Some((_, index)) = cache.lookup(&key) {
if std::intrinsics::unlikely(qcx.dep_context().profiler().enabled()) {
qcx.dep_context().profiler().query_cache_hit(index.into());
}
qcx.dep_context().profiler().query_cache_hit(index.into());
return;
}