Type-erase query stats.

Author: cjgillot

compiler/rustc_middle/src/dep_graph/dep_node.rs

@@ -60,11 +60,13 @@ use crate::traits::query::{
 };
 use crate::ty::subst::{GenericArg, SubstsRef};
 use crate::ty::{self, ParamEnvAnd, Ty, TyCtxt};
+use rustc_middle::ty::query;
 
 use rustc_data_structures::fingerprint::Fingerprint;
 use rustc_hir::def_id::{CrateNum, DefId, LocalDefId, CRATE_DEF_INDEX};
 use rustc_hir::definitions::DefPathHash;
 use rustc_hir::HirId;
+use rustc_query_system::query::QueryAccessors;
 use rustc_serialize::{Decodable, Decoder, Encodable, Encoder};
 use rustc_span::symbol::Symbol;
 use std::hash::Hash;
@@ -84,6 +86,8 @@ pub trait DepKindTrait: std::fmt::Debug + Sync {
 
     fn force_from_dep_node(&self, tcx: TyCtxt<'_>, dep_node: &DepNode) -> bool;
 
+    fn query_stats(&self, tcx: TyCtxt<'_>) -> Option<query::stats::QueryStats>;
+
     fn try_load_from_on_disk_cache(&self, tcx: TyCtxt<'_>, dep_node: &DepNode);
 }
 
@@ -199,6 +203,18 @@ macro_rules! define_dep_kinds {
                 false
             }
 
+            #[inline]
+            fn query_stats(&self, tcx: TyCtxt<'_>) -> Option<query::stats::QueryStats> {
+                let ret = query::stats::stats::<
+                    query::Query<'_>,
+                    <query::queries::$variant<'_> as QueryAccessors<TyCtxt<'_>>>::Cache,
+                >(
+                    stringify!($variant),
+                    &tcx.queries.$variant,
+                );
+                Some(ret)
+            }
+
             #[inline]
             fn try_load_from_on_disk_cache<'tcx>(&self, tcx: TyCtxt<'tcx>, dep_node: &DepNode) {
                 use rustc_query_system::query::QueryDescription;
@@ -412,6 +428,11 @@ impl DepKindTrait for dep_kind::Null {
         bug!("force_from_dep_node: encountered {:?}", _dep_node);
     }
 
+    #[inline]
+    fn query_stats(&self, _tcx: TyCtxt<'_>) -> Option<query::stats::QueryStats> {
+        None
+    }
+
     #[inline]
     fn try_load_from_on_disk_cache<'tcx>(&self, _tcx: TyCtxt<'tcx>, _dep_node: &DepNode) {}
 }
@@ -453,6 +474,11 @@ impl DepKindTrait for dep_kind::CrateMetadata {
         bug!("force_from_dep_node: encountered {:?}", _dep_node);
     }
 
+    #[inline]
+    fn query_stats(&self, _tcx: TyCtxt<'_>) -> Option<query::stats::QueryStats> {
+        None
+    }
+
     #[inline]
     fn try_load_from_on_disk_cache<'tcx>(&self, _tcx: TyCtxt<'tcx>, _dep_node: &DepNode) {}
 }
@@ -493,6 +519,11 @@ impl DepKindTrait for dep_kind::TraitSelect {
         bug!("force_from_dep_node: encountered {:?}", _dep_node);
     }
 
+    #[inline]
+    fn query_stats(&self, _tcx: TyCtxt<'_>) -> Option<query::stats::QueryStats> {
+        None
+    }
+
     #[inline]
     fn try_load_from_on_disk_cache<'tcx>(&self, _tcx: TyCtxt<'tcx>, _dep_node: &DepNode) {}
 }
@@ -534,6 +565,11 @@ impl DepKindTrait for dep_kind::CompileCodegenUnit {
         bug!("force_from_dep_node: encountered {:?}", _dep_node);
     }
 
+    #[inline]
+    fn query_stats(&self, _tcx: TyCtxt<'_>) -> Option<query::stats::QueryStats> {
+        None
+    }
+
     #[inline]
     fn try_load_from_on_disk_cache<'tcx>(&self, _tcx: TyCtxt<'tcx>, _dep_node: &DepNode) {}
 }

compiler/rustc_middle/src/dep_graph/mod.rs

