From 76f8f877a146a55859fef195813ace5019d8fe79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20K=C3=A5re=20Alsaker?= Date: Thu, 13 Dec 2018 06:40:22 +0100 Subject: [PATCH 1/3] test --- src/bootstrap/config.rs | 2 +- src/librustc/session/mod.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs index 9421817ae6d8e..0823d3e5dbce4 100644 --- a/src/bootstrap/config.rs +++ b/src/bootstrap/config.rs @@ -547,7 +547,7 @@ impl Config { set(&mut config.lld_enabled, rust.lld); set(&mut config.lldb_enabled, rust.lldb); set(&mut config.llvm_tools_enabled, rust.llvm_tools); - config.rustc_parallel_queries = rust.experimental_parallel_queries.unwrap_or(false); + config.rustc_parallel_queries = rust.experimental_parallel_queries.unwrap_or(true); config.rustc_default_linker = rust.default_linker.clone(); config.musl_root = rust.musl_root.clone().map(PathBuf::from); config.save_toolstates = rust.save_toolstates.clone().map(PathBuf::from); diff --git a/src/librustc/session/mod.rs b/src/librustc/session/mod.rs index 7363b8b3a78fa..1e422b7126c52 100644 --- a/src/librustc/session/mod.rs +++ b/src/librustc/session/mod.rs @@ -902,7 +902,7 @@ impl Session { /// Returns the number of query threads that should be used for this /// compilation pub fn query_threads_from_opts(opts: &config::Options) -> usize { - opts.debugging_opts.query_threads.unwrap_or(1) + opts.debugging_opts.query_threads.unwrap_or(4) } /// Returns the number of query threads that should be used for this From e19155fcdb865934a83d3b5c513cdd6f79d4fc20 Mon Sep 17 00:00:00 2001 From: Wesley Wiser Date: Fri, 14 Dec 2018 16:20:43 -0500 Subject: [PATCH 2/3] Disable self profiler --- src/librustc/session/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/librustc/session/mod.rs b/src/librustc/session/mod.rs index 1e422b7126c52..dedcf6584d06b 100644 --- a/src/librustc/session/mod.rs +++ b/src/librustc/session/mod.rs @@ -841,7 +841,7 @@ impl Session { #[inline(always)] pub fn profiler ()>(&self, f: F) { - if unlikely!(self.self_profiling_active) { + if unlikely!(false) { self.profiler_active(f) } } From 33610f19c5b95810e40e1754c73ca99f952307b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20K=C3=A5re=20Alsaker?= Date: Sun, 23 Dec 2018 16:12:37 +0100 Subject: [PATCH 3/3] Bump core count --- src/librustc/session/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/librustc/session/mod.rs b/src/librustc/session/mod.rs index dedcf6584d06b..398ce2f66bade 100644 --- a/src/librustc/session/mod.rs +++ b/src/librustc/session/mod.rs @@ -902,7 +902,7 @@ impl Session { /// Returns the number of query threads that should be used for this /// compilation pub fn query_threads_from_opts(opts: &config::Options) -> usize { - opts.debugging_opts.query_threads.unwrap_or(4) + opts.debugging_opts.query_threads.unwrap_or(8) } /// Returns the number of query threads that should be used for this