diff options
| -rw-r--r-- | src/librustc/ty/context.rs | 6 | ||||
| -rw-r--r-- | src/librustc/ty/query/mod.rs | 1 | ||||
| -rw-r--r-- | src/librustc/ty/query/plumbing.rs | 47 | ||||
| -rw-r--r-- | src/librustc/util/profiling.rs | 16 |
4 files changed, 40 insertions, 30 deletions
diff --git a/src/librustc/ty/context.rs b/src/librustc/ty/context.rs index 6c377941dad..1e3e83e8eb2 100644 --- a/src/librustc/ty/context.rs +++ b/src/librustc/ty/context.rs @@ -1248,7 +1248,11 @@ impl<'a, 'gcx, 'tcx> TyCtxt<'a, 'gcx, 'tcx> { sync::assert_send_val(&gcx); - tls::enter_global(gcx, f) + let r = tls::enter_global(gcx, f); + + gcx.queries.record_query_hits(s); + + r } pub fn consider_optimizing<T: Fn() -> String>(&self, msg: T) -> bool { diff --git a/src/librustc/ty/query/mod.rs b/src/librustc/ty/query/mod.rs index 99dd3569491..d9cabb39574 100644 --- a/src/librustc/ty/query/mod.rs +++ b/src/librustc/ty/query/mod.rs @@ -42,6 +42,7 @@ use ty::subst::Substs; use util::nodemap::{DefIdSet, DefIdMap, ItemLocalSet}; use util::common::{ErrorReported}; use util::profiling::ProfileCategory::*; +use session::Session; use rustc_data_structures::bit_set::BitSet; use rustc_data_structures::indexed_vec::IndexVec; diff --git a/src/librustc/ty/query/plumbing.rs b/src/librustc/ty/query/plumbing.rs index fd51f4f86a0..a7dffdb4318 100644 --- a/src/librustc/ty/query/plumbing.rs +++ b/src/librustc/ty/query/plumbing.rs @@ -112,11 +112,7 @@ impl<'a, 'tcx, Q: QueryDescription<'tcx>> JobOwner<'a, 'tcx, Q> { let mut lock = cache.borrow_mut(); if let Some(value) = lock.results.get(key) { profq_msg!(tcx, ProfileQueriesMsg::CacheHit); - tcx.sess.profiler(|p| { - p.record_query(Q::CATEGORY); - p.record_query_hit(Q::CATEGORY); - }); - + tcx.sess.profiler(|p| p.record_query_hit(Q::CATEGORY)); let result = Ok((value.value.clone(), value.index)); #[cfg(debug_assertions)] { @@ -195,6 +191,7 @@ impl<'a, 'tcx, Q: QueryDescription<'tcx>> JobOwner<'a, 'tcx, Q> { /// Executes a job by changing the ImplicitCtxt to point to the /// new query job while it executes. It returns the diagnostics /// captured during execution and the actual result. + #[inline(always)] pub(super) fn start<'lcx, F, R>( &self, tcx: TyCtxt<'_, 'tcx, 'lcx>, @@ -382,13 +379,10 @@ impl<'a, 'gcx, 'tcx> TyCtxt<'a, 'gcx, 'tcx> { ) ); - self.sess.profiler(|p| p.record_query(Q::CATEGORY)); - let job = match JobOwner::try_get(self, span, &key) { TryGetJob::NotYetStarted(job) => job, TryGetJob::JobCompleted(result) => { return result.map(|(v, index)| { - self.sess.profiler(|p| p.record_query_hit(Q::CATEGORY)); self.dep_graph.read_index(index); v }) @@ -430,9 +424,6 @@ impl<'a, 'gcx, 'tcx> TyCtxt<'a, 'gcx, 'tcx> { if !dep_node.kind.is_input() { if let Some(dep_node_index) = self.try_mark_green_and_read(&dep_node) { - profq_msg!(self, ProfileQueriesMsg::CacheHit); - self.sess.profiler(|p| p.record_query_hit(Q::CATEGORY)); - return self.load_from_disk_and_cache_in_memory::<Q>(key, job, dep_node_index, @@ -483,11 +474,16 @@ impl<'a, 'gcx, 'tcx> TyCtxt<'a, 'gcx, 'tcx> { }; let result = if let Some(result) = result { + profq_msg!(self, ProfileQueriesMsg::CacheHit); + self.sess.profiler(|p| p.record_query_hit(Q::CATEGORY)); + result } else { // We could not load a result from the on-disk cache, so // recompute. + self.sess.profiler(|p| p.start_activity(Q::CATEGORY)); + // The diagnostics for this query have already been // promoted to the current session during // try_mark_green(), so we can ignore them here. @@ -498,6 +494,8 @@ impl<'a, 'gcx, 'tcx> TyCtxt<'a, 'gcx, 'tcx> { Q::compute(tcx, key) }) }); + + self.sess.profiler(|p| p.end_activity(Q::CATEGORY)); result }; @@ -547,6 +545,7 @@ impl<'a, 'gcx, 'tcx> TyCtxt<'a, 'gcx, 'tcx> { for {:?}", dep_node); } + #[inline(always)] fn force_query_with_job<Q: QueryDescription<'gcx>>( self, key: Q::Key, @@ -565,10 +564,7 @@ impl<'a, 'gcx, 'tcx> TyCtxt<'a, 'gcx, 'tcx> { key, dep_node); profq_msg!(self, ProfileQueriesMsg::ProviderBegin); - self.sess.profiler(|p| { - p.start_activity(Q::CATEGORY); - p.record_query(Q::CATEGORY); - }); + self.sess.profiler(|p| p.start_activity(Q::CATEGORY)); let res = job.start(self, |tcx| { if dep_node.kind.is_eval_always() { @@ -624,14 +620,10 @@ impl<'a, 'gcx, 'tcx> TyCtxt<'a, 'gcx, 'tcx> { // this introduces should be negligible as we'll immediately hit the // in-memory cache, or another query down the line will. - self.sess.profiler(|p| { - p.start_activity(Q::CATEGORY); - p.record_query(Q::CATEGORY); - }); - let _ = self.get_query::<Q>(DUMMY_SP, key); - - self.sess.profiler(|p| p.end_activity(Q::CATEGORY)); + } else { + profq_msg!(self, ProfileQueriesMsg::CacheHit); + self.sess.profiler(|p| p.record_query_hit(Q::CATEGORY)); } } @@ -751,6 +743,17 @@ macro_rules! define_queries_inner { } } + pub fn record_query_hits(&self, sess: &Session) { + sess.profiler(|p| { + $( + p.record_queries( + <queries::$name<'_> as QueryConfig<'_>>::CATEGORY, + self.$name.lock().results.len() + ); + )* + }); + } + #[cfg(parallel_queries)] pub fn collect_active_jobs(&self) -> Vec<Lrc<QueryJob<$tcx>>> { let mut jobs = Vec::new(); diff --git a/src/librustc/util/profiling.rs b/src/librustc/util/profiling.rs index d598709ae3a..af512509136 100644 --- a/src/librustc/util/profiling.rs +++ b/src/librustc/util/profiling.rs @@ -62,7 +62,8 @@ macro_rules! define_categories { let total_time = ($(self.times.$name + )* 0) as f32; $( - let (hits, total) = self.query_counts.$name; + let (hits, computed) = self.query_counts.$name; + let total = hits + computed; let (hits, total) = if total > 0 { (format!("{:.2}", (((hits as f32) / (total as f32)) * 100.0)), total.to_string()) @@ -86,7 +87,8 @@ macro_rules! define_categories { let mut json = String::from("["); $( - let (hits, total) = self.query_counts.$name; + let (hits, computed) = self.query_counts.$name; + let total = hits + computed; //normalize hits to 0% let hit_percent = @@ -168,14 +170,14 @@ impl SelfProfiler { self.timer_stack.push(category); } - pub fn record_query(&mut self, category: ProfileCategory) { - let (hits, total) = *self.data.query_counts.get(category); - self.data.query_counts.set(category, (hits, total + 1)); + pub fn record_queries(&mut self, category: ProfileCategory, count: usize) { + let (hits, computed) = *self.data.query_counts.get(category); + self.data.query_counts.set(category, (hits, computed + count as u64)); } pub fn record_query_hit(&mut self, category: ProfileCategory) { - let (hits, total) = *self.data.query_counts.get(category); - self.data.query_counts.set(category, (hits + 1, total)); + let (hits, computed) = *self.data.query_counts.get(category); + self.data.query_counts.set(category, (hits + 1, computed)); } pub fn end_activity(&mut self, category: ProfileCategory) { |