@@ -16,6 +16,7 @@ pub use rustc_query_system::dep_graph::{
 
 pub use dep_node::{
     dep_kind, label_strs, DepConstructor, DepKind, DepKindIndex, DepKindTrait, DepNode, DepNodeExt,
+    DEP_KINDS,
 };
 
 pub type DepGraph = rustc_query_system::dep_graph::DepGraph<DepKind>;

compiler/rustc_middle/src/ty/query/mod.rs

@@ -64,7 +64,7 @@ mod plumbing;
 pub(crate) use rustc_query_system::query::CycleError;
 use rustc_query_system::query::*;
 
-mod stats;
+crate mod stats;
 pub use self::stats::print_stats;
 
 #[cfg(parallel_compiler)]

compiler/rustc_middle/src/ty/query/plumbing.rs

@@ -515,7 +515,7 @@ macro_rules! define_queries_struct {
             providers: IndexVec<CrateNum, Providers>,
             fallback_extern_providers: Box<Providers>,
 
-            $($(#[$attr])*  $name: QueryState<
+            $($(#[$attr])* pub(crate) $name: QueryState<
                 crate::dep_graph::DepKind,
                 <TyCtxt<$tcx> as QueryContext>::Query,
                 <queries::$name<$tcx> as QueryAccessors<TyCtxt<'tcx>>>::Cache,

compiler/rustc_middle/src/ty/query/stats.rs

@@ -1,10 +1,9 @@
-use crate::ty::query::queries;
+use crate::dep_graph::{self, DepKind};
 use crate::ty::TyCtxt;
 use rustc_hir::def_id::{DefId, LOCAL_CRATE};
-use rustc_query_system::query::{QueryAccessors, QueryCache, QueryContext, QueryState};
+use rustc_query_system::query::{QueryCache, QueryState};
 
 use std::any::type_name;
-use std::hash::Hash;
 use std::mem;
 #[cfg(debug_assertions)]
 use std::sync::atomic::Ordering;
@@ -26,7 +25,7 @@ impl KeyStats for DefId {
 }
 
 #[derive(Clone)]
-struct QueryStats {
+pub struct QueryStats {
     name: &'static str,
     cache_hits: usize,
     key_size: usize,
@@ -37,9 +36,8 @@ struct QueryStats {
     local_def_id_keys: Option<usize>,
 }
 
-fn stats<D, Q, C>(name: &'static str, map: &QueryState<D, Q, C>) -> QueryStats
+crate fn stats<Q, C>(name: &'static str, map: &QueryState<DepKind, Q, C>) -> QueryStats
 where
-    D: Copy + Clone + Eq + Hash,
     Q: Clone,
     C: QueryCache,
 {
@@ -65,7 +63,15 @@ where
 }
 
 pub fn print_stats(tcx: TyCtxt<'_>) {
-    let queries = query_stats(tcx);
+    let mut queries = Vec::new();
+
+    for dk in dep_graph::DEP_KINDS {
+        if let Some(fragment) = dk.query_stats(tcx) {
+            queries.push(fragment)
+        }
+    }
+
+    let queries = queries;
 
     if cfg!(debug_assertions) {
         let hits: usize = queries.iter().map(|s| s.cache_hits).sum();
@@ -118,28 +124,3 @@ pub fn print_stats(tcx: TyCtxt<'_>) {
         println!("   {} - {} = ({}%)", q.name, local, (local as f64 * 100.0) / total);
     }
 }
-
-macro_rules! print_stats {
-    (<$tcx:tt>
-        $($(#[$attr:meta])* [$($modifiers:tt)*] fn $name:ident($K:ty) -> $V:ty,)*
-    ) => {
-        fn query_stats(tcx: TyCtxt<'_>) -> Vec<QueryStats> {
-            let mut queries = Vec::new();
-
-            $(
-                queries.push(stats::<
-                    crate::dep_graph::DepKind,
-                    <TyCtxt<'_> as QueryContext>::Query,
-                    <queries::$name<'_> as QueryAccessors<TyCtxt<'_>>>::Cache,
-                >(
-                    stringify!($name),
-                    &tcx.queries.$name,
-                ));
-            )*
-
-            queries
-        }
-    }
-}
-
-rustc_query_append! { [print_stats!][<'tcx>] }