mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use cfg attribute instead of macro

Browse Source
This commit is contained in:
klensy 2022-02-08 22:21:16 +03:00
parent 1fca19c8ca
commit 78fbcca3e1
1 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
compiler/rustc_codegen_ssa/src/base.rs
View File

@ -14,6 +14,8 @@ use crate::{CachedModuleCodegen, CompiledModule, CrateInfo, MemFlags, ModuleCode
use rustc_attr as attr; use rustc_attr as attr;
use rustc_data_structures::fx::FxHashMap; use rustc_data_structures::fx::FxHashMap;
use rustc_data_structures::profiling::{get_resident_set_size, print_time_passes_entry}; use rustc_data_structures::profiling::{get_resident_set_size, print_time_passes_entry};
#[cfg(parallel_compiler)]
use rustc_data_structures::sync::{par_iter, ParallelIterator}; use rustc_data_structures::sync::{par_iter, ParallelIterator};
use rustc_hir as hir; use rustc_hir as hir;
use rustc_hir::def_id::{DefId, LOCAL_CRATE}; use rustc_hir::def_id::{DefId, LOCAL_CRATE};
@ -622,34 +624,34 @@ pub fn codegen_crate<B: ExtraBackendMethods>(
// This likely is a temporary measure. Once we don't have to support the // This likely is a temporary measure. Once we don't have to support the
// non-parallel compiler anymore, we can compile CGUs end-to-end in // non-parallel compiler anymore, we can compile CGUs end-to-end in
// parallel and get rid of the complicated scheduling logic. // parallel and get rid of the complicated scheduling logic.
#[cfg(parallel_compiler)]
let pre_compile_cgus = |cgu_reuse: &[CguReuse]| { let pre_compile_cgus = |cgu_reuse: &[CguReuse]| {
if cfg!(parallel_compiler) { tcx.sess.time("compile_first_CGU_batch", || {
tcx.sess.time("compile_first_CGU_batch", || { // Try to find one CGU to compile per thread.
// Try to find one CGU to compile per thread. let cgus: Vec<_> = cgu_reuse
let cgus: Vec<_> = cgu_reuse .iter()
.iter() .enumerate()
.enumerate() .filter(|&(_, reuse)| reuse == &CguReuse::No)
.filter(|&(_, reuse)| reuse == &CguReuse::No) .take(tcx.sess.threads())
.take(tcx.sess.threads()) .collect();
.collect();
// Compile the found CGUs in parallel. // Compile the found CGUs in parallel.
let start_time = Instant::now(); let start_time = Instant::now();
let pre_compiled_cgus = par_iter(cgus) let pre_compiled_cgus = par_iter(cgus)
.map(|(i, _)| { .map(|(i, _)| {
let module = backend.compile_codegen_unit(tcx, codegen_units[i].name()); let module = backend.compile_codegen_unit(tcx, codegen_units[i].name());
(i, module) (i, module)
}) })
.collect(); .collect();
(pre_compiled_cgus, start_time.elapsed()) (pre_compiled_cgus, start_time.elapsed())
}) })
} else {
(FxHashMap::default(), Duration::new(0, 0))
}
}; };
#[cfg(not(parallel_compiler))]
let pre_compile_cgus = |_: &[CguReuse]| (FxHashMap::default(), Duration::new(0, 0));
let mut cgu_reuse = Vec::new(); let mut cgu_reuse = Vec::new();
let mut pre_compiled_cgus: Option<FxHashMap<usize, _>> = None; let mut pre_compiled_cgus: Option<FxHashMap<usize, _>> = None;
let mut total_codegen_time = Duration::new(0, 0); let mut total_codegen_time = Duration::new(0, 0);