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

Remove CodegenContext::worker.

Browse Source 
`CodegenContext` is immutable except for the `worker` field - we clone
`CodegenContext` in multiple places, changing the `worker` field each
time. It's simpler to move the `worker` field out of `CodegenContext`.
This commit is contained in:
Nicholas Nethercote 2023-07-21 09:32:57 +10:00
parent 0ea9950ede
commit 3517fe899e
1 changed files with 12 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
compiler/rustc_codegen_ssa/src/back/write.rs
View File

@ -349,8 +349,6 @@ pub struct CodegenContext<B: WriteBackendMethods> {
/// Directory into which should the LLVM optimization remarks be written. /// Directory into which should the LLVM optimization remarks be written.
/// If `None`, they will be written to stderr. /// If `None`, they will be written to stderr.
pub remark_dir: Option<PathBuf>, pub remark_dir: Option<PathBuf>,
/// Worker thread number
pub worker: usize,
/// The incremental compilation session directory, or None if we are not /// The incremental compilation session directory, or None if we are not
/// compiling incrementally /// compiling incrementally
pub incr_comp_session_dir: Option<PathBuf>, pub incr_comp_session_dir: Option<PathBuf>,
@ -1104,7 +1102,6 @@ fn start_executing_work<B: ExtraBackendMethods>(
exported_symbols, exported_symbols,
remark: sess.opts.cg.remark.clone(), remark: sess.opts.cg.remark.clone(),
remark_dir, remark_dir,
worker: 0,
incr_comp_session_dir: sess.incr_comp_session_dir_opt().map(|r| r.clone()), incr_comp_session_dir: sess.incr_comp_session_dir_opt().map(|r| r.clone()),
cgu_reuse_tracker: sess.cgu_reuse_tracker.clone(), cgu_reuse_tracker: sess.cgu_reuse_tracker.clone(),
coordinator_send, coordinator_send,
@ -1355,17 +1352,13 @@ fn start_executing_work<B: ExtraBackendMethods>(
// LLVM work too. // LLVM work too.
let (item, _) = let (item, _) =
work_items.pop().expect("queue empty - queue_full_enough() broken?"); work_items.pop().expect("queue empty - queue_full_enough() broken?");
let cgcx = CodegenContext {
worker: get_worker_id(&mut free_worker_ids),
..cgcx.clone()
};
maybe_start_llvm_timer( maybe_start_llvm_timer(
prof, prof,
cgcx.config(item.module_kind()), cgcx.config(item.module_kind()),
&mut llvm_start_time, &mut llvm_start_time,
); );
main_thread_state = MainThreadState::Lending; main_thread_state = MainThreadState::Lending;
spawn_work(cgcx, item); spawn_work(&cgcx, get_worker_id(&mut free_worker_ids), item);
} }
} }
} else if codegen_state == Completed { } else if codegen_state == Completed {
@ -1404,17 +1397,13 @@ fn start_executing_work<B: ExtraBackendMethods>(
match main_thread_state { match main_thread_state {
MainThreadState::Idle => { MainThreadState::Idle => {
if let Some((item, _)) = work_items.pop() { if let Some((item, _)) = work_items.pop() {
let cgcx = CodegenContext {
worker: get_worker_id(&mut free_worker_ids),
..cgcx.clone()
};
maybe_start_llvm_timer( maybe_start_llvm_timer(
prof, prof,
cgcx.config(item.module_kind()), cgcx.config(item.module_kind()),
&mut llvm_start_time, &mut llvm_start_time,
); );
main_thread_state = MainThreadState::Lending; main_thread_state = MainThreadState::Lending;
spawn_work(cgcx, item); spawn_work(&cgcx, get_worker_id(&mut free_worker_ids), item);
} else { } else {
// There is no unstarted work, so let the main thread // There is no unstarted work, so let the main thread
// take over for a running worker. Otherwise the // take over for a running worker. Otherwise the
@ -1450,11 +1439,7 @@ fn start_executing_work<B: ExtraBackendMethods>(
let (item, _) = work_items.pop().unwrap(); let (item, _) = work_items.pop().unwrap();
maybe_start_llvm_timer(prof, cgcx.config(item.module_kind()), &mut llvm_start_time); maybe_start_llvm_timer(prof, cgcx.config(item.module_kind()), &mut llvm_start_time);
spawn_work(&cgcx, get_worker_id(&mut free_worker_ids), item);
let cgcx =
CodegenContext { worker: get_worker_id(&mut free_worker_ids), ..cgcx.clone() };
spawn_work(cgcx, item);
running_with_own_token += 1; running_with_own_token += 1;
} }
@ -1700,7 +1685,13 @@ fn start_executing_work<B: ExtraBackendMethods>(
#[must_use] #[must_use]
pub struct WorkerFatalError; pub struct WorkerFatalError;
fn spawn_work<B: ExtraBackendMethods>(cgcx: CodegenContext<B>, work: WorkItem<B>) { fn spawn_work<B: ExtraBackendMethods>(
cgcx: &CodegenContext<B>,
worker_id: usize,
work: WorkItem<B>,
) {
let cgcx = cgcx.clone();
B::spawn_named_thread(cgcx.time_trace, work.short_description(), move || { B::spawn_named_thread(cgcx.time_trace, work.short_description(), move || {
// Set up a destructor which will fire off a message that we're done as // Set up a destructor which will fire off a message that we're done as
// we exit. // we exit.
@ -1723,11 +1714,8 @@ fn spawn_work<B: ExtraBackendMethods>(cgcx: CodegenContext<B>, work: WorkItem<B>
} }
} }
let mut bomb = Bomb::<B> { let mut bomb =
coordinator_send: cgcx.coordinator_send.clone(), Bomb::<B> { coordinator_send: cgcx.coordinator_send.clone(), result: None, worker_id };
result: None,
worker_id: cgcx.worker,
};
// Execute the work itself, and if it finishes successfully then flag // Execute the work itself, and if it finishes successfully then flag
// ourselves as a success as well. // ourselves as a success as well.