Parallelize trans

Author: Zoxc

src/librustc/Cargo.toml

@@ -27,6 +27,7 @@ rustc_errors = { path = "../librustc_errors" }
 serialize = { path = "../libserialize" }
 syntax = { path = "../libsyntax" }
 syntax_pos = { path = "../libsyntax_pos" }
+num_cpus = "1.0"
 backtrace = "0.3.3"
 byteorder = { version = "1.1", features = ["i128"]}
 

src/librustc/lib.rs

@@ -85,6 +85,7 @@ extern crate fmt_macros;
 extern crate getopts;
 extern crate graphviz;
 #[macro_use] extern crate lazy_static;
+extern crate num_cpus;
 #[cfg(windows)]
 extern crate libc;
 #[cfg(windows)]

src/librustc/session/config.rs

@@ -1163,6 +1163,8 @@ options! {DebuggingOptions, DebuggingSetter, basic_debugging_options,
         "print the AST as JSON and halt"),
     query_threads: Option<usize> = (None, parse_opt_uint, [UNTRACKED],
         "execute queries on a thread pool with N threads"),
+    codegen_threads: Option<usize> = (None, parse_opt_uint, [UNTRACKED],
+        "execute code generation work with N threads"),
     ast_json_noexpand: bool = (false, parse_bool, [UNTRACKED],
         "print the pre-expansion AST as JSON and halt"),
     ls: bool = (false, parse_bool, [UNTRACKED],
@@ -1928,6 +1930,10 @@ pub fn build_session_options_and_crate_config(
         );
     }
 
+    if debugging_opts.codegen_threads == Some(0) {
+        early_error(error_format, "Value for codegen threads must be a positive nonzero integer");
+    }
+
     if debugging_opts.query_threads.unwrap_or(1) > 1 && debugging_opts.fuel.is_some() {
         early_error(
             error_format,

src/librustc/session/mod.rs

@@ -881,6 +881,12 @@ impl Session {
         Self::query_threads_from_opts(&self.opts)
     }
 
+    /// Returns the number of codegen threads that should be used for this
+    /// compilation
+    pub fn codegen_threads(&self) -> usize {
+        self.opts.debugging_opts.codegen_threads.unwrap_or(::num_cpus::get())
+    }
+
     /// Returns the number of codegen units that should be used for this
     /// compilation
     pub fn codegen_units(&self) -> usize {

src/librustc_trans/Cargo.toml

@@ -15,7 +15,7 @@ flate2 = "1.0"
 jobserver = "0.1.5"
 libc = "0.2"
 log = "0.4"
-num_cpus = "1.0"
+rustc-rayon = { git = "https://github.com/Zoxc/rayon.git", branch = "fiber" }
 rustc = { path = "../librustc" }
 rustc-demangle = "0.1.4"
 rustc_allocator = { path = "../librustc_allocator" }

src/librustc_trans/back/lto.rs

@@ -42,6 +42,7 @@ pub fn crate_type_allows_lto(crate_type: config::CrateType) -> bool {
     }
 }
 
+#[derive(Debug)]
 pub(crate) enum LtoModuleTranslation {
     Fat {
         module: Option<ModuleTranslation>,
@@ -506,6 +507,7 @@ fn run_pass_manager(cgcx: &CodegenContext,
     debug!("lto done");
 }
 
+#[derive(Debug)]
 pub enum SerializedModule {
     Local(ModuleBuffer),
     FromRlib(Vec<u8>),
@@ -520,6 +522,7 @@ impl SerializedModule {
     }
 }
 
+#[derive(Debug)]
 pub struct ModuleBuffer(*mut llvm::ModuleBuffer);
 
 unsafe impl Send for ModuleBuffer {}
@@ -547,18 +550,21 @@ impl Drop for ModuleBuffer {
     }
 }
 
+#[derive(Debug)]
 pub struct ThinModule {
     shared: Arc<ThinShared>,
     idx: usize,
 }
 
+#[derive(Debug)]
 struct ThinShared {
     data: ThinData,
     thin_buffers: Vec<ThinBuffer>,
     serialized_modules: Vec<SerializedModule>,
     module_names: Vec<CString>,
 }
 
+#[derive(Debug)]
 struct ThinData(*mut llvm::ThinLTOData);
 
 unsafe impl Send for ThinData {}
@@ -572,6 +578,7 @@ impl Drop for ThinData {
     }
 }
 
+#[derive(Debug)]
 pub struct ThinBuffer(*mut llvm::ThinLTOBuffer);
 
 unsafe impl Send for ThinBuffer {}